version 1.90, 2004/02/12 21:15:47
|
version 1.102, 2004/07/13 15:03:34
|
Line 153 sub BuildStudentAssessmentPage {
|
Line 153 sub BuildStudentAssessmentPage {
|
# |
# |
$single_student_mode = 0; |
$single_student_mode = 0; |
$single_student_mode = 1 if ($ENV{'form.SelectedStudent'}); |
$single_student_mode = 1 if ($ENV{'form.SelectedStudent'}); |
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
|
['selectstudent']); |
if ($ENV{'form.selectstudent'}) { |
if ($ENV{'form.selectstudent'}) { |
&Apache::lonstatistics::DisplayClasslist($r); |
&Apache::lonstatistics::DisplayClasslist($r); |
return; |
return; |
Line 306 the chart page.
|
Line 308 the chart page.
|
####################################################### |
####################################################### |
sub CreateInterface { |
sub CreateInterface { |
my $Str = ''; |
my $Str = ''; |
|
$Str .= &Apache::lonhtmlcommon::breadcrumbs(undef,'Chart'); |
# $Str .= &CreateLegend(); |
# $Str .= &CreateLegend(); |
$Str .= '<table cellspacing="5">'."\n"; |
$Str .= '<table cellspacing="5">'."\n"; |
$Str .= '<tr>'; |
$Str .= '<tr>'; |
Line 401 my @OutputOptions =
|
Line 404 my @OutputOptions =
|
}, |
}, |
{ name => 'CSV', |
{ name => 'CSV', |
value => 'csv', |
value => 'csv', |
description => 'Output a comma seperated values file suitable for '. |
description => 'Output a comma separated values file suitable for '. |
'import into a spreadsheet program. Using this method as opposed '. |
'import into a spreadsheet program. Using this method as opposed '. |
'to Excel output allows you to organize your data before importing'. |
'to Excel output allows you to organize your data before importing'. |
' it into a spreadsheet program.', |
' it into a spreadsheet program.', |
Line 473 my @OutputDataOptions =
|
Line 476 my @OutputDataOptions =
|
sequence_sum => 1, |
sequence_sum => 1, |
sequence_max => 1, |
sequence_max => 1, |
grand_total => 1, |
grand_total => 1, |
|
grand_maximum => 1, |
summary_table => 1, |
summary_table => 1, |
maximum_row => 1, |
maximum_row => 1, |
shortdesc => 'Total Score and Maximum Possible for each '. |
shortdesc => 'Total Score and Maximum Possible for each '. |
Line 490 my @OutputDataOptions =
|
Line 494 my @OutputDataOptions =
|
sequence_sum => 1, |
sequence_sum => 1, |
sequence_max => 1, |
sequence_max => 1, |
grand_total => 1, |
grand_total => 1, |
|
grand_maximum => 1, |
summary_table => 1, |
summary_table => 1, |
maximum_row => 1, |
maximum_row => 1, |
shortdesc => 'Score on each Problem Part', |
shortdesc => 'Score on each Problem Part', |
Line 506 my @OutputDataOptions =
|
Line 511 my @OutputDataOptions =
|
sequence_sum => 0, |
sequence_sum => 0, |
sequence_max => 0, |
sequence_max => 0, |
grand_total => 0, |
grand_total => 0, |
|
grand_maximum => 0, |
summary_table => 0, |
summary_table => 0, |
maximum_row => 0, |
maximum_row => 0, |
shortdesc => 'Number of Tries before success on each Problem Part', |
shortdesc => 'Number of Tries before success on each Problem Part', |
Line 521 my @OutputDataOptions =
|
Line 527 my @OutputDataOptions =
|
sequence_sum => 1, |
sequence_sum => 1, |
sequence_max => 1, |
sequence_max => 1, |
grand_total => 1, |
grand_total => 1, |
|
grand_maximum => 1, |
summary_table => 1, |
summary_table => 1, |
maximum_row => 0, |
maximum_row => 0, |
shortdesc => 'Number of Problem Parts completed successfully.', |
shortdesc => 'Number of Problem Parts completed successfully.', |
Line 600 Return a line of the chart for a student
|
Line 607 Return a line of the chart for a student
|
|
|
my $nodata_count; # The number of students for which there is no data |
my $nodata_count; # The number of students for which there is no data |
my %prog_state; # progress state used by loncommon PrgWin routines |
my %prog_state; # progress state used by loncommon PrgWin routines |
|
my $total_sum_width; |
|
|
sub html_initialize { |
sub html_initialize { |
my ($r) = @_; |
my ($r) = @_; |
Line 626 sub html_initialize {
|
Line 634 sub html_initialize {
|
} |
} |
# |
# |
# Compute the column widths and output the sequence titles |
# Compute the column widths and output the sequence titles |
|
my $total_count; |
foreach my $sequence (&Apache::lonstatistics::Sequences_with_Assess()){ |
foreach my $sequence (&Apache::lonstatistics::Sequences_with_Assess()){ |
# |
# |
# Comptue column widths |
# Comptue column widths |
$sequence->{'width_sum'} = 0; |
$sequence->{'width_sum'} = 0; |
if ($chosen_output->{'sequence_sum'}) { |
if ($chosen_output->{'sequence_sum'}) { |
|
if ($chosen_output->{'every_problem'}) { |
|
# Use 1 digit for a space |
|
$sequence->{'width_sum'} += 1; |
|
} |
|
$total_count += $sequence->{'num_assess_parts'}; |
# Use 3 digits for the sum |
# Use 3 digits for the sum |
$sequence->{'width_sum'} = 3; |
$sequence->{'width_sum'} += 3; |
} |
} |
if ($chosen_output->{'sequence_max'}) { |
if ($chosen_output->{'sequence_max'}) { |
if ($sequence->{'width_sum'}>0) { |
if ($sequence->{'width_sum'}>0) { |
Line 642 sub html_initialize {
|
Line 656 sub html_initialize {
|
# Use 3 digits for the total |
# Use 3 digits for the total |
$sequence->{'width_sum'}+=3; |
$sequence->{'width_sum'}+=3; |
} |
} |
|
# |
if ($chosen_output->{'every_problem'}) { |
if ($chosen_output->{'every_problem'}) { |
# one problem per digit |
# one problem per digit |
$sequence->{'width_problem'} = $sequence->{'num_assess_parts'}; |
$sequence->{'width_problem'} = $sequence->{'num_assess_parts'}; |
Line 650 sub html_initialize {
|
Line 665 sub html_initialize {
|
} |
} |
$sequence->{'width_total'} = $sequence->{'width_problem'} + |
$sequence->{'width_total'} = $sequence->{'width_problem'} + |
$sequence->{'width_sum'}; |
$sequence->{'width_sum'}; |
if ($sequence->{'width_total'} < length($sequence->{'title'})) { |
if ($sequence->{'width_total'} < length(&HTML::Entities::decode($sequence->{'title'}))) { |
$sequence->{'width_total'} = length($sequence->{'title'}); |
$sequence->{'width_total'} = length(&HTML::Entities::decode($sequence->{'title'})); |
$sequence->{'width_problem'} = |
|
$sequence->{'width_total'} - $sequence->{'width_sum'}; |
|
} |
} |
# |
# |
# Output the sequence titles |
# Output the sequence titles |
Line 662 sub html_initialize {
|
Line 675 sub html_initialize {
|
length($sequence->{'title'}) |
length($sequence->{'title'}) |
).$padding; |
).$padding; |
} |
} |
$Str .= "total</pre>\n"; |
$total_sum_width = length($total_count)+1; |
|
$Str .= " total</pre>\n"; |
$Str .= "<pre>"; |
$Str .= "<pre>"; |
$r->print($Str); |
$r->print($Str); |
$r->rflush(); |
$r->rflush(); |
Line 715 sub html_outputstudent {
|
Line 729 sub html_outputstudent {
|
$seq,$show_links); |
$seq,$show_links); |
} |
} |
my $ratio=''; |
my $ratio=''; |
if ($chosen_output->{'sequence_sum'}) { |
if ($chosen_output->{'every_problem'}) { |
$ratio .= sprintf("%3d",$score); |
$ratio .= ' '; |
|
} |
|
if ($chosen_output->{'sequence_sum'} && $score ne ' ') { |
|
$ratio .= sprintf("%3.0f",$score); |
|
} elsif($chosen_output->{'sequence_sum'}) { |
|
$ratio .= ' 'x3; |
} |
} |
if ($chosen_output->{'sequence_max'}) { |
if ($chosen_output->{'sequence_max'}) { |
if ($chosen_output->{'sequence_sum'}) { |
if ($chosen_output->{'sequence_sum'}) { |
$ratio .= '/'; |
$ratio .= '/'; |
} |
} |
$ratio .= sprintf("%3d",$seq_max); |
$ratio .= sprintf("%3.0f",$seq_max); |
} |
} |
# |
# |
if (! $chosen_output->{'every_problem'}) { |
if (! $chosen_output->{'every_problem'}) { |
$performance = ''; |
$performance = ''; |
|
$performance_length=0; |
} |
} |
$performance .= ' 'x($seq->{'width_problem'}-$performance_length). |
$performance .= ' 'x($seq->{'width_total'}-$performance_length-$seq->{'width_sum'}). |
$ratio; |
$ratio; |
# |
# |
$Str .= $performance.$padding; |
$Str .= $performance.$padding; |
Line 738 sub html_outputstudent {
|
Line 758 sub html_outputstudent {
|
} |
} |
# |
# |
# Total it up and store the statistics info. |
# Total it up and store the statistics info. |
my ($score,$max) = (0,0); |
my ($score,$max); |
while (my ($symb,$seq_stats) = each (%{$studentstats})) { |
while (my ($symb,$seq_stats) = each (%{$studentstats})) { |
$Statistics->{$symb}->{'score'} += $seq_stats->{'score'}; |
$Statistics->{$symb}->{'score'} += $seq_stats->{'score'}; |
if ($Statistics->{$symb}->{'max'} < $seq_stats->{'max'}) { |
if ($Statistics->{$symb}->{'max'} < $seq_stats->{'max'}) { |
$Statistics->{$symb}->{'max'} = $seq_stats->{'max'}; |
$Statistics->{$symb}->{'max'} = $seq_stats->{'max'}; |
} |
} |
$score += $seq_stats->{'score'}; |
if ($seq_stats->{'score'} ne ' ') { |
|
$score += $seq_stats->{'score'}; |
|
$Statistics->{$symb}->{'num_students'}++; |
|
} |
$max += $seq_stats->{'max'}; |
$max += $seq_stats->{'max'}; |
} |
} |
$Str .= ' '.' 'x(length($max)-length($score)).$score.'/'.$max; |
if (! defined($score)) { |
|
$score = ' ' x $total_sum_width; |
|
} |
|
$Str .= ' '.' 'x($total_sum_width-length($score)).$score.' / '.$max; |
$Str .= " \n"; |
$Str .= " \n"; |
# |
# |
$r->print($Str); |
$r->print($Str); |
Line 774 sub html_finish {
|
Line 800 sub html_finish {
|
|
|
sub StudentAverageTotal { |
sub StudentAverageTotal { |
my $Str = "<h3>Summary Tables</h3>\n"; |
my $Str = "<h3>Summary Tables</h3>\n"; |
my $num_students = scalar(@Apache::lonstatistics::Students); |
# my $max_students; |
my $total_ave = 0; |
# my $total_ave = 0; |
my $total_max = 0; |
# my $total_max = 0; |
$Str .= '<table border=2 cellspacing="1">'."\n"; |
$Str .= '<table border=2 cellspacing="1">'."\n"; |
$Str .= "<tr><th>Title</th><th>Average</th><th>Maximum</th></tr>\n"; |
$Str .= "<tr><th>Title</th><th>Average</th><th>Maximum</th></tr>\n"; |
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { |
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { |
my $ave; |
my $ave; |
if ($num_students > $nodata_count) { |
my $num_students = $Statistics->{$seq->{'symb'}}->{'num_students'}; |
$ave = int(100*($Statistics->{$seq->{'symb'}}->{'score'}/ |
# if ($num_students > $max_students) { |
($num_students-$nodata_count)))/100; |
# $max_students = $num_students; |
|
# } |
|
if ($num_students > 0) { |
|
$ave = int(100* |
|
($Statistics->{$seq->{'symb'}}->{'score'}/$num_students) |
|
)/100; |
} else { |
} else { |
$ave = 0; |
$ave = 0; |
} |
} |
$total_ave += $ave; |
# $total_ave += $ave; |
my $max = $Statistics->{$seq->{'symb'}}->{'max'}; |
my $max = $Statistics->{$seq->{'symb'}}->{'max'}; |
$total_max += $max; |
# $total_max += $max; |
$ave = sprintf("%.2f",$ave); |
$ave = sprintf("%.2f",$ave); |
$Str .= '<tr><td>'.$seq->{'title'}.'</td>'. |
$Str .= '<tr><td>'.$seq->{'title'}.'</td>'. |
'<td align="right">'.$ave.' </td>'. |
'<td align="right">'.$ave.' </td>'. |
'<td align="right">'.$max.' '.'</td></tr>'."\n"; |
'<td align="right">'.$max.' '.'</td></tr>'."\n"; |
} |
} |
$total_ave = sprintf('%.2f',$total_ave); # 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 align="right">'.($num_students-$nodata_count).'</td>'. |
|
'<td align="right">'.$total_ave.' '.'</td>'. |
|
'<td align="right">'.$total_max.' '.'</td>'; |
|
$Str .= "</table>\n"; |
$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 align="right">'.$max_students.'</td>'. |
|
# '<td align="right">'.$total_ave.' '.'</td>'. |
|
# '<td align="right">'.$total_max.' '.'</td>'; |
|
# $Str .= "</table>\n"; |
return $Str; |
return $Str; |
} |
} |
|
|
Line 865 my %prog_state; # progress window state
|
Line 896 my %prog_state; # progress window state
|
my $request_aborted; |
my $request_aborted; |
|
|
my $total_formula; |
my $total_formula; |
|
my $maximum_formula; |
|
|
sub excel_initialize { |
sub excel_initialize { |
my ($r) = @_; |
my ($r) = @_; |
Line 877 sub excel_initialize {
|
Line 909 sub excel_initialize {
|
undef (%prog_state); |
undef (%prog_state); |
undef ($request_aborted); |
undef ($request_aborted); |
undef ($total_formula); |
undef ($total_formula); |
|
undef ($maximum_formula); |
# |
# |
my $total_columns = scalar(&get_student_fields_to_show()); |
my $total_columns = scalar(&get_student_fields_to_show()); |
my $num_students = scalar(@Apache::lonstatistics::Students); |
my $num_students = scalar(@Apache::lonstatistics::Students); |
Line 970 END
|
Line 1003 END
|
# File::Temp is used to determine the temporary directory. |
# File::Temp is used to determine the temporary directory. |
$excel_workbook->set_tempdir($Apache::lonnet::tmpdir); |
$excel_workbook->set_tempdir($Apache::lonnet::tmpdir); |
# |
# |
|
my $format = &Apache::loncommon::define_excel_formats($excel_workbook); |
|
# |
# Add a worksheet |
# Add a worksheet |
my $sheetname = $ENV{'course.'.$ENV{'request.course.id'}.'.description'}; |
my $sheetname = $ENV{'course.'.$ENV{'request.course.id'}.'.description'}; |
$sheetname = &Apache::loncommon::clean_excel_name($sheetname); |
$sheetname = &Apache::loncommon::clean_excel_name($sheetname); |
$excel_sheet = $excel_workbook->addworksheet($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 |
# Put the course description in the header |
$excel_sheet->write($header_row,$cols_output++, |
$excel_sheet->write($header_row,$cols_output++, |
$ENV{'course.'.$ENV{'request.course.id'}.'.description'}, |
$ENV{'course.'.$ENV{'request.course.id'}.'.description'}, |
Line 1035 END
|
Line 1058 END
|
# |
# |
# Add the remaining column headers |
# Add the remaining column headers |
my $total_formula_string = '=0'; |
my $total_formula_string = '=0'; |
|
my $maximum_formula_string = '=0'; |
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { |
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { |
$excel_sheet->write($sequence_name_row,, |
$excel_sheet->write($sequence_name_row,, |
$cols_output,$seq->{'title'},$format->{'bold'}); |
$cols_output,$seq->{'title'},$format->{'bold'}); |
Line 1112 END
|
Line 1136 END
|
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell |
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell |
($first_data_row,$cols_output-1); |
($first_data_row,$cols_output-1); |
if ($chosen_output->{'sequence_max'}) { |
if ($chosen_output->{'sequence_max'}) { |
$excel_sheet->write($resource_name_row,$cols_output++, |
$excel_sheet->write($resource_name_row,$cols_output, |
'maximum', |
'maximum', |
$format->{'bold'}); |
$format->{'bold'}); |
|
$seq->{'Excel:maxcell'} = |
|
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell |
|
($first_data_row,$cols_output); |
|
$seq->{'Excel:maxcol'}=$cols_output; |
|
$maximum_formula_string.='+'. |
|
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell |
|
($first_data_row,$cols_output); |
|
$cols_output++; |
|
|
} |
} |
} |
} |
if ($chosen_output->{'grand_total'}) { |
if ($chosen_output->{'grand_total'}) { |
$excel_sheet->write($resource_name_row,$cols_output++,'Total', |
$excel_sheet->write($resource_name_row,$cols_output++,'Total', |
$format->{'bold'}); |
$format->{'bold'}); |
} |
} |
|
if ($chosen_output->{'grand_maximum'}) { |
|
$excel_sheet->write($resource_name_row,$cols_output++,'Max. Total', |
|
$format->{'bold'}); |
|
} |
$total_formula = $excel_sheet->store_formula($total_formula_string); |
$total_formula = $excel_sheet->store_formula($total_formula_string); |
|
$maximum_formula = $excel_sheet->store_formula($maximum_formula_string); |
############################################## |
############################################## |
# Output a row for MAX, if appropriate |
# Output a row for MAX, if appropriate |
############################################## |
############################################## |
Line 1139 END
|
Line 1177 END
|
# |
# |
# Add the maximums for each sequence or assessment |
# Add the maximums for each sequence or assessment |
my %total_cell_translation; |
my %total_cell_translation; |
|
my %maximum_cell_translation; |
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { |
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { |
$cols_output=$seq->{'Excel:startcol'}; |
$cols_output=$seq->{'Excel:startcol'}; |
$total_cell_translation{$seq->{'Excel:scorecell'}} = |
$total_cell_translation{$seq->{'Excel:scorecell'}} = |
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell |
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell |
($maximum_data_row,$seq->{'Excel:scorecol'}); |
($maximum_data_row,$seq->{'Excel:scorecol'}); |
|
$maximum_cell_translation{$seq->{'Excel:maxcell'}} = |
|
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell |
|
($maximum_data_row,$seq->{'Excel:maxcol'}); |
my $weight; |
my $weight; |
my $max = 0; |
my $max = 0; |
foreach my $resource (@{$seq->{'contents'}}) { |
foreach my $resource (@{$seq->{'contents'}}) { |
Line 1192 END
|
Line 1234 END
|
$total_formula,undef, |
$total_formula,undef, |
%total_cell_translation); |
%total_cell_translation); |
} |
} |
|
if ($chosen_output->{'grand_maximum'}) { |
|
$excel_sheet->repeat_formula($maximum_data_row,$cols_output++, |
|
$maximum_formula,undef, |
|
%total_cell_translation); |
|
} |
} # End of MAXIMUM row output if ($chosen_output->{'maximum_row'}) { |
} # End of MAXIMUM row output if ($chosen_output->{'maximum_row'}) { |
$rows_output = $first_data_row; |
$rows_output = $first_data_row; |
############################################## |
############################################## |
Line 1293 sub excel_outputstudent {
|
Line 1340 sub excel_outputstudent {
|
# |
# |
# Write out sequence scores and totals data |
# Write out sequence scores and totals data |
my %total_cell_translation; |
my %total_cell_translation; |
|
my %maximum_cell_translation; |
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { |
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { |
$cols_output = $seq->{'Excel:startcol'}; |
$cols_output = $seq->{'Excel:startcol'}; |
# Keep track of cells to translate in total cell |
# Keep track of cells to translate in total cell |
Line 1320 sub excel_outputstudent {
|
Line 1368 sub excel_outputstudent {
|
} |
} |
} else { |
} else { |
foreach my $value (@$rawdata) { |
foreach my $value (@$rawdata) { |
$excel_sheet->write($rows_output,$cols_output++,$value); |
if ($score eq ' ' || !defined($value)) { |
|
$cols_output++; |
|
} else { |
|
$excel_sheet->write($rows_output,$cols_output++, |
|
$value); |
|
} |
} |
} |
} |
} |
} |
} |
Line 1345 sub excel_outputstudent {
|
Line 1398 sub excel_outputstudent {
|
%replaceCells); |
%replaceCells); |
} |
} |
} elsif ($chosen_output->{'sequence_sum'}) { |
} elsif ($chosen_output->{'sequence_sum'}) { |
$excel_sheet->write($rows_output,$cols_output++,$score); |
if ($score eq ' ') { |
|
$cols_output++; |
|
} else { |
|
$excel_sheet->write($rows_output,$cols_output++,$score); |
|
} |
} |
} |
if ($chosen_output->{'sequence_max'}) { |
if ($chosen_output->{'sequence_max'}) { |
$excel_sheet->write($rows_output,$cols_output++,$seq_max); |
$excel_sheet->write($rows_output,$cols_output++,$seq_max); |
Line 1357 sub excel_outputstudent {
|
Line 1414 sub excel_outputstudent {
|
$total_formula,undef, |
$total_formula,undef, |
%total_cell_translation); |
%total_cell_translation); |
} |
} |
|
if ($chosen_output->{'grand_maximum'}) { |
|
$excel_sheet->repeat_formula($rows_output,$cols_output++, |
|
$maximum_formula,undef, |
|
%total_cell_translation); |
|
} |
# |
# |
# Bookkeeping |
# Bookkeeping |
$rows_output++; |
$rows_output++; |
Line 1504 END
|
Line 1566 END
|
$sequence_row.= '"",'; |
$sequence_row.= '"",'; |
$resource_row.= '"Total",'; |
$resource_row.= '"Total",'; |
} |
} |
|
if ($chosen_output->{'grand_maximum'}) { |
|
$sequence_row.= '"",'; |
|
$resource_row.= '"Maximum",'; |
|
} |
chomp($sequence_row); |
chomp($sequence_row); |
chomp($resource_row); |
chomp($resource_row); |
print $outputfile $sequence_row."\n"; |
print $outputfile $sequence_row."\n"; |
Line 1535 sub csv_outputstudent {
|
Line 1601 sub csv_outputstudent {
|
# |
# |
# Output performance data |
# Output performance data |
my $total = 0; |
my $total = 0; |
|
my $maximum = 0; |
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { |
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { |
my ($performance,$performance_length,$score,$seq_max,$rawdata); |
my ($performance,$performance_length,$score,$seq_max,$rawdata); |
if ($chosen_output->{'tries'}){ |
if ($chosen_output->{'tries'}){ |
Line 1568 sub csv_outputstudent {
|
Line 1635 sub csv_outputstudent {
|
$Str .= '"'.$seq_max.'",'; |
$Str .= '"'.$seq_max.'",'; |
} |
} |
$total+=$score; |
$total+=$score; |
|
$maximum += $seq_max; |
} |
} |
if ($chosen_output->{'grand_total'}) { |
if ($chosen_output->{'grand_total'}) { |
$Str .= '"'.$total.'",'; |
$Str .= '"'.$total.'",'; |
} |
} |
|
if ($chosen_output->{'grand_maximum'}) { |
|
$Str .= '"'.$maximum.'",'; |
|
} |
chop($Str); |
chop($Str); |
$Str .= "\n"; |
$Str .= "\n"; |
print $outputfile $Str; |
print $outputfile $Str; |
Line 1595 sub csv_finish {
|
Line 1666 sub csv_finish {
|
# |
# |
# Tell the user where to get their csv file |
# Tell the user where to get their csv file |
$r->print('<br />'. |
$r->print('<br />'. |
'<a href="'.$filename.'">Your csv file.</a>'."\n"); |
'<a href="'.$filename.'">'.&mt('Your csv file.').'</a>'."\n"); |
$r->rflush(); |
$r->rflush(); |
return; |
return; |
|
|
Line 1636 sub StudentTriesOnSequence {
|
Line 1707 sub StudentTriesOnSequence {
|
my $performance_length = 0; |
my $performance_length = 0; |
my @TriesData = (); |
my @TriesData = (); |
my $tries; |
my $tries; |
|
my $hasdata = 0; # flag - true if the student has any data on the sequence |
foreach my $resource (@{$seq->{'contents'}}) { |
foreach my $resource (@{$seq->{'contents'}}) { |
next if ($resource->{'type'} ne 'assessment'); |
next if ($resource->{'type'} ne 'assessment'); |
my $resource_data = $studentdata->{$resource->{'symb'}}; |
my $resource_data = $studentdata->{$resource->{'symb'}}; |
Line 1660 sub StudentTriesOnSequence {
|
Line 1732 sub StudentTriesOnSequence {
|
my $tries = 0; |
my $tries = 0; |
if(exists($resource_data->{'resource.'.$partnum.'.tries'})) { |
if(exists($resource_data->{'resource.'.$partnum.'.tries'})) { |
$tries = $resource_data->{'resource.'.$partnum.'.tries'}; |
$tries = $resource_data->{'resource.'.$partnum.'.tries'}; |
|
$hasdata =1; |
} |
} |
# |
# |
if ($awarded > 0) { |
if ($awarded > 0) { |
Line 1722 sub StudentTriesOnSequence {
|
Line 1795 sub StudentTriesOnSequence {
|
if ($seq->{'randompick'}) { |
if ($seq->{'randompick'}) { |
$max = $seq->{'randompick'}; |
$max = $seq->{'randompick'}; |
} |
} |
|
if (! $hasdata && $sum == 0) { |
|
$sum = ' '; |
|
} |
return ($Str,$performance_length,$sum,$max,\@TriesData); |
return ($Str,$performance_length,$sum,$max,\@TriesData); |
} |
} |
|
|
Line 1759 sub StudentPerformanceOnSequence {
|
Line 1835 sub StudentPerformanceOnSequence {
|
my $symbol; |
my $symbol; |
my @ScoreData = (); |
my @ScoreData = (); |
my $partscore; |
my $partscore; |
|
my $hasdata = 0; # flag, 0 if there were no submissions on the sequence |
foreach my $resource (@{$seq->{'contents'}}) { |
foreach my $resource (@{$seq->{'contents'}}) { |
next if ($resource->{'type'} ne 'assessment'); |
next if ($resource->{'type'} ne 'assessment'); |
my $resource_data = $studentdata->{$resource->{'symb'}}; |
my $resource_data = $studentdata->{$resource->{'symb'}}; |
Line 1777 sub StudentPerformanceOnSequence {
|
Line 1854 sub StudentPerformanceOnSequence {
|
$performance_length++; # one character per part |
$performance_length++; # one character per part |
$symbol = ' '; # default to space |
$symbol = ' '; # default to space |
# |
# |
my $awarded = 0; |
my $awarded; |
if (exists($resource_data->{'resource.'.$part.'.awarded'})) { |
if (exists($resource_data->{'resource.'.$part.'.awarded'})) { |
$awarded = $resource_data->{'resource.'.$part.'.awarded'}; |
$awarded = $resource_data->{'resource.'.$part.'.awarded'}; |
$awarded = 0 if (! $awarded); |
$awarded = 0 if (! $awarded); |
|
$hasdata = 1; |
} |
} |
# |
# |
$partscore = $weight*$awarded; |
$partscore = $weight*$awarded; |
|
if (! defined($awarded)) { |
|
$partscore = undef; |
|
} |
$score += $partscore; |
$score += $partscore; |
$symbol = $partscore; |
$symbol = $partscore; |
if (abs($symbol - sprintf("%.0f",$symbol)) < 0.001) { |
if (abs($symbol - sprintf("%.0f",$symbol)) < 0.001) { |
Line 1798 sub StudentPerformanceOnSequence {
|
Line 1879 sub StudentPerformanceOnSequence {
|
$symbol = 'x'; |
$symbol = 'x'; |
$max -= $weight; # Do not count 'excused' problems. |
$max -= $weight; # Do not count 'excused' problems. |
} |
} |
|
$hasdata = 1; |
} else { |
} else { |
# Unsolved. Did they try? |
# Unsolved. Did they try? |
if (exists($resource_data->{'resource.'.$part.'.tries'})){ |
if (exists($resource_data->{'resource.'.$part.'.tries'})){ |
$symbol = '.'; |
$symbol = '.'; |
|
$hasdata = 1; |
} else { |
} else { |
$symbol = ' '; |
$symbol = ' '; |
} |
} |
Line 1822 sub StudentPerformanceOnSequence {
|
Line 1905 sub StudentPerformanceOnSequence {
|
$Str .= $symbol; |
$Str .= $symbol; |
} |
} |
} |
} |
|
if (! $hasdata && $score == 0) { |
|
$score = ' '; |
|
} |
return ($Str,$performance_length,$score,$max,\@ScoreData); |
return ($Str,$performance_length,$score,$max,\@ScoreData); |
} |
} |
|
|