--- loncom/interface/spreadsheet/classcalc.pm	2003/10/14 18:36:54	1.14
+++ loncom/interface/spreadsheet/classcalc.pm	2003/12/08 19:39:08	1.17
@@ -1,5 +1,5 @@
 #
-# $Id: classcalc.pm,v 1.14 2003/10/14 18:36:54 www Exp $
+# $Id: classcalc.pm,v 1.17 2003/12/08 19:39:08 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -85,7 +85,7 @@ 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>';
@@ -117,6 +117,10 @@ sub parent_link {
 sub outsheet_html {
     my $self = shift;
     my ($r) = @_;
+    ####################################
+    # Report any calculation errors    #
+    ####################################
+    $r->print($self->html_report_error());
     ###################################
     # Determine table structure
     ###################################
@@ -124,25 +128,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;
@@ -172,9 +178,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) { 
@@ -247,7 +256,6 @@ sub csv_rows {
     my ($connection,$filehandle) = @_;
     #
     # Write a header row
-
     $self->csv_output_row($filehandle,undef,
                    (&mt('Fullname'),&mt('Username'),&mt('Domain'),&mt('Section'),&mt('Status'),&mt('ID')));
     #
@@ -267,10 +275,74 @@ 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'},
+);
+}
+
 sub outsheet_recursive_excel {
     my $self = shift;
     my ($r) = @_;
-} 
+}
+
+sub outsheet_htmlclasslist {
+    my $self = shift;
+    my ($r) = @_;
+    #
+    $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>
+</tr>
+END
+    #
+    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>'.
+                  "</tr>\n");
+    }
+    $r->print("</table></p>\n");
+    return;
+}
 
 sub compute {
     my $self = shift;
@@ -295,6 +367,10 @@ sub compute {
 	    ($student->{'username'},$student->{'domain'},undef);
         if ($connection->aborted()) { $self->cleanup(); return; }
 	my @exportdata = $studentsheet->export_data($r);
+        if ($studentsheet->badcalc()) {
+            $self->set_calcerror($sname.' : '.
+                                 $studentsheet->calcerror());
+        }
         if ($connection->aborted()) { $self->cleanup(); return; }
 	my $rownum = $self->get_row_number_from_key($sname);
         $f{'A'.$rownum} = $sname;