--- loncom/interface/statistics/lonstudentassessment.pm 2003/10/21 21:23:53 1.71 +++ loncom/interface/statistics/lonstudentassessment.pm 2004/01/27 19:50:03 1.82 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentassessment.pm,v 1.71 2003/10/21 21:23:53 matthew Exp $ +# $Id: lonstudentassessment.pm,v 1.82 2004/01/27 19:50:03 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -52,9 +52,12 @@ package Apache::lonstudentassessment; use strict; use Apache::lonstatistics; use Apache::lonhtmlcommon; +use Apache::loncommon(); use Apache::loncoursedata; use Apache::lonnet; # for logging porpoises +use Apache::lonlocal; use Spreadsheet::WriteExcel; +use Spreadsheet::WriteExcel::Utility(); ####################################################### ####################################################### @@ -138,7 +141,7 @@ Inputs: ####################################################### sub BuildStudentAssessmentPage { my ($r,$c)=@_; - + # undef($Statistics); undef($show_links); undef($output_mode); @@ -146,7 +149,18 @@ sub BuildStudentAssessmentPage { undef($base); undef($datadescription); undef($single_student_mode); - + # + my %Saveable_Parameters = ('Status' => 'scalar', + 'chartoutputmode' => 'scalar', + 'chartoutputdata' => 'scalar', + 'Section' => 'array', + 'StudentData' => 'array', + 'Maps' => 'array'); + &Apache::loncommon::store_course_settings('chart',\%Saveable_Parameters); + &Apache::loncommon::restore_course_settings('chart',\%Saveable_Parameters); + # + &Apache::lonstatistics::PrepareClasslist(); + # $single_student_mode = 0; $single_student_mode = 1 if ($ENV{'form.SelectedStudent'}); if ($ENV{'form.selectstudent'}) { @@ -305,14 +319,14 @@ sub CreateInterface { # $Str .= &CreateLegend(); $Str .= '<table cellspacing="5">'."\n"; $Str .= '<tr>'; - $Str .= '<td align="center"><b>Sections</b></td>'; - $Str .= '<td align="center"><b>Student Data</b></td>'; - $Str .= '<td align="center"><b>Enrollment Status</b></td>'; - $Str .= '<td align="center"><b>Sequences and Folders</b></td>'; - $Str .= '<td align="center"><b>Output Format</b>'. + $Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>'; + $Str .= '<td align="center"><b>'.&mt('Student Data</b>').'</td>'; + $Str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b></td>'; + $Str .= '<td align="center"><b>'.&mt('Sequences and Folders').'</b></td>'; + $Str .= '<td align="center"><b>'.&mt('Output Format').'</b>'. &Apache::loncommon::help_open_topic("Chart_Output_Formats"). '</td>'; - $Str .= '<td align="center"><b>Output Data</b>'. + $Str .= '<td align="center"><b>'.&mt('Output Data').'</b>'. &Apache::loncommon::help_open_topic("Chart_Output_Data"). '</td>'; $Str .= '</tr>'."\n"; @@ -341,12 +355,14 @@ sub CreateInterface { $Str .= &CreateAndParseOutputDataSelector(); $Str .= '</td></tr>'."\n"; $Str .= '</table>'."\n"; - $Str .= '<input type="submit" value="Generate Chart" />'; + $Str .= '<input type="submit" name="Generate Chart" value="'. + &mt('Generate Chart').'" />'; $Str .= ' 'x5; - $Str .= '<input type="submit" name="selectstudent" '. - 'value="Select One Student" />'; + $Str .= '<input type="submit" name="selectstudent" value="'. + &mt('Select One Student').'" />'; $Str .= ' 'x5; - $Str .= '<input type="submit" name="ClearCache" value="Clear Caches" />'; + $Str .= '<input type="submit" name="ClearCache" value="'. + &mt('Clear Caches').'" />'; $Str .= ' 'x5; $Str .= '<br />'; return $Str; @@ -419,6 +435,8 @@ sub OutputDescriptions { sub CreateAndParseOutputSelector { my $Str = ''; my $elementname = 'chartoutputmode'; + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + [$elementname]); # # Format for output options is 'mode, restrictions'; my $selected = 'html, without links'; @@ -445,7 +463,7 @@ sub CreateAndParseOutputSelector { foreach my $option (@OutputOptions) { $Str .= "\n".' <option value="'.$option->{'value'}.'"'; $Str .= " selected " if ($option->{'value'} eq $selected); - $Str .= ">".$option->{'name'}."<\/option>"; + $Str .= ">".&mt($option->{'name'})."<\/option>"; } $Str .= "\n</select>"; return $Str; @@ -456,7 +474,7 @@ sub CreateAndParseOutputSelector { ## my @OutputDataOptions = ( - { name => 'Scores', + { name => 'Scores Summary', base => 'scores', value => 'sum and total', shortdesc => 'Total Score and Maximum Possible for each '. @@ -553,7 +571,7 @@ sub CreateAndParseOutputDataSelector { foreach my $option (@OutputDataOptions) { $Str .= "\n".' <option value="'.$option->{'value'}.'"'; $Str .= " selected " if ($option->{'value'} eq $data); - $Str .= ">".$option->{'name'}."<\/option>"; + $Str .= ">".&mt($option->{'name'})."<\/option>"; } $Str .= "\n</select>"; return $Str; @@ -767,22 +785,20 @@ sub StudentAverageTotal { $total_ave += $ave; my $max = $Statistics->{$seq->{'symb'}}->{'max'}; $total_max += $max; - if ($ave == 0) { - $ave = "0.00"; - } - $ave .= ' '; - $max .= ' '; + $ave = sprintf("%.2f",$ave); $Str .= '<tr><td>'.$seq->{'title'}.'</td>'. - '<td align="right">'.$ave.'</td>'. - '<td align="right">'.$max.'</td></tr>'."\n"; + '<td align="right">'.$ave.' </td>'. + '<td align="right">'.$max.' '.'</td></tr>'."\n"; } - $total_ave = int(100*$total_ave)/100; # only two digit + $total_ave = sprintf('%.2f',$total_ave); # only two digit $Str .= "</table>\n"; $Str .= '<table border=2 cellspacing="1">'."\n"; $Str .= '<tr><th>Number of Students</th><th>Average</th>'. "<th>Maximum</th></tr>\n"; - $Str .= '<tr><td>'.($num_students-$nodata_count).'</td>'. - '<td>'.$total_ave.'</td><td>'.$total_max.'</td>'; + $Str .= '<tr>'. + '<td align="right">'.($num_students-$nodata_count).'</td>'. + '<td align="right">'.$total_ave.' '.'</td>'. + '<td align="right">'.$total_max.' '.'</td>'; $Str .= "</table>\n"; return $Str; } @@ -843,6 +859,8 @@ my $cols_output; my %prog_state; # progress window state my $request_aborted; +my $total_formula; + sub excel_initialize { my ($r) = @_; # @@ -853,6 +871,7 @@ sub excel_initialize { undef ($cols_output); undef (%prog_state); undef ($request_aborted); + undef ($total_formula); # my $total_columns = scalar(&get_student_fields_to_show()); foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { @@ -888,7 +907,7 @@ You may consider reducing the number of have selected. </p><p> LON-CAPA can produce <b>CSV</b> files of this data or Excel files of the -summary data (<b>Scores Sum</b> or <b>Scores Sum & Totals</b>). +<b>Scores Summary</b> data. </p> END $request_aborted = 1; @@ -984,10 +1003,18 @@ END } # # Add the remaining column headers + my $total_formula_string = '=0'; foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { $excel_sheet->write($rows_output+$row_offset, $cols_output,$seq->{'title'}); if ($data eq 'tries' || $data eq 'scores') { + # Determine starting cell + $seq->{'Excel:startcell'}= + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($rows_output,$cols_output); + $seq->{'Excel:startcol'}=$cols_output; + # Put the names of the problems and parts into the sheet + my $count = 0; foreach my $res (@{$seq->{'contents'}}) { next if ($res->{'type'} ne 'assessment'); if (scalar(@{$res->{'parts'}}) > 1) { @@ -1001,17 +1028,40 @@ END $cols_output++, $res->{'title'}); } + $count++; } - $excel_sheet->write($rows_output,$cols_output++,'score'); - $excel_sheet->write($rows_output,$cols_output++,'maximum'); - } elsif ($data eq 'sum and total' || $data eq 'parts correct total') { - $excel_sheet->write($rows_output+1,$cols_output,'score'); - $excel_sheet->write($rows_output+1,$cols_output+1,'maximum'); - $cols_output += 2; + # Determine ending cell + if ($count == 1) { + $seq->{'Excel:endcell'} = $seq->{'Excel:startcell'}; + $seq->{'Excel:endcol'} = $seq->{'Excel:startcol'}; + } else { + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($rows_output,$cols_output-1); + $seq->{'Excel:endcol'} = $cols_output-1; + } + # Create the formula for summing up this sequence + $seq->{'Excel:sum'}= $excel_sheet->store_formula + ('=SUM('.$seq->{'Excel:startcell'}. + ':'.$seq->{'Excel:endcell'}.')'); + } + # Determine cell the score is held in + $seq->{'Excel:scorecell'} = + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($rows_output,$cols_output); + $seq->{'Excel:scorecol'}=$cols_output; + if ($data eq 'parts correct total') { + $excel_sheet->write($rows_output,$cols_output++,'parts correct'); } else { - $cols_output++; + $excel_sheet->write($rows_output,$cols_output++,'score'); } + # + $total_formula_string.='+'. + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($rows_output,$cols_output-1); + $excel_sheet->write($rows_output,$cols_output++,'maximum'); } + $excel_sheet->write($rows_output,$cols_output++,'Grand Total'); + $total_formula = $excel_sheet->store_formula($total_formula_string); # # Bookkeeping if ($data eq 'sum and total' || $data eq 'parts correct total') { @@ -1032,7 +1082,12 @@ END } # # Add the maximums for each sequence or assessment + my %total_cell_translation; + my $grand_total = 0; foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { + $total_cell_translation{$seq->{'Excel:scorecell'}} = + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($rows_output,$seq->{'Excel:scorecol'}); my $weight; my $max = 0; foreach my $resource (@{$seq->{'contents'}}) { @@ -1058,7 +1113,30 @@ END if (! ($data eq 'sum only' || $data eq 'parts correct')) { $excel_sheet->write($rows_output,$cols_output++,''); } - $excel_sheet->write($rows_output,$cols_output++,$max); + # + if ($data eq 'tries' || $data eq 'scores') { + my %replaceCells; + $replaceCells{$seq->{'Excel:startcell'}} = + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($rows_output,$seq->{'Excel:startcol'}); + $replaceCells{$seq->{'Excel:endcell'}} = + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($rows_output,$seq->{'Excel:endcol'}); + $excel_sheet->repeat_formula($rows_output,$cols_output++, + $seq->{'Excel:sum'},undef, + %replaceCells); + } else { + $excel_sheet->write($rows_output,$cols_output++, + $max); + } + $grand_total+=$max; + } + if ($data eq 'tries' || $data eq 'scores') { + $excel_sheet->repeat_formula($rows_output,$cols_output++, + $total_formula,undef, + %total_cell_translation); + } else { + $excel_sheet->write($rows_output,$cols_output++,$grand_total); } $rows_output++; # @@ -1103,7 +1181,13 @@ sub excel_outputstudent { } # # Write out sequence scores and totals data + my %total_cell_translation; foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { + # Keep track of cells to translate in total cell + $total_cell_translation{$seq->{'Excel:scorecell'}} = + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($rows_output,$seq->{'Excel:scorecol'}); + # my ($performance,$performance_length,$score,$seq_max,$rawdata); if ($base eq 'tries') { ($performance,$performance_length,$score,$seq_max,$rawdata) = @@ -1118,7 +1202,25 @@ sub excel_outputstudent { foreach my $value (@$rawdata) { $excel_sheet->write($rows_output,$cols_output++,$value); } - $excel_sheet->write($rows_output,$cols_output++,$score); + # Write a formula for the sum of this sequence + my %replaceCells; + $replaceCells{$seq->{'Excel:startcell'}} = + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($rows_output,$seq->{'Excel:startcol'}); + $replaceCells{$seq->{'Excel:endcell'}} = + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($rows_output,$seq->{'Excel:endcol'}); + # The undef is for the format + if (scalar(keys(%replaceCells)) == 1) { + $excel_sheet->repeat_formula($rows_output,$cols_output++, + $seq->{'Excel:sum'},undef, + %replaceCells,%replaceCells); + } else { + $excel_sheet->repeat_formula($rows_output,$cols_output++, + $seq->{'Excel:sum'},undef, + %replaceCells); + } + # $excel_sheet->write($rows_output,$cols_output++,$seq_max); } elsif ($data eq 'sum and total' || $data eq 'sum only' || $data eq 'parts correct' || $data eq 'parts correct total') { @@ -1129,6 +1231,11 @@ sub excel_outputstudent { } } # + $excel_sheet->repeat_formula($rows_output,$cols_output++, + $total_formula,undef, + %total_cell_translation); + + # # Bookkeeping $rows_output++; $cols_output=0; @@ -1394,44 +1501,56 @@ sub StudentTriesOnSequence { $performance_length++; my $symbol = ' '; # default to space # + my $awarded = 0; + if (exists($resource_data->{'resource.'.$partnum.'.awarded'})) { + $awarded = $resource_data->{'resource.'.$partnum.'.awarded'}; + $awarded = 0 if (! $awarded); + } + # + my $status = ''; if (exists($resource_data->{'resource.'.$partnum.'.solved'})) { - my $status = $resource_data->{'resource.'.$partnum.'.solved'}; - if ($status eq 'correct_by_override') { - $symbol = '+'; - $sum++; - } elsif ($status eq 'incorrect_by_override') { - $symbol = '-'; - } elsif ($status eq 'ungraded_attempted') { - $symbol = '#'; - } elsif ($status eq 'incorrect_attempted') { - $symbol = '.'; - } elsif ($status eq 'excused') { + $status = $resource_data->{'resource.'.$partnum.'.solved'}; + } + # + my $tries = 0; + if(exists($resource_data->{'resource.'.$partnum.'.tries'})) { + $tries = $resource_data->{'resource.'.$partnum.'.tries'}; + } + # + if ($awarded > 0) { + # The student has gotten the problem correct to some degree + if ($status eq 'excused') { $symbol = 'x'; $max--; - } elsif (($status eq 'correct_by_scantron' || - $status eq 'correct_by_student') && - exists($resource_data->{'resource.'.$partnum.'.tries'})){ - $tries = $resource_data->{'resource.'.$partnum.'.tries'}; + } elsif ($status eq 'correct_by_override') { + $symbol = '+'; + $sum++; + } elsif ($tries > 0) { if ($tries > 9) { $symbol = '*'; - } elsif ($tries > 0) { - $symbol = $tries; } else { - $symbol = ' '; + $symbol = $tries; } $sum++; - } elsif (exists($resource_data->{'resource.'. - $partnum.'.tries'})){ - $symbol = '.'; } else { - $symbol = ' '; + $symbol = '+'; + $sum++; } } else { - # Unsolved. Did they try? - if (exists($resource_data->{'resource.'.$partnum.'.tries'})){ + # The student has the problem incorrect or it is ungraded + if ($status eq 'excused') { + $symbol = 'x'; + $max--; + } elsif ($status eq 'incorrect_by_override') { + $symbol = '-'; + } elsif ($status eq 'ungraded_attempted') { + $symbol = '#'; + } elsif ($status eq 'incorrect_attempted' || + $tries > 0) { $symbol = '.'; } else { - $symbol = ' '; + # Problem is wrong and has not been attempted. + $symbol=' '; } } #