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

Diff for /loncom/interface/lonstatistics.pm between versions 1.72 and 1.78.2.1

version 1.72, 2003/05/29 21:38:32 version 1.78.2.1, 2003/10/03 15:34:58
Line 519  sub PrepareCourseData { Line 519  sub PrepareCourseData {
         my $name_length = length($seq->{'title'});          my $name_length = length($seq->{'title'});
         my $num_parts = $seq->{'num_assess_parts'};          my $num_parts = $seq->{'num_assess_parts'};
         #          #
         # The number of columns needed for the summation text:           # Use 3 digits for each the sum and total, which means 7 total...
         #    " 1/5" = 1+3 columns, " 10/99" = 1+5 columns          my $num_col = $num_parts+7;
         my $sum_length = 1+1+2*(length($num_parts));  
         my $num_col = $num_parts+$sum_length;  
         if ($num_col < $name_length) {          if ($num_col < $name_length) {
             $num_col = $name_length;              $num_col = $name_length;
         }          }
Line 807  sub DisplayClasslist { Line 805  sub DisplayClasslist {
     my @Fields = ('fullname','username','domain','id','section');      my @Fields = ('fullname','username','domain','id','section');
     #      #
     my $Str='';      my $Str='';
       if (! @Students) {
           if ($SelectedSections[0] eq 'all') { 
               if (lc($ENV{'form.Status'}) eq 'any') {
                   $Str .= '<h2>There are no students in the course.</h2>';
               } elsif (lc($ENV{'form.Status'}) eq 'active') {
                   $Str .= '<h2>There are no currently enrolled students in '.
                       'the course.</h2>';
               } elsif (lc($ENV{'form.Status'}) eq 'expired') {
                   $Str .= '<h2>There are no previously enrolled '.
                       'students in the course.</h2>';
               }
           } else { 
               my $sections;
               if (@SelectedSections == 1) {
                   $sections = 'section '.$SelectedSections[0];
               } elsif (@SelectedSections > 2) {
                   $sections = 'sections '.join(', ',@SelectedSections);
                   $sections =~ s/, ([^,])*$/, and $1/;
               } else {
                   $sections = 'sections '.join(' and ',@SelectedSections);
               }
               if (lc($ENV{'form.Status'}) eq 'any') {
                   $Str .= '<h2>There are no students in '.$sections.'.</h2>';
               } elsif (lc($ENV{'form.Status'}) eq 'active') {
                   $Str .= '<h2>There are no currently enrolled students '.
                       'in '.$sections.'.</h2>';
               } elsif (lc($ENV{'form.Status'}) eq 'expired') {
                   $Str .= '<h2>There are no previously enrolled students '.
                       'in '.$sections.'.</h2>';
               }
           }
           $Str.= '<a href="/adm/statistics?reportSelected=student_assessment">'.
               'Return to the chart.</a>';
           $r->print($Str);
           $r->rflush();
           return;
       }
   
       # "Click" is asinine but it is probably not my place to change the world.
       $Str .= '<h2>Click on a students name or username to view their chart</h2>';
     $Str .= '<table border="0"><tr><td bgcolor="#777777">'."\n";      $Str .= '<table border="0"><tr><td bgcolor="#777777">'."\n";
     $Str .= '<table border="0" cellpadding="3"><tr bgcolor="#e6ffff">'."\n";      $Str .= '<table border="0" cellpadding="3"><tr bgcolor="#e6ffff">'."\n";
     foreach my $field (@Fields) {      foreach my $field (@Fields) {
Line 827  sub DisplayClasslist { Line 865  sub DisplayClasslist {
         #          #
         foreach my $field (@Fields) {          foreach my $field (@Fields) {
             $Str .= '<td>';              $Str .= '<td>';
             if ($field eq 'fullname') {              if ($field eq 'fullname' || $field eq 'username') {
                 $Str .= '<a href="/adm/statistics?reportSelected=';                  $Str .= '<a href="/adm/statistics?reportSelected=';
                 $Str .= &Apache::lonnet::escape('student_assessment');                  $Str .= &Apache::lonnet::escape('student_assessment');
                 $Str .= '&sort='.&Apache::lonnet::escape($ENV{'form.sort'});                  $Str .= '&sort='.&Apache::lonnet::escape($ENV{'form.sort'});
Line 857  sub CreateMainMenu { Line 895  sub CreateMainMenu {
     #      #
     my $Str = '';      my $Str = '';
     #      #
     $Str .= '<table border="0"><tbody><tr>'."\n";      $Str  = '<input type="hidden" name="reportSelected" value="'.$current.'">';
     $Str .= '<td></td>'."\n";  #    $Str .= '<table border="0"><tbody><tr>'."\n";
     $Str .= '<td></td>'."\n";  #    $Str .= '<td align="center"><b>Report:</b></td>'."\n";
     $Str .= '<td align="center"><b>Select a Report</b></td>'."\n";  #    $Str .= '<td align="center">';
     $Str .= '<tr>'."\n";  #    $Str .= '<select name="reportSelected" '.
     #  #        'onchange="document.Statistics.submit()">'."\n";
     $Str .= '<td align="center">'.  #    foreach (sort(keys(%$reports))) {
         '<input type="submit" name="Refresh" value="Update Display" />'.  #        $Str .= '<option value="'.$_.'"';
             "</td>\n";  #        if($current eq $_) {
     $Str .= '<td align="center">'.  #            $Str .= ' selected';
         '<input type="submit" name="ClearCache" value="Clear Caches" />'.  #        }
             "</td>\n";  #        $Str .= '>'.$reports->{$_}.'</option>'."\n";
     #  #    }
     $Str .= '<td align="center">';  #    $Str .= '</select></td>'."\n";
     $Str .= '<select name="reportSelected" >'."\n";  #    #
     foreach (sort(keys(%$reports))) {  #    $Str .= '<td>'.('&nbsp;'x30).'</td>';
         $Str .= '<option value="'.$_.'"';  #    $Str .= '<td align="center">'.
         if($current eq $_) {  #        '<input type="submit" name="ClearCache" value="Clear Caches" />'.
             $Str .= ' selected';  #            "</td>\n";
         }  #    $Str .= '</tr></tbody></table>'."\n";
         $Str .= '>'.$reports->{$_}.'</option>'."\n";  #    $Str .= '<hr>'."\n";
     }  
     $Str .= '</select></td>'."\n";  
     #  
     $Str .= '</tr></tbody></table>'."\n";  
     $Str .= '<hr>'."\n";  
     #      #
     return $Str;      return $Str;
 }  }
Line 893  sub handler { Line 926  sub handler {
     my $r=shift;      my $r=shift;
     my $c = $r->connection();      my $c = $r->connection();
     #      #
       &Apache::loncoursedata::clear_internal_caches();
       #
     # Check for overloading      # Check for overloading
     my $loaderror=&Apache::lonnet::overloaderror($r);      my $loaderror=&Apache::lonnet::overloaderror($r);
     if ($loaderror) { return $loaderror; }      if ($loaderror) { return $loaderror; }
Line 974  END Line 1009  END
     my %reports = ('classlist'          => 'Class list',      my %reports = ('classlist'          => 'Class list',
                    'problem_statistics' => 'Problem Statistics',                     'problem_statistics' => 'Problem Statistics',
                    'student_assessment' => 'Problem Status Chart',                     'student_assessment' => 'Problem Status Chart',
                    'percentage'         => 'Correct-problems Plot',  #                   'percentage'         => 'Correct-problems Plot',
                    'option_response'    => 'Option Response Analysis',  #                   'option_response'    => 'Option Response Analysis',
 #                   'activitylog'        => 'Activity Log',  #                   'activitylog'        => 'Activity Log',
                    );                     );
     $r->print(&CreateMainMenu($ENV{'form.status'},      $r->print(&CreateMainMenu($ENV{'form.status'},
Line 993  END Line 1028  END
         &Apache::lonstudentassessment::BuildStudentAssessmentPage($r,$c);          &Apache::lonstudentassessment::BuildStudentAssessmentPage($r,$c);
     } elsif($GoToPage eq 'DoDiffGraph' || $GoToPage eq 'PercentWrongGraph') {      } elsif($GoToPage eq 'DoDiffGraph' || $GoToPage eq 'PercentWrongGraph') {
 #        &Apache::lonproblemstatistics::BuildGraphicChart($r,$c);  #        &Apache::lonproblemstatistics::BuildGraphicChart($r,$c);
     } elsif($GoToPage eq 'classlist') {  
         &DisplayClasslist($r);  
     } elsif($GoToPage eq 'Correct-problems Plot') {      } elsif($GoToPage eq 'Correct-problems Plot') {
 # &Apache::lonpercentage::BuildPercentageGraph($r,$c);  # &Apache::lonpercentage::BuildPercentageGraph($r,$c);
     }      }
Removed from v.1.72  
changed lines
  Added in v.1.78.2.1

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