--- loncom/interface/statistics/lonstudentassessment.pm 2004/02/10 19:08:02 1.81.2.1 +++ loncom/interface/statistics/lonstudentassessment.pm 2004/02/11 17:42:34 1.86 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentassessment.pm,v 1.81.2.1 2004/02/10 19:08:02 albertel Exp $ +# $Id: lonstudentassessment.pm,v 1.86 2004/02/11 17:42:34 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -785,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 .= ''.$seq->{'title'}.''. - ''.$ave.''. - ''.$max.''."\n"; + ''.$ave.' '. + ''.$max.' '.''."\n"; } - $total_ave = int(100*$total_ave)/100; # only two digit + $total_ave = sprintf('%.2f',$total_ave); # only two digit $Str .= "\n"; $Str .= ''."\n"; $Str .= ''. "\n"; - $Str .= ''. - ''; + $Str .= ''. + ''. + ''. + ''; $Str .= "
Number of StudentsAverageMaximum
'.($num_students-$nodata_count).''.$total_ave.''.$total_max.'
'.($num_students-$nodata_count).''.$total_ave.' '.''.$total_max.' '.'
\n"; return $Str; } @@ -958,9 +956,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 @@ -980,42 +991,48 @@ 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++,$datadescription, + $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'}); + $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; 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'}}) { if ($res->{'type'} ne 'assessment' || ! exists($res->{'parts'}) || @@ -1025,22 +1042,33 @@ END } 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++; } # Determine ending cell - $seq->{'Excel:endcell'} = - &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($rows_output,$cols_output-1); - $seq->{'Excel:endcol'}=$cols_output-1; + if ($count == 1) { + $seq->{'Excel:endcell'} = $seq->{'Excel:startcell'}; + $seq->{'Excel:endcol'} = $seq->{'Excel:startcol'}; + } else { + $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'}.')'); @@ -1048,37 +1076,38 @@ END # Determine cell the score is held in $seq->{'Excel:scorecell'} = &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($rows_output,$cols_output); + ($maximum_data_row,$cols_output); $seq->{'Excel:scorecol'}=$cols_output; if ($data eq 'parts correct total') { - $excel_sheet->write($rows_output,$cols_output++,'parts correct'); + $excel_sheet->write($resource_name_row,$cols_output++, + 'parts correct', + $format->{'bold'}); } else { - $excel_sheet->write($rows_output,$cols_output++,'score'); + $excel_sheet->write($resource_name_row,$cols_output++, + 'score', + $format->{'bold'}); } # $total_formula_string.='+'. &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell - ($rows_output,$cols_output-1); - $excel_sheet->write($rows_output,$cols_output++,'maximum'); + ($maximum_data_row,$cols_output-1); + $excel_sheet->write($resource_name_row,$cols_output++, + 'maximum', + $format->{'bold'}); } - $excel_sheet->write($rows_output,$cols_output++,'Grand Total'); + $excel_sheet->write($resource_name_row,$cols_output++,'Grand Total', + $format->{'bold'}); $total_formula = $excel_sheet->store_formula($total_formula_string); # - # 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'); + $excel_sheet->write($maximum_data_row,$cols_output++,'Maximum', + $format->{'bold'}); } else { - $excel_sheet->write($rows_output,$cols_output++,''); + $excel_sheet->write($maximum_data_row,$cols_output++,''); } } # @@ -1088,7 +1117,7 @@ END 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'}); + ($maximum_data_row,$seq->{'Excel:scorecol'}); my $weight; my $max = 0; foreach my $resource (@{$seq->{'contents'}}) { @@ -1104,49 +1133,56 @@ END } } if ($data eq 'scores') { - $excel_sheet->write($rows_output,$cols_output++,$weight); + $excel_sheet->write($maximum_data_row,$cols_output++,$weight); } elsif ($data eq 'tries') { - $excel_sheet->write($rows_output,$cols_output++,''); + $excel_sheet->write($maximum_data_row,$cols_output++,''); } $max += $weight; } } if (! ($data eq 'sum only' || $data eq 'parts correct')) { - $excel_sheet->write($rows_output,$cols_output++,''); + $excel_sheet->write($maximum_data_row,$cols_output++,''); } # 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'}); + ($maximum_data_row,$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++, + ($maximum_data_row,$seq->{'Excel:endcol'}); + $excel_sheet->repeat_formula($maximum_data_row,$cols_output++, $seq->{'Excel:sum'},undef, %replaceCells); } else { - $excel_sheet->write($rows_output,$cols_output++, + $excel_sheet->write($maximum_data_row,$cols_output++, $max); } $grand_total+=$max; } if ($data eq 'tries' || $data eq 'scores') { - $excel_sheet->repeat_formula($rows_output,$cols_output++, + $excel_sheet->repeat_formula($maximum_data_row,$cols_output++, $total_formula,undef, %total_cell_translation); } else { - $excel_sheet->write($rows_output,$cols_output++,$grand_total); + $excel_sheet->write($maximum_data_row,$cols_output++,$grand_total); } - $rows_output++; + $rows_output = $first_data_row; # # Let the user know what we are doing my $studentcount = scalar(@Apache::lonstatistics::Students); - $r->print("

Compiling Excel spreadsheet for ". - $studentcount.' student'); - $r->print('s') if ($studentcount > 1); - $r->print("

\n"); + if ($ENV{'form.SelectedStudent'}) { + $studentcount = '1'; + } + if ($studentcount > 1) { + $r->print('

'.&mt('Compiling Excel spreadsheet for [_1] students', + $studentcount)."

\n"); + } else { + $r->print('

'. + &mt('Compiling Excel spreadsheet for 1 student'). + "

\n"); + } $r->rflush(); # # Initialize progress window @@ -1184,6 +1220,7 @@ 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 @@ -1235,7 +1272,6 @@ sub excel_outputstudent { $excel_sheet->repeat_formula($rows_output,$cols_output++, $total_formula,undef, %total_cell_translation); - # # Bookkeeping $rows_output++;