--- loncom/interface/lonparmset.pm 2002/08/21 17:18:08 1.64 +++ loncom/interface/lonparmset.pm 2003/04/04 20:38:36 1.86 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set parameters for assessments # -# $Id: lonparmset.pm,v 1.64 2002/08/21 17:18:08 www Exp $ +# $Id: lonparmset.pm,v 1.86 2003/04/04 20:38:36 bowersj2 Exp $ # # Copyright Michigan State University Board of Trustees # @@ -72,6 +72,8 @@ my %mapp; my %typep; my %keyp; +my %maptitles; + my $uname; my $udom; my $uhome; @@ -87,9 +89,23 @@ my $coursename; Figure out a cascading parameter. -Inputs: $what $id $def - -Returns: I am not entirely sure. +Inputs: $what - a parameter spec (incluse part info and name I.E. 0.weight) + $id - a bighash Id number + $def - the resource's default value 'stupid emacs + +Returns: A list, the first item is the index into the remaining list of items of parm valuse that is the active one, the list consists of parm values at the 11 possible levels + +11- resource default +10- map default +9 - General Course +8 - Map or Folder level in course +7 - resource level in course +6 - General for section +5 - Map or Folder level for section +4 - resource level in section +3 - General for specific student +2 - Map or Folder level for specific student +1 - resource level for specific student =cut @@ -123,32 +139,32 @@ sub parmval { # --------------------------------------------------------- third, check course - if ($courseopt{$courselevel}) { + if (defined($courseopt{$courselevel})) { $outpar[9]=$courseopt{$courselevel}; $result=9; } - if ($courseopt{$courselevelm}) { + if (defined($courseopt{$courselevelm})) { $outpar[8]=$courseopt{$courselevelm}; $result=8; } - if ($courseopt{$courselevelr}) { + if (defined($courseopt{$courselevelr})) { $outpar[7]=$courseopt{$courselevelr}; $result=7; } - if ($csec) { - if ($courseopt{$seclevel}) { + if (defined($csec)) { + if (defined($courseopt{$seclevel})) { $outpar[6]=$courseopt{$seclevel}; $result=6; } - if ($courseopt{$seclevelm}) { + if (defined($courseopt{$seclevelm})) { $outpar[5]=$courseopt{$seclevelm}; $result=5; } - if ($courseopt{$seclevelr}) { + if (defined($courseopt{$seclevelr})) { $outpar[4]=$courseopt{$seclevelr}; $result=4; } @@ -156,23 +172,22 @@ sub parmval { # ---------------------------------------------------------- fourth, check user - if ($uname) { - if ($useropt{$courselevel}) { + if (defined($uname)) { + if (defined($useropt{$courselevel})) { $outpar[3]=$useropt{$courselevel}; $result=3; } - if ($useropt{$courselevelm}) { + if (defined($useropt{$courselevelm})) { $outpar[2]=$useropt{$courselevelm}; $result=2; } - if ($useropt{$courselevelr}) { + if (defined($useropt{$courselevelr})) { $outpar[1]=$useropt{$courselevelr}; $result=1; } } - return ($result,@outpar); } @@ -199,9 +214,32 @@ sub valout { my $result = ''; # Values of zero are valid. if (! $value && $value ne '0') { - $result = '  '; + $result = '  '; } else { - if ($type=~/^date/) { + if ($type eq 'date_interval') { + my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($value); + $year=$year-70; + $mday--; + if ($year) { + $result.=$year.' yrs '; + } + if ($mon) { + $result.=$mon.' mths '; + } + if ($mday) { + $result.=$mday.' days '; + } + if ($hour) { + $result.=$hour.' hrs '; + } + if ($min) { + $result.=$min.' mins '; + } + if ($sec) { + $result.=$sec.' secs '; + } + $result=~s/\s+$//; + } elsif ($type=~/^date/) { $result = localtime($value); } else { $result = $value; @@ -252,6 +290,10 @@ sub startpage { my $bodytag=&Apache::loncommon::bodytag('Set Course Parameters','', 'onUnload="pclose()"'); + my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '. + &Apache::loncommon::selectstudent_link('parmform','uname','udom'); + my $selscript=&Apache::loncommon::studentbrowser_javascript(); + $r->print(< @@ -305,6 +347,7 @@ sub startpage { newWin.focus(); } +$selscript $bodytag
@@ -322,7 +365,7 @@ For User or ID at Domain - +$chooseopt @@ -332,10 +375,27 @@ ENDHEAD } sub print_row { - my ($r,$which,$part,$name,$rid,$default,$type,$display,$defbgone, + my ($r,$which,$part,$name,$rid,$default,$defaulttype,$display,$defbgone, $defbgtwo,$parmlev)=@_; +# get the values for the parameter in cascading order +# empty levels will remain empty my ($result,@outpar)=&parmval($$part{$which}.'.'.$$name{$which}, $rid,$$default{$which}); +# get the type for the parameters +# problem: these may not be set for all levels + my ($typeresult,@typeoutpar)=&parmval($$part{$which}.'.'. + $$name{$which}.'.type', + $rid,$$defaulttype{$which}); +# cascade down manually + my $cascadetype=$defaulttype; + for (my $i=$#typeoutpar;$i>0;$i--) { + if ($typeoutpar[$i]) { + $cascadetype=$typeoutpar[$i]; + } else { + $typeoutpar[$i]=$cascadetype; + } + } + my $parm=$$display{$which}; if ($parmlev eq 'full' || $parmlev eq 'brief') { @@ -354,73 +414,79 @@ sub print_row { if ($parmlev eq 'general') { if ($uname) { - &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,$type,$display); + &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); } elsif ($csec) { - &print_td($r,6,$defbgtwo,$result,\@outpar,$mprefix,$_,$type,$display); + &print_td($r,6,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); } else { - &print_td($r,9,$defbgone,$result,\@outpar,$mprefix,$_,$type,$display); + &print_td($r,9,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); } } elsif ($parmlev eq 'map') { if ($uname) { - &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,$type,$display); + &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); } elsif ($csec) { - &print_td($r,5,$defbgtwo,$result,\@outpar,$mprefix,$_,$type,$display); + &print_td($r,5,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); } else { - &print_td($r,8,$defbgone,$result,\@outpar,$mprefix,$_,$type,$display); + &print_td($r,8,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); } } else { - &print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$_,$type,$display); + &print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); if ($parmlev eq 'brief') { - &print_td($r,7,$defbgone,$result,\@outpar,$mprefix,$_,$type,$display); + &print_td($r,7,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); if ($csec) { - &print_td($r,4,$defbgtwo,$result,\@outpar,$mprefix,$_,$type,$display); + &print_td($r,4,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); } if ($uname) { - &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,$type,$display); + &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); } } else { - &print_td($r,10,'#FFDDDD',$result,\@outpar,$mprefix,$_,$type,$display); - &print_td($r,9,$defbgone,$result,\@outpar,$mprefix,$_,$type,$display); - &print_td($r,8,$defbgone,$result,\@outpar,$mprefix,$_,$type,$display); - &print_td($r,7,$defbgone,$result,\@outpar,$mprefix,$_,$type,$display); + &print_td($r,10,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); + &print_td($r,9,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); + &print_td($r,8,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); + &print_td($r,7,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); if ($csec) { - &print_td($r,6,$defbgtwo,$result,\@outpar,$mprefix,$_,$type,$display); - &print_td($r,5,$defbgtwo,$result,\@outpar,$mprefix,$_,$type,$display); - &print_td($r,4,$defbgtwo,$result,\@outpar,$mprefix,$_,$type,$display); + &print_td($r,6,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); + &print_td($r,5,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); + &print_td($r,4,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); } if ($uname) { - &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,$type,$display); - &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,$type,$display); - &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,$type,$display); + &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); + &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); + &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); } } # end of $brief if/else } # end of $parmlev if/else if ($parmlev eq 'full' || $parmlev eq 'brief') { $r->print(''. - &valout($outpar[$result],$$type{$which}).''); + &valout($outpar[$result],$typeoutpar[$result]).''); } my $sessionval=&Apache::lonnet::EXT('resource.'.$$part{$which}. '.'.$$name{$which},$symbp{$rid}); +# this doesn't seem to work, and I don't think is correct +# my $sessionvaltype=&Apache::lonnet::EXT('resource.'.$$part{$which}. +# '.'.$$name{$which}.'.type',$symbp{$rid}); +# this seems to work + my $sessionvaltype=$typeoutpar[$result]; + if (!defined($sessionvaltype)) { $sessionvaltype=$$defaulttype{$which}; } $r->print(''. - &valout($sessionval,$$type{$which}).' '. + &valout($sessionval,$sessionvaltype).' '. ''); $r->print(''); $r->print("\n"); } sub print_td { - my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$type,$display)=@_; + my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display)=@_; $r->print(''. - &plink($$type{$value},$$display{$value},$$outpar[$which], + &plink($$typeoutpar[$which],$$display{$value},$$outpar[$which], $mprefix."$which",'parmform.pres','psub').''."\n"); } @@ -485,6 +551,7 @@ sub extractResourceInformation { my $defp = shift; my $mapp = shift; my $symbp = shift; + my $maptitles=shift; foreach (keys %$bighash) { if ($_=~/^src\_(\d+)\.(\d+)$/) { @@ -496,7 +563,7 @@ sub extractResourceInformation { $$ids[$#$ids+1]=$id; $$typep{$id}=$1; $$keyp{$id}=''; - foreach (split(/\,/,&Apache::lonnet::metadata($srcf,'keys'))) { + foreach (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys'))) { if ($_=~/^parameter\_(.*)/) { my $key=$_; my $allkey=$1; @@ -525,6 +592,9 @@ sub extractResourceInformation { &Apache::lonnet::declutter($$bighash{'map_id_'.$mapid}); $$mapp{$mapid}=$$mapp{$id}; $$allmaps{$mapid}=$$mapp{$id}; + $$maptitles{$mapid}= + $$bighash{'title_'.$$bighash{'ids_'.&Apache::lonnet::clutter($$mapp{$id})}}; + $$maptitles{$$mapp{$id}}=$$maptitles{$mapid}; $$symbp{$id}=$$mapp{$id}. '___'.$resid.'___'. &Apache::lonnet::declutter($srcf); @@ -598,6 +668,7 @@ sub assessparms { my @pscat=&get_env_multiple('form.pscat'); my $pschp=$ENV{'form.pschp'}; my @psprt=&get_env_multiple('form.psprt'); + if (!@psprt) { $psprt[0]='0'; } my $showoptions=$ENV{'form.showoptions'}; my $pssymb=''; @@ -691,7 +762,7 @@ sub assessparms { } # --------------------------------------------------------- Get all assessments - extractResourceInformation(\%bighash, \@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allkeys, \%allmaps, $fcat, \%defp, \%mapp, \%symbp); + extractResourceInformation(\%bighash, \@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allkeys, \%allmaps, $fcat, \%defp, \%mapp, \%symbp,\%maptitles); $mapp{'0.0'} = ''; $symbp{'0.0'} = ''; @@ -720,8 +791,10 @@ sub assessparms { if ($snum==5) { $storeunder=$seclevelm; } if ($snum==4) { $storeunder=$seclevelr; } - my %storecontent = ($storeunder => $ENV{'form.pres_value'}, - $storeunder.'type' => $ENV{'form.pres_type'}); + my $delete; + if ($ENV{'form.pres_value'} eq '') { $delete=1;} + my %storecontent = ($storeunder => $ENV{'form.pres_value'}, + $storeunder.'.type' => $ENV{'form.pres_type'}); my $reply=''; if ($snum>3) { # ---------------------------------------------------------------- Store Course @@ -736,10 +809,17 @@ sub assessparms { &Apache::lonnet::expirespread('','','assesscalc'); } # Store parameter - $reply=&Apache::lonnet::cput - ('resourcedata',\%storecontent, - $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + if ($delete) { + $reply=&Apache::lonnet::del + ('resourcedata',[keys(%storecontent)], + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + } else { + $reply=&Apache::lonnet::cput + ('resourcedata',\%storecontent, + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + } } else { # ------------------------------------------------------------------ Store User # @@ -755,15 +835,25 @@ sub assessparms { &Apache::lonnet::expirespread($uname,$udom,'assesscalc'); } # Store parameter - $reply=&Apache::lonnet::cput - ('resourcedata',\%storecontent,$udom,$uname); + if ($delete) { + $reply=&Apache::lonnet::del + ('resourcedata',[keys(%storecontent)],$udom,$uname); + } else { + $reply=&Apache::lonnet::cput + ('resourcedata',\%storecontent,$udom,$uname); + } } if ($reply=~/^error\:(.*)/) { $message.="Write Error: $1"; } # ---------------------------------------------------------------- Done storing + $message.='

Changes can take up to 10 minutes before being active for all students

'; } +# --------------------------------------------- Devalidate cache for this child + &Apache::lonnet::devalidatecourseresdata( + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}); # -------------------------------------------------------------- Get coursedata %courseopt = &Apache::lonnet::dump ('resourcedata', @@ -831,13 +921,13 @@ sub assessparms { $r->print('
'); - $r->print('Select Enclosing Map'); + $r->print('Select Enclosing Map or Folder'); $r->print('\n"); } else { @@ -867,7 +957,6 @@ sub assessparms { $r->print('>All Parameters'); my $cnt=0; - foreach $tempkey (sort { $allparms{$a} cmp $allparms{$b} } keys %allparms ) { ++$cnt; @@ -886,10 +975,12 @@ sub assessparms { $r->print(''); + my %temphash=(); + foreach (@psprt) { $temphash{$_}=1; } foreach $tempkey (sort keys %allparts) { unless ($tempkey =~ /\./) { $r->print(''); @@ -899,7 +990,7 @@ sub assessparms { $r->print('Sort list by'); $r->print(''. ''."\n"; } - my $onchange = 'onchange="javascript:window.document.forms'. + my $onchange = 'onFocus="javascript:window.document.forms'. '[\'envform\'].elements[\'newp_setparmval\']'. '.checked=true;"'; $output.='Create New Environment Variable
'. @@ -1451,7 +1562,7 @@ ENDENV =pod -=item handler +=item * handler Main handler. Calls &assessparms and &crsenv subroutines. @@ -1459,6 +1570,7 @@ Main handler. Calls &assessparms and &c ################################################## ################################################## + use Data::Dumper; sub handler { my $r=shift; @@ -1468,6 +1580,11 @@ sub handler { return OK; } &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}); + + $r->content_type('text/html'); + $r->send_http_header; + $r->print("\n\n"); + # ----------------------------------------------------- Needs to be in a course if (($ENV{'request.course.id'}) &&