--- loncom/interface/Attic/lonspreadsheet.pm 2000/12/12 16:48:21 1.15
+++ loncom/interface/Attic/lonspreadsheet.pm 2000/12/16 21:34:47 1.16
@@ -2,7 +2,7 @@
# Spreadsheet/Grades Display Handler
#
# 11/11,11/15,11/27,12/04,12/05,12/06,12/07,
-# 12/08,12/09,12/11,12/12 Gerd Kortemeyer
+# 12/08,12/09,12/11,12/12,12/15,12/16 Gerd Kortemeyer
package Apache::lonspreadsheet;
@@ -260,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{$_};
}
@@ -300,7 +306,7 @@ sub calc {
return '';
}
-sub outrow {
+sub outrowassess {
my $n=shift;
my @cols=();
if ($n) {
@@ -436,6 +442,12 @@ sub rown {
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\_\_\_/,$_);
@@ -453,7 +465,7 @@ sub rown {
$rowdata.=' '.$vl.' | ';
}
$showf++;
- } $safeeval->reval('&outrow('.$n.')');
+ } $safeeval->reval($proc.'('.$n.')');
return $rowdata.'
';
}
@@ -749,6 +761,28 @@ sub updaterows {
}
}
+# --------------------------------------------------- Load data for one student
+
+sub rowazstudent {
+ my $safeeval=shift;
+ my %c=();
+ my %f=&getformulas($safeeval);
+ map {
+ if ($_=~/^A/) {
+ unless ($f{$_}=~/^\!/) {
+ print &Apache::lonnet::ssi(
+ '/res/msu/korte/junk.assesscalc',('utarget' => 'export',
+ 'uname' => $uname,
+ 'udom' => $udom,
+ 'usymb' => $f{$_})).
+ '
'.$f{$_}.'
';
+ }
+ }
+ } keys %f;
+
+ &setconstants($safeeval,%c);
+}
+
# ------------------------------------------------ Load data for one assessment
sub rowaassess {
@@ -903,7 +937,7 @@ sub handler {
}
# ----------------------------------------------------------- Change of target?
- my $reroute=($ENV{'utarget'} eq 'export');
+ my $reroute=($ENV{'form.utarget'} eq 'export');
# ------------------------------------------------------------------- Open page
@@ -991,6 +1025,8 @@ ENDSCRIPT
if (&gettype($sheetone) eq 'assesscalc') {
&rowaassess($sheetone,$ENV{'form.usymb'});
+ } elsif (&gettype($sheetone) eq 'studentcalc') {
+ &rowazstudent($sheetone);
}
&calcsheet($sheetone);