--- loncom/interface/statistics/lonstudentassessment.pm 2010/02/12 15:11:08 1.150.2.4 +++ loncom/interface/statistics/lonstudentassessment.pm 2012/03/20 16:05:26 1.169 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentassessment.pm,v 1.150.2.4 2010/02/12 15:11:08 raeburn Exp $ +# $Id: lonstudentassessment.pm,v 1.169 2012/03/20 16:05:26 bisitz 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>'. @@ -361,20 +364,15 @@ 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 .= '<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; } @@ -556,7 +554,6 @@ my @OutputDataOptions = sub HTMLifyOutputDataDescriptions { my $Str = ''; $Str .= '<h2>'.&mt('Output Data').'</h2>'."\n"; - $Str .= "<dl>\n"; foreach my $option (@OutputDataOptions) { $Str .= ' <dt>'.$option->{'name'}.'</dt>'; @@ -665,19 +662,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 } @@ -715,8 +713,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'}) { @@ -724,8 +722,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'}) { @@ -749,8 +747,6 @@ NEW_WINDOW_CHECKBOX $total_sum_width = length($total_count)+1; $Str .= " total</pre>\n"; $Str .= "<pre>"; - $r->print($Str); - $r->rflush(); $r->print(<<JS); <script type="text/javascript"> @@ -811,13 +807,13 @@ JS } # # Initialize progress window - %prog_state=&Apache::lonhtmlcommon::Create_PrgWin - ($r,'HTML Chart Status', - 'HTML Chart Progress', $studentcount, - 'inline',undef,'Statistics','stats_status'); # + %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$studentcount); &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, 'Processing first student'); + $r->print($Str); + $r->rflush(); + return; } @@ -827,7 +823,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(); @@ -837,6 +838,7 @@ sub html_outputstudent { if ($field eq 'comments') { $title = '<a href="/adm/'.$student->{'domain'}.'/'.$student->{'username'}.'/'.'aboutme#coursecomment">'.&mt('Comments').'</a>'; } + utf8::decode($title); my $base = length($title); my $width=$Apache::lonstatistics::StudentData{$field}->{'width'}; $Str .= $title.' 'x($width-$base).$padding; @@ -870,16 +872,18 @@ sub html_outputstudent { my $PerformanceStr = ''; foreach my $seq (@sequences) { my $symb = $seq->symb; + my $randompick = $seq->randompick(); my ($performance,$performance_length,$score,$seq_max,$rawdata); if ($chosen_output->{'tries'}) { ($performance,$performance_length,$score,$seq_max,$rawdata) = &student_tries_on_sequence($student,\%StudentsData, - $navmap,$seq,$show_links); + $navmap,$seq,$show_links,$randompick); } else { ($performance,$performance_length,$score,$seq_max,$rawdata) = &student_performance_on_sequence($student,\%StudentsData, $navmap,$seq,$show_links, - $chosen_output->{ignore_weight}); + $chosen_output->{ignore_weight}, + $randompick); } my $ratio=''; if ($chosen_output->{'every_problem'} && @@ -887,16 +891,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'}) { @@ -930,16 +935,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; } @@ -1174,7 +1179,7 @@ sub excel_initialize { my $sectionstring = ''; my @Sections = &Apache::lonstatistics::get_selected_sections(); $excel_sheet->write($header_row,$cols_output++, - &Apache::lonstatistics::section_and_enrollment_description('plaintext'), + &Apache::lonstatistics::section_and_enrollment_description('localized'), $format->{'h3'}); # # Put the date in there too @@ -1198,7 +1203,7 @@ sub excel_initialize { # Add the student headers $cols_output = 0; foreach my $field (&get_student_fields_to_show()) { - $excel_sheet->write($resource_name_row,$cols_output++,$field, + $excel_sheet->write($resource_name_row,$cols_output++,&mt($field), $format->{'bold'}); } # @@ -1447,10 +1452,7 @@ sub excel_initialize { $r->rflush(); # # Initialize progress window - %prog_state=&Apache::lonhtmlcommon::Create_PrgWin - ($r,'Excel File Compilation Status', - 'Excel File Compilation Progress', $studentcount, - 'inline',undef,'Statistics','stats_status'); + %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$studentcount); # &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, 'Processing first student'); @@ -1490,6 +1492,7 @@ sub excel_outputstudent { my %maximum_cell_translation; foreach my $seq (@sequences) { my $symb = $seq->symb; + my $randompick = $seq->randompick(); $cols_output = $formula_data{$symb}->{'Excel:startcol'}; # Keep track of cells to translate in total cell $total_cell_translation{$formula_data{$symb}->{'Excel:scorecell'}} = @@ -1504,12 +1507,13 @@ sub excel_outputstudent { if ($chosen_output->{'tries'} || $chosen_output->{'correct'}){ ($performance,$performance_length,$score,$seq_max,$rawdata) = &student_tries_on_sequence($student,\%StudentsData, - $navmap,$seq,'no'); + $navmap,$seq,'no',$randompick); } else { ($performance,$performance_length,$score,$seq_max,$rawdata) = &student_performance_on_sequence($student,\%StudentsData, $navmap,$seq,'no', - $chosen_output->{ignore_weight}); + $chosen_output->{ignore_weight}, + $randompick); } if ($chosen_output->{'every_problem'}) { if ($chosen_output->{'correct'}) { @@ -1662,10 +1666,7 @@ END # # Initialize progress window my $studentcount = scalar(@Apache::lonstatistics::Students); - %prog_state=&Apache::lonhtmlcommon::Create_PrgWin - ($r,'CSV File Compilation Status', - 'CSV File Compilation Progress', $studentcount, - 'inline',undef,'Statistics','stats_status'); + %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$studentcount); # # Open a file ($outputfile,$filename) = &Apache::loncommon::create_text_file($r,'csv'); @@ -1674,7 +1675,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 @@ -1771,16 +1772,18 @@ sub csv_outputstudent { my $total = 0; my $maximum = 0; foreach my $seq (@sequences) { + my $randompick = $seq->randompick(); my ($performance,$performance_length,$score,$seq_max,$rawdata); if ($chosen_output->{'tries'}){ ($performance,$performance_length,$score,$seq_max,$rawdata) = &student_tries_on_sequence($student,\%StudentsData, - $navmap,$seq,'no'); + $navmap,$seq,'no',$randompick); } else { ($performance,$performance_length,$score,$seq_max,$rawdata) = &student_performance_on_sequence($student,\%StudentsData, $navmap,$seq,'no', - $chosen_output->{ignore_weight}); + $chosen_output->{ignore_weight}, + $randompick); } if ($chosen_output->{'every_problem'}) { if ($chosen_output->{'correct'}) { @@ -1881,7 +1884,7 @@ Inputs: ####################################################### ####################################################### sub student_tries_on_sequence { - my ($student,$studentdata,$navmap,$seq,$links) = @_; + my ($student,$studentdata,$navmap,$seq,$links,$randompick) = @_; $links = 'no' if (! defined($links)); my $Str = ''; my ($sum,$max) = (0,0); @@ -1976,8 +1979,8 @@ sub student_tries_on_sequence { } $Str .= $value; } - if ($seq->randompick()) { - $max = $seq->randompick(); + if ($randompick) { + $max = $randompick; } if (! $hasdata && $sum == 0) { $sum = ' '; @@ -2042,7 +2045,7 @@ Inputs: ####################################################### ####################################################### sub student_performance_on_sequence { - my ($student,$studentdata,$navmap,$seq,$links,$awarded_only) = @_; + my ($student,$studentdata,$navmap,$seq,$links,$awarded_only,$randompick) = @_; $links = 'no' if (! defined($links)); my $Str = ''; # final result string my ($score,$max) = (0,0); @@ -2051,9 +2054,11 @@ sub student_performance_on_sequence { my @ScoreData = (); my $partscore; my $hasdata = 0; # flag, 0 if there were no submissions on the sequence + my %ptsfreq; foreach my $resource (&get_resources($navmap,$seq)) { my $symb = $resource->symb; my $resource_data = $studentdata->{$symb}; + my $resmax = 0; foreach my $part (@{$resource->parts()}) { $partscore = undef; my $weight; @@ -2069,6 +2074,7 @@ sub student_performance_on_sequence { } # $max += $weight; # see the 'excused' branch below... + $resmax += $weight; $performance_length++; # one character per part $symbol = ' '; # default to space # @@ -2129,6 +2135,17 @@ sub student_performance_on_sequence { } $Str .= $symbol; } + if ($ptsfreq{$resmax}) { + $ptsfreq{$resmax} ++; + } else { + $ptsfreq{$resmax} = 1; + } + } + if ($randompick) { + my @uniquetotals = keys(%ptsfreq); + if ((@uniquetotals = 1) && ($ptsfreq{$uniquetotals[0]} > 0)) { + $max = $max * $randompick/$ptsfreq{$uniquetotals[0]}; + } } if (! $hasdata && $score == 0) { $score = ' ';