loncom/interface/statistics/lonstudentassessment.pm - diff

Return to lonstudentassessment.pm CVS log

Up to [LON-CAPA] / loncom / interface / statistics

Diff for /loncom/interface/statistics/lonstudentassessment.pm between versions 1.87 and 1.110

version 1.87, 2004/02/11 21:15:01	version 1.110, 2005/01/21 18:52:40
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 354 sub CreateInterface {	Line 357 sub CreateInterface {
$Str .= '<input type="submit" name="ClearCache" value="'.	$Str .= '<input type="submit" name="ClearCache" value="'.
&mt('Clear Caches').'" />';	&mt('Clear Caches').'" />';
$Str .= ' 'x5;	$Str .= ' 'x5;
	$Str .=
	&mt('Status[_1]',
	'<input type="text" name="stats_status" size="60" value="" />');
$Str .= '<br />';	$Str .= '<br />';
return $Str;	return $Str;
}	}
Line 401 my @OutputOptions =	Line 407 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 479 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,
	maximum_row => 1,
shortdesc => 'Total Score and Maximum Possible for each '.	shortdesc => 'Total Score and Maximum Possible for each '.
'Sequence or Folder',	'Sequence or Folder',
longdesc => 'The score of each student as well as the '.	longdesc => 'The score of each student as well as the '.
Line 488 my @OutputDataOptions =	Line 497 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,
	maximum_row => 1,
shortdesc => 'Score on each Problem Part',	shortdesc => 'Score on each Problem Part',
longdesc =>'The students score on each problem part, computed as'.	longdesc =>'The students score on each problem part, computed as'.
'the part weight * part awarded',	'the part weight * part awarded',
Line 502 my @OutputDataOptions =	Line 514 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,
	maximum_row => 0,
shortdesc => 'Number of Tries before success on each Problem Part',	shortdesc => 'Number of Tries before success on each Problem Part',
longdesc =>'The number of tries before success on each problem part.',	longdesc =>'The number of tries before success on each problem part.',
	non_html_notes => 'negative values indicate an incorrect problem',
},	},
{ name =>'Parts Correct',	{ name =>'Parts Correct',
base =>'tries',	base =>'tries',
Line 515 my @OutputDataOptions =	Line 531 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,
	maximum_row => 0,
shortdesc => 'Number of Problem Parts completed successfully.',	shortdesc => 'Number of Problem Parts completed successfully.',
longdesc => 'The Number of Problem Parts completed successfully and '.	longdesc => 'The Number of Problem Parts completed successfully and '.
'the maximum possible for each student',	'the maximum possible for each student',
Line 592 Return a line of the chart for a student	Line 611 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 616 sub html_initialize {	Line 636 sub html_initialize {
my $width=$Apache::lonstatistics::StudentData{$field}->{'width'};	my $width=$Apache::lonstatistics::StudentData{$field}->{'width'};
$Str .= $title.' 'x($width-$base).$padding;	$Str .= $title.' 'x($width-$base).$padding;
}	}
# Now the selected sequences need to be listed	#
	# 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()){
my $title = $sequence->{'title'};	#
my $base = $sequence->{'base_width'};	# Comptue column widths
my $width = $sequence->{'width'};	$sequence->{'width_sum'} = 0;
$Str .= $title.' 'x($width-$base).$padding;	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
	$sequence->{'width_sum'} += 3;
	}
	if ($chosen_output->{'sequence_max'}) {
	if ($sequence->{'width_sum'}>0) {
	# One digit for the '/'
	$sequence->{'width_sum'} +=1;
	}
	# Use 3 digits for the total
	$sequence->{'width_sum'}+=3;
	}
	#
	if ($chosen_output->{'every_problem'}) {
	# one problem per digit
	$sequence->{'width_problem'} = $sequence->{'num_assess_parts'};
	} else {
	$sequence->{'width_problem'} = 0;
	}
	$sequence->{'width_total'} = $sequence->{'width_problem'} +
	$sequence->{'width_sum'};
	if ($sequence->{'width_total'} < length(&HTML::Entities::decode($sequence->{'title'}))) {
	$sequence->{'width_total'} = length(&HTML::Entities::decode($sequence->{'title'}));
	}
	#
	# Output the sequence titles
	$Str .=
	$sequence->{'title'}.' 'x($sequence->{'width_total'}-
	length($sequence->{'title'})
	).$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 641 sub html_outputstudent {	Line 698 sub html_outputstudent {
my @to_show = &get_student_fields_to_show();	my @to_show = &get_student_fields_to_show();
foreach my $field (@to_show) {	foreach my $field (@to_show) {
my $title=$student->{$field};	my $title=$student->{$field};
	# Deal with 'comments' - how I love special cases
	if ($field eq 'comments') {
	$title = '<a href="/adm/'.$student->{'domain'}.'/'.$student->{'username'}.'/'.'aboutme#coursecomment">'.&mt('Comments').'</a>';
	}
my $base = length($title);	my $base = length($title);
my $width=$Apache::lonstatistics::StudentData{$field}->{'width'};	my $width=$Apache::lonstatistics::StudentData{$field}->{'width'};
$Str .= $title.' 'x($width-$base).$padding;	$Str .= $title.' 'x($width-$base).$padding;
Line 675 sub html_outputstudent {	Line 736 sub html_outputstudent {
&StudentPerformanceOnSequence($student,\%StudentsData,	&StudentPerformanceOnSequence($student,\%StudentsData,
$seq,$show_links);	$seq,$show_links);
}	}
my $ratio = sprintf("%3d",$score).'/'.sprintf("%3d",$seq_max);	my $ratio='';
	if ($chosen_output->{'every_problem'}) {
	$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_sum'}) {
	$ratio .= '/';
	}
	$ratio .= sprintf("%3.0f",$seq_max);
	}
#	#
if ($chosen_output->{'sequence_sum'}) {	if (! $chosen_output->{'every_problem'}) {
$performance = $ratio;	$performance = '';
$performance .= ' 'x($seq->{'width'}-length($ratio));	$performance_length=0;
} else {
# Pad with extra spaces
$performance .= ' 'x($seq->{'width'}-$performance_length-
length($ratio)
).$ratio;
}	}
	$performance .= ' 'x($seq->{'width_total'}-$performance_length-$seq->{'width_sum'}).
	$ratio;
#	#
$Str .= $performance.$padding;	$Str .= $performance.$padding;
#	#
Line 694 sub html_outputstudent {	Line 766 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;
	} else {
	$score = sprintf("%.0f",$score);
	}
	$Str .= ' '.' 'x($total_sum_width-length($score)).$score.' / '.$max;
$Str .= " \n";	$Str .= " \n";
#	#
$r->print($Str);	$r->print($Str);
Line 717 sub html_finish {	Line 797 sub html_finish {
#	#
# Check for suppressed output and close the progress window if so	# Check for suppressed output and close the progress window if so
$r->print("</pre>\n");	$r->print("</pre>\n");
if ($single_student_mode) {	if ($chosen_output->{'summary_table'}) {
$r->print(&SingleStudentTotal());	if ($single_student_mode) {
} else {	$r->print(&SingleStudentTotal());
$r->print(&StudentAverageTotal());	} else {
	$r->print(&StudentAverageTotal());
	}
}	}
$r->rflush();	$r->rflush();
return;	return;
}	}

sub StudentAverageTotal {	sub StudentAverageTotal {
my $Str = "<h3>Summary Tables</h3>\n";	my $Str = '<h3>'.&mt('Summary Tables').'</h3>'.$/;
my $num_students = scalar(@Apache::lonstatistics::Students);
my $total_ave = 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>'.&mt('Title').'</th>'.
	'<th>'.&mt('Average').'</th>'.
	'<th>'.&mt('Maximum').'</th>'.
	'</tr>'.$/;
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 > 0) {
($num_students-$nodata_count)))/100;	$ave = int(100*
	($Statistics->{$seq->{'symb'}}->{'score'}/$num_students)
	)/100;
} else {	} else {
$ave = 0;	$ave = 0;
}	}
$total_ave += $ave;
my $max = $Statistics->{$seq->{'symb'}}->{'max'};	my $max = $Statistics->{$seq->{'symb'}}->{'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
$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";
return $Str;	return $Str;
}	}

sub SingleStudentTotal {	sub SingleStudentTotal {
my $student = &Apache::lonstatistics::current_student();	my $student = &Apache::lonstatistics::current_student();
my $Str = "<h3>Summary table for ".$student->{'fullname'}." ".	my $Str = '<h3>'.&mt('Summary table for [_1] ([_2]@[_3])',
$student->{'username'}.'@'.$student->{'domain'}."</h3>\n";	$student->{'fullname'},
	$student->{'username'},$student->{'domain'}).'</h3>';
	$Str .= $/;
$Str .= '<table border=2 cellspacing="1">'."\n";	$Str .= '<table border=2 cellspacing="1">'."\n";
$Str .=	$Str .=
"<tr><th>Sequence or Folder</th><th>Score</th><th>Maximum</th></tr>\n";	'<tr>'.
	'<th>'.&mt('Sequence or Folder').'</th>';
	if ($chosen_output->{'base'} eq 'tries') {
	$Str .= '<th>'.&mt('Parts Correct').'</th>';
	} else {
	$Str .= '<th>'.&mt('Score').'</th>';
	}
	$Str .= '<th>'.&mt('Maximum').'</th>'."</tr>\n";
my $total = 0;	my $total = 0;
my $total_max = 0;	my $total_max = 0;
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {	foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
Line 780 sub SingleStudentTotal {	Line 863 sub SingleStudentTotal {
$total += $value;	$total += $value;
$total_max +=$max;	$total_max +=$max;
}	}
$Str .= '<tr><td><b>Total</b></td>'.	$Str .= '<tr><td><b>'.&mt('Total').'</b></td>'.
'<td align="right">'.$total.'</td>'.	'<td align="right">'.$total.'</td>'.
'<td align="right">'.$total_max."</td></tr>\n";	'<td align="right">'.$total_max."</td></tr>\n";
$Str .= "</table>\n";	$Str .= "</table>\n";
Line 819 my %prog_state; # progress window state	Line 902 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 831 sub excel_initialize {	Line 915 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);
	#
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {	foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
	if ($chosen_output->{'every_problem'}) {
	$total_columns += $seq->{'num_assess_parts'};
	}
# Add 2 because we need a 'sequence_sum' and 'total' column for each	# Add 2 because we need a 'sequence_sum' and 'total' column for each
$total_columns += $seq->{'num_assess_parts'}+2;	$total_columns += 2;
}	}
	my $too_many_cols_error_message =
	'<h2>'.&mt('Unable to Complete Request').'</h2>'.$/.
	'<p>'.&mt('LON-CAPA is unable to produce your Excel spreadsheet because your selections will result in more than 255 columns. Excel allows only 255 columns in a spreadsheet.').'</p>'.$/.
	'<p>'.&mt('You may consider reducing the number of <b>Sequences or Folders</b> you have selected.').'</p>'.$/.
	'<p>'.&mt('LON-CAPA can produce <b>CSV</b> files of this data or Excel files of the <b>Scores Summary</b> data.').'</p>'.$/;
if ($chosen_output->{'base'} eq 'tries' && $total_columns > 255) {	if ($chosen_output->{'base'} eq 'tries' && $total_columns > 255) {
$r->print(<<END);	$r->print($too_many_cols_error_message);
<h2>Unable to Complete Request</h2>	$request_aborted = 1;
<p>
LON-CAPA is unable to produce your Excel spreadsheet because your selections
will result in more than 255 columns. Excel allows only 255 columns in a
spreadsheet.
</p><p>
You may consider reducing the number of <b>Sequences or Folders</b> you
have selected.
</p><p>
LON-CAPA can produce <b>CSV</b> files of this data or Excel files of the
summary data (<b>Parts Correct</b> or <b>Parts Correct & Totals</b>).
</p>
END
$request_aborted = 1;
}	}
if ($chosen_output->{'base'} eq 'scores' && $total_columns > 255) {	if ($chosen_output->{'base'} eq 'scores' && $total_columns > 255) {
$r->print(<<END);	$r->print($too_many_cols_error_message);
<h2>Unable to Complete Request</h2>	$request_aborted = 1;
<p>
LON-CAPA is unable to produce your Excel spreadsheet because your selections
will result in more than 255 columns. Excel allows only 255 columns in a
spreadsheet.
</p><p>
You may consider reducing the number of <b>Sequences or Folders</b> you
have selected.
</p><p>
LON-CAPA can produce <b>CSV</b> files of this data or Excel files of the
<b>Scores Summary</b> data.
</p>
END
$request_aborted = 1;
}	}
return if ($request_aborted);	return if ($request_aborted);
#	#
Line 883 END	Line 952 END
$rows_output = 0;	$rows_output = 0;
$cols_output = 0;	$cols_output = 0;
#	#
	# Determine rows
	my $header_row = $rows_output++;
	my $description_row = $rows_output++;
	my $notes_row = $rows_output++;
	$rows_output++; # blank row
	my $summary_header_row;
	if ($chosen_output->{'summary_table'}) {
	$summary_header_row = $rows_output++;
	$rows_output+= scalar(&Apache::lonstatistics::Sequences_with_Assess());
	$rows_output++;
	}
	my $sequence_name_row = $rows_output++;
	my $resource_name_row = $rows_output++;
	my $maximum_data_row = $rows_output++;
	if (! $chosen_output->{'maximum_row'}) {
	$rows_output--;
	}
	my $first_data_row = $rows_output++;
	#
# Create sheet	# Create sheet
$excel_workbook = Spreadsheet::WriteExcel->new('/home/httpd'.$filename);	$excel_workbook = Spreadsheet::WriteExcel->new('/home/httpd'.$filename);
#	#
Line 901 END	Line 989 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($rows_output,$cols_output++,	$excel_sheet->write($header_row,$cols_output++,
$ENV{'course.'.$ENV{'request.course.id'}.'.description'},	$ENV{'course.'.$ENV{'request.course.id'}.'.description'},
$format->{'h1'});	$format->{'h1'});
$cols_output += 3;	$cols_output += 3;
Line 941 END	Line 1019 END
$sectionstring = "Section ".$Sections[0];	$sectionstring = "Section ".$Sections[0];
}	}
}	}
$excel_sheet->write($rows_output,$cols_output++,$sectionstring,	$excel_sheet->write($header_row,$cols_output++,$sectionstring,
$format->{'h3'});	$format->{'h3'});
$cols_output += scalar(@Sections);	$cols_output += scalar(@Sections);
#	#
# Put the date in there too	# Put the date in there too
$excel_sheet->write($rows_output++,$cols_output++,	$excel_sheet->write($header_row,$cols_output++,
'Compiled on '.localtime(time),$format->{'h3'});	'Compiled on '.localtime(time),$format->{'h3'});
#	#
$cols_output = 0;	$cols_output = 0;
$excel_sheet->write($rows_output++,$cols_output++,	$excel_sheet->write($description_row,$cols_output++,
$chosen_output->{'shortdesc'},	$chosen_output->{'shortdesc'},
$format->{'h3'});	$format->{'b'});
#	#
# Figure out the rows we need	$cols_output = 0;
my $sequence_name_row = $rows_output+1;	$excel_sheet->write($notes_row,$cols_output++,
my $resource_name_row = $sequence_name_row+1;	$chosen_output->{'non_html_notes'},
my $maximum_data_row = $sequence_name_row+2;	$format->{'i'});
my $first_data_row = $sequence_name_row+3;
	##############################################
	# Output headings for the raw data
	##############################################
#	#
# Add the student headers	# Add the student headers
$cols_output = 0;	$cols_output = 0;
Line 969 END	Line 1050 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->{'h3'});	$cols_output,$seq->{'title'},$format->{'bold'});
# Determine starting cell	# Determine starting cell
$seq->{'Excel:startcell'}=	$seq->{'Excel:startcell'}=
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell	&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
($maximum_data_row,$cols_output);	($first_data_row,$cols_output);
$seq->{'Excel:startcol'}=$cols_output;	$seq->{'Excel:startcol'}=$cols_output;
my $count = 0;	my $count = 0;
if ($chosen_output->{'every_problem'}) {	if ($chosen_output->{'every_problem'}) {
Line 993 END	Line 1075 END
$cols_output++,	$cols_output++,
$res->{'title'}.' part '.$part,	$res->{'title'}.' part '.$part,
$format->{'bold'});	$format->{'bold'});
	$count++;
}	}
} else {	} else {
$excel_sheet->write($resource_name_row,	$excel_sheet->write($resource_name_row,
$cols_output++,	$cols_output++,
$res->{'title'},$format->{'bold'});	$res->{'title'},$format->{'bold'});
	$count++;
}	}
$count++;
}	}
}	}
# Determine ending cell	# Determine ending cell
Line 1009 END	Line 1092 END
} else {	} else {
$seq->{'Excel:endcell'} =	$seq->{'Excel:endcell'} =
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell	&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
($maximum_data_row,$cols_output-1);	($first_data_row,$cols_output-1);
$seq->{'Excel:endcol'} = $cols_output-1;	$seq->{'Excel:endcol'} = $cols_output-1;
}	}
# Create the formula for summing up this sequence	# Create the formula for summing up this sequence
Line 1023 END	Line 1106 END
# Determine cell the score is held in	# Determine cell the score is held in
$seq->{'Excel:scorecell'} =	$seq->{'Excel:scorecell'} =
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell	&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
($maximum_data_row,$cols_output);	($first_data_row,$cols_output);
$seq->{'Excel:scorecol'}=$cols_output;	$seq->{'Excel:scorecol'}=$cols_output;
if ($chosen_output->{'base'} eq 'parts correct total') {	if ($chosen_output->{'base'} eq 'parts correct total') {
$excel_sheet->write($resource_name_row,$cols_output++,	$excel_sheet->write($resource_name_row,$cols_output++,
Line 1044 END	Line 1127 END
#	#
$total_formula_string.='+'.	$total_formula_string.='+'.
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell	&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
($maximum_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
if ($chosen_output->{'scores'}) {	##############################################
	if ($chosen_output->{'maximum_row'}) {
$cols_output = 0;	$cols_output = 0;
foreach my $field (&get_student_fields_to_show()) {	foreach my $field (&get_student_fields_to_show()) {
if ($field eq 'username' \|\| $field eq 'fullname' \|\|	if ($field eq 'username' \|\| $field eq 'fullname' \|\|
Line 1072 END	Line 1170 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 1102 END	Line 1204 END
#	#
if ($chosen_output->{'sequence_sum'} &&	if ($chosen_output->{'sequence_sum'} &&
$chosen_output->{'every_problem'}) {	$chosen_output->{'every_problem'}) {
my %replaceCells;	my %replaceCells=
$replaceCells{$seq->{'Excel:startcell'}} =	('^'.$seq->{'Excel:startcell'}.':'.
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell	$seq->{'Excel:endcell'}.'$' =>
($maximum_data_row,$seq->{'Excel:startcol'});	&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'}));
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
($maximum_data_row,$seq->{'Excel:endcol'});
$excel_sheet->repeat_formula($maximum_data_row,$cols_output++,	$excel_sheet->repeat_formula($maximum_data_row,$cols_output++,
$seq->{'Excel:sum'},undef,	$seq->{'Excel:sum'},undef,
%replaceCells);	%replaceCells);

} elsif ($chosen_output->{'sequence_sum'}) {	} elsif ($chosen_output->{'sequence_sum'}) {
$excel_sheet->write($maximum_data_row,$cols_output++,$max);	$excel_sheet->write($maximum_data_row,$cols_output++,$max);
}	}
Line 1125 END	Line 1226 END
$total_formula,undef,	$total_formula,undef,
%total_cell_translation);	%total_cell_translation);
}	}
} # End of MAXIMUM row output if ($chosen_output->{'scores'}) {	if ($chosen_output->{'grand_maximum'}) {
	$excel_sheet->repeat_formula($maximum_data_row,$cols_output++,
	$maximum_formula,undef,
	%maximum_cell_translation);
	}
	} # End of MAXIMUM row output if ($chosen_output->{'maximum_row'}) {
$rows_output = $first_data_row;	$rows_output = $first_data_row;
	##############################################
	# Output summary table, which actually is above the sequence name row.
	##############################################
	if ($chosen_output->{'summary_table'}) {
	$cols_output = 0;
	$excel_sheet->write($summary_header_row,$cols_output++,
	'Summary Table',$format->{'bold'});
	if ($chosen_output->{'maximum_row'}) {
	$excel_sheet->write($summary_header_row,$cols_output++,
	'Maximum',$format->{'bold'});
	}
	$excel_sheet->write($summary_header_row,$cols_output++,
	'Average',$format->{'bold'});
	$excel_sheet->write($summary_header_row,$cols_output++,
	'Median',$format->{'bold'});
	$excel_sheet->write($summary_header_row,$cols_output++,
	'Std Dev',$format->{'bold'});
	my $row = $summary_header_row+1;
	foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
	$cols_output = 0;
	$excel_sheet->write($row,$cols_output++,
	$seq->{'title'},
	$format->{'bold'});
	if ($chosen_output->{'maximum_row'}) {
	$excel_sheet->write
	($row,$cols_output++,
	'='.
	&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
	($maximum_data_row,$seq->{'Excel:scorecol'})
	);
	}
	my $range =
	&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
	($first_data_row,$seq->{'Excel:scorecol'}).
	':'.
	&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
	($first_data_row+$num_students-1,$seq->{'Excel:scorecol'});
	$excel_sheet->write($row,$cols_output++,
	'=AVERAGE('.$range.')');
	$excel_sheet->write($row,$cols_output++,
	'=MEDIAN('.$range.')');
	$excel_sheet->write($row,$cols_output++,
	'=STDEV('.$range.')');
	$row++;
	}
	}
	##############################################
	# Take care of non-excel initialization
	##############################################
#	#
# Let the user know what we are doing	# Let the user know what we are doing
my $studentcount = scalar(@Apache::lonstatistics::Students);	my $studentcount = scalar(@Apache::lonstatistics::Students);
Line 1146 END	Line 1301 END
# Initialize progress window	# Initialize progress window
%prog_state=&Apache::lonhtmlcommon::Create_PrgWin	%prog_state=&Apache::lonhtmlcommon::Create_PrgWin
($r,'Excel File Compilation Status',	($r,'Excel File Compilation Status',
'Excel File Compilation Progress', $studentcount);	'Excel File Compilation Progress', $studentcount,
	'inline',undef,'Statistics','stats_status');
#	#
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,	&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
'Processing first student');	'Processing first student');
Line 1162 sub excel_outputstudent {	Line 1318 sub excel_outputstudent {
# Write out student data	# Write out student data
my @to_show = &get_student_fields_to_show();	my @to_show = &get_student_fields_to_show();
foreach my $field (@to_show) {	foreach my $field (@to_show) {
$excel_sheet->write($rows_output,$cols_output++,$student->{$field});	my $value = $student->{$field};
	if ($field eq 'comments') {
	$value = &Apache::lonmsg::retrieve_instructor_comments
	($student->{'username'},$student->{'domain'});
	}
	$excel_sheet->write($rows_output,$cols_output++,$value);
}	}
#	#
# Get student assessment data	# Get student assessment data
Line 1177 sub excel_outputstudent {	Line 1338 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
$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
($rows_output,$seq->{'Excel:scorecol'});	($rows_output,$seq->{'Excel:scorecol'});
	# and maximum cell
	$maximum_cell_translation{$seq->{'Excel:maxcell'}} =
	&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
	($rows_output,$seq->{'Excel:maxcol'});
#	#
my ($performance,$performance_length,$score,$seq_max,$rawdata);	my ($performance,$performance_length,$score,$seq_max,$rawdata);
if ($chosen_output->{'tries'} \|\| $chosen_output->{'correct'}){	if ($chosen_output->{'tries'} \|\| $chosen_output->{'correct'}){
Line 1204 sub excel_outputstudent {	Line 1370 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);
	}
}	}
}	}
}	}
if ($chosen_output->{'sequence_sum'} &&	if ($chosen_output->{'sequence_sum'} &&
$chosen_output->{'every_problem'}) {	$chosen_output->{'every_problem'}) {
# Write a formula for the sum of this sequence	# Write a formula for the sum of this sequence
my %replaceCells;	my %replaceCells=
$replaceCells{$seq->{'Excel:startcell'}} =	('^'.$seq->{'Excel:startcell'}.':'.$seq->{'Excel:endcell'}.'$'
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell	=>
($rows_output,$seq->{'Excel:startcol'});	&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'})
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell	);
($rows_output,$seq->{'Excel:endcol'});	# The undef is for the format
# The undef is for the format	$excel_sheet->repeat_formula($rows_output,$cols_output++,
if (scalar(keys(%replaceCells)) == 1) {	$seq->{'Excel:sum'},undef,
$excel_sheet->repeat_formula($rows_output,$cols_output++,	%replaceCells);
$seq->{'Excel:sum'},undef,	} elsif ($chosen_output->{'sequence_sum'}) {
%replaceCells,%replaceCells);	if ($score eq ' ') {
	$cols_output++;
} else {	} else {
$excel_sheet->repeat_formula($rows_output,$cols_output++,	$excel_sheet->write($rows_output,$cols_output++,$score);
$seq->{'Excel:sum'},undef,
%replaceCells);
}	}
} elsif ($chosen_output->{'sequence_sum'}) {
$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 1241 sub excel_outputstudent {	Line 1409 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,
	%maximum_cell_translation);
	}
#	#
# Bookkeeping	# Bookkeeping
$rows_output++;	$rows_output++;
Line 1323 END	Line 1496 END
my $studentcount = scalar(@Apache::lonstatistics::Students);	my $studentcount = scalar(@Apache::lonstatistics::Students);
%prog_state=&Apache::lonhtmlcommon::Create_PrgWin	%prog_state=&Apache::lonhtmlcommon::Create_PrgWin
($r,'CSV File Compilation Status',	($r,'CSV File Compilation Status',
'CSV File Compilation Progress', $studentcount);	'CSV File Compilation Progress', $studentcount,
	'inline',undef,'Statistics','stats_status');
#	#
# Open a file	# Open a file
$filename = '/prtspool/'.	$filename = '/prtspool/'.
Line 1342 END	Line 1516 END
print $outputfile '"'.&Apache::loncommon::csv_translate($description).'",'.	print $outputfile '"'.&Apache::loncommon::csv_translate($description).'",'.
'"'.&Apache::loncommon::csv_translate(scalar(localtime(time))).'"'.	'"'.&Apache::loncommon::csv_translate(scalar(localtime(time))).'"'.
"\n";	"\n";
	foreach my $item ('shortdesc','non_html_notes') {
	next if (! exists($chosen_output->{$item}));
	print $outputfile
	'"'.&Apache::loncommon::csv_translate($chosen_output->{$item}).'"'.
	"\n";
	}
#	#
# Print out the headings	# Print out the headings
my $sequence_row = '';	my $sequence_row = '';
Line 1388 END	Line 1568 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 1404 sub csv_outputstudent {	Line 1588 sub csv_outputstudent {
# Output student fields	# Output student fields
my @to_show = &get_student_fields_to_show();	my @to_show = &get_student_fields_to_show();
foreach my $field (@to_show) {	foreach my $field (@to_show) {
$Str .= '"'.&Apache::loncommon::csv_translate($student->{$field}).'",';	my $value = $student->{$field};
	if ($field eq 'comments') {
	$value = &Apache::lonmsg::retrieve_instructor_comments
	($student->{'username'},$student->{'domain'});
	}
	$Str .= '"'.&Apache::loncommon::csv_translate($value).'",';
}	}
#	#
# Get student assessment data	# Get student assessment data
Line 1419 sub csv_outputstudent {	Line 1608 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 1452 sub csv_outputstudent {	Line 1642 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 1479 sub csv_finish {	Line 1673 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 1520 sub StudentTriesOnSequence {	Line 1714 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 1544 sub StudentTriesOnSequence {	Line 1739 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 1584 sub StudentTriesOnSequence {	Line 1780 sub StudentTriesOnSequence {
}	}
#	#
if (! defined($tries)) {	if (! defined($tries)) {
$tries = $symbol;	$tries = 0;
	}
	if ($status =~ /^(incorrect\|ungraded)/) {
	# Bug 3390: show '-' for tries on incorrect problems
	# (csv & excel only)
	push(@TriesData,-$tries);
	} else {
	push (@TriesData,$tries);
}	}
push (@TriesData,$tries);
#	#
if ( ($links eq 'yes' && $symbol ne ' ') \|\|	if ( ($links eq 'yes' && $symbol ne ' ') \|\|
($links eq 'all')) {	($links eq 'all')) {
Line 1606 sub StudentTriesOnSequence {	Line 1808 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 1643 sub StudentPerformanceOnSequence {	Line 1848 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 1661 sub StudentPerformanceOnSequence {	Line 1867 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 1682 sub StudentPerformanceOnSequence {	Line 1892 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 1706 sub StudentPerformanceOnSequence {	Line 1918 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);
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.87
changed lines
	Added in v.1.110