--- loncom/interface/courseprefs.pm	2009/11/05 14:48:39	1.10
+++ loncom/interface/courseprefs.pm	2010/01/07 18:21:25	1.16
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.10 2009/11/05 14:48:39 raeburn Exp $
+# $Id: courseprefs.pm,v 1.16 2010/01/07 18:21:25 faziophi Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -101,7 +101,7 @@ sub handler {
                 date => 'Locale used for community calendar',
                 coco => 'Community Content',
                 copo => 'Community Policy',
-                priv => 'Domain Coodinators in community',
+                priv => 'Domain Coordinators in community',
                 defd => 'Default dates for member access',
                 stuv => 'Member-viewable membership list options',
                 stul => 'Member agreement needed to be listed',
@@ -126,7 +126,7 @@ sub handler {
                 date => 'Locale used for course calendar',
                 coco => 'Course Content',
                 copo => 'Course Policy',
-                priv => 'Domain Coodinators in course',
+                priv => 'Domain Coordinators in course',
                 defd => 'Default dates for student access',
                 stuv => 'Student-viewable classlist options',
                 stul => 'Student agreement needed to be listed',
@@ -281,13 +281,14 @@ sub handler {
                                 col2 => 'Value',}],
                     ordered => ['problem_stream_switch','suppress_tries',
                                 'default_paper_size','print_header_format',
-                                'disableexampointprint'],
+                                'disableexampointprint','canuse_pdfforms'],
                     itemtext => {
                         problem_stream_switch => 'Allow problems to be split over pages',
                         suppress_tries        => 'Suppress number of tries in printing',
                         default_paper_size    => 'Default paper type',
                         print_header_format   => 'Print header format',
                         disableexampointprint => 'Disable automatically printing point values on exams',
+                        canuse_pdfforms    => 'Users can print problems as PDF forms and upload later for grading',
                                 },
                   },
         'spreadsheet' =>
@@ -332,7 +333,7 @@ sub handler {
                                                  \@prefs_order,\%prefs,\%values,
                                                   $cnum,undef,\@allitems);
     } elsif ($phase eq 'display') {
-        my $jscript = &get_jscript($cdom,$phase);
+        my $jscript = &get_jscript($cdom,$phase,$crstype);
         my @allitems = &get_allitems(%prefs);
         &Apache::lonconfigsettings::display_settings($r,$cdom,$phase,$context,
             \@prefs_order,\%prefs,\%values,undef,$jscript,\@allitems,$crstype);
@@ -365,16 +366,11 @@ sub print_config_box {
     my $itemtext = $item->{'itemtext'};
     my $rowtotal = 0;
     my $output =
-         '<table class="LC_nested_outer">
-          <tr>
-           <th align="left" valign="middle"><span class="LC_font_larger">'.
-           &mt($item->{text}).'&nbsp;'.
-           &Apache::loncommon::help_open_topic($item->{'help'}).'</span></th>'."\n".
-          '</tr>';
+        '<h3><a href="#">'.&mt($item->{text}).'</a></h3>
+        <div>&nbsp;<span style="float:right">'.
+         &Apache::loncommon::help_open_topic($item->{'help'}).'</span>';
     if (($action eq 'feedback') || ($action eq 'classlists')) {
         $output .= '
-          <tr>
-           <td>
             <table class="LC_nested">
              <tr class="LC_info_row">
               <td class="LC_left_item">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>
@@ -388,10 +384,6 @@ sub print_config_box {
         }
         $output .= '
            </table>
-          </td>
-         </tr>
-         <tr>
-           <td>
             <table class="LC_nested">
              <tr class="LC_info_row">
               <td class="LC_left_item">'.&mt($item->{'header'}->[1]->{'col1'}).'</td>';
@@ -402,10 +394,6 @@ sub print_config_box {
             $output .= &print_classlists('middle',$cdom,$settings,$itemtext,\$rowtotal,$crstype).
                        '
             </table>
-           </td>
-          </tr>
-          <tr>
-           <td>
             <table class="LC_nested">
              <tr class="LC_info_row">
               <td class="LC_left_item" valign="top">'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
@@ -414,8 +402,6 @@ sub print_config_box {
         }
     } else {
         $output .= '
-          <tr>
-           <td>
             <table class="LC_nested">
              <tr class="LC_info_row">
               <td class="LC_left_item" valign="top">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>
@@ -448,9 +434,7 @@ sub print_config_box {
     }
     $output .= '
    </table>
-  </td>
- </tr>
-</table><br />';
+</div>';
     return ($output,$rowtotal);
 }
 
@@ -983,15 +967,21 @@ sub store_changes {
                                         $displayname = &mt($text);
                                     }
                                     if (defined($yesno{$key})) {
-                                        $displayval = 'no';
+                                        $displayval = &mt('No');
                                         if ($changes->{$item}{$key} eq 'yes') {
-                                            $displayval = 'yes';                          
+                                            $displayval = &mt('Yes');                          
                                         }
                                     } elsif (($key =~ /^default_enrollment_(start|end)_date$/) && ($displayval)) {
                                         $displayval = &Apache::lonlocal::locallocaltime($displayval);
                                     } elsif ($key eq 'categories') {
                                         $displayval = $env{'form.categories_display'};
-                                    }  
+                                    } elsif ($key eq 'canuse_pdfforms') {
+                                        if ($changes->{$item}{$key} eq '1') {
+                                            $displayval = &mt('Yes');
+                                        } elsif ($changes->{$item}{$key} eq '0') {
+                                            $displayval = &mt('No');
+                                        }
+                                    }
                                     if ($changes->{$item}{$key} eq '') {
                                         push(@delkeys,$key);
                                         $output .= '<li>'.&mt('Deleted setting for [_1]',
@@ -1037,6 +1027,10 @@ sub store_changes {
                     $output .= &mt('An error occurred when removing course settings which are no longer in use.');
                 }
                 $output .= '</span>';
+            } else {
+                foreach my $key (@delkeys) {
+                    &Apache::lonnet::delenv('course.'.$cdom.'_'.$cnum.'.'.$key);
+                }
             }
         }
         if (@need_env_update) {
@@ -1174,8 +1168,8 @@ sub get_course {
 }
 
 sub get_jscript {
-    my ($cdom,$phase) = @_;
-    my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom);
+    my ($cdom,$phase,$crstype) = @_;
+    my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom,$crstype);
     my ($jscript,$categorize_js);
     my $stubrowse_js = &Apache::loncommon::studentbrowser_javascript();
     my $browse_js = &Apache::loncommon::browser_and_searcher_javascript('parmset');
@@ -1294,14 +1288,14 @@ sub print_courseinfo {
         if (ref($cathash) eq 'HASH') {
             $categoriesform = 
                 &Apache::loncommon::assign_categories_table($cathash,
-                                                $settings->{'categories'})."\n";
+                                                $settings->{'categories'},$crstype)."\n";
         }
     }
     if (!defined($categoriesform)) {
-        $categoriesform = &mt('No categories defined for this domain');
+        $categoriesform = &mt('No categories defined in this domain.');
     }
 
-    my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom);
+    my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom,$crstype);
 
     my $replace;
     if ($crstype eq 'Community') {
@@ -1507,15 +1501,24 @@ sub new_cloners_dom_row {
 }
 
 sub can_modify_catsettings {
-    my ($dom) = @_;
+    my ($dom,$crstype) = @_;
     my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
     my ($can_toggle_cat,$can_categorize);
     if (ref($domconf{'coursecategories'}) eq 'HASH') {
-        if ($domconf{'coursecategories'}{'togglecats'} eq 'crs') {
-            $can_toggle_cat = 1;
-        }
-        if ($domconf{'coursecategories'}{'categorize'} eq 'crs') {
-            $can_categorize = 1;
+        if ($crstype eq 'Community') {
+            if ($domconf{'coursecategories'}{'togglecatscomm'} eq 'comm') {
+                $can_toggle_cat = 1;
+            }
+            if ($domconf{'coursecategories'}{'categorizecomm'} eq 'comm') {
+                $can_categorize = 1;
+            }
+        } else {
+            if ($domconf{'coursecategories'}{'togglecats'} eq 'crs') {
+                $can_toggle_cat = 1;
+            }
+            if ($domconf{'coursecategories'}{'categorize'} eq 'crs') {
+                $can_categorize = 1;
+            }
         }
     }
     return ($can_toggle_cat,$can_categorize);
@@ -1531,7 +1534,13 @@ sub assign_course_categories {
     if (ref($domconf{'coursecategories'}) eq 'HASH') {
         $cathash = $domconf{'coursecategories'}{'cats'};
         if (ref($cathash) eq 'HASH') {
-            $hascats = 1;
+            foreach my $cat (keys(%{$cathash})) {
+                next if ($cat eq 'instcode::0');
+                unless ($crstype eq 'Community') {
+                    next if ($cat eq 'communities::0');
+                }
+                $hascats ++; 
+            }
         }
     }
     my $catwin_js;
@@ -1597,15 +1606,20 @@ ENDSCRIPT
     if ($hascats) {
         my %currsettings =
             &Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum);
-        $categoriesform .= $assign.'<br /><br />'.
-                           '<form name="chgcats" action="/adm/courseprefs" method="post">'."\n".
-                           &Apache::loncommon::assign_categories_table($cathash,
-                                                       $currsettings{'categories'})."\n".
-                           '<br /><input type="button" name="changes" value="'.
-                           &mt('Copy to main window').'" '.
-                           'onclick="javascript:updateCategories()" /></form><br />';
+        my $cattable = &Apache::loncommon::assign_categories_table($cathash,
+                                       $currsettings{'categories'},$crstype);
+        if ($cattable eq '') {
+            $categoriesform .= &mt('No suitable categories defined for this course type in this domain.'); 
+        } else {
+            $categoriesform .= $assign.'<br /><br />'.
+                               '<form name="chgcats" action="/adm/courseprefs" method="post">'."\n".
+                               $cattable."\n".
+                               '<br /><input type="button" name="changes" value="'.
+                               &mt('Copy to main window').'" '.
+                               'onclick="javascript:updateCategories()" /></form><br />';
+        }
     } else {
-        $categoriesform .= &mt('No categories defined for this domain');
+        $categoriesform .= &mt('No categories defined in this domain.');
     }
     $r->print($start_page.$categoriesform.$end_page);
     return;
@@ -2201,10 +2215,11 @@ sub print_grading {
                    input => 'selectbox',
                    options => {
                                 standard => &mt('Standard: shows points'),
-                                external => &mt('External: shows number of completed parts'),
+                                external => &mt('External: shows number of completed parts and totals'),
+                                externalnototals => &mt('External: shows only number of completed parts'),
                                 spreadsheet => &mt('Spreadsheet: (with link to detailed scores)'), 
                               },
-                   order => ['standard','external','spreadsheet'],
+                   order => ['standard','external','externalnototals','spreadsheet'],
                  },
         'rndseed' => {
                    text => '<b>'.&mt($itemtext->{'rndseed'}).'</b>'.
@@ -2280,6 +2295,16 @@ sub print_printouts {
             text => '<b>'.&mt($itemtext->{'disableexampointprint'}).'</b>',
             input => 'radio',
                                  },
+        canuse_pdfforms => {
+            text  => '<b>'.&mt($itemtext->{'canuse_pdfforms'}).'</b>',
+            input => 'selectbox',
+            options => {
+                         1    => &mt('Yes'),
+                         0    => &mt('No'),
+                       },
+            order => ['1','0'],
+            nullval => 'None specified - use domain default',
+                    }
     );
     return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
 }