--- loncom/interface/Attic/lonspreadsheet.pm 2001/03/20 21:34:34 1.48
+++ loncom/interface/Attic/lonspreadsheet.pm 2002/01/22 10:05:24 1.79
@@ -1,3 +1,28 @@
+#
+# $Id: lonspreadsheet.pm,v 1.79 2002/01/22 10:05:24 matthew Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
# The LearningOnline Network with CAPA
# Spreadsheet/Grades Display Handler
#
@@ -5,7 +30,10 @@
# 12/08,12/09,12/11,12/12,12/15,12/16,12/18,12/19,12/30,
# 01/01/01,02/01,03/01,19/01,20/01,22/01,
# 03/05,03/08,03/10,03/12,03/13,03/15,03/17,
-# 03/19,03/20 Gerd Kortemeyer
+# 03/19,03/20,03/21,03/27,04/05,04/09,
+# 07/09,07/14,07/21,09/01,09/10,9/11,9/12,9/13,9/14,9/17,
+# 10/16,10/17,10/20,11/05,11/28,12/27 Gerd Kortemeyer
+# 01/14/02 Matthew
package Apache::lonspreadsheet;
@@ -77,12 +105,14 @@ sub initsheet {
# v: output values
# c: preloaded constants (A-column)
# rl: row label
+# os: other spreadsheets (for student spreadsheet only)
undef %v;
undef %t;
undef %f;
undef %c;
undef %rl;
+undef @os;
$maxrow=0;
$sheettype='';
@@ -138,16 +168,16 @@ sub mask {
} else {
if (length($ld)!=length($ud)) {
$num.='(';
- map {
+ foreach ($ld=~m/\d/g) {
$num.='['.$_.'-9]';
- } ($ld=~m/\d/g);
+ }
if (length($ud)-length($ld)>1) {
$num.='|\d{'.(length($ld)+1).','.(length($ud)-1).'}';
}
$num.='|';
- map {
+ foreach ($ud=~m/\d/g) {
$num.='[0-'.$_.']';
- } ($ud=~m/\d/g);
+ }
$num.=')';
} else {
my @lda=($ld=~m/\d/g);
@@ -187,10 +217,7 @@ sub mask {
sub NUM {
my $mask=mask(@_);
- my $num=0;
- map {
- $num++;
- } grep /$mask/,keys %v;
+ my $num= $#{@{grep(/$mask/,keys(%v))}}+1;
return $num;
}
@@ -198,11 +225,11 @@ sub BIN {
my ($low,$high,$lower,$upper)=@_;
my $mask=mask($lower,$upper);
my $num=0;
- map {
+ foreach (grep /$mask/,keys(%v)) {
if (($v{$_}>=$low) && ($v{$_}<=$high)) {
$num++;
}
- } grep /$mask/,keys %v;
+ }
return $num;
}
@@ -210,19 +237,19 @@ sub BIN {
sub SUM {
my $mask=mask(@_);
my $sum=0;
- map {
+ foreach (grep /$mask/,keys(%v)) {
$sum+=$v{$_};
- } grep /$mask/,keys %v;
+ }
return $sum;
}
sub MEAN {
my $mask=mask(@_);
my $sum=0; my $num=0;
- map {
+ foreach (grep /$mask/,keys(%v)) {
$sum+=$v{$_};
$num++;
- } grep /$mask/,keys %v;
+ }
if ($num) {
return $sum/$num;
} else {
@@ -233,45 +260,45 @@ sub MEAN {
sub STDDEV {
my $mask=mask(@_);
my $sum=0; my $num=0;
- map {
+ foreach (grep /$mask/,keys(%v)) {
$sum+=$v{$_};
$num++;
- } grep /$mask/,keys %v;
+ }
unless ($num>1) { return undef; }
my $mean=$sum/$num;
$sum=0;
- map {
+ foreach (grep /$mask/,keys(%v)) {
$sum+=($v{$_}-$mean)**2;
- } grep /$mask/,keys %v;
+ }
return sqrt($sum/($num-1));
}
sub PROD {
my $mask=mask(@_);
my $prod=1;
- map {
+ foreach (grep /$mask/,keys(%v)) {
$prod*=$v{$_};
- } grep /$mask/,keys %v;
+ }
return $prod;
}
sub MAX {
my $mask=mask(@_);
my $max='-';
- map {
+ foreach (grep /$mask/,keys(%v)) {
unless ($max) { $max=$v{$_}; }
if (($v{$_}>$max) || ($max eq '-')) { $max=$v{$_}; }
- } grep /$mask/,keys %v;
+ }
return $max;
}
sub MIN {
my $mask=mask(@_);
my $min='-';
- map {
+ foreach (grep /$mask/,keys(%v)) {
unless ($max) { $max=$v{$_}; }
if (($v{$_}<$min) || ($min eq '-')) { $min=$v{$_}; }
- } grep /$mask/,keys %v;
+ }
return $min;
}
@@ -279,9 +306,9 @@ sub SUMMAX {
my ($num,$lower,$upper)=@_;
my $mask=mask($lower,$upper);
my @inside=();
- map {
+ foreach (grep /$mask/,keys(%v)) {
$inside[$#inside+1]=$v{$_};
- } grep /$mask/,keys %v;
+ }
@inside=sort(@inside);
my $sum=0; my $i;
for ($i=$#inside;(($i>$#inside-$num) && ($i>=0));$i--) {
@@ -294,9 +321,9 @@ sub SUMMIN {
my ($num,$lower,$upper)=@_;
my $mask=mask($lower,$upper);
my @inside=();
- map {
+ foreach (grep /$mask/,keys(%v)) {
$inside[$#inside+1]=$v{$_};
- } grep /$mask/,keys %v;
+ }
@inside=sort(@inside);
my $sum=0; my $i;
for ($i=0;(($i<$num) && ($i<=$#inside));$i++) {
@@ -305,6 +332,42 @@ sub SUMMIN {
return $sum;
}
+sub expandnamed {
+ my $expression=shift;
+ if ($expression=~/^\&/) {
+ my ($func,$var,$formula)=($expression=~/^\&(\w+)\(([^\;]+)\;(.*)\)/);
+ my @vars=split(/\W+/,$formula);
+ my %values=();
+ undef %values;
+ foreach ( @vars ) {
+ my $varname=$_;
+ if ($varname=~/\D/) {
+ $formula=~s/$varname/'$c{\''.$varname.'\'}'/ge;
+ $varname=~s/$var/\(\\w\+\)/g;
+ foreach (keys(%c)) {
+ if ($_=~/$varname/) {
+ $values{$1}=1;
+ }
+ }
+ }
+ }
+ if ($func eq 'EXPANDSUM') {
+ my $result='';
+ foreach (keys(%values)) {
+ my $thissum=$formula;
+ $thissum=~s/$var/$_/g;
+ $result.=$thissum.'+';
+ }
+ $result=~s/\+$//;
+ return $result;
+ } else {
+ return 0;
+ }
+ } else {
+ return '$c{\''.$expression.'\'}';
+ }
+}
+
sub sett {
%t=();
my $pattern='';
@@ -313,11 +376,11 @@ sub sett {
} else {
$pattern='[A-Z]';
}
- map {
+ foreach (keys(%f)) {
if ($_=~/template\_(\w)/) {
my $col=$1;
unless ($col=~/^$pattern/) {
- map {
+ foreach (keys(%f)) {
if ($_=~/A(\d+)/) {
my $trow=$1;
if ($trow) {
@@ -326,14 +389,14 @@ sub sett {
$t{$lb}=~s/\#/$trow/g;
$t{$lb}=~s/\.\.+/\,/g;
$t{$lb}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g;
- $t{$lb}=~s/(^|[^\"\'])\[(\w+)\]/$1\$c\{\'$2\'\}/g;
+ $t{$lb}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge;
}
}
- } keys %f;
+ }
}
}
- } keys %f;
- map {
+ }
+ foreach (keys(%f)) {
if (($f{$_}) && ($_!~/template\_/)) {
my $matches=($_=~/^$pattern(\d+)/);
if (($matches) && ($1)) {
@@ -344,14 +407,14 @@ sub sett {
$t{$_}=$f{$_};
$t{$_}=~s/\.\.+/\,/g;
$t{$_}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g;
- $t{$_}=~s/(^|[^\"\'])\[([\w\.]+)\]/$1\$c\{\'$2\'\}/g;
+ $t{$_}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge;
}
}
- } keys %f;
+ }
$t{'A0'}=$f{'A0'};
$t{'A0'}=~s/\.\.+/\,/g;
$t{'A0'}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g;
- $t{'A0'}=~s/(^|[^\"\'])\[([\w\.]+)\]/$1\$c\{\'$2\'\}/g;
+ $t{'A0'}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge;
}
sub calc {
@@ -361,7 +424,7 @@ sub calc {
my $depth=0;
while ($notfinished) {
$notfinished=0;
- map {
+ foreach (keys(%t)) {
my $old=$v{$_};
$v{$_}=eval($t{$_});
if ($@) {
@@ -369,7 +432,7 @@ sub calc {
return $@;
}
if ($v{$_} ne $old) { $notfinished=1; }
- } keys %t;
+ }
$depth++;
if ($depth>100) {
%v=();
@@ -382,14 +445,14 @@ sub calc {
sub templaterow {
my @cols=();
$cols[0]='<b><font size=+1>Template</font></b>';
- map {
+ foreach ('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',
+ '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') {
my $fm=$f{'template_'.$_};
$fm=~s/[\'\"]/\&\#34;/g;
$cols[$#cols+1]="'template_$_','$fm'".'___eq___'.$fm;
- } ('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',
- '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;
}
@@ -397,18 +460,29 @@ sub outrowassess {
my $n=shift;
my @cols=();
if ($n) {
- $cols[0]=$rl{$f{'A'.$n}};
+ my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{'A'.$n});
+ $cols[0]=$rl{$usy}.'<br>'.
+ '<select name="sel_'.$n.'" onChange="changesheet('.$n.
+ ')"><option name="default">Default</option>';
+ foreach (@os) {
+ $cols[0].='<option name="'.$_.'"';
+ if ($ufn eq $_) {
+ $cols[0].=' selected';
+ }
+ $cols[0].='>'.$_.'</option>';
+ }
+ $cols[0].='</select>';
} else {
$cols[0]='<b><font size=+1>Export</font></b>';
}
- map {
+ foreach ('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',
+ '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') {
my $fm=$f{$_.$n};
$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',
- '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;
}
@@ -420,23 +494,23 @@ sub outrow {
} else {
$cols[0]='<b><font size=+1>Export</font></b>';
}
- map {
+ foreach ('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',
+ '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') {
my $fm=$f{$_.$n};
$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',
- '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;
}
sub exportrowa {
my @exportarray=();
- map {
+ foreach ('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') {
$exportarray[$#exportarray+1]=$v{$_.'0'};
- } ('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 @exportarray;
}
@@ -460,6 +534,13 @@ sub setconstants {
%{$safeeval->varglob('c')}=%c;
}
+# --------------------------------------------- Set names of other spreadsheets
+
+sub setothersheets {
+ my ($safeeval,@os)=@_;
+ @{$safeeval->varglob('os')}=@os;
+}
+
# ------------------------------------------------ Add or change formula values
sub setrowlabels {
@@ -600,6 +681,7 @@ sub exportdata {
return $safeeval->reval('&exportrowa()');
}
+
# ========================================================== End of Spreadsheet
# =============================================================================
@@ -612,44 +694,40 @@ sub rown {
my ($safeeval,$n)=@_;
my $defaultbg;
my $rowdata='';
+ my $dataflag=0;
unless ($n eq '-') {
$defaultbg=((($n-1)/5)==int(($n-1)/5))?'#E0E0':'#FFFF';
} else {
$defaultbg='#E0FF';
}
- if ((($n-1)/25)==int(($n-1)/25)) {
- my $what='Student';
- if (&gettype($safeeval) eq 'assesscalc') {
- $what='Item';
- } elsif (&gettype($safeeval) eq 'studentcalc') {
- $what='Assessment';
- }
- $rowdata.="</table>\n<br><table border=2>".
- '<tr><td> <td>'.$what.'</td>';
- map {
- $rowdata.='<td>'.$_.'</td>';
- } ('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',
- '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');
- $rowdata.='</tr>';
+ unless ($ENV{'form.showcsv'}) {
+ $rowdata.="\n<tr><td><b><font size=+1>$n</font></b></td>";
+ } else {
+ $rowdata.="\n".'"'.$n.'"';
}
- $rowdata.="\n<tr><td><b><font size=+1>$n</font></b></td>";
my $showf=0;
my $proc;
my $maxred;
- if (&gettype($safeeval) eq 'assesscalc') {
+ my $sheettype=&gettype($safeeval);
+ if ($sheettype eq 'studentcalc') {
$proc='&outrowassess';
- $maxred=1;
+ $maxred=26;
} else {
$proc='&outrow';
+ }
+ if ($sheettype eq 'assesscalc') {
+ $maxred=1;
+ } else {
$maxred=26;
}
- if ($n eq '-') { $proc='&templaterow'; $n=-1; }
- map {
+ if ($n eq '-') { $proc='&templaterow'; $n=-1; $dataflag=1; }
+ foreach ($safeeval->reval($proc.'('.$n.')')) {
my $bgcolor=$defaultbg.((($showf-1)/5==int(($showf-1)/5))?'99':'DD');
my ($fm,$vl)=split(/\_\_\_eq\_\_\_/,$_);
+ if ((($vl ne '') || ($vl eq '0')) &&
+ (($showf==1) || ($sheettype ne 'studentcalc'))) { $dataflag=1; }
if ($showf==0) { $vl=$_; }
+ unless ($ENV{'form.showcsv'}) {
if ($showf<=$maxred) { $bgcolor='#FFDDDD'; }
if (($n==0) && ($showf<=26)) { $bgcolor='#CCCCFF'; }
if (($showf>$maxred) || ((!$n) && ($showf>0))) {
@@ -662,9 +740,16 @@ sub rown {
} else {
$rowdata.='<td bgcolor='.$bgcolor.'> '.$vl.' </td>';
}
+ } else {
+ $rowdata.=',"'.$vl.'"';
+ }
$showf++;
- } $safeeval->reval($proc.'('.$n.')');
- return $rowdata.'</tr>';
+ } # End of foreach($safeval...)
+ if ($ENV{'form.showall'} || ($dataflag)) {
+ return $rowdata.($ENV{'form.showcsv'}?'':'</tr>');
+ } else {
+ return '';
+ }
}
# ------------------------------------------------------------- Print out sheet
@@ -684,7 +769,9 @@ sub outsheet {
$realm='Course';
}
my $maxyellow=52-$maxred;
- my $tabledata=
+ my $tabledata;
+ unless ($ENV{'form.showcsv'}) {
+ $tabledata=
'<table border=2><tr><th colspan=2 rowspan=2><font size=+2>'.
$realm.'</font></th>'.
'<td bgcolor=#FFDDDD colspan='.$maxred.
@@ -692,7 +779,10 @@ sub outsheet {
'<td colspan='.$maxyellow.
'><b><font size=+1>Calculations</font></b></td></tr><tr>';
my $showf=0;
- map {
+ foreach ('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',
+ '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') {
$showf++;
if ($showf<=$maxred) {
$tabledata.='<td bgcolor="#FFDDDD">';
@@ -700,19 +790,74 @@ sub outsheet {
$tabledata.='<td>';
}
$tabledata.="<b><font size=+1>$_</font></b></td>";
- } ('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',
- '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.='</tr>';
+ }
+ $tabledata.='</tr>'.&rown($safeeval,'-').&rown($safeeval,0);
+ } else { $tabledata='<pre>'; }
+
+ $r->print($tabledata);
+
my $row;
my $maxrow=&getmaxrow($safeeval);
- $tabledata.=&rown($safeeval,'-');
- $r->print($tabledata);
- for ($row=0;$row<=$maxrow;$row++) {
- $r->print(&rown($safeeval,$row));
+
+ my @sortby=();
+ my @sortidx=();
+ for ($row=1;$row<=$maxrow;$row++) {
+ $sortby[$row-1]=$safeeval->reval('$f{"A'.$row.'"}');
+ $sortidx[$row-1]=$row-1;
+ }
+ @sortidx=sort { $sortby[$a] cmp $sortby[$b]; } @sortidx;
+
+ my $what='Student';
+ if (&gettype($safeeval) eq 'assesscalc') {
+ $what='Item';
+ } elsif (&gettype($safeeval) eq 'studentcalc') {
+ $what='Assessment';
+ }
+
+ my $n=0;
+ for ($row=0;$row<$maxrow;$row++) {
+ my $thisrow=&rown($safeeval,$sortidx[$row]+1);
+ if ($thisrow) {
+ if (($n/25==int($n/25)) && (!$ENV{'form.showcsv'})) {
+ $r->print("</table>\n<br>\n");
+ $r->rflush();
+ $r->print('<table border=2><tr><td> <td>'.$what.'</td>');
+ foreach ('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',
+ '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') {
+ $r->print('<td>'.$_.'</td>');
+ }
+ $r->print('</tr>');
+ }
+ $n++;
+ $r->print($thisrow);
+ }
}
- $r->print('</table>');
+ $r->print($ENV{'form.showcsv'}?'</pre>':'</table>');
+}
+
+#
+# ----------------------------------------------- Read list of available sheets
+#
+
+sub othersheets {
+ my ($safeeval,$stype)=@_;
+
+ my $cnum=&getcnum($safeeval);
+ my $cdom=&getcdom($safeeval);
+ my $chome=&getchome($safeeval);
+
+ my @alternatives=();
+ my $result=&Apache::lonnet::reply('dump:'.$cdom.':'.$cnum.':'.
+ $stype.'_spreadsheets',$chome);
+ if ($result!~/^error\:/) {
+ foreach (split(/\&/,$result)) {
+ $alternatives[$#alternatives+1]=
+ &Apache::lonnet::unescape((split(/\=/,$_))[0]);
+ }
+ }
+ return @alternatives;
}
#
@@ -758,10 +903,13 @@ sub readsheet {
my $sheetxml='';
{
my $fh;
- if ($fh=Apache::File->new($includedir.
- '/default.'.&gettype($safeeval))) {
+ my $dfn=$fn;
+ $dfn=~s/\_/\./g;
+ if ($fh=Apache::File->new($includedir.'/'.$dfn)) {
$sheetxml=join('',<$fh>);
- }
+ } else {
+ $sheetxml='<field row="0" col="A">"Error"</field>';
+ }
}
my $parser=HTML::TokeParser->new(\$sheetxml);
my $token;
@@ -784,11 +932,11 @@ sub readsheet {
unless ($reply=~/^error\:/) {
$sheet=$reply;
}
- map {
+ foreach (split(/\&/,$sheet)) {
my ($name,$value)=split(/\=/,$_);
$f{&Apache::lonnet::unescape($name)}=
&Apache::lonnet::unescape($value);
- } split(/\&/,$sheet);
+ }
}
# --------------------------------------------------------------- Cache and set
$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f);
@@ -834,17 +982,20 @@ sub writesheet {
$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f);
# ----------------------------------------------------------------- Write sheet
my $sheetdata='';
- map {
+ foreach (keys(%f)) {
+ unless ($f{$_} eq 'import') {
$sheetdata.=&Apache::lonnet::escape($_).'='.
&Apache::lonnet::escape($f{$_}).'&';
- } keys %f;
+ }
+ }
$sheetdata=~s/\&$//;
my $reply=&Apache::lonnet::reply('put:'.$cdom.':'.$cnum.':'.$fn.':'.
$sheetdata,$chome);
if ($reply eq 'ok') {
$reply=&Apache::lonnet::reply('put:'.$cdom.':'.$cnum.':'.
$stype.'_spreadsheets:'.
- &Apache::lonnet::escape($fn).'='.$ENV{'user.name'},
+ &Apache::lonnet::escape($fn).'='.$ENV{'user.name'}.'@'.
+ $ENV{'user.domain'},
$chome);
if ($reply eq 'ok') {
if ($makedef) {
@@ -902,7 +1053,14 @@ sub tmpread {
$fo{$name}=$value;
}
}
- if ($nfield) { $fo{$nfield}=$nform; }
+ if ($nform eq 'changesheet') {
+ $fo{'A'.$nfield}=(split(/\_\_\&\&\&\_\_/,$fo{'A'.$nfield}))[0];
+ unless ($ENV{'form.sel_'.$nfield} eq 'Default') {
+ $fo{'A'.$nfield}.='__&&&__'.$ENV{'form.sel_'.$nfield};
+ }
+ } else {
+ if ($nfield) { $fo{$nfield}=$nform; }
+ }
&setformulas($safeeval,%fo);
}
@@ -930,7 +1088,7 @@ sub parmval {
# ----------------------------------------------------- Cascading lookup scheme
my $rwhat=$what;
$what=~s/^parameter\_//;
- $what=~s/\_/\./;
+ $what=~s/\_([^\_]+)$/\.$1/;
my $symbparm=$symb.'.'.$what;
my $mapparm=$mapname.'___(all).'.$what;
@@ -1010,7 +1168,7 @@ sub updateclasssheet {
my %currentlist=();
my $now=time;
unless ($classlst=~/^error\:/) {
- map {
+ foreach (split(/\&/,$classlst)) {
my ($name,$value)=split(/\=/,$_);
my ($end,$start)=split(/\:/,&Apache::lonnet::unescape($value));
my $active=1;
@@ -1021,24 +1179,40 @@ sub updateclasssheet {
my ($sname,$sdom)=split(/\:/,$name);
my $ssec=&Apache::lonnet::usection($sdom,$sname,$cid);
if ($ssec==-1) {
+ unless ($ENV{'form.showcsv'}) {
$rowlabel='<font color=red>Data not available: '.$name.
'</font>';
+ } else {
+ $rowlabel='ERROR","'.$name.
+ '","Data not available","","","';
+ }
} else {
my %reply=&Apache::lonnet::idrget($sdom,$sname);
my $reply=&Apache::lonnet::reply('get:'.$sdom.':'.$sname.
':environment:firstname&middlename&lastname&generation',
&Apache::lonnet::homeserver($sname,$sdom));
+ unless ($ENV{'form.showcsv'}) {
$rowlabel='<a href="/adm/studentcalc?uname='.$sname.
'&udom='.$sdom.'">'.
$ssec.' '.$reply{$sname}.'<br>';
- map {
+ foreach ( split(/\&/,$reply)) {
$rowlabel.=&Apache::lonnet::unescape($_).' ';
- } split(/\&/,$reply);
+ }
$rowlabel.='</a>';
+ } else {
+ $rowlabel=$ssec.'","'.$reply{$sname}.'"';
+ my $ncount=0;
+ foreach (split(/\&/,$reply)) {
+ $rowlabel.=',"'.&Apache::lonnet::unescape($_).'"';
+ $ncount++;
+ }
+ unless ($ncount==4) { $rowlabel.=',""'; }
+ $rowlabel=~s/\"$//;
+ }
}
$currentlist{&Apache::lonnet::unescape($name)}=$rowlabel;
}
- } split(/\&/,$classlst);
+ } # end of foreach (split(/\&/,$classlst))
#
# -------------------- Find discrepancies between the course row table and this
#
@@ -1049,7 +1223,7 @@ sub updateclasssheet {
my %existing=();
# ----------------------------------------------------------- Now obsolete rows
- map {
+ foreach (keys(%f)) {
if ($_=~/^A(\d+)/) {
$maxrow=($1>$maxrow)?$1:$maxrow;
$existing{$f{$_}}=1;
@@ -1058,17 +1232,17 @@ sub updateclasssheet {
$changed=1;
}
}
- } keys %f;
+ }
# -------------------------------------------------------- New and unknown keys
- map {
+ foreach (sort keys(%currentlist)) {
unless ($existing{$_}) {
$changed=1;
$maxrow++;
$f{'A'.$maxrow}=$_;
}
- } sort keys %currentlist;
+ }
if ($changed) { &setformulas($safeeval,%f); }
@@ -1093,10 +1267,37 @@ sub updatestudentassesssheet {
&GDBM_READER,0640)) {
# --------------------------------------------------------- Get all assessments
- my %allkeys=();
- my %allassess=();
+ my %allkeys=('timestamp' =>
+ 'Timestamp of Last Transaction<br>timestamp',
+ 'subnumber' =>
+ 'Number of Submissions<br>subnumber',
+ 'tutornumber' =>
+ 'Number of Tutor Responses<br>tutornumber',
+ 'totalpoints' =>
+ 'Total Points Granted<br>totalpoints');
+
+ my $adduserstr='';
+ if ((&getuname($safeeval) ne $ENV{'user.name'}) ||
+ (&getudom($safeeval) ne $ENV{'user.domain'})) {
+ $adduserstr='&uname='.&getuname($safeeval).
+ '&udom='.&getudom($safeeval);
+ }
+
+ my %allassess=('_feedback' =>
+ '<a href="/adm/assesscalc?usymb=_feedback'.$adduserstr.
+ '">Feedback</a>',
+ '_evaluation' =>
+ '<a href="/adm/assesscalc?usymb=_evaluation'.$adduserstr.
+ '">Evaluation</a>',
+ '_tutoring' =>
+ '<a href="/adm/assesscalc?usymb=_tutoring'.$adduserstr.
+ '">Tutoring</a>',
+ '_discussion' =>
+ '<a href="/adm/assesscalc?usymb=_discussion'.$adduserstr.
+ '">Discussion</a>'
+ );
- map {
+ foreach (keys(%bighash)) {
if ($_=~/^src\_(\d+)\.(\d+)$/) {
my $mapid=$1;
my $resid=$2;
@@ -1108,9 +1309,11 @@ sub updatestudentassesssheet {
'___'.$resid.'___'.
&Apache::lonnet::declutter($srcf);
$allassess{$symb}=
- '<a href="/adm/assesscalc?usymb='.$symb.'">'.$bighash{'title_'.$id}.'</a>';
+ '<a href="/adm/assesscalc?usymb='.$symb.$adduserstr.'">'.
+ $bighash{'title_'.$id}.'</a>';
if ($stype eq 'assesscalc') {
- map {
+ foreach (split(/\,/,
+ &Apache::lonnet::metadata($srcf,'keys'))) {
if (($_=~/^stores\_(.*)/) || ($_=~/^parameter\_(.*)/)) {
my $key=$_;
my $display=
@@ -1122,11 +1325,11 @@ sub updatestudentassesssheet {
$display.='<br>'.$key;
$allkeys{$key}=$display;
}
- } split(/\,/,&Apache::lonnet::metadata($srcf,'keys'));
+ } # end of foreach
}
}
}
- } keys %bighash;
+ } # end of foreach (keys(%bighash))
untie(%bighash);
#
@@ -1158,26 +1361,30 @@ sub updatestudentassesssheet {
my %existing=();
# ----------------------------------------------------------- Now obsolete rows
- map {
+ foreach (keys(%f)) {
if ($_=~/^A(\d+)/) {
$maxrow=($1>$maxrow)?$1:$maxrow;
- $existing{$f{$_}}=1;
- unless ((defined($current{$f{$_}})) || (!$1)) {
+ my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{$_});
+ $existing{$usy}=1;
+ unless ((defined($current{$usy})) || (!$1)) {
$f{$_}='!!! Obsolete';
$changed=1;
+ } elsif ($ufn) {
+ $current{$usy}
+ =~s/assesscalc\?usymb\=/assesscalc\?ufn\=$ufn\&usymb\=/;
}
}
- } keys %f;
+ }
# -------------------------------------------------------- New and unknown keys
- map {
+ foreach (keys(%current)) {
unless ($existing{$_}) {
$changed=1;
$maxrow++;
$f{'A'.$maxrow}=$_;
}
- } keys %current;
+ }
if ($changed) { &setformulas($safeeval,%f); }
@@ -1202,23 +1409,25 @@ sub loadstudent {
&getcid($safeeval),
&getuhome($safeeval));
unless ($reply=~/^error\:/) {
- map {
+ foreach ( split(/\&/,$reply)) {
my ($name,$value)=split(/\=/,$_);
$cachedstores{&Apache::lonnet::unescape($name)}=
&Apache::lonnet::unescape($value);
- } split(/\&/,$reply);
+ }
}
}
my @assessdata=();
- map {
+ foreach (keys(%f)) {
if ($_=~/^A(\d+)/) {
my $row=$1;
unless (($f{$_}=~/^\!/) || ($row==0)) {
+ my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{$_});
@assessdata=&exportsheet(&getuname($safeeval),
&getudom($safeeval),
- 'assesscalc',$f{$_});
+ 'assesscalc',$usy,$ufn);
my $index=0;
- map {
+ foreach ('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') {
if ($assessdata[$index]) {
my $col=$_;
if ($assessdata[$index]=~/\D/) {
@@ -1231,11 +1440,10 @@ sub loadstudent {
}
}
$index++;
- } ('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');
+ }
}
}
- } keys %f;
+ }
$cachedassess='';
undef %cachedstores;
&setformulas($safeeval,%f);
@@ -1249,18 +1457,18 @@ sub loadcourse {
my %c=();
my %f=&getformulas($safeeval);
my $total=0;
- map {
+ foreach (keys(%f)) {
if ($_=~/^A(\d+)/) {
unless ($f{$_}=~/^\!/) { $total++; }
}
- } keys %f;
+ }
my $now=0;
my $since=time;
$r->print(<<ENDPOP);
<script>
popwin=open('','popwin','width=400,height=100');
popwin.document.writeln('<html><body bgcolor="#FFFFFF">'+
- '<h1>Spreadsheet Calculation Progress</h1>'+
+ '<h3>Spreadsheet Calculation Progress</h3>'+
'<form name=popremain>'+
'<input type=text size=35 name=remaining value=Starting></form>'+
'</body></html>');
@@ -1268,7 +1476,7 @@ sub loadcourse {
</script>
ENDPOP
$r->rflush();
- map {
+ foreach (keys(%f)) {
if ($_=~/^A(\d+)/) {
my $row=$1;
unless (($f{$_}=~/^\!/) || ($row==0)) {
@@ -1282,7 +1490,8 @@ ENDPOP
$r->rflush();
my $index=0;
- map {
+ foreach ('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') {
if ($studentdata[$index]) {
my $col=$_;
if ($studentdata[$index]=~/\D/) {
@@ -1295,11 +1504,10 @@ ENDPOP
}
}
$index++;
- } ('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');
+ }
}
}
- } keys %f;
+ }
&setformulas($safeeval,%f);
&setconstants($safeeval,%c);
$r->print('<script>popwin.close()</script>');
@@ -1335,9 +1543,9 @@ sub loadassessment {
my $version=$cachedstores{'version:'.$symb};
my $scope;
for ($scope=1;$scope<=$version;$scope++) {
- map {
+ foreach (split(/\:/,$cachedstores{$scope.':keys:'.$symb})) {
$returnhash{$_}=$cachedstores{$scope.':'.$symb.':'.$_};
- } split(/\:/,$cachedstores{$scope.':keys:'.$symb});
+ }
}
} else {
@@ -1349,20 +1557,32 @@ sub loadassessment {
"restore:$udom:$uname:".
&Apache::lonnet::escape($namespace).":".
&Apache::lonnet::escape($symb),$uhome);
- map {
+ foreach (split(/\&/,$answer)) {
my ($name,$value)=split(/\=/,$_);
$returnhash{&Apache::lonnet::unescape($name)}=
&Apache::lonnet::unescape($value);
- } split(/\&/,$answer);
+ }
my $version;
for ($version=1;$version<=$returnhash{'version'};$version++) {
- map {
+ foreach (split(/\:/,$returnhash{$version.':keys'})) {
$returnhash{$_}=$returnhash{$version.':'.$_};
- } split(/\:/,$returnhash{$version.':keys'});
+ }
}
}
# ----------------------------- returnhash now has all stores for this resource
+# --------- convert all "_" to "." to be able to use libraries, multiparts, etc
+
+ my @oldkeys=keys %returnhash;
+
+ foreach (@oldkeys) {
+ my $name=$_;
+ my $value=$returnhash{$_};
+ delete $returnhash{$_};
+ $name=~s/\_/\./g;
+ $returnhash{$name}=$value;
+ }
+
# ---------------------------- initialize coursedata and userdata for this user
undef %courseopt;
undef %useropt;
@@ -1380,11 +1600,11 @@ sub loadassessment {
$courserdatas{$cid.'.last_cache'}=time;
}
}
- map {
+ foreach (split(/\&/,$courserdatas{$cid})) {
my ($name,$value)=split(/\=/,$_);
$courseopt{$userprefix.&Apache::lonnet::unescape($name)}=
&Apache::lonnet::unescape($value);
- } split(/\&/,$courserdatas{$cid});
+ }
# --------------------------------------------------- Get userdata (if present)
unless
((time-$userrdatas{$uname.'___'.$udom.'.last_cache'})<240) {
@@ -1395,38 +1615,52 @@ sub loadassessment {
$userrdatas{$uname.'___'.$udom.'.last_cache'}=time;
}
}
- map {
+ foreach (split(/\&/,$userrdatas{$uname.'___'.$udom})) {
my ($name,$value)=split(/\=/,$_);
$useropt{$userprefix.&Apache::lonnet::unescape($name)}=
&Apache::lonnet::unescape($value);
- } split(/\&/,$userrdatas{$uname.'___'.$udom});
+ }
}
# ----------------- now courseopt, useropt initialized for this user and course
# (used by parmval)
+#
+# Load keys for this assessment only
+#
+ my %thisassess=();
+ my ($symap,$syid,$srcf)=split(/\_\_\_/,$symb);
+
+ foreach (split(/\,/,&Apache::lonnet::metadata($srcf,'keys'))) {
+ $thisassess{$_}=1;
+ }
+#
+# Load parameters
+#
my %c=();
if (tie(%parmhash,'GDBM_File',
&getcfn($safeeval).'_parms.db',&GDBM_READER,0640)) {
my %f=&getformulas($safeeval);
- map {
+ foreach (keys(%f)) {
if ($_=~/^A/) {
unless ($f{$_}=~/^\!/) {
if ($f{$_}=~/^parameter/) {
+ if ($thisassess{$f{$_}}) {
my $val=&parmval($f{$_},$safeeval);
$c{$_}=$val;
$c{$f{$_}}=$val;
+ }
} else {
my $key=$f{$_};
my $ckey=$key;
$key=~s/^stores\_/resource\./;
- $key=~s/\_/\./;
+ $key=~s/\_/\./g;
$c{$_}=$returnhash{$key};
$c{$ckey}=$returnhash{$key};
}
}
}
- } keys %f;
+ }
untie(%parmhash);
}
&setconstants($safeeval,%c);
@@ -1448,11 +1682,11 @@ sub hiddenfield {
sub selectbox {
my ($title,$name,$value,%options)=@_;
my $selout="\n<p><b>$title:</b><br>".'<select name="'.$name.'">';
- map {
+ foreach (sort keys(%options)) {
$selout.='<option value="'.$_.'"';
if ($_ eq $value) { $selout.=' selected'; }
$selout.='>'.$options{$_}.'</option>';
- } sort keys %options;
+ }
return $selout.'</select>';
}
@@ -1498,18 +1732,21 @@ sub forcedrecalc {
my ($uname,$udom,$stype,$usymb)=@_;
my $key=$uname.':'.$udom.':'.$stype.':'.$usymb;
my $time=$oldsheets{$key.'.time'};
+ if ($ENV{'form.forcerecalc'}) { return 1; }
unless ($time) { return 1; }
if ($stype eq 'assesscalc') {
my $map=(split(/\_\_\_/,$usymb))[0];
if (&checkthis('::assesscalc:',$time) ||
&checkthis('::assesscalc:'.$map,$time) ||
&checkthis('::assesscalc:'.$usymb,$time) ||
- &checkthis($uname.':'.$udom.':assesscalc:',$time)) {
+ &checkthis($uname.':'.$udom.':assesscalc:',$time) ||
+ &checkthis($uname.':'.$udom.':assesscalc:'.$map,$time) ||
+ &checkthis($uname.':'.$udom.':assesscalc:'.$usymb,$time)) {
return 1;
}
} else {
if (&checkthis('::studentcalc:',$time) ||
- &checkthis($uname.':'.$udom.':studencalc:',$time)) {
+ &checkthis($uname.':'.$udom.':studentcalc:',$time)) {
return 1;
}
}
@@ -1524,6 +1761,11 @@ sub forcedrecalc {
sub exportsheet {
my ($uname,$udom,$stype,$usymb,$fn)=@_;
my @exportarr=();
+
+ if (($usymb=~/^\_(\w+)/) && (!$fn)) {
+ $fn='default_'.$1;
+ }
+
#
# Check if cached
#
@@ -1532,23 +1774,23 @@ sub exportsheet {
my $found='';
if ($oldsheets{$key}) {
- map {
+ foreach (split(/\_\_\_\&\_\_\_/,$oldsheets{$key})) {
my ($name,$value)=split(/\_\_\_\=\_\_\_/,$_);
if ($name eq $fn) {
$found=$value;
}
- } split(/\_\_\_\&\_\_\_/,$oldsheets{$key});
+ }
}
unless ($found) {
&cachedssheets($uname,$udom,&Apache::lonnet::homeserver($uname,$udom));
if ($oldsheets{$key}) {
- map {
+ foreach (split(/\_\_\_\&\_\_\_/,$oldsheets{$key})) {
my ($name,$value)=split(/\_\_\_\=\_\_\_/,$_);
if ($name eq $fn) {
$found=$value;
}
- } split(/\_\_\_\&\_\_\_/,$oldsheets{$key});
+ }
}
}
#
@@ -1601,18 +1843,18 @@ sub exportsheet {
}
my %currentlystored=();
unless ($current=~/^error\:/) {
- map {
+ foreach (split(/\_\_\_\&\_\_\_/,&Apache::lonnet::unescape($current))) {
my ($name,$value)=split(/\_\_\_\=\_\_\_/,$_);
$currentlystored{$name}=$value;
- } split(/\_\_\_\&\_\_\_/,&Apache::lonnet::unescape($current));
+ }
}
$currentlystored{$fn}=join('___;___',@exportarr);
my $newstore='';
- map {
+ foreach (keys(%currentlystored)) {
if ($newstore) { $newstore.='___&___'; }
$newstore.=$_.'___=___'.$currentlystored{$_};
- } keys %currentlystored;
+ }
my $now=time;
if ($stype eq 'studentcalc') {
&Apache::lonnet::reply('put:'.
@@ -1651,11 +1893,11 @@ sub expirationdates {
':nohist_expirationdates',
$ENV{'course.'.$cid.'.home'});
unless ($reply=~/^error\:/) {
- map {
+ foreach (split(/\&/,$reply)) {
my ($name,$value)=split(/\=/,$_);
$expiredates{&Apache::lonnet::unescape($name)}
=&Apache::lonnet::unescape($value);
- } split(/\&/,$reply);
+ }
}
}
@@ -1672,11 +1914,11 @@ sub cachedcsheets {
':nohist_calculatedsheets',
$ENV{'course.'.$cid.'.home'});
unless ($reply=~/^error\:/) {
- map {
+ foreach ( split(/\&/,$reply)) {
my ($name,$value)=split(/\=/,$_);
$oldsheets{&Apache::lonnet::unescape($name)}
=&Apache::lonnet::unescape($value);
- } split(/\&/,$reply);
+ }
}
}
@@ -1694,11 +1936,11 @@ sub cachedssheets {
$ENV{'request.course.id'},
$shome);
unless ($reply=~/^error\:/) {
- map {
+ foreach ( split(/\&/,$reply)) {
my ($name,$value)=split(/\=/,$_);
$oldsheets{&Apache::lonnet::unescape($name)}
=&Apache::lonnet::unescape($value);
- } split(/\&/,$reply);
+ }
}
$loadedcaches{$sname.'_'.$sdom}=1;
}
@@ -1736,7 +1978,7 @@ $tmpdir=$r->dir_config('lonDaemons').'/t
# --------------------------- Get query string for limited number of parameters
- map {
+ foreach (split(/&/,$ENV{'QUERY_STRING'})) {
my ($name, $value) = split(/=/,$_);
$value =~ tr/+/ /;
$value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
@@ -1746,8 +1988,16 @@ $tmpdir=$r->dir_config('lonDaemons').'/t
$ENV{'form.'.$name}=$value;
}
}
- } (split(/&/,$ENV{'QUERY_STRING'}));
+ }
+ if (($ENV{'form.usymb'}=~/^\_(\w+)/) && (!$ENV{'form.ufn'})) {
+ $ENV{'form.ufn'}='default_'.$1;
+ }
+
+# -------------------------------------- Interactive loading of specific sheet?
+ if (($ENV{'form.load'}) && ($ENV{'form.loadthissheet'} ne 'Default')) {
+ $ENV{'form.ufn'}=$ENV{'form.loadthissheet'};
+ }
# ------------------------------------------- Nothing there? Must be login user
my $aname;
@@ -1783,6 +2033,12 @@ $tmpdir=$r->dir_config('lonDaemons').'/t
}
}
+ function changesheet(cn) {
+ document.sheet.unewfield.value=cn;
+ document.sheet.unewformula.value='changesheet';
+ document.sheet.submit();
+ }
+
</script>
ENDSCRIPT
$r->print('</head><body bgcolor="#FFFFFF">'.
@@ -1799,6 +2055,18 @@ ENDSCRIPT
$r->rflush();
+# ---------------------------------------------------------------- Full recalc?
+
+
+ if ($ENV{'form.forcerecalc'}) {
+ $r->print('<h4>Completely Recalculating Sheet ...</h4>');
+ undef %spreadsheets;
+ undef %courserdatas;
+ undef %userrdatas;
+ undef %defaultsheets;
+ undef %updatedata;
+ }
+
# ---------------------------------------- Read new sheet or modified worksheet
$r->uri=~/\/(\w+)$/;
@@ -1834,34 +2102,48 @@ ENDSCRIPT
} else {
$r->print('<br><b>Section/Group:</b> '.&getcsec($asheet));
}
+ if ($ENV{'form.usymb'}) {
+ $r->print('<br><b>Assessment:</b> <tt>'.$ENV{'form.usymb'}.'</tt>');
+ }
}
# ---------------------------------------------------------------- Course title
$r->print('<h1>'.
- $ENV{'course.'.$ENV{'request.course.id'}.'.description'}.'</h1>');
-
+ $ENV{'course.'.$ENV{'request.course.id'}.'.description'}.
+ '</h1><h3>'.localtime().'</h3>');
-# ---------------------------------------------------- See if something to save
+# ---------------------------------------------------- See if user can see this
- if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
- my $fname='';
- if ($ENV{'form.saveas'} && ($fname=$ENV{'form.newfn'})) {
- $fname=~s/\W/\_/g;
- if ($fname eq 'default') { $fname='course_default'; }
- $fname.='_'.&gettype($asheet);
- &setfilename($asheet,$fname);
- $ENV{'form.ufn'}=$fname;
- $r->print('<p>Saving spreadsheet: '.
- &writesheet($asheet,$ENV{'form.makedefufn'}).'<p>');
- }
+ if ((&gettype($asheet) eq 'classcalc') ||
+ (&getuname($asheet) ne $ENV{'user.name'}) ||
+ (&getudom($asheet) ne $ENV{'user.domain'})) {
+ unless (&Apache::lonnet::allowed('vgr',&getcid($asheet))) {
+ $r->print(
+ '<h1>Access Permission Denied</h1></form></body></html>');
+ return OK;
+ }
}
-# ------------------------------------------------ Write the modified worksheet
+# ---------------------------------------------------------- Additional options
- $r->print('<b>Current sheet:</b> '.&getfilename($asheet).'<p>');
-
- &tmpwrite($asheet);
+ $r->print(
+ '<input type=submit name=forcerecalc value="Completely Recalculate Sheet"><p>'
+ );
+ if (&gettype($asheet) eq 'assesscalc') {
+ $r->print ('<p><font size=+2><a href="/adm/studentcalc?uname='.
+ &getuname($asheet).
+ '&udom='.&getudom($asheet).
+ '">Level up: Student Sheet</a></font><p>');
+ }
+
+ if ((&gettype($asheet) eq 'studentcalc') &&
+ (&Apache::lonnet::allowed('vgr',&getcid($asheet)))) {
+ $r->print (
+ '<p><font size=+2><a href="/adm/classcalc">'.
+ 'Level up: Course Sheet</a></font><p>');
+ }
+
# ----------------------------------------------------------------- Save dialog
@@ -1877,6 +2159,24 @@ ENDSCRIPT
$r->print(&hiddenfield('ufn',&getfilename($asheet)));
+# ----------------------------------------------------------------- Load dialog
+ if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
+ $r->print('<p><input type=submit name=load value="Load ...">'.
+ '<select name="loadthissheet">'.
+ '<option name="default">Default</option>');
+ foreach (&othersheets($asheet,&gettype($asheet))) {
+ $r->print('<option name="'.$_.'"');
+ if ($ENV{'form.ufn'} eq $_) {
+ $r->print(' selected');
+ }
+ $r->print('>'.$_.'</option>');
+ }
+ $r->print('</select><p>');
+ if (&gettype($asheet) eq 'studentcalc') {
+ &setothersheets($asheet,&othersheets($asheet,'assesscalc'));
+ }
+ }
+
# --------------------------------------------------------------- Cached sheets
&expirationdates();
@@ -1913,6 +2213,56 @@ ENDSCRIPT
my $calcoutput=&calcsheet($asheet);
$r->print('<h3><font color=red>'.$calcoutput.'</h3></font>');
+# ---------------------------------------------------- See if something to save
+
+ if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
+ my $fname='';
+ if ($ENV{'form.saveas'} && ($fname=$ENV{'form.newfn'})) {
+ $fname=~s/\W/\_/g;
+ if ($fname eq 'default') { $fname='course_default'; }
+ $fname.='_'.&gettype($asheet);
+ &setfilename($asheet,$fname);
+ $ENV{'form.ufn'}=$fname;
+ $r->print('<p>Saving spreadsheet: '.
+ &writesheet($asheet,$ENV{'form.makedefufn'}).'<p>');
+ }
+ }
+
+# ------------------------------------------------ Write the modified worksheet
+
+ $r->print('<b>Current sheet:</b> '.&getfilename($asheet).'<p>');
+
+ &tmpwrite($asheet);
+
+ if (&gettype($asheet) eq 'studentcalc') {
+ $r->print('<br>Show rows with empty A column: ');
+ } else {
+ $r->print('<br>Show empty rows: ');
+ }
+
+ $r->print(&hiddenfield('userselhidden','true').
+ '<input type=checkbox name=showall onClick="submit()"');
+
+ if ($ENV{'form.showall'}) {
+ $r->print(' checked');
+ } else {
+ unless ($ENV{'form.userselhidden'}) {
+ unless
+ ($ENV{'course.'.$ENV{'request.course.id'}.'.hideemptyrows'} eq 'yes') {
+ $r->print(' checked');
+ $ENV{'form.showall'}=1;
+ }
+ }
+ }
+ $r->print('>');
+ if (&gettype($asheet) eq 'classcalc') {
+ $r->print(
+ ' Output CSV format: <input type=checkbox name=showcsv onClick="submit()"');
+ if ($ENV{'form.showcsv'}) { $r->print(' checked'); }
+ $r->print('>');
+ }
+# ------------------------------------------------------------- Print out sheet
+
&outsheet($r,$asheet);
$r->print('</form></body></html>');
@@ -1929,3 +2279,7 @@ ENDSCRIPT
1;
__END__
+
+
+
+