--- loncom/interface/lonparmset.pm	2019/02/18 13:25:49	1.589
+++ loncom/interface/lonparmset.pm	2020/02/10 02:11:46	1.594
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.589 2019/02/18 13:25:49 raeburn Exp $
+# $Id: lonparmset.pm,v 1.594 2020/02/10 02:11:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -976,7 +976,6 @@ sub storeparm_by_symb_inner {
 #
 # @param {string} $value - the parameter value
 # @param {string} $type - the parameter type
-# @param {string} $name - the parameter name (unused)
 # @param {boolean} $editable - Set to true to get an icon when no value is defined.
 sub valout {
     my ($value,$type,$name,$editable)=@_;
@@ -1071,8 +1070,12 @@ sub plink {
     my ($type,$dis,$value,$marker,$return,$call,$recursive,$extra)=@_;
     my $winvalue=$value;
     unless ($winvalue) {
-        if ((&isdateparm($type) || (&is_specialstring($type))) {
+        if (&isdateparm($type) || (&is_specialstring($type))) {
             $winvalue=$env{'form.recent_'.$type};
+        } elsif ($type eq 'string_yesno') {
+            if ($env{'form.recent_string'} =~ /^(yes|no)$/i) {
+                $winvalue=$env{'form.recent_string'};
+            }
         } else {
             $winvalue=$env{'form.recent_'.(split(/\_/,$type))[0]};
         }
@@ -1080,7 +1083,7 @@ sub plink {
     my ($parmname)=((split(/\&/,$marker))[1]=~/\_([^\_]+)$/);
     my ($hour,$min,$sec,$val)=&preset_defaults($parmname);
     unless (defined($winvalue)) { $winvalue=$val; }
-    my $valout = &valout($value,$type,$parmname,1);
+    my $valout = &valout($value,$type,1);
     my $unencmarker = $marker;
     foreach my $item (\$type, \$dis, \$winvalue, \$marker, \$return, \$call,
               \$hour, \$min, \$sec, \$extra) {
@@ -1108,14 +1111,14 @@ sub page_js {
     $pjump_def
 
     function psub() {
-        var specstring = /^string_/i;
+        var specstring = /^string_!(yesno|any)/i;
         if (document.parmform.pres_marker.value!='') {
             document.parmform.action+='#'+document.parmform.pres_marker.value;
             var typedef=new Array();
             typedef=document.parmform.pres_type.value.split('_');
             if (document.parmform.pres_type.value!='') {
                 if ((typedef[0]=='date') || 
-                    (specstring.test(document.parmform.pres_type.value) && (typedef[1]!='yesno')))  {
+                    (specstring.test(document.parmform.pres_type.value)))  {
                     eval('document.parmform.recent_'+
                         document.parmform.pres_type.value+
                         '.value=document.parmform.pres_value.value;');
@@ -1712,13 +1715,13 @@ sub print_row {
             }
         }
         my ($parmname)=($thismarker=~/\_([^\_]+)$/);
-        $effective_parm = &valout($recursinfo->[0],$recursinfo->[1],$parmname);
+        $effective_parm = &valout($recursinfo->[0],$recursinfo->[1]);
         $r->print('<td style="background-color:#CCCCFF;" align="center">'.$effective_parm.
                   '<br /><span class="LC_parm_recursive">'.$rectitle.'&nbsp;'.
                   $effparm_level.'</span></td>');
     } else {
         if ($result) {
-            $effective_parm = &valout($outpar[$result],$typeoutpar[$result],$parmname);
+            $effective_parm = &valout($outpar[$result],$typeoutpar[$result]);
         }
         if ($eff_groupparm) {
             $effective_parm = $eff_groupparm;
@@ -1735,7 +1738,7 @@ sub print_row {
             $sessionvaltype=$$defaulttype{$which};
         }
         $r->print('<td style="background-color:#999999;" align="center"><font color="#FFFFFF">'.
-                  &valout($sessionval,$sessionvaltype,$$name{$which}).'&nbsp;'.
+                  &valout($sessionval,$sessionvaltype).'&nbsp;'.
                   '</font></td>');
     }
     $r->print('</tr>');
@@ -1816,7 +1819,7 @@ sub print_td {
     }
     if ($nolink) {
         my ($parmname)=((split(/\&/,$mprefix))[1]=~/\_([^\_]+)$/);
-        $r->print(&valout($currval,$currtype,$parmname));
+        $r->print(&valout($currval,$currtype));
     } else {
         $r->print(&plink($currtype,
                          $$display{$value},$currval,
@@ -1856,7 +1859,7 @@ sub check_other_groups {
         if ($result > 3) {
             $bgcolor = '#AAFFAA';
         }
-        $grp_parm = &valout($coursereply,$resulttype,$parmname);
+        $grp_parm = &valout($coursereply,$resulttype);
         $output = '<td style="background-color:'.$bgcolor.';" align="center">';
         if ($resultgroup && $resultlevel) {
             if ($resultlevel eq 'recursive') {
@@ -2069,7 +2072,7 @@ sub isdateparm {
 
 sub is_specialstring {
     my $type=shift;
-    return (($type=~/^string_/) && ((!$type ne 'string_yesno')));
+    return (($type=~/^string_/) && (($type ne 'string_yesno')));
 }
 
 # Prints the HTML and Javascript to select parameters, with various shortcuts.
@@ -3067,7 +3070,21 @@ sub assessparms {
                         "'".$uname."'","'".$udom."'").
                     '</p>';
                 $uname='';
-                $csec=$env{'form.csec'};
+                if ($env{'request.course.sec'} ne '') {
+                    $csec=$env{'request.course.sec'};
+                } else {
+                    $csec=$env{'form.csec'};
+                }
+                $cgroup=$env{'form.cgroup'};
+            } elsif ($env{'request.course.sec'} ne '') {
+                if ($csec ne $env{'request.course.sec'}) {
+                    $message='<span class="LC_error">'.
+                              &mt("User '[_1]' at domain '[_2]' not in section '[_3]'",
+                                  $uname,$udom,$env{'request.course.sec'}).
+                              '</span>';
+                    $uname='';
+                    $csec=$env{'request.course.sec'};
+                }
                 $cgroup=$env{'form.cgroup'};
             } else {
                 my %name=&Apache::lonnet::userenvironment($udom,$uname,
@@ -4385,6 +4402,7 @@ sub listdata {
     $tableopen=0;
     my $foundkeys=0;
     my %keyorder=&standardkeyorder();
+    my $readonlyall = $readonly;
 
     my ($secidx,%grouphash);
     if (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
@@ -4446,6 +4464,7 @@ sub listdata {
             my ($middle,$part,$name)=
                 ($thiskey=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s\-]+)\.(\w+)$/);
             my $section=&mt('All Students');
+            $readonly = $readonlyall;
             my $showval = $$resourcedata{$thiskey}; 
             if ($middle=~/^\[(.*)\]/) {
                 my $issection=$1;
@@ -5382,9 +5401,10 @@ sub oldversion_warning {
 # @param {integer} $shift - time to shift, in seconds
 # @returns {string} - error name or 'ok'
 sub dateshift {
-    my ($shift)=@_;
+    my ($shift,$numchanges)=@_;
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $sec = $env{'request.course.sec'};
     my %data=&Apache::lonnet::dump('resourcedata',$dom,$crs);
 # ugly retro fix for broken version of types
     foreach my $key (keys(%data)) {
@@ -5399,7 +5419,11 @@ sub dateshift {
 # go through all parameters and look for dates
     foreach my $key (keys(%data)) {
        if ($data{$key.'.type'}=~/^date_(start|end)$/) {
+          if ($sec ne '') {
+              next unless ($key =~ /^$env{'request.course.id'}\.\[$sec\]\./);
+          }
           my $newdate=$data{$key}+$shift;
+          $$numchanges ++;
           $storecontent{$key}=$newdate;
        }
     }
@@ -5811,9 +5835,13 @@ sub date_shift_one {
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
-
+    my $sec = $env{'request.course.sec'};
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
         text=>"Shifting Dates"});
+    my $submit_text = &mt('Shift all dates accordingly');
+    if ($sec ne '') {
+        $submit_text = &mt("Shift all dates set explicitly for section '[_1]', accordingly",$sec);
+    }
     my $start_page=&Apache::loncommon::start_page('Shift Dates');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
     $r->print($start_page.$breadcrumbs);
@@ -5829,7 +5857,7 @@ sub date_shift_one {
               '</td></tr></table>'.
               '<input type="hidden" name="action" value="dateshift2" />'.
               '<input type="hidden" name="timebase" value="'.$env{'form.timebase'}.'" />'.
-              '<input type="submit" value="'.&mt('Shift all dates accordingly').'" /></form>');
+              '<input type="submit" value="'.$submit_text.'" /></form>');
     &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
 }
@@ -5841,6 +5869,7 @@ sub date_shift_two {
     my ($r) = @_;
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $sec = $env{'request.course.sec'};
     my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
         text=>"Shifting Dates"});
@@ -5849,14 +5878,35 @@ sub date_shift_two {
     $r->print($start_page.$breadcrumbs);
     &startSettingsScreen($r,'parmset',$crstype);
     my $timeshifted=&Apache::lonhtmlcommon::get_date_from_form('timeshifted');
-    $r->print('<h2>'.&mt('Shift Dates').'</h2>'.
-              '<p>'.&mt('Shifting all dates such that [_1] becomes [_2]',
-              &Apache::lonlocal::locallocaltime($env{'form.timebase'}),
-              &Apache::lonlocal::locallocaltime($timeshifted)).'</p>');
+    $r->print('<h2>'.&mt('Shift Dates').'</h2>');
+    if ($sec ne '') {
+        $r->print('<p>'.
+                  &mt("Shift all dates set explicitly for section '[_1]', such that [_2] becomes [_3]",
+                      $sec,&Apache::lonlocal::locallocaltime($env{'form.timebase'}),
+                      &Apache::lonlocal::locallocaltime($timeshifted)).
+                  '</p>');
+    } else {
+        $r->print('<p>'.&mt('Shifting all dates such that [_1] becomes [_2]',
+                            &Apache::lonlocal::locallocaltime($env{'form.timebase'}),
+                            &Apache::lonlocal::locallocaltime($timeshifted)).
+                  '</p>');
+    }
     my $delta=$timeshifted-$env{'form.timebase'};
-    &dateshift($delta);
+    my $numchanges = 0;
+    my $result = &dateshift($delta,\$numchanges);
+    if ($result eq 'ok') {
+        $r->print(
+            &Apache::lonhtmlcommon::confirm_success(&mt('Completed shifting of [quant,_1,date setting]',
+                                                    $numchanges)));
+    } elsif ($result eq 'con_delayed') {
+        $r->print(
+            &Apache::lonhtmlcommon::confirm_success(&mt('Queued shifting of [quant,_1,date setting]',
+                                                        $numchanges)));
+    } else {
+        $r->print(
+            &Apache::lonhtmlcommon::confirm_success(&mt('An error occurred attempting to shift dates'),1));
+    }
     $r->print(
-        &Apache::lonhtmlcommon::confirm_success(&mt('Done')).
         '<br /><br />'.
         &Apache::lonhtmlcommon::actionbox(
             ['<a href="/adm/parmset">'.&mt('Content and Problem Settings').'</a>']));