--- loncom/interface/Attic/lonspreadsheet.pm 2000/12/06 14:50:47 1.6 +++ loncom/interface/Attic/lonspreadsheet.pm 2000/12/18 13:45:40 1.17 @@ -1,7 +1,8 @@ # The LearningOnline Network with CAPA # Spreadsheet/Grades Display Handler # -# 11/11,11/15,11/27,12/04,12/05,12/06 Gerd Kortemeyer +# 11/11,11/15,11/27,12/04,12/05,12/06,12/07, +# 12/08,12/09,12/11,12/12,12/15,12/16,12/18 Gerd Kortemeyer package Apache::lonspreadsheet; @@ -10,10 +11,26 @@ use Safe; use Safe::Hole; use Opcode; use Apache::lonnet; -use Apache::Constants qw(:common); +use Apache::Constants qw(:common :http); use HTML::TokeParser; use GDBM_File; +# +# These cache hashes need to be independent of user, resource and course +# (user and course are in the keys) +# +use vars qw(%spreadsheets %courserdatas %userrdatas); +# +# These global hashes are dependent on user, course and resource, +# and need to be initialized every time when a sheet is calculated +# +my %courseopt; +my %useropt; +my %parmhash; +my $csec; +my $uname; +my $udom; + # ============================================================================= # ===================================== Implements an instance of a spreadsheet @@ -48,20 +65,25 @@ $filename=''; sub mask { my ($lower,$upper)=@_; - $lower=~/([A-Z]|\*)(\d+|\*)/; + $lower=~/([A-Za-z]|\*)(\d+|\*)/; my $la=$1; my $ld=$2; - $upper=~/([A-Z]|\*)(\d+|\*)/; + $upper=~/([A-Za-z]|\*)(\d+|\*)/; my $ua=$1; my $ud=$2; my $alpha=''; my $num=''; if (($la eq '*') || ($ua eq '*')) { - $alpha='[A-Z]'; + $alpha='[A-Za-z]'; } else { - $alpha='['.$la.'-'.$ua.']'; + if (($la=~/[A-Z]/) && ($ua=~/[A-Z]/) || + ($la=~/[a-z]/) && ($ua=~/[a-z]/)) { + $alpha='['.$la.'-'.$ua.']'; + } else { + $alpha='['.$la.'-Za-'.$ua.']'; + } } if (($ld eq '*') || ($ud eq '*')) { @@ -83,11 +105,13 @@ sub mask { } else { my @lda=($ld=~m/\d/g); my @uda=($ud=~m/\d/g); - my $i; $j=0; - for ($i=0;$i<=$#lda;$i++) { + my $i; $j=0; $notdone=1; + for ($i=0;($i<=$#lda)&&($notdone);$i++) { if ($lda[$i]==$uda[$i]) { $num.=$lda[$i]; $j=$i; + } else { + $notdone=0; } } if ($j<$#lda-1) { @@ -105,7 +129,9 @@ sub mask { } $num.=')'; } else { - $num.='['.$lda[$#lda].'-'.$uda[$#uda].']'; + if ($lda[$#lda]!=$uda[$#uda]) { + $num.='['.$lda[$#lda].'-'.$uda[$#uda].']'; + } } } } @@ -234,19 +260,28 @@ sub SUMMIN { sub sett { %t=(); + my $pattern=''; + if ($sheettype eq 'assesscalc') { + $pattern='A'; + } else { + $pattern='[A-Z]'; + } map { if ($f{$_}) { - if ($_=~/^A/) { + if ($_=~/^$pattern/) { unless ($f{$_}=~/^\!/) { $t{$_}=$c{$_}; } } else { $t{$_}=$f{$_}; - $t{$_}=~s/\.+/\,/g; - $t{$_}=~s/(^|[^\"\'])([A-Z]\d+)/$1\$v\{\'$2\'\}/g; + $t{$_}=~s/\.\.+/\,/g; + $t{$_}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g; } } } keys %f; + $t{'A0'}=$f{'A0'}; + $t{'A0'}=~s/\.\.+/\,/g; + $t{'A0'}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g; } sub calc { @@ -274,7 +309,7 @@ sub calc { return ''; } -sub outrow { +sub outrowassess { my $n=shift; my @cols=(); if ($n) { @@ -287,10 +322,22 @@ sub outrow { $fm=~s/[\'\"]/\&\#34;/g; $cols[$#cols+1]="'$_$n','$fm'".'___eq___'.$v{$_.$n}; } ('A','B','C','D','E','F','G','H','I','J','K','L','M', - 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z'); + 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z', + 'a','b','c','d','e','f','g','h','i','j','k','l','m', + 'n','o','p','q','r','s','t','u','v','w','x','y','z'); return @cols; } +sub exportrowa { + my $rowa=''; + map { + $rowa.=$v{$_.'0'}."','"; + } ('A','B','C','D','E','F','G','H','I','J','K','L','M', + 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z'); + $rowa=~s/\'\,\'$//; + return $rowa; +} + # ------------------------------------------- End of "Inside of the safe space" ENDDEFS $safeeval->reval($code); @@ -343,7 +390,7 @@ sub getformulas { sub settype { my ($safeeval,$type)=@_; - $safeeval->reval('$sheettype='.$type.';'); + $safeeval->reval('$sheettype="'.$type.'";'); } # -------------------------------------------------------------------- Get type @@ -370,7 +417,7 @@ sub getmaxrow { sub setfilename { my ($safeeval,$fn)=@_; - $safeeval->reval('$filename='.$fn.';'); + $safeeval->reval('$filename="'.$fn.'";'); } # ---------------------------------------------------------------- Get filename @@ -379,7 +426,14 @@ sub getfilename { my $safeeval=shift; return $safeeval->reval('$filename'); } - + +# ------------------------------------------------------------- Export of A-row + +sub exportrow { + my $safeeval=shift; + return $safeeval->reval('&exportrowa()'); +} + # ========================================================== End of Spreadsheet # ============================================================================= @@ -388,23 +442,33 @@ sub getfilename { sub rown { my ($safeeval,$n)=@_; + my $defaultbg=((($n-1)/5)==int(($n-1)/5))?'#E0E0':'#FFFF'; my $rowdata="\n$n"; my $showf=0; + my $proc; + if (&gettype($safeeval) eq 'assesscalc') { + $proc='&outrowassess'; + } else { + $proc='&outrow'; + } map { + my $bgcolor=$defaultbg.((($showf-1)/5==int(($showf-1)/5))?'99':'DD'); my ($fm,$vl)=split(/\_\_\_eq\_\_\_/,$_); if ($showf==0) { $vl=$_; } - if ($showf>1) { + if ($showf<=1) { $bgcolor='#FFDDDD'; } + if (($n==0) && ($showf<=26)) { $bgcolor='#CCCCFF'; } + if (($showf>1) || ((!$n) && ($showf>0))) { if ($vl eq '') { - $vl='#'; + $vl='#'; } $rowdata.= - ''.$vl. + ''.$vl. ''; } else { - $rowdata.=' '.$vl.' '; + $rowdata.=' '.$vl.' '; } $showf++; - } $safeeval->reval('&outrow('.$n.')'); + } $safeeval->reval($proc.'('.$n.')'); return $rowdata.''; } @@ -412,11 +476,14 @@ sub rown { sub outsheet { my $safeeval=shift; - my $tabledata=''; + my $tabledata='
 
'. + ''; map { $tabledata.=""; - } ('A
Import','B','C','D','E','F','G','H','I','J','K','L','M', - 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z'); + } ('B','C','D','E','F','G','H','I','J','K','L','M', + 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z', + 'a','b','c','d','e','f','g','h','i','j','k','l','m', + 'n','o','p','q','r','s','t','u','v','w','x','y','z'); $tabledata.=''; my $row; my $maxrow=&getmaxrow($safeeval); @@ -431,18 +498,22 @@ sub outsheet { # --------------------------------------- Read spreadsheet formulas from a file sub readsheet { - my ($safeeval,$fn)=shift; + my ($safeeval,$fn)=@_; &setfilename($safeeval,$fn); $fn=~/\.(\w+)/; &settype($safeeval,$1); my %f=(); - my $content; - { - my $fh=Apache::File->new($fn); - $content=join('',<$fh>); + unless ($spreadsheets{$fn}) { + $spreadsheets{$fn}=''; + { + my $fh; + if ($fh=Apache::File->new($fn)) { + $spreadsheets{$fn}=join('',<$fh>); + } + } } { - my $parser=HTML::TokeParser->new(\$content); + my $parser=HTML::TokeParser->new(\$spreadsheets{$fn}); my $token; while ($token=$parser->get_token) { if ($token->[0] eq 'S') { @@ -456,6 +527,41 @@ sub readsheet { &setformulas($safeeval,%f); } +# ----------------------------------------------- Make a temp copy of the sheet + +sub tmpwrite { + my ($safeeval,$tmpdir,$symb)=@_; + my $fn=$uname.'_'.$udom.'_spreadsheet_'.&getfilename($safeeval); + $fn=~s/\W/\_/g; + $fn=$tmpdir.$fn.'.tmp'; + my $fh; + if ($fh=Apache::File->new('>'.$fn)) { + print $fh join("\n",&getformulas($safeeval)); + } +} + +# ---------------------------------------------------------- Read the temp copy + +sub tmpread { + my ($safeeval,$tmpdir,$symb,$nfield,$nform)=@_; + my $fn=$uname.'_'.$udom.'_spreadsheet_'.&getfilename($safeeval); + $fn=~s/\W/\_/g; + $fn=$tmpdir.$fn.'.tmp'; + my $fh; + my %fo=(); + if ($fh=Apache::File->new($fn)) { + my $name; + while ($name=<$fh>) { + chomp($name); + my $value=<$fh>; + chomp($value); + $fo{$name}=$value; + } + } + $fo{$nfield}=$nform; + &setformulas($safeeval,%fo); +} + # --------------------------------------------------------------- Read metadata sub readmeta { @@ -483,6 +589,83 @@ sub readmeta { return %returnhash; } +# ================================================================== Parameters +# -------------------------------------------- Figure out a cascading parameter + +sub parmval { + my ($what,$symb)=@_; + + unless ($symb) { return ''; } + my $result=''; + + my ($mapname,$id,$fn)=split(/\_\_\_/,$symb); +# ----------------------------------------------------- Cascading lookup scheme + my $rwhat=$what; + $what=~s/^parameter\_//; + $what=~s/\_/\./; + + my $symbparm=$symb.'.'.$what; + my $mapparm=$mapname.'___(all).'.$what; + + my $seclevel= + $ENV{'request.course.id'}.'.['. + $csec.'].'.$what; + my $seclevelr= + $ENV{'request.course.id'}.'.['. + $csec.'].'.$symbparm; + my $seclevelm= + $ENV{'request.course.id'}.'.['. + $csec.'].'.$mapparm; + + my $courselevel= + $ENV{'request.course.id'}.'.'.$what; + my $courselevelr= + $ENV{'request.course.id'}.'.'.$symbparm; + my $courselevelm= + $ENV{'request.course.id'}.'.'.$mapparm; + +# ---------------------------------------------------------- fourth, check user + + if ($uname) { + + if ($useropt{$courselevelr}) { return $useropt{$courselevelr}; } + + if ($useropt{$courselevelm}) { return $useropt{$courselevelm}; } + + if ($useropt{$courselevel}) { return $useropt{$courselevel}; } + + } + +# --------------------------------------------------------- third, check course + + if ($csec) { + + if ($courseopt{$seclevelr}) { return $courseopt{$seclevelr}; } + + if ($courseopt{$seclevelm}) { return $courseopt{$seclevelm}; } + + if ($courseopt{$seclevel}) { return $courseopt{$seclevel}; } + + } + + if ($courseopt{$courselevelr}) { return $courseopt{$courselevelr}; } + + if ($courseopt{$courselevelm}) { return $courseopt{$courselevelm}; } + + if ($courseopt{$courselevel}) { return $courseopt{$courselevel}; } + +# ----------------------------------------------------- second, check map parms + + my $thisparm=$parmhash{$symbparm}; + if ($thisparm) { return $thisparm; } + +# -------------------------------------------------------- first, check default + + return &Apache::lonnet::metadata($fn,$rwhat.'.default'); + +} + + # ----------------------------------------------------------------- Update rows sub updaterows { @@ -510,9 +693,10 @@ sub updaterows { '___'.$resid.'___'. &Apache::lonnet::declutter($srcf); $allassess{$symb}=$bighash{'title_'.$id}; + if ($stype eq 'assesscalc') { map { - if ($_=~/^stores\_(.*)/) { + if (($_=~/^stores\_(.*)/) || ($_=~/^parameter\_(.*)/)) { my $key=$_; my $display= &Apache::lonnet::metadata($srcf,$key.'.display'); @@ -530,7 +714,7 @@ sub updaterows { untie(%bighash); # -# %allkeys has a list of storage displays by unikey +# %allkeys has a list of storage and parameter displays by unikey # %allassess has a list of all resource displays by symb # # -------------------- Find discrepancies between the course row table and this @@ -553,7 +737,7 @@ sub updaterows { if ($_=~/^A(\d+)/) { $maxrow=($1>$maxrow)?$1:$maxrow; $existing{$f{$_}}=1; - unless (defined($current{$f{$_}})) { + unless ((defined($current{$f{$_}})) || (!$1)) { $f{$_}='!!! Obsolete'; $changed=1; } @@ -580,18 +764,55 @@ sub updaterows { } } +# --------------------------------------------------- Load data for one student + +sub rowazstudent { + my $safeeval=shift; + my %c=(); + my %f=&getformulas($safeeval); + map { + if ($_=~/^A(\d+)/) { + my $row=$1; + unless ($f{$_}=~/^\!/) { + my @assessdata=split(/\,/, + &Apache::lonnet::ssi( + '/res/msu/korte/junk.assesscalc',('utarget' => 'export', + 'uname' => $uname, + 'udom' => $udom, + 'usymb' => $f{$_}))); + my $index=0; + map { + $c{$_.$row}=$assessdata[$index]; + print $_.':'.$c{$_.$row}.'
'; + $index++; + } ('A','B','C','D','E','F','G','H','I','J','K','L','M', + 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z'); + + } + } + } keys %f; + + &setconstants($safeeval,%c); +} + # ------------------------------------------------ Load data for one assessment sub rowaassess { - my ($safeeval,$uname,$udom,$symb)=@_; + my ($safeeval,$symb)=@_; my $uhome=&Apache::lonnet::homeserver($uname,$udom); my $namespace; unless ($namespace=$ENV{'request.course.id'}) { return ''; } - my $answer=reply("restore:$udom:$uname:$namespace:$symb",$uhome); + +# ----------------------------------------------------------- Get stored values + my $answer=&Apache::lonnet::reply( + "restore:$udom:$uname:". + &Apache::lonnet::escape($namespace).":". + &Apache::lonnet::escape($symb),$uhome); my %returnhash=(); map { my ($name,$value)=split(/\=/,$_); - $returnhash{&unescape($name)}=&unescape($value); + $returnhash{&Apache::lonnet::unescape($name)}= + &Apache::lonnet::unescape($value); } split(/\&/,$answer); my $version; for ($version=1;$version<=$returnhash{'version'};$version++) { @@ -599,44 +820,244 @@ sub rowaassess { $returnhash{$_}=$returnhash{$version.':'.$_}; } split(/\:/,$returnhash{$version.':keys'}); } +# ----------------------------- returnhash now has all stores for this resource + +# ---------------------------- initialize coursedata and userdata for this user + %courseopt=(); + %useropt=(); + my $uhome=&Apache::lonnet::homeserver($uname,$udom); + unless ($uhome eq 'no_host') { +# -------------------------------------------------------------- Get coursedata + unless + ((time-$courserdatas{$ENV{'request.course.id'}.'.last_cache'})<120) { + my $reply=&Apache::lonnet::reply('dump:'. + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'. + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.':resourcedata', + $ENV{'course.'.$ENV{'request.course.id'}.'.home'}); + if ($reply!~/^error\:/) { + $courserdatas{$ENV{'request.course.id'}}=$reply; + $courserdatas{$ENV{'request.course.id'}.'.last_cache'}=time; + } + } + map { + my ($name,$value)=split(/\=/,$_); + $courseopt{&Apache::lonnet::unescape($name)}= + &Apache::lonnet::unescape($value); + } split(/\&/,$courserdatas{$ENV{'request.course.id'}}); +# --------------------------------------------------- Get userdata (if present) + unless + ((time-$userrdatas{$uname.'___'.$udom.'.last_cache'})<120) { + my $reply= + &Apache::lonnet::reply('dump:'.$udom.':'.$uname.':resourcedata',$uhome); + if ($reply!~/^error\:/) { + $userrdatas{$uname.'___'.$udom}=$reply; + $userrdatas{$uname.'___'.$udom.'.last_cache'}=time; + } + } + map { + my ($name,$value)=split(/\=/,$_); + $useropt{&Apache::lonnet::unescape($name)}= + &Apache::lonnet::unescape($value); + } split(/\&/,$userrdatas{$uname.'___'.$udom}); + } +# -- now courseopt, useropt initialized for this user and course (used parmval) my %c=(); my %f=&getformulas($safeeval); map { if ($_=~/^A/) { unless ($f{$_}=~/^\!/) { - $c{$_}=$returnhash{$f{$_}}; - } + if ($f{$_}=~/^parameter/) { + $c{$_}=&parmval($f{$_},$symb); + } else { + my $key=$f{$_}; + $key=~s/^stores\_/resource\./; + $key=~s/\_/\./; + $c{$_}=$returnhash{$key}; + } + } } } keys %f; + &setconstants($safeeval,%c); } +# --------------------------------------------------------- Various form fields -sub handler { +sub textfield { + my ($title,$name,$value)=@_; + return "\n

$title:
". + ''; +} + +sub hiddenfield { + my ($name,$value)=@_; + return "\n".''; +} + +sub selectbox { + my ($title,$name,$value,%options)=@_; + my $selout="\n

$title:
".''; +} +# ================================================================ Main handler + +sub handler { my $r=shift; - $r->content_type('text/html'); - $r->send_http_header; + $uname=''; + $udom=''; + $csec=''; + + 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'}) || + ($ENV{'request.state'} eq 'construct')) { + +# --------------------------- Get query string for limited number of parameters + + map { + my ($name, $value) = split(/=/,$_); + $value =~ tr/+/ /; + $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; + if (($name eq 'uname') || ($name eq 'udom') || ($name eq 'usymb')) { + unless ($ENV{'form.'.$name}) { + $ENV{'form.'.$name}=$value; + } + } + } (split(/&/,$ENV{'QUERY_STRING'})); + +# ------------------------------------------- Nothing there? Must be login user + + unless ($ENV{'form.uname'}) { + $uname=$ENV{'user.name'}; + $udom=$ENV{'user.domain'}; + } else { + $uname=$ENV{'form.uname'}; + $udom=$ENV{'form.udom'}; + } +# ----------------------------------------------------------- Change of target? + + my $reroute=($ENV{'form.utarget'} eq 'export'); + +# ------------------------------------------------------------------- Open page + + $r->content_type('text/html'); + $r->header_out('Cache-control','no-cache'); + $r->header_out('Pragma','no-cache'); + $r->send_http_header; + +# --------------------------------------------------------------- Screen output + + unless ($reroute) { + $r->print('LON-CAPA Spreadsheet'); + $r->print(< + + function celledit(cn,cf) { + var cnf=prompt(cn,cf); + if (cnf!=null) { + document.sheet.unewfield.value=cn; + document.sheet.unewformula.value=cnf; + document.sheet.submit(); + } + } + + +ENDSCRIPT + $r->print(''. + '
'. + &hiddenfield('uname',$ENV{'form.uname'}). + &hiddenfield('udom',$ENV{'form.udom'}). + &hiddenfield('usymb',$ENV{'form.usymb'}). + &hiddenfield('unewfield',''). + &hiddenfield('unewformula','')); + } + +# ---------------------------------------- Read new sheet or modified worksheet - $r->print('LON-CAPA Spreadsheet'); - $r->print(''); - my $sheetone=initsheet(); - &setformulas($sheetone, - 'B3' => 5, 'C4' => 6, 'C6' => 'B3+C4', 'C2' => 'C6+B5', 'B5'=>'&SUM("A*")', - 'A1' => 'a1', 'A2'=>'a2', 'A3'=>'a3','A4'=>'a4','A5'=>'a5','A6'=>'a6'); - &setrowlabels($sheetone, - 'a1'=>'A Points','a2'=>'B Points','a3'=>'C Points', - 'a4'=>'Percentage Correct','a5'=>'Bonus Points','a6'=>'Points Awarded'); - &setconstants($sheetone, - 'A1' => '3', 'A2'=>'4', 'A3'=>'0','A4'=>'76','A5'=>'1.5','A6'=>'6'); - - &setmaxrow($sheetone,6); + if ($ENV{'form.unewfield'}) { + $r->print('

Modified Workcopy

'); + $ENV{'form.unewformula'}=~s/\'/\"/g; + $r->print('New formula: '.$ENV{'form.unewfield'}.'='. + $ENV{'form.unewformula'}.'
'); + &setfilename($sheetone,$r->filename); + $r->filename=~/\.(\w+)/; + &settype($sheetone,$1); + &tmpread($sheetone,$r->dir_config('lonDaemons').'/tmp/', + $ENV{'form.usymb'}, + $ENV{'form.unewfield'},$ENV{'form.unewformula'}); + } else { + &readsheet($sheetone,$r->filename); + } + +# --------------------------------------------- See if all import rows uptodate + + if (tie(%parmhash,'GDBM_File', + $ENV{'request.course.fn'}.'_parms.db',&GDBM_READER,0640)) { + $csec=&Apache::lonnet::usection($udom,$uname,$ENV{'request.course.id'}); + if ($csec eq '-1') { + $r->print('

'. + "User '$uname' at domain '$udom' not a student in this course

"); + } + &updaterows($sheetone); + untie(%parmhash); + } else { + $r->print('

'. + 'Could not initialize import fields (not in a course)

'); + } + +# ------------------------------------------------ Write the modified worksheet + + &tmpwrite($sheetone,$r->dir_config('lonDaemons').'/tmp/', + $ENV{'form.usymb'}); + +# ----------------------------------------------------- Print user, course, etc + unless ($reroute) { + $r->print("User '$uname' at domain '$udom' for '". + $ENV{'course.'.$ENV{'request.course.id'}.'.description'}."'"); + if ($csec) { + $r->print(", group/section '$csec'"); + } + $r->print("\n"); + } +# -------------------------------------------------------- Import and calculate + + if (&gettype($sheetone) eq 'assesscalc') { + &rowaassess($sheetone,$ENV{'form.usymb'}); + } elsif (&gettype($sheetone) eq 'studentcalc') { + &rowazstudent($sheetone); + } &calcsheet($sheetone); + +# ------------------------------------------------------- Print or export sheet + unless ($reroute) { $r->print(&outsheet($sheetone)); - $r->print(''); + + $r->print(''); + } else { + $r->print(&exportrow($sheetone)); + } +# ------------------------------------------------------------------------ Done + } else { +# ----------------------------- Not in a course, or not allowed to modify parms + $ENV{'user.error.msg'}= + $r->uri.":opa:0:0:Cannot modify spreadsheet"; + return HTTP_NOT_ACCEPTABLE; + } return OK; }
 A Import$_