--- loncom/interface/spreadsheet/classcalc.pm	2003/11/17 19:55:41	1.15
+++ loncom/interface/spreadsheet/classcalc.pm	2004/06/08 15:55:38	1.21
@@ -1,5 +1,5 @@
 #
-# $Id: classcalc.pm,v 1.15 2003/11/17 19:55:41 matthew Exp $
+# $Id: classcalc.pm,v 1.21 2004/06/08 15:55:38 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -85,15 +85,21 @@ sub html_header {
     &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()]) {
+             ['Output Format',$self->output_selector()]) {
         my ($name,$selector) = @{$_};
         $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 {
@@ -128,25 +134,27 @@ sub outsheet_html {
     my $exportcolor = '#BBBBFF';
     my $num_uneditable = 26;
     my $num_left = 52-$num_uneditable;
-    my %lt=&Apache::lonlocal::texthash(
-				       'co' => 'Course',
-				       'im' => 'Import',
-				       'ca' => 'Calculations',
-				       'stu' => 'Student',
-				       'sta' => 'Status',
-				       'usr' => 'Username',
-				       'dom' => 'Domain',
-				       'sec' => 'Section',
-				       );
+    #
+    my %header=&Apache::lonlocal::texthash(
+                                           'course'       => 'Course',
+                                           'import'       => 'Import',
+                                           'calculations' => 'Calculations',
+                                           'student'      => 'Student',
+                                           'status'       => 'Status',
+                                           'username'     => 'Username',
+                                           'domain'       => 'Domain',
+                                           'section'      => 'Section',
+                                           'row'          => 'Row',
+                                           );
     my $tableheader =<<"END";
 <p>
 <table border="2">
 <tr>
-  <th colspan="2" rowspan="2"><font size="+2">$lt{'co'}</font></th>
+  <th colspan="2" rowspan="2"><font size="+2">$header{'course'}</font></th>
   <td bgcolor="$importcolor" colspan="$num_uneditable">
-      <b><font size="+1">$lt{'im'}</font></b></td>
+      <b><font size="+1">$header{'import'}</font></b></td>
   <td colspan="$num_left">
-      <b><font size="+1">$lt{'ca'}</font></b></td>
+      <b><font size="+1">$header{'calculations'}</font></b></td>
 </tr><tr>
 END
     my $label_num = 0;
@@ -176,9 +184,12 @@ END
     $tableheader =<<"END";
 </p><p>
 <table border="2">
-<tr><th>$lt{'ro'}</th>
-  <th>$lt{'stu'}</th><th>$lt{'usr'}</th><th>$lt{'dom'}</th>
-  <th>$lt{'sec'}</th><th>$lt{'sta'}</th>
+<tr><th>$header{'row'}</th>
+  <th>$header{'student'}</th>
+  <th>$header{'username'}</th>
+  <th>$header{'domain'}</th>
+  <th>$header{'section'}</th>
+  <th>$header{'status'}</th>
 END
     foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){
 	if ($label_num<$num_uneditable) { 
@@ -270,11 +281,109 @@ sub csv_rows {
     return;
 }
 
+sub output_options {
+    my $self = shift();
+    return  ({value       => 'htmlclasslist',
+              description => 'Student Sheet Links'},
+             {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=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>');
+    #
+    my %header=&Apache::lonlocal::texthash(
+                                           'student'      => 'Student',
+                                           'status'       => 'Status',
+                                           'username'     => 'Username',
+                                           'domain'       => 'Domain',
+                                           'section'      => 'Section',
+                                           );
+    #
+    # 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{'status'}</th>
+END
+    if ($show_expire_link) {
+        $tableheader.= '<th>&nbsp;</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->{'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) = @_;
@@ -283,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) {
@@ -319,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;