--- loncom/interface/Attic/lonspreadsheet.pm 2002/08/30 20:56:08 1.105
+++ loncom/interface/Attic/lonspreadsheet.pm 2002/11/12 22:44:28 1.139
@@ -1,5 +1,5 @@
#
-# $Id: lonspreadsheet.pm,v 1.105 2002/08/30 20:56:08 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.139 2002/11/12 22:44:28 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,16 +26,6 @@
# The LearningOnline Network with CAPA
# Spreadsheet/Grades Display Handler
#
-# 11/11,11/15,11/27,12/04,12/05,12/06,12/07,
-# 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,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
-# 02/04/02 Matthew
-
# POD required stuff:
=head1 NAME
@@ -54,7 +44,6 @@ not the grades of their peers. The spre
offering the ability to use Perl code to manipulate data, as well as many
built-in functions.
-
=head2 Functions available to user of lonspreadsheet
=over 4
@@ -72,6 +61,15 @@ use Apache::Constants qw(:common :http);
use GDBM_File;
use HTML::TokeParser;
use Apache::lonhtmlcommon;
+use Apache::loncoursedata;
+use Apache::File();
+use Spreadsheet::WriteExcel;
+
+#
+# Caches for coursewide information
+#
+my %Section;
+
#
# Caches for previously calculated spreadsheets
#
@@ -96,7 +94,7 @@ my %spreadsheets;
my %courserdatas;
my %userrdatas;
my %defaultsheets;
-my %updatedata;
+my %rowlabel_cache;
#
# These global hashes are dependent on user, course and resource,
@@ -122,75 +120,21 @@ my $tmpdir;
# =============================================================================
# ===================================== Implements an instance of a spreadsheet
-sub initsheet {
- my $safeeval = new Safe(shift);
- my $safehole = new Safe::Hole;
- $safeeval->permit("entereval");
- $safeeval->permit(":base_math");
- $safeeval->permit("sort");
- $safeeval->deny(":base_io");
- $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');
- $safeeval->share('$@');
- my $code=<<'ENDDEFS';
-# ---------------------------------------------------- Inside of the safe space
-
-#
-# f: formulas
-# t: intermediate format (variable references expanded)
-# v: output values
-# c: preloaded constants (A-column)
-# rl: row label
-# os: other spreadsheets (for student spreadsheet only)
-
-undef %sheet_values;
-undef %t;
-undef %f;
-undef %c;
-undef %rowlabel;
-undef @os;
-
-$maxrow = 0;
-$sheettype = '';
-
-# filename/reference of the sheet
-$filename = '';
-
-# user data
-$uname = '';
-$uhome = '';
-$udom = '';
-
-# course data
-
-$csec = '';
-$chome= '';
-$cnum = '';
-$cdom = '';
-$cid = '';
-$cfn = '';
-
-# symb
-
-$usymb = '';
-
-# error messages
-$errormsg = '';
-
+##
+## mask - used to reside in the safe space.
+##
sub mask {
my ($lower,$upper)=@_;
-
- $lower=~/([A-Za-z]|\*)(\d+|\*)/;
- my $la=$1;
- my $ld=$2;
-
- $upper=~/([A-Za-z]|\*)(\d+|\*)/;
- my $ua=$1;
- my $ud=$2;
+ $upper = $lower if (! defined($upper));
+ #
+ my ($la,$ld) = ($lower=~/([A-Za-z]|\*)(\d+|\*)/);
+ my ($ua,$ud) = ($upper=~/([A-Za-z]|\*)(\d+|\*)/);
+ #
my $alpha='';
my $num='';
-
+ #
if (($la eq '*') || ($ua eq '*')) {
- $alpha='[A-Za-z]';
+ $alpha='[A-Za-z]';
} else {
if (($la=~/[A-Z]/) && ($ua=~/[A-Z]/) ||
($la=~/[a-z]/) && ($ua=~/[a-z]/)) {
@@ -199,7 +143,6 @@ sub mask {
$alpha='['.$la.'-Za-'.$ua.']';
}
}
-
if (($ld eq '*') || ($ud eq '*')) {
$num='\d+';
} else {
@@ -219,7 +162,9 @@ sub mask {
} else {
my @lda=($ld=~m/\d/g);
my @uda=($ud=~m/\d/g);
- my $i; $j=0; $notdone=1;
+ my $i;
+ my $j=0;
+ my $notdone=1;
for ($i=0;($i<=$#lda)&&($notdone);$i++) {
if ($lda[$i]==$uda[$i]) {
$num.=$lda[$i];
@@ -243,8 +188,8 @@ sub mask {
}
$num.=')';
} else {
- if ($lda[$#lda]!=$uda[$#uda]) {
- $num.='['.$lda[$#lda].'-'.$uda[$#uda].']';
+ if ($lda[-1]!=$uda[-1]) {
+ $num.='['.$lda[-1].'-'.$uda[-1].']';
}
}
}
@@ -252,6 +197,78 @@ sub mask {
return '^'.$alpha.$num."\$";
}
+sub initsheet {
+ my $safeeval = new Safe(shift);
+ my $safehole = new Safe::Hole;
+ $safeeval->permit("entereval");
+ $safeeval->permit(":base_math");
+ $safeeval->permit("sort");
+ $safeeval->deny(":base_io");
+ $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');
+ $safehole->wrap(\&Apache::lonspreadsheet::mask,$safeeval,'&mask');
+ $safeeval->share('$@');
+ my $code=<<'ENDDEFS';
+# ---------------------------------------------------- Inside of the safe space
+
+#
+# f: formulas
+# t: intermediate format (variable references expanded)
+# v: output values
+# c: preloaded constants (A-column)
+# rl: row label
+# os: other spreadsheets (for student spreadsheet only)
+
+undef %sheet_values; # Holds the (computed, final) values for the sheet
+ # This is only written to by &calc, the spreadsheet computation routine.
+ # It is read by many functions
+undef %t; # Holds the values of the spreadsheet temporarily. Set in &sett,
+ # which does the translation of strings like C5 into the value in C5.
+ # Used in &calc - %t holds the values that are actually eval'd.
+undef %f; # Holds the formulas for each cell. This is the users
+ # (spreadsheet authors) data for each cell.
+ # set by &setformulas and returned by &getformulas
+ # &setformulas is called by &readsheet, &tmpread, &updateclasssheet,
+ # &updatestudentassesssheet, &loadstudent, &loadcourse
+ # &getformulas is called by &writesheet, &tmpwrite, &updateclasssheet,
+ # &updatestudentassesssheet, &loadstudent, &loadcourse, &loadassessment,
+undef %c; # Holds the constants for a sheet. In the assessment
+ # sheets, this is the A column. Used in &MINPARM, &MAXPARM, &expandnamed,
+ # &sett, and &setconstants. There is no &getconstants.
+ # &setconstants is called by &loadstudent, &loadcourse, &load assessment,
+undef @os; # Holds the names of other spreadsheets - this is used to specify
+ # the spreadsheets that are available for the assessment sheet.
+ # Set by &setothersheets. &setothersheets is called by &handler. A
+ # related subroutine is &othersheets.
+#$errorlog = '';
+
+$maxrow = 0;
+$sheettype = '';
+
+# filename/reference of the sheet
+$filename = '';
+
+# user data
+$uname = '';
+$uhome = '';
+$udom = '';
+
+# course data
+
+$csec = '';
+$chome= '';
+$cnum = '';
+$cdom = '';
+$cid = '';
+$coursefilename = '';
+
+# symb
+
+$usymb = '';
+
+# error messages
+$errormsg = '';
+
+
#-------------------------------------------------------
=item UWCALC(hashname,modules,units,date)
@@ -576,7 +593,8 @@ compute the average of the items in the
#-------------------------------------------------------
sub MEAN {
my $mask=mask(@_);
- my $sum=0; my $num=0;
+ my $sum=0;
+ my $num=0;
foreach (grep /$mask/,keys(%sheet_values)) {
$sum+=$sheet_values{$_};
$num++;
@@ -813,9 +831,11 @@ sub expandnamed {
foreach $parameter (keys(%c)) {
push @matches,$parameter if ($parameter =~ /$expression/);
}
- if ($#matches == 0) {
+ if (scalar(@matches) == 0) {
+ $returnvalue = 'unmatched parameter: '.$parameter;
+ } elsif (scalar(@matches) == 1) {
$returnvalue = '$c{\''.$matches[0].'\'}';
- } elsif ($#matches > 0) {
+ } elsif (scalar(@matches) > 0) {
# more than one match. Look for a concise one
$returnvalue = "'non-unique parameter name : $expression'";
foreach (@matches) {
@@ -824,7 +844,9 @@ sub expandnamed {
}
}
} else {
- $returnvalue = "'bad parameter name : $expression'";
+ # There was a negative number of matches, which indicates
+ # something is wrong with reality. Better warn the user.
+ $returnvalue = 'bizzare parameter: '.$parameter;
}
return $returnvalue;
}
@@ -863,7 +885,7 @@ sub sett {
}
# Deal with the normal cells
foreach (keys(%f)) {
- if (($f{$_}) && ($_!~/template\_/)) {
+ if (exists($f{$_}) && ($_!~/template\_/)) {
my $matches=($_=~/^$pattern(\d+)/);
if (($matches) && ($1)) {
unless ($f{$_}=~/^\!/) {
@@ -907,6 +929,7 @@ sub calc {
while ($notfinished) {
$notfinished=0;
foreach (keys(%t)) {
+ #$errorlog .= "$_:".$t{$_};
my $old=$sheet_values{$_};
$sheet_values{$_}=eval $t{$_};
if ($@) {
@@ -914,6 +937,7 @@ sub calc {
return $_.': '.$@;
}
if ($sheet_values{$_} ne $old) { $notfinished=1; $lastcalc=$_; }
+ #$errorlog .= ":".$sheet_values{$_}."\n";
}
$depth++;
if ($depth>100) {
@@ -924,427 +948,725 @@ sub calc {
return '';
}
+# ------------------------------------------- End of "Inside of the safe space"
+ENDDEFS
+ $safeeval->reval($code);
+ return $safeeval;
+}
+
+#
+#
+#
sub templaterow {
+ my $sheet = shift;
my @cols=();
- $cols[0]='<b><font size=+1>Template</font></b>';
+ my $rowlabel = 'Template';
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_'.$_};
+ my $fm=$sheet->{'f'}->{'template_'.$_};
$fm=~s/[\'\"]/\&\#34;/g;
- push(@cols,"'template_$_','$fm'".'___eq___'.$fm);
+ push(@cols,{ name => 'template_'.$_,
+ formula => $fm,
+ value => $fm });
}
- return @cols;
+ return ($rowlabel,@cols);
}
-#
-# This is actually used for the student spreadsheet, not the assessment sheet
-# Do not be fooled by the name!
-#
sub outrowassess {
# $n is the current row number
- my $n=shift;
+ my ($sheet,$n) = @_;
my @cols=();
+ my $rowlabel='';
if ($n) {
- my ($usy,$ufn)=split(/__&&&\__/,$f{'A'.$n});
- if ($rowlabel{$usy}) {
- $cols[0]=$rowlabel{$usy}.'<br>'.
- '<select name="sel_'.$n.'" onChange="changesheet('.$n.')">'.
- '<option name="default">Default</option>';
+ my ($usy,$ufn)=split(/__&&&\__/,$sheet->{'f'}->{'A'.$n});
+ if (exists($sheet->{'rowlabel'}->{$usy})) {
+ $rowlabel = $sheet->{'rowlabel'}->{$usy};
} else {
- $cols[0]='';
- }
- foreach (@os) {
- $cols[0].='<option name="'.$_.'"';
- if ($ufn eq $_) {
- $cols[0].=' selected';
- }
- $cols[0].='>'.$_.'</option>';
+ $rowlabel = '';
}
- $cols[0].='</select>';
} else {
- $cols[0]='<b><font size=+1>Export</font></b>';
+ $rowlabel = 'Export';
}
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};
+ my $fm=$sheet->{'f'}->{$_.$n};
$fm=~s/[\'\"]/\&\#34;/g;
- push(@cols,"'$_$n','$fm'".'___eq___'.$sheet_values{$_.$n});
+ push(@cols,{ name => $_.$n,
+ formula => $fm,
+ value => $sheet->{'values'}->{$_.$n}});
}
- return @cols;
+ return ($rowlabel,@cols);
}
sub outrow {
- my $n=shift;
+ my ($sheet,$n)=@_;
my @cols=();
+ my $rowlabel;
if ($n) {
- $cols[0]=$rowlabel{$f{'A'.$n}};
+ $rowlabel = $sheet->{'rowlabel'}->{$sheet->{'f'}->{'A'.$n}};
} else {
- $cols[0]='<b><font size=+1>Export</font></b>';
+ if ($sheet->{'sheettype'} eq 'classcalc') {
+ $rowlabel = 'Summary';
+ } else {
+ $rowlabel = 'Export';
+ }
}
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};
+ my $fm=$sheet->{'f'}->{$_.$n};
$fm=~s/[\'\"]/\&\#34;/g;
- push(@cols,"'$_$n','$fm'".'___eq___'.$sheet_values{$_.$n});
+ push(@cols,{ name => $_.$n,
+ formula => $fm,
+ value => $sheet->{'values'}->{$_.$n}});
}
- return @cols;
-}
-
-sub exportrowa {
- my @exportarray=();
- 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') {
- push(@exportarray,$sheet_values{$_.'0'});
- }
- return @exportarray;
-}
-
-# ------------------------------------------- End of "Inside of the safe space"
-ENDDEFS
- $safeeval->reval($code);
- return $safeeval;
+ return ($rowlabel,@cols);
}
# ------------------------------------------------ Add or change formula values
-
sub setformulas {
- my ($safeeval,%f)=@_;
- %{$safeeval->varglob('f')}=%f;
+ my ($sheet)=shift;
+ %{$sheet->{'safe'}->varglob('f')}=%{$sheet->{'f'}};
}
# ------------------------------------------------ Add or change formula values
-
sub setconstants {
- my ($safeeval,%c)=@_;
- %{$safeeval->varglob('c')}=%c;
+ my ($sheet)=shift;
+ my ($constants) = @_;
+ if (! ref($constants)) {
+ my %tmp = @_;
+ $constants = \%tmp;
+ }
+ $sheet->{'constants'} = $constants;
+ return %{$sheet->{'safe'}->varglob('c')}=%{$sheet->{'constants'}};
}
# --------------------------------------------- Set names of other spreadsheets
-
sub setothersheets {
- my ($safeeval,@os)=@_;
- @{$safeeval->varglob('os')}=@os;
+ my $sheet = shift;
+ my @othersheets = @_;
+ $sheet->{'othersheets'} = \@othersheets;
+ @{$sheet->{'safe'}->varglob('os')}=@othersheets;
+ return;
}
# ------------------------------------------------ Add or change formula values
-
sub setrowlabels {
- my ($safeeval,%rowlabel)=@_;
- %{$safeeval->varglob('rowlabel')}=%rowlabel;
+ my $sheet=shift;
+ my ($rowlabel) = @_;
+ if (! ref($rowlabel)) {
+ my %tmp = @_;
+ $rowlabel = \%tmp;
+ }
+ $sheet->{'rowlabel'}=$rowlabel;
}
# ------------------------------------------------------- Calculate spreadsheet
-
sub calcsheet {
- my $safeeval=shift;
- return $safeeval->reval('&calc();');
-}
-
-# ------------------------------------------------------------------ Get values
-
-sub getvalues {
- my $safeeval=shift;
- return $safeeval->reval('%sheet_values');
+ my $sheet=shift;
+ my $result = $sheet->{'safe'}->reval('&calc();');
+ %{$sheet->{'values'}} = %{$sheet->{'safe'}->varglob('sheet_values')};
+ return $result;
}
# ---------------------------------------------------------------- Get formulas
-
+# Return a copy of the formulas
sub getformulas {
- my $safeeval=shift;
- return %{$safeeval->varglob('f')};
-}
-
-# ----------------------------------------------------- Get value of $f{'A'.$n}
-
-sub getfa {
- my ($safeeval,$n)=@_;
- return $safeeval->reval('$f{"A'.$n.'"}');
-}
-
-# -------------------------------------------------------------------- Get type
-
-sub gettype {
- my $safeeval=shift;
- return $safeeval->reval('$sheettype');
-}
-
-# ------------------------------------------------------------------ Set maxrow
-
-sub setmaxrow {
- my ($safeeval,$row)=@_;
- $safeeval->reval('$maxrow='.$row.';');
-}
-
-# ------------------------------------------------------------------ Get maxrow
-
-sub getmaxrow {
- my $safeeval=shift;
- return $safeeval->reval('$maxrow');
-}
-
-# ---------------------------------------------------------------- Set filename
-
-sub setfilename {
- my ($safeeval,$fn)=@_;
- $safeeval->reval('$filename="'.$fn.'";');
-}
-
-# ---------------------------------------------------------------- Get filename
-
-sub getfilename {
- my $safeeval=shift;
- return $safeeval->reval('$filename');
-}
-
-# --------------------------------------------------------------- Get course ID
-
-sub getcid {
- my $safeeval=shift;
- return $safeeval->reval('$cid');
-}
-
-# --------------------------------------------------------- Get course filename
-
-sub getcfn {
- my $safeeval=shift;
- return $safeeval->reval('$cfn');
-}
-
-# ----------------------------------------------------------- Get course number
-
-sub getcnum {
- my $safeeval=shift;
- return $safeeval->reval('$cnum');
+ my $sheet = shift;
+ return %{$sheet->{'safe'}->varglob('f')};
}
-# ------------------------------------------------------------- Get course home
-
-sub getchome {
- my $safeeval=shift;
- return $safeeval->reval('$chome');
-}
-
-# ----------------------------------------------------------- Get course domain
-
-sub getcdom {
- my $safeeval=shift;
- return $safeeval->reval('$cdom');
-}
-
-# ---------------------------------------------------------- Get course section
-
-sub getcsec {
- my $safeeval=shift;
- return $safeeval->reval('$csec');
-}
-
-# --------------------------------------------------------------- Get user name
-
-sub getuname {
- my $safeeval=shift;
- return $safeeval->reval('$uname');
+sub geterrorlog {
+ my $sheet = shift;
+ return ${$sheet->{'safe'}->varglob('errorlog')};
+}
+
+sub gettitle {
+ my $sheet = shift;
+ if ($sheet->{'sheettype'} eq 'classcalc') {
+ return $sheet->{'coursedesc'};
+ } elsif ($sheet->{'sheettype'} eq 'studentcalc') {
+ return 'Grades for '.$sheet->{'uname'}.'@'.$sheet->{'udom'};
+ } elsif ($sheet->{'sheettype'} eq 'assesscalc') {
+ if (($sheet->{'usymb'} eq '_feedback') ||
+ ($sheet->{'usymb'} eq '_evaluation') ||
+ ($sheet->{'usymb'} eq '_discussion') ||
+ ($sheet->{'usymb'} eq '_tutoring')) {
+ my $title = $sheet->{'usymb'};
+ $title =~ s/^_//;
+ $title = ucfirst($title);
+ return $title;
+ }
+ return if (! defined($sheet->{'mapid'}) ||
+ $sheet->{'mapid'} !~ /^\d+$/);
+ my $mapid = $sheet->{'mapid'};
+ return if (! defined($sheet->{'resid'}) ||
+ $sheet->{'resid'} !~ /^\d+$/);
+ my $resid = $sheet->{'resid'};
+ my %course_db;
+ tie(%course_db,'GDBM_File',$sheet->{'coursefilename'}.'.db',
+ &GDBM_READER(),0640);
+ return if (! tied(%course_db));
+ my $key = 'title_'.$mapid.'.'.$resid;
+ my $title = '';
+ if (exists($course_db{$key})) {
+ $title = $course_db{$key};
+ } else {
+ $title = $sheet->{'usymb'};
+ }
+ untie (%course_db);
+ return $title;
+ }
}
-# ------------------------------------------------------------- Get user domain
-
-sub getudom {
- my $safeeval=shift;
- return $safeeval->reval('$udom');
+# ----------------------------------------------------- Get value of $f{'A'.$n}
+sub getfa {
+ my $sheet = shift;
+ my ($n)=@_;
+ return $sheet->{'safe'}->reval('$f{"A'.$n.'"}');
}
-# --------------------------------------------------------------- Get user home
-
-sub getuhome {
- my $safeeval=shift;
- return $safeeval->reval('$uhome');
+# ------------------------------------------------------------- Export of A-row
+sub exportdata {
+ my $sheet=shift;
+ my @exportarray=();
+ 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 (exists($sheet->{'values'}->{$_.'0'})) {
+ push(@exportarray,$sheet->{'values'}->{$_.'0'});
+ } else {
+ push(@exportarray,'');
+ }
+ }
+ return @exportarray;
}
-# -------------------------------------------------------------------- Get symb
-
-sub getusymb {
- my $safeeval=shift;
- return $safeeval->reval('$usymb');
-}
-# ------------------------------------------------------------- Export of A-row
-sub exportdata {
- my $safeeval=shift;
- return $safeeval->reval('&exportrowa()');
+sub update_student_sheet{
+ my $sheet = shift;
+ # Load in the studentcalc sheet
+ &readsheet($sheet,'default_studentcalc');
+ # Determine the structure (contained assessments, etc) of the sheet
+ &updatesheet($sheet);
+ # Load in the cached sheets for this student
+ &cachedssheets($sheet);
+ # Load in the (possibly cached) data from the assessment sheets
+ &loadstudent($sheet);
+ # Compute the sheet
+ &calcsheet($sheet);
}
-
# ========================================================== End of Spreadsheet
# =============================================================================
-
#
-# Procedures for screen output
+# Procedures for spreadsheet output
#
# --------------------------------------------- Produce output row n from sheet
-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';
- }
- unless ($ENV{'form.showcsv'}) {
- $rowdata.="\n<tr><td><b><font size=+1>$n</font></b></td>";
- } else {
- $rowdata.="\n".'"'.$n.'"';
- }
- my $showf=0;
- my $proc;
- my $maxred=1;
- my $sheettype=&gettype($safeeval);
- if ($sheettype eq 'studentcalc') {
- $proc='&outrowassess';
- $maxred=26;
- } else {
- $proc='&outrow';
- }
- if ($sheettype eq 'assesscalc') {
- $maxred=1;
- } else {
- $maxred=26;
- }
- if (&getfa($safeeval,$n)=~/^[\~\-]/) { $maxred=1; }
+sub get_row {
+ my ($sheet,$n) = @_;
+ my ($rowlabel,@rowdata);
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))) {
- if ($vl eq '') {
- $vl='<font size=+2 color='.$bgcolor.'>#</font>';
- }
- $rowdata.=
- '<td bgcolor='.$bgcolor.'><a href="javascript:celledit('.$fm.');">'.$vl.
- '</a></td>';
- } else {
- $rowdata.='<td bgcolor='.$bgcolor.'> '.$vl.' </td>';
- }
- } else {
- $rowdata.=',"'.$vl.'"';
- }
- $showf++;
- } # End of foreach($safeval...)
- if ($ENV{'form.showall'} || ($dataflag)) {
- return $rowdata.($ENV{'form.showcsv'}?'':'</tr>');
+ ($rowlabel,@rowdata) = &templaterow($sheet);
+ } elsif ($sheet->{'sheettype'} eq 'studentcalc') {
+ ($rowlabel,@rowdata) = &outrowassess($sheet,$n);
} else {
- return '';
+ ($rowlabel,@rowdata) = &outrow($sheet,$n);
}
+ return ($rowlabel,@rowdata);
}
-# ------------------------------------------------------------- Print out sheet
-
-sub outsheet {
- my ($r,$safeeval)=@_;
- my $maxred;
- my $realm;
- if (&gettype($safeeval) eq 'assesscalc') {
- $maxred=1;
- $realm='Assessment';
- } elsif (&gettype($safeeval) eq 'studentcalc') {
- $maxred=26;
- $realm='User';
- } else {
- $maxred=26;
- $realm='Course';
- }
- my $maxyellow=52-$maxred;
- 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.
- '><b><font size=+1>Import</font></b></td>'.
- '<td colspan='.$maxyellow.
- '><b><font size=+1>Calculations</font></b></td></tr><tr>';
- my $showf=0;
- 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">';
- } else {
- $tabledata.='<td>';
- }
- $tabledata.="<b><font size=+1>$_</font></b></td>";
- }
- $tabledata.='</tr>'.&rown($safeeval,'-').&rown($safeeval,0);
- } else { $tabledata='<pre>'; }
-
- $r->print($tabledata);
-
- my $row;
- my $maxrow=&getmaxrow($safeeval);
-
+########################################################################
+########################################################################
+sub sort_indicies {
+ my $sheet = shift;
+ #
+ # Sort the rows in some manner
+ #
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'})) {
+ # Skip row 0
+ for (my $row=1;$row<=$sheet->{'maxrow'};$row++) {
+ push (@sortby, $sheet->{'safe'}->reval('$f{"A'.$row.'"}'));
+ push (@sortidx, $row);
+ }
+ @sortidx=sort { lc($sortby[$a]) cmp lc($sortby[$b]); } @sortidx;
+ return @sortidx;
+}
+
+#############################################################
+### ###
+### Spreadsheet Output Routines ###
+### ###
+#############################################################
+
+############################################
+## HTML output routines ##
+############################################
+sub html_editable_cell {
+ my ($cell,$bgcolor) = @_;
+ my $result;
+ my ($name,$formula,$value);
+ if (defined($cell)) {
+ $name = $cell->{'name'};
+ $formula = $cell->{'formula'};
+ $value = $cell->{'value'};
+ }
+ $name = '' if (! defined($name));
+ $formula = '' if (! defined($formula));
+ if (! defined($value)) {
+ $value = '<font color="'.$bgcolor.'">#</font>';
+ if ($formula ne '') {
+ $value = '<i>undefined value</i>';
+ }
+ }
+ if ($value =~ /^\s*$/ ) {
+ $value = '<font color="'.$bgcolor.'">#</font>';
+ }
+ $formula =~ s/\n/\\n/gs;
+ $result .= '<a href="javascript:celledit(\''.
+ $name.'\',\''.$formula.'\');">'.$value.'</a>';
+ return $result;
+}
+
+sub html_uneditable_cell {
+ my ($cell,$bgcolor) = @_;
+ my $value = (defined($cell) ? $cell->{'value'} : '');
+ return ' '.$value.' ';
+}
+
+sub outsheet_html {
+ my ($sheet,$r) = @_;
+ my ($num_uneditable,$realm,$row_type);
+ if ($sheet->{'sheettype'} eq 'assesscalc') {
+ $num_uneditable = 1;
+ $realm = 'Assessment';
+ $row_type = 'Item';
+ } elsif ($sheet->{'sheettype'} eq 'studentcalc') {
+ $num_uneditable = 26;
+ $realm = 'User';
+ $row_type = 'Assessment';
+ } elsif ($sheet->{'sheettype'} eq 'classcalc') {
+ $num_uneditable = 26;
+ $realm = 'Course';
+ $row_type = 'Student';
+ } else {
+ return; # error
+ }
+ ####################################
+ # Print out header table
+ ####################################
+ my $num_left = 52-$num_uneditable;
+ my $tabledata =<<"END";
+<table border="2">
+<tr>
+ <th colspan="1" rowspan="2"><font size="+2">$realm</font></th>
+ <td bgcolor="#FFDDDD" colspan="$num_uneditable">
+ <b><font size="+1">Import</font></b></td>
+ <td colspan="$num_left">
+ <b><font size="+1">Calculations</font></b></td>
+</tr><tr>
+END
+ my $label_num = 0;
+ foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){
+ if ($label_num<$num_uneditable) {
+ $tabledata.='<td bgcolor="#FFDDDD">';
+ } else {
+ $tabledata.='<td>';
+ }
+ $tabledata.="<b><font size=+1>$_</font></b></td>";
+ $label_num++;
+ }
+ $tabledata.="</tr>\n";
+ $r->print($tabledata);
+ ####################################
+ # Print out template row
+ ####################################
+ my ($rowlabel,@rowdata) = &get_row($sheet,'-');
+ my $row_html = '<tr><td>'.&format_html_rowlabel($rowlabel).'</td>';
+ my $num_cols_output = 0;
+ foreach my $cell (@rowdata) {
+ if ($num_cols_output++ < $num_uneditable) {
+ $row_html .= '<td bgcolor="#FFDDDD">';
+ $row_html .= &html_uneditable_cell($cell,'#FFDDDD');
+ } else {
+ $row_html .= '<td bgcolor="#EOFFDD">';
+ $row_html .= &html_editable_cell($cell,'#E0FFDD');
+ }
+ $row_html .= '</td>';
+ }
+ $row_html.= "</tr>\n";
+ $r->print($row_html);
+ ####################################
+ # Print out summary/export row
+ ####################################
+ my ($rowlabel,@rowdata) = &get_row($sheet,'0');
+ $row_html = '<tr><td>'.&format_html_rowlabel($rowlabel).'</td>';
+ $num_cols_output = 0;
+ foreach my $cell (@rowdata) {
+ if ($num_cols_output++ < 26) {
+ $row_html .= '<td bgcolor="#CCCCFF">';
+ $row_html .= &html_editable_cell($cell,'#CCCCFF');
+ } else {
+ $row_html .= '<td bgcolor="#DDCCFF">';
+ $row_html .= &html_uneditable_cell(undef,'#CCCCFF');
+ }
+ $row_html .= '</td>';
+ }
+ $row_html.= "</tr>\n";
+ $r->print($row_html);
+ $r->print('</table>');
+ ####################################
+ # Prepare to output rows
+ ####################################
+ my @Rows = &sort_indicies($sheet);
+ #
+ # Loop through the rows and output them one at a time
+ my $rows_output=0;
+ foreach my $rownum (@Rows) {
+ my ($rowlabel,@rowdata) = &get_row($sheet,$rownum);
+ next if ($rowlabel =~ /^\s*$/);
+ #
+ my $defaultbg='#E0FF';
+ #
+ my $row_html ="\n".'<tr><td><b><font size=+1>'.$rownum.
+ '</font></b></td>';
+ #
+ if ($sheet->{'sheettype'} eq 'classcalc') {
+ $row_html.='<td>'.&format_html_rowlabel($rowlabel).'</td>';
+ # Output links for each student?
+ # Nope, that is already done for us in format_html_rowlabel (for now)
+ } elsif ($sheet->{'sheettype'} eq 'studentcalc') {
+ $row_html.='<td>'.&format_html_rowlabel($rowlabel);
+ $row_html.= '<br>'.
+ '<select name="sel_'.$rownum.'" '.
+ 'onChange="changesheet('.$rownum.')">'.
+ '<option name="default">Default</option>';
+ foreach (@{$sheet->{'othersheets'}}) {
+ $row_html.='<option name="'.$_.'"';
+ #if ($ufn eq $_) {
+ # $row_html.=' selected';
+ #}
+ $row_html.='>'.$_.'</option>';
+ }
+ $row_html.='</select></td>';
+ } elsif ($sheet->{'sheettype'} eq 'assesscalc') {
+ $row_html.='<td>'.&format_html_rowlabel($rowlabel).'</td>';
+ }
+ #
+ my $shown_cells = 0;
+ foreach my $cell (@rowdata) {
+ my $value = $cell->{'value'};
+ my $formula = $cell->{'formula'};
+ my $cellname = $cell->{'name'};
+ #
+ my $bgcolor;
+ if ($shown_cells && ($shown_cells/5 == int($shown_cells/5))) {
+ $bgcolor = $defaultbg.'99';
+ } else {
+ $bgcolor = $defaultbg.'DD';
+ }
+ $bgcolor='#FFDDDD' if ($shown_cells < $num_uneditable);
+ #
+ $row_html.='<td bgcolor='.$bgcolor.'>';
+ if ($shown_cells < $num_uneditable) {
+ $row_html .= &html_uneditable_cell($cell,$bgcolor);
+ } else {
+ $row_html .= &html_editable_cell($cell,$bgcolor);
+ }
+ $row_html.='</td>';
+ $shown_cells++;
+ }
+ if ($row_html) {
+ if ($rows_output % 25 == 0) {
$r->print("</table>\n<br>\n");
$r->rflush();
- $r->print('<table border=2><tr><td> <td>'.$what.'</td>');
- $r->print('<td>'.join('</td><td>',
- (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.
- 'abcdefghijklmnopqrstuvwxyz'))).
+ $r->print('<table border=2>'.
+ '<tr><td> <td>'.$row_type.'</td>'.
+ '<td>'.
+ join('</td><td>',
+ (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.
+ 'abcdefghijklmnopqrstuvwxyz'))).
"</td></tr>\n");
}
- $n++;
- $r->print($thisrow);
+ $rows_output++;
+ $r->print($row_html);
}
}
- $r->print($ENV{'form.showcsv'}?'</pre>':'</table>');
+ #
+ $r->print('</table>');
+ #
+ # Debugging code (be sure to uncomment errorlog code in safe space):
+ #
+ # $r->print("\n<pre>");
+ # $r->print(&geterrorlog($sheet));
+ # $r->print("\n</pre>");
+ return 1;
}
-#
-# ----------------------------------------------- Read list of available sheets
-#
+############################################
+## csv output routines ##
+############################################
+sub outsheet_csv {
+ my ($sheet,$r) = @_;
+ my $csvdata = '';
+ my @Values;
+ ####################################
+ # Prepare to output rows
+ ####################################
+ my @Rows = &sort_indicies($sheet);
+ #
+ # Loop through the rows and output them one at a time
+ my $rows_output=0;
+ foreach my $rownum (@Rows) {
+ my ($rowlabel,@rowdata) = &get_row($sheet,$rownum);
+ next if ($rowlabel =~ /^\s*$/);
+ push (@Values,&format_csv_rowlabel($rowlabel));
+ foreach my $cell (@rowdata) {
+ push (@Values,'"'.$cell->{'value'}.'"');
+ }
+ $csvdata.= join(',',@Values)."\n";
+ @Values = ();
+ }
+ #
+ # Write the CSV data to a file and serve up a link
+ #
+ my $filename = '/prtspool/'.
+ $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
+ time.'_'.rand(1000000000).'.csv';
+ my $file;
+ unless ($file = Apache::File->new('>'.'/home/httpd'.$filename)) {
+ $r->log_error("Couldn't open $filename for output $!");
+ $r->print("Problems occured in writing the csv file. ".
+ "This error has been logged. ".
+ "Please alert your LON-CAPA administrator.");
+ $r->print("<pre>\n".$csvdata."</pre>\n");
+ return 0;
+ }
+ print $file $csvdata;
+ close($file);
+ $r->print('<br /><br />'.
+ '<a href="'.$filename.'">Your CSV spreadsheet.</a>'."\n");
+ #
+ return 1;
+}
+
+############################################
+## Excel output routines ##
+############################################
+sub outsheet_recursive_excel {
+ my ($sheet,$r) = @_;
+ my $c = $r->connection;
+ return undef if ($sheet->{'sheettype'} ne 'classcalc');
+ my ($workbook,$filename) = &create_excel_spreadsheet($sheet,$r);
+ return undef if (! defined($workbook));
+ #
+ # Create main worksheet
+ my $main_worksheet = $workbook->addworksheet('main');
+ #
+ # Figure out who the students are
+ my %f=&getformulas($sheet);
+ my $count = 0;
+ $r->print(<<END);
+<p>
+Compiling Excel Workbook with a worksheet for each student.
+</p><p>
+This operation may take longer than a complete recalculation of the
+spreadsheet.
+</p><p>
+To abort this operation, hit the stop button on your browser.
+</p><p>
+A link to the spreadsheet will be available at the end of this process.
+</p>
+<p>
+END
+ $r->rflush();
+ my $starttime = time;
+ foreach (keys(%f)) {
+ next if ($_!~/^A(\d+)/ || $1 == 0 || ($f{$_}=~/^[!~-]/));
+ $count++;
+ my ($sname,$sdom) = split(':',$f{$_});
+ my $student_excel_worksheet=$workbook->addworksheet($sname.'@'.$sdom);
+ # Create a new spreadsheet
+ my $studentsheet = &makenewsheet($sname,$sdom,'studentcalc',undef);
+ # Read in the spreadsheet definition
+ &update_student_sheet($studentsheet);
+ # Stuff the sheet into excel
+ &export_sheet_as_excel($studentsheet,$student_excel_worksheet);
+ my $totaltime = int((time - $starttime) / $count * $sheet->{'maxrow'});
+ my $timeleft = int((time - $starttime) / $count * ($sheet->{'maxrow'} - $count));
+ if ($count % 5 == 0) {
+ $r->print($count.' students completed.'.
+ ' Time remaining: '.$timeleft.' sec. '.
+ ' Estimated total time: '.$totaltime." sec <br />\n");
+ $r->rflush();
+ }
+ if(defined($c) && ($c->aborted())) {
+ last;
+ }
+ }
+ #
+ if(! $c->aborted() ) {
+ $r->print('All students spreadsheets completed!<br />');
+ $r->rflush();
+ #
+ # &export_sheet_as_excel fills $worksheet with the data from $sheet
+ &export_sheet_as_excel($sheet,$main_worksheet);
+ #
+ $workbook->close();
+ # Okay, the spreadsheet is taken care of, so give the user a link.
+ $r->print('<br /><br />'.
+ '<a href="'.$filename.'">Your Excel spreadsheet.</a>'."\n");
+ } else {
+ $workbook->close(); # Not sure how necessary this is.
+ #unlink('/home/httpd'.$filename); # No need to keep this around?
+ }
+ return 1;
+}
+
+sub outsheet_excel {
+ my ($sheet,$r) = @_;
+ my ($workbook,$filename) = &create_excel_spreadsheet($sheet,$r);
+ return undef if (! defined($workbook));
+ my $sheetname;
+ if ($sheet->{'sheettype'} eq 'classcalc') {
+ $sheetname = 'Main';
+ } elsif ($sheet->{'sheettype'} eq 'studentcalc') {
+ $sheetname = $sheet->{'uname'}.'@'.$sheet->{'udom'};
+ } elsif ($sheet->{'sheettype'} eq 'assesscalc') {
+ $sheetname = $sheet->{'uname'}.'@'.$sheet->{'udom'}.' assessment';
+ }
+ my $worksheet = $workbook->addworksheet($sheetname);
+ #
+ # &export_sheet_as_excel fills $worksheet with the data from $sheet
+ &export_sheet_as_excel($sheet,$worksheet);
+ #
+ $workbook->close();
+ # Okay, the spreadsheet is taken care of, so give the user a link.
+ $r->print('<br /><br />'.
+ '<a href="'.$filename.'">Your Excel spreadsheet.</a>'."\n");
+ return 1;
+}
+
+sub create_excel_spreadsheet {
+ my ($sheet,$r) = @_;
+ my $filename = '/prtspool/'.
+ $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
+ time.'_'.rand(1000000000).'.xls';
+ my $workbook = Spreadsheet::WriteExcel->new('/home/httpd'.$filename);
+ if (! defined($workbook)) {
+ $r->log_error("Error creating excel spreadsheet $filename: $!");
+ $r->print("Problems creating new Excel file. ".
+ "This error has been logged. ".
+ "Please alert your LON-CAPA administrator");
+ return undef;
+ }
+ #
+ # The spreadsheet stores temporary data in files, then put them
+ # together. If needed we should be able to disable this (memory only).
+ # The temporary directory must be specified before calling 'addworksheet'.
+ # File::Temp is used to determine the temporary directory.
+ $workbook->set_tempdir('/home/httpd/perl/tmp');
+ #
+ # Determine the name to give the worksheet
+ return ($workbook,$filename);
+}
+
+sub export_sheet_as_excel {
+ my $sheet = shift;
+ my $worksheet = shift;
+ #
+ my $rows_output = 0;
+ my $cols_output = 0;
+ ####################################
+ # Write an identifying row #
+ ####################################
+ my @Headerinfo = ($sheet->{'coursedesc'});
+ my $title = &gettitle($sheet);
+ $cols_output = 0;
+ if (defined($title)) {
+ $worksheet->write($rows_output++,$cols_output++,$title);
+ }
+ ####################################
+ # Write the summary/export row #
+ ####################################
+ my ($rowlabel,@rowdata) = &get_row($sheet,'0');
+ my $label = &format_excel_rowlabel($rowlabel);
+ $cols_output = 0;
+ $worksheet->write($rows_output,$cols_output++,$label);
+ foreach my $cell (@rowdata) {
+ $worksheet->write($rows_output,$cols_output++,$cell->{'value'});
+ }
+ $rows_output+= 2; # Skip a row, just for fun
+ ####################################
+ # Prepare to output rows
+ ####################################
+ my @Rows = &sort_indicies($sheet);
+ #
+ # Loop through the rows and output them one at a time
+ foreach my $rownum (@Rows) {
+ my ($rowlabel,@rowdata) = &get_row($sheet,$rownum);
+ next if ($rowlabel =~ /^\s*$/);
+ $cols_output = 0;
+ my $label = &format_excel_rowlabel($rowlabel);
+ $worksheet->write($rows_output,$cols_output++,$label);
+ if (ref($label)) {
+ $cols_output = (scalar(@$label));
+ }
+ foreach my $cell (@rowdata) {
+ $worksheet->write($rows_output,$cols_output++,$cell->{'value'});
+ }
+ $rows_output++;
+ }
+ return;
+}
+
+############################################
+## XML output routines ##
+############################################
+sub outsheet_xml {
+ my ($sheet,$r) = @_;
+ ## Someday XML
+ ## Will be rendered for the user
+ ## But not on this day
+}
+
+##
+## Outsheet - calls other outsheet_* functions
+##
+sub outsheet {
+ my ($r,$sheet)=@_;
+ if (! exists($ENV{'form.output'})) {
+ $ENV{'form.output'} = 'HTML';
+ }
+ if (lc($ENV{'form.output'}) eq 'csv') {
+ &outsheet_csv($sheet,$r);
+ } elsif (lc($ENV{'form.output'}) eq 'excel') {
+ &outsheet_excel($sheet,$r);
+ } elsif (lc($ENV{'form.output'}) eq 'recursive excel') {
+ &outsheet_recursive_excel($sheet,$r);
+# } elsif (lc($ENV{'form.output'}) eq 'xml' ) {
+# &outsheet_xml($sheet,$r);
+ } else {
+ &outsheet_html($sheet,$r);
+ }
+}
+
+########################################################################
+########################################################################
sub othersheets {
- my ($safeeval,$stype)=@_;
+ my ($sheet,$stype)=@_;
+ $stype = $sheet->{'sheettype'} if (! defined($stype));
#
- my $cnum = &getcnum($safeeval);
- my $cdom = &getcdom($safeeval);
- my $chome = &getchome($safeeval);
+ my $cnum = $sheet->{'cnum'};
+ my $cdom = $sheet->{'cdom'};
+ my $chome = $sheet->{'chome'};
#
my @alternatives=();
my %results=&Apache::lonnet::dump($stype.'_spreadsheets',$cdom,$cnum);
@@ -1355,7 +1677,6 @@ sub othersheets {
return @alternatives;
}
-
#
# -------------------------------------- Parse a spreadsheet
#
@@ -1387,14 +1708,14 @@ sub parse_sheet {
#
# -------------------------------------- Read spreadsheet formulas for a course
#
-
sub readsheet {
- my ($safeeval,$fn)=@_;
- my $stype = &gettype($safeeval);
- my $cnum = &getcnum($safeeval);
- my $cdom = &getcdom($safeeval);
- my $chome = &getchome($safeeval);
-
+ my ($sheet,$fn)=@_;
+ #
+ my $stype = $sheet->{'sheettype'};
+ my $cnum = $sheet->{'cnum'};
+ my $cdom = $sheet->{'cdom'};
+ my $chome = $sheet->{'chome'};
+ #
if (! defined($fn)) {
# There is no filename. Look for defaults in course and global, cache
unless ($fn=$defaultsheets{$cnum.'_'.$cdom.'_'.$stype}) {
@@ -1414,11 +1735,13 @@ sub readsheet {
}
}
# $fn now has a value
- &setfilename($safeeval,$fn);
+ $sheet->{'filename'} = $fn;
# see if sheet is cached
my $fstring='';
if ($fstring=$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}) {
- &setformulas($safeeval,split(/\_\_\_\;\_\_\_/,$fstring));
+ my %tmp = split(/___;___/,$fstring);
+ $sheet->{'f'} = \%tmp;
+ &setformulas($sheet);
} else {
# Not cached, need to read
my %f=();
@@ -1453,77 +1776,78 @@ sub readsheet {
}
# Cache and set
$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f);
- &setformulas($safeeval,%f);
+ $sheet->{'f'}=\%f;
+ &setformulas($sheet);
}
}
# -------------------------------------------------------- Make new spreadsheet
-
sub makenewsheet {
my ($uname,$udom,$stype,$usymb)=@_;
- my %sheetdata=();
- $sheetdata{'uname'} = $uname;
- $sheetdata{'udom'} = $udom;
- $sheetdata{'sheettype'} = $stype;
- $sheetdata{'usymb'} = $usymb;
- $sheetdata{'cid'} = $ENV{'request.course.id'};
- $sheetdata{'csec'} = &Apache::lonnet::usection
- ($udom,$uname,$ENV{'request.course.id'});
- $sheetdata{'cfn'} = $ENV{'request.course.fn'};
- $sheetdata{'cnum'} = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
- $sheetdata{'cdom'} = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
- $sheetdata{'chome'} = $ENV{'course.'.$ENV{'request.course.id'}.'.home'};
- $sheetdata{'uhome'} = &Apache::lonnet::homeserver($uname,$udom);
-
- my $safeeval=initsheet($stype);
+ my $sheet={};
+ $sheet->{'uname'} = $uname;
+ $sheet->{'udom'} = $udom;
+ $sheet->{'sheettype'} = $stype;
+ $sheet->{'usymb'} = $usymb;
+ $sheet->{'mapid'} = $ENV{'form.mapid'};
+ $sheet->{'resid'} = $ENV{'form.resid'};
+ $sheet->{'cid'} = $ENV{'request.course.id'};
+ $sheet->{'csec'} = $Section{$uname.':'.$udom};
+ $sheet->{'coursefilename'} = $ENV{'request.course.fn'};
+ $sheet->{'cnum'} = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+ $sheet->{'cdom'} = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+ $sheet->{'chome'} = $ENV{'course.'.$ENV{'request.course.id'}.'.home'};
+ $sheet->{'coursedesc'} = $ENV{'course.'.$ENV{'request.course.id'}.
+ '.description'};
+ $sheet->{'uhome'} = &Apache::lonnet::homeserver($uname,$udom);
+ #
+ #
+ $sheet->{'f'} = {};
+ $sheet->{'constants'} = {};
+ $sheet->{'othersheets'} = [];
+ $sheet->{'rowlabel'} = {};
+ #
+ #
+ $sheet->{'safe'}=&initsheet($sheet->{'sheettype'});
+ #
+ # Place all the %$sheet items into the safe space except the safe space
+ # itself
my $initstring = '';
- foreach (keys(%sheetdata)) {
- $initstring.= qq{\$$_="$sheetdata{$_}";};
+ foreach (qw/uname udom sheettype usymb cid csec coursefilename
+ cnum cdom chome uhome/) {
+ $initstring.= qq{\$$_="$sheet->{$_}";};
}
- $safeeval->reval($initstring);
- return $safeeval,\%sheetdata;
+ $sheet->{'safe'}->reval($initstring);
+ return $sheet;
}
# ------------------------------------------------------------ Save spreadsheet
-
sub writesheet {
- my ($safeeval,$makedef)=@_;
- my $cid=&getcid($safeeval);
+ my ($sheet,$makedef)=@_;
+ my $cid=$sheet->{'cid'};
if (&Apache::lonnet::allowed('opa',$cid)) {
- my %f=&getformulas($safeeval);
- my $stype=&gettype($safeeval);
- my $cnum=&getcnum($safeeval);
- my $cdom=&getcdom($safeeval);
- my $chome=&getchome($safeeval);
- my $fn=&getfilename($safeeval);
+ my %f=&getformulas($sheet);
+ my $stype= $sheet->{'sheettype'};
+ my $cnum = $sheet->{'cnum'};
+ my $cdom = $sheet->{'cdom'};
+ my $chome= $sheet->{'chome'};
+ my $fn = $sheet->{'filename'};
# Cache new sheet
$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f);
# Write sheet
- my $sheetdata='';
foreach (keys(%f)) {
- unless ($f{$_} eq 'import') {
- $sheetdata.=&Apache::lonnet::escape($_).'='.
- &Apache::lonnet::escape($f{$_}).'&';
- }
+ delete($f{$_}) if ($f{$_} eq 'import');
}
- $sheetdata=~s/\&$//;
- my $reply=&Apache::lonnet::reply('put:'.$cdom.':'.$cnum.':'.$fn.':'.
- $sheetdata,$chome);
+ my $reply = &Apache::lonnet::put($fn,\%f,$cdom,$cnum);
if ($reply eq 'ok') {
- $reply=&Apache::lonnet::reply('put:'.$cdom.':'.$cnum.':'.
- $stype.'_spreadsheets:'.
- &Apache::lonnet::escape($fn).
- '='.$ENV{'user.name'}.'@'.
- $ENV{'user.domain'},
- $chome);
+ $reply = &Apache::lonnet::put($stype.'_spreadsheets',
+ {$fn => $ENV{'user.name'}.'@'.$ENV{'user.domain'}},
+ $cdom,$cnum);
if ($reply eq 'ok') {
if ($makedef) {
- return &Apache::lonnet::reply('put:'.$cdom.':'.$cnum.
- ':environment:'.
- 'spreadsheet_default_'.
- $stype.'='.
- &Apache::lonnet::escape($fn),
- $chome);
+ return &Apache::lonnet::put('environment',
+ {'spreadsheet_default_'.$stype => $fn },
+ $cdom,$cnum);
}
return $reply;
}
@@ -1537,27 +1861,25 @@ sub writesheet {
# ----------------------------------------------- Make a temp copy of the sheet
# "Modified workcopy" - interactive only
#
-
sub tmpwrite {
- my $safeeval=shift;
+ my ($sheet) = @_;
my $fn=$ENV{'user.name'}.'_'.
- $ENV{'user.domain'}.'_spreadsheet_'.&getusymb($safeeval).'_'.
- &getfilename($safeeval);
+ $ENV{'user.domain'}.'_spreadsheet_'.$sheet->{'usymb'}.'_'.
+ $sheet->{'filename'};
$fn=~s/\W/\_/g;
$fn=$tmpdir.$fn.'.tmp';
my $fh;
if ($fh=Apache::File->new('>'.$fn)) {
- print $fh join("\n",&getformulas($safeeval));
+ print $fh join("\n",&getformulas($sheet));
}
}
# ---------------------------------------------------------- Read the temp copy
-
sub tmpread {
- my ($safeeval,$nfield,$nform)=@_;
+ my ($sheet,$nfield,$nform)=@_;
my $fn=$ENV{'user.name'}.'_'.
- $ENV{'user.domain'}.'_spreadsheet_'.&getusymb($safeeval).'_'.
- &getfilename($safeeval);
+ $ENV{'user.domain'}.'_spreadsheet_'.$sheet->{'usymb'}.'_'.
+ $sheet->{'filename'};
$fn=~s/\W/\_/g;
$fn=$tmpdir.$fn.'.tmp';
my $fh;
@@ -1578,7 +1900,7 @@ sub tmpread {
}
}
if ($nform eq 'changesheet') {
- $fo{'A'.$nfield}=(split(/\_\_\&\&\&\_\_/,$fo{'A'.$nfield}))[0];
+ $fo{'A'.$nfield}=(split(/__&&&\__/,$fo{'A'.$nfield}))[0];
unless ($ENV{'form.sel_'.$nfield} eq 'Default') {
$fo{'A'.$nfield}.='__&&&__'.$ENV{'form.sel_'.$nfield};
}
@@ -1593,7 +1915,8 @@ sub tmpread {
} else {
if ($nfield) { $fo{$nfield}=$nform; }
}
- &setformulas($safeeval,%fo);
+ $sheet->{'f'}=\%fo;
+ &setformulas($sheet);
}
##################################################
@@ -1605,7 +1928,7 @@ sub tmpread {
Determine the value of a parameter.
-Inputs: $what, the parameter needed, $safeeval, the safe space
+Inputs: $what, the parameter needed, $sheet, the safe space
Returns: The value of a parameter, or '' if none.
@@ -1621,14 +1944,14 @@ this user and course.
##################################################
##################################################
sub parmval {
- my ($what,$safeeval,$sheetdata)=@_;
- my $symb = $sheetdata->{'usymb'};
+ my ($what,$sheet)=@_;
+ my $symb = $sheet->{'usymb'};
unless ($symb) { return ''; }
#
- my $cid = $sheetdata->{'cid'};
- my $csec = $sheetdata->{'csec'};
- my $uname = $sheetdata->{'uname'};
- my $udom = $sheetdata->{'udom'};
+ my $cid = $sheet->{'cid'};
+ my $csec = $sheet->{'csec'};
+ my $uname = $sheet->{'uname'};
+ my $udom = $sheet->{'udom'};
my $result='';
#
my ($mapname,$id,$fn)=split(/\_\_\_/,$symb);
@@ -1649,112 +1972,146 @@ sub parmval {
my $courselevelr = $usercourseprefix.'.'.$symbparm;
my $courselevelm = $usercourseprefix.'.'.$mapparm;
# fourth, check user
- if ($uname) {
- return $useropt{$courselevelr} if ($useropt{$courselevelr});
- return $useropt{$courselevelm} if ($useropt{$courselevelm});
- return $useropt{$courselevel} if ($useropt{$courselevel});
+ if (defined($uname)) {
+ return $useropt{$courselevelr} if (defined($useropt{$courselevelr}));
+ return $useropt{$courselevelm} if (defined($useropt{$courselevelm}));
+ return $useropt{$courselevel} if (defined($useropt{$courselevel}));
}
# third, check course
- if ($csec) {
- return $courseopt{$seclevelr} if ($courseopt{$seclevelr});
- return $courseopt{$seclevelm} if ($courseopt{$seclevelm});
- return $courseopt{$seclevel} if ($courseopt{$seclevel});
+ if (defined($csec)) {
+ return $courseopt{$seclevelr} if (defined($courseopt{$seclevelr}));
+ return $courseopt{$seclevelm} if (defined($courseopt{$seclevelm}));
+ return $courseopt{$seclevel} if (defined($courseopt{$seclevel}));
}
#
- return $courseopt{$courselevelr} if ($courseopt{$courselevelr});
- return $courseopt{$courselevelm} if ($courseopt{$courselevelm});
- return $courseopt{$courselevel} if ($courseopt{$courselevel});
+ return $courseopt{$courselevelr} if (defined($courseopt{$courselevelr}));
+ return $courseopt{$courselevelm} if (defined($courseopt{$courselevelm}));
+ return $courseopt{$courselevel} if (defined($courseopt{$courselevel}));
# second, check map parms
my $thisparm = $parmhash{$symbparm};
- return $thisparm if ($thisparm);
+ return $thisparm if (defined($thisparm));
# first, check default
return &Apache::lonnet::metadata($fn,$rwhat.'.default');
}
+
+##################################################################
+## Row label formatting routines ##
+##################################################################
+sub format_html_rowlabel {
+ my $rowlabel = shift;
+ return '' if ($rowlabel eq '');
+ my ($type,$labeldata) = split(':',$rowlabel,2);
+ my $result = '';
+ if ($type eq 'symb') {
+ my ($symb,$uname,$udom,$mapid,$resid,$title) = split(':',$labeldata);
+ $symb = &Apache::lonnet::unescape($symb);
+ $result = '<a href="/adm/assesscalc?usymb='.$symb.
+ '&uname='.$uname.'&udom='.$udom.
+ '&mapid='.$mapid.'&resid='.$resid.'">'.$title.'</a>';
+ } elsif ($type eq 'student') {
+ my ($sname,$sdom,$fullname,$section,$id) = split(':',$labeldata);
+ $result ='<a href="/adm/studentcalc?uname='.$sname.
+ '&udom='.$sdom.'">';
+ $result.=$section.' '.$id." ".$fullname.'</a>';
+ } elsif ($type eq 'parameter') {
+ $result = $labeldata;
+ } else {
+ $result = '<b><font size=+1>'.$rowlabel.'</font></b>';
+ }
+ return $result;
+}
+
+sub format_csv_rowlabel {
+ my $rowlabel = shift;
+ return '' if ($rowlabel eq '');
+ my ($type,$labeldata) = split(':',$rowlabel,2);
+ my $result = '';
+ if ($type eq 'symb') {
+ my ($symb,$uname,$udom,$mapid,$resid,$title) = split(':',$labeldata);
+ $symb = &Apache::lonnet::unescape($symb);
+ $result = $title;
+ } elsif ($type eq 'student') {
+ my ($sname,$sdom,$fullname,$section,$id) = split(':',$labeldata);
+ $result = join('","',($sname,$sdom,$fullname,$section,$id));
+ } elsif ($type eq 'parameter') {
+ $labeldata =~ s/<br>/ /g;
+ $result = $labeldata;
+ } else {
+ $result = $rowlabel;
+ }
+ return '"'.$result.'"';
+}
+
+sub format_excel_rowlabel {
+ my $rowlabel = shift;
+ return '' if ($rowlabel eq '');
+ my ($type,$labeldata) = split(':',$rowlabel,2);
+ my $result = '';
+ if ($type eq 'symb') {
+ my ($symb,$uname,$udom,$mapid,$resid,$title) = split(':',$labeldata);
+ $symb = &Apache::lonnet::unescape($symb);
+ $result = $title;
+ } elsif ($type eq 'student') {
+ my ($sname,$sdom,$fullname,$section,$id) = split(':',$labeldata);
+ $section = '' if (! defined($section));
+ $id = '' if (! defined($id));
+ my @Data = ($sname,$sdom,$fullname,$section,$id);
+ $result = \@Data;
+ } elsif ($type eq 'parameter') {
+ $labeldata =~ s/<br>/ /g;
+ $result = $labeldata;
+ } else {
+ $result = $rowlabel;
+ }
+ return $result;
+}
+
# ---------------------------------------------- Update rows for course listing
sub updateclasssheet {
- my $safeeval=shift;
- my $cnum=&getcnum($safeeval);
- my $cdom=&getcdom($safeeval);
- my $cid=&getcid($safeeval);
- my $chome=&getchome($safeeval);
+ my ($sheet) = @_;
+ my $cnum =$sheet->{'cnum'};
+ my $cdom =$sheet->{'cdom'};
+ my $cid =$sheet->{'cid'};
+ my $chome =$sheet->{'chome'};
+ #
+ %Section = ();
#
# Read class list and row labels
- my %classlist;
- my @tmp = &Apache::lonnet::dump('classlist',$cdom,$cnum);
- if ($tmp[0] !~ /^error/) {
- %classlist = @tmp;
- } else {
- return 'Could not access course data';
- }
- undef @tmp;
+ my $classlist = &Apache::loncoursedata::get_classlist();
+ if (! defined($classlist)) {
+ return 'Could not access course classlist';
+ }
#
my %currentlist=();
- my $now=time;
- foreach my $student (keys(%classlist)) {
- my ($end,$start)=split(/\:/,$classlist{$student});
- my $active=1;
- $active = 0 if (($end) && ($now>$end));
- $active = 1 if ($ENV{'form.Status'} eq 'Any');
- $active = !$active if ($ENV{'form.Status'} eq 'Expired');
- if ($active) {
- my $rowlabel='';
- my ($studentName,$studentDomain)=split(/\:/,$student);
- my $studentSection=&Apache::lonnet::usection($studentDomain,
- $studentName,$cid);
- if ($studentSection==-1) {
- unless ($ENV{'form.showcsv'}) {
- $rowlabel='<font color=red>Data not available: '.
- $studentName.'</font>';
- } else {
- $rowlabel='ERROR","'.$studentName.
- '","Data not available","","","';
- }
- } else {
- my %reply=&Apache::lonnet::idrget($studentDomain,$studentName);
- my %studentInformation=&Apache::lonnet::get
- ('environment',
- ['lastname','generation','firstname','middlename','id'],
- $studentDomain,$studentName);
- if (! $ENV{'form.showcsv'}) {
- $rowlabel='<a href="/adm/studentcalc?uname='.$studentName.
- '&udom='.$studentDomain.'">'.
- $studentSection.' ';
- foreach ('id','firstname','middlename',
- 'lastname','generation'){
- $rowlabel.=$studentInformation{$_}." ";
- }
- $rowlabel.='</a>';
- } else {
- $rowlabel= '"'.join('","',
- ($studentSection,
- $studentInformation{'id'},
- $studentInformation{'firstname'},
- $studentInformation{'middlename'},
- $studentInformation{'lastname'},
- $studentInformation{'generation'})
- ).'"';
- }
- }
- $currentlist{$student}=$rowlabel;
- } # end of if ($active)
- } # end of foreach my $student (keys(%classlist))
+ foreach my $student (keys(%$classlist)) {
+ my ($studentDomain,$studentName,$end,$start,$id,$studentSection,
+ $fullname,$status) = @{$classlist->{$student}};
+ $Section{$studentName.':'.$studentDomain} = $studentSection;
+ if ($ENV{'form.Status'} eq $status || $ENV{'form.Status'} eq 'Any') {
+ $currentlist{$student}=join(':',('student',$studentName,
+ $studentDomain,$fullname,
+ $studentSection,$id));
+ }
+ }
#
# Find discrepancies between the course row table and this
#
- my %f=&getformulas($safeeval);
+ my %f=&getformulas($sheet);
my $changed=0;
#
- my $maxrow=0;
+ $sheet->{'maxrow'}=0;
my %existing=();
#
# Now obsolete rows
foreach (keys(%f)) {
if ($_=~/^A(\d+)/) {
- $maxrow=($1>$maxrow)?$1:$maxrow;
+ if ($1 > $sheet->{'maxrow'}) {
+ $sheet->{'maxrow'}= $1;
+ }
$existing{$f{$_}}=1;
unless ((defined($currentlist{$f{$_}})) || (!$1) ||
- ($f{$_}=~/^(\~\~\~|\-\-\-)/)) {
+ ($f{$_}=~/^(~~~|---)/)) {
$f{$_}='!!! Obsolete';
$changed=1;
}
@@ -1762,77 +2119,116 @@ sub updateclasssheet {
}
#
# New and unknown keys
- foreach (sort keys(%currentlist)) {
- unless ($existing{$_}) {
+ foreach my $student (sort keys(%currentlist)) {
+ unless ($existing{$student}) {
$changed=1;
- $maxrow++;
- $f{'A'.$maxrow}=$_;
+ $sheet->{'maxrow'}++;
+ $f{'A'.$sheet->{'maxrow'}}=$student;
}
}
- if ($changed) { &setformulas($safeeval,%f); }
+ if ($changed) {
+ $sheet->{'f'} = \%f;
+ &setformulas($sheet,%f);
+ }
#
- &setmaxrow($safeeval,$maxrow);
- &setrowlabels($safeeval,%currentlist);
+ &setrowlabels($sheet,\%currentlist);
}
# ----------------------------------- Update rows for student and assess sheets
-sub updatestudentassesssheet {
- my $safeeval=shift;
- my %bighash;
- my $stype=&gettype($safeeval);
- my %current=();
- if ($updatedata{$ENV{'request.course.fn'}.'_'.$stype}) {
- %current=split(/\_\_\_\;\_\_\_/,
- $updatedata{$ENV{'request.course.fn'}.'_'.$stype});
+sub get_student_rowlabels {
+ my ($sheet) = @_;
+ #
+ my %course_db;
+ #
+ my $stype = $sheet->{'sheettype'};
+ my $uname = $sheet->{'uname'};
+ my $udom = $sheet->{'udom'};
+ #
+ $sheet->{'rowlabel'} = {};
+ #
+ my $identifier =$sheet->{'coursefilename'}.'_'.$stype;
+ if ($rowlabel_cache{$identifier}) {
+ %{$sheet->{'rowlabel'}}=split(/___;___/,$rowlabel_cache{$identifier});
} else {
+ # Get the data and store it in the cache
# Tie hash
- tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
+ tie(%course_db,'GDBM_File',$sheet->{'coursefilename'}.'.db',
&GDBM_READER(),0640);
- if (! tied(%bighash)) {
+ if (! tied(%course_db)) {
return 'Could not access course data';
}
- # Get all assessments
- 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>'
- );
- foreach (keys(%bighash)) {
- next if ($_!~/^src\_(\d+)\.(\d+)$/);
- my $mapid=$1;
- my $resid=$2;
- my $id=$mapid.'.'.$resid;
- my $srcf=$bighash{$_};
+ #
+ my %assesslist;
+ foreach ('Feedback','Evaluation','Tutoring','Discussion') {
+ my $symb = '_'.lc($_);
+ $assesslist{$symb} = join(':',('symb',$symb,$uname,$udom,0,0,$_));
+ }
+ #
+ while (my ($key,$srcf) = each(%course_db)) {
+ next if ($key !~ /^src_(\d+)\.(\d+)$/);
+ my $mapid = $1;
+ my $resid = $2;
+ my $id = $mapid.'.'.$resid;
if ($srcf=~/\.(problem|exam|quiz|assess|survey|form)$/) {
my $symb=
- &Apache::lonnet::declutter($bighash{'map_id_'.$mapid}).
+ &Apache::lonnet::declutter($course_db{'map_id_'.$mapid}).
'___'.$resid.'___'.&Apache::lonnet::declutter($srcf);
- $allassess{$symb}=
- '<a href="/adm/assesscalc?usymb='.$symb.$adduserstr.'">'.
- $bighash{'title_'.$id}.'</a>';
- next if ($stype ne 'assesscalc');
- foreach my $key (split(/\,/,
- &Apache::lonnet::metadata($srcf,'keys')
- )) {
+ $assesslist{$symb}='symb:'.&Apache::lonnet::escape($symb).':'
+ .$uname.':'.$udom.':'.$mapid.':'.$resid.':'.
+ $course_db{'title_'.$id};
+ }
+ }
+ untie(%course_db);
+ # Store away the data
+ $sheet->{'rowlabel'} = \%assesslist;
+ $rowlabel_cache{$identifier}=join('___;___',%{$sheet->{'rowlabel'}});
+ }
+
+}
+
+sub get_assess_rowlabels {
+ my ($sheet) = @_;
+ #
+ my %course_db;
+ #
+ my $stype = $sheet->{'sheettype'};
+ my $uname = $sheet->{'uname'};
+ my $udom = $sheet->{'udom'};
+ my $usymb = $sheet->{'usymb'};
+ #
+ $sheet->{'rowlabel'} = {};
+ my $identifier =$sheet->{'coursefilename'}.'_'.$stype.'_'.$usymb;
+ #
+ if ($rowlabel_cache{$identifier}) {
+ %{$sheet->{'rowlabel'}}=split(/___;___/,$rowlabel_cache{$identifier});
+ } else {
+ # Get the data and store it in the cache
+ # Tie hash
+ tie(%course_db,'GDBM_File',$sheet->{'coursefilename'}.'.db',
+ &GDBM_READER(),0640);
+ if (! tied(%course_db)) {
+ return 'Could not access course data';
+ }
+ #
+ my %parameter_labels=
+ ('timestamp' =>
+ 'parameter:Timestamp of Last Transaction<br>timestamp',
+ 'subnumber' =>
+ 'parameter:Number of Submissions<br>subnumber',
+ 'tutornumber' =>
+ 'parameter:Number of Tutor Responses<br>tutornumber',
+ 'totalpoints' =>
+ 'parameter:Total Points Granted<br>totalpoints');
+ while (my ($key,$srcf) = each(%course_db)) {
+ next if ($key !~ /^src_(\d+)\.(\d+)$/);
+ my $mapid = $1;
+ my $resid = $2;
+ my $id = $mapid.'.'.$resid;
+ if ($srcf=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+ # Loop through the metadata for this key
+ my @Metadata = split(/,/,
+ &Apache::lonnet::metadata($srcf,'keys'));
+ foreach my $key (@Metadata) {
next if ($key !~ /^(stores|parameter)_/);
my $display=
&Apache::lonnet::metadata($srcf,$key.'.display');
@@ -1841,73 +2237,73 @@ sub updatestudentassesssheet {
&Apache::lonnet::metadata($srcf,$key.'.name');
}
$display.='<br>'.$key;
- $allkeys{$key}=$display;
+ $parameter_labels{$key}='parameter:'.$display;
} # end of foreach
}
- } # end of foreach (keys(%bighash))
- untie(%bighash);
- #
- # %allkeys has a list of storage and parameter displays by unikey
- # %allassess has a list of all resource displays by symb
- #
- if ($stype eq 'assesscalc') {
- %current=%allkeys;
- } elsif ($stype eq 'studentcalc') {
- %current=%allassess;
- }
- $updatedata{$ENV{'request.course.fn'}.'_'.$stype}=
- join('___;___',%current);
- # Get current from cache
+ }
+ untie(%course_db);
+ # Store away the results
+ $sheet->{'rowlabel'} = \%parameter_labels;
+ $rowlabel_cache{$identifier}=join('___;___',%{$sheet->{'rowlabel'}});
}
- # Find discrepancies between the course row table and this
- #
- my %f=&getformulas($safeeval);
+
+}
+
+sub updatestudentassesssheet {
+ my $sheet = shift;
+ if ($sheet->{'sheettype'} eq 'studentcalc') {
+ &get_student_rowlabels($sheet);
+ } else {
+ &get_assess_rowlabels($sheet);
+ }
+ # Determine if any of the information has changed
+ my %f=&getformulas($sheet);
my $changed=0;
- my $maxrow=0;
+ $sheet->{'maxrow'} = 0;
my %existing=();
# Now obsolete rows
- foreach (keys(%f)) {
- next if ($_!~/^A(\d+)/);
- $maxrow=($1>$maxrow)?$1:$maxrow;
- my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{$_});
+ while (my ($cell, $formula) = each (%f)) {
+ next if ($cell !~ /^A(\d+)/);
+ $sheet->{'maxrow'} = $1 if ($1 > $sheet->{'maxrow'});
+ my ($usy,$ufn)=split(/__&&&\__/,$formula);
$existing{$usy}=1;
- unless ((defined($current{$usy})) || (!$1) ||
- ($f{$_}=~/^(\~\~\~|\-\-\-)/)){
+ unless ((exists($sheet->{'rowlabel'}->{$usy}) &&
+ (defined($sheet->{'rowlabel'}->{$usy})) || (!$1) ||
+ ($formula =~ /^(~~~|---)/) )) {
$f{$_}='!!! Obsolete';
$changed=1;
} elsif ($ufn) {
- $current{$usy}
- =~s/assesscalc\?usymb\=/assesscalc\?ufn\=$ufn\&usymb\=/;
+ # I do not think this works any more
+ $sheet->{'rowlabel'}->{$usy}
+ =~s/assesscalc\?usymb\=/assesscalc\?ufn\=$ufn&\usymb\=/;
}
}
# New and unknown keys
- foreach (keys(%current)) {
+ foreach (keys(%{$sheet->{'rowlabel'}})) {
unless ($existing{$_}) {
$changed=1;
- $maxrow++;
- $f{'A'.$maxrow}=$_;
+ $sheet->{'maxrow'}++;
+ $f{'A'.$sheet->{'maxrow'}}=$_;
}
}
- if ($changed) { &setformulas($safeeval,%f); }
- &setmaxrow($safeeval,$maxrow);
- &setrowlabels($safeeval,%current);
- #
- undef %current;
- undef %existing;
+ if ($changed) {
+ $sheet->{'f'} = \%f;
+ &setformulas($sheet);
+ }
}
# ------------------------------------------------ Load data for one assessment
-sub loadstudent {
- my ($safeeval,$sheetdata)=@_;
+sub loadstudent{
+ my ($sheet)=@_;
my %c=();
- my %f=&getformulas($safeeval);
- $cachedassess=$sheetdata->{'uname'}.':'.$sheetdata->{'udom'};
+ my %f=&getformulas($sheet);
+ $cachedassess=$sheet->{'uname'}.':'.$sheet->{'udom'};
# Get ALL the student preformance data
- my @tmp = &Apache::lonnet::dump($sheetdata->{'cid'},
- $sheetdata->{'udom'},
- $sheetdata->{'uname'},
+ my @tmp = &Apache::lonnet::dump($sheet->{'cid'},
+ $sheet->{'udom'},
+ $sheet->{'uname'},
undef);
if ($tmp[0] !~ /^error:/) {
%cachedstores = @tmp;
@@ -1915,18 +2311,18 @@ sub loadstudent {
undef @tmp;
#
my @assessdata=();
- foreach (keys(%f)) {
- next if ($_!~/^A(\d+)/);
+ while (my ($cell,$value) = each (%f)) {
+ next if ($cell !~ /^A(\d+)/);
my $row=$1;
- next if (($f{$_}=~/^[\!\~\-]/) || ($row==0));
- my ($usy,$ufn)=split(/__&&&\__/,$f{$_});
- @assessdata=&exportsheet($sheetdata->{'uname'},
- $sheetdata->{'udom'},
+ next if (($value =~ /^[!~-]/) || ($row==0));
+ my ($usy,$ufn)=split(/__&&&\__/,$value);
+ @assessdata=&exportsheet($sheet,$sheet->{'uname'},
+ $sheet->{'udom'},
'assesscalc',$usy,$ufn);
my $index=0;
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]) {
+ if (defined($assessdata[$index])) {
my $col=$_;
if ($assessdata[$index]=~/\D/) {
$c{$col.$row}="'".$assessdata[$index]."'";
@@ -1942,16 +2338,19 @@ sub loadstudent {
}
$cachedassess='';
undef %cachedstores;
- &setformulas($safeeval,%f);
- &setconstants($safeeval,%c);
+ $sheet->{'f'} = \%f;
+ &setformulas($sheet);
+ &setconstants($sheet,\%c);
}
# --------------------------------------------------- Load data for one student
-
+#
sub loadcourse {
- my ($safeeval,$sheetdata,$r)=@_;
+ my ($sheet,$r)=@_;
+ #
my %c=();
- my %f=&getformulas($safeeval);
+ my %f=&getformulas($sheet);
+ #
my $total=0;
foreach (keys(%f)) {
if ($_=~/^A(\d+)/) {
@@ -1976,8 +2375,8 @@ ENDPOP
next if ($_!~/^A(\d+)/);
my $row=$1;
next if (($f{$_}=~/^[\!\~\-]/) || ($row==0));
- my @studentdata=&exportsheet(split(/\:/,$f{$_}),
- 'studentcalc');
+ my ($sname,$sdom) = split(':',$f{$_});
+ my @studentdata=&exportsheet($sheet,$sname,$sdom,'studentcalc');
undef %userrdatas;
$now++;
$r->print('<script>popwin.document.popremain.remaining.value="'.
@@ -1988,7 +2387,7 @@ ENDPOP
my $index=0;
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]) {
+ if (defined($studentdata[$index])) {
my $col=$_;
if ($studentdata[$index]=~/\D/) {
$c{$col.$row}="'".$studentdata[$index]."'";
@@ -1998,29 +2397,30 @@ ENDPOP
unless ($col eq 'A') {
$f{$col.$row}='import';
}
- $index++;
- }
+ }
+ $index++;
}
}
- &setformulas($safeeval,%f);
- &setconstants($safeeval,%c);
+ $sheet->{'f'}=\%f;
+ &setformulas($sheet);
+ &setconstants($sheet,\%c);
$r->print('<script>popwin.close()</script>');
$r->rflush();
}
# ------------------------------------------------ Load data for one assessment
-
+#
sub loadassessment {
- my ($safeeval,$sheetdata)=@_;
+ my ($sheet)=@_;
- my $uhome = $sheetdata->{'uhome'};
- my $uname = $sheetdata->{'uname'};
- my $udom = $sheetdata->{'udom'};
- my $symb = $sheetdata->{'usymb'};
- my $cid = $sheetdata->{'cid'};
- my $cnum = $sheetdata->{'cnum'};
- my $cdom = $sheetdata->{'cdom'};
- my $chome = $sheetdata->{'chome'};
+ my $uhome = $sheet->{'uhome'};
+ my $uname = $sheet->{'uname'};
+ my $udom = $sheet->{'udom'};
+ my $symb = $sheet->{'usymb'};
+ my $cid = $sheet->{'cid'};
+ my $cnum = $sheet->{'cnum'};
+ my $cdom = $sheet->{'cdom'};
+ my $chome = $sheet->{'chome'};
my $namespace;
unless ($namespace=$cid) { return ''; }
@@ -2041,30 +2441,23 @@ sub loadassessment {
#
# restore individual
#
- my $answer=&Apache::lonnet::reply(
- "restore:$udom:$uname:".
- &Apache::lonnet::escape($namespace).":".
- &Apache::lonnet::escape($symb),$uhome);
- foreach (split(/\&/,$answer)) {
- my ($name,$value)=split(/\=/,$_);
- $returnhash{&Apache::lonnet::unescape($name)}=
- &Apache::lonnet::unescape($value);
- }
- my $version;
- for ($version=1;$version<=$returnhash{'version'};$version++) {
+ %returnhash = &Apache::lonnet::restore($symb,$namespace,$udom,$uname);
+ for (my $version=1;$version<=$returnhash{'version'};$version++) {
foreach (split(/\:/,$returnhash{$version.':keys'})) {
$returnhash{$_}=$returnhash{$version.':'.$_};
}
}
}
+ #
# returnhash now has all stores for this resource
# convert all "_" to "." to be able to use libraries, multiparts, etc
+ #
+ # This is dumb. It is also necessary :(
my @oldkeys=keys %returnhash;
-
- foreach (@oldkeys) {
- my $name=$_;
- my $value=$returnhash{$_};
- delete $returnhash{$_};
+ #
+ foreach my $name (@oldkeys) {
+ my $value=$returnhash{$name};
+ delete $returnhash{$name};
$name=~s/\_/\./g;
$returnhash{$name}=$value;
}
@@ -2073,36 +2466,28 @@ sub loadassessment {
undef %useropt;
my $userprefix=$uname.'_'.$udom.'_';
-
+
unless ($uhome eq 'no_host') {
# Get coursedata
unless ((time-$courserdatas{$cid.'.last_cache'})<240) {
- my $reply=&Apache::lonnet::reply('dump:'.$cdom.':'.$cnum.
- ':resourcedata',$chome);
- if ($reply!~/^error\:/) {
- $courserdatas{$cid}=$reply;
- $courserdatas{$cid.'.last_cache'}=time;
- }
+ my %Tmp = &Apache::lonnet::dump('resourcedata',$cdom,$cnum);
+ $courserdatas{$cid}=\%Tmp;
+ $courserdatas{$cid.'.last_cache'}=time;
}
- foreach (split(/\&/,$courserdatas{$cid})) {
- my ($name,$value)=split(/\=/,$_);
- $courseopt{$userprefix.&Apache::lonnet::unescape($name)}=
- &Apache::lonnet::unescape($value);
+ while (my ($name,$value) = each(%{$courserdatas{$cid}})) {
+ $courseopt{$userprefix.$name}=$value;
}
# Get userdata (if present)
- unless
- ((time-$userrdatas{$uname.'___'.$udom.'.last_cache'})<240) {
- my $reply=
- &Apache::lonnet::reply('dump:'.$udom.':'.$uname.':resourcedata',$uhome);
- if ($reply!~/^error\:/) {
- $userrdatas{$uname.'___'.$udom}=$reply;
- $userrdatas{$uname.'___'.$udom.'.last_cache'}=time;
- }
- }
- foreach (split(/\&/,$userrdatas{$uname.'___'.$udom})) {
- my ($name,$value)=split(/\=/,$_);
- $useropt{$userprefix.&Apache::lonnet::unescape($name)}=
- &Apache::lonnet::unescape($value);
+ unless ((time-$userrdatas{$uname.'@'.$udom.'.last_cache'})<240) {
+ my %Tmp = &Apache::lonnet::dump('resourcedata',$udom,$uname);
+ $userrdatas{$cid} = \%Tmp;
+ # Most of the time the user does not have a 'resourcedata.db'
+ # file. We need to cache that we got nothing instead of bothering
+ # with requesting it every time.
+ $userrdatas{$uname.'@'.$udom.'.last_cache'}=time;
+ }
+ while (my ($name,$value) = each(%{$userrdatas{$cid}})) {
+ $useropt{$userprefix.$name}=$value;
}
}
# now courseopt, useropt initialized for this user and course
@@ -2120,29 +2505,29 @@ sub loadassessment {
#
my %c=();
if (tie(%parmhash,'GDBM_File',
- &getcfn($safeeval).'_parms.db',&GDBM_READER(),0640)) {
- my %f=&getformulas($safeeval);
- foreach (keys(%f)) {
- next if ($_!~/^A/);
- next if ($f{$_}=~/^[\!\~\-]/);
- if ($f{$_}=~/^parameter/) {
- if ($thisassess{$f{$_}}) {
- my $val=&parmval($f{$_},$safeeval,$sheetdata);
- $c{$_}=$val;
- $c{$f{$_}}=$val;
+ $sheet->{'coursefilename'}.'_parms.db',&GDBM_READER(),0640)) {
+ my %f=&getformulas($sheet);
+ foreach my $cell (keys(%f)) {
+ next if ($cell !~ /^A/);
+ next if ($f{$cell} =~/^[\!\~\-]/);
+ if ($f{$cell}=~/^parameter/) {
+ if (defined($thisassess{$f{$cell}})) {
+ my $val = &parmval($f{$cell},$sheet);
+ $c{$cell} = $val;
+ $c{$f{$cell}} = $val;
}
} else {
- my $key=$f{$_};
+ my $key=$f{$cell};
my $ckey=$key;
$key=~s/^stores\_/resource\./;
$key=~s/\_/\./g;
- $c{$_}=$returnhash{$key};
+ $c{$cell}=$returnhash{$key};
$c{$ckey}=$returnhash{$key};
}
}
untie(%parmhash);
}
- &setconstants($safeeval,%c);
+ &setconstants($sheet,\%c);
}
# --------------------------------------------------------- Various form fields
@@ -2175,12 +2560,11 @@ sub selectbox {
#
sub updatesheet {
- my ($safeeval,$sheetdata)=@_;
- my $stype=$sheetdata->{'sheettype'};
- if ($stype eq 'classcalc') {
- return &updateclasssheet($safeeval);
+ my ($sheet)=@_;
+ if ($sheet->{'sheettype'} eq 'classcalc') {
+ return &updateclasssheet($sheet);
} else {
- return &updatestudentassesssheet($safeeval);
+ return &updatestudentassesssheet($sheet);
}
}
@@ -2190,14 +2574,14 @@ sub updatesheet {
#
sub loadrows {
- my ($safeeval,$sheetdata,$r)=@_;
- my $stype=$sheetdata->{'sheettype'};
+ my ($sheet,$r)=@_;
+ my $stype=$sheet->{'sheettype'};
if ($stype eq 'classcalc') {
- &loadcourse($safeeval,$sheetdata,$r);
+ &loadcourse($sheet,$r);
} elsif ($stype eq 'studentcalc') {
- &loadstudent($safeeval,$sheetdata);
+ &loadstudent($sheet);
} else {
- &loadassessment($safeeval,$sheetdata);
+ &loadassessment($sheet);
}
}
@@ -2215,7 +2599,7 @@ sub forcedrecalc {
if ($ENV{'form.forcerecalc'}) { return 1; }
unless ($time) { return 1; }
if ($stype eq 'assesscalc') {
- my $map=(split(/\_\_\_/,$usymb))[0];
+ my $map=(split(/___/,$usymb))[0];
if (&checkthis('::assesscalc:',$time) ||
&checkthis('::assesscalc:'.$map,$time) ||
&checkthis('::assesscalc:'.$usymb,$time) ||
@@ -2234,14 +2618,17 @@ sub forcedrecalc {
}
# ============================================================== Export handler
+# exportsheet
+# returns the export row for a spreadsheet.
#
-# Non-interactive call from with program
-#
-
sub exportsheet {
- my ($uname,$udom,$stype,$usymb,$fn)=@_;
+ my ($sheet,$uname,$udom,$stype,$usymb,$fn)=@_;
+ $uname = $uname || $sheet->{'uname'};
+ $udom = $udom || $sheet->{'udom'};
+ $stype = $stype || $sheet->{'sheettype'};
my @exportarr=();
- if (($usymb=~/^\_(\w+)/) && (!$fn)) {
+ if (defined($usymb) && ($usymb=~/^\_(\w+)/) &&
+ (!defined($fn) || $fn eq '')) {
$fn='default_'.$1;
}
#
@@ -2250,18 +2637,18 @@ sub exportsheet {
my $key=$uname.':'.$udom.':'.$stype.':'.$usymb;
my $found='';
if ($oldsheets{$key}) {
- foreach (split(/\_\_\_\&\_\_\_/,$oldsheets{$key})) {
- my ($name,$value)=split(/\_\_\_\=\_\_\_/,$_);
+ foreach (split(/___&\___/,$oldsheets{$key})) {
+ my ($name,$value)=split(/___=___/,$_);
if ($name eq $fn) {
$found=$value;
}
}
}
unless ($found) {
- &cachedssheets($uname,$udom,&Apache::lonnet::homeserver($uname,$udom));
+ &cachedssheets($sheet,$uname,$udom);
if ($oldsheets{$key}) {
- foreach (split(/\_\_\_\&\_\_\_/,$oldsheets{$key})) {
- my ($name,$value)=split(/\_\_\_\=\_\_\_/,$_);
+ foreach (split(/___&\___/,$oldsheets{$key})) {
+ my ($name,$value)=split(/___=___/,$_);
if ($name eq $fn) {
$found=$value;
}
@@ -2280,73 +2667,68 @@ sub exportsheet {
#
# Return what was cached
#
- @exportarr=split(/\_\_\_\;\_\_\_/,$found);
- } else {
- #
- # Not cached
- #
- my ($thissheet,$sheetdata)=&makenewsheet($uname,$udom,$stype,$usymb);
- &readsheet($thissheet,$fn);
- &updatesheet($thissheet,$sheetdata);
- &loadrows($thissheet,$sheetdata);
- &calcsheet($thissheet,$sheetdata);
- @exportarr=&exportdata($thissheet,$sheetdata);
- #
- # Store now
- #
- my $cid=$ENV{'request.course.id'};
- my $current='';
- if ($stype eq 'studentcalc') {
- $current=&Apache::lonnet::reply('get:'.
- $ENV{'course.'.$cid.'.domain'}.':'.
- $ENV{'course.'.$cid.'.num'}.
- ':nohist_calculatedsheets:'.
- &Apache::lonnet::escape($key),
- $ENV{'course.'.$cid.'.home'});
- } else {
- $current=&Apache::lonnet::reply('get:'.$sheetdata->{'udom'}.':'.
- $sheetdata->{'uname'}.
- ':nohist_calculatedsheets_'.
- $ENV{'request.course.id'}.':'.
- &Apache::lonnet::escape($key),
- $sheetdata->{'uhome'});
- }
- my %currentlystored=();
- unless ($current=~/^error\:/) {
- foreach (split(/___&\___/,&Apache::lonnet::unescape($current))) {
- my ($name,$value)=split(/___=___/,$_);
- $currentlystored{$name}=$value;
- }
+ @exportarr=split(/___;___/,$found);
+ return @exportarr;
+ }
+ #
+ # Not cached
+ #
+ my ($newsheet)=&makenewsheet($uname,$udom,$stype,$usymb);
+ &readsheet($newsheet,$fn);
+ &updatesheet($newsheet);
+ &loadrows($newsheet);
+ &calcsheet($newsheet);
+ @exportarr=&exportdata($newsheet);
+ ##
+ ## Store now
+ ##
+ #
+ # load in the old value
+ #
+ my %currentlystored=();
+ if ($stype eq 'studentcalc') {
+ my @tmp = &Apache::lonnet::get('nohist_calculatedsheets',
+ [$key],
+ $sheet->{'cdom'},$sheet->{'cnum'});
+ if ($tmp[0]!~/^error/) {
+ %currentlystored = @tmp;
}
- $currentlystored{$fn}=join('___;___',@exportarr);
- #
- my $newstore='';
- foreach (keys(%currentlystored)) {
- if ($newstore) { $newstore.='___&___'; }
- $newstore.=$_.'___=___'.$currentlystored{$_};
- }
- my $now=time;
- if ($stype eq 'studentcalc') {
- &Apache::lonnet::reply('put:'.
- $ENV{'course.'.$cid.'.domain'}.':'.
- $ENV{'course.'.$cid.'.num'}.
- ':nohist_calculatedsheets:'.
- &Apache::lonnet::escape($key).'='.
- &Apache::lonnet::escape($newstore).'&'.
- &Apache::lonnet::escape($key).'.time='.$now,
- $ENV{'course.'.$cid.'.home'});
- } else {
- &Apache::lonnet::reply('put:'.
- $sheetdata->{'udom'}.':'.
- $sheetdata->{'uname'}.
- ':nohist_calculatedsheets_'.
- $ENV{'request.course.id'}.':'.
- &Apache::lonnet::escape($key).'='.
- &Apache::lonnet::escape($newstore).'&'.
- &Apache::lonnet::escape($key).'.time='.$now,
- $sheetdata->{'uhome'});
+ } else {
+ my @tmp = &Apache::lonnet::get('nohist_calculatedsheets_'.
+ $sheet->{'cid'},[$key],
+ $sheet->{'udom'},$sheet->{'uname'});
+ if ($tmp[0]!~/^error/) {
+ %currentlystored = @tmp;
}
}
+ #
+ # Add the new line
+ #
+ $currentlystored{$fn}=join('___;___',@exportarr);
+ #
+ # Stick everything back together
+ #
+ my $newstore='';
+ foreach (keys(%currentlystored)) {
+ if ($newstore) { $newstore.='___&___'; }
+ $newstore.=$_.'___=___'.$currentlystored{$_};
+ }
+ my $now=time;
+ #
+ # Store away the new value
+ #
+ if ($stype eq 'studentcalc') {
+ &Apache::lonnet::put('nohist_calculatedsheets',
+ { $key => $newstore,
+ $key.time => $now },
+ $sheet->{'cdom'},$sheet->{'cnum'});
+ } else {
+ &Apache::lonnet::put('nohist_calculatedsheets_'.$sheet->{'cid'},
+ { $key => $newstore,
+ $key.time => $now },
+ $sheet->{'udom'},
+ $sheet->{'uname'})
+ }
return @exportarr;
}
@@ -2354,20 +2736,14 @@ sub exportsheet {
#
# Load previously cached student spreadsheets for this course
#
-sub expirationdates {
+sub load_spreadsheet_expirationdates {
undef %expiredates;
my $cid=$ENV{'request.course.id'};
- my $reply=&Apache::lonnet::reply('dump:'.
- $ENV{'course.'.$cid.'.domain'}.':'.
- $ENV{'course.'.$cid.'.num'}.
- ':nohist_expirationdates',
- $ENV{'course.'.$cid.'.home'});
- unless ($reply=~/^error\:/) {
- foreach (split(/\&/,$reply)) {
- my ($name,$value)=split(/\=/,$_);
- $expiredates{&Apache::lonnet::unescape($name)}
- =&Apache::lonnet::unescape($value);
- }
+ my @tmp = &Apache::lonnet::dump('nohist_expirationdates',
+ $ENV{'course.'.$cid.'.domain'},
+ $ENV{'course.'.$cid.'.num'});
+ if (lc($tmp[0])!~/^error/){
+ %expiredates = @tmp;
}
}
@@ -2378,16 +2754,13 @@ sub expirationdates {
sub cachedcsheets {
my $cid=$ENV{'request.course.id'};
- my $reply=&Apache::lonnet::reply('dump:'.
- $ENV{'course.'.$cid.'.domain'}.':'.
- $ENV{'course.'.$cid.'.num'}.
- ':nohist_calculatedsheets',
- $ENV{'course.'.$cid.'.home'});
- unless ($reply=~/^error\:/) {
- foreach ( split(/\&/,$reply)) {
- my ($name,$value)=split(/\=/,$_);
- $oldsheets{&Apache::lonnet::unescape($name)}
- =&Apache::lonnet::unescape($value);
+ my @tmp = &Apache::lonnet::dump('nohist_calculatedsheets',
+ $ENV{'course.'.$cid.'.domain'},
+ $ENV{'course.'.$cid.'.num'});
+ if ($tmp[0] !~ /^error/) {
+ my %StupidTempHash = @tmp;
+ while (my ($key,$value) = each %StupidTempHash) {
+ $oldsheets{$key} = $value;
}
}
}
@@ -2398,22 +2771,24 @@ sub cachedcsheets {
#
sub cachedssheets {
- my ($sname,$sdom,$shome)=@_;
- unless (($loadedcaches{$sname.'_'.$sdom}) || ($shome eq 'no_host')) {
- my $cid=$ENV{'request.course.id'};
- my $reply=&Apache::lonnet::reply('dump:'.$sdom.':'.$sname.
- ':nohist_calculatedsheets_'.
- $ENV{'request.course.id'},
- $shome);
- unless ($reply=~/^error\:/) {
- foreach ( split(/\&/,$reply)) {
- my ($name,$value)=split(/\=/,$_);
- $oldsheets{&Apache::lonnet::unescape($name)}
- =&Apache::lonnet::unescape($value);
+ my ($sheet,$uname,$udom) = @_;
+ $uname = $uname || $sheet->{'uname'};
+ $udom = $udom || $sheet->{'udom'};
+ if (! $loadedcaches{$uname.'_'.$udom}) {
+ my @tmp = &Apache::lonnet::dump('nohist_calculatedsheets',
+ $sheet->{'udom'},
+ $sheet->{'uname'});
+ if ($tmp[0] !~ /^error/) {
+ my %TempHash = @tmp;
+ my $count = 0;
+ while (my ($key,$value) = each %TempHash) {
+ $oldsheets{$key} = $value;
+ $count++;
+ }
+ $loadedcaches{$sheet->{'uname'}.'_'.$sheet->{'udom'}}=1;
}
}
- $loadedcaches{$sname.'_'.$sdom}=1;
- }
+
}
# ===================================================== Calculated sheets cache
@@ -2426,58 +2801,137 @@ sub cachedssheets {
# Interactive call to screen
#
#
-
-
sub handler {
my $r=shift;
+
+ my ($sheettype) = ($r->uri=~/\/(\w+)$/);
+
+ if (! exists($ENV{'form.Status'})) {
+ $ENV{'form.Status'} = 'Active';
+ }
+ if ( ! exists($ENV{'form.output'}) ||
+ ($sheettype ne 'classcalc' &&
+ lc($ENV{'form.output'}) eq 'recursive excel')) {
+ $ENV{'form.output'} = 'HTML';
+ }
+ #
+ # Overload checking
+ #
+ # Check this server
+ my $loaderror=&Apache::lonnet::overloaderror($r);
+ if ($loaderror) { return $loaderror; }
+ # Check the course homeserver
+ $loaderror= &Apache::lonnet::overloaderror($r,
+ $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+ if ($loaderror) { return $loaderror; }
+ #
+ # HTML Header
+ #
if ($r->header_only) {
$r->content_type('text/html');
$r->send_http_header;
return OK;
}
+ #
# Global directory configs
- $includedir=$r->dir_config('lonIncludes');
- $tmpdir=$r->dir_config('lonDaemons').'/tmp/';
+ #
+ $includedir = $r->dir_config('lonIncludes');
+ $tmpdir = $r->dir_config('lonDaemons').'/tmp/';
+ #
+ # Roles Checking
+ #
# Needs to be in a course
- if ($ENV{'request.course.fn'}) {
- # Get query string for limited number of parameters
- &Apache::loncommon::get_unprocessed_cgi
- ($ENV{'QUERY_STRING'},['uname','udom','usymb','ufn']);
- 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;
- my $adom;
-
- unless ($ENV{'form.uname'}) {
- $aname=$ENV{'user.name'};
- $adom=$ENV{'user.domain'};
- } else {
- $aname=$ENV{'form.uname'};
- $adom=$ENV{'form.udom'};
- }
- # Open page
- $r->content_type('text/html');
- $r->header_out('Cache-control','no-cache');
- $r->header_out('Pragma','no-cache');
- $r->send_http_header;
- # Screen output
- $r->print('<html><head><title>LON-CAPA Spreadsheet</title>');
+ if (! $ENV{'request.course.fn'}) {
+ # 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;
+ }
+ #
+ # Get query string for limited number of parameters
+ #
+ &Apache::loncommon::get_unprocessed_cgi
+ ($ENV{'QUERY_STRING'},['uname','udom','usymb','ufn','mapid','resid']);
+ #
+ # Deal with restricted student permissions
+ #
+ if ($ENV{'request.role'} =~ /^st\./) {
+ delete $ENV{'form.unewfield'} if (exists($ENV{'form.unewfield'}));
+ delete $ENV{'form.unewformula'} if (exists($ENV{'form.unewformula'}));
+ }
+ #
+ # Clean up symb and spreadsheet filename
+ #
+ 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'};
+ }
+ #
+ # Determine the user name and domain for the sheet.
+ my $aname;
+ my $adom;
+ unless ($ENV{'form.uname'}) {
+ $aname=$ENV{'user.name'};
+ $adom=$ENV{'user.domain'};
+ } else {
+ $aname=$ENV{'form.uname'};
+ $adom=$ENV{'form.udom'};
+ }
+ #
+ # Open page, try to prevent browser cache.
+ #
+ $r->content_type('text/html');
+ $r->header_out('Cache-control','no-cache');
+ $r->header_out('Pragma','no-cache');
+ $r->send_http_header;
+ #
+ # Header....
+ #
+ $r->print('<html><head><title>LON-CAPA Spreadsheet</title>');
+ my $nothing = "''";
+ if ($ENV{'browser.type'} eq 'explorer') {
+ $nothing = "'javascript:void(0);'";
+ }
+
+ if ($ENV{'request.role'} !~ /^st\./) {
$r->print(<<ENDSCRIPT);
<script language="JavaScript">
- 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();
+ var editwin;
+
+ function celledit(cellname,cellformula) {
+ var edit_text = '';
+ edit_text +='<html><head><title>Cell Edit Window</title></head><body>';
+ edit_text += '<form name="editwinform">';
+ edit_text += '<center><h3>Cell '+cellname+'</h3>';
+ edit_text += '<textarea name="newformula" cols="40" rows="6"';
+ edit_text += ' wrap="off" >'+cellformula+'</textarea>';
+ edit_text += '</br>';
+ edit_text += '<input type="button" name="accept" value="Accept"';
+ edit_text += ' onClick=\\\'javascript:';
+ edit_text += 'opener.document.sheet.unewfield.value=';
+ edit_text += '"'+cellname+'";';
+ edit_text += 'opener.document.sheet.unewformula.value=';
+ edit_text += 'document.editwinform.newformula.value;';
+ edit_text += 'opener.document.sheet.submit();';
+ edit_text += 'self.close()\\\' />';
+ edit_text += ' ';
+ edit_text += '<input type="button" name="abort" ';
+ edit_text += 'value="Discard Changes"';
+ edit_text += ' onClick="javascript:self.close()" />';
+ edit_text += '</center></body></html>';
+
+ if (editwin != null && !(editwin.closed) ) {
+ editwin.close();
}
+
+ editwin = window.open($nothing,'CellEditWin','height=200,width=350,scrollbars=no,resizeable=yes,alwaysRaised=yes,dependent=yes',true);
+ editwin.document.write(edit_text);
}
function changesheet(cn) {
@@ -2494,224 +2948,226 @@ sub handler {
</script>
ENDSCRIPT
- $r->print('</head>'.&Apache::loncommon::bodytag('Grades Spreadsheet').
- '<form action="'.$r->uri.'" name=sheet method=post>'.
- &hiddenfield('uname',$ENV{'form.uname'}).
- &hiddenfield('udom',$ENV{'form.udom'}).
- &hiddenfield('usymb',$ENV{'form.usymb'}).
- &hiddenfield('unewfield','').
- &hiddenfield('unewformula',''));
- # Send this out right away
- $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+)$/;
- my ($asheet,$asheetdata)=&makenewsheet
- ($aname,$adom,$1,$ENV{'form.usymb'});
- # If a new formula had been entered, go from work copy
- if ($ENV{'form.unewfield'}) {
- $r->print('<h2>Modified Workcopy</h2>');
- $ENV{'form.unewformula'}=~s/\'/\"/g;
- $r->print('<p>New formula: '.$ENV{'form.unewfield'}.'='.
- $ENV{'form.unewformula'}.'<p>');
- &setfilename($asheet,$ENV{'form.ufn'});
- &tmpread($asheet,
- $ENV{'form.unewfield'},$ENV{'form.unewformula'});
-
- } elsif ($ENV{'form.saveas'}) {
- &setfilename($asheet,$ENV{'form.ufn'});
- &tmpread($asheet);
- } else {
- &readsheet($asheet,$ENV{'form.ufn'});
- }
- # Print out user information
- unless ($asheetdata->{'sheettype'} eq 'classcalc') {
- $r->print('<p><b>User:</b> '.$asheetdata->{'uname'}.
- '<br><b>Domain:</b> '.$asheetdata->{'udom'});
- if (&getcsec($asheet) eq '-1') {
- $r->print('<h3><font color=red>'.
- 'Not a student in this course</font></h3>');
- } else {
- $r->print('<br><b>Section/Group:</b> '.$asheetdata->{'csec'});
- }
- if ($ENV{'form.usymb'}) {
- $r->print('<br><b>Assessment:</b> <tt>'.
- $ENV{'form.usymb'}.'</tt>');
- }
- }
- # See if user can see this
- if (($asheetdata->{'sheettype'} eq 'classcalc' ) ||
- ($asheetdata->{'uname'} ne $ENV{'user.name'} ) ||
- ($asheetdata->{'udom'} ne $ENV{'user.domain'})) {
- unless (&Apache::lonnet::allowed('vgr',$asheetdata->{'cid'})) {
- $r->print('<h1>Access Permission Denied</h1>'.
- '</form></body></html>');
- return OK;
- }
- }
- # Additional options
- $r->print(
- '<input type=submit name=forcerecalc value="Completely Recalculate Sheet"><p>'
- );
- if ($asheetdata->{'sheettype'} eq 'assesscalc') {
- $r->print('<p><font size=+2>'.
- '<a href="/adm/studentcalc?'.
- 'uname='.$asheetdata->{'uname'}.
- '&udom='.$asheetdata->{'udom'}.'">'.
- 'Level up: Student Sheet</a></font><p>');
- }
- if (($asheetdata->{'sheettype'} eq 'studentcalc') &&
- (&Apache::lonnet::allowed('vgr',$asheetdata->{'cid'}))) {
- $r->print (
- '<p><font size=+2><a href="/adm/classcalc">'.
- 'Level up: Course Sheet</a></font><p>');
- }
- # Save dialog
- if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
- my $fname=$ENV{'form.ufn'};
- $fname=~s/\_[^\_]+$//;
- if ($fname eq 'default') { $fname='course_default'; }
- $r->print
- ('<input type=submit name=saveas value="Save as ...">'.
- '<input type=text size=20 name=newfn value="'.$fname.'">'.
- '(make default: <input type=checkbox name="makedefufn">)<p>');
- }
- $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,$asheetdata->{'sheettype'})) {
- $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'));
+ }
+ $r->print('</head>'.&Apache::loncommon::bodytag('Grades Spreadsheet').
+ '<form action="'.$r->uri.'" name="sheet" method="post">');
+ $r->print(&hiddenfield('uname',$ENV{'form.uname'}).
+ &hiddenfield('udom',$ENV{'form.udom'}).
+ &hiddenfield('usymb',$ENV{'form.usymb'}).
+ &hiddenfield('unewfield','').
+ &hiddenfield('unewformula',''));
+ $r->rflush();
+ #
+ # Full recalc?
+ #
+ if ($ENV{'form.forcerecalc'}) {
+ $r->print('<h4>Completely Recalculating Sheet ...</h4>');
+ undef %spreadsheets;
+ undef %courserdatas;
+ undef %userrdatas;
+ undef %defaultsheets;
+ undef %rowlabel_cache;
+ }
+ # Read new sheet or modified worksheet
+ my ($sheet)=&makenewsheet($aname,$adom,$sheettype,$ENV{'form.usymb'});
+ #
+ # Check user permissions
+ if (($sheet->{'sheettype'} eq 'classcalc' ) ||
+ ($sheet->{'uname'} ne $ENV{'user.name'} ) ||
+ ($sheet->{'udom'} ne $ENV{'user.domain'})) {
+ unless (&Apache::lonnet::allowed('vgr',$sheet->{'cid'})) {
+ $r->print('<h1>Access Permission Denied</h1>'.
+ '</form></body></html>');
+ return OK;
+ }
+ }
+ # Print out user information
+ $r->print('<h2>'.$sheet->{'coursedesc'}.'</h2>');
+ if ($sheet->{'sheettype'} ne 'classcalc') {
+ $r->print('<h2>'.&gettitle($sheet).'</h2><p>');
+ }
+ if ($sheet->{'sheettype'} eq 'assesscalc') {
+ $r->print('<b>User:</b> '.$sheet->{'uname'}.
+ '<br /><b>Domain:</b> '.$sheet->{'udom'}.'<br />');
+ }
+ if ($sheet->{'sheettype'} eq 'studentcalc' ||
+ $sheet->{'sheettype'} eq 'assesscalc') {
+ $r->print('<b>Section/Group:</b>'.$sheet->{'csec'}.'</p>');
+ }
+ #
+ # If a new formula had been entered, go from work copy
+ if ($ENV{'form.unewfield'}) {
+ $r->print('<h2>Modified Workcopy</h2>');
+ $ENV{'form.unewformula'}=~s/\'/\"/g;
+ $r->print('<p>New formula: '.$ENV{'form.unewfield'}.'='.
+ $ENV{'form.unewformula'}.'<p>');
+ $sheet->{'filename'} = $ENV{'form.ufn'};
+ &tmpread($sheet,$ENV{'form.unewfield'},$ENV{'form.unewformula'});
+ } elsif ($ENV{'form.saveas'}) {
+ $sheet->{'filename'} = $ENV{'form.ufn'};
+ &tmpread($sheet);
+ } else {
+ &readsheet($sheet,$ENV{'form.ufn'});
+ }
+ # Additional options
+ if ($sheet->{'sheettype'} eq 'assesscalc') {
+ $r->print('<p><font size=+2>'.
+ '<a href="/adm/studentcalc?'.
+ 'uname='.$sheet->{'uname'}.
+ '&udom='.$sheet->{'udom'}.'">'.
+ 'Level up: Student Sheet</a></font></p>');
+ }
+ if (($sheet->{'sheettype'} eq 'studentcalc') &&
+ (&Apache::lonnet::allowed('vgr',$sheet->{'cid'}))) {
+ $r->print ('<p><font size=+2><a href="/adm/classcalc">'.
+ 'Level up: Course Sheet</a></font></p>');
+ }
+ # Recalc button
+ $r->print('<br />'.
+ '<input type="submit" name="forcerecalc" '.
+ 'value="Completely Recalculate Sheet"></p>');
+ # Save dialog
+ if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
+ my $fname=$ENV{'form.ufn'};
+ $fname=~s/\_[^\_]+$//;
+ if ($fname eq 'default') { $fname='course_default'; }
+ $r->print('<input type=submit name=saveas value="Save as ...">'.
+ '<input type=text size=20 name=newfn value="'.$fname.'">'.
+ 'make default: <input type=checkbox name="makedefufn"><p>');
+ }
+ $r->print(&hiddenfield('ufn',$sheet->{'filename'}));
+ # 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($sheet)) {
+ $r->print('<option name="'.$_.'"');
+ if ($ENV{'form.ufn'} eq $_) {
+ $r->print(' selected');
}
+ $r->print('>'.$_.'</option>');
+ }
+ $r->print('</select><p>');
+ if ($sheet->{'sheettype'} eq 'studentcalc') {
+ &setothersheets($sheet,
+ &othersheets($sheet,'assesscalc'));
}
- # Cached sheets
- &expirationdates();
+ }
+ #
+ # Set up caching mechanisms
+ #
+ &load_spreadsheet_expirationdates();
+ # Clear out old caches if we have not seen this class before.
+ if (exists($oldsheets{'course'}) &&
+ $oldsheets{'course'} ne $sheet->{'cid'}) {
undef %oldsheets;
undef %loadedcaches;
- if ($asheetdata->{'sheettype'} eq 'classcalc') {
- $r->print
- ("Loading previously calculated student sheets ...<br>\n");
- $r->rflush();
- &cachedcsheets();
- } elsif ($asheetdata->{'sheettype'} eq 'studentcalc') {
- $r->print
- ("Loading previously calculated assessment sheets ...<br>\n");
- $r->rflush();
- &cachedssheets($asheetdata->{'uname'},$asheetdata->{'udom'},
- $asheetdata->{'uhome'});
- }
- # Update sheet, load rows
- $r->print("Loaded sheet(s), updating rows ...<br>\n");
- $r->rflush();
- #
- &updatesheet($asheet,$asheetdata);
- $r->print("Updated rows, loading row data ...<br>\n");
+ }
+ $oldsheets{'course'} = $sheet->{'cid'};
+ #
+ if ($sheet->{'sheettype'} eq 'classcalc') {
+ $r->print("Loading previously calculated student sheets ...\n");
$r->rflush();
- #
- &loadrows($asheet,$asheetdata,$r);
- $r->print("Loaded row data, calculating sheet ...<br>\n");
+ &cachedcsheets();
+ } elsif ($sheet->{'sheettype'} eq 'studentcalc') {
+ $r->print("Loading previously calculated assessment sheets ...\n");
$r->rflush();
- #
- 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.='_'.$asheetdata->{'sheettype'};
- &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 ($asheetdata->{'sheettype'} eq 'studentcalc') {
- $r->print('<br>Show rows with empty A column: ');
+ &cachedssheets($sheet);
+ }
+ # Update sheet, load rows
+ $r->print("Loaded sheet(s), updating rows ...<br>\n");
+ $r->rflush();
+ #
+ &updatesheet($sheet);
+ $r->print("Updated rows, loading row data ...\n");
+ $r->rflush();
+ #
+ &loadrows($sheet,$r);
+ $r->print("Loaded row data, calculating sheet ...<br>\n");
+ $r->rflush();
+ #
+ my $calcoutput=&calcsheet($sheet);
+ $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.='_'.$sheet->{'sheettype'};
+ $sheet->{'filename'} = $fname;
+ $ENV{'form.ufn'}=$fname;
+ $r->print('<p>Saving spreadsheet: '.
+ &writesheet($sheet,$ENV{'form.makedefufn'}).
+ '<p>');
+ }
+ }
+ #
+ # Write the modified worksheet
+ $r->print('<b>Current sheet:</b> '.$sheet->{'filename'}.'</p>');
+ &tmpwrite($sheet);
+ if ($sheet->{'sheettype'} eq 'studentcalc') {
+ $r->print('<p>Show rows with empty A column: ');
} else {
- $r->print('<br>Show empty rows: ');
- }
-
+ $r->print('<p>>Show empty rows: ');
+ }
+ #
$r->print(&hiddenfield('userselhidden','true').
- '<input type=checkbox name=showall onClick="submit()"');
-
+ '<input type="checkbox" name="showall" onClick="submit()"');
+ #
if ($ENV{'form.showall'}) {
- $r->print(' checked');
+ $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;
- }
- }
+ unless ($ENV{'form.userselhidden'}) {
+ unless
+ ($ENV{'course.'.$sheet->{'cid'}.'.hideemptyrows'} eq 'yes') {
+ $r->print(' checked');
+ $ENV{'form.showall'}=1;
+ }
+ }
}
$r->print('>');
-
- if ($asheetdata->{'sheettype'} eq 'classcalc') {
- $r->print(
- ' Output CSV format: <input type=checkbox name=showcsv onClick="submit()"');
- if ($ENV{'form.showcsv'}) { $r->print(' checked'); }
- $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
-
- &outsheet($r,$asheet);
+ #
+ # CSV format checkbox (classcalc sheets only)
+ $r->print(' Output as <select name="output" size="1" onClick="submit()">'.
+ "\n");
+ foreach my $mode (qw/HTML CSV Excel/) {
+ $r->print('<option value="'.$mode.'"');
+ if ($ENV{'form.output'} eq $mode) {
+ $r->print(' selected ');
+ }
+ $r->print('>'.$mode.'</option>'."\n");
+ }
+ if ($sheet->{'sheettype'} eq 'classcalc') {
+ $r->print('<option value="recursive excel"');
+ if ($ENV{'form.output'} eq 'recursive excel') {
+ $r->print(' selected ');
+ }
+ $r->print(">Multi-Sheet Excel</option>\n");
+ }
+ $r->print("</select>\n");
+ #
+ if ($sheet->{'sheettype'} eq 'classcalc') {
+ $r->print(' Student Status: '.
+ &Apache::lonhtmlcommon::StatusOptions
+ ($ENV{'form.Status'},'sheet'));
+ }
+ #
+ # Buttons to insert rows
+# $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
+ &outsheet($r,$sheet);
$r->print('</form></body></html>');
-
-# ------------------------------------------------------------------------ Done
- } 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;
- }
+ # Done
return OK;
-
}
1;
__END__
-
-
-
-