version 1.81, 2002/04/08 18:28:03
|
version 1.100.4.1, 2002/09/27 18:43:10
|
Line 71 use Apache::lonnet;
|
Line 71 use Apache::lonnet;
|
use Apache::Constants qw(:common :http); |
use Apache::Constants qw(:common :http); |
use GDBM_File; |
use GDBM_File; |
use HTML::TokeParser; |
use HTML::TokeParser; |
|
use Apache::lonhtmlcommon; |
# |
# |
# Caches for previously calculated spreadsheets |
# Caches for previously calculated spreadsheets |
# |
# |
Line 106 my %courseopt;
|
Line 106 my %courseopt;
|
my %useropt; |
my %useropt; |
my %parmhash; |
my %parmhash; |
|
|
|
# |
|
# Some hashes for stats on timing and performance |
|
# |
|
|
|
my %starttimes; |
|
my %usedtimes; |
|
my %numbertimes; |
|
|
# Stuff that only the screen handler can know |
# Stuff that only the screen handler can know |
|
|
my $includedir; |
my $includedir; |
Line 122 sub initsheet {
|
Line 130 sub initsheet {
|
$safeeval->permit("sort"); |
$safeeval->permit("sort"); |
$safeeval->deny(":base_io"); |
$safeeval->deny(":base_io"); |
$safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT'); |
$safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT'); |
|
$safeeval->share('$@'); |
my $code=<<'ENDDEFS'; |
my $code=<<'ENDDEFS'; |
# ---------------------------------------------------- Inside of the safe space |
# ---------------------------------------------------- Inside of the safe space |
|
|
Line 165 $cfn='';
|
Line 174 $cfn='';
|
|
|
$usymb=''; |
$usymb=''; |
|
|
|
# error messages |
|
|
|
$errormsg=''; |
|
|
sub mask { |
sub mask { |
my ($lower,$upper)=@_; |
my ($lower,$upper)=@_; |
|
|
Line 508 sub HASH {
|
Line 521 sub HASH {
|
return $Values[-1]; |
return $Values[-1]; |
} |
} |
|
|
|
#------------------------------------------------------- |
|
|
|
=item NUM(range) |
|
|
|
returns the number of items in the range. |
|
|
|
=cut |
|
|
|
#------------------------------------------------------- |
sub NUM { |
sub NUM { |
my $mask=mask(@_); |
my $mask=mask(@_); |
my $num= $#{@{grep(/$mask/,keys(%v))}}+1; |
my $num= $#{@{grep(/$mask/,keys(%v))}}+1; |
Line 527 sub BIN {
|
Line 549 sub BIN {
|
} |
} |
|
|
|
|
|
#------------------------------------------------------- |
|
|
|
=item SUM(range) |
|
|
|
returns the sum of items in the range. |
|
|
|
=cut |
|
|
|
#------------------------------------------------------- |
sub SUM { |
sub SUM { |
my $mask=mask(@_); |
my $mask=mask(@_); |
my $sum=0; |
my $sum=0; |
Line 536 sub SUM {
|
Line 567 sub SUM {
|
return $sum; |
return $sum; |
} |
} |
|
|
|
#------------------------------------------------------- |
|
|
|
=item MEAN(range) |
|
|
|
compute the average of the items in the range. |
|
|
|
=cut |
|
|
|
#------------------------------------------------------- |
sub MEAN { |
sub MEAN { |
my $mask=mask(@_); |
my $mask=mask(@_); |
my $sum=0; my $num=0; |
my $sum=0; my $num=0; |
Line 550 sub MEAN {
|
Line 590 sub MEAN {
|
} |
} |
} |
} |
|
|
|
#------------------------------------------------------- |
|
|
|
=item STDDEV(range) |
|
|
|
compute the standard deviation of the items in the range. |
|
|
|
=cut |
|
|
|
#------------------------------------------------------- |
sub STDDEV { |
sub STDDEV { |
my $mask=mask(@_); |
my $mask=mask(@_); |
my $sum=0; my $num=0; |
my $sum=0; my $num=0; |
Line 566 sub STDDEV {
|
Line 615 sub STDDEV {
|
return sqrt($sum/($num-1)); |
return sqrt($sum/($num-1)); |
} |
} |
|
|
|
#------------------------------------------------------- |
|
|
|
=item PROD(range) |
|
|
|
compute the product of the items in the range. |
|
|
|
=cut |
|
|
|
#------------------------------------------------------- |
sub PROD { |
sub PROD { |
my $mask=mask(@_); |
my $mask=mask(@_); |
my $prod=1; |
my $prod=1; |
Line 575 sub PROD {
|
Line 633 sub PROD {
|
return $prod; |
return $prod; |
} |
} |
|
|
|
#------------------------------------------------------- |
|
|
|
=item MAX(range) |
|
|
|
compute the maximum of the items in the range. |
|
|
|
=cut |
|
|
|
#------------------------------------------------------- |
sub MAX { |
sub MAX { |
my $mask=mask(@_); |
my $mask=mask(@_); |
my $max='-'; |
my $max='-'; |
Line 585 sub MAX {
|
Line 652 sub MAX {
|
return $max; |
return $max; |
} |
} |
|
|
|
#------------------------------------------------------- |
|
|
|
=item MIN(range) |
|
|
|
compute the minimum of the items in the range. |
|
|
|
=cut |
|
|
|
#------------------------------------------------------- |
sub MIN { |
sub MIN { |
my $mask=mask(@_); |
my $mask=mask(@_); |
my $min='-'; |
my $min='-'; |
Line 595 sub MIN {
|
Line 671 sub MIN {
|
return $min; |
return $min; |
} |
} |
|
|
|
#------------------------------------------------------- |
|
|
|
=item SUMMAX(num,lower,upper) |
|
|
|
compute the sum of the largest 'num' items in the range from |
|
'lower' to 'upper' |
|
|
|
=cut |
|
|
|
#------------------------------------------------------- |
sub SUMMAX { |
sub SUMMAX { |
my ($num,$lower,$upper)=@_; |
my ($num,$lower,$upper)=@_; |
my $mask=mask($lower,$upper); |
my $mask=mask($lower,$upper); |
my @inside=(); |
my @inside=(); |
foreach (grep /$mask/,keys(%v)) { |
foreach (grep /$mask/,keys(%v)) { |
$inside[$#inside+1]=$v{$_}; |
push (@inside,$v{$_}); |
} |
} |
@inside=sort(@inside); |
@inside=sort(@inside); |
my $sum=0; my $i; |
my $sum=0; my $i; |
Line 610 sub SUMMAX {
|
Line 696 sub SUMMAX {
|
return $sum; |
return $sum; |
} |
} |
|
|
|
#------------------------------------------------------- |
|
|
|
=item SUMMIN(num,lower,upper) |
|
|
|
compute the sum of the smallest 'num' items in the range from |
|
'lower' to 'upper' |
|
|
|
=cut |
|
|
|
#------------------------------------------------------- |
sub SUMMIN { |
sub SUMMIN { |
my ($num,$lower,$upper)=@_; |
my ($num,$lower,$upper)=@_; |
my $mask=mask($lower,$upper); |
my $mask=mask($lower,$upper); |
Line 657 sub expandnamed {
|
Line 753 sub expandnamed {
|
return 0; |
return 0; |
} |
} |
} else { |
} else { |
return '$c{\''.$expression.'\'}'; |
# it is not a function, so it is a parameter name |
|
# We should do the following: |
|
# 1. Take the list of parameter names |
|
# 2. look through the list for ones that match the parameter we want |
|
# 3. If there are no collisions, return the one that matches |
|
# 4. If there is a collision, return 'bad parameter name error' |
|
my $returnvalue = ''; |
|
my @matches = (); |
|
$#matches = -1; |
|
study $expression; |
|
foreach $parameter (keys(%c)) { |
|
push @matches,$parameter if ($parameter =~ /$expression/); |
|
} |
|
if ($#matches == 0) { |
|
$returnvalue = '$c{\''.$matches[0].'\'}'; |
|
} elsif ($#matches > 0) { |
|
# more than one match. Look for a concise one |
|
$returnvalue = "'non-unique parameter name : $expression'"; |
|
foreach (@matches) { |
|
if (/^$expression$/) { |
|
$returnvalue = '$c{\''.$_.'\'}'; |
|
} |
|
} |
|
} else { |
|
$returnvalue = "'bad parameter name : $expression'"; |
|
} |
|
return $returnvalue; |
} |
} |
} |
} |
|
|
Line 669 sub sett {
|
Line 791 sub sett {
|
} else { |
} else { |
$pattern='[A-Z]'; |
$pattern='[A-Z]'; |
} |
} |
|
|
|
# Deal with the template row |
foreach (keys(%f)) { |
foreach (keys(%f)) { |
if ($_=~/template\_(\w)/) { |
if ($_=~/template\_(\w)/) { |
my $col=$1; |
my $col=$1; |
Line 677 sub sett {
|
Line 801 sub sett {
|
if ($_=~/A(\d+)/) { |
if ($_=~/A(\d+)/) { |
my $trow=$1; |
my $trow=$1; |
if ($trow) { |
if ($trow) { |
|
# Get the name of this cell |
my $lb=$col.$trow; |
my $lb=$col.$trow; |
|
# Grab the template declaration |
$t{$lb}=$f{'template_'.$col}; |
$t{$lb}=$f{'template_'.$col}; |
|
# Replace '#' with the row number |
$t{$lb}=~s/\#/$trow/g; |
$t{$lb}=~s/\#/$trow/g; |
|
# Replace '....' with ',' |
$t{$lb}=~s/\.\.+/\,/g; |
$t{$lb}=~s/\.\.+/\,/g; |
|
# Replace 'A0' with the value from 'A0' |
$t{$lb}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g; |
$t{$lb}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g; |
|
# Replace parameters |
$t{$lb}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge; |
$t{$lb}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge; |
} |
} |
} |
} |
Line 689 sub sett {
|
Line 819 sub sett {
|
} |
} |
} |
} |
} |
} |
|
|
|
# Deal with the normal cells |
foreach (keys(%f)) { |
foreach (keys(%f)) { |
if (($f{$_}) && ($_!~/template\_/)) { |
if (($f{$_}) && ($_!~/template\_/)) { |
my $matches=($_=~/^$pattern(\d+)/); |
my $matches=($_=~/^$pattern(\d+)/); |
Line 704 sub sett {
|
Line 836 sub sett {
|
} |
} |
} |
} |
} |
} |
|
# For inserted lines, [B-Z] is also valid |
|
|
|
unless ($sheettype eq 'assesscalc') { |
|
foreach (keys(%f)) { |
|
if ($_=~/[B-Z](\d+)/) { |
|
if ($f{'A'.$1}=~/^[\~\-]/) { |
|
$t{$_}=$f{$_}; |
|
$t{$_}=~s/\.\.+/\,/g; |
|
$t{$_}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g; |
|
$t{$_}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge; |
|
} |
|
} |
|
} |
|
} |
|
|
|
# For some reason 'A0' gets special treatment... This seems superfluous |
|
# but I imagine it is here for a reason. |
$t{'A0'}=$f{'A0'}; |
$t{'A0'}=$f{'A0'}; |
$t{'A0'}=~s/\.\.+/\,/g; |
$t{'A0'}=~s/\.\.+/\,/g; |
$t{'A0'}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g; |
$t{'A0'}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g; |
Line 711 sub sett {
|
Line 860 sub sett {
|
} |
} |
|
|
sub calc { |
sub calc { |
%v=(); |
undef %v; |
&sett(); |
&sett(); |
my $notfinished=1; |
my $notfinished=1; |
|
my $lastcalc=''; |
my $depth=0; |
my $depth=0; |
while ($notfinished) { |
while ($notfinished) { |
$notfinished=0; |
$notfinished=0; |
foreach (keys(%t)) { |
foreach (keys(%t)) { |
my $old=$v{$_}; |
my $old=$v{$_}; |
$v{$_}=eval($t{$_}); |
$v{$_}=eval $t{$_}; |
if ($@) { |
if ($@) { |
%v=(); |
undef %v; |
return $@; |
return $_.': '.$@; |
} |
} |
if ($v{$_} ne $old) { $notfinished=1; } |
if ($v{$_} ne $old) { $notfinished=1; $lastcalc=$_; } |
} |
} |
$depth++; |
$depth++; |
if ($depth>100) { |
if ($depth>100) { |
%v=(); |
undef %v; |
return 'Maximum calculation depth exceeded'; |
return $lastcalc.': Maximum calculation depth exceeded'; |
} |
} |
} |
} |
return ''; |
return ''; |
Line 754 sub outrowassess {
|
Line 904 sub outrowassess {
|
my @cols=(); |
my @cols=(); |
if ($n) { |
if ($n) { |
my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{'A'.$n}); |
my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{'A'.$n}); |
|
if ($rl{$usy}) { |
$cols[0]=$rl{$usy}.'<br>'. |
$cols[0]=$rl{$usy}.'<br>'. |
'<select name="sel_'.$n.'" onChange="changesheet('.$n. |
'<select name="sel_'.$n.'" onChange="changesheet('.$n. |
')"><option name="default">Default</option>'; |
')"><option name="default">Default</option>'; |
|
} else { $cols[0]=''; } |
foreach (@os) { |
foreach (@os) { |
$cols[0].='<option name="'.$_.'"'; |
$cols[0].='<option name="'.$_.'"'; |
if ($ufn eq $_) { |
if ($ufn eq $_) { |
Line 774 sub outrowassess {
|
Line 926 sub outrowassess {
|
'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') { |
my $fm=$f{$_.$n}; |
my $fm=$f{$_.$n}; |
$fm=~s/[\'\"]/\&\#34;/g; |
$fm=~s/[\'\"]/\&\#34;/g; |
$cols[$#cols+1]="'$_$n','$fm'".'___eq___'.$v{$_.$n}; |
push(@cols,"'$_$n','$fm'".'___eq___'.$v{$_.$n}); |
} |
} |
return @cols; |
return @cols; |
} |
} |
Line 845 sub setrowlabels {
|
Line 997 sub setrowlabels {
|
|
|
sub calcsheet { |
sub calcsheet { |
my $safeeval=shift; |
my $safeeval=shift; |
$safeeval->reval('&calc();'); |
return $safeeval->reval('&calc();'); |
} |
} |
|
|
# ------------------------------------------------------------------ Get values |
# ------------------------------------------------------------------ Get values |
Line 862 sub getformulas {
|
Line 1014 sub getformulas {
|
return %{$safeeval->varglob('f')}; |
return %{$safeeval->varglob('f')}; |
} |
} |
|
|
|
# ----------------------------------------------------- Get value of $f{'A'.$n} |
|
|
|
sub getfa { |
|
my ($safeeval,$n)=@_; |
|
return $safeeval->reval('$f{"A'.$n.'"}'); |
|
} |
|
|
# -------------------------------------------------------------------- Get type |
# -------------------------------------------------------------------- Get type |
|
|
sub gettype { |
sub gettype { |
Line 1000 sub rown {
|
Line 1159 sub rown {
|
} |
} |
my $showf=0; |
my $showf=0; |
my $proc; |
my $proc; |
my $maxred; |
my $maxred=1; |
my $sheettype=&gettype($safeeval); |
my $sheettype=&gettype($safeeval); |
if ($sheettype eq 'studentcalc') { |
if ($sheettype eq 'studentcalc') { |
$proc='&outrowassess'; |
$proc='&outrowassess'; |
Line 1013 sub rown {
|
Line 1172 sub rown {
|
} else { |
} else { |
$maxred=26; |
$maxred=26; |
} |
} |
|
if (&getfa($safeeval,$n)=~/^[\~\-]/) { $maxred=1; } |
if ($n eq '-') { $proc='&templaterow'; $n=-1; $dataflag=1; } |
if ($n eq '-') { $proc='&templaterow'; $n=-1; $dataflag=1; } |
foreach ($safeeval->reval($proc.'('.$n.')')) { |
foreach ($safeeval->reval($proc.'('.$n.')')) { |
my $bgcolor=$defaultbg.((($showf-1)/5==int(($showf-1)/5))?'99':'DD'); |
my $bgcolor=$defaultbg.((($showf-1)/5==int(($showf-1)/5))?'99':'DD'); |
Line 1027 sub rown {
|
Line 1187 sub rown {
|
if ($vl eq '') { |
if ($vl eq '') { |
$vl='<font size=+2 color='.$bgcolor.'>#</font>'; |
$vl='<font size=+2 color='.$bgcolor.'>#</font>'; |
} |
} |
$rowdata.= |
$rowdata.='<td bgcolor='.$bgcolor.'>'; |
'<td bgcolor='.$bgcolor.'><a href="javascript:celledit('.$fm.');">'.$vl. |
if ($ENV{'request.role'} =~ /^st\./) { |
'</a></td>'; |
$rowdata.=$vl; |
|
} else { |
|
$rowdata.='<a href="javascript:celledit('.$fm.');">'. |
|
$vl.'</a>'; |
|
} |
|
$rowdata.='</td>'; |
} else { |
} else { |
$rowdata.='<td bgcolor='.$bgcolor.'> '.$vl.' </td>'; |
$rowdata.='<td bgcolor='.$bgcolor.'> '.$vl.' </td>'; |
} |
} |
Line 1149 sub othersheets {
|
Line 1314 sub othersheets {
|
return @alternatives; |
return @alternatives; |
} |
} |
|
|
|
|
|
# |
|
# -------------------------------------- Parse a spreadsheet |
|
# |
|
sub parse_sheet { |
|
# $sheetxml is a scalar reference or a scalar |
|
my ($sheetxml) = @_; |
|
if (! ref($sheetxml)) { |
|
my $tmp = $sheetxml; |
|
$sheetxml = \$tmp; |
|
} |
|
my %f; |
|
my $parser=HTML::TokeParser->new($sheetxml); |
|
my $token; |
|
while ($token=$parser->get_token) { |
|
if ($token->[0] eq 'S') { |
|
if ($token->[1] eq 'field') { |
|
$f{$token->[2]->{'col'}.$token->[2]->{'row'}}= |
|
$parser->get_text('/field'); |
|
} |
|
if ($token->[1] eq 'template') { |
|
$f{'template_'.$token->[2]->{'col'}}= |
|
$parser->get_text('/template'); |
|
} |
|
} |
|
} |
|
return \%f; |
|
} |
|
|
# |
# |
# -------------------------------------- Read spreadsheet formulas for a course |
# -------------------------------------- Read spreadsheet formulas for a course |
# |
# |
Line 1160 sub readsheet {
|
Line 1354 sub readsheet {
|
my $cdom=&getcdom($safeeval); |
my $cdom=&getcdom($safeeval); |
my $chome=&getchome($safeeval); |
my $chome=&getchome($safeeval); |
|
|
# --------- There is no filename. Look for defaults in course and global, cache |
if (! defined($fn)) { |
|
# There is no filename. Look for defaults in course and global, cache |
unless($fn) { |
|
unless ($fn=$defaultsheets{$cnum.'_'.$cdom.'_'.$stype}) { |
unless ($fn=$defaultsheets{$cnum.'_'.$cdom.'_'.$stype}) { |
$fn=&Apache::lonnet::reply('get:'.$cdom.':'.$cnum. |
my %tmphash = &Apache::lonnet::get('environment', |
':environment:spreadsheet_default_'.$stype, |
['spreadsheet_default_'.$stype], |
$chome); |
$cdom,$cnum); |
unless (($fn) && ($fn!~/^error\:/)) { |
my ($tmp) = keys(%tmphash); |
$fn='default_'.$stype; |
if ($tmp =~ /^(con_lost|error|no_such_host)/i) { |
} |
$fn = 'default_'.$stype; |
$defaultsheets{$cnum.'_'.$cdom.'_'.$stype}=$fn; |
} else { |
|
$fn = $tmphash{'spreadsheet_default_'.$stype}; |
|
} |
|
unless (($fn) && ($fn!~/^error\:/)) { |
|
$fn='default_'.$stype; |
|
} |
|
$defaultsheets{$cnum.'_'.$cdom.'_'.$stype}=$fn; |
} |
} |
} |
} |
|
|
Line 1189 sub readsheet {
|
Line 1388 sub readsheet {
|
my %f=(); |
my %f=(); |
|
|
if ($fn=~/^default\_/) { |
if ($fn=~/^default\_/) { |
my $sheetxml=''; |
my $sheetxml=''; |
{ |
|
my $fh; |
my $fh; |
my $dfn=$fn; |
my $dfn=$fn; |
$dfn=~s/\_/\./g; |
$dfn=~s/\_/\./g; |
if ($fh=Apache::File->new($includedir.'/'.$dfn)) { |
if ($fh=Apache::File->new($includedir.'/'.$dfn)) { |
$sheetxml=join('',<$fh>); |
$sheetxml=join('',<$fh>); |
} else { |
} else { |
$sheetxml='<field row="0" col="A">"Error"</field>'; |
$sheetxml='<field row="0" col="A">"Error"</field>'; |
} |
} |
} |
%f=%{&parse_sheet(\$sheetxml)}; |
my $parser=HTML::TokeParser->new(\$sheetxml); |
} elsif($fn=~/\/*\.spreadsheet$/) { |
my $token; |
my $sheetxml=&Apache::lonnet::getfile |
while ($token=$parser->get_token) { |
(&Apache::lonnet::filelocation('',$fn)); |
if ($token->[0] eq 'S') { |
if ($sheetxml == -1) { |
if ($token->[1] eq 'field') { |
$sheetxml='<field row="0" col="A">"Error loading spreadsheet ' |
$f{$token->[2]->{'col'}.$token->[2]->{'row'}}= |
.$fn.'"</field>'; |
$parser->get_text('/field'); |
} |
} |
%f=%{&parse_sheet(\$sheetxml)}; |
if ($token->[1] eq 'template') { |
} else { |
$f{'template_'.$token->[2]->{'col'}}= |
my $sheet=''; |
$parser->get_text('/template'); |
my %tmphash = &Apache::lonnet::dump($fn,$cdom,$cnum); |
|
my ($tmp) = keys(%tmphash); |
|
unless ($tmp =~ /^(con_lost|error|no_such_host)/i) { |
|
foreach (keys(%tmphash)) { |
|
$f{$_}=$tmphash{$_}; |
} |
} |
} |
} |
} |
} |
} else { |
|
my $sheet=''; |
|
my %tmphash = &Apache::lonnet::dump($fn,$cdom,$cnum); |
|
my ($tmp) = keys(%tmphash); |
|
unless ($tmp =~ /^(con_lost|error|no_such_host)/i) { |
|
foreach (keys(%tmphash)) { |
|
$f{$_}=$tmphash{$_}; |
|
} |
|
} |
|
} |
|
# --------------------------------------------------------------- Cache and set |
# --------------------------------------------------------------- Cache and set |
$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f); |
$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f); |
&setformulas($safeeval,%f); |
&setformulas($safeeval,%f); |
Line 1330 sub tmpread {
|
Line 1522 sub tmpread {
|
$fn=$tmpdir.$fn.'.tmp'; |
$fn=$tmpdir.$fn.'.tmp'; |
my $fh; |
my $fh; |
my %fo=(); |
my %fo=(); |
|
my $countrows=0; |
if ($fh=Apache::File->new($fn)) { |
if ($fh=Apache::File->new($fn)) { |
my $name; |
my $name; |
while ($name=<$fh>) { |
while ($name=<$fh>) { |
Line 1337 sub tmpread {
|
Line 1530 sub tmpread {
|
my $value=<$fh>; |
my $value=<$fh>; |
chomp($value); |
chomp($value); |
$fo{$name}=$value; |
$fo{$name}=$value; |
|
if ($name=~/^A(\d+)$/) { |
|
if ($1>$countrows) { |
|
$countrows=$1; |
|
} |
|
} |
} |
} |
} |
} |
if ($nform eq 'changesheet') { |
if ($nform eq 'changesheet') { |
Line 1344 sub tmpread {
|
Line 1542 sub tmpread {
|
unless ($ENV{'form.sel_'.$nfield} eq 'Default') { |
unless ($ENV{'form.sel_'.$nfield} eq 'Default') { |
$fo{'A'.$nfield}.='__&&&__'.$ENV{'form.sel_'.$nfield}; |
$fo{'A'.$nfield}.='__&&&__'.$ENV{'form.sel_'.$nfield}; |
} |
} |
|
} elsif ($nfield eq 'insertrow') { |
|
$countrows++; |
|
my $newrow=substr('000000'.$countrows,-7); |
|
if ($nform eq 'top') { |
|
$fo{'A'.$countrows}='--- '.$newrow; |
|
} else { |
|
$fo{'A'.$countrows}='~~~ '.$newrow; |
|
} |
} else { |
} else { |
if ($nfield) { $fo{$nfield}=$nform; } |
if ($nfield) { $fo{$nfield}=$nform; } |
} |
} |
Line 1459 sub updateclasssheet {
|
Line 1665 sub updateclasssheet {
|
my ($end,$start)=split(/\:/,&Apache::lonnet::unescape($value)); |
my ($end,$start)=split(/\:/,&Apache::lonnet::unescape($value)); |
my $active=1; |
my $active=1; |
if (($end) && ($now>$end)) { $active=0; } |
if (($end) && ($now>$end)) { $active=0; } |
|
$active = 1 if ($ENV{'form.Status'} eq 'Any'); |
|
$active = !$active if ($ENV{'form.Status'} eq 'Expired'); |
if ($active) { |
if ($active) { |
my $rowlabel=''; |
my $rowlabel=''; |
$name=&Apache::lonnet::unescape($name); |
$name=&Apache::lonnet::unescape($name); |
my ($sname,$sdom)=split(/\:/,$name); |
my ($sname,$sdom)=split(/\:/,$name); |
my $ssec=&Apache::lonnet::usection($sdom,$sname,$cid); |
my $ssec=&Apache::lonnet::usection($sdom,$sname,$cid); |
if ($ssec==-1) { |
# if ($ssec==-1) { |
unless ($ENV{'form.showcsv'}) { |
# unless ($ENV{'form.showcsv'}) { |
$rowlabel='<font color=red>Data not available: '.$name. |
# $rowlabel='<font color=red>Data not available: '.$name. |
'</font>'; |
# '</font>'; |
} else { |
# } else { |
$rowlabel='ERROR","'.$name. |
# $rowlabel='ERROR","'.$name. |
'","Data not available","","","'; |
# '","Data not available","","","'; |
} |
# } |
} else { |
# } else { |
my %reply=&Apache::lonnet::idrget($sdom,$sname); |
my %reply=&Apache::lonnet::idrget($sdom,$sname); |
my $reply=&Apache::lonnet::reply('get:'.$sdom.':'.$sname. |
my $reply=&Apache::lonnet::reply('get:'.$sdom.':'.$sname. |
':environment:firstname&middlename&lastname&generation', |
':environment:firstname&middlename&lastname&generation', |
Line 1495 sub updateclasssheet {
|
Line 1703 sub updateclasssheet {
|
unless ($ncount==4) { $rowlabel.=',""'; } |
unless ($ncount==4) { $rowlabel.=',""'; } |
$rowlabel=~s/\"$//; |
$rowlabel=~s/\"$//; |
} |
} |
} |
# } |
$currentlist{&Apache::lonnet::unescape($name)}=$rowlabel; |
$currentlist{&Apache::lonnet::unescape($name)}=$rowlabel; |
} |
} |
} # end of foreach (split(/\&/,$classlst)) |
} # end of foreach (split(/\&/,$classlst)) |
Line 1513 sub updateclasssheet {
|
Line 1721 sub updateclasssheet {
|
if ($_=~/^A(\d+)/) { |
if ($_=~/^A(\d+)/) { |
$maxrow=($1>$maxrow)?$1:$maxrow; |
$maxrow=($1>$maxrow)?$1:$maxrow; |
$existing{$f{$_}}=1; |
$existing{$f{$_}}=1; |
unless ((defined($currentlist{$f{$_}})) || (!$1)) { |
unless ((defined($currentlist{$f{$_}})) || (!$1) || |
|
($f{$_}=~/^(\~\~\~|\-\-\-)/)) { |
$f{$_}='!!! Obsolete'; |
$f{$_}='!!! Obsolete'; |
$changed=1; |
$changed=1; |
} |
} |
Line 1546 sub updatestudentassesssheet {
|
Line 1755 sub updatestudentassesssheet {
|
my $safeeval=shift; |
my $safeeval=shift; |
my %bighash; |
my %bighash; |
my $stype=&gettype($safeeval); |
my $stype=&gettype($safeeval); |
|
my $uname=&getuname($safeeval); |
|
my $udom =&getudom($safeeval); |
my %current=(); |
my %current=(); |
unless ($updatedata{$ENV{'request.course.fn'}.'_'.$stype}) { |
unless ($updatedata{ |
|
$ENV{'request.course.fn'}.'_'.$stype.'_'.$uname.'_'.$udom}) { |
# -------------------------------------------------------------------- Tie hash |
# -------------------------------------------------------------------- Tie hash |
if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db', |
if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db', |
&GDBM_READER,0640)) { |
&GDBM_READER(),0640)) { |
# --------------------------------------------------------- Get all assessments |
# --------------------------------------------------------- Get all assessments |
|
|
my %allkeys=('timestamp' => |
my %allkeys=('timestamp' => |
Line 1628 sub updatestudentassesssheet {
|
Line 1840 sub updatestudentassesssheet {
|
} elsif ($stype eq 'studentcalc') { |
} elsif ($stype eq 'studentcalc') { |
%current=%allassess; |
%current=%allassess; |
} |
} |
$updatedata{$ENV{'request.course.fn'}.'_'.$stype}= |
$updatedata{$ENV{'request.course.fn'}.'_'.$stype.'_'.$uname.'_'.$udom}= |
join('___;___',%current); |
join('___;___',%current); |
} else { |
} else { |
return 'Could not access course data'; |
return 'Could not access course data'; |
Line 1636 sub updatestudentassesssheet {
|
Line 1848 sub updatestudentassesssheet {
|
# ------------------------------------------------------ Get current from cache |
# ------------------------------------------------------ Get current from cache |
} else { |
} else { |
%current=split(/\_\_\_\;\_\_\_/, |
%current=split(/\_\_\_\;\_\_\_/, |
$updatedata{$ENV{'request.course.fn'}.'_'.$stype}); |
$updatedata{$ENV{'request.course.fn'}.'_'.$stype.'_'.$uname.'_'.$udom}); |
} |
} |
# -------------------- Find discrepancies between the course row table and this |
# -------------------- Find discrepancies between the course row table and this |
# |
# |
Line 1652 sub updatestudentassesssheet {
|
Line 1864 sub updatestudentassesssheet {
|
$maxrow=($1>$maxrow)?$1:$maxrow; |
$maxrow=($1>$maxrow)?$1:$maxrow; |
my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{$_}); |
my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{$_}); |
$existing{$usy}=1; |
$existing{$usy}=1; |
unless ((defined($current{$usy})) || (!$1)) { |
unless ((defined($current{$usy})) || (!$1) || |
$f{$_}='!!! Obsolete'; |
($f{$_}=~/^(\~\~\~|\-\-\-)/)){ |
|
$f{$_}='!!! Obsolete'; |
$changed=1; |
$changed=1; |
} elsif ($ufn) { |
} elsif ($ufn) { |
$current{$usy} |
$current{$usy} |
Line 1706 sub loadstudent {
|
Line 1919 sub loadstudent {
|
foreach (keys(%f)) { |
foreach (keys(%f)) { |
if ($_=~/^A(\d+)/) { |
if ($_=~/^A(\d+)/) { |
my $row=$1; |
my $row=$1; |
unless (($f{$_}=~/^\!/) || ($row==0)) { |
unless (($f{$_}=~/^[\!\~\-]/) || ($row==0)) { |
my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{$_}); |
my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{$_}); |
@assessdata=&exportsheet(&getuname($safeeval), |
@assessdata=&exportsheet(&getuname($safeeval), |
&getudom($safeeval), |
&getudom($safeeval), |
Line 1745 sub loadcourse {
|
Line 1958 sub loadcourse {
|
my $total=0; |
my $total=0; |
foreach (keys(%f)) { |
foreach (keys(%f)) { |
if ($_=~/^A(\d+)/) { |
if ($_=~/^A(\d+)/) { |
unless ($f{$_}=~/^\!/) { $total++; } |
unless ($f{$_}=~/^[\!\~\-]/) { $total++; } |
} |
} |
} |
} |
my $now=0; |
my $now=0; |
Line 1765 ENDPOP
|
Line 1978 ENDPOP
|
foreach (keys(%f)) { |
foreach (keys(%f)) { |
if ($_=~/^A(\d+)/) { |
if ($_=~/^A(\d+)/) { |
my $row=$1; |
my $row=$1; |
unless (($f{$_}=~/^\!/) || ($row==0)) { |
unless (($f{$_}=~/^[\!\~\-]/) || ($row==0)) { |
my @studentdata=&exportsheet(split(/\:/,$f{$_}), |
my @studentdata=&exportsheet(split(/\:/,$f{$_}), |
'studentcalc'); |
'studentcalc'); |
undef %userrdatas; |
undef %userrdatas; |
Line 1925 sub loadassessment {
|
Line 2138 sub loadassessment {
|
my %c=(); |
my %c=(); |
|
|
if (tie(%parmhash,'GDBM_File', |
if (tie(%parmhash,'GDBM_File', |
&getcfn($safeeval).'_parms.db',&GDBM_READER,0640)) { |
&getcfn($safeeval).'_parms.db',&GDBM_READER(),0640)) { |
my %f=&getformulas($safeeval); |
my %f=&getformulas($safeeval); |
foreach (keys(%f)) { |
foreach (keys(%f)) { |
if ($_=~/^A/) { |
if ($_=~/^A/) { |
unless ($f{$_}=~/^\!/) { |
unless ($f{$_}=~/^[\!\~\-]/) { |
if ($f{$_}=~/^parameter/) { |
if ($f{$_}=~/^parameter/) { |
if ($thisassess{$f{$_}}) { |
if ($thisassess{$f{$_}}) { |
my $val=&parmval($f{$_},$safeeval); |
my $val=&parmval($f{$_},$safeeval); |
Line 2253 sub handler {
|
Line 2466 sub handler {
|
return OK; |
return OK; |
} |
} |
|
|
|
if ($ENV{'request.role'} =~ /^st\./) { |
|
delete $ENV{'form.unewfield'} if (exists($ENV{'form.unewfield'})); |
|
delete $ENV{'form.unewformula'} if (exists($ENV{'form.unewformula'})); |
|
} |
|
|
# ---------------------------------------------------- Global directory configs |
# ---------------------------------------------------- Global directory configs |
|
|
$includedir=$r->dir_config('lonIncludes'); |
$includedir=$r->dir_config('lonIncludes'); |
Line 2264 $tmpdir=$r->dir_config('lonDaemons').'/t
|
Line 2482 $tmpdir=$r->dir_config('lonDaemons').'/t
|
|
|
# --------------------------- Get query string for limited number of parameters |
# --------------------------- Get query string for limited number of parameters |
|
|
foreach (split(/&/,$ENV{'QUERY_STRING'})) { |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
my ($name, $value) = split(/=/,$_); |
['uname','udom','usymb','ufn']); |
$value =~ tr/+/ /; |
|
$value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; |
|
if (($name eq 'uname') || ($name eq 'udom') || |
|
($name eq 'usymb') || ($name eq 'ufn')) { |
|
unless ($ENV{'form.'.$name}) { |
|
$ENV{'form.'.$name}=$value; |
|
} |
|
} |
|
} |
|
|
|
if (($ENV{'form.usymb'}=~/^\_(\w+)/) && (!$ENV{'form.ufn'})) { |
if (($ENV{'form.usymb'}=~/^\_(\w+)/) && (!$ENV{'form.ufn'})) { |
$ENV{'form.ufn'}='default_'.$1; |
$ENV{'form.ufn'}='default_'.$1; |
Line 2307 $tmpdir=$r->dir_config('lonDaemons').'/t
|
Line 2516 $tmpdir=$r->dir_config('lonDaemons').'/t
|
# --------------------------------------------------------------- Screen output |
# --------------------------------------------------------------- Screen output |
|
|
$r->print('<html><head><title>LON-CAPA Spreadsheet</title>'); |
$r->print('<html><head><title>LON-CAPA Spreadsheet</title>'); |
$r->print(<<ENDSCRIPT); |
if ($ENV{'request.role'} !~ /^st\./) { |
|
$r->print(<<ENDSCRIPT); |
<script language="JavaScript"> |
<script language="JavaScript"> |
|
|
function celledit(cn,cf) { |
function celledit(cn,cf) { |
var cnf=prompt(cn,cf); |
var cnf=prompt(cn,cf); |
if (cnf!=null) { |
if (cnf!=null) { |
document.sheet.unewfield.value=cn; |
document.sheet.unewfield.value=cn; |
document.sheet.unewformula.value=cnf; |
document.sheet.unewformula.value=cnf; |
document.sheet.submit(); |
document.sheet.submit(); |
} |
} |
Line 2325 $tmpdir=$r->dir_config('lonDaemons').'/t
|
Line 2535 $tmpdir=$r->dir_config('lonDaemons').'/t
|
document.sheet.submit(); |
document.sheet.submit(); |
} |
} |
|
|
|
function insertrow(cn) { |
|
document.sheet.unewfield.value='insertrow'; |
|
document.sheet.unewformula.value=cn; |
|
document.sheet.submit(); |
|
} |
|
|
</script> |
</script> |
ENDSCRIPT |
ENDSCRIPT |
|
} |
$r->print('</head><body bgcolor="#FFFFFF">'. |
$r->print('</head><body bgcolor="#FFFFFF">'. |
'<img align=right src=/adm/lonIcons/lonlogos.gif>'. |
'<img align=right src=/adm/lonIcons/lonlogos.gif>'. |
'<h1>LON-CAPA Spreadsheet</h1>'. |
'<h1>LON-CAPA Spreadsheet</h1>'. |
Line 2382 ENDSCRIPT
|
Line 2599 ENDSCRIPT
|
unless (&gettype($asheet) eq 'classcalc') { |
unless (&gettype($asheet) eq 'classcalc') { |
$r->print('<p><b>User:</b> '.&getuname($asheet). |
$r->print('<p><b>User:</b> '.&getuname($asheet). |
'<br><b>Domain:</b> '.&getudom($asheet)); |
'<br><b>Domain:</b> '.&getudom($asheet)); |
if (&getcsec($asheet) eq '-1') { |
# if (&getcsec($asheet) eq '-1') { |
$r->print('<h3><font color=red>'. |
# $r->print('<h3><font color=red>'. |
'Not a student in this course</font></h3>'); |
# 'Not a student in this course</font></h3>'); |
} else { |
# } else { |
$r->print('<br><b>Section/Group:</b> '.&getcsec($asheet)); |
$r->print('<br><b>Section/Group:</b> '.&getcsec($asheet)); |
} |
# } |
if ($ENV{'form.usymb'}) { |
if ($ENV{'form.usymb'}) { |
$r->print('<br><b>Assessment:</b> <tt>'.$ENV{'form.usymb'}.'</tt>'); |
$r->print('<br><b>Assessment:</b> <tt>'.$ENV{'form.usymb'}.'</tt>'); |
} |
} |
Line 2541 ENDSCRIPT
|
Line 2758 ENDSCRIPT
|
} |
} |
} |
} |
$r->print('>'); |
$r->print('>'); |
|
|
if (&gettype($asheet) eq 'classcalc') { |
if (&gettype($asheet) eq 'classcalc') { |
$r->print( |
$r->print( |
' Output CSV format: <input type=checkbox name=showcsv onClick="submit()"'); |
' Output CSV format: <input type=checkbox name=showcsv onClick="submit()"'); |
if ($ENV{'form.showcsv'}) { $r->print(' checked'); } |
if ($ENV{'form.showcsv'}) { $r->print(' checked'); } |
$r->print('>'); |
$r->print('>'); |
} |
} |
|
|
|
# ------------------------------------------------------------------ Insertrows |
|
$r->print(' Student Status: '. |
|
&Apache::lonhtmlcommon::StatusOptions |
|
($ENV{'form.Status'},'sheet')); |
|
|
|
$r->print(<<ENDINSERTBUTTONS); |
|
<br> |
|
<input type='button' onClick='insertrow("top");' |
|
value='Insert Row Top'> |
|
<input type='button' onClick='insertrow("bottom");' |
|
value='Insert Row Bottom'><br> |
|
ENDINSERTBUTTONS |
|
|
# ------------------------------------------------------------- Print out sheet |
# ------------------------------------------------------------- Print out sheet |
|
|
&outsheet($r,$asheet); |
&outsheet($r,$asheet); |