--- loncom/interface/lonparmset.pm	2022/01/03 20:08:24	1.603
+++ loncom/interface/lonparmset.pm	2022/05/03 23:46:33	1.612
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.603 2022/01/03 20:08:24 raeburn Exp $
+# $Id: lonparmset.pm,v 1.612 2022/05/03 23:46:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1461,6 +1461,8 @@ END
 
 # Javascript function toggleSecret, for overview mode.
 sub done_proctor_js {
+    my $defaultdone = &mt('Done');
+    &js_escape(\$defaultdone);
     return <<"END";
 function toggleSecret(form,radio,key) {
     var radios = form[radio+key];
@@ -1477,6 +1479,15 @@ function toggleSecret(form,radio,key) {
                         document.getElementById('done_'+key+'_proctorkey').value='';
                     }
                 }
+                if (document.getElementById('done_'+key+'_buttontext')) {
+                    if (radios[i].value == '') {
+                        document.getElementById('done_'+key+'_buttontext').value = '';
+                    } else {
+                        if (document.getElementById('done_'+key+'_buttontext').value == '') {
+                            document.getElementById('done_'+key+'_buttontext').value = '$defaultdone';
+                        }
+                    }
+                }
             }
         }
     }
@@ -1736,13 +1747,11 @@ sub print_row {
         my ($domltistr,$crsltistr);
         my %lti =
             &Apache::lonnet::get_domain_lti($env{'course.'.$env{'request.course.id'}.'.domain'},
-                                            'provider');
+                                            'linkprot');
         if (keys(%lti)) {
             foreach my $item (sort { $a <=> $b }  (keys(%lti))) {
-                if (ref($lti{$item}) eq 'HASH') {
-                    unless ($lti{$item}{'requser'}) {
-                        $domltistr .= $item.':'.&escape(&escape($lti{$item}{'consumer'})).',';
-                    }
+                if (($item =~ /^\d+$/) && (ref($lti{$item}) eq 'HASH')) {
+                    $domltistr .= $item.':'.&escape(&escape($lti{$item}{'name'})).',';
                 }
             }
             $domltistr =~ s/,$//;
@@ -2076,6 +2085,7 @@ sub parm_control_group {
 # @param {hash reference} $uris - hash resource/map id -> resource src
 # @param {hash reference} $keyorder - hash parameter key -> appearance rank for this parameter when looking through every resource and every parameter, starting at 100 (integer)
 # @param {hash reference} $defkeytype - hash parameter name -> parameter type
+# @param {string} $pssymb - resource symb (when a single resource is selected)
 sub extractResourceInformation {
     my $ids = shift;
     my $typep = shift;
@@ -2744,8 +2754,9 @@ sub displaymenu {
 # @param {string} $pschp - selected map pc, or 'all'
 # @param {hash reference} $maptitles - hash map id or src -> map title
 # @param {hash reference} $symbp - hash map pc or resource/map id -> map src.'___(all)' or resource symb
+# @param {string} $parmlev - parameter level (Resource:'full', Map:'map', Course:'general')
 sub mapmenu {
-    my ($r,$allmaps,$pschp,$maptitles,$symbp)=@_;
+    my ($r,$allmaps,$pschp,$maptitles,$symbp,$parmlev)=@_;
     my %allmaps_inverted = reverse %$allmaps;
     my $navmap = Apache::lonnavmaps::navmap->new();
     my $tree=[];
@@ -2793,7 +2804,11 @@ sub mapmenu {
         }
     }
 # Show it ...    
-    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Enclosing Map or Folder'),'','',' id="mapmenu"'));
+    my $rowattr = ' id="mapmenu"';
+    if ($parmlev eq 'general') {
+        $rowattr .= ' style="display:none"';
+    }
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Enclosing Map or Folder'),'','',$rowattr));
     if ((ref($tree) eq 'ARRAY') && (ref($treeinfo) eq 'HASH')) {
         my $icon = '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" />';
         my $whitespace =
@@ -3035,19 +3050,33 @@ sub keysindisplayorder {
 #
 # @param {Apache2::RequestRec} $r - the Apache request
 # @param {string} $sortorder - realmstudent|studentrealm
+# @param {string} $context - newoverview|overview
 sub sortmenu {
-    my ($r,$sortorder)=@_;
-    $r->print('<br /><label><input type="radio" name="sortorder" value="realmstudent"');
-    if ($sortorder eq 'realmstudent') {
-       $r->print(' checked="checked"');
+    my ($r,$sortorder,$context)=@_;
+    my %text;
+    if ($context eq 'newoverview') {
+        %text = &Apache::lonlocal::texthash (
+                   realmstudent => 'Sort by location in course first, then student (group/section)',
+                   studentrealm => 'Sort by student (group/section) first, then location in course',
+        );
+    } else {
+        %text = &Apache::lonlocal::texthash (
+                   realmstudent => 'Sort by realm first, then student (group/section)',
+                   studentrealm => 'Sort by student (group/section) first, then realm',
+        );
     }
-    $r->print(' />'.&mt('Sort by realm first, then student (group/section)'));
-    $r->print('</label><br /><label><input type="radio" name="sortorder" value="studentrealm"');
+    my %sortchecked = (
+       realmstudent => ' checked="checked"',
+       studentrealm => '',
+    );
     if ($sortorder eq 'studentrealm') {
-       $r->print(' checked="checked"');
+        $sortchecked{'studentrealm'} = $sortchecked{'realmstudent'};
+        $sortchecked{'realmstudent'} = '';
+    }
+    foreach my $sorttype ('realmstudent','studentrealm') {
+        $r->print('<br /><label><input type="radio" name="sortorder" value="'.$sorttype.'"'.$sortchecked{$sorttype}.' />'.
+                  $text{$sorttype}.'</label>');
     }
-    $r->print(' />'.&mt('Sort by student (group/section) first, then realm').
-          '</label>');
 }
 
 # Returns a hash parameter key -> order (integer) giving the order for some parameters.
@@ -3394,6 +3423,7 @@ sub assessparms {
         my $chome = $env{'course.'.$env{'request.course.id'}.'.home'};
         my ($got_chostname,$chostname,$cmajor,$cminor);
         my $totalstored = 0;
+        my $totalskippeduser = 0;
         my $now = time;
         for (my $i=0;$i<=$#markers;$i++) {
             my ($needsrelease,$needsnewer,$name,$namematch);
@@ -3402,6 +3432,11 @@ sub assessparms {
             }
             if ($markers[$i] =~ /\&(8|7|6|5)$/) {
                 next if ($noeditgrp);
+            } elsif ($markers[$i] =~ /\&(4|3|2|1)$/) {
+                if ($uname eq '') {
+                    $totalskippeduser ++;
+                    next;
+                }
             }
             if ($markers[$i] =~ /\&(17|11|7|3)$/) {
                 $namematch = 'maplevelrecurse';
@@ -3540,9 +3575,27 @@ sub assessparms {
 # ---------------------------------------------------------------- Done storing
         if ($totalstored) {
             $message.='<p class="LC_warning">'
+                     .&mt('Changes for [quant,_1,parameter] saved.',$totalstored)
+                     .'<br />'
                      .&mt('Changes can take up to 10 minutes before being active for all students.')
                      .&Apache::loncommon::help_open_topic('Caching')
                      .'</p>';
+        } else {
+            $message.='<p class="LC_info">'.&mt('No parameter changes saved.').'</p>';
+        }
+        if ($totalskippeduser) {
+            $message .= '<p class="LC_warning">';
+            if ($uhome eq 'no_host') {
+                $message .= &mt('Changes for [quant,_1,user-specific parameter] not saved because the username or ID was invalid.',
+                                $totalskippeduser);
+            } elsif ($env{'form.userroles'} eq 'any') {
+                $message .= &mt('Changes for [quant,_1,user-specific parameter] not saved because the user does not have a course role.',
+                                $totalskippeduser);
+            } else {
+                $message .= &mt('Changes for [quant,_1,user-specific parameter] not saved because the user is not a student.',
+                                $totalskippeduser);
+            }
+            $message .= '</p>';
         }
     }
 
@@ -3573,13 +3626,20 @@ sub assessparms {
 
     # ----- Start Parameter Selection
 
-    # Hide parm selection?
+    # Hide parm selection and possibly table?
+    my ($tablejs,$tabledivsty);
+    if (((($env{'form.uname'} ne '') || ($env{'form.id'} ne '')) && ($uname eq '')) &&
+        ($env{'form.dis'}) && ($pssymb eq '')) {
+        $tablejs = 'document.getElementById('."'parmtable'".').style.display = "";';
+        $tabledivsty = ' style="display:none"';
+    }
     $r->print(<<ENDPARMSELSCRIPT);
 <script type="text/javascript">
 // <![CDATA[
 function parmsel_show() {
     document.getElementById('parmsel').style.display = "";
     document.getElementById('parmsellink').style.display = "none";
+    $tablejs
 }
 // ]]>
 </script>
@@ -3606,7 +3666,7 @@ ENDPARMSELSCRIPT
         $r->print(&Apache::lonhtmlcommon::start_pick_box(undef,'parmlevel'));
         &levelmenu($r,\%alllevs,$parmlev);
         $r->print(&Apache::lonhtmlcommon::row_closure());
-        &mapmenu($r,\%allmaps,$pschp,\%maptitles, \%symbp);
+        &mapmenu($r,\%allmaps,$pschp,\%maptitles,\%symbp,$parmlev);
         $r->print(&Apache::lonhtmlcommon::row_closure());
         $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));
         &partmenu($r,\%allparts,\@psprt);
@@ -3686,6 +3746,7 @@ ENDPARMSELSCRIPT
         if ($parm_permission->{'edit'}) {
             undef($readonly); 
         }
+        $r->print('<div id="parmtable"'.$tabledivsty.'>');
 
         if ($parmlev eq 'full') {
 #
@@ -3902,7 +3963,7 @@ ENDTABLEHEADFOUR
 
 #-------------------------------------------- for each map, gather information
             my $mapid;
-            foreach $mapid (sort {$maplist{$a} cmp $maplist{$b}} keys(%maplist)) {
+            foreach $mapid (sort { $a <=> $b } keys(%maplist)) {
                 my $maptitle = $maplist{$mapid};
 
 #-----------------------  loop through ids and get all parameter types for map
@@ -4119,6 +4180,7 @@ ENDMAPONE
                      .'</center>'
             );
         } # end of $parmlev eq general
+        $r->print('</div>');
     }
     $r->print('</form>');
     if ($numreclinks) {
@@ -4656,9 +4718,12 @@ sub parse_listdata_key {
 # @param {string} $caller - name of the calling sub (overview|newoverview)
 # @param {hash reference} $classlist - from loncoursedata::get_classlist
 # @param {boolean} $readonly - true if editing not allowed
+# @param {string} $parmlev - full|map
+# @param {hash reference} $hash_for_realm - keys: realm, values: numeric order  
+# @param {string} $pschp - selected map pc, or 'all'
 # @returns{integer} - number of $listdata parameters processed
 sub listdata {
-    my ($r,$resourcedata,$listdata,$sortorder,$caller,$classlist,$readonly)=@_;
+    my ($r,$resourcedata,$listdata,$sortorder,$caller,$classlist,$readonly,$parmlev,$hash_for_realm,$pschp)=@_;
     
 # Start list output
 
@@ -4684,6 +4749,20 @@ sub listdata {
     foreach my $key (sort {
         my ($astudent,$ares,$apart,$aparm) = &parse_listdata_key($a,$listdata);
         my ($bstudent,$bres,$bpart,$bparm) = &parse_listdata_key($b,$listdata);
+        my ($aid,$bid);
+        if ($caller eq 'newoverview') {
+            if (ref($hash_for_realm) eq 'HASH') {
+                if (($parmlev eq 'map') && ($pschp eq 'all')) {
+                    my ($aurl) = ($ares =~ /^(.+\.(?:sequence|page))___\(all\)$/);
+                    my ($burl) = ($bres =~ /^(.+\.(?:sequence|page))___\(all\)$/);
+                    $aid = $hash_for_realm->{$aurl};
+                    $bid = $hash_for_realm->{$burl};
+                } elsif ($parmlev eq 'full') {
+                    $aid = $hash_for_realm->{$ares};
+                    $bid = $hash_for_realm->{$bres};
+                }
+            }
+        }
 
         # get the numerical order for the param
         $aparm=$keyorder{'parameter_0_'.$aparm};
@@ -4693,7 +4772,21 @@ sub listdata {
 
         if ($sortorder eq 'realmstudent') {
             if ($ares     ne $bres    ) {
-                $result = ($ares     cmp $bres);
+                if ($caller eq 'newoverview') {
+                    if (ref($hash_for_realm) eq 'HASH') {
+                        if (($parmlev eq 'map') && ($pschp eq 'all')) {
+                            $result = ($aid <=> $bid);
+                        } elsif ($parmlev eq 'full') {
+                            $result = ($aid <=> $bid);
+                        } else {
+                            $result = ($ares cmp $bres);
+                        }
+                    } else {
+                        $result = ($ares cmp $bres);
+                    }
+                } else {
+                    $result = ($ares cmp $bres);
+                }
             } elsif ($astudent ne $bstudent) {
                 $result = ($astudent cmp $bstudent);
             } elsif ($apart    ne $bpart   ) {
@@ -4703,7 +4796,21 @@ sub listdata {
             if      ($astudent ne $bstudent) {
                 $result = ($astudent cmp $bstudent);
             } elsif ($ares     ne $bres    ) {
-                $result = ($ares     cmp $bres);
+                if ($caller eq 'newoverview') {
+                    if (ref($hash_for_realm) eq 'HASH') {
+                        if (($parmlev eq 'map') && ($pschp eq 'all')) {
+                            $result = ($aid <=> $bid);
+                        } elsif ($parmlev eq 'full') {
+                            $result = ($aid <=> $bid);
+                        } else {
+                            $result = ($ares cmp $bres);
+                        }
+                    } else {
+                        $result = ($ares cmp $bres);
+                    }
+                } else {
+                    $result = ($ares cmp $bres);
+                }
             } elsif ($apart    ne $bpart   ) {
                 $result = ($apart    cmp $bpart);
             }
@@ -4783,6 +4890,12 @@ sub listdata {
             }
             if ($is_map) {
                 my $leveltitle = &mt('Folder/Map');
+                my $title = &Apache::lonnet::gettitle($1);
+                if (ref($hash_for_realm) eq 'HASH') {
+                    if ($hash_for_realm->{$mapurl} eq '1') {
+                        $title = &mt('Main Content');
+                    }
+                }
                 unless (($name eq 'hiddenresource') || ($name eq 'encrypturl')) {   
                     if ($caller eq 'newoverview') {
                         my $altkey = $thiskey;
@@ -4799,9 +4912,10 @@ sub listdata {
                         $is_recursive = 1;
                     }
                 }
-                $realm='<span class="LC_parm_scope_folder">'.$leveltitle.': '.&Apache::lonnet::gettitle($mapurl).' <br /><span class="LC_parm_folder">('.$mapurl.')</span></span>';
+                $realm='<span class="LC_parm_scope_folder">'.$leveltitle.': '.$title.' <br /><span class="LC_parm_folder">('.$mapurl.')</span></span>';
             } elsif ($middle) {
                 my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
+                next if (($url =~ /\.(page|sequence)$/) && ($parmlev eq 'full') && ($caller eq 'newoverview'));
                 $realm='<span class="LC_parm_scope_resource">'.&mt('Resource').
                     ': '.&Apache::lonnet::gettitle($middle).
                     ' <br /><span class="LC_parm_symb">('.$url.' in '.$map.' id: '.
@@ -4923,13 +5037,17 @@ sub listdata {
 sub get_date_interval_from_form {
     my ($key) = @_;
     my $seconds = 0;
+    my $numnotnull = 0;
     foreach my $which (['days', 86400],
                ['hours', 3600],
                ['minutes', 60],
                ['seconds',  1]) {
         my ($name, $factor) = @{ $which };
         if (defined($env{'form.'.$name.'_'.$key})) {
-            $seconds += $env{'form.'.$name.'_'.$key} * $factor;
+            unless ($env{'form.'.$name.'_'.$key} eq '') {
+                $numnotnull ++;
+                $seconds += $env{'form.'.$name.'_'.$key} * $factor;
+            }
         }
     }
     if (($key =~ /\.interval$/) &&
@@ -4948,6 +5066,7 @@ sub get_date_interval_from_form {
             $seconds .= '_'.$env{'form.done_'.$key.'_proctorkey'};
         }
     }
+    return if (!$numnotnull);
     return $seconds;
 }
 
@@ -5111,12 +5230,10 @@ sub string_deeplink_selector {
     }
     my %lti =
         &Apache::lonnet::get_domain_lti($env{'course.'.$env{'request.course.id'}.'.domain'},
-                                        'provider');
+                                        'linkprot');
     foreach my $item (keys(%lti)) {
-        if (ref($lti{$item}) eq 'HASH') {
-            unless ($lti{$item}{'requser'}) {
-                $domlti{$item} = $lti{$item}{'consumer'};
-            }
+        if (($item =~ /^\d+$/) && (ref($lti{$item}) eq 'HASH')) {
+            $domlti{$item} = $lti{$item}{'name'};
         }
     }
     if ($env{'course.'.$env{'request.course.id'}.'.menucollections'}) {
@@ -5610,6 +5727,11 @@ sub date_interval_selector {
         $showval  %= $factor;
         my %select = ((map {$_ => $_} (0..$max)),
                 'select_form_order' => [0..$max]);
+        if ($currval eq '') {
+            unshift(@{$select{'select_form_order'}},'');
+            $select{''} = '';
+            $amount = '';
+        }
         $result .= &Apache::loncommon::select_form($amount,$name.'_'.$thiskey,
                             \%select,'',$readonly);
         $result .= ' '.&mt($name);
@@ -5617,29 +5739,29 @@ sub date_interval_selector {
     if ($name eq 'interval') {
         unless ($skipval{'done'}) {
             my $checkedon = '';
+            my $checkedoff = '';
             my $checkedproc = '';
             my $currproctorkey = '';
             my $currprocdisplay = 'hidden';
             my $currdonetext = &mt('Done');
-            my $checkedoff = ' checked="checked"';
             if ($currval =~ /^(?:\d+)_done$/) {
                 $checkedon = ' checked="checked"';
-                $checkedoff = '';
             } elsif ($currval =~ /^(?:\d+)_done\:([^\:]+)\:$/) {
                 $currdonetext = $1;
                 $checkedon = ' checked="checked"';
-                $checkedoff = '';
             } elsif ($currval =~ /^(?:\d+)_done_proctor_(.+)$/) {
                 $currproctorkey = $1;
                 $checkedproc = ' checked="checked"';
-                $checkedoff = '';
                 $currprocdisplay = 'text';
             } elsif ($currval =~ /^(?:\d+)_done\:([^\:]+)\:_proctor_(.+)$/) {
                 $currdonetext = $1;
                 $currproctorkey = $2;
                 $checkedproc = ' checked="checked"';
-                $checkedoff = '';
                 $currprocdisplay = 'text';
+            } elsif ($currval ne '') {
+                $checkedoff = ' checked="checked"';
+            } else {
+                $currdonetext = '';
             }
             my $onclick = ' onclick="toggleSecret(this.form,'."'done_','$thiskey'".');"';
             my $disabled;
@@ -5656,7 +5778,8 @@ sub date_interval_selector {
                        '<input type="'.$currprocdisplay.'" id="done_'.$thiskey.'_proctorkey" '.
                        'name="done_'.$thiskey.'_proctorkey" value="'.&HTML::Entities::encode($currproctorkey,'"<>&').'"'.$disabled.' /></span><br />'.
                        '<span class="LC_nobreak">'.&mt('Button text').': '.
-                       '<input type="text" name="done_'.$thiskey.'_buttontext" value="'.&HTML::Entities::encode($currdonetext,'"<>&').'"'.$disabled.' /></span>';
+                       '<input type="text" name="done_'.$thiskey.'_buttontext" id="done_'.$thiskey.'_buttontext" value="'.
+                       &HTML::Entities::encode($currdonetext,'"<>&').'"'.$disabled.' /></span>';
         }
     }
     unless ($readonly) {
@@ -5909,10 +6032,8 @@ ENDOVER
     $r->print('<div>');
     $r->print(&Apache::lonhtmlcommon::start_pick_box(undef,'parmlevel'));
     &levelmenu($r,\%alllevs,$parmlev);
-    if ($parmlev ne 'general') {
-        $r->print(&Apache::lonhtmlcommon::row_closure());
-        &mapmenu($r,\%allmaps,$pschp,\%maptitles,\%symbp);
-    }
+    $r->print(&Apache::lonhtmlcommon::row_closure());
+    &mapmenu($r,\%allmaps,$pschp,\%maptitles,\%symbp,$parmlev);
     $r->print(&Apache::lonhtmlcommon::row_closure(1));
     $r->print(&Apache::lonhtmlcommon::end_pick_box());
     $r->print('</div></div>');
@@ -5950,7 +6071,7 @@ ENDOVER
     $r->print('<div>');
     my $sortorder=$env{'form.sortorder'};
     unless ($sortorder) { $sortorder='realmstudent'; }
-    &sortmenu($r,$sortorder);
+    &sortmenu($r,$sortorder,'newoverview');
     $r->print('</div></div>');
 
     $r->print('<p><input type="submit" name="dis" value="'.&mt('Display').'" /></p>');
@@ -5975,7 +6096,15 @@ ENDOVER
 
 # List data
 
-        &listdata($r,$resourcedata,$listdata,$sortorder,'newoverview',undef,$readonly);
+        my $hash_for_realm;
+        if (($parmlev eq 'map') && (keys(%allmaps))) {
+            %{$hash_for_realm} = reverse(%allmaps);
+        } elsif (($parmlev eq 'full') && (keys(%symbp))) {
+            for (my $i=0; $i<@ids; $i++) {
+                $hash_for_realm->{$symbp{$ids[$i]}} = $i;
+            }
+        }
+        &listdata($r,$resourcedata,$listdata,$sortorder,'newoverview',undef,$readonly,$parmlev,$hash_for_realm,$pschp);
     }
     $r->print(&tableend());
     unless ($readonly) {
@@ -6082,7 +6211,7 @@ sub overview {
 
     my $sortorder=$env{'form.sortorder'};
     unless ($sortorder) { $sortorder='realmstudent'; }
-    &sortmenu($r,$sortorder);
+    &sortmenu($r,$sortorder,'overview');
 
     my $submitbutton = '<input type="submit" value="'.&mt('Save').'" />';