--- loncom/interface/spreadsheet/classcalc.pm	2003/12/08 19:39:08	1.17
+++ loncom/interface/spreadsheet/classcalc.pm	2004/06/08 15:55:38	1.21
@@ -1,5 +1,5 @@
 #
-# $Id: classcalc.pm,v 1.17 2003/12/08 19:39:08 matthew Exp $
+# $Id: classcalc.pm,v 1.21 2004/06/08 15:55:38 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -90,10 +90,16 @@ sub html_header {
         $toprow .= '<th align="center"><b>'.&mt($name).'</b></th>';
         $bottomrow .= '<td>'.$selector.'</td>';
     }
+    my $status .= '<nobr>'.&mt('Status: [_1]',
+                            '<input type="text" '.
+                            'name="spreadsheet_status" size="60" value="" />'
+                            ).'</nobr>';
+
     return "<p>\n<table>\n".
         "<tr>".$toprow."</tr>\n".
         "<tr>".$bottomrow."</tr>\n".
-        "</table>\n</p>";
+        "</table>\n".$status."\n".
+        "</p>";
 }
 
 sub get_title {
@@ -285,7 +291,9 @@ sub output_options {
               description => 'Excel'},
              {value       => 'csv',
               description => 'Comma Separated Values'},
-);
+#             {value       => 'xml',
+#              description => 'XML'},
+             );
 }
 
 sub outsheet_recursive_excel {
@@ -297,6 +305,18 @@ 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=ilovewastingtime&not_first_run=1">'.
+                  &mt('Expire all student spreadsheets').'</a>'.$/);
+    }
+    #
     $r->print('<h3>'.
               &mt('Click on a student to be taken to their spreadsheet').
               '</h3>');
@@ -320,8 +340,11 @@ sub outsheet_htmlclasslist {
   <th>$header{'domain'}</th>
   <th>$header{'section'}</th>
   <th>$header{'status'}</th>
-</tr>
 END
+    if ($show_expire_link) {
+        $tableheader.= '<th>&nbsp;</th>';
+    }
+    $tableheader.= "</tr>\n";
     #
     my $num_output = 0;
     foreach my $student (@Students) {
@@ -337,13 +360,30 @@ END
 		  '<td>'.$link.$student->{'username'}.'</a></td>'.
 		  '<td>'.$student->{'domain'}  .'</td>'.
 		  '<td>'.$student->{'section'} .'</td>'.
-		  '<td>'.$student->{'status'}  .'</td>'.
-                  "</tr>\n");
+		  '<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'.'">Expire Record</a>'.$/);
+        }
+        $r->print("</tr>\n");
     }
     $r->print("</table></p>\n");
     return;
 }
 
+sub update_status {
+    my ($r,$message) = @_;
+    $r->print('<script>'.
+              'window.document.sheet.spreadsheet_status.value="'.
+              $message.
+              '";</script>');
+    $r->rflush();
+    return;
+}
+
 sub compute {
     my $self = shift;
     my ($r) = @_;
@@ -352,12 +392,12 @@ sub compute {
     $self->initialize_safe_space();
     my %c = $self->constants();
     my %f = $self->formulas();
+    &update_status($r,'Initializing Course Structure');
+    &Apache::studentcalc::initialize_package();
     my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
         ($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();
+         &mt('Spreadsheet Computation'), scalar(@Students),'inline',undef,
+         'sheet','spreadsheet_status');
     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
                                           &mt('Processing first student'));
     foreach my $student (@Students) {
@@ -388,11 +428,13 @@ sub compute {
                                                  'last student');
     }
     &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+    &update_status($r,'Done computing student sheets');
     $r->rflush();
     $self->constants(\%c);
     $self->formulas(\%f);
     $self->calcsheet();
     $self->save() if ($self->need_to_save());
+    &update_status($r,'Done!');
 }
 
 1;