version 1.120, 2002/10/22 13:09:49
|
version 1.132, 2002/11/04 22:35:45
|
Line 122 my $tmpdir;
|
Line 122 my $tmpdir;
|
## |
## |
sub mask { |
sub mask { |
my ($lower,$upper)=@_; |
my ($lower,$upper)=@_; |
|
$upper = $lower if (! defined($upper)); |
$lower=~/([A-Za-z]|\*)(\d+|\*)/; |
# |
my $la=$1; |
my ($la,$ld) = ($lower=~/([A-Za-z]|\*)(\d+|\*)/); |
my $ld=$2; |
my ($ua,$ud) = ($upper=~/([A-Za-z]|\*)(\d+|\*)/); |
|
# |
$upper=~/([A-Za-z]|\*)(\d+|\*)/; |
|
my $ua=$1; |
|
my $ud=$2; |
|
my $alpha=''; |
my $alpha=''; |
my $num=''; |
my $num=''; |
|
# |
if (($la eq '*') || ($ua eq '*')) { |
if (($la eq '*') || ($ua eq '*')) { |
$alpha='[A-Za-z]'; |
$alpha='[A-Za-z]'; |
} else { |
} else { |
if (($la=~/[A-Z]/) && ($ua=~/[A-Z]/) || |
if (($la=~/[A-Z]/) && ($ua=~/[A-Z]/) || |
($la=~/[a-z]/) && ($ua=~/[a-z]/)) { |
($la=~/[a-z]/) && ($ua=~/[a-z]/)) { |
Line 188 sub mask {
|
Line 185 sub mask {
|
} |
} |
$num.=')'; |
$num.=')'; |
} else { |
} else { |
if ($lda[$#lda]!=$uda[$#uda]) { |
if ($lda[-1]!=$uda[-1]) { |
$num.='['.$lda[$#lda].'-'.$uda[$#uda].']'; |
$num.='['.$lda[-1].'-'.$uda[-1].']'; |
} |
} |
} |
} |
} |
} |
Line 197 sub mask {
|
Line 194 sub mask {
|
return '^'.$alpha.$num."\$"; |
return '^'.$alpha.$num."\$"; |
} |
} |
|
|
|
|
|
|
sub initsheet { |
sub initsheet { |
my $safeeval = new Safe(shift); |
my $safeeval = new Safe(shift); |
my $safehole = new Safe::Hole; |
my $safehole = new Safe::Hole; |
Line 208 sub initsheet {
|
Line 203 sub initsheet {
|
$safeeval->deny(":base_io"); |
$safeeval->deny(":base_io"); |
$safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT'); |
$safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT'); |
$safehole->wrap(\&Apache::lonspreadsheet::mask,$safeeval,'&mask'); |
$safehole->wrap(\&Apache::lonspreadsheet::mask,$safeeval,'&mask'); |
$safehole->wrap(\&Apache::lonspreadsheet::templaterow,$safeeval,'&templaterow'); |
|
$safeeval->share('$@'); |
$safeeval->share('$@'); |
my $code=<<'ENDDEFS'; |
my $code=<<'ENDDEFS'; |
# ---------------------------------------------------- Inside of the safe space |
# ---------------------------------------------------- Inside of the safe space |
Line 238 undef %c; # Holds the constants for a sh
|
Line 232 undef %c; # Holds the constants for a sh
|
# sheets, this is the A column. Used in &MINPARM, &MAXPARM, &expandnamed, |
# sheets, this is the A column. Used in &MINPARM, &MAXPARM, &expandnamed, |
# &sett, and &setconstants. There is no &getconstants. |
# &sett, and &setconstants. There is no &getconstants. |
# &setconstants is called by &loadstudent, &loadcourse, &load assessment, |
# &setconstants is called by &loadstudent, &loadcourse, &load assessment, |
undef %rowlabel; # Holds the 'prefix' for each row. Set by &setrowlabels. |
|
# &setrowlabels is called by &updateclasssheet, &updatestudentassesssheet, |
|
undef @os; # Holds the names of other spreadsheets - this is used to specify |
undef @os; # Holds the names of other spreadsheets - this is used to specify |
# the spreadsheets that are available for the assessment sheet. |
# the spreadsheets that are available for the assessment sheet. |
# Set by &setothersheets. &setothersheets is called by &handler. A |
# Set by &setothersheets. &setothersheets is called by &handler. A |
# related subroutine is &othersheets. |
# related subroutine is &othersheets. |
|
#$errorlog = ''; |
|
|
$maxrow = 0; |
$maxrow = 0; |
$sheettype = ''; |
$sheettype = ''; |
Line 597 compute the average of the items in the
|
Line 590 compute the average of the items in the
|
#------------------------------------------------------- |
#------------------------------------------------------- |
sub MEAN { |
sub MEAN { |
my $mask=mask(@_); |
my $mask=mask(@_); |
my $sum=0; my $num=0; |
my $sum=0; |
|
my $num=0; |
foreach (grep /$mask/,keys(%sheet_values)) { |
foreach (grep /$mask/,keys(%sheet_values)) { |
$sum+=$sheet_values{$_}; |
$sum+=$sheet_values{$_}; |
$num++; |
$num++; |
Line 834 sub expandnamed {
|
Line 828 sub expandnamed {
|
foreach $parameter (keys(%c)) { |
foreach $parameter (keys(%c)) { |
push @matches,$parameter if ($parameter =~ /$expression/); |
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].'\'}'; |
$returnvalue = '$c{\''.$matches[0].'\'}'; |
} elsif ($#matches > 0) { |
} elsif (scalar(@matches) > 0) { |
# more than one match. Look for a concise one |
# more than one match. Look for a concise one |
$returnvalue = "'non-unique parameter name : $expression'"; |
$returnvalue = "'non-unique parameter name : $expression'"; |
foreach (@matches) { |
foreach (@matches) { |
Line 845 sub expandnamed {
|
Line 841 sub expandnamed {
|
} |
} |
} |
} |
} else { |
} 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; |
return $returnvalue; |
} |
} |
Line 928 sub calc {
|
Line 926 sub calc {
|
while ($notfinished) { |
while ($notfinished) { |
$notfinished=0; |
$notfinished=0; |
foreach (keys(%t)) { |
foreach (keys(%t)) { |
|
#$errorlog .= "$_:".$t{$_}; |
my $old=$sheet_values{$_}; |
my $old=$sheet_values{$_}; |
$sheet_values{$_}=eval $t{$_}; |
$sheet_values{$_}=eval $t{$_}; |
if ($@) { |
if ($@) { |
Line 935 sub calc {
|
Line 934 sub calc {
|
return $_.': '.$@; |
return $_.': '.$@; |
} |
} |
if ($sheet_values{$_} ne $old) { $notfinished=1; $lastcalc=$_; } |
if ($sheet_values{$_} ne $old) { $notfinished=1; $lastcalc=$_; } |
|
#$errorlog .= ":".$sheet_values{$_}."\n"; |
} |
} |
$depth++; |
$depth++; |
if ($depth>100) { |
if ($depth>100) { |
Line 945 sub calc {
|
Line 945 sub calc {
|
return ''; |
return ''; |
} |
} |
|
|
|
# ------------------------------------------- End of "Inside of the safe space" |
|
ENDDEFS |
|
$safeeval->reval($code); |
|
return $safeeval; |
|
} |
|
|
# |
# |
# This is actually used for the student spreadsheet, not the assessment sheet |
# |
# Do not be fooled by the name! |
|
# |
# |
sub outrowassess { |
sub templaterow { |
# $n is the current row number |
my $sheet = shift; |
my $n=shift; |
|
my $csv = shift; |
|
my @cols=(); |
my @cols=(); |
if ($n) { |
my $rowlabel = 'Template'; |
my ($usy,$ufn)=split(/__&&&\__/,$f{'A'.$n}); |
|
if ($rowlabel{$usy}) { |
|
$cols[0]=$rowlabel{$usy}; |
|
if (! $csv) { |
|
$cols[0].='<br>'. |
|
'<select name="sel_'.$n.'" onChange="changesheet('.$n.')">'. |
|
'<option name="default">Default</option>'; |
|
} |
|
} else { |
|
$cols[0]=''; |
|
} |
|
if (! $csv) { |
|
foreach (@os) { |
|
$cols[0].='<option name="'.$_.'"'; |
|
if ($ufn eq $_) { |
|
$cols[0].=' selected'; |
|
} |
|
$cols[0].='>'.$_.'</option>'; |
|
} |
|
$cols[0].='</select>'; |
|
} |
|
} else { |
|
$cols[0]='<b><font size=+1>Export</font></b>'; |
|
} |
|
foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M', |
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', |
'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', |
'a','b','c','d','e','f','g','h','i','j','k','l','m', |
'n','o','p','q','r','s','t','u','v','w','x','y','z') { |
'n','o','p','q','r','s','t','u','v','w','x','y','z') { |
my $fm=$f{$_.$n}; |
my $fm=$sheet->{'f'}->{'template_'.$_}; |
$fm=~s/[\'\"]/\&\#34;/g; |
$fm=~s/[\'\"]/\&\#34;/g; |
push(@cols,"'$_$n','$fm'".'___eq___'.$sheet_values{$_.$n}); |
push(@cols,{ name => 'template_'.$_, |
|
formula => $fm, |
|
value => $fm }); |
} |
} |
return @cols; |
return ($rowlabel,@cols); |
} |
} |
|
|
sub outrow { |
sub outrowassess { |
my $n=shift; |
# $n is the current row number |
|
my ($sheet,$n) = @_; |
my @cols=(); |
my @cols=(); |
|
my $rowlabel=''; |
if ($n) { |
if ($n) { |
$cols[0]=$rowlabel{$f{'A'.$n}}; |
my ($usy,$ufn)=split(/__&&&\__/,$sheet->{'f'}->{'A'.$n}); |
|
if (exists($sheet->{'rowlabel'}->{$usy})) { |
|
$rowlabel = $sheet->{'rowlabel'}->{$usy}; |
|
} else { |
|
$rowlabel = ''; |
|
} |
} else { |
} 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', |
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', |
'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', |
'a','b','c','d','e','f','g','h','i','j','k','l','m', |
'n','o','p','q','r','s','t','u','v','w','x','y','z') { |
'n','o','p','q','r','s','t','u','v','w','x','y','z') { |
my $fm=$f{$_.$n}; |
my $fm=$sheet->{'f'}->{$_.$n}; |
$fm=~s/[\'\"]/\&\#34;/g; |
$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 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; |
|
} |
} |
|
|
sub templaterow { |
sub outrow { |
|
my ($sheet,$n)=@_; |
my @cols=(); |
my @cols=(); |
$cols[0]='<b><font size=+1>Template</font></b>'; |
my $rowlabel; |
|
if ($n) { |
|
$rowlabel = $sheet->{'rowlabel'}->{$sheet->{'f'}->{'A'.$n}}; |
|
} else { |
|
if ($sheet->{'sheettype'} eq 'classcalc') { |
|
$rowlabel = 'Summary'; |
|
} else { |
|
$rowlabel = 'Export'; |
|
} |
|
} |
foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M', |
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', |
'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', |
'a','b','c','d','e','f','g','h','i','j','k','l','m', |
'n','o','p','q','r','s','t','u','v','w','x','y','z') { |
'n','o','p','q','r','s','t','u','v','w','x','y','z') { |
my $fm=$f{'template_'.$_}; |
my $fm=$sheet->{'f'}->{$_.$n}; |
$fm=~s/[\'\"]/\&\#34;/g; |
$fm=~s/[\'\"]/\&\#34;/g; |
push(@cols,"'template_$_','$fm'".'___eq___'.$fm); |
push(@cols,{ name => $_.$n, |
|
formula => $fm, |
|
value => $sheet->{'values'}->{$_.$n}}); |
} |
} |
return @cols; |
return ($rowlabel,@cols); |
} |
|
|
|
|
|
# ------------------------------------------- End of "Inside of the safe space" |
|
ENDDEFS |
|
$safeeval->reval($code); |
|
return $safeeval; |
|
} |
} |
|
|
|
|
# ------------------------------------------------ Add or change formula values |
# ------------------------------------------------ Add or change formula values |
sub setformulas { |
sub setformulas { |
my ($sheet)=shift; |
my ($sheet)=shift; |
Line 1049 sub setformulas {
|
Line 1034 sub setformulas {
|
# ------------------------------------------------ Add or change formula values |
# ------------------------------------------------ Add or change formula values |
sub setconstants { |
sub setconstants { |
my ($sheet)=shift; |
my ($sheet)=shift; |
|
my ($constants) = @_; |
|
if (! ref($constants)) { |
|
my %tmp = @_; |
|
$constants = \%tmp; |
|
} |
|
$sheet->{'constants'} = $constants; |
return %{$sheet->{'safe'}->varglob('c')}=%{$sheet->{'constants'}}; |
return %{$sheet->{'safe'}->varglob('c')}=%{$sheet->{'constants'}}; |
} |
} |
|
|
Line 1064 sub setothersheets {
|
Line 1055 sub setothersheets {
|
# ------------------------------------------------ Add or change formula values |
# ------------------------------------------------ Add or change formula values |
sub setrowlabels { |
sub setrowlabels { |
my $sheet=shift; |
my $sheet=shift; |
%{$sheet->{'safe'}->varglob('rowlabel')}=%{$sheet->{'rowlabel'}}; |
my ($rowlabel) = @_; |
|
if (! ref($rowlabel)) { |
|
my %tmp = @_; |
|
$rowlabel = \%tmp; |
|
} |
|
$sheet->{'rowlabel'}=$rowlabel; |
} |
} |
|
|
# ------------------------------------------------------- Calculate spreadsheet |
# ------------------------------------------------------- Calculate spreadsheet |
Line 1076 sub calcsheet {
|
Line 1072 sub calcsheet {
|
} |
} |
|
|
# ---------------------------------------------------------------- Get formulas |
# ---------------------------------------------------------------- Get formulas |
|
# Return a copy of the formulas |
sub getformulas { |
sub getformulas { |
my $sheet = shift; |
my $sheet = shift; |
return %{$sheet->{'safe'}->varglob('f')}; |
return %{$sheet->{'safe'}->varglob('f')}; |
} |
} |
|
|
|
sub geterrorlog { |
|
my $sheet = shift; |
|
return ${$sheet->{'safe'}->varglob('errorlog')}; |
|
} |
|
|
# ----------------------------------------------------- Get value of $f{'A'.$n} |
# ----------------------------------------------------- Get value of $f{'A'.$n} |
sub getfa { |
sub getfa { |
my $sheet = shift; |
my $sheet = shift; |
Line 1091 sub getfa {
|
Line 1093 sub getfa {
|
# ------------------------------------------------------------- Export of A-row |
# ------------------------------------------------------------- Export of A-row |
sub exportdata { |
sub exportdata { |
my $sheet=shift; |
my $sheet=shift; |
return $sheet->{'safe'}->reval('&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') { |
|
if (exists($sheet->{'values'}->{$_.'0'})) { |
|
push(@exportarray,$sheet->{'values'}->{$_.'0'}); |
|
} else { |
|
push(@exportarray,''); |
|
} |
|
} |
|
return @exportarray; |
} |
} |
|
|
|
|
# ========================================================== End of Spreadsheet |
# ========================================================== End of Spreadsheet |
# ============================================================================= |
# ============================================================================= |
|
|
Line 1103 sub exportdata {
|
Line 1113 sub exportdata {
|
# |
# |
# --------------------------------------------- Produce output row n from sheet |
# --------------------------------------------- Produce output row n from sheet |
|
|
sub rown { |
sub get_row { |
my ($sheet,$n)=@_; |
my ($sheet,$n) = @_; |
my $defaultbg; |
my ($rowlabel,@rowdata); |
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=$sheet->{'sheettype'}; |
|
if ($sheettype eq 'studentcalc') { |
|
$proc='&outrowassess'; |
|
$maxred=26; |
|
} else { |
|
$proc='&outrow'; |
|
} |
|
if ($sheettype eq 'assesscalc') { |
|
$maxred=1; |
|
} else { |
|
$maxred=26; |
|
} |
|
if (&getfa($sheet,$n)=~/^[\~\-]/) { $maxred=1; } |
|
if ($n eq '-') { |
if ($n eq '-') { |
$proc='&templaterow'; |
($rowlabel,@rowdata) = &templaterow($sheet); |
$n=-1; |
} elsif ($sheet->{'sheettype'} eq 'studentcalc') { |
$dataflag=1; |
($rowlabel,@rowdata) = &outrowassess($sheet,$n); |
} |
|
foreach ($sheet->{'safe'}->reval($proc.'('.$n.','.$ENV{'form.showcsv'}.')')) { |
|
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.'>'; |
|
if ($ENV{'request.role'} =~ /^st\./) { |
|
$rowdata.=$vl; |
|
} else { |
|
$rowdata.='<a href="javascript:celledit('.$fm.');">'. |
|
$vl.'</a>'; |
|
} |
|
$rowdata.='</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>'); |
|
} else { |
} else { |
return ''; |
($rowlabel,@rowdata) = &outrow($sheet,$n); |
} |
} |
|
return ($rowlabel,@rowdata); |
} |
} |
|
|
# ------------------------------------------------------------- Print out sheet |
######################################################################## |
|
######################################################################## |
sub outsheet { |
sub sort_indicies { |
my ($r,$sheet)=@_; |
my $sheet = shift; |
my $maxred = 26; # The maximum number of cells to show as |
|
# red (uneditable) |
|
# To make student sheets uneditable could we |
|
# set $maxred = 52? |
|
# |
|
my $realm='Course'; # 'assessment', 'user', or 'course' sheet |
|
if ($sheet->{'sheettype'} eq 'assesscalc') { |
|
$maxred=1; |
|
$realm='Assessment'; |
|
} elsif ($sheet->{'sheettype'} eq 'studentcalc') { |
|
$maxred=26; |
|
$realm='User'; |
|
} |
|
# |
|
# Column label |
|
my $tabledata; |
|
if ($ENV{'form.showcsv'}) { |
|
$tabledata='<pre>'; |
|
} else { |
|
$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='.(52-$maxred). |
|
'><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($sheet,'-'). |
|
&rown($sheet,0); |
|
} |
|
$r->print($tabledata); |
|
# |
# |
# Prepare to output rows |
# Sort the rows in some manner |
my $row; |
|
# |
# |
my @sortby=(); |
my @sortby=(); |
my @sortidx=(); |
my @sortidx=(); |
for ($row=1;$row<=$sheet->{'maxrow'};$row++) { |
for (my $row=1;$row<=$sheet->{'maxrow'};$row++) { |
push (@sortby, $sheet->{'safe'}->reval('$f{"A'.$row.'"}')); |
push (@sortby, $sheet->{'safe'}->reval('$f{"A'.$row.'"}')); |
push (@sortidx, $row-1); |
push (@sortidx, $row); |
} |
} |
@sortidx=sort { lc($sortby[$a]) cmp lc($sortby[$b]); } @sortidx; |
@sortidx=sort { lc($sortby[$a]) cmp lc($sortby[$b]); } @sortidx; |
|
return @sortidx; |
|
} |
|
|
|
######################################################################## |
|
######################################################################## |
|
|
|
sub html_editable_cell { |
|
my ($cell,$bgcolor) = @_; |
|
my $result; |
|
# if (defined($cell)) { |
|
# &Apache::lonnet::logthis("cell ".$cell->{'name'}. |
|
# " = ".$cell->{'value'}. |
|
# " : ".$cell->{'formula'}); |
|
# } |
|
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>'; |
|
} |
|
} |
# |
# |
# Determine the type of child spreadsheets |
$result .= '<a href="javascript:celledit(\''. |
my $what='Student'; |
$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') { |
if ($sheet->{'sheettype'} eq 'assesscalc') { |
$what='Item'; |
$num_uneditable = 1; |
|
$realm = 'Assessment'; |
|
$row_type = 'Item'; |
} elsif ($sheet->{'sheettype'} eq 'studentcalc') { |
} elsif ($sheet->{'sheettype'} eq 'studentcalc') { |
$what='Assessment'; |
$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_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'); |
|
my $rowcount = 0; |
|
$row_html = '<tr><td>'.&format_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 |
# Loop through the rows and output them one at a time |
my $n=0; |
my $rows_output=0; |
for ($row=0;$row<$sheet->{'maxrow'};$row++) { |
foreach my $rownum (@Rows) { |
my $thisrow=&rown($sheet,$sortidx[$row]+1); |
my ($rowlabel,@rowdata) = &get_row($sheet,$rownum); |
if ($thisrow) { |
# |
if (($n/25==int($n/25)) && (!$ENV{'form.showcsv'})) { |
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_rowlabel($rowlabel).'</td>'; |
|
# Output links for each student? |
|
# Nope, that is already done for us in format_rowlabel (for now) |
|
} elsif ($sheet->{'sheettype'} eq 'studentcalc') { |
|
$row_html.='<td>'.&format_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_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->print("</table>\n<br>\n"); |
$r->rflush(); |
$r->rflush(); |
$r->print('<table border=2><tr><td> <td>'.$what.'</td>'); |
$r->print('<table border=2>'. |
$r->print('<td>'. |
'<tr><td> <td>'.$row_type.'</td>'. |
|
'<td>'. |
join('</td><td>', |
join('</td><td>', |
(split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZ'. |
(split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZ'. |
'abcdefghijklmnopqrstuvwxyz'))). |
'abcdefghijklmnopqrstuvwxyz'))). |
"</td></tr>\n"); |
"</td></tr>\n"); |
} |
} |
$n++; |
$rows_output++; |
$r->print($thisrow); |
$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; |
} |
} |
|
|
# |
sub outsheet_csv { |
# ----------------------------------------------- Read list of available sheets |
my ($sheet,$r) = @_; |
# |
} |
|
|
|
sub outsheet_excel { |
|
my ($sheet,$r) = @_; |
|
} |
|
|
|
sub outsheet_xml { |
|
my ($sheet,$r) = @_; |
|
} |
|
|
|
sub outsheet { |
|
my ($r,$sheet)=@_; |
|
&outsheet_html($sheet,$r); |
|
# if (exists($ENV{'form.csv'})) { |
|
# &outsheet_csv($sheet,$r); |
|
# } elsif (exists($ENV{'form.excel'})) { |
|
# &outsheet_excel($sheet,$r); |
|
# } elsif (exists($ENV{'form.xml'})) { |
|
# &outsheet_xml($sheet,$r); |
|
# } else { |
|
# &outsheet_html($sheet,$r); |
|
# } |
|
} |
|
|
|
######################################################################## |
|
######################################################################## |
sub othersheets { |
sub othersheets { |
my ($sheet,$stype)=@_; |
my ($sheet,$stype)=@_; |
$stype = $sheet->{'sheettype'} if (! defined($stype)); |
$stype = $sheet->{'sheettype'} if (! defined($stype)); |
Line 1283 sub othersheets {
|
Line 1397 sub othersheets {
|
return @alternatives; |
return @alternatives; |
} |
} |
|
|
|
|
# |
# |
# -------------------------------------- Parse a spreadsheet |
# -------------------------------------- Parse a spreadsheet |
# |
# |
Line 1438 sub writesheet {
|
Line 1551 sub writesheet {
|
# Cache new sheet |
# Cache new sheet |
$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f); |
$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f); |
# Write sheet |
# Write sheet |
my $sheetdata=''; |
|
foreach (keys(%f)) { |
foreach (keys(%f)) { |
unless ($f{$_} eq 'import') { |
delete($f{$_}) if ($f{$_} eq 'import'); |
$sheetdata.=&Apache::lonnet::escape($_).'='. |
|
&Apache::lonnet::escape($f{$_}).'&'; |
|
} |
|
} |
} |
$sheetdata=~s/\&$//; |
my $reply = &Apache::lonnet::put($fn,\%f,$cdom,$cnum); |
my $reply=&Apache::lonnet::reply('put:'.$cdom.':'.$cnum.':'.$fn.':'. |
|
$sheetdata,$chome); |
|
if ($reply eq 'ok') { |
if ($reply eq 'ok') { |
$reply=&Apache::lonnet::reply('put:'.$cdom.':'.$cnum.':'. |
$reply = &Apache::lonnet::put($stype.'_spreadsheets', |
$stype.'_spreadsheets:'. |
{$fn => $ENV{'user.name'}.'@'.$ENV{'user.domain'}}, |
&Apache::lonnet::escape($fn). |
$cdom,$cnum); |
'='.$ENV{'user.name'}.'@'. |
|
$ENV{'user.domain'}, |
|
$chome); |
|
if ($reply eq 'ok') { |
if ($reply eq 'ok') { |
if ($makedef) { |
if ($makedef) { |
return &Apache::lonnet::reply('put:'.$cdom.':'.$cnum. |
return &Apache::lonnet::put('environment', |
':environment:'. |
{'spreadsheet_default_'.$stype => $fn }, |
'spreadsheet_default_'. |
$cdom,$cnum); |
$stype.'='. |
|
&Apache::lonnet::escape($fn), |
|
$chome); |
|
} |
} |
return $reply; |
return $reply; |
} |
} |
Line 1515 sub tmpread {
|
Line 1616 sub tmpread {
|
} |
} |
} |
} |
if ($nform eq 'changesheet') { |
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') { |
unless ($ENV{'form.sel_'.$nfield} eq 'Default') { |
$fo{'A'.$nfield}.='__&&&__'.$ENV{'form.sel_'.$nfield}; |
$fo{'A'.$nfield}.='__&&&__'.$ENV{'form.sel_'.$nfield}; |
} |
} |
Line 1609 sub parmval {
|
Line 1710 sub parmval {
|
return &Apache::lonnet::metadata($fn,$rwhat.'.default'); |
return &Apache::lonnet::metadata($fn,$rwhat.'.default'); |
} |
} |
|
|
|
sub format_rowlabel { |
|
my $rowlabel = shift; |
|
return '' if ($rowlabel eq ''); |
|
my ($type,$labeldata) = split(':',$rowlabel,2); |
|
my $result = ''; |
|
if ($type eq 'symb') { |
|
my ($symb,$uname,$udom,$title) = split(':',$labeldata); |
|
$symb = &Apache::lonnet::unescape($symb); |
|
if ($ENV{'form.showcsv'}) { |
|
$result = $title; |
|
} else { |
|
$result = '<a href="/adm/assesscalc?usymb='.$symb. |
|
'&uname='.$uname.'&udom='.$udom.'">'.$title.'</a>'; |
|
} |
|
} elsif ($type eq 'student') { |
|
my ($sname,$sdom,$fullname,$section,$id) = split(':',$labeldata); |
|
if ($ENV{'form.showcsv'}) { |
|
$result = '"'. |
|
join('","',($sname,$sdom,$fullname,$section,$id).'"'); |
|
} else { |
|
$result ='<a href="/adm/studentcalc?uname='.$sname. |
|
'&udom='.$sdom.'">'; |
|
$result.=$section.' '.$id." ".$fullname.'</a>'; |
|
} |
|
} elsif ($type eq 'parameter') { |
|
if ($ENV{'form.showcsv'}) { |
|
$labeldata =~ s/<br>/ /g; |
|
} |
|
$result = $labeldata; |
|
} else { |
|
if ($ENV{'form.showcsv'}) { |
|
$result = $rowlabel; |
|
} else { |
|
$result = '<b><font size=+1>'.$rowlabel.'</font></b>'; |
|
} |
|
} |
|
return $result; |
|
} |
|
|
# ---------------------------------------------- Update rows for course listing |
# ---------------------------------------------- Update rows for course listing |
sub updateclasssheet { |
sub updateclasssheet { |
my ($sheet) = @_; |
my ($sheet) = @_; |
Line 1631 sub updateclasssheet {
|
Line 1771 sub updateclasssheet {
|
my ($studentDomain,$studentName,$end,$start,$id,$studentSection, |
my ($studentDomain,$studentName,$end,$start,$id,$studentSection, |
$fullname,$status) = @{$classlist->{$student}}; |
$fullname,$status) = @{$classlist->{$student}}; |
if ($ENV{'form.Status'} eq $status || $ENV{'form.Status'} eq 'Any') { |
if ($ENV{'form.Status'} eq $status || $ENV{'form.Status'} eq 'Any') { |
my $rowlabel=''; |
$currentlist{$student}=join(':',('student',$studentName, |
if ($ENV{'form.showcsv'}) { |
$studentDomain,$fullname, |
$rowlabel= '"'.join('","',($studentName,$studentDomain, |
$studentSection,$id)); |
$fullname,$studentSection,$id).'"'); |
|
} else { |
|
$rowlabel='<a href="/adm/studentcalc?uname='.$studentName. |
|
'&udom='.$studentDomain.'">'; |
|
$rowlabel.=$studentSection.' '.$id." ".$fullname; |
|
$rowlabel.='</a>'; |
|
} |
|
$currentlist{$student}=$rowlabel; |
|
} |
} |
} |
} |
# |
# |
Line 1669 sub updateclasssheet {
|
Line 1801 sub updateclasssheet {
|
} |
} |
# |
# |
# New and unknown keys |
# New and unknown keys |
foreach (sort keys(%currentlist)) { |
foreach my $student (sort keys(%currentlist)) { |
unless ($existing{$_}) { |
unless ($existing{$student}) { |
$changed=1; |
$changed=1; |
$sheet->{'maxrow'}++; |
$sheet->{'maxrow'}++; |
$f{'A'.$sheet->{'maxrow'}}=$_; |
$f{'A'.$sheet->{'maxrow'}}=$student; |
} |
} |
} |
} |
if ($changed) { |
if ($changed) { |
Line 1681 sub updateclasssheet {
|
Line 1813 sub updateclasssheet {
|
&setformulas($sheet,%f); |
&setformulas($sheet,%f); |
} |
} |
# |
# |
$sheet->{'rowlabel'} = \%currentlist; |
&setrowlabels($sheet,\%currentlist); |
&setrowlabels($sheet); |
|
} |
} |
|
|
# ----------------------------------- Update rows for student and assess sheets |
# ----------------------------------- Update rows for student and assess sheets |
sub updatestudentassesssheet { |
sub updatestudentassesssheet { |
my ($sheet) = @_; |
my ($sheet) = @_; |
|
# |
my %bighash; |
my %bighash; |
my $stype=$sheet->{'sheettype'}; |
# |
my $uname=$sheet->{'uname'}; |
my $stype = $sheet->{'sheettype'}; |
my $udom =$sheet->{'udom'}; |
my $uname = $sheet->{'uname'}; |
|
my $udom = $sheet->{'udom'}; |
$sheet->{'rowlabel'} = {}; |
$sheet->{'rowlabel'} = {}; |
if ($updatedata |
my $identifier =$sheet->{'coursefilename'}.'_'.$stype.'_'.$uname.'_'.$udom; |
{$ENV{'request.course.fn'}.'_'.$stype.'_'.$uname.'_'.$udom}) { |
if ($updatedata{$identifier}) { |
%{$sheet->{'rowlabel'}}=split(/___;___/, |
%{$sheet->{'rowlabel'}}=split(/___;___/,$updatedata{$identifier}); |
$updatedata{$ENV{'request.course.fn'}. |
|
'_'.$stype.'_'.$uname.'_'.$udom}); |
|
} else { |
} else { |
# Tie hash |
# Tie hash |
tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db', |
tie(%bighash,'GDBM_File',$sheet->{'coursefilename'}.'.db', |
&GDBM_READER(),0640); |
&GDBM_READER(),0640); |
if (! tied(%bighash)) { |
if (! tied(%bighash)) { |
return 'Could not access course data'; |
return 'Could not access course data'; |
} |
} |
# Get all assessments |
# Get all assessments |
my %allkeys=('timestamp' => |
# |
'Timestamp of Last Transaction<br>timestamp', |
# parameter_labels is used in the assessment sheets to provide labels |
'subnumber' => |
# for the parameters. |
'Number of Submissions<br>subnumber', |
my %parameter_labels= |
'tutornumber' => |
('timestamp' => |
'Number of Tutor Responses<br>tutornumber', |
'parameter:Timestamp of Last Transaction<br>timestamp', |
'totalpoints' => |
'subnumber' => |
'Total Points Granted<br>totalpoints'); |
'parameter:Number of Submissions<br>subnumber', |
my $adduserstr=''; |
'tutornumber' => |
if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})){ |
'parameter:Number of Tutor Responses<br>tutornumber', |
$adduserstr='&uname='.$uname.'&udom='.$udom; |
'totalpoints' => |
} |
'parameter:Total Points Granted<br>totalpoints'); |
my %allassess; |
# |
if (! $ENV{'form.showcsv'}) { |
# assesslist holds the descriptions of all assessments |
%allassess = |
my %assesslist; |
('_feedback' =>'<a href="/adm/assesscalc?usymb=_feedback'. |
foreach ('Feedback','Evaluation','Tutoring','Discussion') { |
$adduserstr.'">Feedback</a>', |
my $symb = '_'.lc($_); |
'_evaluation' =>'<a href="/adm/assesscalc?usymb=_evaluation'. |
$assesslist{$symb} = join(':',('symb',$symb,$uname,$udom,$_)); |
$adduserstr.'">Evaluation</a>', |
|
'_tutoring' =>'<a href="/adm/assesscalc?usymb=_tutoring'. |
|
$adduserstr.'">Tutoring</a>', |
|
'_discussion' =>'<a href="/adm/assesscalc?usymb=_discussion'. |
|
$adduserstr.'">Discussion</a>' |
|
); |
|
} else { |
|
%allassess = |
|
('_feedback' => "Feedback", |
|
'_evaluation' => "Evaluation", |
|
'_tutoring' => "Tutoring", |
|
'_discussion' => "Discussion", |
|
); |
|
} |
} |
while (($_,undef) = each(%bighash)) { |
while (($_,undef) = each(%bighash)) { |
next if ($_!~/^src\_(\d+)\.(\d+)$/); |
next if ($_!~/^src\_(\d+)\.(\d+)$/); |
Line 1748 sub updatestudentassesssheet {
|
Line 1866 sub updatestudentassesssheet {
|
my $symb= |
my $symb= |
&Apache::lonnet::declutter($bighash{'map_id_'.$mapid}). |
&Apache::lonnet::declutter($bighash{'map_id_'.$mapid}). |
'___'.$resid.'___'.&Apache::lonnet::declutter($srcf); |
'___'.$resid.'___'.&Apache::lonnet::declutter($srcf); |
if (! $ENV{'form.showcsv'}) { |
$assesslist{$symb}='symb:'.&Apache::lonnet::escape($symb).':' |
$allassess{$symb}= |
.$uname.':'.$udom.':'.$bighash{'title_'.$id}; |
'<a href="/adm/assesscalc?usymb='.$symb.$adduserstr.'">'. |
|
$bighash{'title_'.$id}.'</a>'; |
|
} else { |
|
$allassess{$symb}=$bighash{'title_'.$id}; |
|
} |
|
next if ($stype ne 'assesscalc'); |
next if ($stype ne 'assesscalc'); |
foreach my $key (split(/\,/, |
foreach my $key (split(/\,/, |
&Apache::lonnet::metadata($srcf,'keys') |
&Apache::lonnet::metadata($srcf,'keys') |
Line 1767 sub updatestudentassesssheet {
|
Line 1880 sub updatestudentassesssheet {
|
&Apache::lonnet::metadata($srcf,$key.'.name'); |
&Apache::lonnet::metadata($srcf,$key.'.name'); |
} |
} |
$display.='<br>'.$key; |
$display.='<br>'.$key; |
$allkeys{$key}=$display; |
$parameter_labels{$key}='parameter:'.$display; |
} # end of foreach |
} # end of foreach |
} |
} |
} # end of foreach (keys(%bighash)) |
} # end of foreach (keys(%bighash)) |
untie(%bighash); |
untie(%bighash); |
# |
# |
# %allkeys has a list of storage and parameter displays by unikey |
# %parameter_labels has a list of storage and parameter displays by |
# %allassess has a list of all resource displays by symb |
# unikey |
|
# %assesslist has a list of all resource, by symb |
# |
# |
if ($stype eq 'assesscalc') { |
if ($stype eq 'assesscalc') { |
$sheet->{'rowlabel'} = \%allkeys; |
$sheet->{'rowlabel'} = \%parameter_labels; |
} elsif ($stype eq 'studentcalc') { |
} elsif ($stype eq 'studentcalc') { |
$sheet->{'rowlabel'} = \%allassess; |
$sheet->{'rowlabel'} = \%assesslist; |
} |
} |
$updatedata{$ENV{'request.course.fn'}.'_'.$stype.'_'.$uname.'_'.$udom}= |
$updatedata{$sheet->{'coursefilename'}.'_'.$stype.'_' |
join('___;___',%{$sheet->{'rowlabel'}}); |
.$uname.'_'.$udom}= |
|
join('___;___',%{$sheet->{'rowlabel'}}); |
# Get current from cache |
# Get current from cache |
} |
} |
# Find discrepancies between the course row table and this |
# Find discrepancies between the course row table and this |
Line 1822 sub updatestudentassesssheet {
|
Line 1937 sub updatestudentassesssheet {
|
$sheet->{'f'} = \%f; |
$sheet->{'f'} = \%f; |
&setformulas($sheet); |
&setformulas($sheet); |
} |
} |
&setrowlabels($sheet); |
|
# |
# |
undef %existing; |
undef %existing; |
} |
} |
Line 1850 sub loadstudent {
|
Line 1964 sub loadstudent {
|
my $row=$1; |
my $row=$1; |
next if (($f{$_}=~/^[\!\~\-]/) || ($row==0)); |
next if (($f{$_}=~/^[\!\~\-]/) || ($row==0)); |
my ($usy,$ufn)=split(/__&&&\__/,$f{$_}); |
my ($usy,$ufn)=split(/__&&&\__/,$f{$_}); |
@assessdata=&exportsheet($sheet->{'uname'}, |
@assessdata=&exportsheet($sheet,$sheet->{'uname'}, |
$sheet->{'udom'}, |
$sheet->{'udom'}, |
'assesscalc',$usy,$ufn); |
'assesscalc',$usy,$ufn); |
my $index=0; |
my $index=0; |
Line 1873 sub loadstudent {
|
Line 1987 sub loadstudent {
|
$cachedassess=''; |
$cachedassess=''; |
undef %cachedstores; |
undef %cachedstores; |
$sheet->{'f'} = \%f; |
$sheet->{'f'} = \%f; |
$sheet->{'constants'} = \%c; |
|
&setformulas($sheet); |
&setformulas($sheet); |
&setconstants($sheet); |
&setconstants($sheet,\%c); |
} |
} |
|
|
# --------------------------------------------------- Load data for one student |
# --------------------------------------------------- Load data for one student |
Line 1908 ENDPOP
|
Line 2021 ENDPOP
|
next if ($_!~/^A(\d+)/); |
next if ($_!~/^A(\d+)/); |
my $row=$1; |
my $row=$1; |
next if (($f{$_}=~/^[\!\~\-]/) || ($row==0)); |
next if (($f{$_}=~/^[\!\~\-]/) || ($row==0)); |
my @studentdata=&exportsheet(split(/\:/,$f{$_}), |
my ($sname,$sdom) = split(':',$f{$_}); |
'studentcalc'); |
my @studentdata=&exportsheet($sheet,$sname,$sdom,'studentcalc'); |
undef %userrdatas; |
undef %userrdatas; |
$now++; |
$now++; |
$r->print('<script>popwin.document.popremain.remaining.value="'. |
$r->print('<script>popwin.document.popremain.remaining.value="'. |
Line 1920 ENDPOP
|
Line 2033 ENDPOP
|
my $index=0; |
my $index=0; |
foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M', |
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') { |
'N','O','P','Q','R','S','T','U','V','W','X','Y','Z') { |
if ($studentdata[$index]) { |
if (defined($studentdata[$index])) { |
my $col=$_; |
my $col=$_; |
if ($studentdata[$index]=~/\D/) { |
if ($studentdata[$index]=~/\D/) { |
$c{$col.$row}="'".$studentdata[$index]."'"; |
$c{$col.$row}="'".$studentdata[$index]."'"; |
Line 1930 ENDPOP
|
Line 2043 ENDPOP
|
unless ($col eq 'A') { |
unless ($col eq 'A') { |
$f{$col.$row}='import'; |
$f{$col.$row}='import'; |
} |
} |
$index++; |
} |
} |
$index++; |
} |
} |
} |
} |
$sheet->{'f'}=\%f; |
$sheet->{'f'}=\%f; |
$sheet->{'constants'}=\%c; |
|
&setformulas($sheet); |
&setformulas($sheet); |
&setconstants($sheet); |
&setconstants($sheet,\%c); |
$r->print('<script>popwin.close()</script>'); |
$r->print('<script>popwin.close()</script>'); |
$r->rflush(); |
$r->rflush(); |
} |
} |
Line 2041 sub loadassessment {
|
Line 2153 sub loadassessment {
|
if (tie(%parmhash,'GDBM_File', |
if (tie(%parmhash,'GDBM_File', |
$sheet->{'coursefilename'}.'_parms.db',&GDBM_READER(),0640)) { |
$sheet->{'coursefilename'}.'_parms.db',&GDBM_READER(),0640)) { |
my %f=&getformulas($sheet); |
my %f=&getformulas($sheet); |
foreach (keys(%f)) { |
foreach my $cell (keys(%f)) { |
next if ($_!~/^A/); |
next if ($cell !~ /^A/); |
next if ($f{$_}=~/^[\!\~\-]/); |
next if ($f{$cell} =~/^[\!\~\-]/); |
if ($f{$_}=~/^parameter/) { |
if ($f{$cell}=~/^parameter/) { |
if ($thisassess{$f{$_}}) { |
if (defined($thisassess{$f{$cell}})) { |
my $val=&parmval($f{$_},$sheet); |
my $val = &parmval($f{$cell},$sheet); |
$c{$_}=$val; |
$c{$cell} = $val; |
$c{$f{$_}}=$val; |
$c{$f{$cell}} = $val; |
} |
} |
} else { |
} else { |
my $key=$f{$_}; |
my $key=$f{$cell}; |
my $ckey=$key; |
my $ckey=$key; |
$key=~s/^stores\_/resource\./; |
$key=~s/^stores\_/resource\./; |
$key=~s/\_/\./g; |
$key=~s/\_/\./g; |
$c{$_}=$returnhash{$key}; |
$c{$cell}=$returnhash{$key}; |
$c{$ckey}=$returnhash{$key}; |
$c{$ckey}=$returnhash{$key}; |
} |
} |
} |
} |
untie(%parmhash); |
untie(%parmhash); |
} |
} |
$sheet->{'constants'}=\%c; |
&setconstants($sheet,\%c); |
&setconstants($sheet); |
|
} |
} |
|
|
# --------------------------------------------------------- Various form fields |
# --------------------------------------------------------- Various form fields |
Line 2154 sub forcedrecalc {
|
Line 2265 sub forcedrecalc {
|
} |
} |
|
|
# ============================================================== Export handler |
# ============================================================== Export handler |
|
# exportsheet |
|
# returns the export row for a spreadsheet. |
|
# |
sub exportsheet { |
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=(); |
my @exportarr=(); |
if (defined($usymb) && ($usymb=~/^\_(\w+)/) && (!$fn)) { |
if (defined($usymb) && ($usymb=~/^\_(\w+)/) && |
|
(!defined($fn) || $fn eq '')) { |
$fn='default_'.$1; |
$fn='default_'.$1; |
} |
} |
# |
# |
Line 2174 sub exportsheet {
|
Line 2292 sub exportsheet {
|
} |
} |
} |
} |
unless ($found) { |
unless ($found) { |
&cachedssheets($uname,$udom,&Apache::lonnet::homeserver($uname,$udom)); |
&cachedssheets($sheet,$uname,$udom); |
if ($oldsheets{$key}) { |
if ($oldsheets{$key}) { |
foreach (split(/___&\___/,$oldsheets{$key})) { |
foreach (split(/___&\___/,$oldsheets{$key})) { |
my ($name,$value)=split(/___=___/,$_); |
my ($name,$value)=split(/___=___/,$_); |
Line 2202 sub exportsheet {
|
Line 2320 sub exportsheet {
|
# |
# |
# Not cached |
# Not cached |
# |
# |
my ($sheet)=&makenewsheet($uname,$udom,$stype,$usymb); |
my ($newsheet)=&makenewsheet($uname,$udom,$stype,$usymb); |
&readsheet($sheet,$fn); |
&readsheet($newsheet,$fn); |
&updatesheet($sheet); |
&updatesheet($newsheet); |
&loadrows($sheet); |
&loadrows($newsheet); |
&calcsheet($sheet); |
&calcsheet($newsheet); |
@exportarr=&exportdata($sheet); |
@exportarr=&exportdata($newsheet); |
|
## |
|
## Store now |
|
## |
# |
# |
# Store now |
# load in the old value |
# |
# |
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:'.$sheet->{'udom'}.':'. |
|
$sheet->{'uname'}. |
|
':nohist_calculatedsheets_'. |
|
$ENV{'request.course.id'}.':'. |
|
&Apache::lonnet::escape($key), |
|
$sheet->{'uhome'}); |
|
} |
|
my %currentlystored=(); |
my %currentlystored=(); |
unless ($current=~/^error\:/) { |
if ($stype eq 'studentcalc') { |
foreach (split(/___&\___/,&Apache::lonnet::unescape($current))) { |
my @tmp = &Apache::lonnet::get('nohist_calculatedsheets', |
my ($name,$value)=split(/___=___/,$_); |
[$key], |
$currentlystored{$name}=$value; |
$sheet->{'cdom'},$sheet->{'cnum'}); |
|
if ($tmp[0]!~/^error/) { |
|
%currentlystored = @tmp; |
|
} |
|
} 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); |
$currentlystored{$fn}=join('___;___',@exportarr); |
# |
# |
|
# Stick everything back together |
|
# |
my $newstore=''; |
my $newstore=''; |
foreach (keys(%currentlystored)) { |
foreach (keys(%currentlystored)) { |
if ($newstore) { $newstore.='___&___'; } |
if ($newstore) { $newstore.='___&___'; } |
$newstore.=$_.'___=___'.$currentlystored{$_}; |
$newstore.=$_.'___=___'.$currentlystored{$_}; |
} |
} |
my $now=time; |
my $now=time; |
|
# |
|
# Store away the new value |
|
# |
if ($stype eq 'studentcalc') { |
if ($stype eq 'studentcalc') { |
&Apache::lonnet::put('nohist_calculatedsheets', |
&Apache::lonnet::put('nohist_calculatedsheets', |
{ $key => $newstore, |
{ $key => $newstore, |
$key.time => $now }, |
$key.time => $now }, |
$ENV{'course.'.$cid.'.domain'}, |
$sheet->{'cdom'},$sheet->{'cnum'}); |
$ENV{'course.'.$cid.'.num'}) |
|
} else { |
} else { |
&Apache::lonnet::put('nohist_calculatedsheets_'.$sheet->{'cid'}, |
&Apache::lonnet::put('nohist_calculatedsheets_'.$sheet->{'cid'}, |
{ $key => $newstore, |
{ $key => $newstore, |
Line 2266 sub exportsheet {
|
Line 2386 sub exportsheet {
|
sub expirationdates { |
sub expirationdates { |
undef %expiredates; |
undef %expiredates; |
my $cid=$ENV{'request.course.id'}; |
my $cid=$ENV{'request.course.id'}; |
my $reply=&Apache::lonnet::reply('dump:'. |
my @tmp = &Apache::lonnet::dump('nohist_expirationdates', |
$ENV{'course.'.$cid.'.domain'}.':'. |
$ENV{'course.'.$cid.'.domain'}, |
$ENV{'course.'.$cid.'.num'}. |
$ENV{'course.'.$cid.'.num'}); |
':nohist_expirationdates', |
if (lc($tmp[0])!~/^error/){ |
$ENV{'course.'.$cid.'.home'}); |
%expiredates = @tmp; |
unless ($reply=~/^error\:/) { |
|
foreach (split(/\&/,$reply)) { |
|
my ($name,$value)=split(/\=/,$_); |
|
$expiredates{&Apache::lonnet::unescape($name)} |
|
=&Apache::lonnet::unescape($value); |
|
} |
|
} |
} |
} |
} |
|
|
Line 2287 sub expirationdates {
|
Line 2401 sub expirationdates {
|
|
|
sub cachedcsheets { |
sub cachedcsheets { |
my $cid=$ENV{'request.course.id'}; |
my $cid=$ENV{'request.course.id'}; |
my $reply=&Apache::lonnet::reply('dump:'. |
my @tmp = &Apache::lonnet::dump('nohist_calculatedsheets', |
$ENV{'course.'.$cid.'.domain'}.':'. |
$ENV{'course.'.$cid.'.domain'}, |
$ENV{'course.'.$cid.'.num'}. |
$ENV{'course.'.$cid.'.num'}); |
':nohist_calculatedsheets', |
if ($tmp[0] !~ /^error/) { |
$ENV{'course.'.$cid.'.home'}); |
my %StupidTempHash = @tmp; |
unless ($reply=~/^error\:/) { |
while (my ($key,$value) = each %StupidTempHash) { |
foreach ( split(/\&/,$reply)) { |
$oldsheets{$key} = $value; |
my ($name,$value)=split(/\=/,$_); |
|
$oldsheets{&Apache::lonnet::unescape($name)} |
|
=&Apache::lonnet::unescape($value); |
|
} |
} |
} |
} |
} |
} |
Line 2307 sub cachedcsheets {
|
Line 2418 sub cachedcsheets {
|
# |
# |
|
|
sub cachedssheets { |
sub cachedssheets { |
my ($sname,$sdom,$shome)=@_; |
my ($sheet,$uname,$udom) = @_; |
unless (($loadedcaches{$sname.'_'.$sdom}) || ($shome eq 'no_host')) { |
$uname = $uname || $sheet->{'uname'}; |
my $cid=$ENV{'request.course.id'}; |
$udom = $udom || $sheet->{'udom'}; |
my $reply=&Apache::lonnet::reply('dump:'.$sdom.':'.$sname. |
if (! $loadedcaches{$sheet->{'uname'}.'_'.$sheet->{'udom'}}) { |
':nohist_calculatedsheets_'. |
my @tmp = &Apache::lonnet::dump('nohist_calculatedsheets', |
$ENV{'request.course.id'}, |
$sheet->{'udom'}, |
$shome); |
$sheet->{'uname'}); |
unless ($reply=~/^error\:/) { |
if ($tmp[0] !~ /^error/) { |
foreach ( split(/\&/,$reply)) { |
my %StupidTempHash = @tmp; |
my ($name,$value)=split(/\=/,$_); |
while (my ($key,$value) = each %StupidTempHash) { |
$oldsheets{&Apache::lonnet::unescape($name)} |
$oldsheets{$key} = $value; |
=&Apache::lonnet::unescape($value); |
} |
|
$loadedcaches{$sheet->{'uname'}.'_'.$sheet->{'udom'}}=1; |
} |
} |
} |
} |
$loadedcaches{$sname.'_'.$sdom}=1; |
|
} |
|
} |
} |
|
|
# ===================================================== Calculated sheets cache |
# ===================================================== Calculated sheets cache |
Line 2537 ENDSCRIPT
|
Line 2647 ENDSCRIPT
|
} elsif ($sheet->{'sheettype'} eq 'studentcalc') { |
} elsif ($sheet->{'sheettype'} eq 'studentcalc') { |
$r->print("Loading previously calculated assessment sheets ...\n"); |
$r->print("Loading previously calculated assessment sheets ...\n"); |
$r->rflush(); |
$r->rflush(); |
&cachedssheets($sheet->{'uname'},$sheet->{'udom'},$sheet->{'uhome'}); |
&cachedssheets($sheet); |
} |
} |
# Update sheet, load rows |
# Update sheet, load rows |
$r->print("Loaded sheet(s), updating rows ...<br>\n"); |
$r->print("Loaded sheet(s), updating rows ...<br>\n"); |
Line 2585 ENDSCRIPT
|
Line 2695 ENDSCRIPT
|
} else { |
} else { |
unless ($ENV{'form.userselhidden'}) { |
unless ($ENV{'form.userselhidden'}) { |
unless |
unless |
($ENV{'course.'.$ENV{'request.course.id'}.'.hideemptyrows'} eq 'yes') { |
($ENV{'course.'.$sheet->{'cid'}.'.hideemptyrows'} eq 'yes') { |
$r->print(' checked'); |
$r->print(' checked'); |
$ENV{'form.showall'}=1; |
$ENV{'form.showall'}=1; |
} |
} |