--- loncom/interface/lonparmset.pm 2021/08/12 20:43:26 1.602 +++ loncom/interface/lonparmset.pm 2025/07/02 16:33:51 1.626 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set parameters for assessments # -# $Id: lonparmset.pm,v 1.602 2021/08/12 20:43:26 raeburn Exp $ +# $Id: lonparmset.pm,v 1.626 2025/07/02 16:33:51 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -329,6 +329,8 @@ use Apache::lonnavmaps; use Apache::longroup; use Apache::lonrss; use HTML::Entities; +use POSIX qw (floor); +use Text::Wrap(); use LONCAPA qw(:DEFAULT :match); @@ -991,55 +993,46 @@ sub valout { $result=' '; } } else { - if ($type eq 'date_interval') { - my ($totalsecs,$donesuffix) = split(/_/,$value,2); - my ($usesdone,$donebuttontext,$proctor,$secretkey); - if ($donesuffix =~ /^done\:([^\:]+)\:(.*)$/) { - $donebuttontext = $1; - (undef,$proctor,$secretkey) = split(/_/,$2); - $usesdone = 'done'; - } elsif ($donesuffix =~ /^done(|_.+)$/) { - $donebuttontext = &mt('Done'); - ($usesdone,$proctor,$secretkey) = split(/_/,$donesuffix); - } - my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($totalsecs); - my @timer; - $year=$year-70; - $mday--; - if ($year) { -# $result.=&mt('[quant,_1,yr]',$year).' '; - push(@timer,&mt('[quant,_1,yr]',$year)); - } - if ($mon) { -# $result.=&mt('[quant,_1,mth]',$mon).' '; - push(@timer,&mt('[quant,_1,mth]',$mon)); - } - if ($mday) { -# $result.=&mt('[quant,_1,day]',$mday).' '; - push(@timer,&mt('[quant,_1,day]',$mday)); - } - if ($hour) { -# $result.=&mt('[quant,_1,hr]',$hour).' '; - push(@timer,&mt('[quant,_1,hr]',$hour)); - } - if ($min) { -# $result.=&mt('[quant,_1,min]',$min).' '; - push(@timer,&mt('[quant,_1,min]',$min)); - } - if ($sec) { -# $result.=&mt('[quant,_1,sec]',$sec).' '; - push(@timer,&mt('[quant,_1,sec]',$sec)); - } -# $result=~s/\s+$//; - if (!@timer) { # Special case: all entries 0 -> display "0 secs" intead of empty field to keep this field editable - push(@timer,&mt('[quant,_1,sec]',0)); - } - $result.=join(", ",@timer); - if ($usesdone eq 'done') { - if ($secretkey) { - $result .= ' '.&mt('+ "[_1]" with proctor key: [_2]',$donebuttontext,$secretkey); + if (($type eq 'date_interval') || ($type eq 'string_grace')) { + if ($type eq 'string_grace') { + my @items; + if ($value =~ /,/) { + @items = split(/,/,$value); } else { - $result .= ' + "'.$donebuttontext.'"'; + @items = ($value); + } + foreach my $item (@items) { + if ($item =~ /^\d+:(0|1)\.?\d*:(0|1)$/) { + my ($totalsecs,$fraction,$grad) = split(/:/,$item); + $result .= &grace_to_humanstr($totalsecs); + if (($fraction >=0) && ($fraction <=1)) { + $result .= ' | '.$fraction.' '.&mt('pts'); + if ($grad == 1) { + $result .= ' ('.&mt('gradual').')'; + } + } + $result .= ', '; + } + } + $result =~ s/, $//; + } else { + my ($totalsecs,$donesuffix) = split(/_/,$value,2); + $result = &interval_to_humanstr($totalsecs); + my ($usesdone,$donebuttontext,$proctor,$secretkey); + if ($donesuffix =~ /^done\:([^\:]+)\:(.*)$/) { + $donebuttontext = $1; + (undef,$proctor,$secretkey) = split(/_/,$2); + $usesdone = 'done'; + } elsif ($donesuffix =~ /^done(|_.+)$/) { + $donebuttontext = &mt('Done'); + ($usesdone,$proctor,$secretkey) = split(/_/,$donesuffix); + } + if ($usesdone eq 'done') { + if ($secretkey) { + $result .= ' '.&mt('+ "[_1]" with proctor key: [_2]',$donebuttontext,$secretkey); + } else { + $result .= ' + "'.$donebuttontext.'"'; + } } } } elsif (&isdateparm($type)) { @@ -1054,6 +1047,64 @@ sub valout { return $result; } +sub interval_to_humanstr { + my ($totalsecs) = @_; + my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($totalsecs); + my @timer; + $year=$year-70; + $mday--; + if ($year) { + push(@timer,&mt('[quant,_1,yr]',$year)); + } + if ($mon) { + push(@timer,&mt('[quant,_1,mth]',$mon)); + } + if ($mday) { + push(@timer,&mt('[quant,_1,day]',$mday)); + } + if ($hour) { + push(@timer,&mt('[quant,_1,hr]',$hour)); + } + if ($min) { + push(@timer,&mt('[quant,_1,min]',$min)); + } + if ($sec) { + push(@timer,&mt('[quant,_1,sec]',$sec)); + } + if (!@timer) { # Special case: all entries 0 -> display "0 secs" intead of empty field to keep this field editable + push(@timer,&mt('[quant,_1,sec]',0)); + } + return ''.join(', ',@timer).''; +} + +sub grace_to_humanstr { + my ($totalsecs) = @_; + my @timer; + my $weeks = floor($totalsecs/604800); + $totalsecs -= $weeks*604800; + my $days = floor($totalsecs/86400); + $totalsecs -= $days*86400; + my $hours = floor($totalsecs/3600); + $totalsecs -= $hours*3600; + my $mins= floor($totalsecs/60); + $totalsecs -= $mins*60; + if ($weeks) { + push(@timer,&mt('[quant,_1,wk]',$weeks)); + } + if ($days) { + push(@timer,&mt('[quant,_1,day]',$days)); + } + if ($hours) { + push(@timer,&mt('[quant,_1,hr]',$hours)); + } + if ($mins) { + push(@timer,&mt('[quant,_1,min]',$mins)); + } + if (!@timer) { # Special case: all entries 0 -> display "0 mins" intead of empty field to keep this field editable + push(@timer,&mt('[quant,_1,min]',0)); + } + return ''.join(', ',@timer).''; +} # Returns HTML containing a link on a parameter value, for table mode. # The link uses the javascript function 'pjump'. @@ -1234,16 +1285,35 @@ ENDSCRIPT # Javascript function validateParms, for overview mode sub validateparms_js { - return <<'ENDSCRIPT'; + my %lt = &Apache::lonlocal::texthash ( + nodom => "A link type of 'domain LTI launch' was selected but no domain LTI launcher was selected.", + nocrs => "A link type of 'course LTI launch' was selected but no course LTI launcher was selected.", + plss => 'Please select one, or choose a different supported link type.', + disa => 'disallowed character(s) removed from deeplink key.', + nokyr => "A link type of 'deep with key' was selected but the key value was blank, after removing disallowed characters.", + plse => 'Please enter a key using one or more of:', + nokey => "A link type of 'deep with key' was selected but the key value was blank.", + plsk => 'Please enter a key.', + dise => 'disallowed character(s) removed from Exit Button text.', + exit => "An exit link type of 'In use' was selected but the button text value was blank, after removing disallowed characters.", + disc => 'Disallowed characters are ', + notxt => "An exit link type of 'In use' was selected but the button text value was blank.", + plst => 'Please enter the text to use.', + gppc => 'Grace Period Past-Due: enter partial credit (number between 0 and 1.0).', + gpsn => 'Grace Period Past-Due: select a number in at least one of the time past due select boxes, or delete the value for partial credit.', + ); + &js_escape(\%lt); + return <<"ENDSCRIPT"; function validateParms() { var textRegExp = /^settext_/; - var tailLenient = /\.lenient$/; - var patternRelWeight = /^\-?[\d.]+$/; - var patternLenientStd = /^(yes|no|default)$/; + var tailLenient = /\\.lenient\$/; + var patternRelWeight = /^\\-?[\\d.]+\$/; + var patternLenientStd = /^(yes|no|default)\$/; var ipRegExp = /^setip/; var ipallowRegExp = /^setipallow_/; var ipdenyRegExp = /^setipdeny_/; + var graceRegExp = /^setgrace_/; var deeplinkRegExp = /^deeplink_/; var dlListScopeRegExp = /^deeplink_(state|others|listing|scope)_/; var dlLinkProtectRegExp = /^deeplink_protect_/; @@ -1252,10 +1322,15 @@ function validateParms() { var dlKeyRegExp = /^deeplink_key_/; var dlMenusRegExp = /^deeplink_menus_/; var dlCollsRegExp = /^deeplink_colls_/; - var patternIP = /[\[\]\*\.a-zA-Z\d\-]+/; - if ((document.parmform.elements.length != 'undefined') && (document.parmform.elements.length) != 'null') { - if (document.parmform.elements.length) { - for (i=0; i 0) { var possdeeplink = document.parmform.elements[i].options[idx].value - possdeeplink = possdeeplink.replace(/^\s+|\s+$/g,''); + possdeeplink = possdeeplink.replace(/^\s+|\s+\$/g,''); if (document.parmform.elements['set_'+identifier].value) { possdeeplink = ','+possdeeplink; } @@ -1319,7 +1394,7 @@ function validateParms() { if (document.parmform.elements[i].checked) { var identifier = name.replace(dlLinkProtectRegExp,''); var posslinkurl = document.parmform.elements[i].value; - posslinkurl = posslinkurl.replace(/^\s+|\s+$/g,''); + posslinkurl = posslinkurl.replace(/^\s+|\s+\$/g,''); if (document.parmform.elements['set_'+identifier].value) { posslinkurl = ','+posslinkurl; } @@ -1337,7 +1412,7 @@ function validateParms() { document.parmform.elements['set_'+identifier].value += possltid; } else { document.parmform.elements['set_'+identifier].value = ''; - alert("A link type of 'domain LTI launch' was selected but no domain LTI launcher was selected.\nPlease select one, or choose a different supported link type."); + alert("$lt{'nodom'}\\n$lt{'plss'}"); return false; } } @@ -1353,7 +1428,7 @@ function validateParms() { document.parmform.elements['set_'+identifier].value += possltic; } else { document.parmform.elements['set_'+identifier].value = ''; - alert("A link type of 'course LTI launch' was selected but no course LTI launcher was selected.\nPlease select one, or choose a different supported link type."); + alert("$lt{'nocrs'}\\n$lt{'plss'}"); return false; } } @@ -1361,14 +1436,14 @@ function validateParms() { var identifier = name.replace(dlKeyRegExp,''); if (isRadioSet('deeplink_protect_'+identifier,'key')) { var posskey = document.parmform.elements[i].value; - posskey = posskey.replace(/^\s+|\s+$/g,''); + posskey = posskey.replace(/^\s+|\s+\$/g,''); var origlength = posskey.length; - posskey = posskey.replace(/[^a-zA-Z\d_.!@#$%^&*()+=-]/g,''); + posskey = posskey.replace(/[^a-zA-Z\d_.!\@#\$%^&*()+=-]/g,''); var newlength = posskey.length; if (newlength > 0) { var change = origlength - newlength; if (change) { - alert(change+' disallowed character(s) removed from deeplink key'); + alert(change+" $lt{'disa'}"); } if (document.parmform.elements['set_'+identifier].value) { posskey = ':'+posskey; @@ -1377,9 +1452,9 @@ function validateParms() { } else { document.parmform.elements['set_'+identifier].value = ''; if (newlength < origlength) { - alert("A link type of 'deep with key' was selected but the key value was blank, after removing disallowed characters.\nPlease enter a key using one or more of: a-zA-Z0-9_.!@#$%^&*()+=-"); + alert("$lt{'nokyr'}\\n$lt{'plse'} "+'a-zA-Z0-9_.!\@#\$%^&*()+=-'); } else { - alert("A link type of 'deep with key' was selected but the key value was blank.\nPlease enter a key."); + alert("$lt{'nokey'}\\n$lt{'plsk'}"); } return false; } @@ -1388,7 +1463,7 @@ function validateParms() { if (document.parmform.elements[i].checked) { var identifier = name.replace(dlMenusRegExp,''); var posslinkmenu = document.parmform.elements[i].value; - posslinkmenu = posslinkmenu.replace(/^\s+|\s+$/g,''); + posslinkmenu = posslinkmenu.replace(/^\s+|\s+\$/g,''); if (posslinkmenu == 'std') { posslinkmenu = '0'; if (document.parmform.elements['set_'+identifier].value) { @@ -1406,6 +1481,136 @@ function validateParms() { } document.parmform.elements['set_'+identifier].value += posslinkmenu; } + } else if (dlTargetRegExp.test(name)) { + var identifier = name.replace(dlTargetRegExp,''); + var idx = document.parmform.elements[i].selectedIndex; + if (idx > 0) { + var linktarget = document.parmform.elements[i].options[idx].value + linktarget = linktarget.replace(/^\s+|\s+\$/g,''); + if (document.parmform.elements['set_'+identifier].value) { + linktarget = ','+linktarget; + } + document.parmform.elements['set_'+identifier].value += linktarget; + } + } else if (dlExitRegExp.test(name)) { + if (document.parmform.elements[i].checked) { + var identifier = name.replace(dlExitRegExp,''); + var posslinkexit = document.parmform.elements[i].value; + posslinkexit = posslinkexit.replace(/^\s+|\s+\$/g,''); + if (document.parmform.elements['set_'+identifier].value) { + posslinkexit = ','+posslinkexit; + } + document.parmform.elements['set_'+identifier].value += posslinkexit; + } + } else if (dlExitTextRegExp.test(name)) { + var identifier = name.replace(dlExitTextRegExp,''); + if ((isRadioSet('deeplink_exit_'+identifier,'yes')) || + (isRadioSet('deeplink_exit_'+identifier,'url'))) { + var posstext = document.parmform.elements[i].value; + posstext = posstext.replace(/^\s+|\s+\$/g,''); + var origlength = posstext.length; + posstext = posstext.replace(/[:;'",]/g,''); + var newlength = posstext.length; + if (newlength > 0) { + var change = origlength - newlength; + if (change) { + alert(change+" $lt{'dise'}"); + } + if (posstext !== 'Exit Tool') { + posstext = ':'+posstext; + document.parmform.elements['set_'+identifier].value += posstext; + } + } else { + document.parmform.elements['set_'+identifier].value = ''; + if (newlength < origlength) { + alert("$lt{'exit'}\\n$lt{'disc'}"+'":;\\''); + } else { + alert("$lt{'notxt'}\\n$lt{'plst'}"); + } + return false; + } + } + } + } else if (graceRegExp.test(name)) { + var identifier = name.replace(graceRegExp,''); + var divElem = document.parmform.elements[i].closest('div'); + var timeSels = divElem.getElementsByTagName("select"); + var total = 0; + var numnotnull = 0; + if (timeSels.length) { + for (var j=0; j 0) && (poss <= 52)) { + total += (poss * 604800); + } + } else if (sname == 'days_'+identifier) { + if ((poss > 0) && (poss <= 6)) { + total += (poss * 86400); + } + } else if (sname == 'hours_'+identifier) { + if ((poss > 0) && (poss < 24)) { + total += (poss * 3600); + } + } else if (sname == 'minutes_'+identifier) { + if ((poss > 0) && (poss < 60)) { + total += (poss * 60); + } + } + } + } + } + if (!numnotnull) { + total = ''; + } + var inputElems = divElem.getElementsByTagName("input"); + var frac = ''; + var grad = ''; + if (inputElems.length) { + for (var j=0; j 0) && (poss <= 1)) { + frac = poss; + numnotnull ++; + } + } + } + } else if (iname == 'grad_'+identifier) { + if (inputElems[j].checked) { + grad = 1; + } else { + grad = 0; + } + } + } + } + if (numnotnull) { + var possgrace = total+':'+frac+':'+grad; + if (patternGrace.test(possgrace)) { + document.parmform.elements[i].value = possgrace; + if (document.parmform.elements['set_'+identifier].value) { + document.parmform.elements['set_'+identifier].value += ','; + } + document.parmform.elements['set_'+identifier].value += document.parmform.elements[i].value; + } else { + if (frac == '') { + alert("$lt{'gppc'}"); + return false; + } else { + alert("$lt{'gpsn'}"); + return false; + } + } } } } @@ -1459,8 +1664,51 @@ sub ipacc_boxes_js { END } +sub grace_js { + my %lt = &grace_titles(); + &js_escape(\%lt); + my $overdue = '
'.$lt{'sinc'}.''; + foreach my $which (['weeks', 604800, 52], + ['days', 86400, 6], + ['hours', 3600, 23], + ['minutes', 60, 59]) { + my ($name, $factor, $max) = @{ $which }; + my %select = ((map {$_ => $_} (0..$max)), + 'select_form_order' => [0..$max]); + unshift(@{$select{'select_form_order'}},''); + $select{''} = ''; + my $selector = &Apache::loncommon::select_form('',$name."_'+identifier+'", + \%select); + $selector =~ s/([\r\n\f]+)//g; + $overdue .= $selector.' '.$lt{$name}.(' 'x2).' '; + } + $overdue .= '
'; + return <<"END"; +\$(document).ready(function() { + var wrapper = \$(".LC_string_grace_wrap"); + var add_button = \$(".LC_add_grace_button"); + var graceRegExp = /^LC_string_grace_/; + + \$(add_button).click(function(e){ + e.preventDefault(); + var identifier = \$(this).closest("div").attr("id"); + identifier = identifier.replace(graceRegExp,''); + \$(this).closest('div').find('.LC_string_grace_inner').append('
$overdue
$lt{pcr}  
$lt{remo}
'); + }); + + \$(wrapper).delegate(".LC_remove_grace","click", function(e){ + e.preventDefault(); \$(this).closest("div").remove(); + }) +}); + + +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 +1725,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'; + } + } + } } } } @@ -1539,6 +1796,24 @@ function toggleDeepLink(form,item,key) { keybox.type = 'hidden'; } } + } else if (item == 'exit') { + if (document.getElementById('deeplinkdiv_'+item+'_'+key)) { + if (radios[i].value == 'no') { + document.getElementById('deeplinkdiv_'+item+'_'+key).style.display = 'none'; + if (document.getElementById('deeplink_exittext_'+key)) { + if (document.getElementById('deeplink_exittext_'+key).value != '') { + document.getElementById('deeplink_exittext_'+key).value = ''; + } + } + } else { + document.getElementById('deeplinkdiv_'+item+'_'+key).style.display = 'inline-block'; + if (document.getElementById('deeplink_exittext_'+key)) { + if (document.getElementById('deeplink_exittext_'+key).value == '') { + document.getElementById('deeplink_exittext_'+key).value = 'Exit Tool'; + } + } + } + } } } } @@ -1667,6 +1942,24 @@ sub print_row { if ($automatic) { $parm.='
'.&mt('Automatically sets').' '.join(', ',split(/\:/,$automatic)).''; } + my $advice; + if ((ref($name) eq 'HASH') && ($name->{$which} eq 'mapalias') && + (ref($symbp) eq 'HASH') && ($parmlev eq 'full')) { + if ($symbp->{$rid} =~ m{^uploaded/}) { + if ($result == 14) { + $advice = &mt('Use Course Editor to modify this.'); + } else { + $advice = &mt('Use Course Editor to set this.'); + } + } else { + if ($result == 14) { + $advice = &mt('Use Resource Assembly Tool to modify this.'); + } else { + $advice = &mt('Use Resource Assembly Tool to set this.'); + } + } + $parm .= '
'.$advice.''; + } $r->print(''.$parm.''); my $thismarker=$which; @@ -1736,13 +2029,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/,$//; @@ -1750,7 +2041,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')) { @@ -2076,6 +2367,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; @@ -2089,11 +2381,22 @@ sub extractResourceInformation { my $uris=shift; my $keyorder=shift; my $defkeytype=shift; + my $pssymb=shift; my $keyordercnt=100; my $navmap = Apache::lonnavmaps::navmap->new(); - my @allres=$navmap->retrieveResources(undef,undef,1,undef,1); + return unless(ref($navmap)); + my @allres; + if ($pssymb ne '') { + my $res = $navmap->getBySymb($pssymb); + if (ref($res)) { + @allres = ($res); + } + } + if (!@allres) { + @allres=$navmap->retrieveResources(undef,undef,1,undef,1); + } foreach my $resource (@allres) { my $id=$resource->id(); my ($mapid,$resid)=split(/\./,$id); @@ -2217,7 +2520,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. @@ -2330,6 +2633,7 @@ sub lookUpTableParameter { 'opendate' => 'time_settings', 'duedate' => 'time_settings', 'answerdate' => 'time_settings', + 'grace' => 'time_settings', 'interval' => 'time_settings', 'contentopen' => 'time_settings', 'contentclose' => 'time_settings', @@ -2371,6 +2675,7 @@ sub lookUpTableParameter { 'lenient' => 'grading', 'retrypartial' => 'tries', 'discussvote' => 'misc', + 'texdisplay' => 'misc', 'examcode' => 'high_level_randomization', ); } @@ -2460,6 +2765,8 @@ sub parmboxes { &whatIsMyCategory($tempparameter, \%categoryList); } #part to print the parm-list + $Text::Wrap::columns=60; + $Text::Wrap::separator='
'; foreach my $key (sort { $category_order{$a} <=> $category_order{$b} } keys(%categoryList)) { next if (@{$categoryList{$key}} == 0); next if ($key eq ''); @@ -2473,8 +2780,9 @@ sub parmboxes { if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) { $r->print( ' checked="checked"'); } - $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey} - : $tempkey) + $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? + Text::Wrap::wrap('',' 'x4,$$allparms{$tempkey}) + : $tempkey) .'
'."\n"); } $r->print(''); @@ -2733,8 +3041,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=[]; @@ -2782,7 +3091,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 = ''; my $whitespace = @@ -3024,19 +3337,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('

'); } # Returns a hash parameter key -> order (integer) giving the order for some parameters. @@ -3046,26 +3373,27 @@ sub standardkeyorder { return ('parameter_0_opendate' => 1, 'parameter_0_duedate' => 2, 'parameter_0_answerdate' => 3, - 'parameter_0_interval' => 4, - 'parameter_0_weight' => 5, - 'parameter_0_maxtries' => 6, - 'parameter_0_hinttries' => 7, - 'parameter_0_contentopen' => 8, - 'parameter_0_contentclose' => 9, - 'parameter_0_type' => 10, - 'parameter_0_problemstatus' => 11, - 'parameter_0_hiddenresource' => 12, - 'parameter_0_hiddenparts' => 13, - 'parameter_0_display' => 14, - 'parameter_0_ordered' => 15, - 'parameter_0_tol' => 16, - 'parameter_0_sig' => 17, - 'parameter_0_turnoffunit' => 18, - 'parameter_0_discussend' => 19, - 'parameter_0_discusshide' => 20, - 'parameter_0_discussvote' => 21, - 'parameter_0_printstartdate' => 22, - 'parameter_0_printenddate' => 23); + 'parameter_0_grace' => 4, + 'parameter_0_interval' => 5, + 'parameter_0_weight' => 6, + 'parameter_0_maxtries' => 7, + 'parameter_0_hinttries' => 8, + 'parameter_0_contentopen' => 9, + 'parameter_0_contentclose' => 10, + 'parameter_0_type' => 11, + 'parameter_0_problemstatus' => 12, + 'parameter_0_hiddenresource' => 13, + 'parameter_0_hiddenparts' => 14, + 'parameter_0_display' => 15, + 'parameter_0_ordered' => 16, + 'parameter_0_tol' => 17, + 'parameter_0_sig' => 18, + 'parameter_0_turnoffunit' => 19, + 'parameter_0_discussend' => 20, + 'parameter_0_discusshide' => 21, + 'parameter_0_discussvote' => 22, + 'parameter_0_printstartdate' => 23, + 'parameter_0_printenddate' => 24); } @@ -3366,7 +3694,7 @@ sub assessparms { # --------------------------------------------------------- Get all assessments &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps, \%mapp, \%symbp,\%maptitles,\%uris, - \%keyorder); + \%keyorder,undef,$pssymb); %allmaps_inverted = reverse(%allmaps); @@ -3383,6 +3711,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); @@ -3391,6 +3720,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'; @@ -3529,9 +3863,27 @@ sub assessparms { # ---------------------------------------------------------------- Done storing if ($totalstored) { $message.='

' + .&mt('Changes for [quant,_1,parameter] saved.',$totalstored) + .'
' .&mt('Changes can take up to 10 minutes before being active for all students.') .&Apache::loncommon::help_open_topic('Caching') .'

'; + } else { + $message.='

'.&mt('No parameter changes saved.').'

'; + } + if ($totalskippeduser) { + $message .= '

'; + 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 .= '

'; } } @@ -3554,7 +3906,7 @@ sub assessparms { 'date_interval','int','float','string','string_lenient', 'string_examcode','string_deeplink','string_discussvote', 'string_useslots','string_problemstatus','string_ip', - 'string_questiontype') { + 'string_questiontype','string_tex','string_grace') { $r->print(''). '" name="recent_'.$item.'" />'); @@ -3562,13 +3914,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(< // @@ -3595,7 +3954,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); @@ -3675,6 +4034,7 @@ ENDPARMSELSCRIPT if ($parm_permission->{'edit'}) { undef($readonly); } + $r->print('
'); if ($parmlev eq 'full') { # @@ -3891,7 +4251,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 @@ -4108,6 +4468,7 @@ ENDMAPONE .'' ); } # end of $parmlev eq general + $r->print('
'); } $r->print(''); if ($numreclinks) { @@ -4214,7 +4575,7 @@ sub readdata { # Stores parameter data, using form parameters directly. # # Uses the following form parameters. The variable part in the names is a resourcedata key (except for a modification for user data). -# set_* (except settext, setipallow, setipdeny, setdeeplink) - set a parameter value +# set_* (except settext, setipallow, setipdeny, setdeeplink, setgrace) - set a parameter value # del_* - remove a parameter # datepointer_* - set a date parameter (value is key_* refering to a set of other form parameters) # dateinterval_* - set a date interval parameter (value refers to more form parameters) @@ -4247,7 +4608,7 @@ sub storedata { my $cmd=$1; my $thiskey=$2; my ($altkey,$recursive,$tkey,$tkeyrec,$tkeynonrec); - next if ($cmd eq 'rec' || $cmd eq 'settext' || $cmd eq 'setipallow' || $cmd eq 'setipdeny' || $cmd eq 'setdeeplink'); + next if ($cmd eq 'rec' || $cmd eq 'settext' || $cmd eq 'setipallow' || $cmd eq 'setipdeny' || $cmd eq 'setdeeplink' || $cmd eq 'setgrace'); if ((($cmd eq 'set') || ($cmd eq 'datepointer') || ($cmd eq 'dateinterval') || ($cmd eq 'del')) && ($thiskey =~ /(?:sequence|page)\Q___(all)\E/)) { unless ($thiskey =~ /(encrypturl|hiddenresource)$/) { @@ -4306,6 +4667,8 @@ sub storedata { if ($thiskey =~ /\.retrypartial$/) { $name = 'retrypartial'; } + } elsif ($typeof eq 'string_tex') { + $name = 'texdisplay'; } } elsif ($cmd eq 'datepointer') { $data=&Apache::lonhtmlcommon::get_date_from_form($env{$key}); @@ -4645,9 +5008,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 @@ -4673,6 +5039,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}; @@ -4682,7 +5062,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 ) { @@ -4692,7 +5086,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); } @@ -4772,6 +5180,12 @@ sub listdata { } if ($is_map) { my $leveltitle = &mt('Folder/Map'); + my $title = &Apache::lonnet::gettitle($mapurl); + 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; @@ -4788,9 +5202,10 @@ sub listdata { $is_recursive = 1; } } - $realm=''.$leveltitle.': '.&Apache::lonnet::gettitle($mapurl).'
('.$mapurl.')'; + $realm=''.$leveltitle.': '.$title.'
('.$mapurl.')'; } elsif ($middle) { my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle); + next if (($url =~ /\.(page|sequence)$/) && ($parmlev eq 'full') && ($caller eq 'newoverview')); $realm=''.&mt('Resource'). ': '.&Apache::lonnet::gettitle($middle). '
('.$url.' in '.$map.' id: '. @@ -4828,15 +5243,26 @@ sub listdata { # Ready to print # my $parmitem = &standard_parameter_names($name); + my $advice; + if (($name eq 'mapalias') && ($middle) && (!$is_map)) { + if ($middle =~ m{^uploaded/}) { + $advice = &mt('Use Course Editor to set this.'); + } else { + $advice = &mt('Use Resource Assembly Tool to set this.'); + } + $advice = '
'.$advice.''; + } $r->print(&tablestart($readonly,$is_map). &Apache::loncommon::start_data_table_row(). ''.&mt($parmitem). - ''); + ''.$advice.''); unless ($readonly) { my $disabled; if (($name eq 'availablestudent') && (($showval eq '') || ($userscope))) { $disabled = ' disabled="disabled"'; + } elsif (($name eq 'mapalias') && ($showval eq '')) { + $disabled = ' disabled="disabled"'; } $r->print(''); @@ -4869,6 +5295,8 @@ sub listdata { } elsif ($thistype =~ m/^string/) { if ($name eq 'availablestudent') { $readonly = 1; + } elsif (($name eq 'mapalias') && ($showval eq '')) { + $readonly = 1; } $r->print(&string_selector($thistype,$thiskey, $showval,$name,$readonly)); @@ -4912,13 +5340,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$/) && @@ -4937,10 +5369,10 @@ sub get_date_interval_from_form { $seconds .= '_'.$env{'form.done_'.$key.'_proctorkey'}; } } + return if (!$numnotnull); return $seconds; } - # Returns HTML to enter a text value for a parameter. # # @param {string} $thiskey - parameter key @@ -5024,9 +5456,13 @@ sub string_ip_selector { sub string_deeplink_selector { my ($thiskey, $showval, $readonly) = @_; - my (@components,%values,@current,%titles,%options,%optiontext,%defaults, - %selectnull,%domlti,%crslti,@possmenus); - @components = ('state','others','listing','scope','protect','menus'); + my (@tables,%values,@current,%titles,%options,%optiontext,%defaults, + %selectnull,%domlti,%crslti,@possmenus,%components); + @tables = ('upper','lower'); + %components = ( + upper => ['state','others','listing','scope'], + lower => ['protect','menus','target','exit'], + ); %titles = &Apache::lonlocal::texthash ( state => 'Access status', others => 'Hide other resources', @@ -5034,6 +5470,8 @@ sub string_deeplink_selector { scope => 'Access scope for link', protect => 'Link protection', menus => 'Menu Items Displayed', + target => 'Embedded?', + exit => 'Exit Tool Button?', ); %options = ( state => ['only','off','both'], @@ -5042,6 +5480,8 @@ sub string_deeplink_selector { scope => ['res','map','rec'], protect => ['none','key','ltid','ltic'], menus => ['std','colls'], + target => ['_self','_top'], + exit => ['no','yes','url'], ); %optiontext = &Apache::lonlocal::texthash ( only => 'deep only', @@ -5063,6 +5503,11 @@ sub string_deeplink_selector { ltid => 'LTI access (domain)' , std => 'Standard (all menus)', colls => 'Numbered collection', + _self => 'Embedded', + _top => 'Not embedded', + no => 'Not in use', + yes => 'In use, no URL redirect', + url => 'In use, redirect to URL', ); %selectnull = &Apache::lonlocal::texthash ( ltic => 'Select Launcher', @@ -5078,6 +5523,8 @@ sub string_deeplink_selector { ($values{'scope'}) = ($current[3] =~ /^(res|map|rec)$/); ($values{'protect'}) = ($current[4] =~ /^(key:[a-zA-Z\d_.!\@#\$%^&*()+=-]+|ltic:\d+|ltid:\d+)$/); ($values{'menus'}) = ($current[5] =~ /^(\d+)$/); + ($values{'target'}) = ($current[6] =~ /^(_self|_top)$/); + ($values{'exit'}) = ($current[7] =~ /^((?:(?:yes|url)(?:|\:[^:;"',]+))|no)$/); } else { $defaults{'state'} = 'off', $defaults{'others'} = 'unhide', @@ -5085,6 +5532,8 @@ sub string_deeplink_selector { $defaults{'scope'} = 'res'; $defaults{'protect'} = 'none'; $defaults{'menus'} = '0'; + $defaults{'target'} = '_top'; + $defaults{'exit'} = 'yes'; } my $disabled; if ($readonly) { @@ -5092,7 +5541,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'}; @@ -5100,12 +5550,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'}) { @@ -5117,122 +5565,236 @@ sub string_deeplink_selector { } } - my $output = ''; - foreach my $item (@components) { - $output .= ''; - } - $output .= ''; - foreach my $item (@components) { - $output .= ''; + } elsif (!$readonly) { + $output .= &grace_form($thiskey,'','','',$readonly); + } + $output .= ''.$addmore.''; + return $output; +} + +sub grace_form { + my ($thiskey,$delta,$fraction,$gradchkon,$readonly) = @_; + my $disabled; + if ($readonly) { + $disabled = ' disabled="disabled"'; + } + my %lt = &grace_titles(); + my $output = '
'. + '
'.$lt{'sinc'}.''; + foreach my $which (['weeks', 604800, 52], + ['days', 86400, 6], + ['hours', 3600, 23], + ['minutes', 60, 59]) { + my ($name, $factor, $max) = @{ $which }; + my $amount; + my %select = ((map {$_ => $_} (0..$max)), + 'select_form_order' => [0..$max]); + if ($delta eq '') { + unshift(@{$select{'select_form_order'}},''); + $select{''} = ''; + $amount = ''; + } else { + $amount = int($delta/$factor); + $delta %= $factor; + } + $output .= &Apache::loncommon::select_form($amount,$name.'_'.$thiskey, + \%select,'',$readonly); + $output .= ' '.$lt{$name}.'   '; + } + $output .= '
'. + '
'.$lt{'pcr'}.''. + ''. + '  
'; + unless ($readonly) { + $output .= ''.$lt{'remo'}.''; } - $output .= '
'.$titles{$item}.'
'; - if (($item eq 'protect') || ($item eq 'menus')) { - my $selected = $values{$item}; - foreach my $option (@{$options{$item}}) { - if ($item eq 'protect') { - if ($option eq 'ltid') { - next unless (keys(%domlti)); - } elsif ($option eq 'ltic') { - next unless (keys(%crslti)); - } - } elsif (($item eq 'menus') && ($option eq 'colls')) { - next unless (@possmenus); - } - my $checked; - if ($item eq 'menus') { - if (($selected =~ /^\d+$/) && (@possmenus) && - (grep(/^\Q$selected\E$/,@possmenus))) { - if ($option eq 'colls') { + my $output = ''; + foreach my $table ('upper','lower') { + next unless (ref($components{$table}) eq 'ARRAY'); + $output .= ''; + foreach my $item (@{$components{$table}}) { + $output .= ''; + } + $output .= ''; + foreach my $item (@{$components{$table}}) { + $output .= ''; + } + $output .= '
'.$titles{$item}.'
'; + if (($item eq 'protect') || ($item eq 'menus') || ($item eq 'exit')) { + my $selected = $values{$item}; + foreach my $option (@{$options{$item}}) { + if ($item eq 'protect') { + if ($option eq 'ltid') { + next unless (keys(%domlti)); + } elsif ($option eq 'ltic') { + next unless (keys(%crslti)); + } + } elsif (($item eq 'menus') && ($option eq 'colls')) { + next unless (@possmenus); + } + my $checked; + if ($item eq 'menus') { + if (($selected =~ /^\d+$/) && (@possmenus) && + (grep(/^\Q$selected\E$/,@possmenus))) { + if ($option eq 'colls') { + $checked = ' checked="checked"'; + } + } elsif (($option eq 'std') && ($selected == 0) && ($selected ne '')) { $checked = ' checked="checked"'; } - } elsif (($option eq 'std') && ($selected == 0) && ($selected ne '')) { + } elsif ($selected =~ /^\Q$option\E/) { $checked = ' checked="checked"'; } - } elsif ($selected =~ /^\Q$option\E/) { - $checked = ' checked="checked"'; - } - my $onclick; - unless ($readonly) { - my $esc_key = &js_escape($thiskey); - $onclick = ' onclick="toggleDeepLink(this.form,'."'$item','$esc_key'".');"'; - } - $output .= ''; - if (($item eq 'protect') && ($option eq 'key')) { - my $visibility="hidden"; - my $currkey; - if ($checked) { - $visibility = "text"; - $currkey = (split(/\:/,$values{$item}))[1]; - } - $output .= ' '. - ''; - } elsif (($option eq 'ltic') || ($option eq 'ltid') || ($option eq 'colls')) { - my $display="none"; - my ($current,$blankcheck,@possibles); - if ($checked) { - $display = 'inline-block'; - if (($option eq 'ltic') || ($option eq 'ltid')) { - $current = (split(/\:/,$selected))[1]; + my $onclick; + unless ($readonly) { + my $esc_key = &js_escape($thiskey); + $onclick = ' onclick="toggleDeepLink(this.form,'."'$item','$esc_key'".');"'; + } + $output .= ''; + if (($item eq 'protect') && ($option eq 'key')) { + my $visibility="hidden"; + my $currkey; + if ($checked) { + $visibility = "text"; + $currkey = (split(/\:/,$values{$item}))[1]; + } + $output .= ' '. + ''; + } elsif (($option eq 'ltic') || ($option eq 'ltid') || ($option eq 'colls')) { + my $display="none"; + my ($current,$blankcheck,@possibles); + if ($checked) { + $display = 'inline-block'; + if (($option eq 'ltic') || ($option eq 'ltid')) { + $current = (split(/\:/,$selected))[1]; + } else { + $current = $selected; + } } else { - $current = $selected; - } - } else { - $blankcheck = ' selected="selected"'; - } - if ($option eq 'ltid') { - @possibles = keys(%domlti); - } elsif ($option eq 'ltic') { - @possibles = keys(%crslti); - } else { - @possibles = @possmenus; - } - $output .= '
 '; + if (@possibles > 1) { + $output .= ''."\n"; + } + foreach my $poss (sort { $a <=> $b } @possibles) { + my $selected; + if (($poss == $current) || (scalar(@possibles) ==1)) { + $selected = ' selected="selected"'; + } + my $shown = $poss; + if ($option eq 'ltid') { + $shown = $domlti{$poss}; + } elsif ($option eq 'ltic') { + $shown = $crslti{$poss}; + } + $output .= ''; + } + $output .= '
'; + } + $output .= ' '; + } + if ($item eq 'exit') { + my $exitsty = 'none'; + my $displayval; + if ($values{$item} =~ /^(yes|url)/) { + $exitsty = 'inline-block'; + my $currval = (split(/\:/,$values{$item}))[1]; + if ($currval eq '') { + $displayval = 'Exit Tool'; + } else { + $displayval = $currval; } - $output .= ''; } - $output .= ''; + $output .= '

'.&mt('Button text').': '. + '
'; } - $output .= ' '; - } + } else { + my $selected = $values{$item}; + my $defsel; + if ($selected eq '') { + $defsel = ' selected="selected"'; + } + $output .= ''; + } + $output .= '
'."\n"; + if ($table eq 'upper') { + $output .= '
'; + } + } + return $output; +} + +sub string_grace_selector { + my ($thiskey, $showval, $readonly) = @_; + my $addmore; + unless ($readonly) { + $addmore = "\n".''; + } + my $output = ''. + '
'."\n". + '
'."\n"; + if ($showval ne '') { + my @current; + if ($showval =~ /,/) { + @current = split(/,/,$showval); } else { - my $selected = $values{$item}; - my $defsel; - if ($selected eq '') { - $defsel = ' selected="selected"'; - } - $output .= ''; } - $output .= '
'."\n"; + $output .= ''."\n"; return $output; } +sub grace_titles { + return &Apache::lonlocal::texthash ( + sinc => 'Time past due', + remo => 'Remove', + pcr => 'Partial credit', + grad => 'gradual', + weeks => 'weeks', + days => 'days', + hours => 'hours', + minutes => 'minutes', + ); +} { # block using some constants related to parameter types (overview mode) @@ -5268,7 +5830,12 @@ my %strings = => [['_allowfrom_','Hostname(s), or IP(s) from which access is allowed'], ['_denyfrom_','Hostname(s) or IP(s) from which access is disallowed']], 'string_deeplink' - => [['on','Set choices for link protection, resource listing, access scope, and shown menu items']], + => [['on','Set choices for link protection, resource listing, access scope, shown menu items, embedding, and exit link']], + 'string_tex' + => [['tth', 'tth (TeX to HTML)'], + ['mathjax', 'MathJax']], + 'string_grace' + => [['on','Set grading scale and grace period for submissions after due date']], ); @@ -5279,7 +5846,9 @@ my %stringmatches = ( => [['_allowfrom_','[^\!]+'], ['_denyfrom_','\!']], 'string_deeplink' - => [['on','^(only|off|both)\,(hide|unhide)\,(full|absent|grades|details|datestatus)\,(res|map|rec)\,(none|key\:\w+|ltic\:\d+|ltid\:\d+)\,(\d+|)$']], + => [['on','^(only|off|both)\,(hide|unhide)\,(full|absent|grades|details|datestatus)\,(res|map|rec)\,(none|key\:\w+|ltic\:\d+|ltid\:\d+)\,(\d+|)\,_(self|top),(yes|url|no)(|:[^:;\'",]+)$']], + 'string_grace' + => [['on','^\d+,(0|1)\.?\d*,(0|1)']], ); my %stringtypes = ( @@ -5290,6 +5859,8 @@ my %stringtypes = ( examcode => 'string_examcode', acc => 'string_ip', deeplink => 'string_deeplink', + grace => 'string_grace', + texdisplay => 'string_tex', ); # Returns the possible values and titles for a given string type, or undef if there are none. @@ -5350,6 +5921,8 @@ sub string_selector { ($thistype eq 'string_discussvote') || ($thistype eq 'string_ip') || ($thistype eq 'string_deeplink') || + ($thistype eq 'string_tex') || + ($thistype eq 'string_grace') || ($name eq 'retrypartial')) { my ($got_chostname,$chostname,$cmajor,$cminor); foreach my $possibilities (@{ $strings{$thistype} }) { @@ -5387,7 +5960,9 @@ sub string_selector { } if ($thistype eq 'string_ip') { - return &string_ip_selector($thiskey,$showval,$readonly); + return &string_ip_selector($thiskey,$showval,$readonly); + } elsif ($thistype eq 'string_grace') { + return &string_grace_selector($thiskey,$showval,$readonly); } elsif ($thistype eq 'string_deeplink') { return &string_deeplink_selector($thiskey,$showval,$readonly); } @@ -5599,6 +6174,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); @@ -5606,29 +6186,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; @@ -5645,7 +6225,8 @@ sub date_interval_selector { '&').'"'.$disabled.' />
'. ''.&mt('Button text').': '. - '&').'"'.$disabled.' />'; + '&').'"'.$disabled.' />'; } } unless ($readonly) { @@ -5820,6 +6401,7 @@ sub newoverview { &toggleparmtextbox_js()."\n". &validateparms_js()."\n". &ipacc_boxes_js()."\n". + &grace_js()."\n". &done_proctor_js()."\n". &deeplink_js()."\n". '// ]]> @@ -5832,7 +6414,8 @@ sub newoverview { $r->print($start_page.$breadcrumbs); &startSettingsScreen($r,'parmset',$crstype); $r->print(< +
+ ENDOVER my @ids=(); my %typep=(); @@ -5886,7 +6469,7 @@ ENDOVER &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps, \%mapp, \%symbp,\%maptitles,\%uris, - \%keyorder,\%defkeytype); + \%keyorder,\%defkeytype,$pssymb); if (grep {$_ eq 'all'} (@psprt)) { @psprt = keys(%allparts); @@ -5898,10 +6481,8 @@ ENDOVER $r->print('
'); $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('
'); @@ -5939,10 +6520,10 @@ ENDOVER $r->print('
'); my $sortorder=$env{'form.sortorder'}; unless ($sortorder) { $sortorder='realmstudent'; } - &sortmenu($r,$sortorder); + &sortmenu($r,$sortorder,'newoverview'); $r->print('
'); - $r->print('

'); + $r->print('

'); # Build the list data hash from the specified parms @@ -5954,9 +6535,10 @@ ENDOVER &secgroup_lister($cat,$pschp,$parmlev,$listdata,\@psprt,\@selected_groups,\%defkeytype,\%allmaps,\@ids,\%symbp); } - if (($env{'form.store'}) || ($env{'form.dis'})) { + my $foundkeys; + if ($env{'form.newoverviewsubm'}) { - if ($env{'form.store'}) { &storedata($r,$crs,$dom); } + if ($env{'form.newoverviewsubm'} eq 'store') { &storedata($r,$crs,$dom); } # Read modified data @@ -5964,13 +6546,84 @@ 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; + } + } + $foundkeys = &listdata($r,$resourcedata,$listdata,$sortorder,'newoverview',undef,$readonly,$parmlev,$hash_for_realm,$pschp); } $r->print(&tableend()); - unless ($readonly) { - $r->print( ((($env{'form.store'}) || ($env{'form.dis'}))?'

':'') ); + if ((!$readonly) && ($foundkeys)) { + $r->print( ($env{'form.newoverviewsubm'}? '

':'') ); } $r->print('
'); + if ($env{'form.newoverviewsubm'}) { + $r->print(<<"END"); + + +END + } &endSettingsScreen($r); $r->print(&Apache::loncommon::end_page()); } @@ -6042,6 +6695,7 @@ sub overview { &toggleparmtextbox_js()."\n". &validateparms_js()."\n". &ipacc_boxes_js()."\n". + &grace_js()."\n". &done_proctor_js()."\n". &deeplink_js()."\n". '// ]]>'."\n". @@ -6071,7 +6725,7 @@ sub overview { my $sortorder=$env{'form.sortorder'}; unless ($sortorder) { $sortorder='realmstudent'; } - &sortmenu($r,$sortorder); + &sortmenu($r,$sortorder,'overview'); my $submitbutton = ''; @@ -7331,6 +7985,9 @@ sub parm_change_log { } else { if (&isdateparm($istype{$parmname})) { $showvalue = &Apache::lonlocal::locallocaltime($value); + } elsif (($istype{$parmname} eq 'string_grace') || + ($istype{$parmname} eq 'string_ip')) { + $showvalue =~ s/,/, /g; } } $output .= $showvalue;