--- loncom/interface/lonparmset.pm 2000/11/28 15:39:52 1.18 +++ loncom/interface/lonparmset.pm 2001/08/08 21:00:49 1.32 @@ -9,7 +9,10 @@ # # 10/11,10/12,10/16 Gerd Kortemeyer) # -# 11/20,11/21,11/22,11/23,11/24,11/25,11/27,11/28 Gerd Kortemeyer +# 11/20,11/21,11/22,11/23,11/24,11/25,11/27,11/28, +# 12/08,12/12, +# 16/01/01,02/08,03/20,03/23,03/24,03/26,05/09, +# 07/05,07/06,08/08 Gerd Kortemeyer package Apache::lonparmset; @@ -34,6 +37,7 @@ my %keyp; my %defp; my %allkeys; +my %allmaps; my $uname; my $udom; @@ -136,26 +140,23 @@ sub valout { sub plink { my ($type,$dis,$value,$marker,$return,$call)=@_; - return ''. - &valout($value,$type).''; + &valout($value,$type).''; } -# ================================================================ Main Handler +sub assessparms { -sub handler { - my $r=shift; - - if ($r->header_only) { - $r->content_type('text/html'); - $r->send_http_header; - return OK; - } - -# ----------------------------------------------------- Needs to be in a course - - if (($ENV{'request.course.fn'}) && - (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'}))) { + my $r=shift; # -------------------------------------------------------- Variable declaration %courseopt=(); @@ -172,6 +173,23 @@ sub handler { $udom=$ENV{'form.udom'}; unless ($udom) { $udom=$r->dir_config('lonDefDomain'); } + my $pscat=$ENV{'form.pscat'}; + my $pschp=$ENV{'form.pschp'}; + my $pssymb=''; + +# ----------------------------------------------- Was this started from grades? + + if (($ENV{'form.command'} eq 'set') && ($ENV{'form.url'}) + && (!$ENV{'form.dis'})) { + my $url=$ENV{'form.url'}; + $url=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--; + $pssymb=&Apache::lonnet::symbread($url); + $pscat='all'; + $pschp=''; + } else { + $ENV{'form.url'}=''; + } + my $id=$ENV{'form.id'}; if (($id) && ($udom)) { $uname=(&Apache::lonnet::idget($udom,$id))[1]; @@ -224,8 +242,9 @@ sub handler { $ENV{'request.course.fn'}.'_parms.db',&GDBM_READER,0640))) { # --------------------------------------------------------- Get all assessments - %allkeys=(); - %defp=(); + undef %allkeys; + undef %allmaps; + undef %defp; map { if ($_=~/^src\_(\d+)\.(\d+)$/) { my $mapid=$1; @@ -250,7 +269,7 @@ sub handler { $allkeys{$allkey}=$display; if ($allkey eq $fcat) { $defp{$id}= - &Apache::lonnet::metadata($srcf,$key.'.default'); + &Apache::lonnet::metadata($srcf,$key); } if ($keyp{$id}) { $keyp{$id}.=','.$key; @@ -262,6 +281,7 @@ sub handler { &Apache::lonnet::metadata($srcf,'keys')); $mapp{$id}= &Apache::lonnet::declutter($bighash{'map_id_'.$mapid}); + $allmaps{$mapid}=$mapp{$id}; $symbp{$id}=$mapp{$id}. '___'.$resid.'___'. &Apache::lonnet::declutter($srcf); @@ -271,7 +291,7 @@ sub handler { # ---------------------------------------------------------- Anything to store? if ($ENV{'form.pres_marker'}) { my ($sresid,$spnam,$snum)=split(/\&/,$ENV{'form.pres_marker'}); - $spnam=~s/\_/\./; + $spnam=~s/\_([^\_]+)$/\.$1/; # ---------------------------------------------------------- Construct prefixes my $symbparm=$symbp{$sresid}.'.'.$spnam; @@ -310,6 +330,18 @@ sub handler { my $reply=''; if ($snum>3) { # ---------------------------------------------------------------- Store Course +# +# Expire sheets + &Apache::lonnet::expirespread('','','studentcalc'); + if (($snum==7) || ($snum==4)) { + &Apache::lonnet::expirespread('','','assesscalc',$symbp{$sresid}); + } elsif (($snum==8) || ($snum==5)) { + &Apache::lonnet::expirespread('','','assesscalc',$mapp{$sresid}); + } else { + &Apache::lonnet::expirespread('','','assesscalc'); + } + +# Store parameter $reply=&Apache::lonnet::critical('put:'. $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'. $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.':resourcedata:'. @@ -317,6 +349,20 @@ sub handler { $ENV{'course.'.$ENV{'request.course.id'}.'.home'}); } else { # ------------------------------------------------------------------ Store User +# +# Expire sheets + &Apache::lonnet::expirespread($uname,$udom,'studentcalc'); + if ($snum==1) { + &Apache::lonnet::expirespread + ($uname,$udom,'assesscalc',$symbp{$sresid}); + } elsif ($snum==2) { + &Apache::lonnet::expirespread + ($uname,$udom,'assesscalc',$mapp{$sresid}); + } else { + &Apache::lonnet::expirespread($uname,$udom,'assesscalc'); + } + +# Store parameter $reply= &Apache::lonnet::critical('put:'.$udom.':'.$uname.':resourcedata:'. $storecontent,$uhome); @@ -358,17 +404,18 @@ sub handler { if ($fcat eq '') { $a<=>$b; } else { - $outpar[&parmval($fcat,$a,$defp{$a})]<=> - $outpar[&parmval($fcat,$b,$defp{$b})]; + 1*$outpar[&parmval($fcat,$a,$defp{$a})]<=> + 1*$outpar[&parmval($fcat,$b,$defp{$b})]; } - } @ids; + } @ids; + # ------------------------------------------------------------------ Start page $r->content_type('text/html'); $r->send_http_header; $r->print(< -LON-CAPA Assessment Parameters +LON-CAPA Course Parameters -

Set Assessment Parameters

-
+

Set Course Parameters

+

Course: $ENV{'course.'.$ENV{'request.course.id'}.'.description'}

+

Course Environment

+ +
+
+

Course Assessments

Section/Group: @@ -414,22 +479,52 @@ or ID at Domain - - + ENDHEAD + if ($ENV{'form.url'}) { + $r->print(''); + } + map { + $r->print(''); + } ('tolerance','date_default','date_start','date_end','date_interval', + 'int','float','string'); - $r->print('

'.$message.'

Sort list by '); - $r->print(''); $r->print(''); map { $r->print(''); } keys %allkeys; - $r->print(''); + $r->print( + 'Select Enclosing MapSelect Parameter
' + ); + if (($pscat) || ($pschp) || ($pssymb)) { # ----------------------------------------------------------------- Start Table + my $catmarker='parameter_'.$pscat; + $catmarker=~s/\./\_/g; my $coursespan=$csec?8:5; $r->print(< @@ -460,10 +555,26 @@ ENDTABLEHEADFOUR $r->print(''); } $r->print(''); + my $defbgone=''; + my $defbgtwo=''; map { + my $rid=$_; + my ($inmapid)=($rid=~/\.(\d+)$/); + if (($pschp eq 'all') || ($allmaps{$pschp} eq $mapp{$rid}) || + ($pssymb eq $mapp{$rid}.'___'.$inmapid.'___'. + &Apache::lonnet::declutter($bighash{'src_'.$rid}))) { # ------------------------------------------------------ Entry for one resource + if ($defbgone eq '"E0E099"') { + $defbgone='"E0E0DD"'; + } else { + $defbgone='"E0E099"'; + } + if ($defbgtwo eq '"FFFF99"') { + $defbgtwo='"FFFFDD"'; + } else { + $defbgtwo='"FFFF99"'; + } @outpar=(); - my $rid=$_; my $thistitle=''; my %name= (); my %part= (); @@ -478,13 +589,17 @@ ENDTABLEHEADFOUR $display{$_}=&Apache::lonnet::metadata($uri,$_.'.display'); unless ($display{$_}) { $display{$_}=''; } $display{$_}.=' ('.$name{$_}.')'; - $default{$_}=&Apache::lonnet::metadata($uri,$_.'.default'); + $default{$_}=&Apache::lonnet::metadata($uri,$_); $type{$_}=&Apache::lonnet::metadata($uri,$_.'.type'); $thistitle=&Apache::lonnet::metadata($uri,$_.'.title'); } split(/\,/,$keyp{$rid}); my $totalparms=scalar keys %name; - $r->print(''); - $r->print(''); - $r->print(''); + $r->print(''); + if ($isdef) { map { - + if (($_ eq $catmarker) || ($pscat eq 'all')) { my $result=&parmval($part{$_}.'.'.$name{$_},$rid,$default{$_}); - $r->print(""); + $r->print(""); my $thismarker=$_; $thismarker=~s/^parameter\_//; my $mprefix=$rid.'&'.$thismarker.'&'; - $r->print(''. + $r->print(''); - $r->print(''. + $r->print(''); - $r->print(''. + $r->print(''); - $r->print(''. + $r->print(''); - $r->print(''. + $r->print(''); if ($csec) { - $r->print(''. + $r->print(''); - $r->print(''. + $r->print(''); - $r->print(''. + $r->print(''); } if ($uname) { - $r->print(''. + $r->print(''); - $r->print(''. + $r->print(''); - $r->print(''. + $r->print(''); } - - $r->print(''); + $r->print( + ''); $r->print("\n"); + } } sort keys %name; + } else { + $r->print("\n"); + } # -------------------------------------------------- End entry for one resource + } } @ids; - $r->print('
generalfor Enclosing Mapfor Resource
'. + my $isdef=1; + unless ($totalparms) { $totalparms=1; $isdef=0; } + if ($pscat ne 'all') { $totalparms=1; } + $r->print(''. join(' / ',split(/\//,$uri)). '

'. $bighash{'title_'.$rid}); @@ -492,66 +607,222 @@ ENDTABLEHEADFOUR $r->print(' ('.$thistitle.')'); } $r->print('

'.$typep{$rid}.''. + $r->print(''.$typep{$rid}.''. join(' / ',split(/\//,$mapp{$rid})).'$part{$_}$display{$_}$part{$_}$display{$_}'. &valout($outpar[11],$type{$_}).''. &valout($outpar[10],$type{$_}).''. &plink($type{$_},$display{$_},$outpar[9],$mprefix.'9', 'parmform.pres','psub').''. &plink($type{$_},$display{$_},$outpar[8],$mprefix.'8', 'parmform.pres','psub').''. &plink($type{$_},$display{$_},$outpar[7],$mprefix.'7', 'parmform.pres','psub').''. &plink($type{$_},$display{$_},$outpar[6],$mprefix.'6', 'parmform.pres','psub').''. &plink($type{$_},$display{$_},$outpar[5],$mprefix.'5', 'parmform.pres','psub').''. &plink($type{$_},$display{$_},$outpar[4],$mprefix.'4', 'parmform.pres','psub').''. &plink($type{$_},$display{$_},$outpar[3],$mprefix.'3', 'parmform.pres','psub').''. &plink($type{$_},$display{$_},$outpar[2],$mprefix.'2', 'parmform.pres','psub').''. &plink($type{$_},$display{$_},$outpar[1],$mprefix.'1', 'parmform.pres','psub').''.&valout($outpar[$result],$type{$_}).''.&valout($outpar[$result],$type{$_}).'
'); + $r->print(''); + } + $r->print(''); untie(%bighash); untie(%parmhash); } +} + +sub crsenv { + my $r=shift; + my $setoutput=''; +# -------------------------------------------------- Go through list of changes + map { + if ($_=~/^form\.(.+)\_setparmval$/) { + my $name=$1; + my $value=$ENV{'form.'.$name.'_value'}; + if ($name eq 'newp') { + $name=$ENV{'form.newp_name'}; + } + if ($name eq 'url') { + $value=~s/^\/res\///; + $setoutput.='Backing up previous URL: '. + &Apache::lonnet::reply('put:'. + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}. + ':'.$ENV{'course.'.$ENV{'request.course.id'}.'.num'}. + ':environment:'. + &Apache::lonnet::escape('top level map backup '. + time).'='. + &Apache::lonnet::reply('get:'. + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}. + ':'.$ENV{'course.'.$ENV{'request.course.id'}.'.num'}. + ':environment:url', + $ENV{'course.'.$ENV{'request.course.id'}.'.home'}), + $ENV{'course.'.$ENV{'request.course.id'}.'.home'}). + '
'; + + } + if ($name) { + $setoutput.='Setting '.$name.' to '. + $value.': '. + &Apache::lonnet::reply('put:'. + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}. + ':'.$ENV{'course.'.$ENV{'request.course.id'}.'.num'}. + ':environment:'. + &Apache::lonnet::escape($name).'='. + &Apache::lonnet::escape($value), + $ENV{'course.'.$ENV{'request.course.id'}.'.home'}). + '
'; + } + } + } keys %ENV; +# -------------------------------------------------------- Get parameters again + my $rep=&Apache::lonnet::reply + ('dump:'.$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}. + ':'.$ENV{'course.'.$ENV{'request.course.id'}.'.num'}. + ':environment', + $ENV{'course.'.$ENV{'request.course.id'}.'.home'}); + my $output=''; + if ($rep ne 'con_lost') { + my %values; + my %descriptions= + ('url' => 'Top Level Map
'. + 'Modification may make assessment data inaccessible', + 'description' => 'Course Description', + 'courseid' => 'Course ID or number
(internal, optional)', + 'question.email' => 'Feedback Addresses for Content Questions
'. + '(user:domain,user:domain,...)', + 'comment.email' => 'Feedback Addresses for Comments
'. + '(user:domain,user:domain,...)', + 'policy.email' => 'Feedback Addresses for Course Policy
'. + '(user:domain,user:domain,...)' + ); + + map { + my ($name,$value)=split(/\=/,$_); + $name=&Apache::lonnet::unescape($name); + $values{$name}=&Apache::lonnet::unescape($value); + unless ($descriptions{$name}) { + $descriptions{$name}=$name; + } + } split(/\&/,$rep); + map { + $output.=''.$descriptions{$_}.''; + } keys %descriptions; + $output.='Create New Environment Variable
'. + ''. + ''. + ''; + } + $r->print(< + +LON-CAPA Course Environment + + +

Set Course Parameters

+
+

Course: $ENV{'course.'.$ENV{'request.course.id'}.'.description'}

+

Course Environment

+$setoutput +

+ + +$output +
ParameterValueSet?
+ +

+ + +ENDENV +} + +# ================================================================ Main Handler + +sub handler { + my $r=shift; + + if ($r->header_only) { + $r->content_type('text/html'); + $r->send_http_header; + return OK; + } + +# ----------------------------------------------------- Needs to be in a course + + if (($ENV{'request.course.id'}) && + (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'}))) { + + unless (($ENV{'form.crsenv'}) || (!$ENV{'request.course.fn'})) { +# --------------------------------------------------------- Bring up assessment + &assessparms($r); +# ---------------------------------------------- This is for course environment + } else { + &crsenv($r); + } } else { # ----------------------------- Not in a course, or not allowed to modify parms $ENV{'user.error.msg'}=