version 1.17, 2003/09/05 01:06:45
|
version 1.24, 2003/11/17 19:55:41
|
Line 57 use Apache::lonnavmaps;
|
Line 57 use Apache::lonnavmaps;
|
use Apache::Spreadsheet(); |
use Apache::Spreadsheet(); |
use Apache::assesscalc(); |
use Apache::assesscalc(); |
use HTML::Entities(); |
use HTML::Entities(); |
use Spreadsheet::WriteExcel; |
|
use Time::HiRes; |
use Time::HiRes; |
|
use Apache::lonlocal; |
|
|
@Apache::studentcalc::ISA = ('Apache::Spreadsheet'); |
@Apache::studentcalc::ISA = ('Apache::Spreadsheet'); |
|
|
Line 89 sub ensure_correct_sequence_data {
|
Line 89 sub ensure_correct_sequence_data {
|
sub initialize_sequence_cache { |
sub initialize_sequence_cache { |
# |
# |
# Set up the sequences and assessments |
# Set up the sequences and assessments |
@Sequences = (); |
undef(@Sequences); |
my ($top,$sequences,$assessments) = |
my ($top,$sequences,$assessments) = |
&Apache::loncoursedata::get_sequence_assessment_data(); |
&Apache::loncoursedata::get_sequence_assessment_data(); |
if (! defined($top) || ! ref($top)) { |
if (! defined($top) || ! ref($top)) { |
Line 103 sub initialize_sequence_cache {
|
Line 103 sub initialize_sequence_cache {
|
sub clear_package { |
sub clear_package { |
undef(@Sequences); |
undef(@Sequences); |
undef(%Exportrows); |
undef(%Exportrows); |
|
&Apache::assesscalc::clear_package(); |
} |
} |
|
|
sub get_title { |
sub get_title { |
Line 118 sub get_title {
|
Line 119 sub get_title {
|
|
|
push (@title,$name); |
push (@title,$name); |
push (@title,$self->{'coursedesc'}); |
push (@title,$self->{'coursedesc'}); |
push (@title,scalar(localtime(time))); |
push (@title,&Apache::lonlocal::locallocaltime(time)); |
return @title; |
return @title; |
} |
} |
|
|
Line 128 sub get_html_title {
|
Line 129 sub get_html_title {
|
my $title = '<h1>'.$name; |
my $title = '<h1>'.$name; |
if ($ENV{'user.name'} ne $self->{'name'} && |
if ($ENV{'user.name'} ne $self->{'name'} && |
$ENV{'user.domain'} ne $self->{'domain'}) { |
$ENV{'user.domain'} ne $self->{'domain'}) { |
$title .= &Apache::loncommon::aboutmewrapper |
$title .= ' '.&Apache::loncommon::aboutmewrapper |
($self->{'name'}.'@'.$self->{'domain'}, |
($self->{'name'}.'@'.$self->{'domain'}, |
$self->{'name'},$self->{'domain'}); |
$self->{'name'},$self->{'domain'}); |
} |
} |
Line 140 sub get_html_title {
|
Line 141 sub get_html_title {
|
|
|
sub parent_link { |
sub parent_link { |
my $self = shift; |
my $self = shift; |
my $link .= '<p><a href="/adm/classcalc?'. |
return '<p><a href="/adm/classcalc">'.&mt('Course level sheet').'</a></p>'."\n"; |
'sname='.$self->{'name'}. |
|
'&sdomain='.$self->{'domain'}.'">'. |
|
'Course level sheet</a></p>'."\n"; |
|
return $link; |
|
} |
} |
|
|
sub convenience_links { |
sub convenience_links { |
Line 177 sub outsheet_html {
|
Line 174 sub outsheet_html {
|
my $editing_is_allowed = &Apache::lonnet::allowed('mgr', |
my $editing_is_allowed = &Apache::lonnet::allowed('mgr', |
$ENV{'request.course.id'}); |
$ENV{'request.course.id'}); |
#################################### |
#################################### |
|
# Report any calculation errors # |
|
#################################### |
|
$r->print($self->html_report_error()); |
|
#################################### |
# Determine table structure # |
# Determine table structure # |
#################################### |
#################################### |
my $num_uneditable = 26; |
my $num_uneditable = 26; |
my $num_left = 52-$num_uneditable; |
my $num_left = 52-$num_uneditable; |
|
my %lt=&Apache::lonlocal::texthash( |
|
'st' => 'Student', |
|
'im' => 'Import', |
|
'ca' => 'Calculations', |
|
'as' => 'Assessment', |
|
'ro' => 'Row', |
|
); |
my $tableheader =<<"END"; |
my $tableheader =<<"END"; |
<p> |
<p> |
<table border="2"> |
<table border="2"> |
<tr> |
<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"> |
<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"> |
<td colspan="$num_left"> |
<b><font size="+1">Calculations</font></b></td> |
<b><font size="+1">$lt{'ca'}</font></b></td> |
</tr><tr> |
</tr><tr> |
END |
END |
my $label_num = 0; |
my $label_num = 0; |
Line 205 END
|
Line 213 END
|
$tableheader .="</tr>\n"; |
$tableheader .="</tr>\n"; |
if ($self->blackout()) { |
if ($self->blackout()) { |
$r->print('<font color="red" size="+2"><p>'. |
$r->print('<font color="red" size="+2"><p>'. |
'Some computations are not available at this time.<br />'. |
&mt('Some computations are not available at this time.').'<br />'. |
'There are problems whose status you are allowed to view.'. |
&mt('There are problems whose status you are not allowed to view.'). |
'</font></p>'."\n"); |
'</font></p>'."\n"); |
} else { |
} else { |
$r->print($tableheader); |
$r->print($tableheader); |
Line 219 END
|
Line 227 END
|
} |
} |
# |
# |
# Print out summary/export row |
# 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"); |
$self->html_export_row($exportcolor)."</tr>\n"); |
} |
} |
$r->print("</table>\n"); |
$r->print("</table>\n"); |
Line 229 END
|
Line 237 END
|
$tableheader =<<"END"; |
$tableheader =<<"END"; |
</p><p> |
</p><p> |
<table border="2"> |
<table border="2"> |
<tr><th>Row</th><th> </th><th>Assessment</th> |
<tr><th>$lt{'ro'}</th><th> </th><th>$lt{'as'}</th> |
END |
END |
} else { |
} else { |
$tableheader =<<"END"; |
$tableheader =<<"END"; |
</p><p> |
</p><p> |
<table border="2"> |
<table border="2"> |
<tr><th> </th><th>Assessment</th> |
<tr><th> </th><th>$lt{'as'}</th> |
END |
END |
} |
} |
foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){ |
foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){ |
Line 282 END
|
Line 290 END
|
} |
} |
if ($self->blackout() && $self->{'blackout_rows'}->{$rownum}>0) { |
if ($self->blackout() && $self->{'blackout_rows'}->{$rownum}>0) { |
$row_output .= |
$row_output .= |
'<td colspan="52">Unavailable at this time</td></tr>'."\n"; |
'<td colspan="52">'.&mt('Unavailable at this time').'</td></tr>'."\n"; |
} else { |
} else { |
$row_output .= $self->html_row($num_uneditable,$rownum, |
$row_output .= $self->html_row($num_uneditable,$rownum, |
$exportcolor,$importcolor). |
$exportcolor,$importcolor). |
Line 359 sub csv_rows {
|
Line 367 sub csv_rows {
|
# |
# |
# Write a header row |
# Write a header row |
$self->csv_output_row($filehandle,undef, |
$self->csv_output_row($filehandle,undef, |
('Sequence or Folder','Assessment title')); |
(&mt('Sequence or Folder'),&mt('Assessment title'))); |
# |
# |
# Write each assessments row |
# Write each assessments row |
if (scalar(@Sequences)< 1) { |
if (scalar(@Sequences)< 1) { |
Line 386 sub excel_rows {
|
Line 394 sub excel_rows {
|
# Write a header row |
# Write a header row |
$cols_output = 0; |
$cols_output = 0; |
foreach my $value ('Container','Assessment title') { |
foreach my $value ('Container','Assessment title') { |
$worksheet->write($rows_output,$cols_output++,$value); |
$worksheet->write($rows_output,$cols_output++,&mt($value)); |
} |
} |
$rows_output++; |
$rows_output++; |
# |
# |
Line 412 sub outsheet_recursive_excel {
|
Line 420 sub outsheet_recursive_excel {
|
my ($r) = @_; |
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 { |
sub compute { |
my $self = shift; |
my $self = shift; |
|
my ($r) = @_; |
|
my $connection = $r->connection(); |
|
if ($connection->aborted()) { $self->cleanup; return; } |
if (! defined($current_course) || |
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'}; |
$current_course = $ENV{'request.course.id'}; |
&clear_package(); |
&clear_package(); |
&initialize_sequence_cache(); |
&initialize_sequence_cache(); |
} |
} |
$self->initialize_safe_space(); |
$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'}); |
&Apache::assesscalc::initialize_package($self->{'name'},$self->{'domain'}); |
my %f = $self->formulas(); |
my %f = $self->formulas(); |
# |
# |
# Process the formulas list - |
# Process the formulas list - |
# the formula for the A column of a row is symb__&&__filename |
# the formula for the A column of a row is symb__&&__filename |
my %c = $self->constants(); |
my %c = $self->constants(); |
foreach my $seq (@sequences) { |
foreach my $seq (@Sequences) { |
next if ($seq->{'num_assess'}<1); |
next if ($seq->{'num_assess'}<1); |
foreach my $resource (@{$seq->{'contents'}}) { |
foreach my $resource (@{$seq->{'contents'}}) { |
|
if ($connection->aborted()) { $self->cleanup(); return; } |
next if ($resource->{'type'} ne 'assessment'); |
next if ($resource->{'type'} ne 'assessment'); |
my $rownum = $self->get_row_number_from_key($resource->{'symb'}); |
my $rownum = $self->get_row_number_from_key($resource->{'symb'}); |
my $cell = 'A'.$rownum; |
my $cell = 'A'.$rownum; |
Line 450 sub compute {
|
Line 530 sub compute {
|
$self->{'row_source'}->{$rownum} = $assess_filename; |
$self->{'row_source'}->{$rownum} = $assess_filename; |
} |
} |
$f{$cell} = $resource->{'symb'}.'__&&&__'.$assess_filename; |
$f{$cell} = $resource->{'symb'}.'__&&&__'.$assess_filename; |
my $assessSheet = Apache::assesscalc->new($self->{'name'}, |
if ($connection->aborted()) { $self->cleanup(); return; } |
$self->{'domain'}, |
my $assessSheet; |
$assess_filename, |
$assessSheet = Apache::assesscalc->new($self->{'name'}, |
$resource->{'symb'}); |
$self->{'domain'}, |
my @exportdata = $assessSheet->export_data(); |
$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()) { |
if ($assessSheet->blackout()) { |
$self->blackout(1); |
$self->blackout(1); |
$self->{'blackout_rows'}->{$rownum} = 1; |
$self->{'blackout_rows'}->{$rownum} = 1; |
Line 479 sub compute {
|
Line 569 sub compute {
|
} |
} |
$self->constants(\%c); |
$self->constants(\%c); |
$self->formulas(\%f); |
$self->formulas(\%f); |
|
$self->put_sequence_data_in_safe_space(); |
$self->calcsheet(); |
$self->calcsheet(); |
|
$self->remove_sequence_data_from_safe_space(); |
# |
# |
# Store export row in cache |
# Store export row in cache |
my @exportarray=$self->exportrow(); |
my @exportarray=$self->exportrow(); |
Line 582 Writes the export data for this student
|
Line 674 Writes the export data for this student
|
############################################# |
############################################# |
sub save_export_data { |
sub save_export_data { |
my $self = shift; |
my $self = shift; |
return if ($self->temporary()); |
|
my $student = $self->{'name'}.':'.$self->{'domain'}; |
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})); |
return if (! exists($Exportrows{$student})); |
|
&Apache::assesscalc::save_cached_export_rows($self->{'name'}, |
|
$self->{'domain'}); |
return if (! $self->is_default()); |
return if (! $self->is_default()); |
my $key = join(':',($self->{'name'},$self->{'domain'},'studentcalc')).':'; |
my $key = join(':',($self->{'name'},$self->{'domain'},'studentcalc')).':'; |
my $timekey = $key.'.time'; |
my $timekey = $key.'.time'; |
Line 615 spreadsheet only if necessary.
|
Line 714 spreadsheet only if necessary.
|
############################################# |
############################################# |
sub export_data { |
sub export_data { |
my $self = shift; |
my $self = shift; |
|
my ($r) = @_; |
|
my $connection = $r->connection(); |
my $student = $self->{'name'}.':'.$self->{'domain'}; |
my $student = $self->{'name'}.':'.$self->{'domain'}; |
if (! exists($Exportrows{$student}) || |
if (! exists($Exportrows{$student}) || |
! defined($Exportrows{$student}) || |
! defined($Exportrows{$student}) || |
Line 623 sub export_data {
|
Line 724 sub export_data {
|
! exists($Exportrows{$student}->{'time'}) || |
! exists($Exportrows{$student}->{'time'}) || |
! defined($Exportrows{$student}->{'time'}) || |
! defined($Exportrows{$student}->{'time'}) || |
! $self->check_expiration_time($Exportrows{$student}->{'time'})) { |
! $self->check_expiration_time($Exportrows{$student}->{'time'})) { |
$self->compute(); |
$self->compute($r); |
} |
} |
my @Data = @{$Exportrows{$student}->{'data'}}; |
if ($connection->aborted()) { $self->cleanup(); return; } |
for (my $i=0; $i<=$#Data;$i++) { |
my @Data; |
$Data[$i]="'".$Data[$i]."'" if ($Data[$i]=~/\D/ && defined($Data[$i])); |
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; |
return @Data; |
} |
} |