--- loncom/interface/spreadsheet/classcalc.pm 2003/06/12 17:06:44 1.8 +++ loncom/interface/spreadsheet/classcalc.pm 2003/09/05 01:06:45 1.11 @@ -1,5 +1,5 @@ # -# $Id: classcalc.pm,v 1.8 2003/06/12 17:06:44 matthew Exp $ +# $Id: classcalc.pm,v 1.11 2003/09/05 01:06:45 matthew 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(); @@ -112,6 +114,8 @@ sub outsheet_html { ################################### # Determine table structure ################################### + my $importcolor = '#88FF88'; + my $exportcolor = '#BBBBFF'; my $num_uneditable = 26; my $num_left = 52-$num_uneditable; my $tableheader =<<"END"; @@ -119,7 +123,7 @@ sub outsheet_html { - @@ -128,7 +132,7 @@ END my $label_num = 0; foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){ if ($label_num<$num_uneditable) { - $tableheader.=''. - $self->html_template_row($num_uneditable)."\n"); + $self->html_template_row($num_uneditable,$importcolor). + "\n"); # # Print out summary/export row $r->print(''. - $self->html_export_row()."\n"); + $self->html_export_row($exportcolor)."\n"); # # Prepare to output rows $tableheader =<<"END"; @@ -157,7 +162,7 @@ END END foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){ if ($label_num<$num_uneditable) { - $tableheader.=''. ''. ''. - $self->html_row($num_uneditable,$rownum)."\n"); + $self->html_row($num_uneditable,$rownum,$exportcolor, + $importcolor). + "\n"); } $r->print("
Course + Import Calculations'; + $tableheader.=''; } else { $tableheader.=''; } @@ -141,11 +145,12 @@ END # # Print out template row $r->print('
Template 
Summary0
'; + $tableheader.=''; } else { $tableheader.=''; } @@ -180,7 +185,9 @@ END ''.$student->{'domain'} .''.$student->{'section'} .''.$student->{'status'} .'

\n"); return; @@ -256,7 +263,11 @@ sub compute { my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin ($r,'Spreadsheet Computation Status', 'Spreadsheet Computation', scalar(@Students)); + &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, + 'Processing course structure'); &Apache::studentcalc::initialize_package(); + &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, + 'Processing first student'); foreach my $student (@Students) { my $sname = $student->{'username'}.':'.$student->{'domain'}; my $studentsheet = Apache::studentcalc->new