--- loncom/interface/lonparmset.pm	2003/06/13 20:01:02	1.99
+++ loncom/interface/lonparmset.pm	2003/06/20 16:13:06	1.107
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.99 2003/06/13 20:01:02 albertel Exp $
+# $Id: lonparmset.pm,v 1.107 2003/06/20 16:13:06 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -342,15 +342,17 @@ $selscript
 </head>
 $bodytag
 
-<a href="/adm/helper/parameter.helper">Use Assignment Parameter Helper</a>, a
-simpler interface to set open, due, or answer open dates for problems or sequences.
-
 <form method="post" action="/adm/parmset" name="envform">
 <h3>Course Environment</h3>
 <input type="submit" name="crsenv" value="Set Course Environment">
 </form>
+<hr />
 <form method="post" action="/adm/parmset" name="parmform">
 <h3>Course Assessments</h3>
+
+<a href="/adm/helper/parameter.helper">Use Assignment Parameter Helper</a>, a
+simpler interface to set open, due, or answer open dates for problems or
+sequences.<br />&nbsp;<br />
 ENDHEAD
 
     if (!$have_assesments) {
@@ -726,8 +728,8 @@ sub assessparms {
 		"<font color=red>Unknown user '$uname' at domain '$udom'</font>";
 	    $uname='';
         } else {
-	    $csec=&Apache::lonnet::usection($udom,$uname,
-					    $ENV{'request.course.id'});
+	    $csec=&Apache::lonnet::getsection($udom,$uname,
+					      $ENV{'request.course.id'});
 	    if ($csec eq '-1') {
 		$message="<font color=red>".
 		    "User '$uname' at domain '$udom' not ".
@@ -904,16 +906,9 @@ sub assessparms {
 
     $r->print('<h2>'.$message.'</h2><table>');
                         
-    $r->print('<tr><td><hr /></td></tr>');
-
     my $submitmessage;
-    if (($prevvisit) || ($pschp) || ($pssymb)) {
-        $submitmessage = "Update Display";
-    } else {
-        $submitmessage = "Display";
-    }
     if (!$pssymb) {
-        $r->print('<tr><td>Select Parameter Level</td><td>');
+        $r->print('<tr><td>Select Parameter Level</td><td colspan="2">');
         $r->print('<select name="parmlev">');
         foreach (reverse sort keys %alllevs) {
             $r->print('<option value="'.$alllevs{$_}.'"');
@@ -923,10 +918,8 @@ sub assessparms {
             $r->print('>'.$_.'</option>');
         }
         $r->print("</select></td>\n");
-    
-        $r->print('<td><input type="submit" name="dis" value="'.$submitmessage.'"></td>');
 
-        $r->print('</tr><tr><td><hr /></td>');
+        $r->print('</tr>');
 
         $r->print('<tr><td>Select Enclosing Map or Folder</td>');
         $r->print('<td colspan="2"><select name="pschp">');
@@ -947,7 +940,7 @@ sub assessparms {
 
     $r->print('<tr><td colspan="3"><hr /><input type="checkbox"');
     if ($showoptions eq 'show') {$r->print(" checked ");}
-    $r->print(' name="showoptions" value="show" onclick="form.submit();">Show More Options<hr /></td></tr>');
+    $r->print(' name="showoptions" value="show">Show More Options<hr /></td></tr>');
 #    $r->print("<tr><td>Show: $showoptions</td></tr>");
 #    $r->print("<tr><td>pscat: @pscat</td></tr>");
 #    $r->print("<tr><td>psprt: @psprt</td></tr>");
@@ -1032,7 +1025,13 @@ sub assessparms {
         }
 
     }
-    $r->print('</table>');
+    $r->print('</table><br />');
+    if (($prevvisit) || ($pschp) || ($pssymb)) {
+        $submitmessage = "Update Course Assessment Parameter Display";
+    } else {
+        $submitmessage = "Set Course Assessment Parameters";
+    }
+    $r->print('<input type="submit" name="dis" value="'.$submitmessage.'">');
 
 #    my @temp_psprt;
 #    foreach my $t (@psprt) {
@@ -1075,7 +1074,7 @@ ENDTABLETWO
            }
            $r->print(<<ENDTABLEHEADFOUR);
 </tr><tr><th>Assessment URL and Title</th><th>Type</th>
-<th>Enclosing Map or Folder</th><th>Part No.</th><th>Parameter Name</th>
+<th>Enclosing Map or Folder</th><th>Part</th><th>Parameter Name</th>
 <th>default</th><th>from Enclosing Map or Folder</th>
 <th>general</th><th>for Enclosing Map or Folder</th><th>for Resource</th>
 ENDTABLEHEADFOUR
@@ -1372,7 +1371,7 @@ ENDMAPONE
 
 =item crsenv
 
-Show course data and parameters.  This is a large routine that should
+Show and set course data and parameters.  This is a large routine that should
 be simplified and shortened... someday.
 
 Inputs: $r
@@ -1390,50 +1389,68 @@ sub crsenv {
                              'Set Course Environment Parameters');
     my $dom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
     my $crs = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
-# -------------------------------------------------- Go through list of changes
+
+    #
+    # Go through list of changes
     foreach (keys %ENV) {
-	if ($_=~/^form\.(.+)\_setparmval$/) {
-            my $name=$1;
-            my $value=$ENV{'form.'.$name.'_value'};
-            if ($name eq 'newp') {
-                $name=$ENV{'form.newp_name'};
-            }
-            if ($name eq 'url') {
-		$value=~s/^\/res\///;
-                my $bkuptime=time;
-                my @tmp = &Apache::lonnet::get
-                    ('environment',['url'],$dom,$crs);
-                $setoutput.='Backing up previous URL: '.
-                    &Apache::lonnet::put
-                        ('environment',
-                         {'top level map backup '.$bkuptime => $tmp[1] },
-                         $dom,$crs).
-                    '<br>';
+        next if ($_!~/^form\.(.+)\_setparmval$/);
+        my $name  = $1;
+        my $value = $ENV{'form.'.$name.'_value'};
+        if ($name eq 'newp') {
+            $name = $ENV{'form.newp_name'};
+        }
+        if ($name eq 'url') {
+            $value=~s/^\/res\///;
+            my $bkuptime=time;
+            my @tmp = &Apache::lonnet::get
+                ('environment',['url'],$dom,$crs);
+            $setoutput.='Backing up previous URL: '.
+                &Apache::lonnet::put
+                ('environment',
+                 {'top level map backup '.$bkuptime => $tmp[1] },
+                 $dom,$crs).
+                     '<br>';
+        }
+        #
+        # Deal with modified default spreadsheets
+        if ($name =~ /^spreadsheet_default_(classcalc|
+                                            studentcalc|
+                                            assesscalc)$/x) {
+            my $sheettype = $1; 
+            if ($sheettype eq 'classcalc') {
+                # no need to do anything since viewing the sheet will
+                # cause it to be updated. 
+            } elsif ($sheettype eq 'studentcalc') {
+                # expire all the student spreadsheets
+                &Apache::lonnet::expirespread('','','studentcalc');
+            } else {
+                # expire all the assessment spreadsheets 
+                #    this includes non-default spreadsheets, but better to
+                #    be safe than sorry.
+                &Apache::lonnet::expirespread('','','assesscalc');
+                # expire all the student spreadsheets
+                &Apache::lonnet::expirespread('','','studentcalc');
             }
-            if ($name =~ /^spreadsheet_default_(classcalc|
-                                                studentcalc|
-                                                assesscalc)$/x) {
-                my $sheettype = $1; 
-                if ($sheettype eq 'classcalc') {
-                    # no need to do anything since viewing the sheet will
-                    # cause it to be updated. 
-                } elsif ($sheettype eq 'studentcalc') {
-                    # expire all the student spreadsheets
-                    &Apache::lonnet::expirespread('','','studentcalc');
-                } else {
-                    # expire all the default assessment spreadsheets
-                }
+        }
+        #
+        # Deal with the enrollment dates
+        if ($name =~ /^default_enrollment_(start|end)_date$/) {
+            $value=&Apache::lonhtmlcommon::get_date_from_form($name.'_value');
+        }
+        #
+        # Let the user know we made the changes
+        if ($name) {
+            my $put_result = &Apache::lonnet::put('environment',
+                                                  {$name=>$value},$dom,$crs);
+            if ($put_result eq 'ok') {
+                $setoutput.='Set <b>'.$name.'</b> to <b>'.$value.'</b>.<br />';
+            } else {
+                $setoutput.='Unable to set <b>'.$name.'</b> to '.
+                    '<b>'.$value.'</b> due to '.$put_result.'.<br />';
             }
-
-            if ($name) {
-                $setoutput.='Setting <tt>'.$name.'</tt> to <tt>'.
-                    $value.'</tt>: '.
-                    &Apache::lonnet::put
-                            ('environment',{$name=>$value},$dom,$crs).
-                    '<br>';
-	    }
         }
     }
+
 # -------------------------------------------------------- Get parameters again
 
     my %values=&Apache::lonnet::dump('environment',$dom,$crs);
@@ -1443,7 +1460,7 @@ sub crsenv {
 	    ('url'            => '<b>Top Level Map</b> '.
                                  '<a href="javascript:openbrowser'.
                                  "('envform','url','sequence')\">".
-                                 'Browse</a><br /><font color=red> '.
+                                 'Select Map</a><br /><font color=red> '.
                                  'Modification may make assessment data '.
                                  'inaccessible</font>',
              'description'    => '<b>Course Description</b>',
@@ -1452,7 +1469,7 @@ sub crsenv {
              'default_xml_style' => '<b>Default XML Style File</b> '.
                     '<a href="javascript:openbrowser'.
                     "('envform','default_xml_style'".
-                    ",'sty')\">Browse</a><br>",
+                    ",'sty')\">Select Style File</a><br>",
              'question.email' => '<b>Feedback Addresses for Resource Content '.
                                  'Questions</b><br />(<tt>user:domain,'.
                                  'user:domain(section;section;...;*;...),...</tt>)',
@@ -1478,17 +1495,17 @@ sub crsenv {
                  => '<b>Default Course Spreadsheet</b> '.
                     '<a href="javascript:openbrowser'.
                     "('envform','spreadsheet_default_classcalc'".
-                    ",'spreadsheet')\">Browse</a><br />",
+                    ",'spreadsheet')\">Select Spreadsheet File</a><br />",
              'spreadsheet_default_studentcalc' 
                  => '<b>Default Student Spreadsheet</b> '.
                     '<a href="javascript:openbrowser'.
                     "('envform','spreadsheet_default_calc'".
-                    ",'spreadsheet')\">Browse</a><br />",
+                    ",'spreadsheet')\">Select Spreadsheet File</a><br />",
              'spreadsheet_default_assesscalc' 
                  => '<b>Default Assessment Spreadsheet</b> '.
                     '<a href="javascript:openbrowser'.
                     "('envform','spreadsheet_default_assesscalc'".
-                    ",'spreadsheet')\">Browse</a><br />",
+                    ",'spreadsheet')\">Select Spreadsheet File</a><br />",
 	     'allow_limited_html_in_feedback'
 	         => '<b>Allow limited HTML in discussion posts</b><br />'.
 	            '(Set value to yes to allow)',
@@ -1497,24 +1514,57 @@ sub crsenv {
                     '<font color="red">Modifying this will make problems '.
                     'have different numbers and answers</font>',
              'problem_stream_switch'
-                 => '<b>Allow problems to be splitted over pages</b><br />'.
-                    ' (<tt><b>yes</b> if allow anything else if not</tt>)'
-             );
-	foreach (keys(%values)) {
-	    unless ($descriptions{$_}) {
-		$descriptions{$_}=$_;
+                 => '<b>Allow problems to be split over pages</b><br />'.
+                    ' (<tt><b>yes</b> if allow anything else if not</tt>)',
+             'default_enrollment_start_date' => 'The default beginning date '.
+                                                'for enrolled students.',
+             'default_enrollment_end_date'   => 'The default ending date '.
+                                                'for enrolled students.',
+             ); 
+        my @Display_Order = ('url','description','courseid',
+                             'default_xml_style','pageseparators',
+                             'question.email','comment.email','policy.email',
+                             'pch.roles.denied','pch.users.denied',
+                             'allow_limited_html_in_feedback',
+                             'rndseed',
+                             'problem_stream_switch',
+                             'spreadsheet_default_classcalc',
+                             'spreadsheet_default_studentcalc',
+                             'spreadsheet_default_assesscalc', 
+                             'hideemptyrows',
+                             'default_enrollment_start_date',
+                             'default_enrollment_end_date',
+                             );
+	foreach my $parameter (sort(keys(%values))) {
+	    if (! $descriptions{$parameter}) {
+                $descriptions{$parameter}=$parameter;
+                push(@Display_Order,$parameter);
 	    }
 	}
-	foreach (sort keys %descriptions) {
+        foreach my $parameter (@Display_Order) {
+            my $description = $descriptions{$parameter};
             # onchange is javascript to automatically check the 'Set' button.
             my $onchange = 'onFocus="javascript:window.document.forms'.
-                '[\'envform\'].elements[\''.$_.'_setparmval\']'.
+                "['envform'].elements['".$parameter."_setparmval']".
                 '.checked=true;"';
-	    $output.='<tr><td>'.$descriptions{$_}.'</td>'.
-                '<td><input name="'.$_.'_value" size=40 '.
-                'value="'.$values{$_}.'" '.$onchange.' /></td>'.
-                '<td><input type=checkbox name="'.$_.'_setparmval"></td>'.
-                '</tr>'."\n";
+            $output .= '<tr><td>'.$description.'</td>';
+            if ($parameter =~ /^default_enrollment_(start|end)_date$/) {
+                $output .= '<td>'.
+                    &Apache::lonhtmlcommon::date_setter('envform',
+                                                        $parameter.'_value',
+                                                        $values{$parameter},
+                                                        $onchange).
+                                                        '</td>';
+            } else {
+                $output .= '<td>'.
+                    &Apache::lonhtmlcommon::textbox($parameter.'_value',
+                                                    $values{$parameter},
+                                                    40,$onchange).'</td>';
+            }
+            $output .= '<td>'.
+                &Apache::lonhtmlcommon::checkbox($parameter.'_setparmval').
+                '</td>';
+            $output .= "</tr>\n";
 	}
         my $onchange = 'onFocus="javascript:window.document.forms'.
             '[\'envform\'].elements[\'newp_setparmval\']'.
@@ -1594,12 +1644,13 @@ sub handler {
     }
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
 
-    $r->content_type('text/html');
-    $r->send_http_header;
 # ----------------------------------------------------- Needs to be in a course
 
     if (($ENV{'request.course.id'}) && 
 	(&Apache::lonnet::allowed('opa',$ENV{'request.course.id'}))) {
+
+        $r->content_type('text/html');
+        $r->send_http_header;
  
         $coursename=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};