--- loncom/interface/spreadsheet/classcalc.pm	2003/11/21 21:51:28	1.16
+++ loncom/interface/spreadsheet/classcalc.pm	2004/06/04 21:43:36	1.20
@@ -1,5 +1,5 @@
 #
-# $Id: classcalc.pm,v 1.16 2003/11/21 21:51:28 matthew Exp $
+# $Id: classcalc.pm,v 1.20 2004/06/04 21:43:36 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -285,7 +285,9 @@ sub output_options {
               description => 'Excel'},
              {value       => 'csv',
               description => 'Comma Separated Values'},
-);
+#             {value       => 'xml',
+#              description => 'XML'},
+             );
 }
 
 sub outsheet_recursive_excel {
@@ -297,6 +299,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>');
@@ -314,13 +328,17 @@ sub outsheet_htmlclasslist {
 </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{'status'}</th>
-</tr>
 END
+    if ($show_expire_link) {
+        $tableheader.= '<th>&nbsp;</th>';
+    }
+    $tableheader.= "</tr>\n";
     #
     my $num_output = 0;
     foreach my $student (@Students) {
@@ -331,12 +349,20 @@ END
             '&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->{'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;
@@ -350,13 +376,11 @@ sub compute {
     $self->initialize_safe_space();
     my %c = $self->constants();
     my %f = $self->formulas();
+    &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();
-    &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
                                           &mt('Processing first student'));
     foreach my $student (@Students) {
         if ($connection->aborted()) { $self->cleanup(); return; }