Diff for /loncom/interface/statistics/lonstudentassessment.pm between versions 1.161 and 1.172

version 1.161, 2010/04/14 06:57:17 version 1.172, 2013/04/11 16:23:36
Line 51  package Apache::lonstudentassessment; Line 51  package Apache::lonstudentassessment;
   
 use strict;  use strict;
 use Apache::lonstatistics();  use Apache::lonstatistics();
   use Apache::lonquickgrades();
 use Apache::lonhtmlcommon();  use Apache::lonhtmlcommon();
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::loncoursedata;  use Apache::loncoursedata;
Line 166  sub BuildStudentAssessmentPage { Line 167  sub BuildStudentAssessmentPage {
         &Apache::lonstatistics::DisplayClasslist($r);          &Apache::lonstatistics::DisplayClasslist($r);
         return;          return;
     }      }
       $r->print(&Apache::lonhtmlcommon::breadcrumbs('Chart','Chart_Description:Chart_Sections:Chart_Student_Data:Chart_Enrollment_Status:Chart_Sequences:Chart_Output_Formats:Chart_Output_Data'));
       &Apache::lonquickgrades::startGradeScreen($r,'chart');
   
     #      #
     # Print out the HTML headers for the interface      # Print out the HTML headers for the interface
     #    This also parses the output mode selector      #    This also parses the output mode selector
Line 230  sub BuildStudentAssessmentPage { Line 234  sub BuildStudentAssessmentPage {
         $output_student->($r,$student);          $output_student->($r,$student);
     }      }
     # Call the "finish" routine selected above      # Call the "finish" routine selected above
       &Apache::lonquickgrades::endGradeScreen($r);
     $finish->($r);      $finish->($r);
     #      #
     return;      return;
Line 277  sub next_and_previous_buttons { Line 282  sub next_and_previous_buttons {
     # Build the 'all students' button      # Build the 'all students' button
     my $all = '';      my $all = '';
     $all .= '<input type="button" value="'.&mt('All Students').'" '.      $all .= '<input type="button" value="'.&mt('All Students').'" '.
             '" onclick="document.Statistics.SelectedStudent.value='.              ' onclick="document.Statistics.SelectedStudent.value='.
             "''".';'.'document.Statistics.submit();" />';              "''".';'.'document.Statistics.submit();" />';
     $Str .= $previousbutton.('&nbsp;'x5).$all.('&nbsp;'x5).$nextbutton;      $Str .= $previousbutton.('&nbsp;'x5).$all.('&nbsp;'x5).$nextbutton;
     return $Str;      return $Str;
Line 318  the chart page. Line 323  the chart page.
 #######################################################  #######################################################
 sub CreateInterface {  sub CreateInterface {
     my $Str = '';      my $Str = '';
     $Str .= &Apache::lonhtmlcommon::breadcrumbs('Chart','Chart_Description:Chart_Sections:Chart_Student_Data:Chart_Enrollment_Status:Chart_Sequences:Chart_Output_Formats:Chart_Output_Data');  
 #    $Str .= &CreateLegend();  
     $Str .= '<table cellspacing="5">'."\n";      $Str .= '<table cellspacing="5">'."\n";
     $Str .= '<tr>';      $Str .= '<tr>';
     $Str .= '<td align="center"><b>'.&mt('Sections').'</b>'.      $Str .= '<td align="center"><b>'.&mt('Sections').'</b>'.
Line 361  sub CreateInterface { Line 364  sub CreateInterface {
     $Str .= &CreateAndParseOutputDataSelector();      $Str .= &CreateAndParseOutputDataSelector();
     $Str .= '</td></tr>'."\n";      $Str .= '</td></tr>'."\n";
     $Str .= '</table>'."\n";      $Str .= '</table>'."\n";
     $Str .= '<p>'  
            .&mt('Status:').' '  
            .'<input type="text" name="stats_status" size="60" value="" readonly="readonly" />'  
            .'</p>';  
     $Str .= '<input type="submit" name="selectstudent" value="'.      $Str .= '<input type="submit" name="selectstudent" value="'.
         &mt('Select One Student').'" />';          &mt('Select One Student').'" />';
     $Str .= '&nbsp;'x5;      $Str .= '&nbsp;'x5;
Line 466  sub CreateAndParseOutputSelector { Line 465  sub CreateAndParseOutputSelector {
     $Str = qq/<select size="5" name="$elementname">/;      $Str = qq/<select size="5" name="$elementname">/;
     foreach my $option (@OutputOptions) {      foreach my $option (@OutputOptions) {
         $Str .= "\n".'    <option value="'.$option->{'value'}.'"';          $Str .= "\n".'    <option value="'.$option->{'value'}.'"';
         $Str .= " selected " if ($option->{'value'} eq $selected);          $Str .= ' selected="selected"' if ($option->{'value'} eq $selected);
         $Str .= ">".&mt($option->{'name'})."<\/option>";          $Str .= ">".&mt($option->{'name'})."<\/option>";
     }      }
     $Str .= "\n</select>";      $Str .= "\n</select>";
Line 583  sub CreateAndParseOutputDataSelector { Line 582  sub CreateAndParseOutputDataSelector {
     $Str = qq/<select size="5" name="$elementname">/;      $Str = qq/<select size="5" name="$elementname">/;
     foreach my $option (@OutputDataOptions) {      foreach my $option (@OutputDataOptions) {
         $Str .= "\n".'    <option value="'.$option->{'value'}.'"';          $Str .= "\n".'    <option value="'.$option->{'value'}.'"';
         $Str .= " selected " if ($option->{'value'} eq $chosen_output->{'value'});          $Str .= ' selected="selected"' if ($option->{'value'} eq $chosen_output->{'value'});
         $Str .= ">".&mt($option->{'name'})."<\/option>";          $Str .= ">".&mt($option->{'name'})."<\/option>";
     }      }
     $Str .= "\n</select>";      $Str .= "\n</select>";
Line 748  NEW_WINDOW_CHECKBOX Line 747  NEW_WINDOW_CHECKBOX
     $total_sum_width = length($total_count)+1;      $total_sum_width = length($total_count)+1;
     $Str .= "    total</pre>\n";      $Str .= "    total</pre>\n";
     $Str .= "<pre>";      $Str .= "<pre>";
     $r->print($Str);  
     $r->rflush();  
   
     $r->print(<<JS);      $r->print(<<JS);
 <script type="text/javascript">  <script type="text/javascript">
Line 810  JS Line 807  JS
     }      }
     #      #
     # Initialize progress window      # Initialize progress window
     %prog_state=&Apache::lonhtmlcommon::Create_PrgWin  
         ($r,'HTML Chart Status',  
          'HTML Chart Progress', $studentcount,  
          'inline',undef,'Statistics','stats_status');  
     #      #
       %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$studentcount);
     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,      &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
                                           'Processing first student');                                            'Processing first student');
       $r->print($Str);
       $r->rflush();
   
     return;      return;
 }  }
   
Line 829  sub html_outputstudent { Line 826  sub html_outputstudent {
 #       $r->print("</pre><pre>");  #       $r->print("</pre><pre>");
         $r->print('</pre>');          $r->print('</pre>');
         &Apache::lonhtmlcommon::Increment_PrgWin(          &Apache::lonhtmlcommon::Increment_PrgWin(
             $r,\%prog_state,'last five students');              $r,\%prog_state,'last five students',5);
         $r->rflush();          $r->rflush();
         $r->print('<pre>');          $r->print('<pre>');
     }      }
Line 841  sub html_outputstudent { Line 838  sub html_outputstudent {
         if ($field eq 'comments') {          if ($field eq 'comments') {
             $title = '<a href="/adm/'.$student->{'domain'}.'/'.$student->{'username'}.'/'.'aboutme#coursecomment">'.&mt('Comments').'</a>';              $title = '<a href="/adm/'.$student->{'domain'}.'/'.$student->{'username'}.'/'.'aboutme#coursecomment">'.&mt('Comments').'</a>';
         }          }
           utf8::decode($title);
         my $base = length($title);          my $base = length($title);
         my $width=$Apache::lonstatistics::StudentData{$field}->{'width'};          my $width=$Apache::lonstatistics::StudentData{$field}->{'width'};
         $Str .= $title.' 'x($width-$base).$padding;          $Str .= $title.' 'x($width-$base).$padding;
Line 874  sub html_outputstudent { Line 872  sub html_outputstudent {
     my $PerformanceStr = '';      my $PerformanceStr = '';
     foreach my $seq (@sequences) {      foreach my $seq (@sequences) {
         my $symb = $seq->symb;          my $symb = $seq->symb;
           my $randompick = $seq->randompick();
         my ($performance,$performance_length,$score,$seq_max,$rawdata);          my ($performance,$performance_length,$score,$seq_max,$rawdata);
         if ($chosen_output->{'tries'}) {          if ($chosen_output->{'tries'}) {
             ($performance,$performance_length,$score,$seq_max,$rawdata) =              ($performance,$performance_length,$score,$seq_max,$rawdata) =
                 &student_tries_on_sequence($student,\%StudentsData,                  &student_tries_on_sequence($student,\%StudentsData,
                                            $navmap,$seq,$show_links);                                             $navmap,$seq,$show_links,$randompick);
         } else {          } else {
             ($performance,$performance_length,$score,$seq_max,$rawdata) =              ($performance,$performance_length,$score,$seq_max,$rawdata) =
                 &student_performance_on_sequence($student,\%StudentsData,                  &student_performance_on_sequence($student,\%StudentsData,
                                                  $navmap,$seq,$show_links,                                                   $navmap,$seq,$show_links,
                                                  $chosen_output->{ignore_weight});                                                   $chosen_output->{ignore_weight},
                                                    $randompick);
         }          }
         my $ratio='';          my $ratio='';
         if ($chosen_output->{'every_problem'} &&           if ($chosen_output->{'every_problem'} && 
Line 1120  sub excel_initialize { Line 1120  sub excel_initialize {
     }      }
     my $too_many_cols_error_message =       my $too_many_cols_error_message = 
         '<h2>'.&mt('Unable to Complete Request').'</h2>'.$/.          '<h2>'.&mt('Unable to Complete Request').'</h2>'.$/.
         '<p>'.&mt('LON-CAPA is unable to produce your Excel spreadsheet because your selections will result in more than 255 columns.  Excel allows only 255 columns in a spreadsheet.').'</p>'.$/.          '<p class="LC_warning">'.&mt('LON-CAPA is unable to produce your Excel spreadsheet because your selections will result in more than 255 columns.  Excel allows only 255 columns in a spreadsheet.').'</p>'.$/.
         '<p>'.&mt('You may consider reducing the number of <b>Sequences or Folders</b> you have selected.').'</p>'.$/.          '<p>'.&mt('You may consider reducing the number of <b>Sequences or Folders</b> you have selected.').'</p>'.$/.
         '<p>'.&mt('LON-CAPA can produce <b>CSV</b> files of this data or Excel files of the <b>Scores Summary</b> data.').'</p>'.$/;          '<p>'.&mt('LON-CAPA can produce <b>CSV</b> files of this data or Excel files of the <b>Scores Summary</b> data.').'</p>'.$/;
     if ($chosen_output->{'base'} eq 'tries' && $total_columns > 255) {      if ($chosen_output->{'base'} eq 'tries' && $total_columns > 255) {
Line 1179  sub excel_initialize { Line 1179  sub excel_initialize {
     my $sectionstring = '';      my $sectionstring = '';
     my @Sections = &Apache::lonstatistics::get_selected_sections();      my @Sections = &Apache::lonstatistics::get_selected_sections();
     $excel_sheet->write($header_row,$cols_output++,      $excel_sheet->write($header_row,$cols_output++,
                         &Apache::lonstatistics::section_and_enrollment_description('plaintext'),                          &Apache::lonstatistics::section_and_enrollment_description('localized'),
                         $format->{'h3'});                          $format->{'h3'});
     #      #
     # Put the date in there too      # Put the date in there too
Line 1203  sub excel_initialize { Line 1203  sub excel_initialize {
     # Add the student headers      # Add the student headers
     $cols_output = 0;      $cols_output = 0;
     foreach my $field (&get_student_fields_to_show()) {      foreach my $field (&get_student_fields_to_show()) {
         $excel_sheet->write($resource_name_row,$cols_output++,$field,          $excel_sheet->write($resource_name_row,$cols_output++,&mt($field),
                             $format->{'bold'});                              $format->{'bold'});
     }      }
     #      #
Line 1452  sub excel_initialize { Line 1452  sub excel_initialize {
     $r->rflush();      $r->rflush();
     #      #
     # Initialize progress window      # Initialize progress window
     %prog_state=&Apache::lonhtmlcommon::Create_PrgWin      %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$studentcount);
         ($r,'Excel File Compilation Status',  
          'Excel File Compilation Progress', $studentcount,  
          'inline',undef,'Statistics','stats_status');  
     #      #
     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,      &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
                                           'Processing first student');                                            'Processing first student');
Line 1495  sub excel_outputstudent { Line 1492  sub excel_outputstudent {
     my %maximum_cell_translation;      my %maximum_cell_translation;
     foreach my $seq (@sequences) {      foreach my $seq (@sequences) {
         my $symb = $seq->symb;          my $symb = $seq->symb;
           my $randompick = $seq->randompick();
         $cols_output = $formula_data{$symb}->{'Excel:startcol'};          $cols_output = $formula_data{$symb}->{'Excel:startcol'};
         # Keep track of cells to translate in total cell          # Keep track of cells to translate in total cell
         $total_cell_translation{$formula_data{$symb}->{'Excel:scorecell'}} =           $total_cell_translation{$formula_data{$symb}->{'Excel:scorecell'}} = 
Line 1509  sub excel_outputstudent { Line 1507  sub excel_outputstudent {
         if ($chosen_output->{'tries'} || $chosen_output->{'correct'}){          if ($chosen_output->{'tries'} || $chosen_output->{'correct'}){
             ($performance,$performance_length,$score,$seq_max,$rawdata) =              ($performance,$performance_length,$score,$seq_max,$rawdata) =
                 &student_tries_on_sequence($student,\%StudentsData,                  &student_tries_on_sequence($student,\%StudentsData,
                                            $navmap,$seq,'no');                                             $navmap,$seq,'no',$randompick);
         } else {          } else {
             ($performance,$performance_length,$score,$seq_max,$rawdata) =              ($performance,$performance_length,$score,$seq_max,$rawdata) =
                 &student_performance_on_sequence($student,\%StudentsData,                  &student_performance_on_sequence($student,\%StudentsData,
                                                  $navmap,$seq,'no',                                                   $navmap,$seq,'no',
                                                  $chosen_output->{ignore_weight});                                                   $chosen_output->{ignore_weight},
                                                    $randompick);
         }           } 
         if ($chosen_output->{'every_problem'}) {          if ($chosen_output->{'every_problem'}) {
             if ($chosen_output->{'correct'}) {              if ($chosen_output->{'correct'}) {
Line 1655  sub csv_initialize{ Line 1654  sub csv_initialize{
     # Deal with unimplemented requests      # Deal with unimplemented requests
     $request_aborted = undef;      $request_aborted = undef;
     if ($chosen_output->{'base'} =~ /final table/) {      if ($chosen_output->{'base'} =~ /final table/) {
         $r->print(<<END);          $r->print(
 <h2>Unable to Complete Request</h2>              '<h2>'.&mt('Unable to Complete Request').'</h2>'
 <p>             .'<p class="LC_warning">'
 The <b>Summary Table (Scores)</b> option is not available for non-HTML output.             .&mt('The [_1]Summary Table (Scores)[_2] option'
 </p>                 .' is not available for non-HTML output.','<b>','</b>')
 END             .'</p>'
           );
        $request_aborted = 1;         $request_aborted = 1;
     }      }
     return if ($request_aborted);      return if ($request_aborted);
     #      #
     # Initialize progress window      # Initialize progress window
     my $studentcount = scalar(@Apache::lonstatistics::Students);      my $studentcount = scalar(@Apache::lonstatistics::Students);
     %prog_state=&Apache::lonhtmlcommon::Create_PrgWin      %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$studentcount);
         ($r,'CSV File Compilation Status',  
          'CSV File Compilation Progress', $studentcount,  
          'inline',undef,'Statistics','stats_status');  
     #      #
     # Open a file      # Open a file
     ($outputfile,$filename) = &Apache::loncommon::create_text_file($r,'csv');      ($outputfile,$filename) = &Apache::loncommon::create_text_file($r,'csv');
Line 1776  sub csv_outputstudent { Line 1773  sub csv_outputstudent {
     my $total = 0;      my $total = 0;
     my $maximum = 0;      my $maximum = 0;
     foreach my $seq (@sequences) {      foreach my $seq (@sequences) {
           my $randompick = $seq->randompick();
         my ($performance,$performance_length,$score,$seq_max,$rawdata);          my ($performance,$performance_length,$score,$seq_max,$rawdata);
         if ($chosen_output->{'tries'}){          if ($chosen_output->{'tries'}){
             ($performance,$performance_length,$score,$seq_max,$rawdata) =              ($performance,$performance_length,$score,$seq_max,$rawdata) =
                 &student_tries_on_sequence($student,\%StudentsData,                  &student_tries_on_sequence($student,\%StudentsData,
                                            $navmap,$seq,'no');                                             $navmap,$seq,'no',$randompick);
         } else {          } else {
             ($performance,$performance_length,$score,$seq_max,$rawdata) =              ($performance,$performance_length,$score,$seq_max,$rawdata) =
                 &student_performance_on_sequence($student,\%StudentsData,                  &student_performance_on_sequence($student,\%StudentsData,
                                                  $navmap,$seq,'no',                                                   $navmap,$seq,'no',
                                                  $chosen_output->{ignore_weight});                                                   $chosen_output->{ignore_weight},
                                                    $randompick);
         }          }
         if ($chosen_output->{'every_problem'}) {          if ($chosen_output->{'every_problem'}) {
             if ($chosen_output->{'correct'}) {              if ($chosen_output->{'correct'}) {
Line 1886  Inputs: Line 1885  Inputs:
 #######################################################  #######################################################
 #######################################################  #######################################################
 sub student_tries_on_sequence {  sub student_tries_on_sequence {
     my ($student,$studentdata,$navmap,$seq,$links) = @_;      my ($student,$studentdata,$navmap,$seq,$links,$randompick) = @_;
     $links = 'no' if (! defined($links));      $links = 'no' if (! defined($links));
     my $Str = '';      my $Str = '';
     my ($sum,$max) = (0,0);      my ($sum,$max) = (0,0);
Line 1972  sub student_tries_on_sequence { Line 1971  sub student_tries_on_sequence {
                  ($links eq 'all')) {                   ($links eq 'all')) {
                 my $link = '/adm/grades'.                  my $link = '/adm/grades'.
                     '?symb='.&escape($resource->shown_symb).                      '?symb='.&escape($resource->shown_symb).
                         '&student='.$student->{'username'}.                          '&amp;student='.$student->{'username'}.
                             '&userdom='.$student->{'domain'}.                              '&amp;userdom='.$student->{'domain'}.
                                 '&command=submission';                                  '&amp;command=submission';
                 $symbol = &link($symbol, $link);                  $symbol = &link($symbol, $link);
             }              }
             $value .= $symbol;              $value .= $symbol;
         }          }
         $Str .= $value;          $Str .= $value;
     }      }
     if ($seq->randompick()) {      if ($randompick) {
         $max = $seq->randompick();          $max = $randompick;
     }      }
     if (! $hasdata && $sum == 0) {      if (! $hasdata && $sum == 0) {
         $sum = ' ';          $sum = ' ';
Line 2047  Inputs: Line 2046  Inputs:
 #######################################################  #######################################################
 #######################################################  #######################################################
 sub student_performance_on_sequence {  sub student_performance_on_sequence {
     my ($student,$studentdata,$navmap,$seq,$links,$awarded_only) = @_;      my ($student,$studentdata,$navmap,$seq,$links,$awarded_only,$randompick) = @_;
     $links = 'no' if (! defined($links));      $links = 'no' if (! defined($links));
     my $Str = ''; # final result string      my $Str = ''; # final result string
     my ($score,$max) = (0,0);      my ($score,$max) = (0,0);
Line 2056  sub student_performance_on_sequence { Line 2055  sub student_performance_on_sequence {
     my @ScoreData = ();      my @ScoreData = ();
     my $partscore;      my $partscore;
     my $hasdata = 0; # flag, 0 if there were no submissions on the sequence      my $hasdata = 0; # flag, 0 if there were no submissions on the sequence
       my %ptsfreq;
     foreach my $resource (&get_resources($navmap,$seq)) {      foreach my $resource (&get_resources($navmap,$seq)) {
         my $symb = $resource->symb;          my $symb = $resource->symb;
         my $resource_data = $studentdata->{$symb};          my $resource_data = $studentdata->{$symb};
           my $resmax = 0;
         foreach my $part (@{$resource->parts()}) {          foreach my $part (@{$resource->parts()}) {
             $partscore = undef;              $partscore = undef;
             my $weight;              my $weight;
Line 2074  sub student_performance_on_sequence { Line 2075  sub student_performance_on_sequence {
             }              }
             #              #
             $max += $weight; # see the 'excused' branch below...              $max += $weight; # see the 'excused' branch below...
               $resmax += $weight;
             $performance_length++; # one character per part              $performance_length++; # one character per part
             $symbol = ' '; # default to space              $symbol = ' '; # default to space
             #              #
Line 2127  sub student_performance_on_sequence { Line 2129  sub student_performance_on_sequence {
             if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) {              if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) {
                 my $link = '/adm/grades' .                  my $link = '/adm/grades' .
                     '?symb='.&escape($resource->shown_symb).                      '?symb='.&escape($resource->shown_symb).
                     '&student='.$student->{'username'}.                      '&amp;student='.$student->{'username'}.
                     '&userdom='.$student->{'domain'}.                      '&amp;userdom='.$student->{'domain'}.
                     '&command=submission';                      '&amp;command=submission';
                 $symbol = &link($symbol, $link);                  $symbol = &link($symbol, $link);
             }              }
             $Str .= $symbol;              $Str .= $symbol;
         }          }
           if ($ptsfreq{$resmax}) {
               $ptsfreq{$resmax} ++;
           } else {
               $ptsfreq{$resmax} = 1;
           }
       }
       if ($randompick) {
           my @uniquetotals = keys(%ptsfreq);
           if ((@uniquetotals = 1) && ($ptsfreq{$uniquetotals[0]} > 0)) {
               $max = $max * $randompick/$ptsfreq{$uniquetotals[0]};
           }
     }      }
     if (! $hasdata && $score == 0) {      if (! $hasdata && $score == 0) {
         $score = ' ';          $score = ' ';

Removed from v.1.161  
changed lines
  Added in v.1.172


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