--- loncom/interface/Attic/lonspreadsheet.pm 2001/01/02 23:27:11 1.32 +++ loncom/interface/Attic/lonspreadsheet.pm 2002/08/30 20:56:08 1.105 @@ -1,12 +1,68 @@ +# +# $Id: lonspreadsheet.pm,v 1.105 2002/08/30 20:56:08 matthew Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# # The LearningOnline Network with CAPA # Spreadsheet/Grades Display Handler # # 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 Gerd Kortemeyer +# 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 -package Apache::lonspreadsheet; +# POD required stuff: + +=head1 NAME + +lonspreadsheet + +=head1 SYNOPSIS + +Spreadsheet interface to internal LON-CAPA data + +=head1 DESCRIPTION + +Lonspreadsheet provides course coordinators the ability to manage their +students grades online. The students are able to view their own grades, but +not the grades of their peers. The spreadsheet is highly customizable, +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 + +=cut +package Apache::lonspreadsheet; + use strict; use Safe; use Safe::Hole; @@ -15,12 +71,32 @@ use Apache::lonnet; use Apache::Constants qw(:common :http); use GDBM_File; use HTML::TokeParser; +use Apache::lonhtmlcommon; +# +# Caches for previously calculated spreadsheets +# + +my %oldsheets; +my %loadedcaches; +my %expiredates; + +# +# Cache for stores of an individual user +# + +my $cachedassess; +my %cachedstores; # # These cache hashes need to be independent of user, resource and course # (user and course can/should be in the keys) # -use vars qw(%spreadsheets %courserdatas %userrdatas %defaultsheets); + +my %spreadsheets; +my %courserdatas; +my %userrdatas; +my %defaultsheets; +my %updatedata; # # These global hashes are dependent on user, course and resource, @@ -30,6 +106,14 @@ my %courseopt; my %useropt; my %parmhash; +# +# Some hashes for stats on timing and performance +# + +my %starttimes; +my %usedtimes; +my %numbertimes; + # Stuff that only the screen handler can know my $includedir; @@ -39,13 +123,14 @@ my $tmpdir; # ===================================== Implements an instance of a spreadsheet sub initsheet { - my $safeeval = new Safe; + 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 @@ -55,37 +140,41 @@ sub initsheet { # v: output values # c: preloaded constants (A-column) # rl: row label +# os: other spreadsheets (for student spreadsheet only) -%v=(); -%t=(); -%f=(); -%c=(); -%rl=(); +undef %sheet_values; +undef %t; +undef %f; +undef %c; +undef %rowlabel; +undef @os; -$maxrow=0; -$sheettype=''; +$maxrow = 0; +$sheettype = ''; # filename/reference of the sheet - -$filename=''; +$filename = ''; # user data -$uname=''; -$uhome=''; -$udom=''; +$uname = ''; +$uhome = ''; +$udom = ''; # course data -$csec=''; -$chome=''; -$cnum=''; -$cdom=''; -$cid=''; -$cfn=''; +$csec = ''; +$chome= ''; +$cnum = ''; +$cdom = ''; +$cid = ''; +$cfn = ''; # symb -$usymb=''; +$usymb = ''; + +# error messages +$errormsg = ''; sub mask { my ($lower,$upper)=@_; @@ -116,16 +205,16 @@ sub mask { } else { if (length($ld)!=length($ud)) { $num.='('; - map { + foreach ($ld=~m/\d/g) { $num.='['.$_.'-9]'; - } ($ld=~m/\d/g); + } if (length($ud)-length($ld)>1) { $num.='|\d{'.(length($ld)+1).','.(length($ud)-1).'}'; } $num.='|'; - map { + foreach ($ud=~m/\d/g) { $num.='[0-'.$_.']'; - } ($ud=~m/\d/g); + } $num.=')'; } else { my @lda=($ld=~m/\d/g); @@ -163,12 +252,285 @@ sub mask { return '^'.$alpha.$num."\$"; } +#------------------------------------------------------- + +=item UWCALC(hashname,modules,units,date) + +returns the proportion of the module +weights not previously completed by the student. + +=over 4 + +=item hashname + +name of the hash the module dates have been inserted into + +=item modules + +reference to a cell which contains a comma deliminated list of modules +covered by the assignment. + +=item units + +reference to a cell which contains a comma deliminated list of module +weights with respect to the assignment + +=item date + +reference to a cell which contains the date the assignment was completed. + +=back + +=cut + +#------------------------------------------------------- +sub UWCALC { + my ($hashname,$modules,$units,$date) = @_; + my @Modules = split(/,/,$modules); + my @Units = split(/,/,$units); + my $total_weight; + foreach (@Units) { + $total_weight += $_; + } + my $usum=0; + for (my $i=0; $i<=$#Modules; $i++) { + if (&HASH($hashname,$Modules[$i]) eq $date) { + $usum += $Units[$i]; + } + } + return $usum/$total_weight; +} + +#------------------------------------------------------- + +=item CDLSUM(list) + +returns the sum of the elements in a cell which contains +a Comma Deliminate List of numerical values. +'list' is a reference to a cell which contains a comma deliminated list. + +=cut + +#------------------------------------------------------- +sub CDLSUM { + my ($list)=@_; + my $sum; + foreach (split/,/,$list) { + $sum += $_; + } + return $sum; +} + +#------------------------------------------------------- + +=item CDLITEM(list,index) + +returns the item at 'index' in a Comma Deliminated List. + +=over 4 + +=item list + +reference to a cell which contains a comma deliminated list. + +=item index + +the Perl index of the item requested (first element in list has +an index of 0) + +=back + +=cut + +#------------------------------------------------------- +sub CDLITEM { + my ($list,$index)=@_; + my @Temp = split/,/,$list; + return $Temp[$index]; +} + +#------------------------------------------------------- + +=item CDLHASH(name,key,value) + +loads a comma deliminated list of keys into +the hash 'name', all with a value of 'value'. + +=over 4 + +=item name + +name of the hash. + +=item key + +(a pointer to) a comma deliminated list of keys. + +=item value + +a single value to be entered for each key. + +=back + +=cut + +#------------------------------------------------------- +sub CDLHASH { + my ($name,$key,$value)=@_; + my @Keys; + my @Values; + # Check to see if we have multiple $key values + if ($key =~ /[A-z](\-[A-z])?\d+(\-\d+)?/) { + my $keymask = &mask($key); + # Assume the keys are addresses + my @Temp = grep /$keymask/,keys(%sheet_values); + @Keys = $sheet_values{@Temp}; + } else { + $Keys[0]= $key; + } + my @Temp; + foreach $key (@Keys) { + @Temp = (@Temp, split/,/,$key); + } + @Keys = @Temp; + if ($value =~ /[A-z](\-[A-z])?\d+(\-\d+)?/) { + my $valmask = &mask($value); + my @Temp = grep /$valmask/,keys(%sheet_values); + @Values =$sheet_values{@Temp}; + } else { + $Values[0]= $value; + } + $value = $Values[0]; + # Add values to hash + for (my $i = 0; $i<=$#Keys; $i++) { + my $key = $Keys[$i]; + if (! exists ($hashes{$name}->{$key})) { + $hashes{$name}->{$key}->[0]=$value; + } else { + my @Temp = sort(@{$hashes{$name}->{$key}},$value); + $hashes{$name}->{$key} = \@Temp; + } + } + return "hash '$name' updated"; +} + +#------------------------------------------------------- + +=item GETHASH(name,key,index) + +returns the element in hash 'name' +reference by the key 'key', at index 'index' in the values list. + +=cut + +#------------------------------------------------------- +sub GETHASH { + my ($name,$key,$index)=@_; + if (! defined($index)) { + $index = 0; + } + if ($key =~ /^[A-z]\d+$/) { + $key = $sheet_values{$key}; + } + return $hashes{$name}->{$key}->[$index]; +} + +#------------------------------------------------------- + +=item CLEARHASH(name) + +clears all the values from the hash 'name' + +=item CLEARHASH(name,key) + +clears all the values from the hash 'name' associated with the given key. + +=cut + +#------------------------------------------------------- +sub CLEARHASH { + my ($name,$key)=@_; + if (defined($key)) { + if (exists($hashes{$name}->{$key})) { + $hashes{$name}->{$key}=undef; + return "hash '$name' key '$key' cleared"; + } + } else { + if (exists($hashes{$name})) { + $hashes{$name}=undef; + return "hash '$name' cleared"; + } + } + return "Error in clearing hash"; +} + +#------------------------------------------------------- + +=item HASH(name,key,value) + +loads values into an internal hash. If a key +already has a value associated with it, the values are sorted numerically. + +=item HASH(name,key) + +returns the 0th value in the hash 'name' associated with 'key'. + +=cut + +#------------------------------------------------------- +sub HASH { + my ($name,$key,$value)=@_; + my @Keys; + undef @Keys; + my @Values; + # Check to see if we have multiple $key values + if ($key =~ /[A-z](\-[A-z])?\d+(\-\d+)?/) { + my $keymask = &mask($key); + # Assume the keys are addresses + my @Temp = grep /$keymask/,keys(%sheet_values); + @Keys = $sheet_values{@Temp}; + } else { + $Keys[0]= $key; + } + # If $value is empty, return the first value associated + # with the first key. + if (! $value) { + return $hashes{$name}->{$Keys[0]}->[0]; + } + # Check to see if we have multiple $value(s) + if ($value =~ /[A-z](\-[A-z])?\d+(\-\d+)?/) { + my $valmask = &mask($value); + my @Temp = grep /$valmask/,keys(%sheet_values); + @Values =$sheet_values{@Temp}; + } else { + $Values[0]= $value; + } + # Add values to hash + for (my $i = 0; $i<=$#Keys; $i++) { + my $key = $Keys[$i]; + my $value = ($i<=$#Values ? $Values[$i] : $Values[0]); + if (! exists ($hashes{$name}->{$key})) { + $hashes{$name}->{$key}->[0]=$value; + } else { + my @Temp = sort(@{$hashes{$name}->{$key}},$value); + $hashes{$name}->{$key} = \@Temp; + } + } + return $Values[-1]; +} + +#------------------------------------------------------- + +=item NUM(range) + +returns the number of items in the range. + +=cut + +#------------------------------------------------------- sub NUM { my $mask=mask(@_); - my $num=0; - map { - $num++; - } grep /$mask/,keys %v; + my $num= $#{@{grep(/$mask/,keys(%sheet_values))}}+1; return $num; } @@ -176,31 +538,49 @@ sub BIN { my ($low,$high,$lower,$upper)=@_; my $mask=mask($lower,$upper); my $num=0; - map { - if (($v{$_}>=$low) && ($v{$_}<=$high)) { + foreach (grep /$mask/,keys(%sheet_values)) { + if (($sheet_values{$_}>=$low) && ($sheet_values{$_}<=$high)) { $num++; } - } grep /$mask/,keys %v; + } return $num; } +#------------------------------------------------------- + +=item SUM(range) + +returns the sum of items in the range. + +=cut + +#------------------------------------------------------- sub SUM { my $mask=mask(@_); my $sum=0; - map { - $sum+=$v{$_}; - } grep /$mask/,keys %v; + foreach (grep /$mask/,keys(%sheet_values)) { + $sum+=$sheet_values{$_}; + } return $sum; } +#------------------------------------------------------- + +=item MEAN(range) + +compute the average of the items in the range. + +=cut + +#------------------------------------------------------- sub MEAN { my $mask=mask(@_); my $sum=0; my $num=0; - map { - $sum+=$v{$_}; + foreach (grep /$mask/,keys(%sheet_values)) { + $sum+=$sheet_values{$_}; $num++; - } grep /$mask/,keys %v; + } if ($num) { return $sum/$num; } else { @@ -208,58 +588,106 @@ sub MEAN { } } +#------------------------------------------------------- + +=item STDDEV(range) + +compute the standard deviation of the items in the range. + +=cut + +#------------------------------------------------------- sub STDDEV { my $mask=mask(@_); my $sum=0; my $num=0; - map { - $sum+=$v{$_}; + foreach (grep /$mask/,keys(%sheet_values)) { + $sum+=$sheet_values{$_}; $num++; - } grep /$mask/,keys %v; + } unless ($num>1) { return undef; } my $mean=$sum/$num; $sum=0; - map { - $sum+=($v{$_}-$mean)**2; - } grep /$mask/,keys %v; + foreach (grep /$mask/,keys(%sheet_values)) { + $sum+=($sheet_values{$_}-$mean)**2; + } return sqrt($sum/($num-1)); } +#------------------------------------------------------- + +=item PROD(range) + +compute the product of the items in the range. + +=cut + +#------------------------------------------------------- sub PROD { my $mask=mask(@_); my $prod=1; - map { - $prod*=$v{$_}; - } grep /$mask/,keys %v; + foreach (grep /$mask/,keys(%sheet_values)) { + $prod*=$sheet_values{$_}; + } return $prod; } +#------------------------------------------------------- + +=item MAX(range) + +compute the maximum of the items in the range. + +=cut + +#------------------------------------------------------- sub MAX { my $mask=mask(@_); my $max='-'; - map { - unless ($max) { $max=$v{$_}; } - if (($v{$_}>$max) || ($max eq '-')) { $max=$v{$_}; } - } grep /$mask/,keys %v; + foreach (grep /$mask/,keys(%sheet_values)) { + unless ($max) { $max=$sheet_values{$_}; } + if (($sheet_values{$_}>$max) || ($max eq '-')) { $max=$sheet_values{$_}; } + } return $max; } +#------------------------------------------------------- + +=item MIN(range) + +compute the minimum of the items in the range. + +=cut + +#------------------------------------------------------- sub MIN { my $mask=mask(@_); my $min='-'; - map { - unless ($max) { $max=$v{$_}; } - if (($v{$_}<$min) || ($min eq '-')) { $min=$v{$_}; } - } grep /$mask/,keys %v; + foreach (grep /$mask/,keys(%sheet_values)) { + unless ($max) { $max=$sheet_values{$_}; } + if (($sheet_values{$_}<$min) || ($min eq '-')) { + $min=$sheet_values{$_}; + } + } return $min; } +#------------------------------------------------------- + +=item SUMMAX(num,lower,upper) + +compute the sum of the largest 'num' items in the range from +'lower' to 'upper' + +=cut + +#------------------------------------------------------- sub SUMMAX { my ($num,$lower,$upper)=@_; my $mask=mask($lower,$upper); my @inside=(); - map { - $inside[$#inside+1]=$v{$_}; - } grep /$mask/,keys %v; + foreach (grep /$mask/,keys(%sheet_values)) { + push (@inside,$sheet_values{$_}); + } @inside=sort(@inside); my $sum=0; my $i; for ($i=$#inside;(($i>$#inside-$num) && ($i>=0));$i--) { @@ -268,13 +696,23 @@ sub SUMMAX { return $sum; } +#------------------------------------------------------- + +=item SUMMIN(num,lower,upper) + +compute the sum of the smallest 'num' items in the range from +'lower' to 'upper' + +=cut + +#------------------------------------------------------- sub SUMMIN { my ($num,$lower,$upper)=@_; my $mask=mask($lower,$upper); my @inside=(); - map { - $inside[$#inside+1]=$v{$_}; - } grep /$mask/,keys %v; + foreach (grep /$mask/,keys(%sheet_values)) { + $inside[$#inside+1]=$sheet_values{$_}; + } @inside=sort(@inside); my $sum=0; my $i; for ($i=0;(($i<$num) && ($i<=$#inside));$i++) { @@ -283,6 +721,115 @@ sub SUMMIN { return $sum; } +#------------------------------------------------------- + +=item MINPARM(parametername) + +Returns the minimum value of the parameters matching the parametername. +parametername should be a string such as 'duedate'. + +=cut + +#------------------------------------------------------- +sub MINPARM { + my ($expression) = @_; + my $min = undef; + study($expression); + foreach $parameter (keys(%c)) { + next if ($parameter !~ /$expression/); + if ((! defined($min)) || ($min > $c{$parameter})) { + $min = $c{$parameter} + } + } + return $min; +} + +#------------------------------------------------------- + +=item MAXPARM(parametername) + +Returns the maximum value of the parameters matching the input parameter name. +parametername should be a string such as 'duedate'. + +=cut + +#------------------------------------------------------- +sub MAXPARM { + my ($expression) = @_; + my $max = undef; + study($expression); + foreach $parameter (keys(%c)) { + next if ($parameter !~ /$expression/); + if ((! defined($min)) || ($max < $c{$parameter})) { + $max = $c{$parameter} + } + } + return $max; +} + +#-------------------------------------------------------- +sub expandnamed { + my $expression=shift; + if ($expression=~/^\&/) { + my ($func,$var,$formula)=($expression=~/^\&(\w+)\(([^\;]+)\;(.*)\)/); + my @vars=split(/\W+/,$formula); + my %values=(); + undef %values; + foreach ( @vars ) { + my $varname=$_; + if ($varname=~/\D/) { + $formula=~s/$varname/'$c{\''.$varname.'\'}'/ge; + $varname=~s/$var/\(\\w\+\)/g; + foreach (keys(%c)) { + if ($_=~/$varname/) { + $values{$1}=1; + } + } + } + } + if ($func eq 'EXPANDSUM') { + my $result=''; + foreach (keys(%values)) { + my $thissum=$formula; + $thissum=~s/$var/$_/g; + $result.=$thissum.'+'; + } + $result=~s/\+$//; + return $result; + } else { + return 0; + } + } else { + # it is not a function, so it is a parameter name + # We should do the following: + # 1. Take the list of parameter names + # 2. look through the list for ones that match the parameter we want + # 3. If there are no collisions, return the one that matches + # 4. If there is a collision, return 'bad parameter name error' + my $returnvalue = ''; + my @matches = (); + $#matches = -1; + study $expression; + foreach $parameter (keys(%c)) { + push @matches,$parameter if ($parameter =~ /$expression/); + } + if ($#matches == 0) { + $returnvalue = '$c{\''.$matches[0].'\'}'; + } elsif ($#matches > 0) { + # more than one match. Look for a concise one + $returnvalue = "'non-unique parameter name : $expression'"; + foreach (@matches) { + if (/^$expression$/) { + $returnvalue = '$c{\''.$_.'\'}'; + } + } + } else { + $returnvalue = "'bad parameter name : $expression'"; + } + return $returnvalue; + } +} + sub sett { %t=(); my $pattern=''; @@ -291,63 +838,87 @@ sub sett { } else { $pattern='[A-Z]'; } - map { - if ($_=~/template\_(\w)/) { - my $col=$1; - unless ($col=~/^$pattern/) { - map { - if ($_=~/A(\d+)/) { - my $trow=$1; - if ($trow) { - my $lb=$col.$trow; - $t{$lb}=$f{'template_'.$col}; - $t{$lb}=~s/\#/$trow/g; - $t{$lb}=~s/\.\.+/\,/g; - $t{$lb}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g; - } - } - } keys %f; - } - } - } keys %f; - map { + # Deal with the template row + foreach (keys(%f)) { + next if ($_!~/template\_(\w)/); + my $col=$1; + next if ($col=~/^$pattern/); + foreach (keys(%f)) { + next if ($_!~/A(\d+)/); + my $trow=$1; + next if (! $trow); + # Get the name of this cell + my $lb=$col.$trow; + # Grab the template declaration + $t{$lb}=$f{'template_'.$col}; + # Replace '#' with the row number + $t{$lb}=~s/\#/$trow/g; + # Replace '....' with ',' + $t{$lb}=~s/\.\.+/\,/g; + # Replace 'A0' with the value from 'A0' + $t{$lb}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$sheet_values\{\'$2\'\}/g; + # Replace parameters + $t{$lb}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge; + } + } + # Deal with the normal cells + foreach (keys(%f)) { if (($f{$_}) && ($_!~/template\_/)) { - if ($_=~/^$pattern/) { + my $matches=($_=~/^$pattern(\d+)/); + if (($matches) && ($1)) { unless ($f{$_}=~/^\!/) { $t{$_}=$c{$_}; } } else { $t{$_}=$f{$_}; $t{$_}=~s/\.\.+/\,/g; - $t{$_}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g; + $t{$_}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$sheet_values\{\'$2\'\}/g; + $t{$_}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge; } } - } keys %f; + } + # For inserted lines, [B-Z] is also valid + unless ($sheettype eq 'assesscalc') { + foreach (keys(%f)) { + if ($_=~/[B-Z](\d+)/) { + if ($f{'A'.$1}=~/^[\~\-]/) { + $t{$_}=$f{$_}; + $t{$_}=~s/\.\.+/\,/g; + $t{$_}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$sheet_values\{\'$2\'\}/g; + $t{$_}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge; + } + } + } + } + # For some reason 'A0' gets special treatment... This seems superfluous + # but I imagine it is here for a reason. $t{'A0'}=$f{'A0'}; $t{'A0'}=~s/\.\.+/\,/g; - $t{'A0'}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g; + $t{'A0'}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$sheet_values\{\'$2\'\}/g; + $t{'A0'}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge; } sub calc { - %v=(); + undef %sheet_values; &sett(); my $notfinished=1; + my $lastcalc=''; my $depth=0; while ($notfinished) { $notfinished=0; - map { - my $old=$v{$_}; - $v{$_}=eval($t{$_}); + foreach (keys(%t)) { + my $old=$sheet_values{$_}; + $sheet_values{$_}=eval $t{$_}; if ($@) { - %v=(); - return $@; + undef %sheet_values; + return $_.': '.$@; } - if ($v{$_} ne $old) { $notfinished=1; } - } keys %t; + if ($sheet_values{$_} ne $old) { $notfinished=1; $lastcalc=$_; } + } $depth++; if ($depth>100) { - %v=(); - return 'Maximum calculation depth exceeded'; + undef %sheet_values; + return $lastcalc.': Maximum calculation depth exceeded'; } } return ''; @@ -356,33 +927,53 @@ sub calc { sub templaterow { my @cols=(); $cols[0]='Template'; - map { + foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M', + 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z', + 'a','b','c','d','e','f','g','h','i','j','k','l','m', + 'n','o','p','q','r','s','t','u','v','w','x','y','z') { my $fm=$f{'template_'.$_}; $fm=~s/[\'\"]/\&\#34;/g; - $cols[$#cols+1]="'template_$_','$fm'".'___eq___'.$fm; - } ('A','B','C','D','E','F','G','H','I','J','K','L','M', - 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z', - 'a','b','c','d','e','f','g','h','i','j','k','l','m', - 'n','o','p','q','r','s','t','u','v','w','x','y','z'); + push(@cols,"'template_$_','$fm'".'___eq___'.$fm); + } return @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 @cols=(); if ($n) { - $cols[0]=$rl{$f{'A'.$n}}; + my ($usy,$ufn)=split(/__&&&\__/,$f{'A'.$n}); + if ($rowlabel{$usy}) { + $cols[0]=$rowlabel{$usy}.'
'. + ''; } else { - $cols[0]='Export'; + $cols[0]='Export'; } - map { + foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M', + 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z', + 'a','b','c','d','e','f','g','h','i','j','k','l','m', + 'n','o','p','q','r','s','t','u','v','w','x','y','z') { my $fm=$f{$_.$n}; $fm=~s/[\'\"]/\&\#34;/g; - $cols[$#cols+1]="'$_$n','$fm'".'___eq___'.$v{$_.$n}; - } ('A','B','C','D','E','F','G','H','I','J','K','L','M', - 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z', - 'a','b','c','d','e','f','g','h','i','j','k','l','m', - 'n','o','p','q','r','s','t','u','v','w','x','y','z'); + push(@cols,"'$_$n','$fm'".'___eq___'.$sheet_values{$_.$n}); + } return @cols; } @@ -390,27 +981,27 @@ sub outrow { my $n=shift; my @cols=(); if ($n) { - $cols[0]=$rl{$f{'A'.$n}}; + $cols[0]=$rowlabel{$f{'A'.$n}}; } else { $cols[0]='Export'; } - map { + foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M', + 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z', + 'a','b','c','d','e','f','g','h','i','j','k','l','m', + 'n','o','p','q','r','s','t','u','v','w','x','y','z') { my $fm=$f{$_.$n}; $fm=~s/[\'\"]/\&\#34;/g; - $cols[$#cols+1]="'$_$n','$fm'".'___eq___'.$v{$_.$n}; - } ('A','B','C','D','E','F','G','H','I','J','K','L','M', - 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z', - 'a','b','c','d','e','f','g','h','i','j','k','l','m', - 'n','o','p','q','r','s','t','u','v','w','x','y','z'); + push(@cols,"'$_$n','$fm'".'___eq___'.$sheet_values{$_.$n}); + } return @cols; } sub exportrowa { my @exportarray=(); - map { - $exportarray[$#exportarray+1]=$v{$_.'0'}; - } ('A','B','C','D','E','F','G','H','I','J','K','L','M', - 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z'); + 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; } @@ -423,43 +1014,57 @@ ENDDEFS # ------------------------------------------------ Add or change formula values sub setformulas { - my ($safeeval,@f)=@_; - $safeeval->reval('%f='."('".join("','",@f)."');"); + my ($safeeval,%f)=@_; + %{$safeeval->varglob('f')}=%f; } # ------------------------------------------------ Add or change formula values sub setconstants { - my ($safeeval,@c)=@_; - $safeeval->reval('%c='."('".join("','",@c)."');"); + my ($safeeval,%c)=@_; + %{$safeeval->varglob('c')}=%c; +} + +# --------------------------------------------- Set names of other spreadsheets + +sub setothersheets { + my ($safeeval,@os)=@_; + @{$safeeval->varglob('os')}=@os; } # ------------------------------------------------ Add or change formula values sub setrowlabels { - my ($safeeval,@rl)=@_; - $safeeval->reval('%rl='."('".join("','",@rl)."');"); + my ($safeeval,%rowlabel)=@_; + %{$safeeval->varglob('rowlabel')}=%rowlabel; } # ------------------------------------------------------- Calculate spreadsheet sub calcsheet { my $safeeval=shift; - $safeeval->reval('&calc();'); + return $safeeval->reval('&calc();'); } # ------------------------------------------------------------------ Get values sub getvalues { my $safeeval=shift; - return $safeeval->reval('%v'); + return $safeeval->reval('%sheet_values'); } # ---------------------------------------------------------------- Get formulas sub getformulas { my $safeeval=shift; - return $safeeval->reval('%f'); + return %{$safeeval->varglob('f')}; +} + +# ----------------------------------------------------- Get value of $f{'A'.$n} + +sub getfa { + my ($safeeval,$n)=@_; + return $safeeval->reval('$f{"A'.$n.'"}'); } # -------------------------------------------------------------------- Get type @@ -574,6 +1179,7 @@ sub exportdata { return $safeeval->reval('&exportrowa()'); } + # ========================================================== End of Spreadsheet # ============================================================================= @@ -586,44 +1192,45 @@ sub rown { my ($safeeval,$n)=@_; my $defaultbg; my $rowdata=''; + my $dataflag=0; unless ($n eq '-') { $defaultbg=((($n-1)/5)==int(($n-1)/5))?'#E0E0':'#FFFF'; } else { $defaultbg='#E0FF'; } - if ((($n-1)/25)==int(($n-1)/25)) { - my $what='Student'; - if (&gettype($safeeval) eq 'assesscalc') { - $what='Item'; - } elsif (&gettype($safeeval) eq 'studentcalc') { - $what='Assessment'; - } - $rowdata.="\n
". - ''; - map { - $rowdata.=''; - } ('A','B','C','D','E','F','G','H','I','J','K','L','M', - 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z', - 'a','b','c','d','e','f','g','h','i','j','k','l','m', - 'n','o','p','q','r','s','t','u','v','w','x','y','z'); - $rowdata.=''; + unless ($ENV{'form.showcsv'}) { + $rowdata.="\n"; + } else { + $rowdata.="\n".'"'.$n.'"'; } - $rowdata.="\n"; my $showf=0; my $proc; - my $maxred; - if (&gettype($safeeval) eq 'assesscalc') { + my $maxred=1; + my $sheettype=&gettype($safeeval); + if ($sheettype eq 'studentcalc') { $proc='&outrowassess'; - $maxred=1; + $maxred=26; } else { $proc='&outrow'; + } + if ($sheettype eq 'assesscalc') { + $maxred=1; + } else { $maxred=26; } - if ($n eq '-') { $proc='&templaterow'; $n=-1; } - map { + if (&getfa($safeeval,$n)=~/^[\~\-]/) { $maxred=1; } + 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))) { @@ -636,9 +1243,16 @@ sub rown { } else { $rowdata.=''; } + } else { + $rowdata.=',"'.$vl.'"'; + } $showf++; - } $safeeval->reval($proc.'('.$n.')'); - return $rowdata.''; + } # End of foreach($safeval...) + if ($ENV{'form.showall'} || ($dataflag)) { + return $rowdata.($ENV{'form.showcsv'}?'':''); + } else { + return ''; + } } # ------------------------------------------------------------- Print out sheet @@ -658,115 +1272,188 @@ sub outsheet { $realm='Course'; } my $maxyellow=52-$maxred; - my $tabledata= + my $tabledata; + unless ($ENV{'form.showcsv'}) { + $tabledata= '
 '.$what.''.$_.'
$n
$n '.$vl.' 
'. ''. ''; - my $showf=0; - map { - $showf++; - if ($showf<=$maxred) { - $tabledata.='"; - } ('A','B','C','D','E','F','G','H','I','J','K','L','M', - 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z', - 'a','b','c','d','e','f','g','h','i','j','k','l','m', - 'n','o','p','q','r','s','t','u','v','w','x','y','z'); - $tabledata.=''; + 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.='"; + } + $tabledata.=''.&rown($safeeval,'-').&rown($safeeval,0); + } else { $tabledata='
'; }
+
+    $r->print($tabledata);
+
     my $row;
     my $maxrow=&getmaxrow($safeeval);
-    $tabledata.=&rown($safeeval,'-');
-    $r->print($tabledata);
-    for ($row=0;$row<=$maxrow;$row++) {
-        $r->print(&rown($safeeval,$row));
+
+    my @sortby=();
+    my @sortidx=();
+    for ($row=1;$row<=$maxrow;$row++) {
+       $sortby[$row-1]=$safeeval->reval('$f{"A'.$row.'"}');
+       $sortidx[$row-1]=$row-1;
+    }
+    @sortidx=sort { $sortby[$a] cmp $sortby[$b]; } @sortidx;
+        my $what='Student';
+        if (&gettype($safeeval) eq 'assesscalc') {
+	    $what='Item';
+	} elsif (&gettype($safeeval) eq 'studentcalc') {
+            $what='Assessment';
+        }
+
+    my $n=0;
+    for ($row=0;$row<$maxrow;$row++) {
+        my $thisrow=&rown($safeeval,$sortidx[$row]+1);
+        if ($thisrow) {
+            if (($n/25==int($n/25)) && (!$ENV{'form.showcsv'})) {
+                $r->print("
'. $realm.'ImportCalculations
'; - } else { - $tabledata.=''; - } - $tabledata.="$_
'; + } else { + $tabledata.=''; + } + $tabledata.="$_
\n
\n"); + $r->rflush(); + $r->print(''); + $r->print('\n"); + } + $n++; + $r->print($thisrow); + } } - $r->print('
 '.$what.''.join('', + (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZ'. + 'abcdefghijklmnopqrstuvwxyz'))). + "
'); + $r->print($ENV{'form.showcsv'}?'':''); } # -# -------------------------------------- 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); - -# --------- There is no filename. Look for defaults in course and global, cache - - unless($fn) { - unless ($fn=$defaultsheets{$cnum.'_'.$cdom.'_'.$stype}) { - $fn=&Apache::lonnet::reply('get:'.$cdom.':'.$cnum. - ':environment:spreadsheet_default_'.$stype, - $chome); - unless (($fn) && ($fn!~/^error\:/)) { - $fn='default_'.$stype; - } - $defaultsheets{$cnum.'_'.$cdom.'_'.$stype}=$fn; - } - } - -# ---------------------------------------------------------- fn now has a value - - &setfilename($safeeval,$fn); +# ----------------------------------------------- Read list of available sheets +# +sub othersheets { + my ($safeeval,$stype)=@_; + # + my $cnum = &getcnum($safeeval); + my $cdom = &getcdom($safeeval); + my $chome = &getchome($safeeval); + # + my @alternatives=(); + my %results=&Apache::lonnet::dump($stype.'_spreadsheets',$cdom,$cnum); + my ($tmp) = keys(%results); + unless ($tmp =~ /^(con_lost|error|no_such_host)/i) { + @alternatives = sort (keys(%results)); + } + return @alternatives; +} -# ------------------------------------------------------ see if sheet is cached - my $fstring=''; - if ($fstring=$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}) { - &setformulas($safeeval,split(/\_\_\_\;\_\_\_/,$fstring)); - } else { -# ---------------------------------------------------- Not cached, need to read +# +# -------------------------------------- Parse a spreadsheet +# +sub parse_sheet { + # $sheetxml is a scalar reference or a scalar + my ($sheetxml) = @_; + if (! ref($sheetxml)) { + my $tmp = $sheetxml; + $sheetxml = \$tmp; + } + my %f; + my $parser=HTML::TokeParser->new($sheetxml); + my $token; + while ($token=$parser->get_token) { + if ($token->[0] eq 'S') { + if ($token->[1] eq 'field') { + $f{$token->[2]->{'col'}.$token->[2]->{'row'}}= + $parser->get_text('/field'); + } + if ($token->[1] eq 'template') { + $f{'template_'.$token->[2]->{'col'}}= + $parser->get_text('/template'); + } + } + } + return \%f; +} - my %f=(); +# +# -------------------------------------- Read spreadsheet formulas for a course +# - if ($fn=~/^default\_/) { - my $sheetxml=''; - { - my $fh; - if ($fh=Apache::File->new($includedir. - '/default.'.&gettype($safeeval))) { - $sheetxml=join('',<$fh>); - } - } - my $parser=HTML::TokeParser->new(\$sheetxml); - my $token; - while ($token=$parser->get_token) { - if ($token->[0] eq 'S') { - if ($token->[1] eq 'field') { - $f{$token->[2]->{'col'}.$token->[2]->{'row'}}= - $parser->get_text('/field'); - } - if ($token->[1] eq 'template') { - $f{'template_'.$token->[2]->{'col'}}= - $parser->get_text('/template'); - } - } +sub readsheet { + my ($safeeval,$fn)=@_; + my $stype = &gettype($safeeval); + my $cnum = &getcnum($safeeval); + my $cdom = &getcdom($safeeval); + my $chome = &getchome($safeeval); + + if (! defined($fn)) { + # There is no filename. Look for defaults in course and global, cache + unless ($fn=$defaultsheets{$cnum.'_'.$cdom.'_'.$stype}) { + my %tmphash = &Apache::lonnet::get('environment', + ['spreadsheet_default_'.$stype], + $cdom,$cnum); + my ($tmp) = keys(%tmphash); + if ($tmp =~ /^(con_lost|error|no_such_host)/i) { + $fn = 'default_'.$stype; + } else { + $fn = $tmphash{'spreadsheet_default_'.$stype}; + } + unless (($fn) && ($fn!~/^error\:/)) { + $fn='default_'.$stype; + } + $defaultsheets{$cnum.'_'.$cdom.'_'.$stype}=$fn; } - } else { - my $sheet=''; - my $reply=&Apache::lonnet::reply('dump:'.$cdom.':'.$cnum.':'.$fn, - $chome); - unless ($reply=~/^error\:/) { - $sheet=$reply; - } - map { - my ($name,$value)=split(/\=/,$_); - $f{&Apache::lonnet::unescape($name)}= - &Apache::lonnet::unescape($value); - } split(/\&/,$sheet); - } -# --------------------------------------------------------------- Cache and set - $spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f); - &setformulas($safeeval,%f); + } + # $fn now has a value + &setfilename($safeeval,$fn); + # see if sheet is cached + my $fstring=''; + if ($fstring=$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}) { + &setformulas($safeeval,split(/\_\_\_\;\_\_\_/,$fstring)); + } else { + # Not cached, need to read + my %f=(); + if ($fn=~/^default\_/) { + my $sheetxml=''; + my $fh; + my $dfn=$fn; + $dfn=~s/\_/\./g; + if ($fh=Apache::File->new($includedir.'/'.$dfn)) { + $sheetxml=join('',<$fh>); + } else { + $sheetxml='"Error"'; + } + %f=%{&parse_sheet(\$sheetxml)}; + } elsif($fn=~/\/*\.spreadsheet$/) { + my $sheetxml=&Apache::lonnet::getfile + (&Apache::lonnet::filelocation('',$fn)); + if ($sheetxml == -1) { + $sheetxml='"Error loading spreadsheet ' + .$fn.'"'; + } + %f=%{&parse_sheet(\$sheetxml)}; + } else { + my $sheet=''; + my %tmphash = &Apache::lonnet::dump($fn,$cdom,$cnum); + my ($tmp) = keys(%tmphash); + unless ($tmp =~ /^(con_lost|error|no_such_host)/i) { + foreach (keys(%tmphash)) { + $f{$_}=$tmphash{$_}; + } + } + } + # Cache and set + $spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f); + &setformulas($safeeval,%f); } } @@ -774,69 +1461,77 @@ sub readsheet { sub makenewsheet { my ($uname,$udom,$stype,$usymb)=@_; - my $safeeval=initsheet(); - $safeeval->reval( - '$uname="'.$uname. - '";$udom="'.$udom. - '";$uhome="'.&Apache::lonnet::homeserver($uname,$udom). - '";$sheettype="'.$stype. - '";$usymb="'.$usymb. - '";$csec="'.&Apache::lonnet::usection($udom,$uname, - $ENV{'request.course.id'}). - '";$cid="'.$ENV{'request.course.id'}. - '";$cfn="'.$ENV{'request.course.fn'}. - '";$cnum="'.$ENV{'course.'.$ENV{'request.course.id'}.'.num'}. - '";$cdom="'.$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}. - '";$chome="'.$ENV{'course.'.$ENV{'request.course.id'}.'.home'}.'";'); - return $safeeval; + 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 $initstring = ''; + foreach (keys(%sheetdata)) { + $initstring.= qq{\$$_="$sheetdata{$_}";}; + } + $safeeval->reval($initstring); + return $safeeval,\%sheetdata; } # ------------------------------------------------------------ Save spreadsheet sub writesheet { - my ($safeeval,$makedef)=@_; - my $cid=&getcid($safeeval); - 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); - -# ------------------------------------------------------------- Cache new sheet - $spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f); -# ----------------------------------------------------------------- Write sheet - my $sheetdata=''; - map { - $sheetdata.=&Apache::lonnet::escape($_).'='. - &Apache::lonnet::escape($f{$_}).'&'; - } keys %f; - $sheetdata=~s/\&$//; - my $reply=&Apache::lonnet::reply('put:'.$cdom.':'.$cnum.':'.$fn.':'. - $sheetdata,$chome); - if ($reply eq 'ok') { - $reply=&Apache::lonnet::reply('put:'.$cdom.':'.$cnum.':'. - $stype.'_spreadsheets:'. - &Apache::lonnet::escape($fn).'='.$ENV{'user.name'}, - $chome); - if ($reply eq 'ok') { - if ($makedef) { - return &Apache::lonnet::reply('put:'.$cdom.':'.$cnum. - ':environment:spreadsheet_default_'.$stype.'='. - &Apache::lonnet::escape($fn), - $chome); - } else { - return $reply; - } - } else { - return $reply; - } - } else { - return $reply; - } - } - return 'unauthorized'; + my ($safeeval,$makedef)=@_; + my $cid=&getcid($safeeval); + 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); + # 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{$_}).'&'; + } + } + $sheetdata=~s/\&$//; + my $reply=&Apache::lonnet::reply('put:'.$cdom.':'.$cnum.':'.$fn.':'. + $sheetdata,$chome); + if ($reply eq 'ok') { + $reply=&Apache::lonnet::reply('put:'.$cdom.':'.$cnum.':'. + $stype.'_spreadsheets:'. + &Apache::lonnet::escape($fn). + '='.$ENV{'user.name'}.'@'. + $ENV{'user.domain'}, + $chome); + if ($reply eq 'ok') { + if ($makedef) { + return &Apache::lonnet::reply('put:'.$cdom.':'.$cnum. + ':environment:'. + 'spreadsheet_default_'. + $stype.'='. + &Apache::lonnet::escape($fn), + $chome); + } + return $reply; + } + return $reply; + } + return $reply; + } + return 'unauthorized'; } # ----------------------------------------------- Make a temp copy of the sheet @@ -846,7 +1541,7 @@ sub writesheet { sub tmpwrite { my $safeeval=shift; my $fn=$ENV{'user.name'}.'_'. - $ENV{'user.domain'}.'_spreadsheet_'.&getusymb($safeeval).'_'. + $ENV{'user.domain'}.'_spreadsheet_'.&getusymb($safeeval).'_'. &getfilename($safeeval); $fn=~s/\W/\_/g; $fn=$tmpdir.$fn.'.tmp'; @@ -867,6 +1562,7 @@ sub tmpread { $fn=$tmpdir.$fn.'.tmp'; my $fh; my %fo=(); + my $countrows=0; if ($fh=Apache::File->new($fn)) { my $name; while ($name=<$fh>) { @@ -874,308 +1570,378 @@ sub tmpread { my $value=<$fh>; chomp($value); $fo{$name}=$value; + if ($name=~/^A(\d+)$/) { + if ($1>$countrows) { + $countrows=$1; + } + } + } + } + if ($nform eq 'changesheet') { + $fo{'A'.$nfield}=(split(/\_\_\&\&\&\_\_/,$fo{'A'.$nfield}))[0]; + unless ($ENV{'form.sel_'.$nfield} eq 'Default') { + $fo{'A'.$nfield}.='__&&&__'.$ENV{'form.sel_'.$nfield}; + } + } elsif ($nfield eq 'insertrow') { + $countrows++; + my $newrow=substr('000000'.$countrows,-7); + if ($nform eq 'top') { + $fo{'A'.$countrows}='--- '.$newrow; + } else { + $fo{'A'.$countrows}='~~~ '.$newrow; } + } else { + if ($nfield) { $fo{$nfield}=$nform; } } - if ($nfield) { $fo{$nfield}=$nform; } &setformulas($safeeval,%fo); } -# ================================================================== Parameters -# -------------------------------------------- Figure out a cascading parameter -# -# For this function to work -# -# * parmhash needs to be tied -# * courseopt and useropt need to be initialized for this user and course -# +################################################## +################################################## -sub parmval { - my ($what,$safeeval)=@_; - my $cid=&getcid($safeeval); - my $csec=&getcsec($safeeval); - my $uname=&getuname($safeeval); - my $udom=&getudom($safeeval); - my $symb=&getusymb($safeeval); +=pod - unless ($symb) { return ''; } - my $result=''; - - my ($mapname,$id,$fn)=split(/\_\_\_/,$symb); -# ----------------------------------------------------- Cascading lookup scheme - my $rwhat=$what; - $what=~s/^parameter\_//; - $what=~s/\_/\./; - - my $symbparm=$symb.'.'.$what; - my $mapparm=$mapname.'___(all).'.$what; - my $usercourseprefix=$uname.'_'.$udom.'_'.$cid; - - my $seclevel= - $usercourseprefix.'.['. - $csec.'].'.$what; - my $seclevelr= - $usercourseprefix.'.['. - $csec.'].'.$symbparm; - my $seclevelm= - $usercourseprefix.'.['. - $csec.'].'.$mapparm; - - my $courselevel= - $usercourseprefix.'.'.$what; - my $courselevelr= - $usercourseprefix.'.'.$symbparm; - my $courselevelm= - $usercourseprefix.'.'.$mapparm; - -# ---------------------------------------------------------- fourth, check user - - if ($uname) { +=item &parmval() - if ($useropt{$courselevelr}) { return $useropt{$courselevelr}; } +Determine the value of a parameter. - if ($useropt{$courselevelm}) { return $useropt{$courselevelm}; } +Inputs: $what, the parameter needed, $safeeval, the safe space - if ($useropt{$courselevel}) { return $useropt{$courselevel}; } +Returns: The value of a parameter, or '' if none. - } +This function cascades through the possible levels searching for a value for +a parameter. The levels are checked in the following order: +user, course (at section level and course level), map, and lonnet::metadata. +This function uses %parmhash, which must be tied prior to calling it. +This function also requires %courseopt and %useropt to be initialized for +this user and course. -# --------------------------------------------------------- third, check course - - if ($csec) { - - if ($courseopt{$seclevelr}) { return $courseopt{$seclevelr}; } +=cut - if ($courseopt{$seclevelm}) { return $courseopt{$seclevelm}; } - - if ($courseopt{$seclevel}) { return $courseopt{$seclevel}; } - - } - - if ($courseopt{$courselevelr}) { return $courseopt{$courselevelr}; } - - if ($courseopt{$courselevelm}) { return $courseopt{$courselevelm}; } - - if ($courseopt{$courselevel}) { return $courseopt{$courselevel}; } - -# ----------------------------------------------------- second, check map parms - - my $thisparm=$parmhash{$symbparm}; - if ($thisparm) { return $thisparm; } - -# -------------------------------------------------------- first, check default - - return &Apache::lonnet::metadata($fn,$rwhat.'.default'); - +################################################## +################################################## +sub parmval { + my ($what,$safeeval,$sheetdata)=@_; + my $symb = $sheetdata->{'usymb'}; + unless ($symb) { return ''; } + # + my $cid = $sheetdata->{'cid'}; + my $csec = $sheetdata->{'csec'}; + my $uname = $sheetdata->{'uname'}; + my $udom = $sheetdata->{'udom'}; + my $result=''; + # + my ($mapname,$id,$fn)=split(/\_\_\_/,$symb); + # Cascading lookup scheme + my $rwhat=$what; + $what =~ s/^parameter\_//; + $what =~ s/\_([^\_]+)$/\.$1/; + # + my $symbparm = $symb.'.'.$what; + my $mapparm = $mapname.'___(all).'.$what; + my $usercourseprefix = $uname.'_'.$udom.'_'.$cid; + # + my $seclevel = $usercourseprefix.'.['.$csec.'].'.$what; + my $seclevelr = $usercourseprefix.'.['.$csec.'].'.$symbparm; + my $seclevelm = $usercourseprefix.'.['.$csec.'].'.$mapparm; + # + my $courselevel = $usercourseprefix.'.'.$what; + 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}); + } + # third, check course + if ($csec) { + return $courseopt{$seclevelr} if ($courseopt{$seclevelr}); + return $courseopt{$seclevelm} if ($courseopt{$seclevelm}); + return $courseopt{$seclevel} if ($courseopt{$seclevel}); + } + # + return $courseopt{$courselevelr} if ($courseopt{$courselevelr}); + return $courseopt{$courselevelm} if ($courseopt{$courselevelm}); + return $courseopt{$courselevel} if ($courseopt{$courselevel}); + # second, check map parms + my $thisparm = $parmhash{$symbparm}; + return $thisparm if ($thisparm); + # first, check default + return &Apache::lonnet::metadata($fn,$rwhat.'.default'); } # ---------------------------------------------- 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); - -# ---------------------------------------------- Read class list and row labels - - my $classlst=&Apache::lonnet::reply - ('dump:'.$cdom.':'.$cnum.':classlist',$chome); + # + # 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 %currentlist=(); my $now=time; - unless ($classlst=~/^error\:/) { - map { - my ($name,$value)=split(/\=/,$_); - my ($end,$start)=split(/\:/,&Apache::lonnet::unescape($value)); - my $active=1; - if (($end) && ($now>$end)) { $active=0; } - if ($active) { - my $rowlabel=''; - $name=&Apache::lonnet::unescape($name); - my ($sname,$sdom)=split(/\:/,$name); - my $ssec=&Apache::lonnet::usection($sdom,$sname,$cid); - if ($ssec==-1) { - $rowlabel='Data not available: '.$name. - ''; + 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='Data not available: '. + $studentName.''; } else { - my %reply=&Apache::lonnet::idrget($sdom,$sname); - my $reply=&Apache::lonnet::reply('get:'.$sdom.':'.$sname. - ':environment:firstname&middlename&lastname&generation', - &Apache::lonnet::homeserver($sname,$sdom)); - $rowlabel=$ssec.' '.$reply{$sname}.'
'; - map { - $rowlabel.=&Apache::lonnet::unescape($_).' '; - } split(/\&/,$reply); + $rowlabel='ERROR","'.$studentName. + '","Data not available","","","'; } - $currentlist{&Apache::lonnet::unescape($name)}=$rowlabel; - } - } split(/\&/,$classlst); -# -# -------------------- Find discrepancies between the course row table and this -# - my %f=&getformulas($safeeval); - my $changed=0; - - my $maxrow=0; - my %existing=(); - -# ----------------------------------------------------------- Now obsolete rows - map { - if ($_=~/^A(\d+)/) { - $maxrow=($1>$maxrow)?$1:$maxrow; - $existing{$f{$_}}=1; - unless ((defined($currentlist{$f{$_}})) || (!$1)) { - $f{$_}='!!! Obsolete'; - $changed=1; + } 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=''. + $studentSection.' '; + foreach ('id','firstname','middlename', + 'lastname','generation'){ + $rowlabel.=$studentInformation{$_}." "; + } + $rowlabel.=''; + } else { + $rowlabel= '"'.join('","', + ($studentSection, + $studentInformation{'id'}, + $studentInformation{'firstname'}, + $studentInformation{'middlename'}, + $studentInformation{'lastname'}, + $studentInformation{'generation'}) + ).'"'; } } - } keys %f; - -# -------------------------------------------------------- New and unknown keys - - map { - unless ($existing{$_}) { - $changed=1; - $maxrow++; - $f{'A'.$maxrow}=$_; - } - } sort keys %currentlist; - - if ($changed) { &setformulas($safeeval,%f); } - - &setmaxrow($safeeval,$maxrow); - &setrowlabels($safeeval,%currentlist); - - } else { - return 'Could not access course data'; + $currentlist{$student}=$rowlabel; + } # end of if ($active) + } # end of foreach my $student (keys(%classlist)) + # + # Find discrepancies between the course row table and this + # + my %f=&getformulas($safeeval); + my $changed=0; + # + my $maxrow=0; + my %existing=(); + # + # Now obsolete rows + foreach (keys(%f)) { + if ($_=~/^A(\d+)/) { + $maxrow=($1>$maxrow)?$1:$maxrow; + $existing{$f{$_}}=1; + unless ((defined($currentlist{$f{$_}})) || (!$1) || + ($f{$_}=~/^(\~\~\~|\-\-\-)/)) { + $f{$_}='!!! Obsolete'; + $changed=1; + } + } + } + # + # New and unknown keys + foreach (sort keys(%currentlist)) { + unless ($existing{$_}) { + $changed=1; + $maxrow++; + $f{'A'.$maxrow}=$_; + } } + if ($changed) { &setformulas($safeeval,%f); } + # + &setmaxrow($safeeval,$maxrow); + &setrowlabels($safeeval,%currentlist); } # ----------------------------------- Update rows for student and assess sheets - sub updatestudentassesssheet { my $safeeval=shift; my %bighash; -# -------------------------------------------------------------------- Tie hash - if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db', - &GDBM_READER,0640)) { -# --------------------------------------------------------- Get all assessments - - my %allkeys=(); - my %allassess=(); - - my $stype=&gettype($safeeval); - - map { - if ($_=~/^src\_(\d+)\.(\d+)$/) { - my $mapid=$1; - my $resid=$2; - my $id=$mapid.'.'.$resid; - my $srcf=$bighash{$_}; - if ($srcf=~/\.(problem|exam|quiz|assess|survey|form)$/) { - my $symb= - &Apache::lonnet::declutter($bighash{'map_id_'.$mapid}). - '___'.$resid.'___'. - &Apache::lonnet::declutter($srcf); - $allassess{$symb}=$bighash{'title_'.$id}; - - if ($stype eq 'assesscalc') { - map { - if (($_=~/^stores\_(.*)/) || ($_=~/^parameter\_(.*)/)) { - my $key=$_; - my $display= - &Apache::lonnet::metadata($srcf,$key.'.display'); - unless ($display) { - $display= - &Apache::lonnet::metadata($srcf,$key.'.name'); - } - $allkeys{$key}=$display; - } - } split(/\,/,&Apache::lonnet::metadata($srcf,'keys')); - } - } - } - } keys %bighash; + my $stype=&gettype($safeeval); + my %current=(); + if ($updatedata{$ENV{'request.course.fn'}.'_'.$stype}) { + %current=split(/\_\_\_\;\_\_\_/, + $updatedata{$ENV{'request.course.fn'}.'_'.$stype}); + } else { + # Tie hash + tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db', + &GDBM_READER(),0640); + if (! tied(%bighash)) { + return 'Could not access course data'; + } + # Get all assessments + my %allkeys=('timestamp' => + 'Timestamp of Last Transaction
timestamp', + 'subnumber' => + 'Number of Submissions
subnumber', + 'tutornumber' => + 'Number of Tutor Responses
tutornumber', + 'totalpoints' => + 'Total Points Granted
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' =>'Feedback', + '_evaluation' =>'Evaluation', + '_tutoring' =>'Tutoring', + '_discussion' =>'Discussion' + ); + foreach (keys(%bighash)) { + next if ($_!~/^src\_(\d+)\.(\d+)$/); + my $mapid=$1; + my $resid=$2; + my $id=$mapid.'.'.$resid; + my $srcf=$bighash{$_}; + if ($srcf=~/\.(problem|exam|quiz|assess|survey|form)$/) { + my $symb= + &Apache::lonnet::declutter($bighash{'map_id_'.$mapid}). + '___'.$resid.'___'.&Apache::lonnet::declutter($srcf); + $allassess{$symb}= + ''. + $bighash{'title_'.$id}.''; + next if ($stype ne 'assesscalc'); + foreach my $key (split(/\,/, + &Apache::lonnet::metadata($srcf,'keys') + )) { + next if ($key !~ /^(stores|parameter)_/); + my $display= + &Apache::lonnet::metadata($srcf,$key.'.display'); + unless ($display) { + $display.= + &Apache::lonnet::metadata($srcf,$key.'.name'); + } + $display.='
'.$key; + $allkeys{$key}=$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 -# -# -------------------- Find discrepancies between the course row table and this -# - my %f=&getformulas($safeeval); - my $changed=0; - - my %current=(); + # + # %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; + %current=%allkeys; } elsif ($stype eq 'studentcalc') { %current=%allassess; } - - my $maxrow=0; - my %existing=(); - -# ----------------------------------------------------------- Now obsolete rows - map { - if ($_=~/^A(\d+)/) { - $maxrow=($1>$maxrow)?$1:$maxrow; - $existing{$f{$_}}=1; - unless ((defined($current{$f{$_}})) || (!$1)) { - $f{$_}='!!! Obsolete'; - $changed=1; - } - } - } keys %f; - -# -------------------------------------------------------- New and unknown keys - - map { - unless ($existing{$_}) { - $changed=1; - $maxrow++; - $f{'A'.$maxrow}=$_; - } - } keys %current; - - if ($changed) { &setformulas($safeeval,%f); } - - &setmaxrow($safeeval,$maxrow); - &setrowlabels($safeeval,%current); - - } else { - return 'Could not access course data'; + $updatedata{$ENV{'request.course.fn'}.'_'.$stype}= + join('___;___',%current); + # Get current from cache + } + # Find discrepancies between the course row table and this + # + my %f=&getformulas($safeeval); + my $changed=0; + + my $maxrow=0; + my %existing=(); + # Now obsolete rows + foreach (keys(%f)) { + next if ($_!~/^A(\d+)/); + $maxrow=($1>$maxrow)?$1:$maxrow; + my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{$_}); + $existing{$usy}=1; + unless ((defined($current{$usy})) || (!$1) || + ($f{$_}=~/^(\~\~\~|\-\-\-)/)){ + $f{$_}='!!! Obsolete'; + $changed=1; + } elsif ($ufn) { + $current{$usy} + =~s/assesscalc\?usymb\=/assesscalc\?ufn\=$ufn\&usymb\=/; + } } + # New and unknown keys + foreach (keys(%current)) { + unless ($existing{$_}) { + $changed=1; + $maxrow++; + $f{'A'.$maxrow}=$_; + } + } + if ($changed) { &setformulas($safeeval,%f); } + &setmaxrow($safeeval,$maxrow); + &setrowlabels($safeeval,%current); + # + undef %current; + undef %existing; } # ------------------------------------------------ Load data for one assessment sub loadstudent { - my $safeeval=shift; + my ($safeeval,$sheetdata)=@_; my %c=(); my %f=&getformulas($safeeval); - map { - if ($_=~/^A(\d+)/) { - my $row=$1; - unless ($f{$_}=~/^\!/) { - my @assessdata=&exportsheet(&getuname($safeeval), - &getudom($safeeval), - 'assesscalc',$f{$_}); - my $index=0; - map { - if ($assessdata[$index]) { - $c{$_.$row}=$assessdata[$index]; - unless ($_ eq 'A') { - $f{$_.$row}='import'; - } - } - $index++; - } ('A','B','C','D','E','F','G','H','I','J','K','L','M', - 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z'); - } + $cachedassess=$sheetdata->{'uname'}.':'.$sheetdata->{'udom'}; + # Get ALL the student preformance data + my @tmp = &Apache::lonnet::dump($sheetdata->{'cid'}, + $sheetdata->{'udom'}, + $sheetdata->{'uname'}, + undef); + if ($tmp[0] !~ /^error:/) { + %cachedstores = @tmp; + } + undef @tmp; + # + my @assessdata=(); + foreach (keys(%f)) { + next if ($_!~/^A(\d+)/); + my $row=$1; + next if (($f{$_}=~/^[\!\~\-]/) || ($row==0)); + my ($usy,$ufn)=split(/__&&&\__/,$f{$_}); + @assessdata=&exportsheet($sheetdata->{'uname'}, + $sheetdata->{'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]) { + my $col=$_; + if ($assessdata[$index]=~/\D/) { + $c{$col.$row}="'".$assessdata[$index]."'"; + } else { + $c{$col.$row}=$assessdata[$index]; + } + unless ($col eq 'A') { + $f{$col.$row}='import'; + } + } + $index++; } - } keys %f; + } + $cachedassess=''; + undef %cachedstores; &setformulas($safeeval,%f); &setconstants($safeeval,%c); } @@ -1183,139 +1949,200 @@ sub loadstudent { # --------------------------------------------------- Load data for one student sub loadcourse { - my $safeeval=shift; + my ($safeeval,$sheetdata,$r)=@_; my %c=(); my %f=&getformulas($safeeval); - map { + my $total=0; + foreach (keys(%f)) { if ($_=~/^A(\d+)/) { - my $row=$1; - unless (($f{$_}=~/^\!/) - -|| ($row>200)) - - { - my @studentdata=&exportsheet(&getuname($safeeval), - &getudom($safeeval), - 'studentcalc'); - undef %userrdatas; - my $index=0; - map { - if ($studentdata[$index]) { - $c{$_.$row}=$studentdata[$index]; - unless ($_ eq 'A') { - $f{$_.$row}='import'; - } - } - $index++; - } ('A','B','C','D','E','F','G','H','I','J','K','L','M', - 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z'); - } + unless ($f{$_}=~/^[\!\~\-]/) { $total++; } } - } keys %f; + } + my $now=0; + my $since=time; + $r->print(< + popwin=open('','popwin','width=400,height=100'); + popwin.document.writeln(''+ + '

Spreadsheet Calculation Progress

'+ + '
'+ + '
'+ + ''); + popwin.document.close(); + +ENDPOP + $r->rflush(); + foreach (keys(%f)) { + next if ($_!~/^A(\d+)/); + my $row=$1; + next if (($f{$_}=~/^[\!\~\-]/) || ($row==0)); + my @studentdata=&exportsheet(split(/\:/,$f{$_}), + 'studentcalc'); + undef %userrdatas; + $now++; + $r->print(''); + $r->rflush(); + # + 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]) { + my $col=$_; + if ($studentdata[$index]=~/\D/) { + $c{$col.$row}="'".$studentdata[$index]."'"; + } else { + $c{$col.$row}=$studentdata[$index]; + } + unless ($col eq 'A') { + $f{$col.$row}='import'; + } + $index++; + } + } + } &setformulas($safeeval,%f); &setconstants($safeeval,%c); + $r->print(''); + $r->rflush(); } # ------------------------------------------------ Load data for one assessment sub loadassessment { - my $safeeval=shift; + my ($safeeval,$sheetdata)=@_; - my $uhome=&getuhome($safeeval); - my $uname=&getuname($safeeval); - my $udom=&getudom($safeeval); - my $symb=&getusymb($safeeval); - my $cid=&getcid($safeeval); - my $cnum=&getcnum($safeeval); - my $cdom=&getcdom($safeeval); - my $chome=&getchome($safeeval); + 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 $namespace; unless ($namespace=$cid) { return ''; } - -# ----------------------------------------------------------- Get stored values - my $answer=&Apache::lonnet::reply( - "restore:$udom:$uname:". - &Apache::lonnet::escape($namespace).":". - &Apache::lonnet::escape($symb),$uhome); + # Get stored values my %returnhash=(); - map { - my ($name,$value)=split(/\=/,$_); - $returnhash{&Apache::lonnet::unescape($name)}= - &Apache::lonnet::unescape($value); - } split(/\&/,$answer); - my $version; - for ($version=1;$version<=$returnhash{'version'};$version++) { - map { - $returnhash{$_}=$returnhash{$version.':'.$_}; - } split(/\:/,$returnhash{$version.':keys'}); + if ($cachedassess eq $uname.':'.$udom) { + # + # get data out of the dumped stores + # + my $version=$cachedstores{'version:'.$symb}; + my $scope; + for ($scope=1;$scope<=$version;$scope++) { + foreach (split(/\:/,$cachedstores{$scope.':keys:'.$symb})) { + $returnhash{$_}=$cachedstores{$scope.':'.$symb.':'.$_}; + } + } + } else { + # + # 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++) { + foreach (split(/\:/,$returnhash{$version.':keys'})) { + $returnhash{$_}=$returnhash{$version.':'.$_}; + } + } } -# ----------------------------- returnhash now has all stores for this resource - -# ---------------------------- initialize coursedata and userdata for this user + # returnhash now has all stores for this resource + # convert all "_" to "." to be able to use libraries, multiparts, etc + my @oldkeys=keys %returnhash; + + foreach (@oldkeys) { + my $name=$_; + my $value=$returnhash{$_}; + delete $returnhash{$_}; + $name=~s/\_/\./g; + $returnhash{$name}=$value; + } + # initialize coursedata and userdata for this user undef %courseopt; undef %useropt; 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; - } - } - map { - my ($name,$value)=split(/\=/,$_); - $courseopt{$userprefix.&Apache::lonnet::unescape($name)}= - &Apache::lonnet::unescape($value); - } split(/\&/,$courserdatas{$ENV{'request.course.id'}}); -# --------------------------------------------------- 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; - } - } - map { - my ($name,$value)=split(/\=/,$_); - $useropt{$userprefix.&Apache::lonnet::unescape($name)}= - &Apache::lonnet::unescape($value); - } split(/\&/,$userrdatas{$uname.'___'.$udom}); + # 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; + } + } + foreach (split(/\&/,$courserdatas{$cid})) { + my ($name,$value)=split(/\=/,$_); + $courseopt{$userprefix.&Apache::lonnet::unescape($name)}= + &Apache::lonnet::unescape($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); + } } - -# ----------------- now courseopt, useropt initialized for this user and course -# (used by parmval) - - my %c=(); - - if (tie(%parmhash,'GDBM_File', - &getcfn($safeeval).'_parms.db',&GDBM_READER,0640)) { - my %f=&getformulas($safeeval); - map { - if ($_=~/^A/) { - unless ($f{$_}=~/^\!/) { - if ($f{$_}=~/^parameter/) { - $c{$_}=&parmval($f{$_},$safeeval); - } else { - my $key=$f{$_}; - $key=~s/^stores\_/resource\./; - $key=~s/\_/\./; - $c{$_}=$returnhash{$key}; - } - } + # now courseopt, useropt initialized for this user and course + # (used by parmval) + # + # Load keys for this assessment only + # + my %thisassess=(); + my ($symap,$syid,$srcf)=split(/\_\_\_/,$symb); + foreach (split(/\,/,&Apache::lonnet::metadata($srcf,'keys'))) { + $thisassess{$_}=1; + } + # + # Load parameters + # + my %c=(); + if (tie(%parmhash,'GDBM_File', + &getcfn($safeeval).'_parms.db',&GDBM_READER(),0640)) { + my %f=&getformulas($safeeval); + 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; + } + } else { + my $key=$f{$_}; + my $ckey=$key; + $key=~s/^stores\_/resource\./; + $key=~s/\_/\./g; + $c{$_}=$returnhash{$key}; + $c{$ckey}=$returnhash{$key}; + } } - } keys %f; - untie(%parmhash); - } - &setconstants($safeeval,%c); + untie(%parmhash); + } + &setconstants($safeeval,%c); } # --------------------------------------------------------- Various form fields @@ -1323,7 +2150,7 @@ sub loadassessment { sub textfield { my ($title,$name,$value)=@_; return "\n

$title:
". - ''; + ''; } sub hiddenfield { @@ -1334,11 +2161,11 @@ sub hiddenfield { sub selectbox { my ($title,$name,$value,%options)=@_; my $selout="\n

$title:
".''; } @@ -1348,8 +2175,8 @@ sub selectbox { # sub updatesheet { - my $safeeval=shift; - my $stype=&gettype($safeeval); + my ($safeeval,$sheetdata)=@_; + my $stype=$sheetdata->{'sheettype'}; if ($stype eq 'classcalc') { return &updateclasssheet($safeeval); } else { @@ -1362,18 +2189,50 @@ sub updatesheet { # Import the data for rows # -sub loadrows() { - my $safeeval=shift; - my $stype=&gettype($safeeval); +sub loadrows { + my ($safeeval,$sheetdata,$r)=@_; + my $stype=$sheetdata->{'sheettype'}; if ($stype eq 'classcalc') { - &loadcourse($safeeval); + &loadcourse($safeeval,$sheetdata,$r); } elsif ($stype eq 'studentcalc') { - &loadstudent($safeeval); + &loadstudent($safeeval,$sheetdata); } else { - &loadassessment($safeeval); + &loadassessment($safeeval,$sheetdata); } } +# ======================================================= Forced recalculation? + +sub checkthis { + my ($keyname,$time)=@_; + return ($time<$expiredates{$keyname}); +} + +sub forcedrecalc { + my ($uname,$udom,$stype,$usymb)=@_; + my $key=$uname.':'.$udom.':'.$stype.':'.$usymb; + my $time=$oldsheets{$key.'.time'}; + if ($ENV{'form.forcerecalc'}) { return 1; } + unless ($time) { return 1; } + if ($stype eq 'assesscalc') { + my $map=(split(/\_\_\_/,$usymb))[0]; + if (&checkthis('::assesscalc:',$time) || + &checkthis('::assesscalc:'.$map,$time) || + &checkthis('::assesscalc:'.$usymb,$time) || + &checkthis($uname.':'.$udom.':assesscalc:',$time) || + &checkthis($uname.':'.$udom.':assesscalc:'.$map,$time) || + &checkthis($uname.':'.$udom.':assesscalc:'.$usymb,$time)) { + return 1; + } + } else { + if (&checkthis('::studentcalc:',$time) || + &checkthis($uname.':'.$udom.':studentcalc:',$time)) { + return 1; + } + } + return 0; +} + # ============================================================== Export handler # # Non-interactive call from with program @@ -1381,198 +2240,464 @@ sub loadrows() { sub exportsheet { my ($uname,$udom,$stype,$usymb,$fn)=@_; - my $thissheet=&makenewsheet($uname,$udom,$stype,$usymb); - &readsheet($thissheet,$fn); - &updatesheet($thissheet); - &loadrows($thissheet); - &calcsheet($thissheet); - my @returnthis=&exportdata($thissheet); - undef $thissheet; - return @returnthis; + my @exportarr=(); + if (($usymb=~/^\_(\w+)/) && (!$fn)) { + $fn='default_'.$1; + } + # + # Check if cached + # + my $key=$uname.':'.$udom.':'.$stype.':'.$usymb; + my $found=''; + if ($oldsheets{$key}) { + foreach (split(/\_\_\_\&\_\_\_/,$oldsheets{$key})) { + my ($name,$value)=split(/\_\_\_\=\_\_\_/,$_); + if ($name eq $fn) { + $found=$value; + } + } + } + unless ($found) { + &cachedssheets($uname,$udom,&Apache::lonnet::homeserver($uname,$udom)); + if ($oldsheets{$key}) { + foreach (split(/\_\_\_\&\_\_\_/,$oldsheets{$key})) { + my ($name,$value)=split(/\_\_\_\=\_\_\_/,$_); + if ($name eq $fn) { + $found=$value; + } + } + } + } + # + # Check if still valid + # + if ($found) { + if (&forcedrecalc($uname,$udom,$stype,$usymb)) { + $found=''; + } + } + if ($found) { + # + # 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; + } + } + $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'}); + } + } + return @exportarr; } -# ================================================================ Main handler +# ============================================================ Expiration Dates # -# Interactive call to screen +# Load previously cached student spreadsheets for this course # -# - - -sub handler { - my $r=shift; - - if ($r->header_only) { - $r->content_type('text/html'); - $r->send_http_header; - return OK; +sub 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); + } } +} -# ---------------------------------------------------- Global directory configs - -$includedir=$r->dir_config('lonIncludes'); -$tmpdir=$r->dir_config('lonDaemons').'/tmp/'; - -# ----------------------------------------------------- Needs to be in a course - - if ($ENV{'request.course.fn'}) { - -# --------------------------- Get query string for limited number of parameters - - map { - my ($name, $value) = split(/=/,$_); - $value =~ tr/+/ /; - $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; - if (($name eq 'uname') || ($name eq 'udom') || - ($name eq 'usymb') || ($name eq 'ufn')) { - unless ($ENV{'form.'.$name}) { - $ENV{'form.'.$name}=$value; - } - } - } (split(/&/,$ENV{'QUERY_STRING'})); +# ===================================================== Calculated sheets cache +# +# Load previously cached student spreadsheets for this course +# -# ------------------------------------------- Nothing there? Must be login user +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 $aname; - my $adom; +# ===================================================== Calculated sheets cache +# +# Load previously cached assessment spreadsheets for this student +# - unless ($ENV{'form.uname'}) { - $aname=$ENV{'user.name'}; - $adom=$ENV{'user.domain'}; - } else { - $aname=$ENV{'form.uname'}; - $adom=$ENV{'form.udom'}; +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); + } } + $loadedcaches{$sname.'_'.$sdom}=1; + } +} -# ------------------------------------------------------------------- Open page +# ===================================================== Calculated sheets cache +# +# Load previously cached assessment spreadsheets for this student +# - $r->content_type('text/html'); - $r->header_out('Cache-control','no-cache'); - $r->header_out('Pragma','no-cache'); - $r->send_http_header; +# ================================================================ Main handler +# +# Interactive call to screen +# +# -# --------------------------------------------------------------- Screen output - $r->print('LON-CAPA Spreadsheet'); - $r->print(<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/'; + # 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('LON-CAPA Spreadsheet'); + $r->print(< function celledit(cn,cf) { var cnf=prompt(cn,cf); - if (cnf!=null) { - document.sheet.unewfield.value=cn; + if (cnf!=null) { + document.sheet.unewfield.value=cn; document.sheet.unewformula.value=cnf; document.sheet.submit(); } } - -ENDSCRIPT - $r->print(''. - ''. - '

LON-CAPA Spreadsheet

'. - '
'. - &hiddenfield('uname',$ENV{'form.uname'}). - &hiddenfield('udom',$ENV{'form.udom'}). - &hiddenfield('usymb',$ENV{'form.usymb'}). - &hiddenfield('unewfield',''). - &hiddenfield('unewformula','')); - -# ---------------------- Make sure that this gets out, even if user hits "stop" - - $r->rflush(); - -# ---------------------------------------- Read new sheet or modified worksheet - - $r->uri=~/\/(\w+)$/; - - my $asheet=&makenewsheet($aname,$adom,$1,$ENV{'form.usymb'}); - -# ------------------------ If a new formula had been entered, go from work copy - - if ($ENV{'form.unewfield'}) { - $r->print('

Modified Workcopy

'); - $ENV{'form.unewformula'}=~s/\'/\"/g; - $r->print('

New formula: '.$ENV{'form.unewfield'}.'='. - $ENV{'form.unewformula'}.'

'); - &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'}); + function changesheet(cn) { + document.sheet.unewfield.value=cn; + document.sheet.unewformula.value='changesheet'; + document.sheet.submit(); } -# -------------------------------------------------- Print out user information + function insertrow(cn) { + document.sheet.unewfield.value='insertrow'; + document.sheet.unewformula.value=cn; + document.sheet.submit(); + } - unless (&gettype($asheet) eq 'classcalc') { - $r->print('

User: '.&getuname($asheet). - '
Domain: '.&getudom($asheet)); - if (&getcsec($asheet) eq '-1') { - $r->print('

'. - 'Not a student in this course

'); + +ENDSCRIPT + $r->print(''.&Apache::loncommon::bodytag('Grades Spreadsheet'). + ''. + &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('

Completely Recalculating Sheet ...

'); + 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('

Modified Workcopy

'); + $ENV{'form.unewformula'}=~s/\'/\"/g; + $r->print('

New formula: '.$ENV{'form.unewfield'}.'='. + $ENV{'form.unewformula'}.'

'); + &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 { - $r->print('
Section/Group: '.&getcsec($asheet)); + &readsheet($asheet,$ENV{'form.ufn'}); } - } - -# ---------------------------------------------------------------- Course title - - $r->print('

'. - $ENV{'course.'.$ENV{'request.course.id'}.'.description'}.'

'); - - -# ---------------------------------------------------- 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; + # Print out user information + unless ($asheetdata->{'sheettype'} eq 'classcalc') { + $r->print('

User: '.$asheetdata->{'uname'}. + '
Domain: '.$asheetdata->{'udom'}); + if (&getcsec($asheet) eq '-1') { + $r->print('

'. + 'Not a student in this course

'); + } else { + $r->print('
Section/Group: '.$asheetdata->{'csec'}); + } + if ($ENV{'form.usymb'}) { + $r->print('
Assessment: '. + $ENV{'form.usymb'}.''); + } + } + # 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('

Access Permission Denied

'. + '
'); + return OK; + } + } + # Additional options + $r->print( + '

' + ); + if ($asheetdata->{'sheettype'} eq 'assesscalc') { + $r->print('

'. + ''. + 'Level up: Student Sheet

'); + } + if (($asheetdata->{'sheettype'} eq 'studentcalc') && + (&Apache::lonnet::allowed('vgr',$asheetdata->{'cid'}))) { + $r->print ( + '

'. + 'Level up: Course Sheet

'); + } + # 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'; } - $fname.='_'.&gettype($asheet); - &setfilename($asheet,$fname); - $ENV{'form.ufn'}=$fname; - $r->print('

Saving spreadsheet: '. - &writesheet($asheet,$ENV{'form.makedefufn'}).'

'); - } - } - -# ------------------------------------------------ Write the modified worksheet + $r->print + (''. + ''. + '(make default: )

'); + } + $r->print(&hiddenfield('ufn',&getfilename($asheet))); + # Load dialog + if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) { + $r->print('

'. + '

'); + if (&gettype($asheet) eq 'studentcalc') { + &setothersheets($asheet,&othersheets($asheet,'assesscalc')); + } + } + # Cached sheets + &expirationdates(); + undef %oldsheets; + undef %loadedcaches; + if ($asheetdata->{'sheettype'} eq 'classcalc') { + $r->print + ("Loading previously calculated student sheets ...
\n"); + $r->rflush(); + &cachedcsheets(); + } elsif ($asheetdata->{'sheettype'} eq 'studentcalc') { + $r->print + ("Loading previously calculated assessment sheets ...
\n"); + $r->rflush(); + &cachedssheets($asheetdata->{'uname'},$asheetdata->{'udom'}, + $asheetdata->{'uhome'}); + } + # Update sheet, load rows + $r->print("Loaded sheet(s), updating rows ...
\n"); + $r->rflush(); + # + &updatesheet($asheet,$asheetdata); + $r->print("Updated rows, loading row data ...
\n"); + $r->rflush(); + # + &loadrows($asheet,$asheetdata,$r); + $r->print("Loaded row data, calculating sheet ...
\n"); + $r->rflush(); + # + my $calcoutput=&calcsheet($asheet); + $r->print('

'.$calcoutput.'

'); + # 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('

Saving spreadsheet: '. + &writesheet($asheet,$ENV{'form.makedefufn'}).'

'); + } + } + #Write the modified worksheet - $r->print('Current sheet: '.&getfilename($asheet).'

'); + $r->print('Current sheet: '.&getfilename($asheet).'

'); - &tmpwrite($asheet); + &tmpwrite($asheet); -# ----------------------------------------------------------------- Save dialog + if ($asheetdata->{'sheettype'} eq 'studentcalc') { + $r->print('
Show rows with empty A column: '); + } else { + $r->print('
Show empty rows: '); + } + $r->print(&hiddenfield('userselhidden','true'). + 'print(''. - ' (make default: )

'); + if ($ENV{'form.showall'}) { + $r->print(' checked'); + } else { + unless ($ENV{'form.userselhidden'}) { + unless + ($ENV{'course.'.$ENV{'request.course.id'}.'.hideemptyrows'} eq 'yes') { + $r->print(' checked'); + $ENV{'form.showall'}=1; + } + } } + $r->print('>'); - $r->print(&hiddenfield('ufn',&getfilename($asheet))); - - -# ----------------------------------------------------- Update sheet, load rows - - &updatesheet($asheet); - &loadrows($asheet); - + if ($asheetdata->{'sheettype'} eq 'classcalc') { + $r->print( + ' Output CSV format: print(' checked'); } + $r->print('>'); + } + +# ------------------------------------------------------------------ Insertrows + $r->print(' Student Status: '. + &Apache::lonhtmlcommon::StatusOptions + ($ENV{'form.Status'},'sheet')); + + $r->print(< + +
+ENDINSERTBUTTONS - my $calcoutput=&calcsheet($asheet); - $r->print('

'.$calcoutput.'

'); +# ------------------------------------------------------------- Print out sheet &outsheet($r,$asheet); $r->print(''); - # ------------------------------------------------------------------------ Done } else { # ----------------------------- Not in a course, or not allowed to modify parms @@ -1589,16 +2714,4 @@ __END__ - - - - - - - - - - - -