--- loncom/interface/spreadsheet/studentcalc.pm 2003/07/16 15:57:32 1.14
+++ loncom/interface/spreadsheet/studentcalc.pm 2003/11/17 19:55:41 1.24
@@ -1,5 +1,5 @@
#
-# $Id: studentcalc.pm,v 1.14 2003/07/16 15:57:32 matthew Exp $
+# $Id: studentcalc.pm,v 1.24 2003/11/17 19:55:41 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -45,6 +45,9 @@ studentcalc
###################################################
package Apache::studentcalc;
+use warnings FATAL=>'all';
+no warnings 'uninitialized';
+
use strict;
use Apache::Constants qw(:common :http);
use Apache::lonnet;
@@ -54,8 +57,8 @@ use Apache::lonnavmaps;
use Apache::Spreadsheet();
use Apache::assesscalc();
use HTML::Entities();
-use Spreadsheet::WriteExcel;
use Time::HiRes;
+use Apache::lonlocal;
@Apache::studentcalc::ISA = ('Apache::Spreadsheet');
@@ -86,7 +89,7 @@ sub ensure_correct_sequence_data {
sub initialize_sequence_cache {
#
# Set up the sequences and assessments
- @Sequences = ();
+ undef(@Sequences);
my ($top,$sequences,$assessments) =
&Apache::loncoursedata::get_sequence_assessment_data();
if (! defined($top) || ! ref($top)) {
@@ -98,8 +101,9 @@ sub initialize_sequence_cache {
}
sub clear_package {
- @Sequences = undef;
- %Exportrows = undef;
+ undef(@Sequences);
+ undef(%Exportrows);
+ &Apache::assesscalc::clear_package();
}
sub get_title {
@@ -115,7 +119,7 @@ sub get_title {
push (@title,$name);
push (@title,$self->{'coursedesc'});
- push (@title,scalar(localtime(time)));
+ push (@title,&Apache::lonlocal::locallocaltime(time));
return @title;
}
@@ -125,7 +129,7 @@ sub get_html_title {
my $title = '<h1>'.$name;
if ($ENV{'user.name'} ne $self->{'name'} &&
$ENV{'user.domain'} ne $self->{'domain'}) {
- $title .= &Apache::loncommon::aboutmewrapper
+ $title .= ' '.&Apache::loncommon::aboutmewrapper
($self->{'name'}.'@'.$self->{'domain'},
$self->{'name'},$self->{'domain'});
}
@@ -137,11 +141,7 @@ sub get_html_title {
sub parent_link {
my $self = shift;
- my $link .= '<p><a href="/adm/classcalc?'.
- 'sname='.$self->{'name'}.
- '&sdomain='.$self->{'domain'}.'">'.
- 'Course level sheet</a></p>'."\n";
- return $link;
+ return '<p><a href="/adm/classcalc">'.&mt('Course level sheet').'</a></p>'."\n";
}
sub convenience_links {
@@ -174,19 +174,30 @@ sub outsheet_html {
my $editing_is_allowed = &Apache::lonnet::allowed('mgr',
$ENV{'request.course.id'});
####################################
+ # Report any calculation errors #
+ ####################################
+ $r->print($self->html_report_error());
+ ####################################
# Determine table structure #
####################################
my $num_uneditable = 26;
my $num_left = 52-$num_uneditable;
+ my %lt=&Apache::lonlocal::texthash(
+ 'st' => 'Student',
+ 'im' => 'Import',
+ 'ca' => 'Calculations',
+ 'as' => 'Assessment',
+ 'ro' => 'Row',
+ );
my $tableheader =<<"END";
<p>
<table border="2">
<tr>
- <th colspan="2" rowspan="2"><font size="+2">Student</font></th>
+ <th colspan="2" rowspan="2"><font size="+2">$lt{'st'}</font></th>
<td bgcolor="$importcolor" colspan="$num_uneditable">
- <b><font size="+1">Import</font></b></td>
+ <b><font size="+1">$lt{'im'}</font></b></td>
<td colspan="$num_left">
- <b><font size="+1">Calculations</font></b></td>
+ <b><font size="+1">$lt{'ca'}</font></b></td>
</tr><tr>
END
my $label_num = 0;
@@ -202,8 +213,8 @@ END
$tableheader .="</tr>\n";
if ($self->blackout()) {
$r->print('<font color="red" size="+2"><p>'.
- 'Some computations are not available at this time.<br />'.
- 'There are problems whose status you are allowed to view.'.
+ &mt('Some computations are not available at this time.').'<br />'.
+ &mt('There are problems whose status you are not allowed to view.').
'</font></p>'."\n");
} else {
$r->print($tableheader);
@@ -216,7 +227,7 @@ END
}
#
# Print out summary/export row
- $r->print('<tr><td>Summary</td><td>0</td>'.
+ $r->print('<tr><td>'.&mt('Summary').'</td><td>0</td>'.
$self->html_export_row($exportcolor)."</tr>\n");
}
$r->print("</table>\n");
@@ -226,13 +237,13 @@ END
$tableheader =<<"END";
</p><p>
<table border="2">
-<tr><th>Row</th><th> </th><th>Assessment</th>
+<tr><th>$lt{'ro'}</th><th> </th><th>$lt{'as'}</th>
END
} else {
$tableheader =<<"END";
</p><p>
<table border="2">
-<tr><th> </th><th>Assessment</th>
+<tr><th> </th><th>$lt{'as'}</th>
END
}
foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){
@@ -279,7 +290,7 @@ END
}
if ($self->blackout() && $self->{'blackout_rows'}->{$rownum}>0) {
$row_output .=
- '<td colspan="52">Unavailable at this time</td></tr>'."\n";
+ '<td colspan="52">'.&mt('Unavailable at this time').'</td></tr>'."\n";
} else {
$row_output .= $self->html_row($num_uneditable,$rownum,
$exportcolor,$importcolor).
@@ -356,7 +367,7 @@ sub csv_rows {
#
# Write a header row
$self->csv_output_row($filehandle,undef,
- ('Sequence or Folder','Assessment title'));
+ (&mt('Sequence or Folder'),&mt('Assessment title')));
#
# Write each assessments row
if (scalar(@Sequences)< 1) {
@@ -383,7 +394,7 @@ sub excel_rows {
# Write a header row
$cols_output = 0;
foreach my $value ('Container','Assessment title') {
- $worksheet->write($rows_output,$cols_output++,$value);
+ $worksheet->write($rows_output,$cols_output++,&mt($value));
}
$rows_output++;
#
@@ -409,35 +420,106 @@ sub outsheet_recursive_excel {
my ($r) = @_;
}
+##
+## Routines to deal with sequences in the safe space
+##
+sub get_rows_in_sequence {
+ my $self = shift();
+ my ($sequence) = @_;
+ my @Rows;
+ foreach my $resource (@{$sequence->{'contents'}}) {
+ if ($resource->{'type'} eq 'assessment') {
+ my $rownum = $self->get_row_number_from_key($resource->{'symb'});
+ push (@Rows,$rownum);
+ }
+ }
+ return @Rows;
+}
+
+sub remove_sequence_data_from_safe_space {
+ my $self = shift();
+ my $command = 'undef(%Sequence_Rows);';
+ $self->{'safe'}->reval($command);
+}
+
+sub put_sequence_data_in_safe_space {
+ my $self = shift();
+ my $data = 'undef(%Sequence_Rows);';
+ # Build up the %Sequence_Rows hash - each sequence title is associated with
+ # an array pointer, which holds the rows in the sequence.
+ foreach my $seq (@Sequences) {
+ my @Rows = $self->get_rows_in_sequence($seq);
+ #
+ # Potential problems with sequence titles:
+ # 1. duplicate titles - they get the total for the titles
+ # 2. control characters in titles - use q{} around the string to
+ # deal with it.
+ my $title = &HTML::Entities::decode($seq->{'title'});
+ $title =~ s/&\#058;/:/g;
+ if (@Rows) {
+ $data .= 'push(@{$Sequence_Rows{"'.quotemeta($title).'"}},'.
+ '('.join(',',@Rows).'));'."\n";;
+ }
+ }
+ my $new_code = $data.<<'END';
+sub SUMSEQ {
+ my ($col,@titles) = @_;
+ return 'bad column: '.$col if ($col !~ /^[A-z]$/);
+ my $sum = 0;
+ foreach my $title (@titles) {
+ while (my ($seq_title,$rows) = each(%Sequence_Rows)) {
+ my $regexp;
+ if ($title =~ /^regexp:(.*)$/) {
+ $regexp = $1;
+ } elsif (lc($title) eq 'all') {
+ $regexp = '.';
+ }
+ if (defined($regexp)) {
+ next if ($seq_title !~ /$regexp/);
+ } else {
+ next if ($seq_title ne $title);
+ }
+ foreach my $rownum (@{$rows}) {
+ my $cell = $col.$rownum;
+ if (exists($sheet_values{$cell})) {
+ $sum += $sheet_values{$cell};
+ }
+ }
+ }
+ }
+ return $sum;
+}
+END
+ $self->{'safe'}->reval($new_code);
+ return;
+}
+
+##
+## Main computation method
+##
sub compute {
my $self = shift;
- $self->logthis('computing');
+ my ($r) = @_;
+ my $connection = $r->connection();
+ if ($connection->aborted()) { $self->cleanup; return; }
if (! defined($current_course) ||
- $current_course ne $ENV{'request.course.id'}) {
+ $current_course ne $ENV{'request.course.id'} ||
+ ! @Sequences ) {
$current_course = $ENV{'request.course.id'};
&clear_package();
&initialize_sequence_cache();
}
$self->initialize_safe_space();
- my @sequences = @Sequences;
- if (@sequences < 1) {
- my ($top,$sequences,$assessments) =
- &Apache::loncoursedata::get_sequence_assessment_data();
- if (! defined($top) || ! ref($top)) {
- &Apache::lonnet::logthis('top is undefined');
- return;
- }
- @sequences = @{$sequences} if (ref($sequences) eq 'ARRAY');
- }
&Apache::assesscalc::initialize_package($self->{'name'},$self->{'domain'});
my %f = $self->formulas();
#
# Process the formulas list -
# the formula for the A column of a row is symb__&&__filename
my %c = $self->constants();
- foreach my $seq (@sequences) {
+ foreach my $seq (@Sequences) {
next if ($seq->{'num_assess'}<1);
foreach my $resource (@{$seq->{'contents'}}) {
+ if ($connection->aborted()) { $self->cleanup(); return; }
next if ($resource->{'type'} ne 'assessment');
my $rownum = $self->get_row_number_from_key($resource->{'symb'});
my $cell = 'A'.$rownum;
@@ -448,11 +530,21 @@ sub compute {
$self->{'row_source'}->{$rownum} = $assess_filename;
}
$f{$cell} = $resource->{'symb'}.'__&&&__'.$assess_filename;
- my $assessSheet = Apache::assesscalc->new($self->{'name'},
- $self->{'domain'},
- $assess_filename,
- $resource->{'symb'});
- my @exportdata = $assessSheet->export_data();
+ if ($connection->aborted()) { $self->cleanup(); return; }
+ my $assessSheet;
+ $assessSheet = Apache::assesscalc->new($self->{'name'},
+ $self->{'domain'},
+ $assess_filename,
+ $resource->{'symb'});
+ my @exportdata = $assessSheet->export_data($r);
+ #
+ if ($assessSheet->badcalc()) {
+ $self->set_calcerror(
+ &mt('Error computing row for assessment "[_1]" (row [_2]):[_3]',
+ $assessSheet->get_title(),$rownum,$assessSheet->calcerror()));
+ }
+ #
+ if ($connection->aborted()) { $self->cleanup(); return; }
if ($assessSheet->blackout()) {
$self->blackout(1);
$self->{'blackout_rows'}->{$rownum} = 1;
@@ -477,7 +569,9 @@ sub compute {
}
$self->constants(\%c);
$self->formulas(\%f);
+ $self->put_sequence_data_in_safe_space();
$self->calcsheet();
+ $self->remove_sequence_data_from_safe_space();
#
# Store export row in cache
my @exportarray=$self->exportrow();
@@ -494,7 +588,7 @@ sub compute {
sub set_row_sources {
my $self = shift;
while (my ($cell,$value) = each(%{$self->{'formulas'}})) {
- next if ($cell !~ /^A(\d+)/ && $1 > 0);
+ next if ($cell !~ /^A(\d+)$/ || $1 < 1);
my $row = $1;
(undef,$value) = split('__&&&__',$value);
$value = 'Default' if (! defined($value));
@@ -511,7 +605,7 @@ sub set_row_numbers {
next if ($row == 0);
my ($symb,undef) = split('__&&&__',$formula);
$self->{'row_numbers'}->{$symb} = $row;
- $self->{'maxrow'} = $1 if ($1 > $self->{'maxrow'});
+ $self->{'maxrow'} = $row if ($row > $self->{'maxrow'});
}
}
@@ -541,7 +635,7 @@ These rows are saved in the courses dire
#############################################
#############################################
sub load_cached_export_rows {
- %Exportrows = undef;
+ undef(%Exportrows);
my @tmp = &Apache::lonnet::dump('nohist_calculatedsheets',
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
$ENV{'course.'.$ENV{'request.course.id'}.'.num'},undef);
@@ -580,16 +674,23 @@ Writes the export data for this student
#############################################
sub save_export_data {
my $self = shift;
- return if ($self->temporary());
my $student = $self->{'name'}.':'.$self->{'domain'};
+ return if ($self->temporary());
+ if ($self->badcalc()){
+ # do not save data away when calculations have not been done properly.
+ delete($Exportrows{$student});
+ return;
+ }
return if (! exists($Exportrows{$student}));
+ &Apache::assesscalc::save_cached_export_rows($self->{'name'},
+ $self->{'domain'});
return if (! $self->is_default());
my $key = join(':',($self->{'name'},$self->{'domain'},'studentcalc')).':';
my $timekey = $key.'.time';
my $newstore = join('___;___',
@{$Exportrows{$student}->{'data'}});
$newstore = '___=___'.$newstore;
- &Apache::lonnet::put('nohist_calculatedsheets',
+ my $result= &Apache::lonnet::put('nohist_calculatedsheets',
{ $key => $newstore,
$timekey => $Exportrows{$student}->{'time'} },
$self->{'cdom'},
@@ -613,14 +714,29 @@ spreadsheet only if necessary.
#############################################
sub export_data {
my $self = shift;
+ my ($r) = @_;
+ my $connection = $r->connection();
my $student = $self->{'name'}.':'.$self->{'domain'};
if (! exists($Exportrows{$student}) ||
+ ! defined($Exportrows{$student}) ||
+ ! exists($Exportrows{$student}->{'data'}) ||
+ ! defined($Exportrows{$student}->{'data'}) ||
+ ! exists($Exportrows{$student}->{'time'}) ||
+ ! defined($Exportrows{$student}->{'time'}) ||
! $self->check_expiration_time($Exportrows{$student}->{'time'})) {
- $self->compute();
+ $self->compute($r);
}
- my @Data = @{$Exportrows{$student}->{'data'}};
- for (my $i=0; $i<=$#Data;$i++) {
- $Data[$i]="'".$Data[$i]."'" if ($Data[$i]=~/\D/ && defined($Data[$i]));
+ if ($connection->aborted()) { $self->cleanup(); return; }
+ my @Data;
+ if ($self->badcalc()) {
+ @Data = ();
+ } else {
+ @Data = @{$Exportrows{$student}->{'data'}};
+ for (my $i=0; $i<=$#Data;$i++) {
+ if ($Data[$i]=~/\D/ && defined($Data[$i])) {
+ $Data[$i]="'".$Data[$i]."'";
+ }
+ }
}
return @Data;
}