--- loncom/interface/statistics/lonstudentassessment.pm 2009/05/17 23:13:49 1.155 +++ loncom/interface/statistics/lonstudentassessment.pm 2010/02/12 14:42:50 1.160 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentassessment.pm,v 1.155 2009/05/17 23:13:49 bisitz Exp $ +# $Id: lonstudentassessment.pm,v 1.160 2010/02/12 14:42:50 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -327,7 +327,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,19 +361,19 @@ sub CreateInterface { $Str .= &CreateAndParseOutputDataSelector(); $Str .= '</td></tr>'."\n"; $Str .= '</table>'."\n"; - $Str .= '<input type="submit" name="Generate Chart" value="'. - &mt('Generate Chart').'" />'; - $Str .= ' 'x5; + $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>'; - $Str .= - &mt('Status [_1]', - '<input type="text" name="stats_status" size="60" value="" readonly="readonly" />'); - $Str .= '</p>'; + $Str .= '<p>' + .'<input type="submit" name="Generate Chart"' + .' value="'.&mt('Generate Chart').'" />' + .'</p>'; return $Str; } @@ -546,7 +546,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', }, @@ -554,7 +554,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>'; @@ -663,26 +663,27 @@ sub html_initialize { &Apache::lonstatistics::selected_sequences_with_assessments(); if (! ref($navmap)) { # Unable to get data, so bail out - $r->print("<h3>". - &mt('Unable to retrieve course information.'). - '</h3>'); + $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 } # $r->print("<h3>".$env{'course.'.$env{'request.course.id'}.'.description'}. - " ".localtime(time)."</h3>"); + " ".&Apache::lonlocal::locallocaltime(time)."</h3>"); # if ($chosen_output->{'base'} !~ /^final table/) { $r->print("<h3>".&mt($chosen_output->{'shortdesc'})."</h3>"); @@ -825,7 +826,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'); + $r->rflush(); + $r->print('<pre>'); } # First, the @StudentData fields need to be listed my @to_show = &get_student_fields_to_show(); @@ -937,8 +943,8 @@ sub html_outputstudent { # $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 +1001,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 +1184,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 +1266,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 +1286,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 +1300,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 +1395,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; @@ -1713,23 +1719,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);