--- loncom/interface/Attic/lonspreadsheet.pm 2000/12/06 14:50:47 1.6 +++ 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; @@ -10,7 +10,7 @@ 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; @@ -48,20 +48,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 +88,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 +112,9 @@ sub mask { } $num.=')'; } else { - $num.='['.$lda[$#lda].'-'.$uda[$#uda].']'; + if ($lda[$#lda]!=$uda[$#uda]) { + $num.='['.$lda[$#lda].'-'.$uda[$#uda].']'; + } } } } @@ -242,8 +251,8 @@ sub sett { } } 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; @@ -287,7 +296,9 @@ 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; } @@ -388,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.')'); @@ -412,11 +427,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,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); @@ -510,6 +530,7 @@ sub updaterows { '___'.$resid.'___'. &Apache::lonnet::declutter($srcf); $allassess{$symb}=$bighash{'title_'.$id}; + if ($stype eq 'assesscalc') { map { if ($_=~/^stores\_(.*)/) { @@ -520,6 +541,8 @@ sub updaterows { $display= &Apache::lonnet::metadata($srcf,$key.'.name'); } + + $allkeys{$key}=$display; } } split(/\,/,&Apache::lonnet::metadata($srcf,'keys')); @@ -614,29 +637,39 @@ sub rowaassess { sub handler { - my $r=shift; - $r->content_type('text/html'); - $r->send_http_header; + 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')) { + + $r->content_type('text/html'); + $r->send_http_header; - $r->print('LON-CAPA Spreadsheet'); - $r->print(''); + $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); + &readsheet($sheetone,$r->filename); + &updaterows($sheetone); &calcsheet($sheetone); $r->print(&outsheet($sheetone)); + $r->print(''); + + } 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$_