--- loncom/interface/statistics/lonstudentassessment.pm 2014/04/05 13:03:06 1.169.2.6 +++ loncom/interface/statistics/lonstudentassessment.pm 2012/12/16 16:59:34 1.171 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentassessment.pm,v 1.169.2.6 2014/04/05 13:03:06 raeburn Exp $ +# $Id: lonstudentassessment.pm,v 1.171 2012/12/16 16:59:34 raeburn 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; @@ -167,6 +168,7 @@ 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 @@ -232,6 +234,7 @@ sub BuildStudentAssessmentPage { $output_student->($r,$student); } # Call the "finish" routine selected above + &Apache::lonquickgrades::endGradeScreen($r); $finish->($r); # return; @@ -279,7 +282,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; @@ -427,7 +430,7 @@ my @OutputOptions = sub OutputDescriptions { my $Str = ''; - $Str .= '<h2>'.&mt('Output Formats')."</h2>\n"; + $Str .= "<h2>Output Formats</h2>\n"; $Str .= "<dl>\n"; foreach my $outputmode (@OutputOptions) { $Str .=" <dt>".$outputmode->{'name'}."</dt>\n"; @@ -462,7 +465,7 @@ sub CreateAndParseOutputSelector { $Str = qq/<select size="5" name="$elementname">/; foreach my $option (@OutputOptions) { $Str .= "\n".' <option value="'.$option->{'value'}.'"'; - $Str .= ' selected="selected"' if ($option->{'value'} eq $selected); + $Str .= " selected " if ($option->{'value'} eq $selected); $Str .= ">".&mt($option->{'name'})."<\/option>"; } $Str .= "\n</select>"; @@ -579,7 +582,7 @@ sub CreateAndParseOutputDataSelector { $Str = qq/<select size="5" name="$elementname">/; foreach my $option (@OutputDataOptions) { $Str .= "\n".' <option value="'.$option->{'value'}.'"'; - $Str .= ' selected="selected"' if ($option->{'value'} eq $chosen_output->{'value'}); + $Str .= " selected " if ($option->{'value'} eq $chosen_output->{'value'}); $Str .= ">".&mt($option->{'name'})."<\/option>"; } $Str .= "\n</select>"; @@ -1100,9 +1103,9 @@ sub excel_initialize { &Apache::lonstatistics::selected_sequences_with_assessments(); if (! ref($navmap)) { # Unable to get data, so bail out - $r->print('<p class="LC_error">'. + $r->print("<h3>". &mt('Unable to retrieve course information.'). - '</p>'); + '</h3>'); } # my $total_columns = scalar(&get_student_fields_to_show()); @@ -1118,8 +1121,8 @@ sub excel_initialize { my $too_many_cols_error_message = '<h2>'.&mt('Unable to Complete Request').'</h2>'.$/. '<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>'.$/; + '<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>'.$/; if ($chosen_output->{'base'} eq 'tries' && $total_columns > 255) { $r->print($too_many_cols_error_message); $request_aborted = 1; @@ -1643,9 +1646,9 @@ sub csv_initialize{ &Apache::lonstatistics::selected_sequences_with_assessments(); if (! ref($navmap)) { # Unable to get data, so bail out - $r->print('<p class="LC_error">'. + $r->print("<h3>". &mt('Unable to retrieve course information.'). - '</p>'); + '</h3>'); } # # Deal with unimplemented requests @@ -1658,7 +1661,7 @@ sub csv_initialize{ .' is not available for non-HTML output.','<b>','</b>') .'</p>' ); - $request_aborted = 1; + $request_aborted = 1; } return if ($request_aborted); # @@ -1968,9 +1971,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; @@ -2126,9 +2129,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;