--- loncom/interface/statistics/lonstudentassessment.pm 2014/04/05 13:03:06 1.169.2.6 +++ loncom/interface/statistics/lonstudentassessment.pm 2023/04/07 16:46:44 1.177 @@ -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.177 2023/04/07 16:46:44 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; @@ -602,7 +605,7 @@ sub count_parts { sub get_resources { my ($navmap,$sequence) = @_; my @resources = $navmap->retrieveResources($sequence, - sub { shift->is_problem(); }, + sub { shift->is_gradable(); }, 0,0,0); return @resources; } @@ -741,7 +744,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\n"; $Str .= "
"; @@ -935,6 +941,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"; # @@ -1643,7 +1650,7 @@ sub csv_initialize{ &Apache::lonstatistics::selected_sequences_with_assessments(); if (! ref($navmap)) { # Unable to get data, so bail out - $r->print(''. + $r->print('p class="LC_error">'. &mt('Unable to retrieve course information.'). '
'); } @@ -1658,7 +1665,7 @@ sub csv_initialize{ .' is not available for non-HTML output.','','') .'' ); - $request_aborted = 1; + $request_aborted = 1; } return if ($request_aborted); # @@ -2141,7 +2148,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]}; } }