--- loncom/interface/spreadsheet/classcalc.pm 2003/06/12 17:06:44 1.8
+++ loncom/interface/spreadsheet/classcalc.pm 2014/02/12 16:53:09 1.32
@@ -1,5 +1,5 @@
#
-# $Id: classcalc.pm,v 1.8 2003/06/12 17:06:44 matthew Exp $
+# $Id: classcalc.pm,v 1.32 2014/02/12 16:53:09 bisitz 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,27 +74,34 @@ sub initialize {
return;
}
+sub clear_package {
+ undef(@Students);
+ &Apache::studentcalc::clear_package();
+}
+
sub html_header {
my $self = shift;
my ($toprow,$bottomrow);
&Apache::lonstatistics::clear_classlist_variables();
- foreach (['Sections',&Apache::lonstatistics::SectionSelect('Section','multpile',3)],
- ['Enrollment Status',&Apache::lonhtmlcommon::StatusOptions(undef,undef,3)],
- ['Output Format',&Apache::Spreadsheet::output_selector()]) {
+ foreach (['Sections',&Apache::lonstatistics::SectionSelect('Section','multiple',3)],
+ ['Groups',&Apache::lonstatistics::GroupSelect('Group','multiple',3)],
+ ['Access Status',&Apache::lonhtmlcommon::StatusOptions(undef,undef,3)],
+ ['Output Format',$self->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".
"<tr>".$toprow."</tr>\n".
"<tr>".$bottomrow."</tr>\n".
- "</table>\n</p>";
+ "</table>\n".
+ "</p>";
}
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;
}
@@ -109,26 +119,45 @@ sub parent_link {
sub outsheet_html {
my $self = shift;
my ($r) = @_;
+ ####################################
+ # Report any calculation errors #
+ ####################################
+ $r->print($self->html_report_error());
###################################
# Determine table structure
###################################
+ my $importcolor = '#88FF88';
+ my $exportcolor = '#BBBBFF';
my $num_uneditable = 26;
my $num_left = 52-$num_uneditable;
+ #
+ my %header=&Apache::lonlocal::texthash(
+ 'course' => 'Course',
+ 'import' => 'Import',
+ 'calculations' => 'Calculations',
+ 'student' => 'Student',
+ 'status' => 'Status',
+ 'username' => 'Username',
+ 'domain' => 'Domain',
+ 'section' => 'Section',
+ 'groups' => 'Groups',
+ 'row' => 'Row',
+ );
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">$header{'course'}</font></th>
+ <td bgcolor="$importcolor" colspan="$num_uneditable">
+ <b><font size="+1">$header{'import'}</font></b></td>
<td colspan="$num_left">
- <b><font size="+1">Calculations</font></b></td>
+ <b><font size="+1">$header{'calculations'}</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 +169,29 @@ 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>$header{'row'}</th>
+ <th>$header{'student'}</th>
+ <th>$header{'username'}</th>
+ <th>$header{'domain'}</th>
+ <th>$header{'section'}</th>
+ <th>$header{'groups'}</th>
+ <th>$header{'status'}</th>
END
foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){
if ($label_num<$num_uneditable) {
- $tableheader.='<th bgcolor="#FFDDDD">';
+ $tableheader.='<th bgcolor="'.$importcolor.'">';
} else {
$tableheader.='<th>';
}
@@ -179,8 +213,11 @@ END
'<td>'.$link.$student->{'username'}.'</a></td>'.
'<td>'.$student->{'domain'} .'</td>'.
'<td>'.$student->{'section'} .'</td>'.
+ '<td>'.$student->{'groups'} .'</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 +227,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,$format) = @_;
#
# 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','Group','Status','ID') {
+ $worksheet->write($rows_output,$cols_output++,&mt($value),$format->{'h4'});
}
$rows_output++;
#
@@ -209,7 +246,9 @@ sub excel_rows {
$student->{'username'},
$student->{'domain'},
$student->{'section'},
- $student->{'status'});
+ $student->{'groups'},
+ $student->{'status'},
+ $student->{'id'});
$self->excel_output_row($worksheet,$rownum,$rows_output++,
@studentdata);
}
@@ -220,12 +259,11 @@ 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('Group'),&mt('Status'),&mt('ID')));
#
# Write each students row
foreach my $student (@Students) {
@@ -236,32 +274,136 @@ sub csv_rows {
$student->{'username'},
$student->{'domain'},
$student->{'section'},
- $student->{'status'});
+ $student->{'groups'},
+ $student->{'status'},
+ $student->{'id'});
$self->csv_output_row($filehandle,$rownum,@studentdata);
}
return;
}
+sub output_options {
+ my $self = shift();
+ return ({value => 'htmlclasslist',
+ description => 'Student Sheet Links'},
+ {value => 'source',
+ description => 'Show Source'},
+ {value => 'html',
+ description => 'HTML'},
+ {value => 'excel',
+ description => 'Excel'},
+ {value => 'csv',
+ description => 'Comma Separated Values'},
+# {value => 'xml',
+# description => 'XML'},
+ );
+}
+
sub outsheet_recursive_excel {
my $self = shift;
my ($r) = @_;
-}
+}
+
+sub outsheet_htmlclasslist {
+ my $self = shift;
+ my ($r) = @_;
+ #
+ # Determine if we should output expire caches links...
+ my $show_expire_link = 0;
+ if (exists($env{'user.role.dc./'.$env{'request.role.domain'}.'/'})){
+ $show_expire_link = 1;
+ }
+ #
+ if ($show_expire_link) {
+ $r->print('<a href="/adm/classcalc?output_format=htmlclasslist&'.
+ 'recalc=expireallsheets¬_first_run=1">'.
+ &mt('Expire all student spreadsheets').'</a>'.$/);
+ }
+ #
+ $r->print('<p class="LC_info">'.
+ &mt('Click on a student to be taken to their spreadsheet').
+ '</p>');
+ #
+ my %header=&Apache::lonlocal::texthash(
+ 'student' => 'Student',
+ 'status' => 'Status',
+ 'username' => 'Username',
+ 'domain' => 'Domain',
+ 'section' => 'Section',
+ 'groups' => 'Groups',
+ );
+ #
+ # Prepare to output rows
+ my $tableheader =<<"END";
+</p><p>
+<table border="2">
+<tr>
+ <th></th>
+ <th>$header{'student'}</th>
+ <th>$header{'username'}</th>
+ <th>$header{'domain'}</th>
+ <th>$header{'section'}</th>
+ <th>$header{'groups'}</th>
+ <th>$header{'status'}</th>
+END
+ if ($show_expire_link) {
+ $tableheader.= '<th> </th>';
+ }
+ $tableheader.= "</tr>\n";
+ #
+ my $num_output = 0;
+ foreach my $student (@Students) {
+ if ($num_output++ % 50 == 0) {
+ $r->print("</table>\n".$tableheader);
+ }
+ my $link = '<a href="/adm/studentcalc?sname='.$student->{'username'}.
+ '&sdomain='.$student->{'domain'}.'">';
+ $student->{'section'} = 'none' if ($student->{'section'} eq '-1');
+ $r->print('<tr>'.
+ '<td>'.$num_output.'</td>'.
+ '<td>'.$link.$student->{'fullname'}.'</a></td>'.
+ '<td>'.$link.$student->{'username'}.'</a></td>'.
+ '<td>'.$student->{'domain'} .'</td>'.
+ '<td>'.$student->{'section'} .'</td>'.
+ '<td>'.$student->{'groups'} .'</td>'.
+ '<td>'.$student->{'status'} .'</td>');
+ if ($show_expire_link) {
+ $r->print('<td>'.
+ '<a href="/adm/classcalc?recalc=student:'.
+ $student->{'username'}.':'.$student->{'domain'}.'&'.
+ 'output_format=htmlclasslist&'.
+ 'not_first_run=1'.'">'.&mt('Expire Record').'</a>'.$/);
+ }
+ $r->print("</tr>\n");
+ }
+ $r->print("</table></p>\n");
+ return;
+}
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));
&Apache::studentcalc::initialize_package();
+ my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@Students));
+ &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();
+ ($student->{'username'},$student->{'domain'},undef,undef,
+ $student->{'section'},$student->{'groupref'} );
+ if ($connection->aborted()) { $self->cleanup(); return; }
+ my @exportdata = $studentsheet->export_data($r);
+ if ($studentsheet->badcalc()) {
+ $self->set_calcerror($sname.' : '.
+ $studentsheet->calcerror());
+ }
+ if ($connection->aborted()) { $self->cleanup(); return; }
my $rownum = $self->get_row_number_from_key($sname);
$f{'A'.$rownum} = $sname;
$self->{'row_source'}->{$rownum} = $sname;
@@ -274,8 +416,7 @@ sub compute {
$c{$cell} = $data;
}
}
- &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
- 'last student');
+ &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
}
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
$r->rflush();