--- loncom/interface/Attic/lonspreadsheet.pm 2000/12/05 15:09:22 1.5 +++ loncom/interface/Attic/lonspreadsheet.pm 2000/12/06 14:50:47 1.6 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Spreadsheet/Grades Display Handler # -# 11/11,11/15,11/27,12/04,12/05 Gerd Kortemeyer +# 11/11,11/15,11/27,12/04,12/05,12/06 Gerd Kortemeyer package Apache::lonspreadsheet; @@ -12,6 +12,7 @@ use Opcode; use Apache::lonnet; use Apache::Constants qw(:common); use HTML::TokeParser; +use GDBM_File; # ============================================================================= # ===================================== Implements an instance of a spreadsheet @@ -31,11 +32,16 @@ sub initsheet { # f: formulas # t: intermediate format (variable references expanded) # v: output values -# +# c: preloaded constants (A-column) +# rl: row label %v=(); %t=(); %f=(); +%c=(); +%rl=(); + +$maxrow=0; $sheettype=''; $filename=''; @@ -230,9 +236,15 @@ sub sett { %t=(); map { if ($f{$_}) { - $t{$_}=$f{$_}; - $t{$_}=~s/\.+/\,/g; - $t{$_}=~s/(^|[^\"\'])([A-Z]\d+)/$1\$v\{\'$2\'\}/g; + if ($_=~/^A/) { + unless ($f{$_}=~/^\!/) { + $t{$_}=$c{$_}; + } + } else { + $t{$_}=$f{$_}; + $t{$_}=~s/\.+/\,/g; + $t{$_}=~s/(^|[^\"\'])([A-Z]\d+)/$1\$v\{\'$2\'\}/g; + } } } keys %f; } @@ -262,6 +274,23 @@ sub calc { return ''; } +sub outrow { + my $n=shift; + my @cols=(); + if ($n) { + $cols[0]=$rl{$f{'A'.$n}}; + } 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'); + return @cols; +} + # ------------------------------------------- End of "Inside of the safe space" ENDDEFS $safeeval->reval($code); @@ -272,7 +301,21 @@ ENDDEFS sub setformulas { my ($safeeval,@f)=@_; - $safeeval->reval('%f=(%f,'."('".join("','",@f)."'));"); + $safeeval->reval('%f='."('".join("','",@f)."');"); +} + +# ------------------------------------------------ Add or change formula values + +sub setconstants { + my ($safeeval,@c)=@_; + $safeeval->reval('%c='."('".join("','",@c)."');"); +} + +# ------------------------------------------------ Add or change formula values + +sub setrowlabels { + my ($safeeval,@rl)=@_; + $safeeval->reval('%rl='."('".join("','",@rl)."');"); } # ------------------------------------------------------- Calculate spreadsheet @@ -309,15 +352,28 @@ sub gettype { my $safeeval=shift; return $safeeval->reval('$sheettype'); } +# ------------------------------------------------------------------ Set maxrow -# -------------------------------------------------------------------- Set type +sub setmaxrow { + my ($safeeval,$row)=@_; + $safeeval->reval('$maxrow='.$row.';'); +} + +# ------------------------------------------------------------------ Get maxrow + +sub getmaxrow { + my $safeeval=shift; + return $safeeval->reval('$maxrow'); +} + +# ---------------------------------------------------------------- Set filename sub setfilename { my ($safeeval,$fn)=@_; $safeeval->reval('$filename='.$fn.';'); } -# -------------------------------------------------------------------- Get type +# ---------------------------------------------------------------- Get filename sub getfilename { my $safeeval=shift; @@ -328,6 +384,49 @@ sub getfilename { # ============================================================================= +# --------------------------------------------- Produce output row n from sheet + +sub rown { + my ($safeeval,$n)=@_; + my $rowdata="\n$n"; + my $showf=0; + map { + my ($fm,$vl)=split(/\_\_\_eq\_\_\_/,$_); + if ($showf==0) { $vl=$_; } + if ($showf>1) { + if ($vl eq '') { + $vl='#'; + } + $rowdata.= + ''.$vl. + ''; + } else { + $rowdata.=' '.$vl.' '; + } + $showf++; + } $safeeval->reval('&outrow('.$n.')'); + return $rowdata.''; +} + +# ------------------------------------------------------------- Print out sheet + +sub outsheet { + my $safeeval=shift; + 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'); + $tabledata.=''; + my $row; + my $maxrow=&getmaxrow($safeeval); + for ($row=0;$row<=$maxrow;$row++) { + $tabledata.=&rown($safeeval,$row); + } + $tabledata.='
 $_
'; +} + + # --------------------------------------- Read spreadsheet formulas from a file @@ -411,7 +510,7 @@ sub updaterows { '___'.$resid.'___'. &Apache::lonnet::declutter($srcf); $allassess{$symb}=$bighash{'title_'.$id}; - if ($stype eq 'assesssheet') { + if ($stype eq 'assesscalc') { map { if ($_=~/^stores\_(.*)/) { my $key=$_; @@ -437,21 +536,82 @@ sub updaterows { # -------------------- Find discrepancies between the course row table and this # my %f=&getformulas($safeeval); + my $changed=0; + + my %current=(); + if ($stype eq 'assesscalc') { + %current=%allkeys; + } elsif ($stype eq 'studentcalc') { + %current=%allassess; + } + + my $maxrow=0; + my %existing=(); + +# ----------------------------------------------------------- Now obsolete rows map { - if ($_=~/^A/) { - if ($stype eq 'assesssheet') { - } elsif ($stype eq 'coursesheet') { + if ($_=~/^A(\d+)/) { + $maxrow=($1>$maxrow)?$1:$maxrow; + $existing{$f{$_}}=1; + unless (defined($current{$f{$_}})) { + $f{$_}='!!! Obsolete'; + $changed=1; } } } keys %f; -# ------------------------------------------------ Find new and obsolete values + +# -------------------------------------------------------- New and unknown keys + + map { + unless ($existing{$_}) { + $changed=1; + $maxrow++; + $f{'A'.$maxrow}=$_; + } + } keys %current; + + if ($changed) { &setformulas($safeeval,%f); } + + &setmaxrow($safeeval,$maxrow); + &setrowlabels($safeeval,%current); } else { return 'Could not access course data'; } } -# ----------------------------------------------------------------------------- +# ------------------------------------------------ Load data for one assessment + +sub rowaassess { + my ($safeeval,$uname,$udom,$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); + my %returnhash=(); + map { + my ($name,$value)=split(/\=/,$_); + $returnhash{&unescape($name)}=&unescape($value); + } split(/\&/,$answer); + my $version; + for ($version=1;$version<=$returnhash{'version'};$version++) { + map { + $returnhash{$_}=$returnhash{$version.':'.$_}; + } split(/\:/,$returnhash{$version.':keys'}); + } + + my %c=(); + my %f=&getformulas($safeeval); + map { + if ($_=~/^A/) { + unless ($f{$_}=~/^\!/) { + $c{$_}=$returnhash{$f{$_}}; + } + } + } keys %f; + &setconstants($safeeval,%c); +} + sub handler { @@ -464,17 +624,18 @@ sub handler { $r->print(''); my $sheetone=initsheet(); - - &setformulas($sheetone,('A1' => '5', 'B2' => '6', 'C4' => 'A1+B2')); - $r->print(&calcsheet($sheetone)); - my %output=&getformulas($sheetone); - - $r->print('FORM:'.$output{'A1'}.' '.$output{'B2'}.' '.$output{'C4'}); - - my %output=&getvalues($sheetone); - - $r->print('
OUT:'.$output{'A1'}.' '.$output{'B2'}.' '.$output{'C4'}); - + &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); + &calcsheet($sheetone); + $r->print(&outsheet($sheetone)); $r->print(''); return OK; }