version 1.143, 2002/11/19 22:36:09
|
version 1.149, 2002/11/22 19:21:59
|
Line 1317 END
|
Line 1317 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 1335 END
|
Line 1335 END
|
# Print out summary/export row |
# Print out summary/export row |
#################################### |
#################################### |
my ($rowlabel,@rowdata) = &get_row($sheet,'0'); |
my ($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 1381 END
|
Line 1381 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 1399 END
|
Line 1399 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 1469 sub outsheet_csv {
|
Line 1469 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 1530 A link to the spreadsheet will be availa
|
Line 1530 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); |
Line 1639 sub export_sheet_as_excel {
|
Line 1638 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 1656 sub export_sheet_as_excel {
|
Line 1655 sub export_sheet_as_excel {
|
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'} && |
if ( ! $ENV{'form.showall'} && |
$sheet->{'sheettype'} =~ /^(studentcalc|classcalc)$/) { |
$sheet->{'sheettype'} =~ /^(studentcalc|classcalc)$/) { |
my $row_is_empty = 1; |
my $row_is_empty = 1; |
Line 2053 sub parmval {
|
Line 2052 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 2077 sub format_html_rowlabel {
|
Line 2080 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 2098 sub format_csv_rowlabel {
|
Line 2102 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 2215 sub get_student_rowlabels {
|
Line 2220 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 2228 sub get_student_rowlabels {
|
Line 2233 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 2317 sub updatestudentassesssheet {
|
Line 2321 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 2365 sub loadstudent{
|
Line 2370 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 2377 sub loadstudent{
|
Line 2383 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 2651 sub loadrows {
|
Line 2654 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 2685 sub forcedrecalc {
|
Line 2692 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 2753 sub exportsheet {
|
Line 2761 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 2779 sub exportsheet {
|
Line 2797 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'}, |
|
$sheet->{'cnum'}); |
} else { |
} else { |
&Apache::lonnet::put('nohist_calculatedsheets_'.$sheet->{'cid'}, |
my $result = &Apache::lonnet::put('nohist_calculatedsheets_'.$sheet->{'cid'}, |
{ $key => $newstore, |
{ $key => $newstore, |
$key.time => $now }, |
$timekey => $now }, |
$sheet->{'udom'}, |
$sheet->{'udom'}, |
$sheet->{'uname'}) |
$sheet->{'uname'}); |
} |
} |
return @exportarr; |
return @exportarr; |
} |
} |