--- loncom/interface/statistics/lonstudentassessment.pm 2003/06/11 16:19:39 1.58
+++ loncom/interface/statistics/lonstudentassessment.pm 2003/10/29 16:20:14 1.73
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstudentassessment.pm,v 1.58 2003/06/11 16:19:39 matthew Exp $
+# $Id: lonstudentassessment.pm,v 1.73 2003/10/29 16:20:14 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -138,8 +138,21 @@ Inputs:
#######################################################
sub BuildStudentAssessmentPage {
my ($r,$c)=@_;
+
undef($Statistics);
+ undef($show_links);
+ undef($output_mode);
+ undef($data);
+ undef($base);
+ undef($datadescription);
+ undef($single_student_mode);
+
+ $single_student_mode = 0;
$single_student_mode = 1 if ($ENV{'form.SelectedStudent'});
+ if ($ENV{'form.selectstudent'}) {
+ &Apache::lonstatistics::DisplayClasslist($r);
+ return;
+ }
#
# Print out the HTML headers for the interface
# This also parses the output mode selector
@@ -187,6 +200,9 @@ sub BuildStudentAssessmentPage {
# are immediately reflected in the chart.
&Apache::lonnet::clear_EXT_cache_status();
#
+ # Clean out loncoursedata's package data, just to be safe.
+ &Apache::loncoursedata::clear_internal_caches();
+ #
# Call the initialize routine selected above
$initialize->($r);
foreach my $student (@Students) {
@@ -326,7 +342,13 @@ sub CreateInterface {
$Str .= ''."\n";
$Str .= ''."\n";
$Str .= '';
- $Str .= ' 'x8;
+ $Str .= ' 'x5;
+ $Str .= '';
+ $Str .= ' 'x5;
+ $Str .= '';
+ $Str .= ' 'x5;
+ $Str .= '
';
return $Str;
}
@@ -397,6 +419,8 @@ sub OutputDescriptions {
sub CreateAndParseOutputSelector {
my $Str = '';
my $elementname = 'chartoutputmode';
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ [$elementname]);
#
# Format for output options is 'mode, restrictions';
my $selected = 'html, without links';
@@ -434,21 +458,7 @@ sub CreateAndParseOutputSelector {
##
my @OutputDataOptions =
(
- { 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',
+ { name => 'Scores Summary',
base => 'scores',
value => 'sum and total',
shortdesc => 'Total Score and Maximum Possible for each '.
@@ -456,13 +466,27 @@ my @OutputDataOptions =
longdesc => 'The score of each student as well as the '.
' maximum possible on each Sequence or Folder.',
},
- { name => 'Scores Summary Table Only',
+ { name => 'Scores Per Problem',
base => 'scores',
- value => 'final table scores',
- shortdesc => 'Summary of Scores',
- longdesc => 'The average score on each sequence or folder for the '.
- 'selected students.',
+ 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 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',
@@ -471,25 +495,25 @@ my @OutputDataOptions =
},
{ 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.',
- },
+# { 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 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 {
@@ -572,6 +596,7 @@ sub html_initialize {
$padding = ' 'x3;
$count = 0;
$nodata_count = 0;
+ undef(%prog_state);
#
$r->print("