--- loncom/interface/Attic/lonspreadsheet.pm 2000/12/11 22:25:35 1.14 +++ loncom/interface/Attic/lonspreadsheet.pm 2000/12/18 17:14:49 1.18 @@ -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,12/07,12/08,12/09,12/11 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; @@ -259,9 +260,15 @@ 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{$_}; } @@ -272,6 +279,9 @@ sub sett { } } } keys %f; + $t{'A0'}=$f{'A0'}; + $t{'A0'}=~s/\.\.+/\,/g; + $t{'A0'}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g; } sub calc { @@ -299,7 +309,7 @@ sub calc { return ''; } -sub outrow { +sub outrowassess { my $n=shift; my @cols=(); if ($n) { @@ -318,13 +328,32 @@ sub outrow { return @cols; } +sub outrow { + my $n=shift; + my @cols=(); + if ($n) { + $cols[0]=$rl{$f{'A'.$n}}.' stuff'; + } else { + $cols[0]='Export'; + } + map { + my $fm=$f{$_.$n}; + $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', + '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'}."','"; + $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/\'\,\'$//; + $rowa=~s/\_\_\_\;\_\_\_$//; return $rowa; } @@ -435,13 +464,22 @@ sub rown { my $defaultbg=((($n-1)/5)==int(($n-1)/5))?'#E0E0':'#FFFF'; my $rowdata="\n$n"; my $showf=0; + my $proc; + my $maxred; + if (&gettype($safeeval) eq 'assesscalc') { + $proc='&outrowassess'; + $maxred=1; + } else { + $proc='&outrow'; + $maxred=26; + } 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) { $bgcolor='#FFDDDD'; } + if ($showf<=$maxred) { $bgcolor='#FFDDDD'; } if (($n==0) && ($showf<=26)) { $bgcolor='#CCCCFF'; } - if ($showf>1) { + if (($showf>$maxred) || ((!$n) && ($showf>0))) { if ($vl eq '') { $vl='#'; } @@ -452,7 +490,7 @@ sub rown { $rowdata.=' '.$vl.' '; } $showf++; - } $safeeval->reval('&outrow('.$n.')'); + } $safeeval->reval($proc.'('.$n.')'); return $rowdata.''; } @@ -460,11 +498,35 @@ sub rown { sub outsheet { my $safeeval=shift; - my $tabledata=''. - ''; + my $maxred; + my $realm; + if (&gettype($safeeval) eq 'assesscalc') { + $maxred=1; + $realm='Assessment'; + } elsif (&gettype($safeeval) eq 'studentcalc') { + $maxred=26; + $realm='User'; + } else { + $maxred=26; + $realm='Course'; + } + my $maxyellow=52-$maxred; + my $tabledata='
 A Import
'. + ''. + ''; + my $showf=0; map { - $tabledata.=""; - } ('B','C','D','E','F','G','H','I','J','K','L','M', + $showf++; + if ($showf<=$maxred) { + $tabledata.='"; + } ('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', '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'); @@ -721,7 +783,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; } @@ -748,6 +810,40 @@ 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 { + if ($assessdata[$index]) { + $c{$_.$row}=$assessdata[$index]; + unless ($_ eq 'A') { + $f{$_.$row}='import'; + } + } + $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; + &setformulas($safeeval,%f); + &setconstants($safeeval,%c); +} + # ------------------------------------------------ Load data for one assessment sub rowaassess { @@ -758,7 +854,9 @@ sub rowaassess { # ----------------------------------------------------------- Get stored values my $answer=&Apache::lonnet::reply( - "restore:$udom:$uname:$namespace:$symb",$uhome); + "restore:$udom:$uname:". + &Apache::lonnet::escape($namespace).":". + &Apache::lonnet::escape($symb),$uhome); my %returnhash=(); map { my ($name,$value)=split(/\=/,$_); @@ -808,7 +906,7 @@ sub rowaassess { map { my ($name,$value)=split(/\=/,$_); $useropt{&Apache::lonnet::unescape($name)}= - &Apache::lonnet::unescape($value); + &Apache::lonnet::unescape($value); } split(/\&/,$userrdatas{$uname.'___'.$udom}); } # -- now courseopt, useropt initialized for this user and course (used parmval) @@ -821,7 +919,10 @@ sub rowaassess { if ($f{$_}=~/^parameter/) { $c{$_}=&parmval($f{$_},$symb); } else { - $c{$_}=$returnhash{$f{$_}}; + my $key=$f{$_}; + $key=~s/^stores\_/resource\./; + $key=~s/\_/\./; + $c{$_}=$returnhash{$key}; } } } @@ -875,6 +976,7 @@ sub handler { ($ENV{'request.state'} eq 'construct')) { # --------------------------- Get query string for limited number of parameters + map { my ($name, $value) = split(/=/,$_); $value =~ tr/+/ /; @@ -897,7 +999,7 @@ sub handler { } # ----------------------------------------------------------- Change of target? - my $reroute=($ENV{'utarget'} eq 'export'); + my $reroute=($ENV{'form.utarget'} eq 'export'); # ------------------------------------------------------------------- Open page @@ -941,12 +1043,12 @@ ENDSCRIPT $ENV{'form.unewformula'}=~s/\'/\"/g; $r->print('New formula: '.$ENV{'form.unewfield'}.'='. $ENV{'form.unewformula'}.'
'); - &tmpread($sheetone,$r->dir_config('lonDaemons').'/tmp/', - $ENV{'form.usymb'}, - $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); } @@ -985,8 +1087,13 @@ ENDSCRIPT if (&gettype($sheetone) eq 'assesscalc') { &rowaassess($sheetone,$ENV{'form.usymb'}); + } elsif (&gettype($sheetone) eq 'studentcalc') { + &rowazstudent($sheetone); + } + my $calcoutput=&calcsheet($sheetone); + unless ($reroute) { + $r->print('

'.$calcoutput.'

'); } - &calcsheet($sheetone); # ------------------------------------------------------- Print or export sheet unless ($reroute) { @@ -994,7 +1101,7 @@ ENDSCRIPT $r->print(''); } else { - $r->print(&exportrow($sheetone)); + $r->print(&exportrow($sheetone)); } # ------------------------------------------------------------------------ Done } else {
'. + $realm.'ImportCalculations
$_'; + } else { + $tabledata.=''; + } + $tabledata.="$_