--- loncom/interface/Attic/lonspreadsheet.pm 2000/12/06 14:50:47 1.6
+++ loncom/interface/Attic/lonspreadsheet.pm 2000/12/09 19:14:20 1.10
@@ -1,16 +1,17 @@
# 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,12/09 Gerd Kortemeyer
package Apache::lonspreadsheet;
use strict;
+use vars qw(%spreadsheets);
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 +49,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 +89,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 +113,9 @@ sub mask {
}
$num.=')';
} else {
- $num.='['.$lda[$#lda].'-'.$uda[$#uda].']';
+ if ($lda[$#lda]!=$uda[$#uda]) {
+ $num.='['.$lda[$#lda].'-'.$uda[$#uda].']';
+ }
}
}
}
@@ -242,8 +252,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 +297,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 +400,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 +428,14 @@ 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',
- '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,18 +450,22 @@ 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 $fh=Apache::File->new($fn);
- $content=join('',<$fh>);
+ unless ($spreadsheets{$fn}) {
+ $spreadsheets{$fn}='';
+ {
+ my $fh;
+ if ($fh=Apache::File->new($fn)) {
+ $spreadsheets{$fn}=join('',<$fh>);
+ }
+ }
}
{
- my $parser=HTML::TokeParser->new(\$content);
+ my $parser=HTML::TokeParser->new(\$spreadsheets{$fn});
my $token;
while ($token=$parser->get_token) {
if ($token->[0] eq 'S') {
@@ -456,6 +479,41 @@ sub readsheet {
&setformulas($safeeval,%f);
}
+# ----------------------------------------------- Make a temp copy of the sheet
+
+sub tmpwrite {
+ my ($safeeval,$tmpdir,$uname,$udom,$symb)=@_;
+ my $fn=$uname.'_'.$udom.'_spreadsheet_'.&getfilename($safeeval);
+ $fn=~s/\W/\_/g;
+ $fn=$tmpdir.$fn.'.tmp';
+ my $fh;
+ if ($fh=Apache::File->new('>'.$fn)) {
+ print $fh join("\n",&getformulas($safeeval));
+ }
+}
+
+# ---------------------------------------------------------- Read the temp copy
+
+sub tmpread {
+ my ($safeeval,$tmpdir,$uname,$udom,$symb,$nfield,$nform)=@_;
+ my $fn=$uname.'_'.$udom.'_spreadsheet_'.&getfilename($safeeval);
+ $fn=~s/\W/\_/g;
+ $fn=$tmpdir.$fn.'.tmp';
+ my $fh;
+ my %fo=();
+ if ($fh=Apache::File->new($fn)) {
+ my $name;
+ while ($name=<$fh>) {
+ chomp($name);
+ my $value=<$fh>;
+ chomp($value);
+ $fo{$name}=$value;
+ }
+ }
+ $fo{$nfield}=$nform;
+ &setformulas($safeeval,%fo);
+}
+
# --------------------------------------------------------------- Read metadata
sub readmeta {
@@ -510,6 +568,7 @@ sub updaterows {
'___'.$resid.'___'.
&Apache::lonnet::declutter($srcf);
$allassess{$symb}=$bighash{'title_'.$id};
+
if ($stype eq 'assesscalc') {
map {
if ($_=~/^stores\_(.*)/) {
@@ -520,6 +579,8 @@ sub updaterows {
$display=
&Apache::lonnet::metadata($srcf,$key.'.name');
}
+
+
$allkeys{$key}=$display;
}
} split(/\,/,&Apache::lonnet::metadata($srcf,'keys'));
@@ -612,31 +673,120 @@ sub rowaassess {
&setconstants($safeeval,%c);
}
+# --------------------------------------------------------- Various form fields
-sub handler {
+sub textfield {
+ my ($title,$name,$value)=@_;
+ return "\n$title:
".
+ '';
+}
+
+sub hiddenfield {
+ my ($name,$value)=@_;
+ return "\n".'';
+}
+
+sub selectbox {
+ my ($title,$name,$value,%options)=@_;
+ my $selout="\n
$title:
".'';
+}
+# ---------------------------------------------------------------- Main handler
+
+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')) {
+
+# --------------------------- Get query string for limited number of parameters
+ map {
+ my ($name, $value) = split(/=/,$_);
+ $value =~ tr/+/ /;
+ $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+ if (($name='uname') || ($name='udom') || ($name='usymb')) {
+ unless ($ENV{'form.'.$name}) {
+ $ENV{'form.'.$name}=$value;
+ }
+ }
+ } (split(/&/,$ENV{'QUERY_STRING'}));
+
+# ------------------------------------------- Nothing there? Must be login user
- $r->print('
LON-CAPA Spreadsheet');
- $r->print('');
-
+ unless ($ENV{'form.uname'}) {
+ $ENV{'form.uname'}=$ENV{'user.name'};
+ $ENV{'form.udom'}=$ENV{'user.domain'};
+ }
+# ------------------------------------------------------------------- Open page
+
+ $r->content_type('text/html');
+ $r->send_http_header;
+
+ $r->print('LON-CAPA Spreadsheet');
+ $r->print(<
+
+ function celledit(cn,cf) {
+ var cnf=prompt(cn,cf);
+ if (cnf!=null) {
+ document.sheet.unewfield.value=cn;
+ document.sheet.unewformula.value=cnf;
+ document.sheet.submit();
+ }
+ }
+
+
+ENDSCRIPT
+ $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;
}