--- loncom/interface/Attic/lonspreadsheet.pm 2000/12/06 23:23:38 1.7
+++ loncom/interface/Attic/lonspreadsheet.pm 2000/12/08 17:16:37 1.9
@@ -1,7 +1,7 @@
# 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 Gerd Kortemeyer
package Apache::lonspreadsheet;
@@ -399,20 +399,24 @@ 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;
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 (($n==0) && ($showf<=26)) { $bgcolor='#CCCCFF'; }
if ($showf>1) {
if ($vl eq '') {
- $vl='#';
+ $vl='#';
}
$rowdata.=
- ''.$vl.
+ ' | '.$vl.
' | ';
} else {
- $rowdata.=' '.$vl.' | ';
+ $rowdata.=' '.$vl.' | ';
}
$showf++;
} $safeeval->reval('&outrow('.$n.')');
@@ -423,10 +427,11 @@ sub rown {
sub outsheet {
my $safeeval=shift;
- my $tabledata=' | ';
+ my $tabledata=' | '.
+ 'A Import | ';
map {
$tabledata.="$_ | ";
- } ('A
Import','B','C','D','E','F','G','H','I','J','K','L','M',
+ } ('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');
@@ -444,15 +449,17 @@ 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 $content='';
{
- my $fh=Apache::File->new($fn);
- $content=join('',<$fh>);
+ my $fh;
+ if ($fh=Apache::File->new($fn)) {
+ $content=join('',<$fh>);
+ }
}
{
my $parser=HTML::TokeParser->new(\$content);
@@ -523,6 +530,7 @@ sub updaterows {
'___'.$resid.'___'.
&Apache::lonnet::declutter($srcf);
$allassess{$symb}=$bighash{'title_'.$id};
+
if ($stype eq 'assesscalc') {
map {
if ($_=~/^stores\_(.*)/) {
@@ -533,6 +541,8 @@ sub updaterows {
$display=
&Apache::lonnet::metadata($srcf,$key.'.name');
}
+
+
$allkeys{$key}=$display;
}
} split(/\,/,&Apache::lonnet::metadata($srcf,'keys'));
@@ -647,19 +657,11 @@ sub handler {
$r->print('');
my $sheetone=initsheet();
- &setformulas($sheetone,
- 'B3' => 5, 'C4' => 6, 'C6' => 'B3+C4', 'C2' => 'C6+B5', 'B5'=>'&SUM("A*")',
- 'A1' => 'da1', 'A2'=>'da2', 'A3'=>'da3','A4'=>'da4','A5'=>'da5','A6'=>'da6',
- 'a1' => '28.7', 'a2' => 'C4+a1','G1'=>'&SUM("*25")');
- &setrowlabels($sheetone,
- 'da1'=>'A Points','da2'=>'B Points','da3'=>'C Points',
- 'da4'=>'Percentage Correct','da5'=>'Bonus Points','da6'=>'Points Awarded');
- &setconstants($sheetone,
- 'A1' => '3', 'A2'=>'4', 'A3'=>'0','A4'=>'76','A5'=>'1.5','A6'=>'6');
-
- &setmaxrow($sheetone,6);
+ &readsheet($sheetone,$r->filename);
+ &updaterows($sheetone);
&calcsheet($sheetone);
$r->print(&outsheet($sheetone));
+
$r->print('