[BACK]Return to lonstudentassessment.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface / statistics

Diff for /loncom/interface/statistics/lonstudentassessment.pm between versions 1.16 and 1.17

version 1.16, 2002/10/23 21:04:26 version 1.17, 2002/10/24 20:58:06
Line 104  sub BuildStudentAssessmentPage { Line 104  sub BuildStudentAssessmentPage {
     $r->print('<pre>'."\n");      $r->print('<pre>'."\n");
     foreach (@$students) {      foreach (@$students) {
         if($c->aborted()) { return $Str; }          if($c->aborted()) { return $Str; }
         next if ($_ ne $selectedName &&           next if ($_ ne $selectedName &&
                  $selectedName ne 'All Students');                   $selectedName ne 'All Students');
         $selected = 1;          $selected = 1;
   
         my @who = ($_);          my @who = ($_);
         next if(&Apache::loncoursedata::DownloadStudentCourseData(\@who, 'true',           next if(&Apache::loncoursedata::DownloadStudentCourseData(\@who, 'true',
                                                              $cacheDB, 'true',                                                                $cacheDB, 'true',
                                                              'false', $courseID,                                                               'false', $courseID,
                                                              $r, $c) ne 'OK');                                                               $r, $c) ne 'OK');
         next if($c->aborted());          next if($c->aborted());
Line 166  sub BuildStudentAssessmentPage { Line 166  sub BuildStudentAssessmentPage {
     }      }
   
   
     $r->print(&StudentReport(\%cache, "AvgTotal", $spacing, $sequenceKeys));  #    $r->print("AverageTtal");
       $r->print(&StudentAverageTotal(\%cache, $spacing, $sequenceKeys));
     $r->print("\n");      $r->print("\n");
     $r->rflush();      $r->rflush();
     untie(%cache);      untie(%cache);
Line 193  sub CreateInterface { Line 194  sub CreateInterface {
     $Str .= '<input type="submit" name="PreviousStudent" ';      $Str .= '<input type="submit" name="PreviousStudent" ';
     $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);
Line 239  sub CreateTableHeadings { Line 240  sub CreateTableHeadings {
     my $displayString = '<td align="left"><pre><a href="/adm/statistics?';      my $displayString = '<td align="left"><pre><a href="/adm/statistics?';
     $displayString .= 'sort=LINKDATA">DISPLAYDATA</a>FORMATTING';      $displayString .= 'sort=LINKDATA">DISPLAYDATA</a>FORMATTING';
     $displayString .= $spacing.'</pre></td>'."\n";      $displayString .= $spacing.'</pre></td>'."\n";
     $Str .= &Apache::lonhtmlcommon::CreateHeadings($cache,       $Str .= &Apache::lonhtmlcommon::CreateHeadings($cache,
                                                    $infoKeys,                                                     $infoKeys,
                                                    $infoHeadings,                                                     $infoHeadings,
                                                    $displayString,                                                     $displayString,
Line 342  sub StudentReport { Line 343  sub StudentReport {
         }          }
   
         # Output the number of correct answers for the current sequence.          # Output the number of correct answers for the current sequence.
         # This part takes up 6 character slots, but is formated right           # 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;
       }
   
       # 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 .= '<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;
   }
   
   
   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 .= '<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.          # justified.
         my $spacesNeeded=$cache->{$sequence.':columnWidth'}-$characterCount;          my $spacesNeeded=$cache->{$sequence.':columnWidth'}-$characterCount;
         $spacesNeeded -= 3;          $spacesNeeded -= 3;
Line 352  sub StudentReport { Line 438  sub StudentReport {
 #    ':problemsCorrect'});  #    ':problemsCorrect'});
   
  my $outputProblemsCorrect = sprintf("%2d/%2d", $cache->{$name.':'.$sequence.   my $outputProblemsCorrect = sprintf("%2d/%2d", $cache->{$name.':'.$sequence.
                                             ':problemsCorrect'},                                               ':problemsCorrect'},
                                             $characterCount);                                              $characterCount);
         if($hasData eq 'true') {          if($hasData eq 'true') {
             $Str .= '<font color="#007700">'.$outputProblemsCorrect.'</font>';              $Str .= '<font color="#007700">'.$outputProblemsCorrect.'</font>';
Line 382  sub StudentReport { Line 468  sub StudentReport {
     return $Str;      return $Str;
 }  }
   
   
   
 =pod  =pod
   
 =item &CreateLegend()  =item &CreateLegend()
Line 403  sub CreateLegend { Line 491  sub CreateLegend {
       "   #  ungraded attempted\n".        "   #  ungraded attempted\n".
               "      not attempted (blank field)\n".                "      not attempted (blank field)\n".
       "   x  excused".        "   x  excused".
               "</pre><p>";                 "</pre><p>";
     return $Str;      return $Str;
 }  }
   
Line 412  sub CreateLegend { Line 500  sub CreateLegend {
 =item &CreateColumnSelectionBox()  =item &CreateColumnSelectionBox()
   
 If there are columns not being displayed then this selection box is created  If there are columns not being displayed then this selection box is created
 with a list of those columns.  When selections are made and the page   with a list of those columns.  When selections are made and the page
 refreshed, the columns will be removed from this box and the column is  refreshed, the columns will be removed from this box and the column is
 put back in the chart.  If there is no columns to select, no row is added  put back in the chart.  If there is no columns to select, no row is added
 to the interface table.  to the interface table.
Line 423  Input: $CacheData, $headings Line 511  Input: $CacheData, $headings
   
 $CacheData: A pointer to a hash tied to the cached data  $CacheData: A pointer to a hash tied to the cached data
   
 $headings:  An array of the names of the columns for the student information.    $headings:  An array of the names of the columns for the student information.
 They are used for displaying which columns are missing.  They are used for displaying which columns are missing.
   
 Output: $notThere  Output: $notThere
   
 $notThere: The string contains one row of a table.  The first column has the   $notThere: The string contains one row of a table.  The first column has the
 name of the selection box.  The second contains the selection box   name of the selection box.  The second contains the selection box
 which has a size of four.  which has a size of four.
   
 =back  =back
Line 459  sub CreateColumnSelectionBox { Line 547  sub CreateColumnSelectionBox {
   
 =item &CreateColumnSelectors()  =item &CreateColumnSelectors()
   
 This function generates the checkboxes above the column headings.  The   This function generates the checkboxes above the column headings.  The
 column will be removed if the checkbox is unchecked.  column will be removed if the checkbox is unchecked.
   
 =over 4  =over 4
Line 509  sub CreateColumnSelectors { Line 597  sub CreateColumnSelectors {
 sub FindSelectedStudent {  sub FindSelectedStudent {
     my($cache, $selectedName, $students)=@_;      my($cache, $selectedName, $students)=@_;
   
     if($selectedName eq 'All Students' ||       if($selectedName eq 'All Students' ||
        $selectedName eq 'No Student Selected') {         $selectedName eq 'No Student Selected') {
         return $selectedName;          return $selectedName;
     }      }
Removed from v.1.16  
changed lines
  Added in v.1.17

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