--- loncom/interface/spreadsheet/classcalc.pm 2003/05/29 18:31:27 1.7
+++ loncom/interface/spreadsheet/classcalc.pm 2003/10/14 18:36:54 1.14
@@ -1,5 +1,5 @@
#
-# $Id: classcalc.pm,v 1.7 2003/05/29 18:31:27 matthew Exp $
+# $Id: classcalc.pm,v 1.14 2003/10/14 18:36:54 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -46,6 +46,8 @@ classcalc
package Apache::classcalc;
use strict;
+use warnings FATAL=>'all';
+no warnings 'uninitialized';
use Apache::Constants qw(:common :http);
use Apache::loncoursedata();
use Apache::lonhtmlcommon();
@@ -56,6 +58,7 @@ use HTML::Entities();
use Spreadsheet::WriteExcel;
use Apache::lonnet;
use Time::HiRes;
+use Apache::lonlocal;
@Apache::classcalc::ISA = ('Apache::Spreadsheet');
@@ -71,6 +74,11 @@ sub initialize {
return;
}
+sub clear_package {
+ undef(@Students);
+ &Apache::studentcalc::clear_package();
+}
+
sub html_header {
my $self = shift;
my ($toprow,$bottomrow);
@@ -79,7 +87,7 @@ sub html_header {
['Enrollment Status',&Apache::lonhtmlcommon::StatusOptions(undef,undef,3)],
['Output Format',&Apache::Spreadsheet::output_selector()]) {
my ($name,$selector) = @{$_};
- $toprow .= '<th align="center"><b>'.$name.'</b></th>';
+ $toprow .= '<th align="center"><b>'.&mt($name).'</b></th>';
$bottomrow .= '<td>'.$selector.'</td>';
}
return "<p>\n<table>\n".
@@ -91,7 +99,7 @@ sub html_header {
sub get_title {
my $self = shift;
# Section info should be included
- my @title = ($self->{'coursedesc'}, scalar(localtime(time)) );
+ my @title = ($self->{'coursedesc'}, &Apache::lonlocal::locallocaltime(time) );
return @title;
}
@@ -112,23 +120,35 @@ sub outsheet_html {
###################################
# Determine table structure
###################################
+ my $importcolor = '#88FF88';
+ my $exportcolor = '#BBBBFF';
my $num_uneditable = 26;
my $num_left = 52-$num_uneditable;
+ my %lt=&Apache::lonlocal::texthash(
+ 'co' => 'Course',
+ 'im' => 'Import',
+ 'ca' => 'Calculations',
+ 'stu' => 'Student',
+ 'sta' => 'Status',
+ 'usr' => 'Username',
+ 'dom' => 'Domain',
+ 'sec' => 'Section',
+ );
my $tableheader =<<"END";
<p>
<table border="2">
<tr>
- <th colspan="2" rowspan="2"><font size="+2">Course</font></th>
- <td bgcolor="#FFDDDD" colspan="$num_uneditable">
- <b><font size="+1">Import</font></b></td>
+ <th colspan="2" rowspan="2"><font size="+2">$lt{'co'}</font></th>
+ <td bgcolor="$importcolor" colspan="$num_uneditable">
+ <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;
foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){
if ($label_num<$num_uneditable) {
- $tableheader.='<th bgcolor="#FFDDDD">';
+ $tableheader.='<th bgcolor="'.$importcolor.'">';
} else {
$tableheader.='<th>';
}
@@ -140,24 +160,25 @@ END
$r->print($tableheader);
#
# Print out template row
- $r->print('<tr><td>Template</td><td> </td>'.
- $self->html_template_row($num_uneditable)."</tr>\n");
+ $r->print('<tr><td>'.&mt('Template').'</td><td> </td>'.
+ $self->html_template_row($num_uneditable,$importcolor).
+ "</tr>\n");
#
# Print out summary/export row
- $r->print('<tr><td>Summary</td><td>0</td>'.
- $self->html_export_row()."</tr>\n");
+ $r->print('<tr><td>'.&mt('Summary').'</td><td>0</td>'.
+ $self->html_export_row($exportcolor)."</tr>\n");
#
# Prepare to output rows
$tableheader =<<"END";
</p><p>
<table border="2">
-<tr><th>Row</th>
- <th>student</th><th>username</th><th>domain</th>
- <th>section</th><th>status</th>
+<tr><th>$lt{'ro'}</th>
+ <th>$lt{'stu'}</th><th>$lt{'usr'}</th><th>$lt{'dom'}</th>
+ <th>$lt{'sec'}</th><th>$lt{'sta'}</th>
END
foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){
if ($label_num<$num_uneditable) {
- $tableheader.='<th bgcolor="#FFDDDD">';
+ $tableheader.='<th bgcolor="'.$importcolor.'">';
} else {
$tableheader.='<th>';
}
@@ -175,12 +196,14 @@ END
'&sdomain='.$student->{'domain'}.'">';
$student->{'section'} = 'none' if ($student->{'section'} eq '-1');
$r->print('<tr>'.'<td>'.$rownum.'</td>'.
- '<td>'.$link.$student->{'fullname'}.'</a></td>'.
- '<td>'.$student->{'username'}.'</td>'.
+ '<td>'.$student->{'fullname'}.'</td>'.
+ '<td>'.$link.$student->{'username'}.'</a></td>'.
'<td>'.$student->{'domain'} .'</td>'.
'<td>'.$student->{'section'} .'</td>'.
'<td>'.$student->{'status'} .'</td>'.
- $self->html_row($num_uneditable,$rownum)."</tr>\n");
+ $self->html_row($num_uneditable,$rownum,$exportcolor,
+ $importcolor).
+ "</tr>\n");
}
$r->print("</table></p>\n");
return;
@@ -190,12 +213,12 @@ sub excel_rows {
# writes the meat of the spreadsheet to an excel worksheet. Called
# by Spreadsheet::outsheet_excel;
my $self = shift;
- my ($worksheet,$cols_output,$rows_output) = @_;
+ my ($connection,$worksheet,$cols_output,$rows_output) = @_;
#
# Write a header row
$cols_output = 0;
- foreach my $value ('fullname','username','domain','section','status') {
- $worksheet->write($rows_output,$cols_output++,$value);
+ foreach my $value ('Fullname','Username','Domain','Section','Status','ID') {
+ $worksheet->write($rows_output,$cols_output++,&mt($value));
}
$rows_output++;
#
@@ -209,7 +232,8 @@ sub excel_rows {
$student->{'username'},
$student->{'domain'},
$student->{'section'},
- $student->{'status'});
+ $student->{'status'},
+ $student->{'id'});
$self->excel_output_row($worksheet,$rownum,$rows_output++,
@studentdata);
}
@@ -220,12 +244,12 @@ sub csv_rows {
# writes the meat of the spreadsheet to an excel worksheet. Called
# by Spreadsheet::outsheet_excel;
my $self = shift;
- my ($filehandle) = @_;
+ my ($connection,$filehandle) = @_;
#
# Write a header row
$self->csv_output_row($filehandle,undef,
- ('fullname','username','domain','section','status'));
+ (&mt('Fullname'),&mt('Username'),&mt('Domain'),&mt('Section'),&mt('Status'),&mt('ID')));
#
# Write each students row
foreach my $student (@Students) {
@@ -236,7 +260,8 @@ sub csv_rows {
$student->{'username'},
$student->{'domain'},
$student->{'section'},
- $student->{'status'});
+ $student->{'status'},
+ $student->{'id'});
$self->csv_output_row($filehandle,$rownum,@studentdata);
}
return;
@@ -250,18 +275,27 @@ sub outsheet_recursive_excel {
sub compute {
my $self = shift;
my ($r) = @_;
+ my $connection = $r->connection();
+ if ($connection->aborted()) { $self->cleanup(); return; }
$self->initialize_safe_space();
my %c = $self->constants();
my %f = $self->formulas();
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
- ($r,'Spreadsheet Computation Status',
- 'Spreadsheet Computation', scalar(@Students));
+ ($r,&mt('Spreadsheet Computation Status'),
+ &mt('Spreadsheet Computation'), scalar(@Students));
+ &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
+ &mt('Processing course structure'));
&Apache::studentcalc::initialize_package();
+ &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
+ &mt('Processing first student'));
foreach my $student (@Students) {
+ if ($connection->aborted()) { $self->cleanup(); return; }
my $sname = $student->{'username'}.':'.$student->{'domain'};
my $studentsheet = Apache::studentcalc->new
($student->{'username'},$student->{'domain'},undef);
- my @exportdata = $studentsheet->export_data();
+ if ($connection->aborted()) { $self->cleanup(); return; }
+ my @exportdata = $studentsheet->export_data($r);
+ if ($connection->aborted()) { $self->cleanup(); return; }
my $rownum = $self->get_row_number_from_key($sname);
$f{'A'.$rownum} = $sname;
$self->{'row_source'}->{$rownum} = $sname;