Diff for /loncom/interface/statistics/lonstudentassessment.pm between versions 1.20 and 1.22

version 1.20, 2002/12/11 18:41:00 version 1.22, 2002/12/18 20:02:34
Line 34 Line 34
 #  #
 ###  ###
   
 package Apache::lonstudentassessment;   package Apache::lonstudentassessment;
   
 use strict;  use strict;
 use Apache::lonhtmlcommon;  use Apache::lonhtmlcommon;
Line 77  sub BuildStudentAssessmentPage { Line 77  sub BuildStudentAssessmentPage {
         }          }
     }      }
     my ($infoHeadings, $infoKeys, $sequenceHeadings, $sequenceKeys,      my ($infoHeadings, $infoKeys, $sequenceHeadings, $sequenceKeys,
         $doNotShow) =           $doNotShow) =
         &ShouldShowColumns(\%cache, $headings, $studentInformation);          &ShouldShowColumns(\%cache, $headings, $studentInformation);
   
     my $selectedName = &FindSelectedStudent(\%cache,       my $selectedName = &FindSelectedStudent(\%cache,
                                             $cache{'StudentAssessmentStudent'},                                              $cache{'StudentAssessmentStudent'},
                                             $students);                                              $students);
     $r->print(&CreateInterface(\%cache, $selectedName, $students, $formName,      $r->print(&CreateInterface(\%cache, $selectedName, $students, $formName,
Line 165  sub BuildStudentAssessmentPage { Line 165  sub BuildStudentAssessmentPage {
         }          }
     }      }
   
   #    if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
 #    $r->print("AverageTtal");  #        $r->print(&StudentAverageTotal(\%cache, $students, $sequenceKeys));
 #    $r->print(&StudentAverageTotal(\%cache, $spacing, $sequenceKeys));  #        untie(%cache);
 #    $r->print("\n");  #    }
 #    $r->rflush();  
     untie(%cache);  
   
   
     $r->print('</pre>'."\n");      $r->print('</pre>'."\n");
     if($selected == 0) {      if($selected == 0) {
  $Str .= '<h3><font color=blue>WARNING: ';   $Str .= '<h3><font color=blue>WARNING: ';
Line 183  sub BuildStudentAssessmentPage { Line 179  sub BuildStudentAssessmentPage {
     return;      return;
 }  }
   
   
   
   
 #---- Student Assessment Web Page --------------------------------------------  #---- Student Assessment Web Page --------------------------------------------
   
 sub CreateInterface {  sub CreateInterface {
Line 195  sub CreateInterface { Line 194  sub CreateInterface {
     $Str .= 'value="Previous Student" />'."\n";      $Str .= 'value="Previous Student" />'."\n";
     $Str .= '&nbsp&nbsp&nbsp'."\n";      $Str .= '&nbsp&nbsp&nbsp'."\n";
     $Str .= &Apache::lonhtmlcommon::StudentOptions($cache, $students,      $Str .= &Apache::lonhtmlcommon::StudentOptions($cache, $students,
                                                    $selectedName,                                                      $selectedName,
                                                    'StudentAssessment',                                                      'StudentAssessment',
                                                    $formName);                                                     $formName);
     $Str .= "\n".'&nbsp&nbsp&nbsp'."\n";      $Str .= "\n".'&nbsp&nbsp&nbsp'."\n";
     $Str .= '<input type="submit" name="NextStudent" ';      $Str .= '<input type="submit" name="NextStudent" ';
Line 225  sub CreateInterface { Line 224  sub CreateInterface {
         lc($ENV{'form.displaymode'}) eq 'display with links') {          lc($ENV{'form.displaymode'}) eq 'display with links') {
         $Str .= 'value="Display without links" />';          $Str .= 'value="Display without links" />';
         # Set the current value, in case it is undefined          # Set the current value, in case it is undefined
         $ENV{'form.displaymode'} = 'Display with links';           $ENV{'form.displaymode'} = 'Display with links';
     } else {      } else {
         $Str .= 'value="Display with links" />';          $Str .= 'value="Display with links" />';
     }      }
Line 296  database. Line 295  database.
   
 Output: $Str  Output: $Str
   
 $Str: Formatted string that is an entire row of the chart.  It is a   $Str: Formatted string that is an entire row of the chart.  It is a
 concatenation of student information and student course information.  concatenation of student information and student course information.
   
 =back  =back
Line 342  sub StudentReport { Line 341  sub StudentReport {
                     $Str .= '<a href="/adm/grades?symb=';                      $Str .= '<a href="/adm/grades?symb=';
                     $Str .= &Apache::lonnet::escape($problem);                      $Str .= &Apache::lonnet::escape($problem);
                     $Str .= '&student='.$username.'&domain='.$domain;                      $Str .= '&student='.$username.'&domain='.$domain;
                     $Str .= '&command=submission">';                       $Str .= '&command=submission">';
                 }                  }
                 my $code = $cache->{$name.':'.$problemID.':'.$_.':code'};                  my $code = $cache->{$name.':'.$problemID.':'.$_.':code'};
                 my $tries = $cache->{$name.':'.$problemID.':'.$_.':tries'};                  my $tries = $cache->{$name.':'.$problemID.':'.$_.':tries'};
Line 400  sub StudentReport { Line 399  sub StudentReport {
   
   
 sub StudentAverageTotal {  sub StudentAverageTotal {
           my ($cache, $students, $sequenceKeys)=@_;
     return "";      my $Str = "\nAverageTotal\n";
       my %Correct = ();
     my ($cache,$name,$spacing,$showSequences)=@_;      my $ProblemsSolved = 0;
     my $username = $name;      my $TotalProblems = 0;
     my $Str = '';      my $StudentCount = 0;
     my $hasVersion = 'false';  
     my $hasFinalData = 'false';      foreach my $name (@$students) {
     foreach my $sequence (@$showSequences) {          $StudentCount++;
         my $hasData = 'false';          foreach my $sequence (@$sequenceKeys) {
         my $characterCount=0;              $Correct{$cache->{$sequence.':title'}} +=
         foreach my $problemID (split(':', $cache->{$sequence.':problems'})) {          $cache->{$name.':'.$sequence.':problemsCorrect'};
             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 .= '<a href="/adm/grades?symb=';  
                 $Str .= &Apache::lonnet::escape($problem);  
                 $Str .= '&student= Average &domain= Total';  
                 $Str .= '&command=submission">';  
                 my $code = $cache->{$name.':'.$problemID.':'.$_.':code'};  
                 my $tries = $cache->{$name.':'.$problemID.':'.$_.':tries'};  
                 if($code eq '*' && $tries < 10 && $tries ne '') {  
                     $code = $tries;  
                 }  
                 $Str .= $code;  
                 $Str .= '</a>';  
                 $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 .= '<font color="#007700">'.$outputProblemsCorrect.'</font>';  
             $hasFinalData = 'true';  
         } else {  
             $Str .= '<font color="#007700">     </font>';  
         }          }
         $Str .= $spacing;   $ProblemsSolved += $cache->{$name.':problemsSolved'};
           $TotalProblems += $cache->{$name.':totalProblems'};
     }      }
       $ProblemsSolved /= $StudentCount;
     # Output the total correct problems over the total number of problems.      $TotalProblems /= $StudentCount;
     # I don't like this type of formatting, but it is a solution.  Need      $Str .= "AvgSlvd:$ProblemsSolved  AvgTotal: $TotalProblems\n";
     # a way to dynamically determine the space requirements.      
     my $outputProblemsSolved = sprintf("%4d", $cache->{$name.':problemsSolved'});      foreach (%Correct) {
     my $outputTotalProblems  = sprintf("%4d", $cache->{$name.':totalProblems'});          $Str .= "$_  : $Correct{$_}\n";
     if($hasFinalData eq 'true') {  
         $Str .= '<font color="#000088">'.$outputProblemsSolved.  
     ' / '.$outputTotalProblems.'</font>';  
     } else {  
         $Str .= '<font color="#000088">           </font>';  
     }  
   
     if($hasVersion eq 'false') {  
         $Str = '<b><font color="blue">No course data.</font></b>';  
     }      }
   
     return $Str;      return $Str;
Line 696  sub ShouldShowColumns { Line 639  sub ShouldShowColumns {
   
     foreach my $sequence (split(/\:/,$cache->{'orderedSequences'})) {      foreach my $sequence (split(/\:/,$cache->{'orderedSequences'})) {
         $check = 'SequenceColumn'.$sequence;          $check = 'SequenceColumn'.$sequence;
         if($cache->{'SequencesFound'} eq 'All Sequences' ||           if($cache->{'SequencesFound'} eq 'All Sequences' ||
            $cache->{'SequencesFound'} =~ /$check/) {             $cache->{'SequencesFound'} =~ /$check/) {
             push(@sequenceHeadings, $cache->{$sequence.':title'});              push(@sequenceHeadings, $cache->{$sequence.':title'});
             push(@sequenceKeys, $sequence);              push(@sequenceKeys, $sequence);
Line 709  sub ShouldShowColumns { Line 652  sub ShouldShowColumns {
   
     $doNotShow{'count'} = $count;      $doNotShow{'count'} = $count;
   
     return (\@infoHeadings, \@infoKeys, \@sequenceHeadings,       return (\@infoHeadings, \@infoKeys, \@sequenceHeadings,
             \@sequenceKeys, \%doNotShow);              \@sequenceKeys, \%doNotShow);
 }  }
   

Removed from v.1.20  
changed lines
  Added in v.1.22


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>