--- loncom/interface/statistics/lonstudentassessment.pm 2012/03/20 16:05:26 1.169 +++ loncom/interface/statistics/lonstudentassessment.pm 2023/07/10 02:33:06 1.169.2.7.2.1 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentassessment.pm,v 1.169 2012/03/20 16:05:26 bisitz Exp $ +# $Id: lonstudentassessment.pm,v 1.169.2.7.2.1 2023/07/10 02:33:06 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -51,7 +51,6 @@ package Apache::lonstudentassessment; use strict; use Apache::lonstatistics(); -use Apache::lonquickgrades(); use Apache::lonhtmlcommon(); use Apache::loncommon(); use Apache::loncoursedata; @@ -168,7 +167,6 @@ sub BuildStudentAssessmentPage { 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 @@ -234,7 +232,6 @@ sub BuildStudentAssessmentPage { $output_student->($r,$student); } # Call the "finish" routine selected above - &Apache::lonquickgrades::endGradeScreen($r); $finish->($r); # return; @@ -282,7 +279,7 @@ sub next_and_previous_buttons { # Build the 'all students' button my $all = ''; $all .= '<input type="button" value="'.&mt('All Students').'" '. - '" onclick="document.Statistics.SelectedStudent.value='. + ' onclick="document.Statistics.SelectedStudent.value='. "''".';'.'document.Statistics.submit();" />'; $Str .= $previousbutton.(' 'x5).$all.(' 'x5).$nextbutton; return $Str; @@ -430,7 +427,7 @@ my @OutputOptions = sub OutputDescriptions { my $Str = ''; - $Str .= "<h2>Output Formats</h2>\n"; + $Str .= '<h2>'.&mt('Output Formats')."</h2>\n"; $Str .= "<dl>\n"; foreach my $outputmode (@OutputOptions) { $Str .=" <dt>".$outputmode->{'name'}."</dt>\n"; @@ -465,7 +462,7 @@ sub CreateAndParseOutputSelector { $Str = qq/<select size="5" name="$elementname">/; foreach my $option (@OutputOptions) { $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 .= "\n</select>"; @@ -582,7 +579,7 @@ sub CreateAndParseOutputDataSelector { $Str = qq/<select size="5" name="$elementname">/; foreach my $option (@OutputDataOptions) { $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 .= "\n</select>"; @@ -744,7 +741,10 @@ NEW_WINDOW_CHECKBOX length($title) )).$padding; } - $total_sum_width = length($total_count)+1; + $total_sum_width = length($total_count); + if ($total_sum_width < 6) { + $total_sum_width = 6; + } $Str .= " total</pre>\n"; $Str .= "<pre>"; @@ -938,6 +938,7 @@ sub html_outputstudent { $score = sprintf("%.2f",$score); $score = (' 'x(6-length($score))).$score; } + $max = sprintf("%.2f",$max); $Str .= ' '.' 'x($total_sum_width-length($score)).$score.' / '.$max; $Str .= " \n"; # @@ -1103,9 +1104,9 @@ sub excel_initialize { &Apache::lonstatistics::selected_sequences_with_assessments(); if (! ref($navmap)) { # Unable to get data, so bail out - $r->print("<h3>". + $r->print('<p class="LC_error">'. &mt('Unable to retrieve course information.'). - '</h3>'); + '</p>'); } # my $total_columns = scalar(&get_student_fields_to_show()); @@ -1120,9 +1121,9 @@ sub excel_initialize { } my $too_many_cols_error_message = '<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>'.&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 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 [_1]Sequences or Folders[_2] you have selected.','<b>','</b>').'</p>'.$/. + '<p>'.&mt('LON-CAPA can produce [_1]CSV[_2] files of this data or Excel files of the [_1]Scores Summary[_2] data.','<b>','</b>').'</p>'.$/; if ($chosen_output->{'base'} eq 'tries' && $total_columns > 255) { $r->print($too_many_cols_error_message); $request_aborted = 1; @@ -1646,21 +1647,22 @@ sub csv_initialize{ &Apache::lonstatistics::selected_sequences_with_assessments(); if (! ref($navmap)) { # Unable to get data, so bail out - $r->print("<h3>". + $r->print('<p class="LC_error">'. &mt('Unable to retrieve course information.'). - '</h3>'); + '</p>'); } # # Deal with unimplemented requests $request_aborted = undef; if ($chosen_output->{'base'} =~ /final table/) { - $r->print(<<END); -<h2>Unable to Complete Request</h2> -<p> -The <b>Summary Table (Scores)</b> option is not available for non-HTML output. -</p> -END - $request_aborted = 1; + $r->print( + '<h2>'.&mt('Unable to Complete Request').'</h2>' + .'<p class="LC_warning">' + .&mt('The [_1]Summary Table (Scores)[_2] option' + .' is not available for non-HTML output.','<b>','</b>') + .'</p>' + ); + $request_aborted = 1; } return if ($request_aborted); # @@ -1970,9 +1972,9 @@ sub student_tries_on_sequence { ($links eq 'all')) { my $link = '/adm/grades'. '?symb='.&escape($resource->shown_symb). - '&student='.$student->{'username'}. - '&userdom='.$student->{'domain'}. - '&command=submission'; + '&student='.$student->{'username'}. + '&userdom='.$student->{'domain'}. + '&command=submission'; $symbol = &link($symbol, $link); } $value .= $symbol; @@ -2128,9 +2130,9 @@ sub student_performance_on_sequence { if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) { my $link = '/adm/grades' . '?symb='.&escape($resource->shown_symb). - '&student='.$student->{'username'}. - '&userdom='.$student->{'domain'}. - '&command=submission'; + '&student='.$student->{'username'}. + '&userdom='.$student->{'domain'}. + '&command=submission'; $symbol = &link($symbol, $link); } $Str .= $symbol; @@ -2143,7 +2145,7 @@ sub student_performance_on_sequence { } if ($randompick) { my @uniquetotals = keys(%ptsfreq); - if ((@uniquetotals = 1) && ($ptsfreq{$uniquetotals[0]} > 0)) { + if ((@uniquetotals == 1) && ($ptsfreq{$uniquetotals[0]} > 0)) { $max = $max * $randompick/$ptsfreq{$uniquetotals[0]}; } }