--- loncom/interface/lonparmset.pm	2022/03/23 16:39:47	1.605
+++ loncom/interface/lonparmset.pm	2022/04/30 19:29:43	1.610
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.605 2022/03/23 16:39:47 raeburn Exp $
+# $Id: lonparmset.pm,v 1.610 2022/04/30 19:29:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2074,6 +2074,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;
@@ -2742,8 +2743,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=[];
@@ -2791,7 +2793,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 =
@@ -3033,19 +3039,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.
@@ -3595,13 +3615,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>
@@ -3628,7 +3655,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);
@@ -3708,6 +3735,7 @@ ENDPARMSELSCRIPT
         if ($parm_permission->{'edit'}) {
             undef($readonly); 
         }
+        $r->print('<div id="parmtable"'.$tabledivsty.'>');
 
         if ($parmlev eq 'full') {
 #
@@ -3924,7 +3952,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
@@ -4141,6 +4169,7 @@ ENDMAPONE
                      .'</center>'
             );
         } # end of $parmlev eq general
+        $r->print('</div>');
     }
     $r->print('</form>');
     if ($numreclinks) {
@@ -4678,9 +4707,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
 
@@ -4706,6 +4738,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};
@@ -4715,7 +4761,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   ) {
@@ -4725,7 +4785,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);
             }
@@ -4805,6 +4879,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;
@@ -4821,9 +4901,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: '.
@@ -5929,10 +6010,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>');
@@ -5970,7 +6049,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>');
@@ -5995,7 +6074,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) {
@@ -6102,7 +6189,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').'" />';