--- loncom/interface/statistics/lonstudentassessment.pm	2003/06/11 14:41:59	1.56
+++ loncom/interface/statistics/lonstudentassessment.pm	2003/06/11 15:04:55	1.57
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentassessment.pm,v 1.56 2003/06/11 14:41:59 matthew Exp $
+# $Id: lonstudentassessment.pm,v 1.57 2003/06/11 15:04:55 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -366,29 +366,12 @@ my @OutputOptions =
        mode => 'excel',
        show_links => 'no',
    },
-#     { name  => 'multi-sheet Excel',
-#       value => 'multi-sheet excel',
-#       description => 'Output an Excel file (compatable with Excel 95), '.
-#	   'with a seperate worksheet for each sequence you have selected '.
-#           'the data for each problem part '.
-#           '(number of tries, status, points awarded) will be listed.',
-#       mode => 'multi-sheet excel',
-#       show_links => 'no',
-#           },
-#     { name  => 'multi-sheet Excel, by section',
-#       value => 'multi-sheet excel, by section',
-#       description => 'Output an Excel file (compatable with Excel 95), '.
-#	   'with a seperate worksheet for each sequence you have selected '.
-#           'the data for each problem part '.
-#           '(number of tries, status, points awarded) will be listed.  '.
-#           'There will be one Excel workbook for each section selected.',
-#       mode => 'multi-sheet excel',
-#       show_links => 'no',
-#           },
      { name  => 'CSV',
        value => 'csv',
        description => 'Output a comma seperated values file suitable for '.
-           'import into a spreadsheet.',
+           'import into a spreadsheet program.  Using this method as opposed '.
+           'to Excel output allows you to organize your data before importing'.
+           ' it into a spreadsheet program.',
        mode => 'csv',
        show_links => 'no',
            },
@@ -445,61 +428,75 @@ sub CreateAndParseOutputSelector {
 ## Data selector stuff
 ##
 my @OutputDataOptions =
-    ( { name  =>'Tries',
-        base  =>'tries',
-        value => 'tries',
-        shortdesc => 'Number of Tries before success on each Problem Part',
-        longdesc =>'The number of tries before success on each problem part.',
-        },
-      { name  =>'Parts Correct',
-        base  =>'tries',
-        value => 'parts correct',
-        shortdesc => 'Number of Problem Parts completed successfully.',
-        longdesc => 'The Number of Problem Parts completed successfully.',
-        },
-      { name  =>'Parts Correct & Maximums',
-        base  =>'tries',
-        value => 'parts correct total',
-        shortdesc => 'Number of Problem Parts completed successfully.',
-        longdesc => 'The Number of Problem Parts completed successfully and '.
-            'the maximum possible for each student',
-        },
-      { name  => 'Scores',
-        base  => 'scores',
-        value => 'scores',
-        shortdesc => 'Score on each Problem Part',
-        longdesc =>'The students score on each problem part, computed as'.
-            'the part weight * part awarded',
-        },
-      { name  => 'Scores Sum',
-        base  => 'scores',
-        value => 'sum only',
-        shortdesc => 'Sum of Scores on each Problem Part',
-        longdesc =>'The total of the scores of the student on each problem'.
-            ' part in the sequences or folders selected.',
-        },
-      { name  => 'Scores Sum & Maximums',
-        base  => 'scores',
-        value => 'sum and total',
-        shortdesc => 'Total Score and Maximum Possible for each '.
-            'Sequence or Folder',
-        longdesc => 'The total of the scores of the student on each problem'.
-            ' and the maximum possible for that student on each Sequence or '.
-            ' Folder.',
-        },
-      { name  => 'Summary Table (Scores)',
-        base  => 'scores',
-        value => 'final table scores',
-        shortdesc => 'Summary of Scores',
-        longdesc  => '',
-        },
-      { name  => 'Summary Table (Parts)',
-        base  => 'tries',
-        value => 'final table parts',
-        shortdesc => 'Summary of Parts Correct',
-        longdesc  => '',
-        }
-      );
+    (
+     { name  => 'Scores',
+       base  => 'scores',
+       value => 'scores',
+       shortdesc => 'Score on each Problem Part',
+       longdesc =>'The students score on each problem part, computed as'.
+           'the part weight * part awarded',
+       },
+     { name  => 'Scores Sum',
+       base  => 'scores',
+       value => 'sum only',
+       shortdesc => 'Sum of Scores on each Problem Part',
+       longdesc =>'The total of the scores of the student on each problem'.
+           ' part in the sequences or folders selected.',
+       },
+     { name  => 'Scores Sum & Maximums',
+       base  => 'scores',
+       value => 'sum and total',
+       shortdesc => 'Total Score and Maximum Possible for each '.
+           'Sequence or Folder',
+       longdesc => 'The score of each student as well as the '.
+           ' maximum possible on each Sequence or Folder.',
+       },
+     { name  => 'Scores Summary Table Only',
+       base  => 'scores',
+       value => 'final table scores',
+       shortdesc => 'Summary of Scores',
+       longdesc  => 'The average score on each sequence or folder for the '.
+           'selected students.',
+       },
+     { name  =>'Tries',
+       base  =>'tries',
+       value => 'tries',
+       shortdesc => 'Number of Tries before success on each Problem Part',
+       longdesc =>'The number of tries before success on each problem part.',
+       },
+     { name  =>'Parts Correct',
+       base  =>'tries',
+       value => 'parts correct',
+       shortdesc => 'Number of Problem Parts completed successfully.',
+       longdesc => 'The Number of Problem Parts completed successfully'.
+           ' on each sequence or folder.',
+       },
+     { name  =>'Parts Correct & Maximums',
+       base  =>'tries',
+       value => 'parts correct total',
+       shortdesc => 'Number of Problem Parts completed successfully.',
+       longdesc => 'The Number of Problem Parts completed successfully and '.
+           'the maximum possible for each student',
+       },
+     { name  => 'Parts Summary Table Only',
+       base  => 'tries',
+       value => 'final table parts',
+       shortdesc => 'Summary of Parts Correct',
+       longdesc  => 'A summary table of the average number of problem parts '.
+           'students were able to get correct on each sequence.',
+       },
+     );
+
+sub HTMLifyOutputDataDescriptions {
+    my $Str = '';
+    $Str .= "<dl>\n";
+    foreach my $option (@OutputDataOptions) {
+        $Str .= '    <dt>'.$option->{'name'}.'</dt>';
+        $Str .= '<dd>'.$option->{'longdesc'}.'</dd>'."\n";
+    }
+    $Str .= "</dl>\n";
+    return $Str;
+}
 
 sub CreateAndParseOutputDataSelector {
     my $Str = '';
@@ -791,78 +788,6 @@ sub SingleStudentTotal {
 #######################################################
 #######################################################
 
-=pod
-
-=head2 Multi-Sheet EXCEL subroutines
-
-=item &multi_sheet_excel_initialize($r)
-
-=item &multi_sheet_excel_outputstudent($r,$student)
-
-=item &multi_sheet_excel_finish($r)
-
-=cut
-
-#######################################################
-#######################################################
-{
-
-sub multi_sheet_excel_initialize {
-    my ($r)=@_;
-    $r->print("<h1>Not yet implemented</h1>");
-    # 
-    # Estimate the size of the file.  We would like to have < 5 megs of data.
-    my $max_size = 5000000;
-    my $num_students  = scalar(@Apache::lonstatistics::Students);
-    my $num_sequences = 0;
-    my $num_data_per_part  = 2; # 'status' and 'numtries'
-    my $fields_per_student = scalar(&get_student_fields_to_show());
-    my $bytes_per_field    = 20; # Back of the envelope calculation
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-        $num_sequences++ if ($seq->{'num_assess'} > 0);
-        $fields_per_student += $num_data_per_part * $seq->{'num_assess_parts'};
-    }
-    my $size_estimate = $fields_per_student*$num_students*$bytes_per_field;
-    #
-    # Compute number of workbooks
-    my $num_workbooks = 1;
-    if ($size_estimate > $max_size) { # try to stay under 5 megs
-        $num_workbooks += int($size_estimate / $max_size);
-    }
-#    if ($data eq ) {
-#        if (@Apache::lonstatistics::SelectedSections > 1 && 
-#            $Apache::lonstatistics::SelectedSections[0] ne 'all') {
-#            $num_workbooks = scalar(@Apache::lonstatistics::SelectedSections);
-#        } else {
-#            # @Apache::lonstatistics::Sections contains 'all' as well.
-#            $num_workbooks = scalar(@Apache::lonstatistics::Sections) - 1;
-#        }
-#    }
-    
-    $r->print("Maximum allowed size: ".$max_size." bytes<br />");
-    $r->print("Number of students: ".$num_students."<br />");
-    $r->print("Number of fields per student: ".$fields_per_student."<br />");
-    $r->print("Total number of fields: ".($fields_per_student*$num_students).
-              "<br />");
-    $r->print("Bytes per field: ".$bytes_per_field." (estimated)"."<br />");
-    $r->print("Estimated size: ".$size_estimate." bytes<br />");
-    $r->print("Number of workbooks: ".$num_workbooks."<br />");
-    $r->rflush();
-    return;
-}
-
-sub multi_sheet_excel_outputstudent {
-    my ($r,$student) = @_;
-}
-
-sub multi_sheet_excel_finish {
-    my ($r) = @_;
-}
-
-}
-#######################################################
-#######################################################
-
 =pod
 
 =head2 EXCEL subroutines