version 1.142, 2002/11/19 19:20:50
|
version 1.152, 2002/12/02 21:22:39
|
Line 62 use Safe;
|
Line 62 use Safe;
|
use Safe::Hole; |
use Safe::Hole; |
use Opcode; |
use Opcode; |
use GDBM_File; |
use GDBM_File; |
|
use HTML::Entities(); |
use HTML::TokeParser; |
use HTML::TokeParser; |
use Spreadsheet::WriteExcel; |
use Spreadsheet::WriteExcel; |
|
|
Line 965 sub templaterow {
|
Line 966 sub templaterow {
|
'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=$sheet->{'f'}->{'template_'.$_}; |
|
$fm=~s/[\'\"]/\&\#34;/g; |
|
push(@cols,{ name => 'template_'.$_, |
push(@cols,{ name => 'template_'.$_, |
formula => $fm, |
formula => $sheet->{'f'}->{'template_'.$_}, |
value => $fm }); |
value => $sheet->{'f'}->{'template_'.$_} }); |
} |
} |
return ($rowlabel,@cols); |
return ($rowlabel,@cols); |
} |
} |
Line 993 sub outrowassess {
|
Line 992 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=$sheet->{'f'}->{$_.$n}; |
|
$fm=~s/[\'\"]/\&\#34;/g; |
|
push(@cols,{ name => $_.$n, |
push(@cols,{ name => $_.$n, |
formula => $fm, |
formula => $sheet->{'f'}->{$_.$n}, |
value => $sheet->{'values'}->{$_.$n}}); |
value => $sheet->{'values'}->{$_.$n}}); |
} |
} |
return ($rowlabel,@cols); |
return ($rowlabel,@cols); |
Line 1019 sub outrow {
|
Line 1016 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=$sheet->{'f'}->{$_.$n}; |
|
$fm=~s/[\'\"]/\&\#34;/g; |
|
push(@cols,{ name => $_.$n, |
push(@cols,{ name => $_.$n, |
formula => $fm, |
formula => $sheet->{'f'}->{$_.$n}, |
value => $sheet->{'values'}->{$_.$n}}); |
value => $sheet->{'values'}->{$_.$n}}); |
} |
} |
return ($rowlabel,@cols); |
return ($rowlabel,@cols); |
Line 1149 sub exportdata {
|
Line 1144 sub exportdata {
|
|
|
|
|
sub update_student_sheet{ |
sub update_student_sheet{ |
my ($sheet,$c) = @_; |
my ($sheet,$r,$c) = @_; |
# Load in the studentcalc sheet |
# Load in the studentcalc sheet |
&readsheet($sheet,'default_studentcalc'); |
&readsheet($sheet,'default_studentcalc'); |
# Determine the structure (contained assessments, etc) of the sheet |
# Determine the structure (contained assessments, etc) of the sheet |
Line 1157 sub update_student_sheet{
|
Line 1152 sub update_student_sheet{
|
# Load in the cached sheets for this student |
# Load in the cached sheets for this student |
&cachedssheets($sheet); |
&cachedssheets($sheet); |
# Load in the (possibly cached) data from the assessment sheets |
# Load in the (possibly cached) data from the assessment sheets |
&loadstudent($sheet,$c); |
&loadstudent($sheet,$r,$c); |
# Compute the sheet |
# Compute the sheet |
&calcsheet($sheet); |
&calcsheet($sheet); |
} |
} |
Line 1189 sub sort_indicies {
|
Line 1184 sub sort_indicies {
|
my @sortidx=(); |
my @sortidx=(); |
# |
# |
if ($sheet->{'sheettype'} eq 'classcalc') { |
if ($sheet->{'sheettype'} eq 'classcalc') { |
my @sortby=(); |
my @sortby=(undef); |
# Skip row 0 |
# Skip row 0 |
for (my $row=1;$row<=$sheet->{'maxrow'};$row++) { |
for (my $row=1;$row<=$sheet->{'maxrow'};$row++) { |
my (undef,$sname,$sdom,$fullname,$section,$id) = |
my (undef,$sname,$sdom,$fullname,$section,$id) = |
Line 1199 sub sort_indicies {
|
Line 1194 sub sort_indicies {
|
} |
} |
@sortidx = sort { $sortby[$a] cmp $sortby[$b]; } @sortidx; |
@sortidx = sort { $sortby[$a] cmp $sortby[$b]; } @sortidx; |
} elsif ($sheet->{'sheettype'} eq 'studentcalc') { |
} elsif ($sheet->{'sheettype'} eq 'studentcalc') { |
my @sortby=(); |
my @sortby1=(undef); |
|
my @sortby2=(undef); |
# Skip row 0 |
# Skip row 0 |
&Apache::lonnet::logthis('starting sort for studentcalc'); |
|
for (my $row=1;$row<=$sheet->{'maxrow'};$row++) { |
for (my $row=1;$row<=$sheet->{'maxrow'};$row++) { |
my (undef,$symb,$uname,$udom,$mapid,$resid,$title) = |
my (undef,$symb,$uname,$udom,$mapid,$resid,$title) = |
split(':',$sheet->{'rowlabel'}->{$sheet->{'f'}->{'A'.$row}}); |
split(':',$sheet->{'rowlabel'}->{$sheet->{'f'}->{'A'.$row}}); |
Line 1210 sub sort_indicies {
|
Line 1205 sub sort_indicies {
|
if ($sequence eq '') { |
if ($sequence eq '') { |
$sequence = $symb; |
$sequence = $symb; |
} |
} |
push (@sortby, $sequence); |
push (@sortby1, $sequence); |
|
push (@sortby2, $title); |
push (@sortidx, $row); |
push (@sortidx, $row); |
} |
} |
@sortidx = sort { $sortby[$a] cmp $sortby[$b]; } @sortidx; |
@sortidx = sort { $sortby1[$a] cmp $sortby1[$b] || |
|
$sortby2[$a] cmp $sortby2[$b] } @sortidx; |
} else { |
} else { |
my @sortby=(); |
my @sortby=(undef); |
# Skip row 0 |
# Skip row 0 |
for (my $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.'"}')); |
Line 1251 sub html_editable_cell {
|
Line 1248 sub html_editable_cell {
|
if ($formula ne '') { |
if ($formula ne '') { |
$value = '<i>undefined value</i>'; |
$value = '<i>undefined value</i>'; |
} |
} |
} |
} elsif ($value =~ /^\s*$/ ) { |
if ($value =~ /^\s*$/ ) { |
|
$value = '<font color="'.$bgcolor.'">#</font>'; |
$value = '<font color="'.$bgcolor.'">#</font>'; |
|
} else { |
|
$value = &HTML::Entities::encode($value); |
} |
} |
|
# Make the formula safe for outputting |
|
$formula =~ s/\'/\"/g; |
|
# The formula will be parsed by the browser *twice* before being |
|
# displayed to the user for editing. |
|
$formula = &HTML::Entities::encode(&HTML::Entities::encode($formula)); |
|
# Escape newlines so they make it into the edit window |
$formula =~ s/\n/\\n/gs; |
$formula =~ s/\n/\\n/gs; |
$result .= '<a href="javascript:celledit(\''. |
# Glue everything together |
$name.'\',\''.$formula.'\');">'.$value.'</a>'; |
$result .= "<a href=\"javascript:celledit(\'". |
|
$name."','".$formula."');\">".$value."</a>"; |
return $result; |
return $result; |
} |
} |
|
|
sub html_uneditable_cell { |
sub html_uneditable_cell { |
my ($cell,$bgcolor) = @_; |
my ($cell,$bgcolor) = @_; |
my $value = (defined($cell) ? $cell->{'value'} : ''); |
my $value = (defined($cell) ? $cell->{'value'} : ''); |
|
$value = &HTML::Entities::encode($value); |
return ' '.$value.' '; |
return ' '.$value.' '; |
} |
} |
|
|
Line 1315 END
|
Line 1321 END
|
# Print out template row |
# Print out template row |
#################################### |
#################################### |
my ($rowlabel,@rowdata) = &get_row($sheet,'-'); |
my ($rowlabel,@rowdata) = &get_row($sheet,'-'); |
my $row_html = '<tr><td>'.&format_html_rowlabel($rowlabel).'</td>'; |
my $row_html = '<tr><td>'.&format_html_rowlabel($sheet,$rowlabel).'</td>'; |
my $num_cols_output = 0; |
my $num_cols_output = 0; |
foreach my $cell (@rowdata) { |
foreach my $cell (@rowdata) { |
if ($num_cols_output++ < $num_uneditable) { |
if ($num_cols_output++ < $num_uneditable) { |
Line 1332 END
|
Line 1338 END
|
#################################### |
#################################### |
# Print out summary/export row |
# Print out summary/export row |
#################################### |
#################################### |
my ($rowlabel,@rowdata) = &get_row($sheet,'0'); |
($rowlabel,@rowdata) = &get_row($sheet,'0'); |
$row_html = '<tr><td>'.&format_html_rowlabel($rowlabel).'</td>'; |
$row_html = '<tr><td>'.&format_html_rowlabel($sheet,$rowlabel).'</td>'; |
$num_cols_output = 0; |
$num_cols_output = 0; |
foreach my $cell (@rowdata) { |
foreach my $cell (@rowdata) { |
if ($num_cols_output++ < 26) { |
if ($num_cols_output++ < 26) { |
Line 1361 END
|
Line 1367 END
|
next if (($sheet->{'sheettype'} eq 'assesscalc') && |
next if (($sheet->{'sheettype'} eq 'assesscalc') && |
(! $ENV{'form.showall'}) && |
(! $ENV{'form.showall'}) && |
($rowdata[0]->{'value'} =~ /^\s*$/)); |
($rowdata[0]->{'value'} =~ /^\s*$/)); |
if ($sheet->{'sheettype'} =~ /^(studentcalc|classcalc)$/) { |
if (! $ENV{'form.showall'} && |
|
$sheet->{'sheettype'} =~ /^(studentcalc|classcalc)$/) { |
my $row_is_empty = 1; |
my $row_is_empty = 1; |
foreach my $cell (@rowdata) { |
foreach my $cell (@rowdata) { |
if ($cell->{'value'} !~ /^\s*$/) { |
if ($cell->{'value'} !~ /^\s*$/) { |
Line 1369 END
|
Line 1376 END
|
last; |
last; |
} |
} |
} |
} |
next if $row_is_empty; |
next if ($row_is_empty); |
} |
} |
# |
# |
my $defaultbg='#E0FF'; |
my $defaultbg='#E0FF'; |
Line 1378 END
|
Line 1385 END
|
'</font></b></td>'; |
'</font></b></td>'; |
# |
# |
if ($sheet->{'sheettype'} eq 'classcalc') { |
if ($sheet->{'sheettype'} eq 'classcalc') { |
$row_html.='<td>'.&format_html_rowlabel($rowlabel).'</td>'; |
$row_html.='<td>'.&format_html_rowlabel($sheet,$rowlabel).'</td>'; |
# Output links for each student? |
# Output links for each student? |
# Nope, that is already done for us in format_html_rowlabel (for now) |
# Nope, that is already done for us in format_html_rowlabel (for now) |
} elsif ($sheet->{'sheettype'} eq 'studentcalc') { |
} elsif ($sheet->{'sheettype'} eq 'studentcalc') { |
$row_html.='<td>'.&format_html_rowlabel($rowlabel); |
$row_html.='<td>'.&format_html_rowlabel($sheet,$rowlabel); |
$row_html.= '<br>'. |
$row_html.= '<br>'. |
'<select name="sel_'.$rownum.'" '. |
'<select name="sel_'.$rownum.'" '. |
'onChange="changesheet('.$rownum.')">'. |
'onChange="changesheet('.$rownum.')">'. |
Line 1396 END
|
Line 1403 END
|
} |
} |
$row_html.='</select></td>'; |
$row_html.='</select></td>'; |
} elsif ($sheet->{'sheettype'} eq 'assesscalc') { |
} elsif ($sheet->{'sheettype'} eq 'assesscalc') { |
$row_html.='<td>'.&format_html_rowlabel($rowlabel).'</td>'; |
$row_html.='<td>'.&format_html_rowlabel($sheet,$rowlabel).'</td>'; |
} |
} |
# |
# |
my $shown_cells = 0; |
my $shown_cells = 0; |
Line 1466 sub outsheet_csv {
|
Line 1473 sub outsheet_csv {
|
foreach my $rownum (@Rows) { |
foreach my $rownum (@Rows) { |
my ($rowlabel,@rowdata) = &get_row($sheet,$rownum); |
my ($rowlabel,@rowdata) = &get_row($sheet,$rownum); |
next if ($rowlabel =~ /^\s*$/); |
next if ($rowlabel =~ /^\s*$/); |
push (@Values,&format_csv_rowlabel($rowlabel)); |
push (@Values,&format_csv_rowlabel($sheet,$rowlabel)); |
foreach my $cell (@rowdata) { |
foreach my $cell (@rowdata) { |
push (@Values,'"'.$cell->{'value'}.'"'); |
push (@Values,'"'.$cell->{'value'}.'"'); |
} |
} |
Line 1527 A link to the spreadsheet will be availa
|
Line 1534 A link to the spreadsheet will be availa
|
END |
END |
$r->rflush(); |
$r->rflush(); |
my $starttime = time; |
my $starttime = time; |
foreach (keys(%f)) { |
foreach my $rownum (&sort_indicies($sheet)) { |
next if ($_!~/^A(\d+)/ || $1 == 0 || ($f{$_}=~/^[!~-]/)); |
|
$count++; |
$count++; |
my ($sname,$sdom) = split(':',$f{$_}); |
my ($sname,$sdom) = split(':',$f{'A'.$rownum}); |
my $student_excel_worksheet=$workbook->addworksheet($sname.'@'.$sdom); |
my $student_excel_worksheet=$workbook->addworksheet($sname.'@'.$sdom); |
# Create a new spreadsheet |
# Create a new spreadsheet |
my $studentsheet = &makenewsheet($sname,$sdom,'studentcalc',undef); |
my $studentsheet = &makenewsheet($sname,$sdom,'studentcalc',undef); |
# Read in the spreadsheet definition |
# Read in the spreadsheet definition |
&update_student_sheet($studentsheet,$c); |
&update_student_sheet($studentsheet,$r,$c); |
# Stuff the sheet into excel |
# Stuff the sheet into excel |
&export_sheet_as_excel($studentsheet,$student_excel_worksheet); |
&export_sheet_as_excel($studentsheet,$student_excel_worksheet); |
my $totaltime = int((time - $starttime) / $count * $sheet->{'maxrow'}); |
my $totaltime = int((time - $starttime) / $count * $sheet->{'maxrow'}); |
Line 1636 sub export_sheet_as_excel {
|
Line 1642 sub export_sheet_as_excel {
|
# Write the summary/export row # |
# Write the summary/export row # |
#################################### |
#################################### |
my ($rowlabel,@rowdata) = &get_row($sheet,'0'); |
my ($rowlabel,@rowdata) = &get_row($sheet,'0'); |
my $label = &format_excel_rowlabel($rowlabel); |
my $label = &format_excel_rowlabel($sheet,$rowlabel); |
$cols_output = 0; |
$cols_output = 0; |
$worksheet->write($rows_output,$cols_output++,$label); |
$worksheet->write($rows_output,$cols_output++,$label); |
foreach my $cell (@rowdata) { |
foreach my $cell (@rowdata) { |
Line 1651 sub export_sheet_as_excel {
|
Line 1657 sub export_sheet_as_excel {
|
# Loop through the rows and output them one at a time |
# Loop through the rows and output them one at a time |
foreach my $rownum (@Rows) { |
foreach my $rownum (@Rows) { |
my ($rowlabel,@rowdata) = &get_row($sheet,$rownum); |
my ($rowlabel,@rowdata) = &get_row($sheet,$rownum); |
next if ($rowlabel =~ /^\s*$/); |
next if ($rowlabel =~ /^[\s]*$/); |
$cols_output = 0; |
$cols_output = 0; |
my $label = &format_excel_rowlabel($rowlabel); |
my $label = &format_excel_rowlabel($sheet,$rowlabel); |
|
if ( ! $ENV{'form.showall'} && |
|
$sheet->{'sheettype'} =~ /^(studentcalc|classcalc)$/) { |
|
my $row_is_empty = 1; |
|
foreach my $cell (@rowdata) { |
|
if ($cell->{'value'} !~ /^\s*$/) { |
|
$row_is_empty = 0; |
|
last; |
|
} |
|
} |
|
next if ($row_is_empty); |
|
} |
$worksheet->write($rows_output,$cols_output++,$label); |
$worksheet->write($rows_output,$cols_output++,$label); |
if (ref($label)) { |
if (ref($label)) { |
$cols_output = (scalar(@$label)); |
$cols_output = (scalar(@$label)); |
Line 1680 sub outsheet_xml {
|
Line 1697 sub outsheet_xml {
|
## Outsheet - calls other outsheet_* functions |
## Outsheet - calls other outsheet_* functions |
## |
## |
sub outsheet { |
sub outsheet { |
my ($r,$sheet)=@_; |
my ($sheet,$r)=@_; |
if (! exists($ENV{'form.output'})) { |
if (! exists($ENV{'form.output'})) { |
$ENV{'form.output'} = 'HTML'; |
$ENV{'form.output'} = 'HTML'; |
} |
} |
Line 2039 sub parmval {
|
Line 2056 sub parmval {
|
## Row label formatting routines ## |
## Row label formatting routines ## |
################################################################## |
################################################################## |
sub format_html_rowlabel { |
sub format_html_rowlabel { |
|
my $sheet = shift; |
my $rowlabel = shift; |
my $rowlabel = shift; |
return '' if ($rowlabel eq ''); |
return '' if ($rowlabel eq ''); |
my ($type,$labeldata) = split(':',$rowlabel,2); |
my ($type,$labeldata) = split(':',$rowlabel,2); |
my $result = ''; |
my $result = ''; |
if ($type eq 'symb') { |
if ($type eq 'symb') { |
my ($symb,$uname,$udom,$mapid,$resid,$title) = split(':',$labeldata); |
my ($symb,$mapid,$resid,$title) = split(':',$labeldata); |
$symb = &Apache::lonnet::unescape($symb); |
$symb = &Apache::lonnet::unescape($symb); |
$result = '<a href="/adm/assesscalc?usymb='.$symb. |
$result = '<a href="/adm/assesscalc?usymb='.$symb. |
'&uname='.$uname.'&udom='.$udom. |
'&uname='.$sheet->{'uname'}.'&udom='.$sheet->{'udom'}. |
'&mapid='.$mapid.'&resid='.$resid.'">'.$title.'</a>'; |
'&mapid='.$mapid.'&resid='.$resid.'">'.$title.'</a>'; |
} elsif ($type eq 'student') { |
} elsif ($type eq 'student') { |
my ($sname,$sdom,$fullname,$section,$id) = split(':',$labeldata); |
my ($sname,$sdom,$fullname,$section,$id) = split(':',$labeldata); |
|
if ($fullname =~ /^\s*$/) { |
|
$fullname = $sname.'@'.$sdom; |
|
} |
$result ='<a href="/adm/studentcalc?uname='.$sname. |
$result ='<a href="/adm/studentcalc?uname='.$sname. |
'&udom='.$sdom.'">'; |
'&udom='.$sdom.'">'; |
$result.=$section.' '.$id." ".$fullname.'</a>'; |
$result.=$section.' '.$id." ".$fullname.'</a>'; |
Line 2063 sub format_html_rowlabel {
|
Line 2084 sub format_html_rowlabel {
|
} |
} |
|
|
sub format_csv_rowlabel { |
sub format_csv_rowlabel { |
|
my $sheet = shift; |
my $rowlabel = shift; |
my $rowlabel = shift; |
return '' if ($rowlabel eq ''); |
return '' if ($rowlabel eq ''); |
my ($type,$labeldata) = split(':',$rowlabel,2); |
my ($type,$labeldata) = split(':',$rowlabel,2); |
my $result = ''; |
my $result = ''; |
if ($type eq 'symb') { |
if ($type eq 'symb') { |
my ($symb,$uname,$udom,$mapid,$resid,$title) = split(':',$labeldata); |
my ($symb,$mapid,$resid,$title) = split(':',$labeldata); |
$symb = &Apache::lonnet::unescape($symb); |
$symb = &Apache::lonnet::unescape($symb); |
$result = $title; |
$result = $title; |
} elsif ($type eq 'student') { |
} elsif ($type eq 'student') { |
Line 2084 sub format_csv_rowlabel {
|
Line 2106 sub format_csv_rowlabel {
|
} |
} |
|
|
sub format_excel_rowlabel { |
sub format_excel_rowlabel { |
|
my $sheet = shift; |
my $rowlabel = shift; |
my $rowlabel = shift; |
return '' if ($rowlabel eq ''); |
return '' if ($rowlabel eq ''); |
my ($type,$labeldata) = split(':',$rowlabel,2); |
my ($type,$labeldata) = split(':',$rowlabel,2); |
my $result = ''; |
my $result = ''; |
if ($type eq 'symb') { |
if ($type eq 'symb') { |
my ($symb,$uname,$udom,$mapid,$resid,$title) = split(':',$labeldata); |
my ($symb,$mapid,$resid,$title) = split(':',$labeldata); |
$symb = &Apache::lonnet::unescape($symb); |
$symb = &Apache::lonnet::unescape($symb); |
$result = $title; |
$result = $title; |
} elsif ($type eq 'student') { |
} elsif ($type eq 'student') { |
Line 2201 sub get_student_rowlabels {
|
Line 2224 sub get_student_rowlabels {
|
my %assesslist; |
my %assesslist; |
foreach ('Feedback','Evaluation','Tutoring','Discussion') { |
foreach ('Feedback','Evaluation','Tutoring','Discussion') { |
my $symb = '_'.lc($_); |
my $symb = '_'.lc($_); |
$assesslist{$symb} = join(':',('symb',$symb,$uname,$udom,0,0,$_)); |
$assesslist{$symb} = join(':',('symb',$symb,0,0,$_)); |
} |
} |
# |
# |
while (my ($key,$srcf) = each(%course_db)) { |
while (my ($key,$srcf) = each(%course_db)) { |
Line 2214 sub get_student_rowlabels {
|
Line 2237 sub get_student_rowlabels {
|
&Apache::lonnet::declutter($course_db{'map_id_'.$mapid}). |
&Apache::lonnet::declutter($course_db{'map_id_'.$mapid}). |
'___'.$resid.'___'.&Apache::lonnet::declutter($srcf); |
'___'.$resid.'___'.&Apache::lonnet::declutter($srcf); |
$assesslist{$symb}='symb:'.&Apache::lonnet::escape($symb).':' |
$assesslist{$symb}='symb:'.&Apache::lonnet::escape($symb).':' |
.$uname.':'.$udom.':'.$mapid.':'.$resid.':'. |
.$mapid.':'.$resid.':'.$course_db{'title_'.$id}; |
$course_db{'title_'.$id}; |
|
} |
} |
} |
} |
untie(%course_db); |
untie(%course_db); |
Line 2303 sub updatestudentassesssheet {
|
Line 2325 sub updatestudentassesssheet {
|
$sheet->{'maxrow'} = 0; |
$sheet->{'maxrow'} = 0; |
my %existing=(); |
my %existing=(); |
# Now obsolete rows |
# Now obsolete rows |
while (my ($cell, $formula) = each (%f)) { |
foreach my $cell (keys(%f)) { |
|
my $formula = $f{$cell}; |
next if ($cell !~ /^A(\d+)/); |
next if ($cell !~ /^A(\d+)/); |
$sheet->{'maxrow'} = $1 if ($1 > $sheet->{'maxrow'}); |
$sheet->{'maxrow'} = $1 if ($1 > $sheet->{'maxrow'}); |
my ($usy,$ufn)=split(/__&&&\__/,$formula); |
my ($usy,$ufn)=split(/__&&&\__/,$formula); |
Line 2351 sub loadstudent{
|
Line 2374 sub loadstudent{
|
undef @tmp; |
undef @tmp; |
# |
# |
my @assessdata=(); |
my @assessdata=(); |
while (my ($cell,$value) = each (%formulas)) { |
foreach my $cell (keys(%formulas)) { |
|
my $value = $formulas{$cell}; |
if(defined($c) && ($c->aborted())) { |
if(defined($c) && ($c->aborted())) { |
last; |
last; |
} |
} |
Line 2363 sub loadstudent{
|
Line 2387 sub loadstudent{
|
$sheet->{'udom'}, |
$sheet->{'udom'}, |
'assesscalc',$usy,$ufn,$r); |
'assesscalc',$usy,$ufn,$r); |
my $index=0; |
my $index=0; |
foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M', |
foreach my $col ('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 (defined($assessdata[$index])) { |
if (defined($assessdata[$index])) { |
my $col=$_; |
|
if ($assessdata[$index]=~/\D/) { |
if ($assessdata[$index]=~/\D/) { |
$constants{$col.$row}="'".$assessdata[$index]."'"; |
$constants{$col.$row}="'".$assessdata[$index]."'"; |
} else { |
} else { |
$constants{$col.$row}=$assessdata[$index]; |
$constants{$col.$row}=$assessdata[$index]; |
} |
} |
unless ($col eq 'A') { |
$formulas{$col.$row}='import' if ($col ne 'A'); |
$formulas{$col.$row}='import'; |
|
} |
|
} |
} |
$index++; |
$index++; |
} |
} |
Line 2637 sub loadrows {
|
Line 2658 sub loadrows {
|
|
|
sub checkthis { |
sub checkthis { |
my ($keyname,$time)=@_; |
my ($keyname,$time)=@_; |
return ($time<$expiredates{$keyname}); |
if (! exists($expiredates{$keyname})) { |
|
return 0; |
|
} else { |
|
return ($time<$expiredates{$keyname}); |
|
} |
} |
} |
|
|
sub forcedrecalc { |
sub forcedrecalc { |
Line 2671 sub forcedrecalc {
|
Line 2696 sub forcedrecalc {
|
# |
# |
sub exportsheet { |
sub exportsheet { |
my ($sheet,$uname,$udom,$stype,$usymb,$fn,$r)=@_; |
my ($sheet,$uname,$udom,$stype,$usymb,$fn,$r)=@_; |
|
my $flag = 0; |
$uname = $uname || $sheet->{'uname'}; |
$uname = $uname || $sheet->{'uname'}; |
$udom = $udom || $sheet->{'udom'}; |
$udom = $udom || $sheet->{'udom'}; |
$stype = $stype || $sheet->{'sheettype'}; |
$stype = $stype || $sheet->{'sheettype'}; |
Line 2739 sub exportsheet {
|
Line 2765 sub exportsheet {
|
[$key], |
[$key], |
$sheet->{'cdom'},$sheet->{'cnum'}); |
$sheet->{'cdom'},$sheet->{'cnum'}); |
if ($tmp[0]!~/^error/) { |
if ($tmp[0]!~/^error/) { |
%currentlystored = @tmp; |
# We only got one key, so we will access it directly. |
|
foreach (split('___&___',$tmp[1])) { |
|
my ($key,$value) = split('___=___',$_); |
|
$key = '' if (! defined($key)); |
|
$currentlystored{$key} = $value; |
|
} |
} |
} |
} else { |
} else { |
my @tmp = &Apache::lonnet::get('nohist_calculatedsheets_'. |
my @tmp = &Apache::lonnet::get('nohist_calculatedsheets_'. |
$sheet->{'cid'},[$key], |
$sheet->{'cid'},[$key], |
$sheet->{'udom'},$sheet->{'uname'}); |
$sheet->{'udom'},$sheet->{'uname'}); |
if ($tmp[0]!~/^error/) { |
if ($tmp[0]!~/^error/) { |
%currentlystored = @tmp; |
# We only got one key, so we will access it directly. |
|
foreach (split('___&___',$tmp[1])) { |
|
my ($key,$value) = split('___=___',$_); |
|
$key = '' if (! defined($key)); |
|
$currentlystored{$key} = $value; |
|
} |
} |
} |
} |
} |
# |
# |
Line 2765 sub exportsheet {
|
Line 2801 sub exportsheet {
|
# |
# |
# Store away the new value |
# Store away the new value |
# |
# |
|
my $timekey = $key.'.time'; |
if ($stype eq 'studentcalc') { |
if ($stype eq 'studentcalc') { |
&Apache::lonnet::put('nohist_calculatedsheets', |
my $result = &Apache::lonnet::put('nohist_calculatedsheets', |
{ $key => $newstore, |
{ $key => $newstore, |
$key.time => $now }, |
$timekey => $now }, |
$sheet->{'cdom'},$sheet->{'cnum'}); |
$sheet->{'cdom'}, |
} else { |
$sheet->{'cnum'}); |
&Apache::lonnet::put('nohist_calculatedsheets_'.$sheet->{'cid'}, |
} else { |
{ $key => $newstore, |
my $result = &Apache::lonnet::put('nohist_calculatedsheets_'.$sheet->{'cid'}, |
$key.time => $now }, |
{ $key => $newstore, |
$sheet->{'udom'}, |
$timekey => $now }, |
$sheet->{'uname'}) |
$sheet->{'udom'}, |
|
$sheet->{'uname'}); |
} |
} |
return @exportarr; |
return @exportarr; |
} |
} |
Line 2954 sub handler {
|
Line 2992 sub handler {
|
|
|
function celledit(cellname,cellformula) { |
function celledit(cellname,cellformula) { |
var edit_text = ''; |
var edit_text = ''; |
|
// cellformula may contain less-than and greater-than symbols, so |
|
// we need to escape them? |
edit_text +='<html><head><title>Cell Edit Window</title></head><body>'; |
edit_text +='<html><head><title>Cell Edit Window</title></head><body>'; |
edit_text += '<form name="editwinform">'; |
edit_text += '<form name="editwinform">'; |
edit_text += '<center><h3>Cell '+cellname+'</h3>'; |
edit_text += '<center><h3>Cell '+cellname+'</h3>'; |
Line 3047 ENDSCRIPT
|
Line 3087 ENDSCRIPT
|
if ($ENV{'form.unewfield'}) { |
if ($ENV{'form.unewfield'}) { |
$r->print('<h2>Modified Workcopy</h2>'); |
$r->print('<h2>Modified Workcopy</h2>'); |
$ENV{'form.unewformula'}=~s/\'/\"/g; |
$ENV{'form.unewformula'}=~s/\'/\"/g; |
$r->print('<p>New formula: '.$ENV{'form.unewfield'}.'='. |
$r->print('<p>Cell '.$ENV{'form.unewfield'}.' = <pre>'); |
$ENV{'form.unewformula'}.'<p>'); |
$r->print(&HTML::Entities::encode($ENV{'form.unewformula'}). |
|
'</pre></p>'); |
$sheet->{'filename'} = $ENV{'form.ufn'}; |
$sheet->{'filename'} = $ENV{'form.ufn'}; |
&tmpread($sheet,$ENV{'form.unewfield'},$ENV{'form.unewformula'}); |
&tmpread($sheet,$ENV{'form.unewfield'},$ENV{'form.unewformula'}); |
} elsif ($ENV{'form.saveas'}) { |
} elsif ($ENV{'form.saveas'}) { |
Line 3187 ENDSCRIPT
|
Line 3228 ENDSCRIPT
|
} |
} |
$r->print('>'.$mode.'</option>'."\n"); |
$r->print('>'.$mode.'</option>'."\n"); |
} |
} |
if ($sheet->{'sheettype'} eq 'classcalc') { |
# |
$r->print('<option value="recursive excel"'); |
# Mulit-sheet excel takes too long and does not work at all for large |
if ($ENV{'form.output'} eq 'recursive excel') { |
# classes. Future inclusion of this option may be possible with the |
$r->print(' selected '); |
# Spreadsheet::WriteExcel::Big and speed improvements. |
} |
# |
$r->print(">Multi-Sheet Excel</option>\n"); |
# if ($sheet->{'sheettype'} eq 'classcalc') { |
} |
# $r->print('<option value="recursive excel"'); |
|
# if ($ENV{'form.output'} eq 'recursive excel') { |
|
# $r->print(' selected '); |
|
# } |
|
# $r->print(">Multi-Sheet Excel</option>\n"); |
|
# } |
$r->print("</select>\n"); |
$r->print("</select>\n"); |
# |
# |
if ($sheet->{'sheettype'} eq 'classcalc') { |
if ($sheet->{'sheettype'} eq 'classcalc') { |
Line 3211 ENDSCRIPT
|
Line 3257 ENDSCRIPT
|
#value='Insert Row Bottom'><br> |
#value='Insert Row Bottom'><br> |
#ENDINSERTBUTTONS |
#ENDINSERTBUTTONS |
# Print out sheet |
# Print out sheet |
&outsheet($r,$sheet); |
&outsheet($sheet,$r); |
$r->print('</form></body></html>'); |
$r->print('</form></body></html>'); |
# Done |
# Done |
return OK; |
return OK; |