--- loncom/interface/statistics/lonstudentassessment.pm 2003/03/07 18:46:38 1.40
+++ loncom/interface/statistics/lonstudentassessment.pm 2003/05/12 22:07:17 1.46
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstudentassessment.pm,v 1.40 2003/03/07 18:46:38 matthew Exp $
+# $Id: lonstudentassessment.pm,v 1.46 2003/05/12 22:07:17 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -224,7 +224,8 @@ sub CreateInterface {
$Str .= '
';
$Str .= 'Sections | ';
$Str .= 'Student Data | ';
- $Str .= 'Problem Sets | ';
+ $Str .= 'Enrollment Status | ';
+ $Str .= 'Sequences and Folders | ';
$Str .= 'Output Format | ';
$Str .= '
'."\n";
#
@@ -242,6 +243,8 @@ sub CreateInterface {
$Str .= &Apache::lonstatistics::StudentDataSelect('StudentData','multiple',
5,undef);
$Str .= ''."\n";
+ $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5);
+ $Str .= ' | '."\n";
$Str .= &Apache::lonstatistics::MapSelect('Maps','multiple,all',5,
$only_seq_with_assessments);
$Str .= ' | '."\n";
@@ -381,7 +384,7 @@ sub OutputDescriptions {
sub CreateAndParseOutputSelector {
my $Str = '';
- my $elementname = 'outputmode';
+ my $elementname = 'chartoutputmode';
#
# Format for output options is 'mode, restrictions';
my $selected = 'html, with links';
@@ -596,8 +599,13 @@ sub StudentAverageTotal {
$Str .= ''."\n";
$Str .= "Title | Average | Maximum | \n";
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
- my $ave = int(100*($Statistics->{$seq->{'symb'}}->{'score'}/
- ($num_students-$nodata_count)))/100;
+ my $ave;
+ if ($num_students > $nodata_count) {
+ $ave = int(100*($Statistics->{$seq->{'symb'}}->{'score'}/
+ ($num_students-$nodata_count)))/100;
+ } else {
+ $ave = 0;
+ }
$total_ave += $ave;
my $max = $seq->{'num_assess_parts'};
$total_max += $max;
@@ -817,6 +825,26 @@ sub excel_initialize {
$rows_output += 1;
}
#
+ # Output a row for MAX
+ if ($show ne 'totals') {
+ $cols_output = 0;
+ foreach my $field (&get_student_fields_to_show()) {
+ if ($field eq 'username' || $field eq 'fullname' ||
+ $field eq 'id') {
+ $excel_sheet->write($rows_output,$cols_output++,'Maximum');
+ } else {
+ $excel_sheet->write($rows_output,$cols_output++,'');
+ }
+ }
+ #
+ # Add the Sequence Headers
+ foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+ $excel_sheet->write($rows_output,$cols_output++,
+ $seq->{'num_assess_parts'});
+ }
+ $rows_output++;
+ }
+ #
# Let the user know what we are doing
my $studentcount = scalar(@Apache::lonstatistics::Students);
$r->print("Compiling Excel spreadsheet for ".
@@ -1121,6 +1149,9 @@ sub StudentPerformanceOnSequence {
$symbol = ' ';
}
$sum++;
+ } elsif (exists($resource_data->{'resource.'.
+ $partnum.'.tries'})){
+ $symbol = '.';
} else {
$symbol = ' ';
}
|