|
version 1.118, 2002/10/18 13:46:01
|
version 1.125, 2002/10/24 14:34:07
|
|
Line 122 my $tmpdir;
|
Line 122 my $tmpdir;
|
| ## |
## |
| sub mask { |
sub mask { |
| my ($lower,$upper)=@_; |
my ($lower,$upper)=@_; |
| |
# |
| $lower=~/([A-Za-z]|\*)(\d+|\*)/; |
my ($la,$ld) = ($lower=~/([A-Za-z]|\*)(\d+|\*)/); |
| my $la=$1; |
my ($ua,$ud) = ($upper=~/([A-Za-z]|\*)(\d+|\*)/); |
| my $ld=$2; |
# |
| |
|
| $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]/)) { |
| $alpha='['.$la.'-'.$ua.']'; |
$alpha='['.$la.'-'.$ua.']'; |
|
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 208 sub initsheet {
|
Line 205 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 221 sub initsheet {
|
Line 217 sub initsheet {
|
| # rl: row label |
# rl: row label |
| # os: other spreadsheets (for student spreadsheet only) |
# os: other spreadsheets (for student spreadsheet only) |
| |
|
| undef %sheet_values; |
undef %sheet_values; # Holds the (computed, final) values for the sheet |
| undef %t; |
# This is only written to by &calc, the spreadsheet computation routine. |
| undef %f; |
# It is read by many functions |
| undef %c; |
undef %t; # Holds the values of the spreadsheet temporarily. Set in &sett, |
| undef %rowlabel; |
# which does the translation of strings like C5 into the value in C5. |
| undef @os; |
# Used in &calc - %t holds the values that are actually eval'd. |
| |
undef %f; # Holds the formulas for each cell. This is the users |
| |
# (spreadsheet authors) data for each cell. |
| |
# set by &setformulas and returned by &getformulas |
| |
# &setformulas is called by &readsheet, &tmpread, &updateclasssheet, |
| |
# &updatestudentassesssheet, &loadstudent, &loadcourse |
| |
# &getformulas is called by &writesheet, &tmpwrite, &updateclasssheet, |
| |
# &updatestudentassesssheet, &loadstudent, &loadcourse, &loadassessment, |
| |
undef %c; # Holds the constants for a sheet. In the assessment |
| |
# sheets, this is the A column. Used in &MINPARM, &MAXPARM, &expandnamed, |
| |
# &sett, and &setconstants. There is no &getconstants. |
| |
# &setconstants is called by &loadstudent, &loadcourse, &load assessment, |
| |
undef @os; # Holds the names of other spreadsheets - this is used to specify |
| |
# the spreadsheets that are available for the assessment sheet. |
| |
# Set by &setothersheets. &setothersheets is called by &handler. A |
| |
# related subroutine is &othersheets. |
| |
|
| $maxrow = 0; |
$maxrow = 0; |
| $sheettype = ''; |
$sheettype = ''; |
|
Line 928 sub calc {
|
Line 939 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 |
# This is actually used for the student spreadsheet, not the assessment sheet |
| # Do not be fooled by the name! |
# Do not be fooled by the name! |
| # |
# |
| |
sub templaterow { |
| |
my $sheet = shift; |
| |
my @cols=(); |
| |
$cols[0]='<b><font size=+1>Template</font></b>'; |
| |
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=$sheet->{'f'}->{'template_'.$_}; |
| |
$fm=~s/[\'\"]/\&\#34;/g; |
| |
push(@cols,"'template_$_','$fm'".'___eq___'.$fm); |
| |
} |
| |
return @cols; |
| |
} |
| |
|
| |
|
| sub outrowassess { |
sub outrowassess { |
| # $n is the current row number |
# $n is the current row number |
| my $n=shift; |
my $sheet = shift; |
| |
my $n=shift; |
| |
my $csv = $ENV{'form.showcsv'}; |
| my @cols=(); |
my @cols=(); |
| if ($n) { |
if ($n) { |
| my ($usy,$ufn)=split(/__&&&\__/,$f{'A'.$n}); |
my ($usy,$ufn)=split(/__&&&\__/,$sheet->{'f'}->{'A'.$n}); |
| if ($rowlabel{$usy}) { |
if ($sheet->{'rowlabel'}->{$usy}) { |
| $cols[0]=$rowlabel{$usy}.'<br>'. |
$cols[0]=&format_rowlabel($sheet->{'rowlabel'}->{$usy}); |
| |
if (! $csv) { |
| |
$cols[0].='<br>'. |
| '<select name="sel_'.$n.'" onChange="changesheet('.$n.')">'. |
'<select name="sel_'.$n.'" onChange="changesheet('.$n.')">'. |
| '<option name="default">Default</option>'; |
'<option name="default">Default</option>'; |
| |
} |
| } else { |
} else { |
| $cols[0]=''; |
$cols[0]=''; |
| } |
} |
| foreach (@os) { |
if (! $csv) { |
| $cols[0].='<option name="'.$_.'"'; |
foreach (@{$sheet->{'othersheets'}}) { |
| if ($ufn eq $_) { |
$cols[0].='<option name="'.$_.'"'; |
| $cols[0].=' selected'; |
if ($ufn eq $_) { |
| |
$cols[0].=' selected'; |
| |
} |
| |
$cols[0].='>'.$_.'</option>'; |
| } |
} |
| $cols[0].='>'.$_.'</option>'; |
$cols[0].='</select>'; |
| } |
} |
| $cols[0].='</select>'; |
|
| } else { |
} else { |
| $cols[0]='<b><font size=+1>Export</font></b>'; |
$cols[0]='<b><font size=+1>Export</font></b>'; |
| } |
} |
|
Line 960 sub outrowassess {
|
Line 1000 sub outrowassess {
|
| 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z', |
'N','O','P','Q','R','S','T','U','V','W','X','Y','Z', |
| '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,"'$_$n','$fm'".'___eq___'.$sheet->{'values'}->{$_.$n}); |
| } |
} |
| return @cols; |
return @cols; |
| } |
} |
| |
|
| sub outrow { |
sub outrow { |
| |
my $sheet=shift; |
| my $n=shift; |
my $n=shift; |
| my @cols=(); |
my @cols=(); |
| if ($n) { |
if ($n) { |
| $cols[0]=$rowlabel{$f{'A'.$n}}; |
$cols[0]=&format_rowlabel($sheet->{'rowlabel'}->{$sheet->{'f'}->{'A'.$n}}); |
| } else { |
} else { |
| $cols[0]='<b><font size=+1>Export</font></b>'; |
$cols[0]='<b><font size=+1>Export</font></b>'; |
| } |
} |
|
Line 979 sub outrow {
|
Line 1020 sub outrow {
|
| '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,"'$_$n','$fm'".'___eq___'.$sheet->{'values'}->{$_.$n}); |
| } |
} |
| return @cols; |
return @cols; |
| } |
} |
| |
|
| sub exportrowa { |
|
| my @exportarray=(); |
|
| foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M', |
|
| 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z') { |
|
| push(@exportarray,$sheet_values{$_.'0'}); |
|
| } |
|
| return @exportarray; |
|
| } |
|
| |
|
| sub templaterow { |
|
| my @cols=(); |
|
| $cols[0]='<b><font size=+1>Template</font></b>'; |
|
| 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; |
|
| push(@cols,"'template_$_','$fm'".'___eq___'.$fm); |
|
| } |
|
| return @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 ($safeeval,%f)=@_; |
my ($sheet)=shift; |
| %{$safeeval->varglob('f')}=%f; |
%{$sheet->{'safe'}->varglob('f')}=%{$sheet->{'f'}}; |
| } |
} |
| |
|
| # ------------------------------------------------ Add or change formula values |
# ------------------------------------------------ Add or change formula values |
| sub setconstants { |
sub setconstants { |
| my ($safeeval,%c)=@_; |
my ($sheet)=shift; |
| %{$safeeval->varglob('c')}=%c; |
my ($constants) = @_; |
| |
if (! ref($constants)) { |
| |
my %tmp = @_; |
| |
$constants = \%tmp; |
| |
} |
| |
$sheet->{'constants'} = $constants; |
| |
&Apache::lonnet::logthis("----------------------------------"); |
| |
foreach my $c (keys(%{$sheet->{'constants'}})) { |
| |
&Apache::lonnet::logthis('constant '.$c.' = '. |
| |
$sheet->{'constants'}->{$c}); |
| |
} |
| |
return %{$sheet->{'safe'}->varglob('c')}=%{$sheet->{'constants'}}; |
| } |
} |
| |
|
| # --------------------------------------------- Set names of other spreadsheets |
# --------------------------------------------- Set names of other spreadsheets |
| sub setothersheets { |
sub setothersheets { |
| my ($safeeval,@os)=@_; |
my $sheet = shift; |
| @{$safeeval->varglob('os')}=@os; |
my @othersheets = @_; |
| |
$sheet->{'othersheets'} = \@othersheets; |
| |
@{$sheet->{'safe'}->varglob('os')}=@othersheets; |
| |
return; |
| } |
} |
| |
|
| # ------------------------------------------------ Add or change formula values |
# ------------------------------------------------ Add or change formula values |
| sub setrowlabels { |
sub setrowlabels { |
| my ($safeeval,%rowlabel)=@_; |
my $sheet=shift; |
| %{$safeeval->varglob('rowlabel')}=%rowlabel; |
my ($rowlabel) = @_; |
| |
if (! ref($rowlabel)) { |
| |
my %tmp = @_; |
| |
$rowlabel = \%tmp; |
| |
} |
| |
$sheet->{'rowlabel'}=$rowlabel; |
| } |
} |
| |
|
| # ------------------------------------------------------- Calculate spreadsheet |
# ------------------------------------------------------- Calculate spreadsheet |
| sub calcsheet { |
sub calcsheet { |
| my $safeeval=shift; |
my $sheet=shift; |
| return $safeeval->reval('&calc();'); |
my $result = $sheet->{'safe'}->reval('&calc();'); |
| |
%{$sheet->{'values'}} = %{$sheet->{'safe'}->varglob('sheet_values')}; |
| |
return $result; |
| } |
} |
| |
|
| # ---------------------------------------------------------------- Get formulas |
# ---------------------------------------------------------------- Get formulas |
| sub getformulas { |
sub getformulas { |
| my $safeeval=shift; |
my $sheet = shift; |
| return %{$safeeval->varglob('f')}; |
return %{$sheet->{'safe'}->varglob('f')}; |
| } |
} |
| |
|
| # ----------------------------------------------------- Get value of $f{'A'.$n} |
# ----------------------------------------------------- Get value of $f{'A'.$n} |
| sub getfa { |
sub getfa { |
| my ($safeeval,$n)=@_; |
my $sheet = shift; |
| return $safeeval->reval('$f{"A'.$n.'"}'); |
my ($n)=@_; |
| |
return $sheet->{'safe'}->reval('$f{"A'.$n.'"}'); |
| } |
} |
| |
|
| # ------------------------------------------------------------- Export of A-row |
# ------------------------------------------------------------- Export of A-row |
| sub exportdata { |
sub exportdata { |
| my $safeeval=shift; |
my $sheet=shift; |
| return $safeeval->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') { |
| |
push(@exportarray,$sheet->{'values'}->{$_.'0'}); |
| |
} |
| |
return @exportarray; |
| } |
} |
| |
|
| |
|
| # ========================================================== End of Spreadsheet |
# ========================================================== End of Spreadsheet |
| # ============================================================================= |
# ============================================================================= |
| |
|
|
Line 1075 sub exportdata {
|
Line 1111 sub exportdata {
|
| # --------------------------------------------- Produce output row n from sheet |
# --------------------------------------------- Produce output row n from sheet |
| |
|
| sub rown { |
sub rown { |
| my ($safeeval,$n,$sheetdata)=@_; |
my ($sheet,$n)=@_; |
| my $defaultbg; |
my $defaultbg; |
| my $rowdata=''; |
my $rowdata=''; |
| my $dataflag=0; |
my $dataflag=0; |
|
Line 1090 sub rown {
|
Line 1126 sub rown {
|
| $rowdata.="\n".'"'.$n.'"'; |
$rowdata.="\n".'"'.$n.'"'; |
| } |
} |
| my $showf=0; |
my $showf=0; |
| my $proc; |
# |
| |
# Determine how many pink (uneditable) cells there are in this sheet. |
| my $maxred=1; |
my $maxred=1; |
| my $sheettype=$sheetdata->{'sheettype'}; |
my $sheettype=$sheet->{'sheettype'}; |
| if ($sheettype eq 'studentcalc') { |
if ($sheettype eq 'studentcalc') { |
| $proc='&outrowassess'; |
|
| $maxred=26; |
$maxred=26; |
| } else { |
} elsif ($sheettype eq 'assesscalc') { |
| $proc='&outrow'; |
|
| } |
|
| if ($sheettype eq 'assesscalc') { |
|
| $maxred=1; |
$maxred=1; |
| } else { |
} else { |
| $maxred=26; |
$maxred=26; |
| } |
} |
| if (&getfa($safeeval,$n)=~/^[\~\-]/) { $maxred=1; } |
$maxred=1 if (&getfa($sheet,$n)=~/^[\~\-]/); |
| |
# |
| |
# Get the proper row |
| |
my @rowdata; |
| if ($n eq '-') { |
if ($n eq '-') { |
| $proc='&templaterow'; |
@rowdata = &templaterow($sheet); |
| $n=-1; |
$n=-1; |
| $dataflag=1; |
$dataflag=1; |
| |
} elsif ($sheettype eq 'studentcalc') { |
| |
@rowdata = &outrowassess($sheet,$n); |
| |
} else { |
| |
@rowdata = &outrow($sheet,$n); |
| } |
} |
| foreach ($safeeval->reval($proc.'('.$n.')')) { |
# |
| |
foreach (@rowdata) { |
| my $bgcolor=$defaultbg.((($showf-1)/5==int(($showf-1)/5))?'99':'DD'); |
my $bgcolor=$defaultbg.((($showf-1)/5==int(($showf-1)/5))?'99':'DD'); |
| my ($fm,$vl)=split(/\_\_\_eq\_\_\_/,$_); |
my ($fm,$vl)=split(/\_\_\_eq\_\_\_/,$_); |
| if ((($vl ne '') || ($vl eq '0')) && |
if ((($vl ne '') || ($vl eq '0')) && |
|
Line 1149 sub rown {
|
Line 1190 sub rown {
|
| # ------------------------------------------------------------- Print out sheet |
# ------------------------------------------------------------- Print out sheet |
| |
|
| sub outsheet { |
sub outsheet { |
| my ($r,$safeeval,$sheetdata)=@_; |
my ($r,$sheet)=@_; |
| my $maxred = 26; # The maximum number of cells to show as |
my $maxred = 26; # The maximum number of cells to show as |
| # red (uneditable) |
# red (uneditable) |
| # To make student sheets uneditable could we |
# To make student sheets uneditable could we |
| # set $maxred = 52? |
# set $maxred = 52? |
| # |
# |
| my $realm='Course'; # 'assessment', 'user', or 'course' sheet |
my $realm='Course'; # 'assessment', 'user', or 'course' sheet |
| if ($sheetdata->{'sheettype'} eq 'assesscalc') { |
if ($sheet->{'sheettype'} eq 'assesscalc') { |
| $maxred=1; |
$maxred=1; |
| $realm='Assessment'; |
$realm='Assessment'; |
| } elsif ($sheetdata->{'sheettype'} eq 'studentcalc') { |
} elsif ($sheet->{'sheettype'} eq 'studentcalc') { |
| $maxred=26; |
$maxred=26; |
| $realm='User'; |
$realm='User'; |
| } |
} |
|
Line 1188 sub outsheet {
|
Line 1229 sub outsheet {
|
| } |
} |
| $tabledata.="<b><font size=+1>$_</font></b></td>"; |
$tabledata.="<b><font size=+1>$_</font></b></td>"; |
| } |
} |
| $tabledata.='</tr>'.&rown($safeeval,'-',$sheetdata). |
$tabledata.='</tr>'.&rown($sheet,'-'). |
| &rown($safeeval,0,$sheetdata); |
&rown($sheet,0); |
| } |
} |
| $r->print($tabledata); |
$r->print($tabledata); |
| # |
# |
| # Prepare to output rows |
# Prepare to output rows |
| my $row; |
my $row; |
| my $maxrow=$sheetdata->{'maxrow'}; |
|
| # |
# |
| my @sortby=(); |
my @sortby=(); |
| my @sortidx=(); |
my @sortidx=(); |
| for ($row=1;$row<=$maxrow;$row++) { |
for ($row=1;$row<=$sheet->{'maxrow'};$row++) { |
| push (@sortby, $safeeval->reval('$f{"A'.$row.'"}')); |
push (@sortby, $sheet->{'safe'}->reval('$f{"A'.$row.'"}')); |
| push (@sortidx, $row-1); |
push (@sortidx, $row-1); |
| } |
} |
| @sortidx=sort { lc($sortby[$a]) cmp lc($sortby[$b]); } @sortidx; |
@sortidx=sort { lc($sortby[$a]) cmp lc($sortby[$b]); } @sortidx; |
| # |
# |
| # Determine the type of child spreadsheets |
# Determine the type of child spreadsheets |
| my $what='Student'; |
my $what='Student'; |
| if ($sheetdata->{'sheettype'} eq 'assesscalc') { |
if ($sheet->{'sheettype'} eq 'assesscalc') { |
| $what='Item'; |
$what='Item'; |
| } elsif ($sheetdata->{'sheettype'} eq 'studentcalc') { |
} elsif ($sheet->{'sheettype'} eq 'studentcalc') { |
| $what='Assessment'; |
$what='Assessment'; |
| } |
} |
| # |
# |
| # 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 $n=0; |
| for ($row=0;$row<$maxrow;$row++) { |
for ($row=0;$row<$sheet->{'maxrow'};$row++) { |
| my $thisrow=&rown($safeeval,$sortidx[$row]+1,$sheetdata); |
my $thisrow=&rown($sheet,$sortidx[$row]+1); |
| if ($thisrow) { |
if ($thisrow) { |
| if (($n/25==int($n/25)) && (!$ENV{'form.showcsv'})) { |
if (($n/25==int($n/25)) && (!$ENV{'form.showcsv'})) { |
| $r->print("</table>\n<br>\n"); |
$r->print("</table>\n<br>\n"); |
|
Line 1239 sub outsheet {
|
Line 1279 sub outsheet {
|
| # ----------------------------------------------- Read list of available sheets |
# ----------------------------------------------- Read list of available sheets |
| # |
# |
| sub othersheets { |
sub othersheets { |
| my ($safeeval,$stype,$sheetdata)=@_; |
my ($sheet,$stype)=@_; |
| |
$stype = $sheet->{'sheettype'} if (! defined($stype)); |
| # |
# |
| my $cnum = $sheetdata->{'cnum'}; |
my $cnum = $sheet->{'cnum'}; |
| my $cdom = $sheetdata->{'cdom'}; |
my $cdom = $sheet->{'cdom'}; |
| my $chome = $sheetdata->{'chome'}; |
my $chome = $sheet->{'chome'}; |
| # |
# |
| my @alternatives=(); |
my @alternatives=(); |
| my %results=&Apache::lonnet::dump($stype.'_spreadsheets',$cdom,$cnum); |
my %results=&Apache::lonnet::dump($stype.'_spreadsheets',$cdom,$cnum); |
|
Line 1287 sub parse_sheet {
|
Line 1328 sub parse_sheet {
|
| # -------------------------------------- Read spreadsheet formulas for a course |
# -------------------------------------- Read spreadsheet formulas for a course |
| # |
# |
| sub readsheet { |
sub readsheet { |
| my ($safeeval,$sheetdata,$fn)=@_; |
my ($sheet,$fn)=@_; |
| # |
# |
| my $stype = $sheetdata->{'sheettype'}; |
my $stype = $sheet->{'sheettype'}; |
| my $cnum = $sheetdata->{'cnum'}; |
my $cnum = $sheet->{'cnum'}; |
| my $cdom = $sheetdata->{'cdom'}; |
my $cdom = $sheet->{'cdom'}; |
| my $chome = $sheetdata->{'chome'}; |
my $chome = $sheet->{'chome'}; |
| # |
# |
| if (! defined($fn)) { |
if (! defined($fn)) { |
| # There is no filename. Look for defaults in course and global, cache |
# There is no filename. Look for defaults in course and global, cache |
|
Line 1313 sub readsheet {
|
Line 1354 sub readsheet {
|
| } |
} |
| } |
} |
| # $fn now has a value |
# $fn now has a value |
| $sheetdata->{'filename'} = $fn; |
$sheet->{'filename'} = $fn; |
| # see if sheet is cached |
# see if sheet is cached |
| my $fstring=''; |
my $fstring=''; |
| if ($fstring=$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}) { |
if ($fstring=$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}) { |
| &setformulas($safeeval,split(/\_\_\_\;\_\_\_/,$fstring)); |
my %tmp = split(/___;___/,$fstring); |
| |
$sheet->{'f'} = \%tmp; |
| |
&setformulas($sheet); |
| } else { |
} else { |
| # Not cached, need to read |
# Not cached, need to read |
| my %f=(); |
my %f=(); |
|
Line 1352 sub readsheet {
|
Line 1395 sub readsheet {
|
| } |
} |
| # Cache and set |
# Cache and set |
| $spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f); |
$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f); |
| &setformulas($safeeval,%f); |
$sheet->{'f'}=\%f; |
| |
&setformulas($sheet); |
| } |
} |
| } |
} |
| |
|
| # -------------------------------------------------------- Make new spreadsheet |
# -------------------------------------------------------- Make new spreadsheet |
| sub makenewsheet { |
sub makenewsheet { |
| my ($uname,$udom,$stype,$usymb)=@_; |
my ($uname,$udom,$stype,$usymb)=@_; |
| my %sheetdata=(); |
my $sheet={}; |
| $sheetdata{'uname'} = $uname; |
$sheet->{'uname'} = $uname; |
| $sheetdata{'udom'} = $udom; |
$sheet->{'udom'} = $udom; |
| $sheetdata{'sheettype'} = $stype; |
$sheet->{'sheettype'} = $stype; |
| $sheetdata{'usymb'} = $usymb; |
$sheet->{'usymb'} = $usymb; |
| $sheetdata{'cid'} = $ENV{'request.course.id'}; |
$sheet->{'cid'} = $ENV{'request.course.id'}; |
| $sheetdata{'csec'} = $Section{$uname.':'.$udom}; |
$sheet->{'csec'} = $Section{$uname.':'.$udom}; |
| $sheetdata{'coursefilename'} = $ENV{'request.course.fn'}; |
$sheet->{'coursefilename'} = $ENV{'request.course.fn'}; |
| $sheetdata{'cnum'} = $ENV{'course.'.$ENV{'request.course.id'}.'.num'}; |
$sheet->{'cnum'} = $ENV{'course.'.$ENV{'request.course.id'}.'.num'}; |
| $sheetdata{'cdom'} = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; |
$sheet->{'cdom'} = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; |
| $sheetdata{'chome'} = $ENV{'course.'.$ENV{'request.course.id'}.'.home'}; |
$sheet->{'chome'} = $ENV{'course.'.$ENV{'request.course.id'}.'.home'}; |
| $sheetdata{'uhome'} = &Apache::lonnet::homeserver($uname,$udom); |
$sheet->{'uhome'} = &Apache::lonnet::homeserver($uname,$udom); |
| |
# |
| my $safeeval=initsheet($stype); |
# |
| |
$sheet->{'f'} = {}; |
| |
$sheet->{'constants'} = {}; |
| |
$sheet->{'othersheets'} = []; |
| |
$sheet->{'rowlabel'} = {}; |
| |
# |
| |
# |
| |
$sheet->{'safe'}=&initsheet($sheet->{'sheettype'}); |
| # |
# |
| # Place all the %sheetdata items into the safe space |
# Place all the %$sheet items into the safe space except the safe space |
| |
# itself |
| my $initstring = ''; |
my $initstring = ''; |
| foreach (keys(%sheetdata)) { |
foreach (qw/uname udom sheettype usymb cid csec coursefilename |
| $initstring.= qq{\$$_="$sheetdata{$_}";}; |
cnum cdom chome uhome/) { |
| |
$initstring.= qq{\$$_="$sheet->{$_}";}; |
| } |
} |
| $safeeval->reval($initstring); |
$sheet->{'safe'}->reval($initstring); |
| return $safeeval,\%sheetdata; |
return $sheet; |
| } |
} |
| |
|
| # ------------------------------------------------------------ Save spreadsheet |
# ------------------------------------------------------------ Save spreadsheet |
| sub writesheet { |
sub writesheet { |
| my ($safeeval,$makedef,$sheetdata)=@_; |
my ($sheet,$makedef)=@_; |
| my $cid=$sheetdata->{'cid'}; |
my $cid=$sheet->{'cid'}; |
| if (&Apache::lonnet::allowed('opa',$cid)) { |
if (&Apache::lonnet::allowed('opa',$cid)) { |
| my %f=&getformulas($safeeval); |
my %f=&getformulas($sheet); |
| my $stype= $sheetdata->{'sheettype'}; |
my $stype= $sheet->{'sheettype'}; |
| my $cnum = $sheetdata->{'cnum'}; |
my $cnum = $sheet->{'cnum'}; |
| my $cdom = $sheetdata->{'cdom'}; |
my $cdom = $sheet->{'cdom'}; |
| my $chome= $sheetdata->{'chome'}; |
my $chome= $sheet->{'chome'}; |
| my $fn = $sheetdata->{'filename'}; |
my $fn = $sheet->{'filename'}; |
| # Cache new sheet |
# Cache new sheet |
| $spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f); |
$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f); |
| # Write sheet |
# Write sheet |
|
Line 1436 sub writesheet {
|
Line 1489 sub writesheet {
|
| # "Modified workcopy" - interactive only |
# "Modified workcopy" - interactive only |
| # |
# |
| sub tmpwrite { |
sub tmpwrite { |
| my ($safeeval,$sheetdata) = @_; |
my ($sheet) = @_; |
| my $fn=$ENV{'user.name'}.'_'. |
my $fn=$ENV{'user.name'}.'_'. |
| $ENV{'user.domain'}.'_spreadsheet_'.$sheetdata->{'usymb'}.'_'. |
$ENV{'user.domain'}.'_spreadsheet_'.$sheet->{'usymb'}.'_'. |
| $sheetdata->{'filename'}; |
$sheet->{'filename'}; |
| $fn=~s/\W/\_/g; |
$fn=~s/\W/\_/g; |
| $fn=$tmpdir.$fn.'.tmp'; |
$fn=$tmpdir.$fn.'.tmp'; |
| my $fh; |
my $fh; |
| if ($fh=Apache::File->new('>'.$fn)) { |
if ($fh=Apache::File->new('>'.$fn)) { |
| print $fh join("\n",&getformulas($safeeval)); |
print $fh join("\n",&getformulas($sheet)); |
| } |
} |
| } |
} |
| |
|
| # ---------------------------------------------------------- Read the temp copy |
# ---------------------------------------------------------- Read the temp copy |
| sub tmpread { |
sub tmpread { |
| my ($safeeval,$sheetdata,$nfield,$nform)=@_; |
my ($sheet,$nfield,$nform)=@_; |
| my $fn=$ENV{'user.name'}.'_'. |
my $fn=$ENV{'user.name'}.'_'. |
| $ENV{'user.domain'}.'_spreadsheet_'.$sheetdata->{'usymb'}.'_'. |
$ENV{'user.domain'}.'_spreadsheet_'.$sheet->{'usymb'}.'_'. |
| $sheetdata->{'filename'}; |
$sheet->{'filename'}; |
| $fn=~s/\W/\_/g; |
$fn=~s/\W/\_/g; |
| $fn=$tmpdir.$fn.'.tmp'; |
$fn=$tmpdir.$fn.'.tmp'; |
| my $fh; |
my $fh; |
|
Line 1489 sub tmpread {
|
Line 1542 sub tmpread {
|
| } else { |
} else { |
| if ($nfield) { $fo{$nfield}=$nform; } |
if ($nfield) { $fo{$nfield}=$nform; } |
| } |
} |
| &setformulas($safeeval,%fo); |
$sheet->{'f'}=\%fo; |
| |
&setformulas($sheet); |
| } |
} |
| |
|
| ################################################## |
################################################## |
|
Line 1501 sub tmpread {
|
Line 1555 sub tmpread {
|
| |
|
| Determine the value of a parameter. |
Determine the value of a parameter. |
| |
|
| Inputs: $what, the parameter needed, $safeeval, the safe space |
Inputs: $what, the parameter needed, $sheet, the safe space |
| |
|
| Returns: The value of a parameter, or '' if none. |
Returns: The value of a parameter, or '' if none. |
| |
|
|
Line 1517 this user and course.
|
Line 1571 this user and course.
|
| ################################################## |
################################################## |
| ################################################## |
################################################## |
| sub parmval { |
sub parmval { |
| my ($what,$safeeval,$sheetdata)=@_; |
my ($what,$sheet)=@_; |
| my $symb = $sheetdata->{'usymb'}; |
my $symb = $sheet->{'usymb'}; |
| unless ($symb) { return ''; } |
unless ($symb) { return ''; } |
| # |
# |
| my $cid = $sheetdata->{'cid'}; |
my $cid = $sheet->{'cid'}; |
| my $csec = $sheetdata->{'csec'}; |
my $csec = $sheet->{'csec'}; |
| my $uname = $sheetdata->{'uname'}; |
my $uname = $sheet->{'uname'}; |
| my $udom = $sheetdata->{'udom'}; |
my $udom = $sheet->{'udom'}; |
| my $result=''; |
my $result=''; |
| # |
# |
| my ($mapname,$id,$fn)=split(/\_\_\_/,$symb); |
my ($mapname,$id,$fn)=split(/\_\_\_/,$symb); |
|
Line 1567 sub parmval {
|
Line 1621 sub parmval {
|
| return &Apache::lonnet::metadata($fn,$rwhat.'.default'); |
return &Apache::lonnet::metadata($fn,$rwhat.'.default'); |
| } |
} |
| |
|
| |
sub format_rowlabel { |
| |
my $rowlabel = shift; |
| |
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?usmb='.$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'}) { |
| |
$result = $labeldata =~ s/<br>//g; |
| |
} else { |
| |
$result = $labeldata; |
| |
} |
| |
} else { |
| |
&Apache::lonnet::logthis("lonspreadsheet:bogus rowlabel type: $type"); |
| |
} |
| |
return $result; |
| |
} |
| |
|
| # ---------------------------------------------- Update rows for course listing |
# ---------------------------------------------- Update rows for course listing |
| sub updateclasssheet { |
sub updateclasssheet { |
| my ($safeeval,$sheetdata) = @_; |
my ($sheet) = @_; |
| my $cnum =$sheetdata->{'cnum'}; |
my $cnum =$sheet->{'cnum'}; |
| my $cdom =$sheetdata->{'cdom'}; |
my $cdom =$sheet->{'cdom'}; |
| my $cid =$sheetdata->{'cid'}; |
my $cid =$sheet->{'cid'}; |
| my $chome =$sheetdata->{'chome'}; |
my $chome =$sheet->{'chome'}; |
| # |
# |
| %Section = (); |
%Section = (); |
| |
|
|
Line 1589 sub updateclasssheet {
|
Line 1678 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; |
|
| } |
} |
| } |
} |
| # |
# |
| # Find discrepancies between the course row table and this |
# Find discrepancies between the course row table and this |
| # |
# |
| my %f=&getformulas($safeeval); |
my %f=&getformulas($sheet); |
| my $changed=0; |
my $changed=0; |
| # |
# |
| my $maxrow=0; |
$sheet->{'maxrow'}=0; |
| my %existing=(); |
my %existing=(); |
| # |
# |
| # Now obsolete rows |
# Now obsolete rows |
| foreach (keys(%f)) { |
foreach (keys(%f)) { |
| if ($_=~/^A(\d+)/) { |
if ($_=~/^A(\d+)/) { |
| $maxrow=($1>$maxrow)?$1:$maxrow; |
if ($1 > $sheet->{'maxrow'}) { |
| |
$sheet->{'maxrow'}= $1; |
| |
} |
| $existing{$f{$_}}=1; |
$existing{$f{$_}}=1; |
| unless ((defined($currentlist{$f{$_}})) || (!$1) || |
unless ((defined($currentlist{$f{$_}})) || (!$1) || |
| ($f{$_}=~/^(\~\~\~|\-\-\-)/)) { |
($f{$_}=~/^(~~~|---)/)) { |
| $f{$_}='!!! Obsolete'; |
$f{$_}='!!! Obsolete'; |
| $changed=1; |
$changed=1; |
| } |
} |
|
Line 1628 sub updateclasssheet {
|
Line 1711 sub updateclasssheet {
|
| foreach (sort keys(%currentlist)) { |
foreach (sort keys(%currentlist)) { |
| unless ($existing{$_}) { |
unless ($existing{$_}) { |
| $changed=1; |
$changed=1; |
| $maxrow++; |
$sheet->{'maxrow'}++; |
| $f{'A'.$maxrow}=$_; |
$f{'A'.$sheet->{'maxrow'}}=$_; |
| } |
} |
| } |
} |
| if ($changed) { &setformulas($safeeval,%f); } |
if ($changed) { |
| |
$sheet->{'f'} = \%f; |
| |
&setformulas($sheet,%f); |
| |
} |
| # |
# |
| $sheetdata->{'maxrow'} = $maxrow; |
&setrowlabels($sheet,\%currentlist); |
| &setrowlabels($safeeval,%currentlist); |
|
| } |
} |
| |
|
| # ----------------------------------- Update rows for student and assess sheets |
# ----------------------------------- Update rows for student and assess sheets |
| sub updatestudentassesssheet { |
sub updatestudentassesssheet { |
| my ($safeeval,$sheetdata) = @_; |
my ($sheet) = @_; |
| my %bighash; |
my %bighash; |
| my $stype=$sheetdata->{'sheettype'}; |
my $stype=$sheet->{'sheettype'}; |
| my $uname=$sheetdata->{'uname'}; |
my $uname=$sheet->{'uname'}; |
| my $udom =$sheetdata->{'udom'}; |
my $udom =$sheet->{'udom'}; |
| my %current=(); |
$sheet->{'rowlabel'} = {}; |
| if ($updatedata |
if ($updatedata |
| {$ENV{'request.course.fn'}.'_'.$stype.'_'.$uname.'_'.$udom}) { |
{$ENV{'request.course.fn'}.'_'.$stype.'_'.$uname.'_'.$udom}) { |
| %current=split(/\_\_\_\;\_\_\_/, |
%{$sheet->{'rowlabel'}}=split(/___;___/, |
| $updatedata{$ENV{'request.course.fn'}. |
$updatedata{$ENV{'request.course.fn'}. |
| '_'.$stype.'_'.$uname.'_'.$udom}); |
'_'.$stype.'_'.$uname.'_'.$udom}); |
| } else { |
} else { |
|
Line 1659 sub updatestudentassesssheet {
|
Line 1744 sub updatestudentassesssheet {
|
| return 'Could not access course data'; |
return 'Could not access course data'; |
| } |
} |
| # Get all assessments |
# Get all assessments |
| |
# |
| |
# allkeys is used in the assessment sheets to provide labels |
| |
# for the parameters. |
| my %allkeys=('timestamp' => |
my %allkeys=('timestamp' => |
| 'Timestamp of Last Transaction<br>timestamp', |
'parameter:Timestamp of Last Transaction<br>timestamp', |
| 'subnumber' => |
'subnumber' => |
| 'Number of Submissions<br>subnumber', |
'parameter:Number of Submissions<br>subnumber', |
| 'tutornumber' => |
'tutornumber' => |
| 'Number of Tutor Responses<br>tutornumber', |
'parameter:Number of Tutor Responses<br>tutornumber', |
| 'totalpoints' => |
'totalpoints' => |
| 'Total Points Granted<br>totalpoints'); |
'parameter:Total Points Granted<br>totalpoints'); |
| my $adduserstr=''; |
my $adduserstr=''; |
| if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})){ |
if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})){ |
| $adduserstr='&uname='.$uname.'&udom='.$udom; |
$adduserstr='&uname='.$uname.'&udom='.$udom; |
| } |
} |
| my %allassess = |
# |
| ('_feedback' =>'<a href="/adm/assesscalc?usymb=_feedback'. |
# allassess holds the descriptions of all assessments |
| $adduserstr.'">Feedback</a>', |
my %allassess; |
| '_evaluation' =>'<a href="/adm/assesscalc?usymb=_evaluation'. |
foreach ('Feedback','Evaluation','Tutoring','Discussion') { |
| $adduserstr.'">Evaluation</a>', |
my $symb = '_'.lc($_); |
| '_tutoring' =>'<a href="/adm/assesscalc?usymb=_tutoring'. |
$allassess{$symb} = join(':',('symb',$symb,$uname,$udom,$_)); |
| $adduserstr.'">Tutoring</a>', |
} |
| '_discussion' =>'<a href="/adm/assesscalc?usymb=_discussion'. |
|
| $adduserstr.'">Discussion</a>' |
|
| ); |
|
| while (($_,undef) = each(%bighash)) { |
while (($_,undef) = each(%bighash)) { |
| next if ($_!~/^src\_(\d+)\.(\d+)$/); |
next if ($_!~/^src\_(\d+)\.(\d+)$/); |
| my $mapid=$1; |
my $mapid=$1; |
|
Line 1691 sub updatestudentassesssheet {
|
Line 1776 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); |
| $allassess{$symb}= |
$allassess{$symb}='symb:'.&Apache::lonnet::escape($symb).':' |
| '<a href="/adm/assesscalc?usymb='.$symb.$adduserstr.'">'. |
.$uname.':'.$udom.':'.$bighash{'title_'.$id}; |
| $bighash{'title_'.$id}.'</a>'; |
|
| 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 1706 sub updatestudentassesssheet {
|
Line 1790 sub updatestudentassesssheet {
|
| &Apache::lonnet::metadata($srcf,$key.'.name'); |
&Apache::lonnet::metadata($srcf,$key.'.name'); |
| } |
} |
| $display.='<br>'.$key; |
$display.='<br>'.$key; |
| $allkeys{$key}=$display; |
$allkeys{$key}='parameter:'.$display; |
| } # end of foreach |
} # end of foreach |
| } |
} |
| } # end of foreach (keys(%bighash)) |
} # end of foreach (keys(%bighash)) |
|
Line 1716 sub updatestudentassesssheet {
|
Line 1800 sub updatestudentassesssheet {
|
| # %allassess has a list of all resource displays by symb |
# %allassess has a list of all resource displays by symb |
| # |
# |
| if ($stype eq 'assesscalc') { |
if ($stype eq 'assesscalc') { |
| %current=%allkeys; |
$sheet->{'rowlabel'} = \%allkeys; |
| } elsif ($stype eq 'studentcalc') { |
} elsif ($stype eq 'studentcalc') { |
| %current=%allassess; |
$sheet->{'rowlabel'} = \%allassess; |
| } |
} |
| $updatedata{$ENV{'request.course.fn'}.'_'.$stype.'_'.$uname.'_'.$udom}= |
$updatedata{$ENV{'request.course.fn'}.'_'.$stype.'_'.$uname.'_'.$udom}= |
| join('___;___',%current); |
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 |
| # |
# |
| my %f=&getformulas($safeeval); |
my %f=&getformulas($sheet); |
| my $changed=0; |
my $changed=0; |
| |
|
| my $maxrow=0; |
$sheet->{'maxrow'} = 0; |
| my %existing=(); |
my %existing=(); |
| # Now obsolete rows |
# Now obsolete rows |
| foreach (keys(%f)) { |
foreach (keys(%f)) { |
| next if ($_!~/^A(\d+)/); |
next if ($_!~/^A(\d+)/); |
| $maxrow=($1>$maxrow)?$1:$maxrow; |
if ($1 > $sheet->{'maxrow'}) { |
| my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{$_}); |
$sheet->{'maxrow'} = $1; |
| |
} |
| |
my ($usy,$ufn)=split(/__&&&\__/,$f{$_}); |
| $existing{$usy}=1; |
$existing{$usy}=1; |
| unless ((defined($current{$usy})) || (!$1) || |
unless ((exists($sheet->{'rowlabel'}->{$usy}) && |
| ($f{$_}=~/^(\~\~\~|\-\-\-)/)){ |
(defined($sheet->{'rowlabel'}->{$usy})) || (!$1) || |
| |
($f{$_}=~/^(~~~|---)/))){ |
| $f{$_}='!!! Obsolete'; |
$f{$_}='!!! Obsolete'; |
| $changed=1; |
$changed=1; |
| } elsif ($ufn) { |
} elsif ($ufn) { |
| $current{$usy} |
$sheet->{'rowlabel'}->{$usy} |
| =~s/assesscalc\?usymb\=/assesscalc\?ufn\=$ufn\&usymb\=/; |
=~s/assesscalc\?usymb\=/assesscalc\?ufn\=$ufn\&usymb\=/; |
| } |
} |
| } |
} |
| # New and unknown keys |
# New and unknown keys |
| foreach (keys(%current)) { |
foreach (keys(%{$sheet->{'rowlabel'}})) { |
| unless ($existing{$_}) { |
unless ($existing{$_}) { |
| $changed=1; |
$changed=1; |
| $maxrow++; |
$sheet->{'maxrow'}++; |
| $f{'A'.$maxrow}=$_; |
$f{'A'.$sheet->{'maxrow'}}=$_; |
| } |
} |
| } |
} |
| if ($changed) { &setformulas($safeeval,%f); } |
if ($changed) { |
| $sheetdata->{'maxrow'} = $maxrow; |
$sheet->{'f'} = \%f; |
| &setrowlabels($safeeval,%current); |
&setformulas($sheet); |
| |
} |
| # |
# |
| undef %current; |
|
| undef %existing; |
undef %existing; |
| } |
} |
| |
|
| # ------------------------------------------------ Load data for one assessment |
# ------------------------------------------------ Load data for one assessment |
| |
|
| sub loadstudent { |
sub loadstudent { |
| my ($safeeval,$sheetdata)=@_; |
my ($sheet)=@_; |
| my %c=(); |
my %c=(); |
| my %f=&getformulas($safeeval); |
my %f=&getformulas($sheet); |
| $cachedassess=$sheetdata->{'uname'}.':'.$sheetdata->{'udom'}; |
$cachedassess=$sheet->{'uname'}.':'.$sheet->{'udom'}; |
| # Get ALL the student preformance data |
# Get ALL the student preformance data |
| my @tmp = &Apache::lonnet::dump($sheetdata->{'cid'}, |
my @tmp = &Apache::lonnet::dump($sheet->{'cid'}, |
| $sheetdata->{'udom'}, |
$sheet->{'udom'}, |
| $sheetdata->{'uname'}, |
$sheet->{'uname'}, |
| undef); |
undef); |
| if ($tmp[0] !~ /^error:/) { |
if ($tmp[0] !~ /^error:/) { |
| %cachedstores = @tmp; |
%cachedstores = @tmp; |
|
Line 1785 sub loadstudent {
|
Line 1872 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($sheetdata->{'uname'}, |
@assessdata=&exportsheet($sheet->{'uname'}, |
| $sheetdata->{'udom'}, |
$sheet->{'udom'}, |
| 'assesscalc',$usy,$ufn); |
'assesscalc',$usy,$ufn); |
| 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', |
|
Line 1807 sub loadstudent {
|
Line 1894 sub loadstudent {
|
| } |
} |
| $cachedassess=''; |
$cachedassess=''; |
| undef %cachedstores; |
undef %cachedstores; |
| &setformulas($safeeval,%f); |
$sheet->{'f'} = \%f; |
| &setconstants($safeeval,%c); |
&setformulas($sheet); |
| |
&setconstants($sheet,\%c); |
| } |
} |
| |
|
| # --------------------------------------------------- Load data for one student |
# --------------------------------------------------- Load data for one student |
| # |
# |
| sub loadcourse { |
sub loadcourse { |
| my ($safeeval,$sheetdata,$r)=@_; |
my ($sheet,$r)=@_; |
| my %c=(); |
my %c=(); |
| my %f=&getformulas($safeeval); |
my %f=&getformulas($sheet); |
| my $total=0; |
my $total=0; |
| foreach (keys(%f)) { |
foreach (keys(%f)) { |
| if ($_=~/^A(\d+)/) { |
if ($_=~/^A(\d+)/) { |
|
Line 1867 ENDPOP
|
Line 1955 ENDPOP
|
| } |
} |
| } |
} |
| } |
} |
| &setformulas($safeeval,%f); |
$sheet->{'f'}=\%f; |
| &setconstants($safeeval,%c); |
&setformulas($sheet); |
| |
&setconstants($sheet,\%c); |
| $r->print('<script>popwin.close()</script>'); |
$r->print('<script>popwin.close()</script>'); |
| $r->rflush(); |
$r->rflush(); |
| } |
} |
|
Line 1876 ENDPOP
|
Line 1965 ENDPOP
|
| # ------------------------------------------------ Load data for one assessment |
# ------------------------------------------------ Load data for one assessment |
| # |
# |
| sub loadassessment { |
sub loadassessment { |
| my ($safeeval,$sheetdata)=@_; |
my ($sheet)=@_; |
| |
|
| my $uhome = $sheetdata->{'uhome'}; |
my $uhome = $sheet->{'uhome'}; |
| my $uname = $sheetdata->{'uname'}; |
my $uname = $sheet->{'uname'}; |
| my $udom = $sheetdata->{'udom'}; |
my $udom = $sheet->{'udom'}; |
| my $symb = $sheetdata->{'usymb'}; |
my $symb = $sheet->{'usymb'}; |
| my $cid = $sheetdata->{'cid'}; |
my $cid = $sheet->{'cid'}; |
| my $cnum = $sheetdata->{'cnum'}; |
my $cnum = $sheet->{'cnum'}; |
| my $cdom = $sheetdata->{'cdom'}; |
my $cdom = $sheet->{'cdom'}; |
| my $chome = $sheetdata->{'chome'}; |
my $chome = $sheet->{'chome'}; |
| |
|
| my $namespace; |
my $namespace; |
| unless ($namespace=$cid) { return ''; } |
unless ($namespace=$cid) { return ''; } |
|
Line 1970 sub loadassessment {
|
Line 2059 sub loadassessment {
|
| # |
# |
| my %c=(); |
my %c=(); |
| if (tie(%parmhash,'GDBM_File', |
if (tie(%parmhash,'GDBM_File', |
| $sheetdata->{'coursefilename'}.'_parms.db',&GDBM_READER(),0640)) { |
$sheet->{'coursefilename'}.'_parms.db',&GDBM_READER(),0640)) { |
| my %f=&getformulas($safeeval); |
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{$_},$safeeval,$sheetdata); |
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); |
| } |
} |
| &setconstants($safeeval,%c); |
&setconstants($sheet,\%c); |
| } |
} |
| |
|
| # --------------------------------------------------------- Various form fields |
# --------------------------------------------------------- Various form fields |
|
Line 2025 sub selectbox {
|
Line 2114 sub selectbox {
|
| # |
# |
| |
|
| sub updatesheet { |
sub updatesheet { |
| my ($safeeval,$sheetdata)=@_; |
my ($sheet)=@_; |
| my $stype=$sheetdata->{'sheettype'}; |
my $stype=$sheet->{'sheettype'}; |
| if ($stype eq 'classcalc') { |
if ($stype eq 'classcalc') { |
| return &updateclasssheet($safeeval,$sheetdata); |
return &updateclasssheet($sheet); |
| } else { |
} else { |
| return &updatestudentassesssheet($safeeval,$sheetdata); |
return &updatestudentassesssheet($sheet); |
| } |
} |
| } |
} |
| |
|
|
Line 2040 sub updatesheet {
|
Line 2129 sub updatesheet {
|
| # |
# |
| |
|
| sub loadrows { |
sub loadrows { |
| my ($safeeval,$sheetdata,$r)=@_; |
my ($sheet,$r)=@_; |
| my $stype=$sheetdata->{'sheettype'}; |
my $stype=$sheet->{'sheettype'}; |
| if ($stype eq 'classcalc') { |
if ($stype eq 'classcalc') { |
| &loadcourse($safeeval,$sheetdata,$r); |
&loadcourse($sheet,$r); |
| } elsif ($stype eq 'studentcalc') { |
} elsif ($stype eq 'studentcalc') { |
| &loadstudent($safeeval,$sheetdata); |
&loadstudent($sheet); |
| } else { |
} else { |
| &loadassessment($safeeval,$sheetdata); |
&loadassessment($sheet); |
| } |
} |
| } |
} |
| |
|
|
Line 2065 sub forcedrecalc {
|
Line 2154 sub forcedrecalc {
|
| if ($ENV{'form.forcerecalc'}) { return 1; } |
if ($ENV{'form.forcerecalc'}) { return 1; } |
| unless ($time) { return 1; } |
unless ($time) { return 1; } |
| if ($stype eq 'assesscalc') { |
if ($stype eq 'assesscalc') { |
| my $map=(split(/\_\_\_/,$usymb))[0]; |
my $map=(split(/___/,$usymb))[0]; |
| if (&checkthis('::assesscalc:',$time) || |
if (&checkthis('::assesscalc:',$time) || |
| &checkthis('::assesscalc:'.$map,$time) || |
&checkthis('::assesscalc:'.$map,$time) || |
| &checkthis('::assesscalc:'.$usymb,$time) || |
&checkthis('::assesscalc:'.$usymb,$time) || |
|
Line 2084 sub forcedrecalc {
|
Line 2173 sub forcedrecalc {
|
| } |
} |
| |
|
| # ============================================================== Export handler |
# ============================================================== Export handler |
| # |
|
| # Non-interactive call from with program |
|
| # |
|
| |
|
| sub exportsheet { |
sub exportsheet { |
| my ($uname,$udom,$stype,$usymb,$fn)=@_; |
my ($uname,$udom,$stype,$usymb,$fn)=@_; |
| my @exportarr=(); |
my @exportarr=(); |
| if (($usymb=~/^\_(\w+)/) && (!$fn)) { |
if (defined($usymb) && ($usymb=~/^\_(\w+)/) && (!$fn)) { |
| $fn='default_'.$1; |
$fn='default_'.$1; |
| } |
} |
| # |
# |
|
Line 2100 sub exportsheet {
|
Line 2185 sub exportsheet {
|
| my $key=$uname.':'.$udom.':'.$stype.':'.$usymb; |
my $key=$uname.':'.$udom.':'.$stype.':'.$usymb; |
| my $found=''; |
my $found=''; |
| if ($oldsheets{$key}) { |
if ($oldsheets{$key}) { |
| foreach (split(/\_\_\_\&\_\_\_/,$oldsheets{$key})) { |
foreach (split(/___&\___/,$oldsheets{$key})) { |
| my ($name,$value)=split(/\_\_\_\=\_\_\_/,$_); |
my ($name,$value)=split(/___=___/,$_); |
| if ($name eq $fn) { |
if ($name eq $fn) { |
| $found=$value; |
$found=$value; |
| } |
} |
|
Line 2110 sub exportsheet {
|
Line 2195 sub exportsheet {
|
| unless ($found) { |
unless ($found) { |
| &cachedssheets($uname,$udom,&Apache::lonnet::homeserver($uname,$udom)); |
&cachedssheets($uname,$udom,&Apache::lonnet::homeserver($uname,$udom)); |
| if ($oldsheets{$key}) { |
if ($oldsheets{$key}) { |
| foreach (split(/\_\_\_\&\_\_\_/,$oldsheets{$key})) { |
foreach (split(/___&\___/,$oldsheets{$key})) { |
| my ($name,$value)=split(/\_\_\_\=\_\_\_/,$_); |
my ($name,$value)=split(/___=___/,$_); |
| if ($name eq $fn) { |
if ($name eq $fn) { |
| $found=$value; |
$found=$value; |
| } |
} |
|
Line 2130 sub exportsheet {
|
Line 2215 sub exportsheet {
|
| # |
# |
| # Return what was cached |
# Return what was cached |
| # |
# |
| @exportarr=split(/\_\_\_\;\_\_\_/,$found); |
@exportarr=split(/___;___/,$found); |
| } else { |
return @exportarr; |
| # |
} |
| # Not cached |
# |
| # |
# Not cached |
| my ($thissheet,$sheetdata)=&makenewsheet($uname,$udom,$stype,$usymb); |
# |
| &readsheet($thissheet,$sheetdata,$fn); |
my ($sheet)=&makenewsheet($uname,$udom,$stype,$usymb); |
| &updatesheet($thissheet,$sheetdata); |
&readsheet($sheet,$fn); |
| &loadrows($thissheet,$sheetdata); |
&updatesheet($sheet); |
| &calcsheet($thissheet); |
&loadrows($sheet); |
| @exportarr=&exportdata($thissheet); |
&calcsheet($sheet); |
| # |
@exportarr=&exportdata($sheet); |
| # Store now |
# |
| # |
# Store now |
| my $cid=$ENV{'request.course.id'}; |
# |
| my $current=''; |
my $cid=$ENV{'request.course.id'}; |
| if ($stype eq 'studentcalc') { |
my $current=''; |
| $current=&Apache::lonnet::reply('get:'. |
if ($stype eq 'studentcalc') { |
| $ENV{'course.'.$cid.'.domain'}.':'. |
$current=&Apache::lonnet::reply('get:'. |
| $ENV{'course.'.$cid.'.num'}. |
$ENV{'course.'.$cid.'.domain'}.':'. |
| ':nohist_calculatedsheets:'. |
$ENV{'course.'.$cid.'.num'}. |
| &Apache::lonnet::escape($key), |
':nohist_calculatedsheets:'. |
| $ENV{'course.'.$cid.'.home'}); |
&Apache::lonnet::escape($key), |
| } else { |
$ENV{'course.'.$cid.'.home'}); |
| $current=&Apache::lonnet::reply('get:'.$sheetdata->{'udom'}.':'. |
} else { |
| $sheetdata->{'uname'}. |
$current=&Apache::lonnet::reply('get:'.$sheet->{'udom'}.':'. |
| ':nohist_calculatedsheets_'. |
$sheet->{'uname'}. |
| $ENV{'request.course.id'}.':'. |
':nohist_calculatedsheets_'. |
| &Apache::lonnet::escape($key), |
$ENV{'request.course.id'}.':'. |
| $sheetdata->{'uhome'}); |
&Apache::lonnet::escape($key), |
| } |
$sheet->{'uhome'}); |
| my %currentlystored=(); |
} |
| unless ($current=~/^error\:/) { |
my %currentlystored=(); |
| foreach (split(/___&\___/,&Apache::lonnet::unescape($current))) { |
unless ($current=~/^error\:/) { |
| my ($name,$value)=split(/___=___/,$_); |
foreach (split(/___&\___/,&Apache::lonnet::unescape($current))) { |
| $currentlystored{$name}=$value; |
my ($name,$value)=split(/___=___/,$_); |
| } |
$currentlystored{$name}=$value; |
| } |
} |
| $currentlystored{$fn}=join('___;___',@exportarr); |
} |
| # |
$currentlystored{$fn}=join('___;___',@exportarr); |
| my $newstore=''; |
# |
| foreach (keys(%currentlystored)) { |
my $newstore=''; |
| if ($newstore) { $newstore.='___&___'; } |
foreach (keys(%currentlystored)) { |
| $newstore.=$_.'___=___'.$currentlystored{$_}; |
if ($newstore) { $newstore.='___&___'; } |
| } |
$newstore.=$_.'___=___'.$currentlystored{$_}; |
| my $now=time; |
} |
| if ($stype eq 'studentcalc') { |
my $now=time; |
| &Apache::lonnet::reply('put:'. |
if ($stype eq 'studentcalc') { |
| $ENV{'course.'.$cid.'.domain'}.':'. |
&Apache::lonnet::put('nohist_calculatedsheets', |
| $ENV{'course.'.$cid.'.num'}. |
{ $key => $newstore, |
| ':nohist_calculatedsheets:'. |
$key.time => $now }, |
| &Apache::lonnet::escape($key).'='. |
$ENV{'course.'.$cid.'.domain'}, |
| &Apache::lonnet::escape($newstore).'&'. |
$ENV{'course.'.$cid.'.num'}) |
| &Apache::lonnet::escape($key).'.time='.$now, |
} else { |
| $ENV{'course.'.$cid.'.home'}); |
&Apache::lonnet::put('nohist_calculatedsheets_'.$sheet->{'cid'}, |
| } else { |
{ $key => $newstore, |
| &Apache::lonnet::reply('put:'. |
$key.time => $now }, |
| $sheetdata->{'udom'}.':'. |
$sheet->{'udom'}, |
| $sheetdata->{'uname'}. |
$sheet->{'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; |
return @exportarr; |
| } |
} |
|
Line 2386 ENDSCRIPT
|
Line 2464 ENDSCRIPT
|
| } |
} |
| # Read new sheet or modified worksheet |
# Read new sheet or modified worksheet |
| $r->uri=~/\/(\w+)$/; |
$r->uri=~/\/(\w+)$/; |
| my ($sheet,$sheetdata)=&makenewsheet($aname,$adom,$1,$ENV{'form.usymb'}); |
my ($sheet)=&makenewsheet($aname,$adom,$1,$ENV{'form.usymb'}); |
| # |
# |
| # If a new formula had been entered, go from work copy |
# If a new formula had been entered, go from work copy |
| if ($ENV{'form.unewfield'}) { |
if ($ENV{'form.unewfield'}) { |
|
Line 2394 ENDSCRIPT
|
Line 2472 ENDSCRIPT
|
| $ENV{'form.unewformula'}=~s/\'/\"/g; |
$ENV{'form.unewformula'}=~s/\'/\"/g; |
| $r->print('<p>New formula: '.$ENV{'form.unewfield'}.'='. |
$r->print('<p>New formula: '.$ENV{'form.unewfield'}.'='. |
| $ENV{'form.unewformula'}.'<p>'); |
$ENV{'form.unewformula'}.'<p>'); |
| $sheetdata->{'filename'} = $ENV{'form.ufn'}; |
$sheet->{'filename'} = $ENV{'form.ufn'}; |
| &tmpread($sheet,$sheetdata, |
&tmpread($sheet,$ENV{'form.unewfield'},$ENV{'form.unewformula'}); |
| $ENV{'form.unewfield'},$ENV{'form.unewformula'}); |
|
| } elsif ($ENV{'form.saveas'}) { |
} elsif ($ENV{'form.saveas'}) { |
| $sheetdata->{'filename'} = $ENV{'form.ufn'}; |
$sheet->{'filename'} = $ENV{'form.ufn'}; |
| &tmpread($sheet,$sheetdata); |
&tmpread($sheet); |
| } else { |
} else { |
| &readsheet($sheet,$sheetdata,$ENV{'form.ufn'}); |
&readsheet($sheet,$ENV{'form.ufn'}); |
| } |
} |
| # Print out user information |
# Print out user information |
| unless ($sheetdata->{'sheettype'} eq 'classcalc') { |
if ($sheet->{'sheettype'} ne 'classcalc') { |
| $r->print('<p><b>User:</b> '.$sheetdata->{'uname'}. |
$r->print('<p><b>User:</b> '.$sheet->{'uname'}. |
| '<br><b>Domain:</b> '.$sheetdata->{'udom'}); |
'<br><b>Domain:</b> '.$sheet->{'udom'}); |
| $r->print('<br><b>Section/Group:</b> '.$sheetdata->{'csec'}); |
$r->print('<br><b>Section/Group:</b> '.$sheet->{'csec'}); |
| if ($ENV{'form.usymb'}) { |
if ($ENV{'form.usymb'}) { |
| $r->print('<br><b>Assessment:</b> <tt>'. |
$r->print('<br><b>Assessment:</b> <tt>'. |
| $ENV{'form.usymb'}.'</tt>'); |
$ENV{'form.usymb'}.'</tt>'); |
|
Line 2415 ENDSCRIPT
|
Line 2492 ENDSCRIPT
|
| } |
} |
| # |
# |
| # Check user permissions |
# Check user permissions |
| if (($sheetdata->{'sheettype'} eq 'classcalc' ) || |
if (($sheet->{'sheettype'} eq 'classcalc' ) || |
| ($sheetdata->{'uname'} ne $ENV{'user.name'} ) || |
($sheet->{'uname'} ne $ENV{'user.name'} ) || |
| ($sheetdata->{'udom'} ne $ENV{'user.domain'})) { |
($sheet->{'udom'} ne $ENV{'user.domain'})) { |
| unless (&Apache::lonnet::allowed('vgr',$sheetdata->{'cid'})) { |
unless (&Apache::lonnet::allowed('vgr',$sheet->{'cid'})) { |
| $r->print('<h1>Access Permission Denied</h1>'. |
$r->print('<h1>Access Permission Denied</h1>'. |
| '</form></body></html>'); |
'</form></body></html>'); |
| return OK; |
return OK; |
|
Line 2428 ENDSCRIPT
|
Line 2505 ENDSCRIPT
|
| $r->print('<br />'. |
$r->print('<br />'. |
| '<input type="submit" name="forcerecalc" '. |
'<input type="submit" name="forcerecalc" '. |
| 'value="Completely Recalculate Sheet"><p>'); |
'value="Completely Recalculate Sheet"><p>'); |
| if ($sheetdata->{'sheettype'} eq 'assesscalc') { |
if ($sheet->{'sheettype'} eq 'assesscalc') { |
| $r->print('<p><font size=+2>'. |
$r->print('<p><font size=+2>'. |
| '<a href="/adm/studentcalc?'. |
'<a href="/adm/studentcalc?'. |
| 'uname='.$sheetdata->{'uname'}. |
'uname='.$sheet->{'uname'}. |
| '&udom='.$sheetdata->{'udom'}.'">'. |
'&udom='.$sheet->{'udom'}.'">'. |
| 'Level up: Student Sheet</a></font><p>'); |
'Level up: Student Sheet</a></font><p>'); |
| } |
} |
| if (($sheetdata->{'sheettype'} eq 'studentcalc') && |
if (($sheet->{'sheettype'} eq 'studentcalc') && |
| (&Apache::lonnet::allowed('vgr',$sheetdata->{'cid'}))) { |
(&Apache::lonnet::allowed('vgr',$sheet->{'cid'}))) { |
| $r->print ('<p><font size=+2><a href="/adm/classcalc">'. |
$r->print ('<p><font size=+2><a href="/adm/classcalc">'. |
| 'Level up: Course Sheet</a></font><p>'); |
'Level up: Course Sheet</a></font><p>'); |
| } |
} |
|
Line 2449 ENDSCRIPT
|
Line 2526 ENDSCRIPT
|
| '<input type=text size=20 name=newfn value="'.$fname.'">'. |
'<input type=text size=20 name=newfn value="'.$fname.'">'. |
| 'make default: <input type=checkbox name="makedefufn"><p>'); |
'make default: <input type=checkbox name="makedefufn"><p>'); |
| } |
} |
| $r->print(&hiddenfield('ufn',$sheetdata->{'filename'})); |
$r->print(&hiddenfield('ufn',$sheet->{'filename'})); |
| # Load dialog |
# Load dialog |
| if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) { |
if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) { |
| $r->print('<p><input type=submit name=load value="Load ...">'. |
$r->print('<p><input type=submit name=load value="Load ...">'. |
| '<select name="loadthissheet">'. |
'<select name="loadthissheet">'. |
| '<option name="default">Default</option>'); |
'<option name="default">Default</option>'); |
| foreach (&othersheets($sheet,$sheetdata->{'sheettype'},$sheetdata)) { |
foreach (&othersheets($sheet)) { |
| $r->print('<option name="'.$_.'"'); |
$r->print('<option name="'.$_.'"'); |
| if ($ENV{'form.ufn'} eq $_) { |
if ($ENV{'form.ufn'} eq $_) { |
| $r->print(' selected'); |
$r->print(' selected'); |
|
Line 2463 ENDSCRIPT
|
Line 2540 ENDSCRIPT
|
| $r->print('>'.$_.'</option>'); |
$r->print('>'.$_.'</option>'); |
| } |
} |
| $r->print('</select><p>'); |
$r->print('</select><p>'); |
| if ($sheetdata->{'sheettype'} eq 'studentcalc') { |
if ($sheet->{'sheettype'} eq 'studentcalc') { |
| &setothersheets($sheet, |
&setothersheets($sheet, |
| &othersheets($sheet,'assesscalc',$sheetdata)); |
&othersheets($sheet,'assesscalc')); |
| } |
} |
| } |
} |
| # Cached sheets |
# Cached sheets |
| &expirationdates(); |
&expirationdates(); |
| undef %oldsheets; |
undef %oldsheets; |
| undef %loadedcaches; |
undef %loadedcaches; |
| if ($sheetdata->{'sheettype'} eq 'classcalc') { |
if ($sheet->{'sheettype'} eq 'classcalc') { |
| $r->print("Loading previously calculated student sheets ...\n"); |
$r->print("Loading previously calculated student sheets ...\n"); |
| $r->rflush(); |
$r->rflush(); |
| &cachedcsheets(); |
&cachedcsheets(); |
| } elsif ($sheetdata->{'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($sheetdata->{'uname'},$sheetdata->{'udom'}, |
&cachedssheets($sheet->{'uname'},$sheet->{'udom'},$sheet->{'uhome'}); |
| $sheetdata->{'uhome'}); |
|
| } |
} |
| # 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"); |
| $r->rflush(); |
$r->rflush(); |
| # |
# |
| &updatesheet($sheet,$sheetdata); |
&updatesheet($sheet); |
| $r->print("Updated rows, loading row data ...\n"); |
$r->print("Updated rows, loading row data ...\n"); |
| $r->rflush(); |
$r->rflush(); |
| # |
# |
| &loadrows($sheet,$sheetdata,$r); |
&loadrows($sheet,$r); |
| $r->print("Loaded row data, calculating sheet ...<br>\n"); |
$r->print("Loaded row data, calculating sheet ...<br>\n"); |
| $r->rflush(); |
$r->rflush(); |
| # |
# |
|
Line 2502 ENDSCRIPT
|
Line 2578 ENDSCRIPT
|
| if ($ENV{'form.saveas'} && ($fname=$ENV{'form.newfn'})) { |
if ($ENV{'form.saveas'} && ($fname=$ENV{'form.newfn'})) { |
| $fname=~s/\W/\_/g; |
$fname=~s/\W/\_/g; |
| if ($fname eq 'default') { $fname='course_default'; } |
if ($fname eq 'default') { $fname='course_default'; } |
| $fname.='_'.$sheetdata->{'sheettype'}; |
$fname.='_'.$sheet->{'sheettype'}; |
| $sheetdata->{'filename'} = $fname; |
$sheet->{'filename'} = $fname; |
| $ENV{'form.ufn'}=$fname; |
$ENV{'form.ufn'}=$fname; |
| $r->print('<p>Saving spreadsheet: '. |
$r->print('<p>Saving spreadsheet: '. |
| &writesheet($sheet,$ENV{'form.makedefufn'},$sheetdata). |
&writesheet($sheet,$ENV{'form.makedefufn'}). |
| '<p>'); |
'<p>'); |
| } |
} |
| } |
} |
| # |
# |
| # Write the modified worksheet |
# Write the modified worksheet |
| $r->print('<b>Current sheet:</b> '.$sheetdata->{'filename'}.'<p>'); |
$r->print('<b>Current sheet:</b> '.$sheet->{'filename'}.'<p>'); |
| &tmpwrite($sheet,$sheetdata); |
&tmpwrite($sheet); |
| if ($sheetdata->{'sheettype'} eq 'studentcalc') { |
if ($sheet->{'sheettype'} eq 'studentcalc') { |
| $r->print('<br>Show rows with empty A column: '); |
$r->print('<br>Show rows with empty A column: '); |
| } else { |
} else { |
| $r->print('<br>Show empty rows: '); |
$r->print('<br>Show empty rows: '); |
| } |
} |
| # |
# |
| $r->print(&hiddenfield('userselhidden','true'). |
$r->print(&hiddenfield('userselhidden','true'). |
| '<input type="checkbox" name="showall" onClick="submit()"'); |
'<input type="checkbox" name="showall" onClick="submit()"'); |
|
Line 2537 ENDSCRIPT
|
Line 2613 ENDSCRIPT
|
| $r->print('>'); |
$r->print('>'); |
| # |
# |
| # CSV format checkbox (classcalc sheets only) |
# CSV format checkbox (classcalc sheets only) |
| if ($sheetdata->{'sheettype'} eq 'classcalc') { |
$r->print(' Output CSV format: <input type="checkbox" '. |
| $r->print(' Output CSV format: <input type="checkbox" '. |
'name="showcsv" onClick="submit()"'); |
| 'name="showcsv" onClick="submit()"'); |
$r->print(' checked') if ($ENV{'form.showcsv'}); |
| if ($ENV{'form.showcsv'}) { $r->print(' checked'); } |
$r->print('>'); |
| $r->print('>'); |
if ($sheet->{'sheettype'} eq 'classcalc') { |
| |
$r->print(' Student Status: '. |
| |
&Apache::lonhtmlcommon::StatusOptions |
| |
($ENV{'form.Status'},'sheet')); |
| } |
} |
| # |
# |
| # Buttons to insert rows |
# Buttons to insert rows |
| $r->print(' Student Status: '. |
|
| &Apache::lonhtmlcommon::StatusOptions |
|
| ($ENV{'form.Status'},'sheet')); |
|
| $r->print(<<ENDINSERTBUTTONS); |
$r->print(<<ENDINSERTBUTTONS); |
| <br> |
<br> |
| <input type='button' onClick='insertrow("top");' |
<input type='button' onClick='insertrow("top");' |
|
Line 2556 value='Insert Row Top'>
|
Line 2632 value='Insert Row Top'>
|
| value='Insert Row Bottom'><br> |
value='Insert Row Bottom'><br> |
| ENDINSERTBUTTONS |
ENDINSERTBUTTONS |
| # Print out sheet |
# Print out sheet |
| &outsheet($r,$sheet,$sheetdata); |
&outsheet($r,$sheet); |
| $r->print('</form></body></html>'); |
$r->print('</form></body></html>'); |
| # Done |
# Done |
| return OK; |
return OK; |
|
Line 2564 ENDINSERTBUTTONS
|
Line 2640 ENDINSERTBUTTONS
|
| |
|
| 1; |
1; |
| __END__ |
__END__ |
| |
|
| |
|
| |
|
| |
|
![[BACK]](/icons/back.gif){kind=icon}
Return to lonspreadsheet.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / interface