--- loncom/interface/statistics/lonstudentassessment.pm 2003/09/30 11:41:06 1.68 +++ loncom/interface/statistics/lonstudentassessment.pm 2004/02/12 14:47:55 1.88 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentassessment.pm,v 1.68 2003/09/30 11:41:06 matthew Exp $ +# $Id: lonstudentassessment.pm,v 1.88 2004/02/12 14:47:55 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(); ####################################################### ####################################################### @@ -85,12 +88,6 @@ my $Statistics; =item $show 'all', 'totals', or 'scores' determines how much data is output -=item $data determines what performance data is shown - -=item $datadescription A short description of the output data selected. - -=item $base 'tries' or 'scores' determines the base of the performance shown - =item $single_student_mode evaluates to true if we are showing only one student. @@ -100,9 +97,7 @@ student. ####################################################### my $show_links; my $output_mode; -my $data; -my $base; -my $datadescription; +my $chosen_output; my $single_student_mode; ####################################################### @@ -138,15 +133,24 @@ Inputs: ####################################################### sub BuildStudentAssessmentPage { my ($r,$c)=@_; - + # undef($Statistics); undef($show_links); undef($output_mode); - undef($data); - undef($base); - undef($datadescription); + undef($chosen_output); 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'}) { @@ -200,6 +204,9 @@ sub BuildStudentAssessmentPage { # are immediately reflected in the chart. &Apache::lonnet::clear_EXT_cache_status(); # + # Clean out loncoursedata's package data, just to be safe. + &Apache::loncoursedata::clear_internal_caches(); + # # Call the initialize routine selected above $initialize->($r); foreach my $student (@Students) { @@ -302,14 +309,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"; @@ -338,12 +345,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; @@ -416,6 +425,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'; @@ -442,7 +453,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; @@ -453,62 +464,61 @@ sub CreateAndParseOutputSelector { ## my @OutputDataOptions = ( - { name => 'Scores', - base => 'scores', - value => 'scores', - shortdesc => 'Score on each Problem Part', - longdesc =>'The students score on each problem part, computed as'. - 'the part weight * part awarded', - }, - { name => 'Scores Sum', - base => 'scores', - value => 'sum only', - shortdesc => 'Sum of Scores on each Problem Part', - longdesc =>'The total of the scores of the student on each problem'. - ' part in the sequences or folders selected.', - }, - { name => 'Scores Sum & Maximums', + { name => 'Scores Summary', base => 'scores', value => 'sum and total', + scores => 1, + tries => 0, + every_problem => 0, + sequence_sum => 1, + sequence_max => 1, + grand_total => 1, shortdesc => 'Total Score and Maximum Possible for each '. 'Sequence or Folder', longdesc => 'The score of each student as well as the '. ' maximum possible on each Sequence or Folder.', }, - { name => 'Scores Summary Table Only', + { name => 'Scores Per Problem', base => 'scores', - value => 'final table scores', - shortdesc => 'Summary of Scores', - longdesc => 'The average score on each sequence or folder for the '. - 'selected students.', + value => 'scores', + scores => 1, + tries => 0, + correct => 0, + every_problem => 1, + sequence_sum => 1, + sequence_max => 1, + grand_total => 1, + shortdesc => 'Score on each Problem Part', + longdesc =>'The students score on each problem part, computed as'. + 'the part weight * part awarded', }, { name =>'Tries', base =>'tries', value => 'tries', + scores => 0, + tries => 1, + correct => 0, + every_problem => 1, + sequence_sum => 0, + sequence_max => 0, + grand_total => 0, shortdesc => 'Number of Tries before success on each Problem Part', longdesc =>'The number of tries before success on each problem part.', }, { name =>'Parts Correct', base =>'tries', - value => 'parts correct', - shortdesc => 'Number of Problem Parts completed successfully.', - longdesc => 'The Number of Problem Parts completed successfully'. - ' on each sequence or folder.', - }, - { name =>'Parts Correct & Maximums', - base =>'tries', value => 'parts correct total', + scores => 0, + tries => 0, + correct => 1, + every_problem => 1, + sequence_sum => 1, + sequence_max => 1, + grand_total => 1, shortdesc => 'Number of Problem Parts completed successfully.', longdesc => 'The Number of Problem Parts completed successfully and '. 'the maximum possible for each student', }, - { name => 'Parts Summary Table Only', - base => 'tries', - value => 'final table parts', - shortdesc => 'Summary of Parts Correct', - longdesc => 'A summary table of the average number of problem parts '. - 'students were able to get correct on each sequence.', - }, ); sub HTMLifyOutputDataDescriptions { @@ -536,12 +546,10 @@ sub CreateAndParseOutputDataSelector { } } # - $data = 'scores'; + $chosen_output = $OutputDataOptions[0]; foreach my $option (@OutputDataOptions) { if ($option->{'value'} eq $selected) { - $data = $option->{'value'}; - $base = $option->{'base'}; - $datadescription = $option->{'shortdesc'}; + $chosen_output = $option; } } # @@ -549,8 +557,8 @@ 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 $data); - $Str .= ">".$option->{'name'}."<\/option>"; + $Str .= " selected " if ($option->{'value'} eq $chosen_output->{'value'}); + $Str .= ">".&mt($option->{'name'})."<\/option>"; } $Str .= "\n</select>"; return $Str; @@ -596,16 +604,8 @@ sub html_initialize { $r->print("<h3>".$ENV{'course.'.$ENV{'request.course.id'}.'.description'}. " ".localtime(time)."</h3>"); - if ($data !~ /^final table/) { - $r->print("<h3>".$datadescription."</h3>"); - } - # - # Set up progress window for 'final table' display only - if ($data =~ /^final table/) { - my $studentcount = scalar(@Apache::lonstatistics::Students); - %prog_state=&Apache::lonhtmlcommon::Create_PrgWin - ($r,'Summary Table Status', - 'Summary Table Compilation Progress', $studentcount); + if ($chosen_output->{'base'} !~ /^final table/) { + $r->print("<h3>".$chosen_output->{'shortdesc'}."</h3>"); } my $Str = "<pre>\n"; # First, the @StudentData fields need to be listed @@ -625,11 +625,6 @@ sub html_initialize { } $Str .= "total</pre>\n"; $Str .= "<pre>"; - # - # Check for suppression of output - if ($data =~ /^final table/) { - $Str = ''; - } $r->print($Str); $r->rflush(); return; @@ -639,7 +634,7 @@ sub html_outputstudent { my ($r,$student) = @_; my $Str = ''; # - if($count++ % 5 == 0 && $count > 0 && $data !~ /^final table/) { + if($count++ % 5 == 0 && $count > 0) { $r->print("</pre><pre>"); } # First, the @StudentData fields need to be listed @@ -660,7 +655,6 @@ sub html_outputstudent { } if (scalar(@tmp) < 1) { $nodata_count++; - return if ($data =~ /^final table/); $Str .= '<font color="blue">No Course Data</font>'."\n"; $r->print($Str); $r->rflush(); @@ -672,7 +666,7 @@ sub html_outputstudent { my $PerformanceStr = ''; foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { my ($performance,$performance_length,$score,$seq_max,$rawdata); - if ($base eq 'tries') { + if ($chosen_output->{'tries'}) { ($performance,$performance_length,$score,$seq_max,$rawdata) = &StudentTriesOnSequence($student,\%StudentsData, $seq,$show_links); @@ -683,12 +677,9 @@ sub html_outputstudent { } my $ratio = sprintf("%3d",$score).'/'.sprintf("%3d",$seq_max); # - if ($data eq 'sum and total' || $data eq 'parts correct total') { + if ($chosen_output->{'sequence_sum'}) { $performance = $ratio; $performance .= ' 'x($seq->{'width'}-length($ratio)); - } elsif ($data eq 'sum only' || $data eq 'parts correct') { - $performance = $score; - $performance .= ' 'x($seq->{'width'}-length($score)); } else { # Pad with extra spaces $performance .= ' 'x($seq->{'width'}-$performance_length- @@ -715,13 +706,6 @@ sub html_outputstudent { $Str .= ' '.' 'x(length($max)-length($score)).$score.'/'.$max; $Str .= " \n"; # - # Check for suppressed output and update the progress window if so... - if ($data =~ /^final table/) { - $Str = ''; - &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, - 'last student'); - } - # $r->print($Str); # $r->rflush(); @@ -732,11 +716,7 @@ sub html_finish { my ($r) = @_; # # Check for suppressed output and close the progress window if so - if ($data =~ /^final table/) { - &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); - } else { - $r->print("</pre>\n"); - } + $r->print("</pre>\n"); if ($single_student_mode) { $r->print(&SingleStudentTotal()); } else { @@ -764,22 +744,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; } @@ -840,6 +818,8 @@ my $cols_output; my %prog_state; # progress window state my $request_aborted; +my $total_formula; + sub excel_initialize { my ($r) = @_; # @@ -850,13 +830,18 @@ 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()) { - # Add 2 because we need a 'sum' and 'total' column for each - $total_columns += $seq->{'num_assess_parts'}+2; + if ($chosen_output->{'every_problem'}) { + $total_columns += $seq->{'num_assess_parts'}; + } + # Add 2 because we need a 'sequence_sum' and 'total' column for each + $total_columns += 2; } - if ($data eq 'tries' && $total_columns > 255) { + if ($chosen_output->{'base'} eq 'tries' && $total_columns > 255) { $r->print(<<END); <h2>Unable to Complete Request</h2> <p> @@ -873,7 +858,7 @@ summary data (<b>Parts Correct</b> or <b END $request_aborted = 1; } - if ($data eq 'scores' && $total_columns > 255) { + if ($chosen_output->{'base'} eq 'scores' && $total_columns > 255) { $r->print(<<END); <h2>Unable to Complete Request</h2> <p> @@ -885,16 +870,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>). -</p> -END - $request_aborted = 1; - } - if ($data =~ /^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. +<b>Scores Summary</b> data. </p> END $request_aborted = 1; @@ -934,9 +910,22 @@ END $sheetname = &Apache::loncommon::clean_excel_name($sheetname); $excel_sheet = $excel_workbook->addworksheet($sheetname); # + # Define some potentially useful formats + my $format; + $format->{'header'} = $excel_workbook->add_format(bold => 1, + bottom => 1, + align => 'center'); + $format->{'bold'} = $excel_workbook->add_format(bold=>1); + $format->{'h1'} = $excel_workbook->add_format(bold=>1, size=>18); + $format->{'h2'} = $excel_workbook->add_format(bold=>1, size=>16); + $format->{'h3'} = $excel_workbook->add_format(bold=>1, size=>14); + $format->{'date'} = $excel_workbook->add_format(num_format=> + 'mmm d yyyy hh:mm AM/PM'); + # # Put the course description in the header $excel_sheet->write($rows_output,$cols_output++, - $ENV{'course.'.$ENV{'request.course.id'}.'.description'}); + $ENV{'course.'.$ENV{'request.course.id'}.'.description'}, + $format->{'h1'}); $cols_output += 3; # # Put a description of the sections listed @@ -956,115 +945,206 @@ END $sectionstring = "Section ".$Sections[0]; } } - $excel_sheet->write($rows_output,$cols_output++,$sectionstring); + $excel_sheet->write($rows_output,$cols_output++,$sectionstring, + $format->{'h3'}); $cols_output += scalar(@Sections); # # Put the date in there too $excel_sheet->write($rows_output++,$cols_output++, - 'Compiled on '.localtime(time)); + 'Compiled on '.localtime(time),$format->{'h3'}); # $cols_output = 0; - $excel_sheet->write($rows_output++,$cols_output++,$datadescription); + $excel_sheet->write($rows_output++,$cols_output++, + $chosen_output->{'shortdesc'}, + $format->{'h3'}); # - if ($data eq 'tries' || $data eq 'scores') { - $rows_output++; - } + # Figure out the rows we need + my $sequence_name_row = $rows_output+1; + my $resource_name_row = $sequence_name_row+1; + my $maximum_data_row = $sequence_name_row+2; + my $first_data_row = $sequence_name_row+3; # # Add the student headers $cols_output = 0; foreach my $field (&get_student_fields_to_show()) { - $excel_sheet->write($rows_output,$cols_output++,$field); - } - my $row_offset = 0; - if ($data eq 'tries' || $data eq 'scores') { - $row_offset = -1; + $excel_sheet->write($resource_name_row,$cols_output++,$field, + $format->{'bold'}); } # # 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') { + $excel_sheet->write($sequence_name_row,, + $cols_output,$seq->{'title'},$format->{'h3'}); + # Determine starting cell + $seq->{'Excel:startcell'}= + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($maximum_data_row,$cols_output); + $seq->{'Excel:startcol'}=$cols_output; + my $count = 0; + if ($chosen_output->{'every_problem'}) { + # Put the names of the problems and parts into the sheet foreach my $res (@{$seq->{'contents'}}) { - next if ($res->{'type'} ne 'assessment'); + if ($res->{'type'} ne 'assessment' || + ! exists($res->{'parts'}) || + ref($res->{'parts'}) ne 'ARRAY' || + scalar(@{$res->{'parts'}}) < 1) { + next; + } if (scalar(@{$res->{'parts'}}) > 1) { foreach my $part (@{$res->{'parts'}}) { - $excel_sheet->write($rows_output, + $excel_sheet->write($resource_name_row, $cols_output++, - $res->{'title'}.' part '.$part); + $res->{'title'}.' part '.$part, + $format->{'bold'}); } } else { - $excel_sheet->write($rows_output, + $excel_sheet->write($resource_name_row, $cols_output++, - $res->{'title'}); + $res->{'title'},$format->{'bold'}); } + $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; - } else { - $cols_output++; } - } - # - # Bookkeeping - if ($data eq 'sum and total' || $data eq 'parts correct total') { - $rows_output += 2; - } else { - $rows_output += 1; - } - # - # Output a row for MAX - $cols_output = 0; - foreach my $field (&get_student_fields_to_show()) { - if ($field eq 'username' || $field eq 'fullname' || - $field eq 'id') { - $excel_sheet->write($rows_output,$cols_output++,'Maximum'); + # Determine ending cell + if ($count <= 1) { + $seq->{'Excel:endcell'} = $seq->{'Excel:startcell'}; + $seq->{'Excel:endcol'} = $seq->{'Excel:startcol'}; } else { - $excel_sheet->write($rows_output,$cols_output++,''); + $seq->{'Excel:endcell'} = + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($maximum_data_row,$cols_output-1); + $seq->{'Excel:endcol'} = $cols_output-1; + } + # Create the formula for summing up this sequence + if (! exists($seq->{'Excel:endcell'}) || + ! defined($seq->{'Excel:endcell'})) { + $seq->{'Excel:endcell'} = $seq->{'Excel:startcell'}; + } + $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 + ($maximum_data_row,$cols_output); + $seq->{'Excel:scorecol'}=$cols_output; + if ($chosen_output->{'base'} eq 'parts correct total') { + $excel_sheet->write($resource_name_row,$cols_output++, + 'parts correct', + $format->{'bold'}); + } elsif ($chosen_output->{'sequence_sum'}) { + if ($chosen_output->{'correct'}) { + # Only reporting the number correct, so do not call it score + $excel_sheet->write($resource_name_row,$cols_output++, + 'sum', + $format->{'bold'}); + } else { + $excel_sheet->write($resource_name_row,$cols_output++, + 'score', + $format->{'bold'}); + } } - } - # - # Add the maximums for each sequence or assessment - foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { - my $weight; - my $max = 0; - foreach my $resource (@{$seq->{'contents'}}) { - next if ($resource->{'type'} ne 'assessment'); - foreach my $part (@{$resource->{'parts'}}) { - $weight = 1; - if ($base eq 'scores') { - $weight = &Apache::lonnet::EXT - ('resource.'.$part.'.weight',$resource->{'symb'}, - undef,undef,undef); - if (!defined($weight) || ($weight eq '')) { - $weight=1; + # + $total_formula_string.='+'. + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($maximum_data_row,$cols_output-1); + if ($chosen_output->{'sequence_max'}) { + $excel_sheet->write($resource_name_row,$cols_output++, + 'maximum', + $format->{'bold'}); + } + } + if ($chosen_output->{'grand_total'}) { + $excel_sheet->write($resource_name_row,$cols_output++,'Total', + $format->{'bold'}); + } + $total_formula = $excel_sheet->store_formula($total_formula_string); + # + # Output a row for MAX, if appropriate + if ($chosen_output->{'scores'}) { + $cols_output = 0; + foreach my $field (&get_student_fields_to_show()) { + if ($field eq 'username' || $field eq 'fullname' || + $field eq 'id') { + $excel_sheet->write($maximum_data_row,$cols_output++,'Maximum', + $format->{'bold'}); + } else { + $excel_sheet->write($maximum_data_row,$cols_output++,''); + } + } + # + # Add the maximums for each sequence or assessment + my %total_cell_translation; + foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { + $cols_output=$seq->{'Excel:startcol'}; + $total_cell_translation{$seq->{'Excel:scorecell'}} = + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($maximum_data_row,$seq->{'Excel:scorecol'}); + my $weight; + my $max = 0; + foreach my $resource (@{$seq->{'contents'}}) { + next if ($resource->{'type'} ne 'assessment'); + foreach my $part (@{$resource->{'parts'}}) { + $weight = 1; + if ($chosen_output->{'scores'}) { + $weight = &Apache::lonnet::EXT + ('resource.'.$part.'.weight',$resource->{'symb'}, + undef,undef,undef); + if (!defined($weight) || ($weight eq '')) { + $weight=1; + } } + if ($chosen_output->{'scores'} && + $chosen_output->{'every_problem'}) { + $excel_sheet->write($maximum_data_row,$cols_output++, + $weight); + } + $max += $weight; } - if ($data eq 'scores') { - $excel_sheet->write($rows_output,$cols_output++,$weight); - } elsif ($data eq 'tries') { - $excel_sheet->write($rows_output,$cols_output++,''); - } - $max += $weight; + } + # + if ($chosen_output->{'sequence_sum'} && + $chosen_output->{'every_problem'}) { + my %replaceCells; + $replaceCells{$seq->{'Excel:startcell'}} = + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($maximum_data_row,$seq->{'Excel:startcol'}); + $replaceCells{$seq->{'Excel:endcell'}} = + &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell + ($maximum_data_row,$seq->{'Excel:endcol'}); + $excel_sheet->repeat_formula($maximum_data_row,$cols_output++, + $seq->{'Excel:sum'},undef, + %replaceCells); + } elsif ($chosen_output->{'sequence_sum'}) { + $excel_sheet->write($maximum_data_row,$cols_output++,$max); } - } - if (! ($data eq 'sum only' || $data eq 'parts correct')) { - $excel_sheet->write($rows_output,$cols_output++,''); + if ($chosen_output->{'sequence_max'}) { + $excel_sheet->write($maximum_data_row,$cols_output++,$max); + } + # } - $excel_sheet->write($rows_output,$cols_output++,$max); - } - $rows_output++; + if ($chosen_output->{'grand_total'}) { + $excel_sheet->repeat_formula($maximum_data_row,$cols_output++, + $total_formula,undef, + %total_cell_translation); + } + } # End of MAXIMUM row output if ($chosen_output->{'scores'}) { + $rows_output = $first_data_row; # # Let the user know what we are doing my $studentcount = scalar(@Apache::lonstatistics::Students); - $r->print("<h1>Compiling Excel spreadsheet for ". - $studentcount.' student'); - $r->print('s') if ($studentcount > 1); - $r->print("</h1>\n"); + if ($ENV{'form.SelectedStudent'}) { + $studentcount = '1'; + } + if ($studentcount > 1) { + $r->print('<h1>'.&mt('Compiling Excel spreadsheet for [_1] students', + $studentcount)."</h1>\n"); + } else { + $r->print('<h1>'. + &mt('Compiling Excel spreadsheet for 1 student'). + "</h1>\n"); + } $r->rflush(); # # Initialize progress window @@ -1100,9 +1180,16 @@ sub excel_outputstudent { } # # Write out sequence scores and totals data + my %total_cell_translation; foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { + $cols_output = $seq->{'Excel:startcol'}; + # 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') { + if ($chosen_output->{'tries'} || $chosen_output->{'correct'}){ ($performance,$performance_length,$score,$seq_max,$rawdata) = &StudentTriesOnSequence($student,\%StudentsData, $seq,'no'); @@ -1110,22 +1197,55 @@ sub excel_outputstudent { ($performance,$performance_length,$score,$seq_max,$rawdata) = &StudentPerformanceOnSequence($student,\%StudentsData, $seq,'no'); + } + if ($chosen_output->{'every_problem'}) { + if ($chosen_output->{'correct'}) { + # only indiciate if each item is correct or not + foreach my $value (@$rawdata) { + # nonzero means correct + $value = 1 if ($value > 0); + $excel_sheet->write($rows_output,$cols_output++,$value); + } + } else { + foreach my $value (@$rawdata) { + $excel_sheet->write($rows_output,$cols_output++,$value); + } + } } - if ($data eq 'tries' || $data eq 'scores') { - foreach my $value (@$rawdata) { - $excel_sheet->write($rows_output,$cols_output++,$value); + if ($chosen_output->{'sequence_sum'} && + $chosen_output->{'every_problem'}) { + # 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++,$score); - $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') { + } elsif ($chosen_output->{'sequence_sum'}) { $excel_sheet->write($rows_output,$cols_output++,$score); } - if ($data eq 'sum and total' || $data eq 'parts correct total') { + if ($chosen_output->{'sequence_max'}) { $excel_sheet->write($rows_output,$cols_output++,$seq_max); } } # + if ($chosen_output->{'grand_total'}) { + $excel_sheet->repeat_formula($rows_output,$cols_output++, + $total_formula,undef, + %total_cell_translation); + } + # # Bookkeeping $rows_output++; $cols_output=0; @@ -1192,7 +1312,7 @@ sub csv_initialize{ # # Deal with unimplemented requests $request_aborted = undef; - if ($data =~ /final table/) { + if ($chosen_output->{'base'} =~ /final table/) { $r->print(<<END); <h2>Unable to Complete Request</h2> <p> @@ -1202,7 +1322,12 @@ END $request_aborted = 1; } return if ($request_aborted); - + # + # 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); # # Open a file $filename = '/prtspool/'. @@ -1223,55 +1348,54 @@ END "\n"; # # Print out the headings - my $Str = ''; - my $Str2 = undef; + my $sequence_row = ''; + my $resource_row = undef; foreach my $field (&get_student_fields_to_show()) { - if ($data eq 'sum only') { - $Str .= '"'.&Apache::loncommon::csv_translate($field).'",'; - } elsif ($data eq 'sum and total' || $data eq 'parts correct total') { - $Str .= '"",'; # first row empty on the student fields - $Str2 .= '"'.&Apache::loncommon::csv_translate($field).'",'; - } elsif ($data eq 'scores' || $data eq 'tries' || - $data eq 'parts correct') { - $Str .= '"",'; - $Str2 .= '"'.&Apache::loncommon::csv_translate($field).'",'; - } + $sequence_row .='"",'; + $resource_row .= '"'.&Apache::loncommon::csv_translate($field).'",'; } foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { - if ($data eq 'sum only' || $data eq 'parts correct') { - $Str .= '"'.&Apache::loncommon::csv_translate($seq->{'title'}). - '",'; - } elsif ($data eq 'sum and total' || $data eq 'parts correct total') { - $Str .= '"'.&Apache::loncommon::csv_translate($seq->{'title'}). - '","",'; - $Str2 .= '"score","total possible",'; - } elsif ($data eq 'scores' || $data eq 'tries') { - $Str .= '"'.&Apache::loncommon::csv_translate($seq->{'title'}). - '",'; - $Str .= '"",'x($seq->{'num_assess_parts'}-1+2); + $sequence_row .= '"'. + &Apache::loncommon::csv_translate($seq->{'title'}).'",'; + my $count = 0; + if ($chosen_output->{'every_problem'}) { foreach my $res (@{$seq->{'contents'}}) { - next if ($res->{'type'} ne 'assessment'); + if ($res->{'type'} ne 'assessment' || + ! exists($res->{'parts'}) || + ref($res->{'parts'}) ne 'ARRAY' || + scalar(@{$res->{'parts'}}) < 1) { + next; + } foreach my $part (@{$res->{'parts'}}) { - $Str2 .= '"'.&Apache::loncommon::csv_translate($res->{'title'}.', Part '.$part).'",'; + $resource_row .= '"'. + &Apache::loncommon::csv_translate($res->{'title'}. + ', Part '.$part + ).'",'; + $count++; } } - $Str2 .= '"score","total possible",'; + } + $sequence_row.='"",'x$count; + if ($chosen_output->{'sequence_sum'}) { + if($chosen_output->{'correct'}) { + $resource_row .= '"sum",'; + } else { + $resource_row .= '"score",'; + } + } + if ($chosen_output->{'sequence_max'}) { + $sequence_row.= '"",'; + $resource_row .= '"maximum possible",'; } } - chop($Str); - $Str .= "\n"; - print $outputfile $Str; - if (defined($Str2)) { - chop($Str2); - $Str2 .= "\n"; - print $outputfile $Str2; - } - # - # 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); + if ($chosen_output->{'grand_total'}) { + $sequence_row.= '"",'; + $resource_row.= '"Total",'; + } + chomp($sequence_row); + chomp($resource_row); + print $outputfile $sequence_row."\n"; + print $outputfile $resource_row."\n"; return; } @@ -1298,9 +1422,10 @@ sub csv_outputstudent { } # # Output performance data + my $total = 0; foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { my ($performance,$performance_length,$score,$seq_max,$rawdata); - if ($base eq 'tries') { + if ($chosen_output->{'tries'}){ ($performance,$performance_length,$score,$seq_max,$rawdata) = &StudentTriesOnSequence($student,\%StudentsData, $seq,'no'); @@ -1309,13 +1434,31 @@ sub csv_outputstudent { &StudentPerformanceOnSequence($student,\%StudentsData, $seq,'no'); } - if ($data eq 'sum only' || $data eq 'parts correct') { + if ($chosen_output->{'every_problem'}) { + if ($chosen_output->{'correct'}) { + $score = 0; + # Deal with number of parts correct data + $Str .= '"'.join('","',( map { if ($_>0) { + $score += 1; + 1; + } else { + 0; + } + } @$rawdata)).'",'; + } else { + $Str .= '"'.join('","',(@$rawdata)).'",'; + } + } + if ($chosen_output->{'sequence_sum'}) { $Str .= '"'.$score.'",'; - } elsif ($data eq 'sum and total' || $data eq 'parts correct total') { - $Str .= '"'.$score.'","'.$seq_max.'",'; - } elsif ($data eq 'scores' || $data eq 'tries') { - $Str .= '"'.join('","',(@$rawdata,$score,$seq_max)).'",'; + } + if ($chosen_output->{'sequence_max'}) { + $Str .= '"'.$seq_max.'",'; } + $total+=$score; + } + if ($chosen_output->{'grand_total'}) { + $Str .= '"'.$total.'",'; } chop($Str); $Str .= "\n"; @@ -1391,44 +1534,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=' '; } } # @@ -1519,6 +1674,9 @@ sub StudentPerformanceOnSequence { $partscore = $weight*$awarded; $score += $partscore; $symbol = $partscore; + if (abs($symbol - sprintf("%.0f",$symbol)) < 0.001) { + $symbol = sprintf("%.0f",$symbol); + } if (length($symbol) > 1) { $symbol = '*'; }