--- loncom/interface/spreadsheet/classcalc.pm	2003/05/23 21:03:29	1.4
+++ loncom/interface/spreadsheet/classcalc.pm	2003/06/23 19:58:18	1.10
@@ -1,5 +1,5 @@
 #
-# $Id: classcalc.pm,v 1.4 2003/05/23 21:03:29 matthew Exp $
+# $Id: classcalc.pm,v 1.10 2003/06/23 19:58:18 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,6 +51,7 @@ use Apache::loncoursedata();
 use Apache::lonhtmlcommon();
 use Apache::Spreadsheet;
 use Apache::studentcalc;
+use Apache::lonstatistics();
 use HTML::Entities();
 use Spreadsheet::WriteExcel;
 use Apache::lonnet;
@@ -58,10 +59,23 @@ use Time::HiRes;
 
 @Apache::classcalc::ISA = ('Apache::Spreadsheet');
 
+##
+## Package variable
+##
+
+my @Students;
+
+sub initialize {
+    &Apache::lonstatistics::clear_classlist_variables();
+    @Students = &Apache::lonstatistics::get_students();
+    return;
+}
+
 sub html_header {
     my $self = shift;
     my ($toprow,$bottomrow);
-    foreach (['Sections','Section selector goes here'],
+    &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()]) {
         my ($name,$selector) = @{$_};
@@ -74,26 +88,6 @@ sub html_header {
         "</table>\n</p>";
 }
 
-sub get_classlist {
-    my $self = shift;
-    # Retrieve the classlist
-    my @Students = ();
-    my ($classlist,$field_names) = &Apache::loncoursedata::get_classlist
-        ($self->{'cid'},$self->{'cdom'},$self->{'cnum'});
-    while (my ($student,$student_data) = each (%$classlist)) {
-        my $studenthash = ();
-        for (my $i=0; $i< scalar(@$field_names);$i++) {
-            my $field = $field_names->[$i];
-            $studenthash->{$field}=$student_data->[$i];
-        }
-        # This is where we can skip students because they are in 
-        # the wrong section, have expired or pending roles, whatever...
-        push (@Students,$studenthash);
-    }
-    my @SortedStudents = sort { $a->{'fullname'} cmp $b->{'fullname'} } @Students;
-    return @SortedStudents;
-}
-
 sub get_title {
     my $self = shift;
     # Section info should be included
@@ -118,6 +112,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";
@@ -125,7 +121,7 @@ sub outsheet_html {
 <table border="2">
 <tr>
   <th colspan="2" rowspan="2"><font size="+2">Course</font></th>
-  <td bgcolor="#FFDDDD" colspan="$num_uneditable">
+  <td bgcolor="$importcolor" colspan="$num_uneditable">
       <b><font size="+1">Import</font></b></td>
   <td colspan="$num_left">
       <b><font size="+1">Calculations</font></b></td>
@@ -134,7 +130,7 @@ END
     my $label_num = 0;
     foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){
         if ($label_num<$num_uneditable) { 
-            $tableheader.='<th bgcolor="#FFDDDD">';
+            $tableheader.='<th bgcolor="'.$importcolor.'">';
         } else {
             $tableheader.='<th>';
         }
@@ -147,11 +143,12 @@ END
     #
     # Print out template row
     $r->print('<tr><td>Template</td><td>&nbsp;</td>'.
-	      $self->html_template_row($num_uneditable)."</tr>\n");
+	      $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");
+	      $self->html_export_row($exportcolor)."</tr>\n");
     #
     # Prepare to output rows
     $tableheader =<<"END";
@@ -163,7 +160,7 @@ END
 END
     foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){
 	if ($label_num<$num_uneditable) { 
-            $tableheader.='<th bgcolor="#FFDDDD">';
+            $tableheader.='<th bgcolor="'.$importcolor.'">';
         } else {
             $tableheader.='<th>';
         }
@@ -171,7 +168,7 @@ END
     }
     #
     my $num_output = 0;
-    foreach my $student ($self->get_classlist()) {
+    foreach my $student (@Students) {
 	if ($num_output++ % 50 == 0) {
 	    $r->print("</table>\n".$tableheader);
 	}
@@ -181,12 +178,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;
@@ -206,7 +205,7 @@ sub excel_rows {
     $rows_output++;    
     #
     # Write each students row
-    foreach my $student ($self->get_classlist()) {
+    foreach my $student (@Students) {
         $cols_output = 0;
 	my $rownum = $self->get_row_number_from_key
 	    ($student->{'username'}.':'.$student->{'domain'});
@@ -234,7 +233,7 @@ sub csv_rows {
                           ('fullname','username','domain','section','status'));
     #
     # Write each students row
-    foreach my $student ($self->get_classlist()) {
+    foreach my $student (@Students) {
 	my $rownum = $self->get_row_number_from_key
 	    ($student->{'username'}.':'.$student->{'domain'});
         $student->{'section'} = 'none' if ($student->{'section'} eq '-1');
@@ -259,12 +258,15 @@ sub compute {
     $self->initialize_safe_space();
     my %c = $self->constants();
     my %f = $self->formulas();
-    my @Students = $self->get_classlist();
     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();
-    foreach my $student ($self->get_classlist()) {
+    &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
 	    ($student->{'username'},$student->{'domain'},undef);
@@ -289,6 +291,7 @@ sub compute {
     $self->constants(\%c);
     $self->formulas(\%f);
     $self->calcsheet();
+    $self->save() if ($self->need_to_save());
 }
 
 1;