--- loncom/interface/statistics/lonstudentassessment.pm 2002/11/08 22:16:47 1.18 +++ loncom/interface/statistics/lonstudentassessment.pm 2003/01/09 15:59:17 1.25 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # (Publication Handler # -# $Id: lonstudentassessment.pm,v 1.18 2002/11/08 22:16:47 matthew Exp $ +# $Id: lonstudentassessment.pm,v 1.25 2003/01/09 15:59:17 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,11 +30,11 @@ # 11/1,11/4,11/16,12/14,12/16,12/18,12/20,12/31 Behrouz Minaei # YEAR=2002 # 1/22,2/1,2/6,2/25,3/2,3/6,3/17,3/21,3/22,3/26,4/7,5/6 Behrouz Minaei -# 5/12,5/14,5/15,5/19,5/26,7/16 Behrouz Minaei +# 5/12,5/14,5/15,5/19,5/26,7/16,12/24 Behrouz Minaei # ### -package Apache::lonstudentassessment; +package Apache::lonstudentassessment; use strict; use Apache::lonhtmlcommon; @@ -77,10 +77,10 @@ sub BuildStudentAssessmentPage { } } my ($infoHeadings, $infoKeys, $sequenceHeadings, $sequenceKeys, - $doNotShow) = + $doNotShow) = &ShouldShowColumns(\%cache, $headings, $studentInformation); - my $selectedName = &FindSelectedStudent(\%cache, + my $selectedName = &FindSelectedStudent(\%cache, $cache{'StudentAssessmentStudent'}, $students); $r->print(&CreateInterface(\%cache, $selectedName, $students, $formName, @@ -101,6 +101,7 @@ sub BuildStudentAssessmentPage { if($c->aborted()) { return $Str; } my $selected=0; + my $Count = 0; $r->print('
'."\n");
     foreach (@$students) {
         if($c->aborted()) { return $Str; }
@@ -132,8 +133,16 @@ sub BuildStudentAssessmentPage {
                     push(@before, $_);
                 }
             }
-            my $displayString = 'DISPLAYDATA'.$spacing;
-            $r->print(&Apache::lonhtmlcommon::FormatStudentInformation(
+            $Count++;
+	    my $out = '';
+#	    $out .= sprintf("%3d", $Count);
+            if($Count % 2) {
+                $out .= '';
+            } else {
+                $out .= '';
+            }
+	    my $displayString = $out.'DISPLAYDATA'.$spacing;
+	    $r->print(&Apache::lonhtmlcommon::FormatStudentInformation(
                                                          \%cache, $_,
                                                          \@before,
                                                          $displayString,
@@ -165,14 +174,10 @@ sub BuildStudentAssessmentPage {
         }
     }
 
-
-#    $r->print("AverageTtal");
-    $r->print(&StudentAverageTotal(\%cache, $spacing, $sequenceKeys));
-    $r->print("\n");
-    $r->rflush();
-    untie(%cache);
-
-
+    if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
+        $r->print(&StudentAverageTotal(\%cache, $students, $sequenceKeys));
+        untie(%cache);
+    }
     $r->print('
'."\n"); if($selected == 0) { $Str .= '

WARNING: '; @@ -183,6 +188,9 @@ sub BuildStudentAssessmentPage { return; } + + + #---- Student Assessment Web Page -------------------------------------------- sub CreateInterface { @@ -195,8 +203,8 @@ sub CreateInterface { $Str .= 'value="Previous Student" />'."\n"; $Str .= '   '."\n"; $Str .= &Apache::lonhtmlcommon::StudentOptions($cache, $students, - $selectedName, - 'StudentAssessment', + $selectedName, + 'StudentAssessment', $formName); $Str .= "\n".'   '."\n"; $Str .= ''; + $Str .= '&command=submission">'; } my $code = $cache->{$name.':'.$problemID.':'.$_.':code'}; my $tries = $cache->{$name.':'.$problemID.':'.$_.':tries'}; @@ -400,91 +409,88 @@ sub StudentReport { sub StudentAverageTotal { - - return ""; - - my ($cache,$name,$spacing,$showSequences)=@_; - my $username = $name; - my $Str = ''; - my $hasVersion = 'false'; - my $hasFinalData = 'false'; - foreach my $sequence (@$showSequences) { - my $hasData = 'false'; - my $characterCount=0; - foreach my $problemID (split(':', $cache->{$sequence.':problems'})) { - my $problem = $cache->{$problemID.':problem'}; - # All grades (except for versionless parts) are displayed as links - # to their submission record. Loop through all the parts for the - # current problem in the correct order and prepare the output links - foreach(split(/\:/,$cache->{$sequence.':'.$problemID. - ':parts'})) { - if($cache->{$name.':'.$problemID.':NoVersion'} eq 'true' || - $cache->{$name.':'.$problemID.':'.$_.':code'} eq ' ' || - $cache->{$name.':'.$problemID.':'.$_.':code'} eq '') { - $Str .= ' '; - $characterCount++; - next; - } - $hasVersion = 'true'; - $hasData = 'true'; - $Str .= ''; - my $code = $cache->{$name.':'.$problemID.':'.$_.':code'}; - my $tries = $cache->{$name.':'.$problemID.':'.$_.':tries'}; - if($code eq '*' && $tries < 10 && $tries ne '') { - $code = $tries; - } - $Str .= $code; - $Str .= ''; - $characterCount++; - } - } - - # Output the number of correct answers for the current sequence. - # This part takes up 6 character slots, but is formated right - # justified. - my $spacesNeeded=$cache->{$sequence.':columnWidth'}-$characterCount; - $spacesNeeded -= 3; - $Str .= (' 'x$spacesNeeded); - -# my $outputProblemsCorrect = sprintf("%3d", $cache->{$name.':'.$sequence. -# ':problemsCorrect'}); - - my $outputProblemsCorrect = sprintf("%2d/%2d", $cache->{$name.':'.$sequence. - ':problemsCorrect'}, - $characterCount); - if($hasData eq 'true') { - $Str .= ''.$outputProblemsCorrect.''; - $hasFinalData = 'true'; - } else { - $Str .= ' '; + my ($cache, $students, $sequenceKeys)=@_; + my $Str = "\nSummary Tables:\n"; + my %Correct = (); + my $ProblemsSolved = 0; + my $TotalProblems = 0; + my $StudentCount = 0; + + foreach my $name (@$students) { + $StudentCount++; + foreach my $sequence (@$sequenceKeys) { + $Correct{$sequence} += + $cache->{$name.':'.$sequence.':problemsCorrect'}; } - $Str .= $spacing; + $ProblemsSolved += $cache->{$name.':problemsSolved'}; + $TotalProblems += $cache->{$name.':totalProblems'}; } - - # Output the total correct problems over the total number of problems. - # I don't like this type of formatting, but it is a solution. Need - # a way to dynamically determine the space requirements. - my $outputProblemsSolved = sprintf("%4d", $cache->{$name.':problemsSolved'}); - my $outputTotalProblems = sprintf("%4d", $cache->{$name.':totalProblems'}); - if($hasFinalData eq 'true') { - $Str .= ''.$outputProblemsSolved. - ' / '.$outputTotalProblems.''; + if ($StudentCount) { + $ProblemsSolved /= $StudentCount; + $TotalProblems /= $StudentCount; } else { - $Str .= ' '; + $ProblemsSolved = 0; + $TotalProblems = 0; } - - if($hasVersion eq 'false') { - $Str = 'No course data.'; + $Str .= ''."\n"; + $Str .= ''."\n"; + $Str .= ''."\n"; + $Str .= ''."\n"; + $Str .= '
Students Count'. + $StudentCount.'
Total Problems'. + $TotalProblems.'
Average Correct'. + $ProblemsSolved.'
'."\n"; + + $Str .= ''."\n"; + $Str .= ''. + ''."\n"; + foreach my $S(@$sequenceKeys) { + my $title=$cache->{$S.':title'}; + #$Str .= $cache->{$S.':problems'}; + #my @problems=split(':', $cache->{$S.':problems'}); + #my $pCount=scalar @problems; + my $pCount=MaxSeqPr($cache,@$students[0],$S); + my $crr; + if ($StudentCount) { + $crr=sprintf( "%.2f", $Correct{$S}/$StudentCount ); + } else { + $crr="0.00"; + } + $Str .= ''."\n"; } + $Str .= '
TitleTotal ProblemsAverage Correct
'.$title. + ''.$pCount. + ''.$crr. + '
'."\n"; + return $Str; } +sub MaxSeqPr { + my ($cache, $name, $sequence)=@_; + my $prCount=0; + foreach my $problemID (split(':', $cache->{$sequence.':problems'})) { + my $problem = $cache->{$problemID.':problem'}; + foreach(split(/\:/,$cache->{$sequence.':'.$problemID.':parts'})) { + if($cache->{$name.':'.$problemID.':NoVersion'} eq 'true' || + $cache->{$name.':'.$problemID.':'.$_.':code'} eq ' ' || + $cache->{$name.':'.$problemID.':'.$_.':code'} eq '') { + $prCount++; + next; + } + $prCount++; + } + } + return $prCount; +} + + + + + =pod =item &CreateLegend() @@ -500,7 +506,7 @@ sub CreateLegend { " 1 correct by student in 1 try\n". " 7 correct by student in 7 tries\n". " * correct by student in more than 9 tries\n". - " + correct by override\n". + " + correct by hand grading or override\n". " - incorrect by override\n". " . incorrect attempted\n". " # ungraded attempted\n". @@ -696,7 +702,7 @@ sub ShouldShowColumns { foreach my $sequence (split(/\:/,$cache->{'orderedSequences'})) { $check = 'SequenceColumn'.$sequence; - if($cache->{'SequencesFound'} eq 'All Sequences' || + if($cache->{'SequencesFound'} eq 'All Sequences' || $cache->{'SequencesFound'} =~ /$check/) { push(@sequenceHeadings, $cache->{$sequence.':title'}); push(@sequenceKeys, $sequence); @@ -709,7 +715,7 @@ sub ShouldShowColumns { $doNotShow{'count'} = $count; - return (\@infoHeadings, \@infoKeys, \@sequenceHeadings, + return (\@infoHeadings, \@infoKeys, \@sequenceHeadings, \@sequenceKeys, \%doNotShow); }