--- loncom/interface/lonparmset.pm	2022/07/08 16:12:50	1.522.2.28.4.7
+++ loncom/interface/lonparmset.pm	2023/07/06 19:24:31	1.522.2.28.4.10
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.522.2.28.4.7 2022/07/08 16:12:50 raeburn Exp $
+# $Id: lonparmset.pm,v 1.522.2.28.4.10 2023/07/06 19:24:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1183,6 +1183,8 @@ END
 }
 
 sub done_proctor_js {
+    my $defaultdone = &mt('Done');
+    &js_escape(\$defaultdone);
     return <<"END";
 function toggleSecret(form,radio,key) {
     var radios = form[radio+key];
@@ -1199,6 +1201,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';
+                        }
+                    }
+                }
             }
         }
     }
@@ -1397,7 +1408,7 @@ sub print_row {
                 $extra = 'ltid_'.$domltistr;
             }
         }
-        my %courselti = &Apache::lonnet::get_course_lti($cnum,$cdom);
+        my %courselti = &Apache::lonnet::get_course_lti($cnum,$cdom,'provider');
         if (keys(%courselti)) {
             foreach my $item (sort { $a <=> $b } keys(%courselti)) {
                 if (($item =~ /^\d+$/) && (ref($courselti{$item}) eq 'HASH')) {
@@ -1629,23 +1640,27 @@ sub extractResourceInformation {
         my $srcf=$resource->src();
         $srcf=~/\.(\w+)$/;
         $$typep{$id}=$1;
+        my $toolsymb;
+        if ($srcf =~ /ext\.tool$/) {
+            $toolsymb = $resource->symb();
+        }
         $$keyp{$id}='';
         $$uris{$id}=$srcf;
 
-        foreach my $key (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys'))) {
+        foreach my $key (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys',$toolsymb))) {
             next if ($key!~/^parameter_/);
 
 # Hidden parameters
-            next if (&Apache::lonnet::metadata($srcf,$key.'.hidden') eq 'parm');
+            next if (&Apache::lonnet::metadata($srcf,$key.'.hidden',$toolsymb) eq 'parm');
 #
 # allparms is a hash of parameter names
 #
-            my $name=&Apache::lonnet::metadata($srcf,$key.'.name');
+            my $name=&Apache::lonnet::metadata($srcf,$key.'.name',$toolsymb);
             if (!exists($$allparms{$name}) || $$allparms{$name} =~ m/^\s*$/ ) {
                 my ($display,$parmdis);
                 $display = &standard_parameter_names($name);
                 if ($display eq '') {
-                    $display= &Apache::lonnet::metadata($srcf,$key.'.display');
+                    $display= &Apache::lonnet::metadata($srcf,$key.'.display',$toolsymb);
                     $parmdis = $display;
                     $parmdis =~ s/\s*\[Part.*$//g;
                 } else {
@@ -1654,14 +1669,14 @@ sub extractResourceInformation {
                 $$allparms{$name}=$parmdis;
                 if (ref($defkeytype)) {
                     $$defkeytype{$name}=
-                    &Apache::lonnet::metadata($srcf,$key.'.type');
+                    &Apache::lonnet::metadata($srcf,$key.'.type',$toolsymb);
                 }
             }
 
 #
 # allparts is a hash of all parts
 #
-            my $part= &Apache::lonnet::metadata($srcf,$key.'.part');
+            my $part= &Apache::lonnet::metadata($srcf,$key.'.part',$toolsymb);
             $$allparts{$part} = &mt('Part: [_1]',$part);
 #
 # Remember all keys going with this resource
@@ -2182,7 +2197,7 @@ sub displaymenu {
 }
 
 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=[];
@@ -2230,7 +2245,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 =
@@ -2918,7 +2937,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);
@@ -3124,20 +3143,24 @@ ENDTABLEHEADFOUR
                     my %type=   ();
                     my %default=();
                     my $uri=&Apache::lonnet::declutter($uris{$rid});
+                    my $toolsymb;
+                    if ($uri =~ /ext\.tool$/) {
+                        $toolsymb = $symbp{$rid};
+                    }
 
                     my $filter=$env{'form.filter'};
                     foreach (&keysplit($keyp{$rid})) {
                         my $tempkeyp = $_;
                         if (grep $_ eq $tempkeyp, @catmarker) {
-                          my $parmname=&Apache::lonnet::metadata($uri,$_.'.name');
+                          my $parmname=&Apache::lonnet::metadata($uri,$_.'.name',$toolsymb);
 # We may only want certain parameters listed
                           if ($filter) {
                              unless ($filter=~/\Q$parmname\E/) { next; }
                           }
                           $name{$_}=$parmname;
-                          $part{$_}=&Apache::lonnet::metadata($uri,$_.'.part');
+                          $part{$_}=&Apache::lonnet::metadata($uri,$_.'.part',$toolsymb);
 
-                          my $parmdis=&Apache::lonnet::metadata($uri,$_.'.display');
+                          my $parmdis=&Apache::lonnet::metadata($uri,$_.'.display',$toolsymb);
                           if ($allparms{$name{$_}} ne '') {
                               my $identifier;
                               if ($parmdis =~ /(\s*\[Part.*)$/) {
@@ -3149,9 +3172,9 @@ ENDTABLEHEADFOUR
                           }
                           unless ($display{$_}) { $display{$_}=''; }
                           $display{$_}.=' ('.$name{$_}.')';
-                          $default{$_}=&Apache::lonnet::metadata($uri,$_);
-                          $type{$_}=&Apache::lonnet::metadata($uri,$_.'.type');
-                          $thistitle=&Apache::lonnet::metadata($uri,$_.'.title');
+                          $default{$_}=&Apache::lonnet::metadata($uri,$_,$toolsymb);
+                          $type{$_}=&Apache::lonnet::metadata($uri,$_.'.type',$toolsymb);
+                          $thistitle=&Apache::lonnet::metadata($uri,$_.'.title',$toolsymb);
                         }
                     }
                     my $totalparms=scalar keys %name;
@@ -3214,7 +3237,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
@@ -3236,6 +3259,10 @@ ENDTABLEHEADFOUR
 
                      if ($map eq $mapid) {
                         my $uri=&Apache::lonnet::declutter($uris{$rid});
+                        my $toolsymb;
+                        if ($uri =~ /ext\.tool$/) {
+                            $toolsymb = $symbp{$rid};
+                        }
 #                    $r->print("Keys: $keyp{$rid} <br />\n");
 
 #--------------------------------------------------------------------
@@ -3252,8 +3279,8 @@ ENDTABLEHEADFOUR
 
                               if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
                                 $part{$tempkeyp}="0";
-                                $name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');
-                                my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
+                                $name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name',$toolsymb);
+                                my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display',$toolsymb);
                                 if ($allparms{$name{$tempkeyp}} ne '') {
                                     my $identifier;
                                     if ($parmdis =~ /(\s*\[Part.*)$/) {
@@ -3266,8 +3293,8 @@ ENDTABLEHEADFOUR
                                 unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
                                 $display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
                                 $display{$tempkeyp} =~ s/_\w+_/_0_/;
-                                $default{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp);
-                                $type{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.type');
+                                $default{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp,$toolsymb);
+                                $type{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.type',$toolsymb);
                               }
                         } # end loop through keys
                       }
@@ -3341,6 +3368,10 @@ ENDTABLEHEADFOUR
                 my $rid = $_;
 
                 my $uri=&Apache::lonnet::declutter($uris{$rid});
+                my $toolsymb;
+                if ($uri =~ /ext\.tool$/) {
+                    $toolsymb = $symbp{$rid};
+                }
 
 #--------------------------------------------------------------------
 # @catmarker contains list of all possible parameters including part #s
@@ -3355,8 +3386,8 @@ ENDTABLEHEADFOUR
                       $tempkeyp =~ s/_\w+_/_0_/;
                       if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
                         $part{$tempkeyp}="0";
-                        $name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');
-                        my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
+                        $name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name',$toolsymb);
+                        my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display',$toolsymb);
                         if ($allparms{$name{$tempkeyp}} ne '') {
                             my $identifier;
                             if ($parmdis =~ /(\s*\[Part.*)$/) {
@@ -3369,8 +3400,8 @@ ENDTABLEHEADFOUR
                         unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
                         $display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
                         $display{$tempkeyp} =~ s/_\w+_/_0_/;
-                        $default{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp);
-                        $type{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.type');
+                        $default{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp,$toolsymb);
+                        $type{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.type',$toolsymb);
                       }
                 } # end loop through keys
             } # end loop through ids
@@ -3672,7 +3703,7 @@ sub parse_listdata_key {
 }
 
 sub listdata {
-    my ($r,$resourcedata,$listdata,$sortorder,$caller,$classlist,$readonly)=@_;
+    my ($r,$resourcedata,$listdata,$sortorder,$caller,$classlist,$readonly,$parmlev)=@_;
 # Start list output
 
     my $oldsection='';
@@ -3784,6 +3815,7 @@ sub listdata {
         $realm='<span class="LC_parm_scope_folder">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <br /><span class="LC_parm_folder">('.$1.')</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: '.$id.')</span></span>';
         }
         if ($sortorder eq 'realmstudent') {
@@ -3889,6 +3921,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);
@@ -3896,6 +3933,7 @@ sub date_interval_selector {
     if ($pname eq 'interval') {
         unless ($skipval{'done'}) {
             my $checkedon = '';
+            my $checkedoff = '';
             my $checkedproc = '';
             my $currproctorkey = '';
             my $currprocdisplay = 'hidden';
@@ -3903,22 +3941,22 @@ sub date_interval_selector {
             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;
@@ -3935,7 +3973,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" value="'.
+                       &HTML::Entities::encode($currdonetext,'"<>&').'"'.$disabled.' /></span>';
         }
     }
     unless ($readonly) {
@@ -3948,15 +3987,36 @@ sub date_interval_selector {
 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$/) &&
+            (($env{'form.done_'.$key} eq '_done') || ($env{'form.done_'.$key} eq '_done_proctor'))) {
+        if ($env{'form.done_'.$key.'_buttontext'}) {
+            $env{'form.done_'.$key.'_buttontext'} =~ s/\://g;
+            $seconds .= '_done:'.$env{'form.done_'.$key.'_buttontext'}.':';
+            if ($env{'form.done_'.$key} eq '_done_proctor') {
+                $seconds .= '_proctor';
+            }
+        } else {
+            $seconds .= $env{'form.done_'.$key};
+        }
+        if (($env{'form.done_'.$key} eq '_done_proctor') &&
+                ($env{'form.done_'.$key.'_proctorkey'})) {
+            $seconds .= '_'.$env{'form.done_'.$key.'_proctorkey'};
+        }
     }
+    return if (!$numnotnull);
     return $seconds;
 }
 
@@ -4117,7 +4177,8 @@ sub string_deeplink_selector {
     }
     my %courselti =
         &Apache::lonnet::get_course_lti($env{'course.'.$env{'request.course.id'}.'.num'},
-                                        $env{'course.'.$env{'request.course.id'}.'.domain'});
+                                        $env{'course.'.$env{'request.course.id'}.'.domain'},
+                                        'provider');
     foreach my $item (keys(%courselti)) {
         if (ref($courselti{$item}) eq 'HASH') {
             $crslti{$item} = $courselti{$item}{'name'};
@@ -4641,10 +4702,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>');
@@ -4707,7 +4766,7 @@ ENDOVER
 
 # List data
 
-        &listdata($r,$resourcedata,$listdata,$sortorder,'newoverview',undef,$readonly);
+        &listdata($r,$resourcedata,$listdata,$sortorder,'newoverview',undef,$readonly,$parmlev);
     }
     $r->print(&tableend());
     unless ($readonly) {
@@ -5881,7 +5940,11 @@ sub parm_change_log {
                     $parmitem = &mt($parmitem);
             $output .= &mt('Type: [_1]',$parmitem);
         } else {
-            my ($level,@all)=&parmval_by_symb($what,$middle,&Apache::lonnet::metadata($middle,$what),
+            my $toolsymb;
+            if ($middle =~ /ext\.tool$/) {
+                $toolsymb = $middle;
+            }
+            my ($level,@all)=&parmval_by_symb($what,$middle,&Apache::lonnet::metadata($middle,$what,$toolsymb),
                               $uname,$udom,$issection,$issection,$courseopt);
                     my $showvalue = $value;
                     if ($istype{$parmname} eq '') {