--- loncom/interface/statistics/lonstudentassessment.pm 2009/08/13 18:45:04 1.150.2.2 +++ loncom/interface/statistics/lonstudentassessment.pm 2010/12/04 14:41:13 1.163 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentassessment.pm,v 1.150.2.2 2009/08/13 18:45:04 raeburn Exp $ +# $Id: lonstudentassessment.pm,v 1.163 2010/12/04 14:41:13 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -51,6 +51,7 @@ package Apache::lonstudentassessment; use strict; use Apache::lonstatistics(); +use Apache::lonquickgrades(); use Apache::lonhtmlcommon(); use Apache::loncommon(); use Apache::loncoursedata; @@ -166,6 +167,9 @@ sub BuildStudentAssessmentPage { &Apache::lonstatistics::DisplayClasslist($r); 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 # This also parses the output mode selector @@ -230,6 +234,7 @@ sub BuildStudentAssessmentPage { $output_student->($r,$student); } # Call the "finish" routine selected above + &Apache::lonquickgrades::endGradeScreen($r); $finish->($r); # return; @@ -255,7 +260,7 @@ sub next_and_previous_buttons { 'document.Statistics.submit();" />'; } else { $previousbutton .= '<input type="button" value="'. - &mt('Previous student').'" disabled="disabled" />'; + &mt('Previous Student').'" disabled="disabled" />'; } # # Build the next student link @@ -267,11 +272,11 @@ sub next_and_previous_buttons { &mt('Next Student ([_1])', $next->{'username'}.':'.$next->{'domain'}). '" onclick="document.Statistics.SelectedStudent.value='. - "'$sname'".';'. + "'".$sname."'".';'. 'document.Statistics.submit();" />'; } else { $nextbutton .= '<input type="button" value="'. - &mt('Next student').'" disabled="disabled" />'; + &mt('Next Student').'" disabled="disabled" />'; } # # Build the 'all students' button @@ -318,8 +323,6 @@ the chart page. ####################################################### sub CreateInterface { 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 .= '<tr>'; $Str .= '<td align="center"><b>'.&mt('Sections').'</b>'. @@ -327,7 +330,7 @@ sub CreateInterface { '</td>'; $Str .= '<td align="center"><b>'.&mt('Groups').'</b>'. '</td>'; - $Str .= '<td align="center"><b>'.&mt('Student Data</b>'). + $Str .= '<td align="center"><b>'.&mt('Student Data').'</b>'. &Apache::loncommon::help_open_topic("Chart_Student_Data"). '</td>'; $Str .= '<td align="center"><b>'.&mt('Access Status').'</b>'. @@ -361,20 +364,19 @@ sub CreateInterface { $Str .= &CreateAndParseOutputDataSelector(); $Str .= '</td></tr>'."\n"; $Str .= '</table>'."\n"; - $Str .= '<p>'. - &mt('Status:').' '. - '<input type="text" name="stats_status" size="60" value="" readonly="readonly" />'. - '</p>'; + $Str .= '<p>' + .&mt('Status:').' ' + .'<input type="text" name="stats_status" size="60" value="" readonly="readonly" />' + .'</p>'; $Str .= '<input type="submit" name="selectstudent" value="'. &mt('Select One Student').'" />'; $Str .= ' 'x5; $Str .= '<input type="submit" name="ClearCache" value="'. &mt('Clear Caches').'" />'; - $Str .= '<p>'. - '<input type="submit" name="Generate Chart"'. - ' value="'.&mt('Generate Chart').'" />'. - '</p>'; - + $Str .= '<p>' + .'<input type="submit" name="Generate Chart"' + .' value="'.&mt('Generate Chart').'" />' + .'</p>'; return $Str; } @@ -547,7 +549,7 @@ my @OutputDataOptions = summary_table => 1, maximum_row => 0, ignore_weight => 1, - shortdesc => 'Number of Problem Parts completed successfully.', + shortdesc => 'Number of Problem Parts completed successfully', longdesc => 'The Number of Problem Parts completed successfully and '. 'the maximum possible for each student', }, @@ -555,7 +557,7 @@ my @OutputDataOptions = sub HTMLifyOutputDataDescriptions { my $Str = ''; - $Str .= "<h2>Output Data</h2>\n"; + $Str .= '<h2>'.&mt('Output Data').'</h2>'."\n"; $Str .= "<dl>\n"; foreach my $option (@OutputDataOptions) { $Str .= ' <dt>'.$option->{'name'}.'</dt>'; @@ -664,19 +666,20 @@ sub html_initialize { &Apache::lonstatistics::selected_sequences_with_assessments(); if (! ref($navmap)) { # Unable to get data, so bail out - $r->print("<p class="LC_error">". - &mt('Unable to retrieve course information.'). - '</p>'); + $r->print('<p class="LC_error">' + .&mt('Unable to retrieve course information.') + .'</p>'); } # If we're showing links, show a checkbox to open in new # windows. if ($show_links ne 'no') { - my $labeltext = &mt('Show links in new window:'); + my $labeltext = &mt('Show links in new window'); $r->print(<<NEW_WINDOW_CHECKBOX); <script type="text/javascript">new_window = true;</script> -<p><label>$labeltext +<p><label> <input type="checkbox" checked="checked" onclick="new_window=this.checked" /> +$labeltext </label></p> NEW_WINDOW_CHECKBOX } @@ -714,8 +717,8 @@ NEW_WINDOW_CHECKBOX $width{$symb}->{'width_sum'} += 1; } $total_count += &count_parts($navmap,$seq); - # Use 3 digits for the sum - $width{$symb}->{'width_sum'} += 3; + # Use 6 digits for the sum + $width{$symb}->{'width_sum'} += 6; } # Compute width of maximum if ($chosen_output->{'sequence_max'}) { @@ -723,8 +726,8 @@ NEW_WINDOW_CHECKBOX # One digit for the '/' $width{$symb}->{'width_sum'} +=1; } - # Use 3 digits for the total - $width{$symb}->{'width_sum'}+=3; + # Use 6 digits for the total + $width{$symb}->{'width_sum'}+=6; } # if ($chosen_output->{'every_problem'}) { @@ -826,7 +829,12 @@ sub html_outputstudent { return if (! defined($navmap)); # if($count++ % 5 == 0 && $count > 0) { - $r->print("</pre><pre>"); +# $r->print("</pre><pre>"); + $r->print('</pre>'); + &Apache::lonhtmlcommon::Increment_PrgWin( + $r,\%prog_state,'last five students',5); + $r->rflush(); + $r->print('<pre>'); } # First, the @StudentData fields need to be listed my @to_show = &get_student_fields_to_show(); @@ -886,16 +894,17 @@ sub html_outputstudent { $ratio .= ' '; } if ($chosen_output->{'sequence_sum'} && $score ne ' ') { - my $score .= sprintf("%3.0f",$score); - $ratio .= (' 'x(3-length($score))).$score; + my $score .= sprintf("%3.2f",$score); + $ratio .= (' 'x(6-length($score))).$score; } elsif($chosen_output->{'sequence_sum'}) { - $ratio .= ' 'x3; + $ratio .= ' 'x6; } if ($chosen_output->{'sequence_max'}) { if ($chosen_output->{'sequence_sum'}) { $ratio .= '/'; } - $ratio .= sprintf("%3.0f",$seq_max); + my $sequence_total=sprintf("%3.2f",$seq_max); + $ratio .= $sequence_total.(' 'x(6-length($sequence_total))); } # if (! $chosen_output->{'every_problem'}) { @@ -929,16 +938,16 @@ sub html_outputstudent { if (! defined($score)) { $score = ' ' x $total_sum_width; } else { - $score = sprintf("%.0f",$score); - $score = (' 'x(3-length($score))).$score; + $score = sprintf("%.2f",$score); + $score = (' 'x(6-length($score))).$score; } $Str .= ' '.' 'x($total_sum_width-length($score)).$score.' / '.$max; $Str .= " \n"; # $r->print($Str); # - $r->rflush(); - &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student'); +# $r->rflush(); +# &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student'); return; } @@ -995,9 +1004,9 @@ sub StudentAverageTotal { sub SingleStudentTotal { return if (! defined($navmap)); my $student = &Apache::lonstatistics::current_student(); - my $Str = '<h3>'.&mt('Summary table for [_1] ([_2]@[_3])', + my $Str = '<h3>'.&mt('Summary table for [_1] ([_2])', $student->{'fullname'}, - $student->{'username'},$student->{'domain'}).'</h3>'; + $student->{'username'}.':'.$student->{'domain'}).'</h3>'; $Str .= $/; $Str .= &Apache::loncommon::start_data_table()."\n"; $Str .= @@ -1178,11 +1187,11 @@ sub excel_initialize { # # Put the date in there too $excel_sheet->write($header_row,$cols_output++, - 'Compiled on '.localtime(time),$format->{'h3'}); + &mt('Compiled on [_1]',&Apache::lonlocal::locallocaltime(time)),$format->{'h3'}); # $cols_output = 0; $excel_sheet->write($description_row,$cols_output++, - $chosen_output->{'shortdesc'}, + &mt($chosen_output->{'shortdesc'}), $format->{'b'}); # $cols_output = 0; @@ -1260,17 +1269,17 @@ sub excel_initialize { $formula_data{$symb}->{'Excel:scorecol'}=$cols_output; if ($chosen_output->{'base'} eq 'parts correct total') { $excel_sheet->write($resource_name_row,$cols_output++, - 'parts correct', + &mt('parts correct'), $format->{'bold'}); } elsif ($chosen_output->{'sequence_sum'}) { if ($chosen_output->{'correct'}) { # Only reporting the number correct, so do not call it score $excel_sheet->write($resource_name_row,$cols_output++, - 'sum', + &mt('sum'), $format->{'bold'}); } else { $excel_sheet->write($resource_name_row,$cols_output++, - 'score', + &mt('score'), $format->{'bold'}); } } @@ -1280,7 +1289,7 @@ sub excel_initialize { ($first_data_row,$cols_output-1); if ($chosen_output->{'sequence_max'}) { $excel_sheet->write($resource_name_row,$cols_output, - 'maximum', + &mt('maximum'), $format->{'bold'}); $formula_data{$symb}->{'Excel:maxcell'} = &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell @@ -1294,11 +1303,11 @@ sub excel_initialize { } } if ($chosen_output->{'grand_total'}) { - $excel_sheet->write($resource_name_row,$cols_output++,'Total', + $excel_sheet->write($resource_name_row,$cols_output++,&mt('Total'), $format->{'bold'}); } if ($chosen_output->{'grand_maximum'}) { - $excel_sheet->write($resource_name_row,$cols_output++,'Max. Total', + $excel_sheet->write($resource_name_row,$cols_output++,&mt('Max. Total'), $format->{'bold'}); } $total_formula = $excel_sheet->store_formula($total_formula_string); @@ -1389,17 +1398,17 @@ sub excel_initialize { if ($chosen_output->{'summary_table'}) { $cols_output = 0; $excel_sheet->write($summary_header_row,$cols_output++, - 'Summary Table',$format->{'bold'}); + &mt('Summary Table'),$format->{'bold'}); if ($chosen_output->{'maximum_row'}) { $excel_sheet->write($summary_header_row,$cols_output++, - 'Maximum',$format->{'bold'}); + &mt('Maximum'),$format->{'bold'}); } $excel_sheet->write($summary_header_row,$cols_output++, - 'Average',$format->{'bold'}); + &mt('Average'),$format->{'bold'}); $excel_sheet->write($summary_header_row,$cols_output++, - 'Median',$format->{'bold'}); + &mt('Median'),$format->{'bold'}); $excel_sheet->write($summary_header_row,$cols_output++, - 'Std Dev',$format->{'bold'}); + &mt('Std Dev'),$format->{'bold'}); my $row = $summary_header_row+1; foreach my $seq (@sequences) { my $symb = $seq->symb; @@ -1673,7 +1682,7 @@ END # Datestamp my $description = $env{'course.'.$env{'request.course.id'}.'.description'}; print $outputfile '"'.&Apache::loncommon::csv_translate($description).'",'. - '"'.&Apache::loncommon::csv_translate(scalar(localtime(time))).'"'. + '"'.&Apache::loncommon::csv_translate(scalar(&Apache::lonlocal::locallocaltime(time))).'"'. "\n"; print $outputfile '"'. &Apache::loncommon::csv_translate @@ -1713,23 +1722,23 @@ END $sequence_row.='"",'x$count; if ($chosen_output->{'sequence_sum'}) { if($chosen_output->{'correct'}) { - $resource_row .= '"sum",'; + $resource_row .= '"'.&mt('sum').'",'; } else { - $resource_row .= '"score",'; + $resource_row .= '"'.&mt('score').'",'; } } if ($chosen_output->{'sequence_max'}) { $sequence_row.= '"",'; - $resource_row .= '"maximum possible",'; + $resource_row .= '"'.&mt('maximum possible').'",'; } } if ($chosen_output->{'grand_total'}) { $sequence_row.= '"",'; - $resource_row.= '"Total",'; + $resource_row.= '"'.&mt('Total').'",'; } if ($chosen_output->{'grand_maximum'}) { $sequence_row.= '"",'; - $resource_row.= '"Maximum",'; + $resource_row.= '"'.&mt('Maximum').'",'; } chomp($sequence_row); chomp($resource_row);