version 1.97, 2004/03/10 18:41:37
|
version 1.114, 2005/02/25 19:48:01
|
Line 56 use Apache::loncommon();
|
Line 56 use Apache::loncommon();
|
use Apache::loncoursedata; |
use Apache::loncoursedata; |
use Apache::lonnet; # for logging porpoises |
use Apache::lonnet; # for logging porpoises |
use Apache::lonlocal; |
use Apache::lonlocal; |
|
use Time::HiRes; |
use Spreadsheet::WriteExcel; |
use Spreadsheet::WriteExcel; |
use Spreadsheet::WriteExcel::Utility(); |
use Spreadsheet::WriteExcel::Utility(); |
|
|
Line 153 sub BuildStudentAssessmentPage {
|
Line 154 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 174 sub BuildStudentAssessmentPage {
|
Line 177 sub BuildStudentAssessmentPage {
|
my $initialize = \&html_initialize; |
my $initialize = \&html_initialize; |
my $output_student = \&html_outputstudent; |
my $output_student = \&html_outputstudent; |
my $finish = \&html_finish; |
my $finish = \&html_finish; |
|
&Apache::lonnet::logthis('got here! 1'); |
# |
# |
if ($output_mode eq 'excel') { |
if ($output_mode eq 'excel') { |
$initialize = \&excel_initialize; |
$initialize = \&excel_initialize; |
Line 185 sub BuildStudentAssessmentPage {
|
Line 189 sub BuildStudentAssessmentPage {
|
$finish = \&csv_finish; |
$finish = \&csv_finish; |
} |
} |
# |
# |
|
&Apache::lonnet::logthis('got here! 2'); |
if($c->aborted()) { return ; } |
if($c->aborted()) { return ; } |
# |
# |
# Determine which students we want to look at |
# Determine which students we want to look at |
Line 209 sub BuildStudentAssessmentPage {
|
Line 214 sub BuildStudentAssessmentPage {
|
# |
# |
# Call the initialize routine selected above |
# Call the initialize routine selected above |
$initialize->($r); |
$initialize->($r); |
|
&Apache::lonnet::logthis('got here! 3'); |
foreach my $student (@Students) { |
foreach my $student (@Students) { |
if($c->aborted()) { |
if($c->aborted()) { |
$finish->($r); |
$finish->($r); |
Line 325 sub CreateInterface {
|
Line 331 sub CreateInterface {
|
$Str .= '<tr><td align="center">'."\n"; |
$Str .= '<tr><td align="center">'."\n"; |
$Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5); |
$Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5); |
$Str .= '</td><td align="center">'; |
$Str .= '</td><td align="center">'; |
my $only_seq_with_assessments = sub { |
|
my $s=shift; |
|
if ($s->{'num_assess'} < 1) { |
|
return 0; |
|
} else { |
|
return 1; |
|
} |
|
}; |
|
$Str .= &Apache::lonstatistics::StudentDataSelect('StudentData','multiple', |
$Str .= &Apache::lonstatistics::StudentDataSelect('StudentData','multiple', |
5,undef); |
5,undef); |
$Str .= '</td><td>'."\n"; |
$Str .= '</td><td>'."\n"; |
$Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5); |
$Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5); |
$Str .= '</td><td>'."\n"; |
$Str .= '</td><td>'."\n"; |
$Str .= &Apache::lonstatistics::MapSelect('Maps','multiple,all',5, |
$Str .= &Apache::lonstatistics::map_select('Maps','multiple,all',5); |
$only_seq_with_assessments); |
|
$Str .= '</td><td>'."\n"; |
$Str .= '</td><td>'."\n"; |
$Str .= &CreateAndParseOutputSelector(); |
$Str .= &CreateAndParseOutputSelector(); |
$Str .= '</td><td>'."\n"; |
$Str .= '</td><td>'."\n"; |
Line 355 sub CreateInterface {
|
Line 352 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 474 my @OutputDataOptions =
|
Line 474 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 491 my @OutputDataOptions =
|
Line 492 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 507 my @OutputDataOptions =
|
Line 509 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', |
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 522 my @OutputDataOptions =
|
Line 526 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 601 Return a line of the chart for a student
|
Line 606 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; |
|
|
|
my %width; # Holds sequence width information |
|
my @sequences; |
|
my $navmap; # Have to keep this around since weakref is a bit zealous |
|
|
sub html_initialize { |
sub html_initialize { |
my ($r) = @_; |
my ($r) = @_; |
Line 609 sub html_initialize {
|
Line 619 sub html_initialize {
|
$count = 0; |
$count = 0; |
$nodata_count = 0; |
$nodata_count = 0; |
undef(%prog_state); |
undef(%prog_state); |
|
undef(%width); |
|
undef($navmap); |
|
undef(@sequences); |
|
&Apache::lonnet::logthis('called html_initialize'); |
# |
# |
$r->print("<h3>".$ENV{'course.'.$ENV{'request.course.id'}.'.description'}. |
$r->print("<h3>".$ENV{'course.'.$ENV{'request.course.id'}.'.description'}. |
" ".localtime(time)."</h3>"); |
" ".localtime(time)."</h3>"); |
|
# |
if ($chosen_output->{'base'} !~ /^final table/) { |
if ($chosen_output->{'base'} !~ /^final table/) { |
$r->print("<h3>".$chosen_output->{'shortdesc'}."</h3>"); |
$r->print("<h3>".$chosen_output->{'shortdesc'}."</h3>"); |
} |
} |
Line 627 sub html_initialize {
|
Line 641 sub html_initialize {
|
} |
} |
# |
# |
# Compute the column widths and output the sequence titles |
# Compute the column widths and output the sequence titles |
foreach my $sequence (&Apache::lonstatistics::Sequences_with_Assess()){ |
my $total_count; |
# |
($navmap,@sequences) = |
# Comptue column widths |
&Apache::lonstatistics::selected_sequences_with_assessments(); |
$sequence->{'width_sum'} = 0; |
if (! ref($navmap)) { |
|
# Unable to get data, so bail out |
|
$r->print("<h3>". |
|
&mt('Unable to retrieve course information.'). |
|
'</h3>'); |
|
} |
|
# |
|
# Compute sequence widths |
|
my $starttime = Time::HiRes::time; |
|
foreach my $seq (@sequences) { |
|
my $symb = $seq->symb; |
|
my $title = $seq->compTitle; |
|
$width{$symb}->{'width_sum'} = 0; |
|
# Compute width of sum |
if ($chosen_output->{'sequence_sum'}) { |
if ($chosen_output->{'sequence_sum'}) { |
|
if ($chosen_output->{'every_problem'}) { |
|
# Use 1 digit for a space |
|
$width{$symb}->{'width_sum'} += 1; |
|
} |
|
$total_count += $width{$symb}->{'num_assess_parts'}; |
# Use 3 digits for the sum |
# Use 3 digits for the sum |
$sequence->{'width_sum'} = 3; |
$width{$symb}->{'width_sum'} += 3; |
} |
} |
|
# Compute width of maximum |
if ($chosen_output->{'sequence_max'}) { |
if ($chosen_output->{'sequence_max'}) { |
if ($sequence->{'width_sum'}>0) { |
if ($width{$symb}->{'width_sum'}>0) { |
# One digit for the '/' |
# One digit for the '/' |
$sequence->{'width_sum'} +=1; |
$width{$symb}->{'width_sum'} +=1; |
} |
} |
# Use 3 digits for the total |
# Use 3 digits for the total |
$sequence->{'width_sum'}+=3; |
$width{$symb}->{'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'}; |
$width{$symb}->{'width_parts'}=0; |
|
$starttime = Time::HiRes::time; |
|
my @resources = |
|
$navmap->retrieveResources($seq,sub { shift->is_problem(); }, |
|
0,0,0); |
|
$starttime = Time::HiRes::time; |
|
foreach my $res (@resources) { |
|
my @parts = @{$res->parts}; |
|
$width{$symb}->{'width_parts'} += scalar(@parts); |
|
} |
|
&Apache::lonnet::logthis('2elapsed:'.(Time::HiRes::time-$starttime)); $width{$symb}->{'width_problem'} += |
|
$width{$symb}->{'width_parts'}; |
} else { |
} else { |
$sequence->{'width_problem'} = 0; |
$width{$symb}->{'width_problem'} = 0; |
} |
} |
$sequence->{'width_total'} = $sequence->{'width_problem'} + |
$width{$symb}->{'width_total'} = $width{$symb}->{'width_problem'} + |
$sequence->{'width_sum'}; |
$width{$symb}->{'width_sum'}; |
if ($sequence->{'width_total'} < length(&HTML::Entities::decode($sequence->{'title'}))) { |
if ($width{$symb}->{'width_total'} < length(&HTML::Entities::decode($title))) { |
$sequence->{'width_total'} = length(&HTML::Entities::decode($sequence->{'title'})); |
$width{$symb}->{'width_total'} = length(&HTML::Entities::decode($title)); |
} |
} |
# |
# |
# Output the sequence titles |
# Output the sequence titles |
$Str .= |
$Str .= $title.(' 'x($width{$symb}->{'width_total'}- |
$sequence->{'title'}.' 'x($sequence->{'width_total'}- |
length($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 672 sub html_initialize {
|
Line 716 sub html_initialize {
|
sub html_outputstudent { |
sub html_outputstudent { |
my ($r,$student) = @_; |
my ($r,$student) = @_; |
my $Str = ''; |
my $Str = ''; |
|
return if (! defined($navmap)); |
# |
# |
if($count++ % 5 == 0 && $count > 0) { |
if($count++ % 5 == 0 && $count > 0) { |
$r->print("</pre><pre>"); |
$r->print("</pre><pre>"); |
Line 680 sub html_outputstudent {
|
Line 725 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 703 sub html_outputstudent {
|
Line 752 sub html_outputstudent {
|
# By sequence build up the data |
# By sequence build up the data |
my $studentstats; |
my $studentstats; |
my $PerformanceStr = ''; |
my $PerformanceStr = ''; |
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { |
foreach my $seq (@sequences) { |
|
&Apache::lonnet::logthis('computing student data for '.$seq->compTitle); |
my ($performance,$performance_length,$score,$seq_max,$rawdata); |
my ($performance,$performance_length,$score,$seq_max,$rawdata); |
if ($chosen_output->{'tries'}) { |
if ($chosen_output->{'tries'}) { |
($performance,$performance_length,$score,$seq_max,$rawdata) = |
($performance,$performance_length,$score,$seq_max,$rawdata) = |
&StudentTriesOnSequence($student,\%StudentsData, |
&student_tries_on_sequence($student,\%StudentsData, |
$seq,$show_links); |
$navmap,$seq,$show_links); |
} else { |
} else { |
($performance,$performance_length,$score,$seq_max,$rawdata) = |
($performance,$performance_length,$score,$seq_max,$rawdata) = |
&StudentPerformanceOnSequence($student,\%StudentsData, |
&student_performance_on_sequence($student,\%StudentsData, |
$seq,$show_links); |
$navmap,$seq,$show_links); |
} |
} |
my $ratio=''; |
my $ratio=''; |
|
if ($chosen_output->{'every_problem'}) { |
|
$ratio .= ' '; |
|
} |
if ($chosen_output->{'sequence_sum'} && $score ne ' ') { |
if ($chosen_output->{'sequence_sum'} && $score ne ' ') { |
$ratio .= sprintf("%3d",$score); |
$ratio .= sprintf("%3.0f",$score); |
} else { |
} elsif($chosen_output->{'sequence_sum'}) { |
$ratio .= ' 'x3; |
$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_length=0; |
} |
} |
$performance .= ' 'x($seq->{'width_total'}-$performance_length-$seq->{'width_sum'}). |
$performance .= ' 'x($width{$seq->symb}->{'width_total'} - |
|
$performance_length - |
|
$width{$seq->symb}->{'width_sum'}). |
$ratio; |
$ratio; |
# |
# |
$Str .= $performance.$padding; |
$Str .= $performance.$padding; |
# |
# |
$studentstats->{$seq->{'symb'}}->{'score'}= $score; |
$studentstats->{$seq->symb}->{'score'}= $score; |
$studentstats->{$seq->{'symb'}}->{'max'} = $seq_max; |
$studentstats->{$seq->symb}->{'max'} = $seq_max; |
} |
} |
# |
# |
# Total it up and store the statistics info. |
# Total it up and store the statistics info. |
Line 754 sub html_outputstudent {
|
Line 809 sub html_outputstudent {
|
$max += $seq_stats->{'max'}; |
$max += $seq_stats->{'max'}; |
} |
} |
if (! defined($score)) { |
if (! defined($score)) { |
$score = ' 'x3; |
$score = ' ' x $total_sum_width; |
|
} else { |
|
$score = sprintf("%.0f",$score); |
} |
} |
$Str .= ' '.' 'x(length($max)-length($score)).$score.'/'.$max; |
$Str .= ' '.' 'x($total_sum_width-length($score)).$score.' / '.$max; |
$Str .= " \n"; |
$Str .= " \n"; |
# |
# |
$r->print($Str); |
$r->print($Str); |
Line 767 sub html_outputstudent {
|
Line 824 sub html_outputstudent {
|
|
|
sub html_finish { |
sub html_finish { |
my ($r) = @_; |
my ($r) = @_; |
|
return if (! defined($navmap)); |
# |
# |
# 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"); |
Line 778 sub html_finish {
|
Line 836 sub html_finish {
|
} |
} |
} |
} |
$r->rflush(); |
$r->rflush(); |
|
undef($navmap); |
return; |
return; |
} |
} |
|
|
sub StudentAverageTotal { |
sub StudentAverageTotal { |
my $Str = "<h3>Summary Tables</h3>\n"; |
my $Str = '<h3>'.&mt('Summary Tables').'</h3>'.$/; |
# my $max_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>'. |
foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) { |
'<th>'.&mt('Title').'</th>'. |
|
'<th>'.&mt('Average').'</th>'. |
|
'<th>'.&mt('Maximum').'</th>'. |
|
'</tr>'.$/; |
|
foreach my $seq (@sequences) { |
|
my $symb = $seq->symb; |
my $ave; |
my $ave; |
my $num_students = $Statistics->{$seq->{'symb'}}->{'num_students'}; |
my $num_students = $Statistics->{$symb}->{'num_students'}; |
# if ($num_students > $max_students) { |
|
# $max_students = $num_students; |
|
# } |
|
if ($num_students > 0) { |
if ($num_students > 0) { |
$ave = int(100* |
$ave = int(100* |
($Statistics->{$seq->{'symb'}}->{'score'}/$num_students) |
($Statistics->{$symb}->{'score'}/$num_students) |
)/100; |
)/100; |
} else { |
} else { |
$ave = 0; |
$ave = 0; |
} |
} |
# $total_ave += $ave; |
my $max = $Statistics->{$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->compTitle.'</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>\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; |
} |
} |
|
|
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()) { |
my $value = $Statistics->{$seq->{'symb'}}->{'score'}; |
my $value = $Statistics->{$seq->symb}->{'score'}; |
my $max = $Statistics->{$seq->{'symb'}}->{'max'}; |
my $max = $Statistics->{$seq->symb}->{'max'}; |
$Str .= '<tr><td>'.$seq->{'title'}.'</td>'. |
$Str .= '<tr><td>'.&HTML::Entities::encode($seq->compTitle).'</td>'. |
'<td align="right">'.$value.'</td>'. |
'<td align="right">'.$value.'</td>'. |
'<td align="right">'.$max.'</td></tr>'."\n"; |
'<td align="right">'.$max.'</td></tr>'."\n"; |
$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 879 my %prog_state; # progress window state
|
Line 935 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 891 sub excel_initialize {
|
Line 948 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 902 sub excel_initialize {
|
Line 960 sub excel_initialize {
|
# 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 += 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 951 END
|
Line 988 END
|
# Determine rows |
# Determine rows |
my $header_row = $rows_output++; |
my $header_row = $rows_output++; |
my $description_row = $rows_output++; |
my $description_row = $rows_output++; |
|
my $notes_row = $rows_output++; |
$rows_output++; # blank row |
$rows_output++; # blank row |
my $summary_header_row; |
my $summary_header_row; |
if ($chosen_output->{'summary_table'}) { |
if ($chosen_output->{'summary_table'}) { |
Line 1025 END
|
Line 1063 END
|
$cols_output = 0; |
$cols_output = 0; |
$excel_sheet->write($description_row,$cols_output++, |
$excel_sheet->write($description_row,$cols_output++, |
$chosen_output->{'shortdesc'}, |
$chosen_output->{'shortdesc'}, |
$format->{'h3'}); |
$format->{'b'}); |
|
# |
|
$cols_output = 0; |
|
$excel_sheet->write($notes_row,$cols_output++, |
|
$chosen_output->{'non_html_notes'}, |
|
$format->{'i'}); |
|
|
############################################## |
############################################## |
# Output headings for the raw data |
# Output headings for the raw data |
############################################## |
############################################## |
Line 1039 END
|
Line 1083 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 1063 END
|
Line 1108 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 1116 END
|
Line 1162 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 1143 END
|
Line 1203 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 1173 END
|
Line 1237 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 1196 END
|
Line 1259 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, |
|
%maximum_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 1266 END
|
Line 1334 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 1282 sub excel_outputstudent {
|
Line 1351 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 1297 sub excel_outputstudent {
|
Line 1371 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 1336 sub excel_outputstudent {
|
Line 1415 sub excel_outputstudent {
|
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, |
|
%replaceCells,%replaceCells); |
|
} else { |
|
$excel_sheet->repeat_formula($rows_output,$cols_output++, |
|
$seq->{'Excel:sum'},undef, |
|
%replaceCells); |
|
} |
|
} elsif ($chosen_output->{'sequence_sum'}) { |
} elsif ($chosen_output->{'sequence_sum'}) { |
if ($score eq ' ') { |
if ($score eq ' ') { |
$cols_output++; |
$cols_output++; |
Line 1370 sub excel_outputstudent {
|
Line 1442 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 1452 END
|
Line 1529 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 1471 END
|
Line 1549 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 1517 END
|
Line 1601 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 1533 sub csv_outputstudent {
|
Line 1621 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 1548 sub csv_outputstudent {
|
Line 1641 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 1581 sub csv_outputstudent {
|
Line 1675 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 1641 Inputs:
|
Line 1739 Inputs:
|
|
|
####################################################### |
####################################################### |
####################################################### |
####################################################### |
sub StudentTriesOnSequence { |
sub student_tries_on_sequence { |
my ($student,$studentdata,$seq,$links) = @_; |
my ($student,$studentdata,$navmap,$seq,$links) = @_; |
$links = 'no' if (! defined($links)); |
$links = 'no' if (! defined($links)); |
my $Str = ''; |
my $Str = ''; |
my ($sum,$max) = (0,0); |
my ($sum,$max) = (0,0); |
Line 1650 sub StudentTriesOnSequence {
|
Line 1748 sub StudentTriesOnSequence {
|
my @TriesData = (); |
my @TriesData = (); |
my $tries; |
my $tries; |
my $hasdata = 0; # flag - true if the student has any data on the sequence |
my $hasdata = 0; # flag - true if the student has any data on the sequence |
foreach my $resource (@{$seq->{'contents'}}) { |
my @resources = |
next if ($resource->{'type'} ne 'assessment'); |
$navmap->retrieveResources($seq,sub { shift->is_problem(); },0,0,0); |
my $resource_data = $studentdata->{$resource->{'symb'}}; |
foreach my $resource (@resources) { |
|
my $resource_data = $studentdata->{$resource->symb}; |
my $value = ''; |
my $value = ''; |
foreach my $partnum (@{$resource->{'parts'}}) { |
foreach my $partnum (@{$resource->parts()}) { |
$tries = undef; |
$tries = undef; |
$max++; |
$max++; |
$performance_length++; |
$performance_length++; |
Line 1715 sub StudentTriesOnSequence {
|
Line 1814 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 1725 sub StudentTriesOnSequence {
|
Line 1830 sub StudentTriesOnSequence {
|
&Apache::lonnet::logthis('length of symbol "'.$symbol.'" > 1'); |
&Apache::lonnet::logthis('length of symbol "'.$symbol.'" > 1'); |
} |
} |
$symbol = '<a href="/adm/grades'. |
$symbol = '<a href="/adm/grades'. |
'?symb='.&Apache::lonnet::escape($resource->{'symb'}). |
'?symb='.&Apache::lonnet::escape($resource->symb). |
'&student='.$student->{'username'}. |
'&student='.$student->{'username'}. |
'&userdom='.$student->{'domain'}. |
'&userdom='.$student->{'domain'}. |
'&command=submission">'.$symbol.'</a>'; |
'&command=submission">'.$symbol.'</a>'; |
Line 1734 sub StudentTriesOnSequence {
|
Line 1839 sub StudentTriesOnSequence {
|
} |
} |
$Str .= $value; |
$Str .= $value; |
} |
} |
if ($seq->{'randompick'}) { |
if ($seq->randompick()) { |
$max = $seq->{'randompick'}; |
$max = $seq->randompick(); |
} |
} |
if (! $hasdata && $sum == 0) { |
if (! $hasdata && $sum == 0) { |
$sum = ' '; |
$sum = ' '; |
Line 1768 Inputs:
|
Line 1873 Inputs:
|
|
|
####################################################### |
####################################################### |
####################################################### |
####################################################### |
sub StudentPerformanceOnSequence { |
sub student_performance_on_sequence { |
my ($student,$studentdata,$seq,$links) = @_; |
my ($student,$studentdata,$navmap,$seq,$links) = @_; |
$links = 'no' if (! defined($links)); |
$links = 'no' if (! defined($links)); |
my $Str = ''; # final result string |
my $Str = ''; # final result string |
my ($score,$max) = (0,0); |
my ($score,$max) = (0,0); |
Line 1778 sub StudentPerformanceOnSequence {
|
Line 1883 sub StudentPerformanceOnSequence {
|
my @ScoreData = (); |
my @ScoreData = (); |
my $partscore; |
my $partscore; |
my $hasdata = 0; # flag, 0 if there were no submissions on the sequence |
my $hasdata = 0; # flag, 0 if there were no submissions on the sequence |
foreach my $resource (@{$seq->{'contents'}}) { |
my @resources = |
next if ($resource->{'type'} ne 'assessment'); |
$navmap->retrieveResources($seq,sub { shift->is_problem(); },0,0,0); |
my $resource_data = $studentdata->{$resource->{'symb'}}; |
foreach my $resource (@resources) { |
foreach my $part (@{$resource->{'parts'}}) { |
my $symb = $resource->symb; |
|
my $resource_data = $studentdata->{$symb}; |
|
foreach my $part (@{$resource->parts()}) { |
$partscore = undef; |
$partscore = undef; |
my $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight', |
my $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight', |
$resource->{'symb'}, |
$symb, |
$student->{'domain'}, |
$student->{'domain'}, |
$student->{'username'}, |
$student->{'username'}, |
$student->{'section'}); |
$student->{'section'}); |
Line 1822 sub StudentPerformanceOnSequence {
|
Line 1929 sub StudentPerformanceOnSequence {
|
$max -= $weight; # Do not count 'excused' problems. |
$max -= $weight; # Do not count 'excused' problems. |
} |
} |
$hasdata = 1; |
$hasdata = 1; |
} else { |
} elsif (!exists($resource_data->{'resource.'.$part.'.awarded'})){ |
# Unsolved. Did they try? |
# Unsolved. Did they try? |
if (exists($resource_data->{'resource.'.$part.'.tries'})){ |
if (exists($resource_data->{'resource.'.$part.'.tries'})){ |
$symbol = '.'; |
$symbol = '.'; |
Line 1839 sub StudentPerformanceOnSequence {
|
Line 1946 sub StudentPerformanceOnSequence {
|
# |
# |
if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) { |
if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) { |
$symbol = '<a href="/adm/grades'. |
$symbol = '<a href="/adm/grades'. |
'?symb='.&Apache::lonnet::escape($resource->{'symb'}). |
'?symb='.&Apache::lonnet::escape($symb). |
'&student='.$student->{'username'}. |
'&student='.$student->{'username'}. |
'&userdom='.$student->{'domain'}. |
'&userdom='.$student->{'domain'}. |
'&command=submission">'.$symbol.'</a>'; |
'&command=submission">'.$symbol.'</a>'; |