version 1.123, 2005/04/08 13:44:43
|
version 1.140, 2006/05/30 12:46:50
|
Line 50 Presents assessment data about a student
|
Line 50 Presents assessment data about a student
|
package Apache::lonstudentassessment; |
package Apache::lonstudentassessment; |
|
|
use strict; |
use strict; |
use Apache::lonstatistics; |
use Apache::lonstatistics(); |
use Apache::lonhtmlcommon; |
use Apache::lonhtmlcommon(); |
use Apache::loncommon(); |
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 Apache::grades(); |
|
use Apache::lonmsgdisplay(); |
use Time::HiRes; |
use Time::HiRes; |
use Spreadsheet::WriteExcel; |
use Spreadsheet::WriteExcel; |
use Spreadsheet::WriteExcel::Utility(); |
use Spreadsheet::WriteExcel::Utility(); |
|
use lib '/home/httpd/lib/perl/'; |
|
use LONCAPA; |
|
|
|
|
####################################################### |
####################################################### |
####################################################### |
####################################################### |
Line 145 sub BuildStudentAssessmentPage {
|
Line 150 sub BuildStudentAssessmentPage {
|
'chartoutputmode' => 'scalar', |
'chartoutputmode' => 'scalar', |
'chartoutputdata' => 'scalar', |
'chartoutputdata' => 'scalar', |
'Section' => 'array', |
'Section' => 'array', |
|
'Groups' => 'array', |
'StudentData' => 'array', |
'StudentData' => 'array', |
'Maps' => 'array'); |
'Maps' => 'array'); |
&Apache::loncommon::store_course_settings('chart',\%Saveable_Parameters); |
&Apache::loncommon::store_course_settings('chart',\%Saveable_Parameters); |
Line 312 the chart page.
|
Line 318 the chart page.
|
####################################################### |
####################################################### |
sub CreateInterface { |
sub CreateInterface { |
my $Str = ''; |
my $Str = ''; |
$Str .= &Apache::lonhtmlcommon::breadcrumbs(undef,'Chart'); |
$Str .= &Apache::lonhtmlcommon::breadcrumbs('Chart'); |
# $Str .= &CreateLegend(); |
# $Str .= &CreateLegend(); |
$Str .= '<table cellspacing="5">'."\n"; |
$Str .= '<table cellspacing="5">'."\n"; |
$Str .= '<tr>'; |
$Str .= '<tr>'; |
$Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>'; |
$Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>'; |
|
$Str .= '<td align="center"><b>'.&mt('Groups').'</b></td>'; |
$Str .= '<td align="center"><b>'.&mt('Student Data</b>').'</td>'; |
$Str .= '<td align="center"><b>'.&mt('Student Data</b>').'</td>'; |
$Str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b></td>'; |
$Str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b></td>'; |
$Str .= '<td align="center"><b>'.&mt('Sequences and Folders').'</b></td>'; |
$Str .= '<td align="center"><b>'.&mt('Sequences and Folders').'</b></td>'; |
Line 331 sub CreateInterface {
|
Line 338 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">'; |
|
$Str .= &Apache::lonstatistics::GroupSelect('Group','multiple',5); |
|
$Str .= '</td><td align="center">'; |
$Str .= &Apache::lonstatistics::StudentDataSelect('StudentData','multiple', |
$Str .= &Apache::lonstatistics::StudentDataSelect('StudentData','multiple', |
5,undef); |
5,undef); |
$Str .= '</td><td>'."\n"; |
$Str .= '</td><td>'."\n"; |
Line 472 my @OutputDataOptions =
|
Line 481 my @OutputDataOptions =
|
grand_maximum => 1, |
grand_maximum => 1, |
summary_table => 1, |
summary_table => 1, |
maximum_row => 1, |
maximum_row => 1, |
|
ignore_weight => 0, |
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 490 my @OutputDataOptions =
|
Line 500 my @OutputDataOptions =
|
grand_maximum => 1, |
grand_maximum => 1, |
summary_table => 1, |
summary_table => 1, |
maximum_row => 1, |
maximum_row => 1, |
|
ignore_weight => 0, |
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 507 my @OutputDataOptions =
|
Line 518 my @OutputDataOptions =
|
grand_maximum => 0, |
grand_maximum => 0, |
summary_table => 0, |
summary_table => 0, |
maximum_row => 0, |
maximum_row => 0, |
|
ignore_weight => 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', |
non_html_notes => 'negative values indicate an incorrect problem', |
Line 524 my @OutputDataOptions =
|
Line 536 my @OutputDataOptions =
|
grand_maximum => 1, |
grand_maximum => 1, |
summary_table => 1, |
summary_table => 1, |
maximum_row => 0, |
maximum_row => 0, |
|
ignore_weight => 1, |
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 622 Return a line of the chart for a student
|
Line 635 Return a line of the chart for a student
|
my @sequences; |
my @sequences; |
my $navmap; # Have to keep this around since weakref is a bit zealous |
my $navmap; # Have to keep this around since weakref is a bit zealous |
|
|
|
sub html_cleanup { |
|
undef(%prog_state); |
|
undef(%width); |
|
# |
|
undef($navmap); |
|
undef(@sequences); |
|
} |
|
|
sub html_initialize { |
sub html_initialize { |
my ($r) = @_; |
my ($r) = @_; |
# |
# |
$padding = ' 'x3; |
$padding = ' 'x3; |
$count = 0; |
$count = 0; |
$nodata_count = 0; |
$nodata_count = 0; |
undef(%prog_state); |
&html_cleanup(); |
undef(%width); |
|
# |
|
undef($navmap); |
|
undef(@sequences); |
|
($navmap,@sequences) = |
($navmap,@sequences) = |
&Apache::lonstatistics::selected_sequences_with_assessments(); |
&Apache::lonstatistics::selected_sequences_with_assessments(); |
if (! ref($navmap)) { |
if (! ref($navmap)) { |
Line 641 sub html_initialize {
|
Line 658 sub html_initialize {
|
&mt('Unable to retrieve course information.'). |
&mt('Unable to retrieve course information.'). |
'</h3>'); |
'</h3>'); |
} |
} |
|
|
|
# If we're showing links, show a checkbox to open in new |
|
# windows. |
|
if ($show_links ne 'no') { |
|
$r->print(<<NEW_WINDOW_CHECKBOX); |
|
<script type="text/javascript">new_window = true;</script> |
|
<p><label>Show links in new window: |
|
<input type="checkbox" checked="1" onclick="new_window=this.checked" /> |
|
</label></p> |
|
NEW_WINDOW_CHECKBOX |
|
} |
|
|
# |
# |
$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>"); |
Line 710 sub html_initialize {
|
Line 739 sub html_initialize {
|
$Str .= "<pre>"; |
$Str .= "<pre>"; |
$r->print($Str); |
$r->print($Str); |
$r->rflush(); |
$r->rflush(); |
|
|
|
$r->print(<<JS); |
|
<script> |
|
// get the left offset of a given widget as an absolute position |
|
function getLeftOffset (element) { |
|
return collect(element, "offsetLeft"); |
|
} |
|
|
|
// get the top offset of a given widget as an absolute position |
|
function getTopOffset (element) { |
|
return collect(element, "offsetTop"); |
|
} |
|
|
|
function collect(element, att) { |
|
var val = 0; |
|
while(element) { |
|
val += element[att]; |
|
element = element.offsetParent; |
|
} |
|
return val; |
|
} |
|
|
|
var currentDiv; |
|
var oldBorder; |
|
var currentElement; |
|
function popup_score(element, score) { |
|
popdown_score(); |
|
var left = getLeftOffset(element); |
|
var top = getTopOffset(element); |
|
var div = document.createElement("div"); |
|
div.style.border = "1px solid #8888FF"; |
|
div.style.backgroundColor = "#CCCCFF"; |
|
div.appendChild(document.createTextNode(score)); |
|
div.style.position = "absolute"; |
|
div.style.top = (top - 25) + "px"; |
|
div.style.left = (left - 10) + "px"; |
|
currentDiv = div; |
|
document.body.insertBefore(div, document.body.childNodes[0]); |
|
oldBorder = element.style.border; |
|
element.style.border = "1px solid yellow"; |
|
currentElement = element; |
|
} |
|
|
|
function popdown_score() { |
|
if (currentDiv) { |
|
document.body.removeChild(currentDiv); |
|
} |
|
if (currentElement) { |
|
currentElement.style.border = oldBorder; |
|
} |
|
currentDiv = undefined; |
|
} |
|
</script> |
|
JS |
|
|
# |
# |
# 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 777 sub html_outputstudent {
|
Line 861 sub html_outputstudent {
|
} else { |
} else { |
($performance,$performance_length,$score,$seq_max,$rawdata) = |
($performance,$performance_length,$score,$seq_max,$rawdata) = |
&student_performance_on_sequence($student,\%StudentsData, |
&student_performance_on_sequence($student,\%StudentsData, |
$navmap,$seq,$show_links); |
$navmap,$seq,$show_links, |
|
$chosen_output->{ignore_weight}); |
} |
} |
my $ratio=''; |
my $ratio=''; |
if ($chosen_output->{'every_problem'} && |
if ($chosen_output->{'every_problem'} && |
Line 856 sub html_finish {
|
Line 941 sub html_finish {
|
} |
} |
$r->rflush(); |
$r->rflush(); |
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
undef($navmap); |
&html_cleanup(); |
return; |
return; |
} |
} |
|
|
Line 963 my %formula_data;
|
Line 1048 my %formula_data;
|
my $navmap; |
my $navmap; |
my @sequences; |
my @sequences; |
|
|
sub excel_initialize { |
sub excel_cleanup { |
my ($r) = @_; |
|
# |
# |
undef ($excel_sheet); |
undef ($excel_sheet); |
undef ($excel_workbook); |
undef ($excel_workbook); |
Line 980 sub excel_initialize {
|
Line 1064 sub excel_initialize {
|
# |
# |
undef($navmap); |
undef($navmap); |
undef(@sequences); |
undef(@sequences); |
|
} |
|
|
|
sub excel_initialize { |
|
my ($r) = @_; |
|
|
|
&excel_cleanup(); |
($navmap,@sequences) = |
($navmap,@sequences) = |
&Apache::lonstatistics::selected_sequences_with_assessments(); |
&Apache::lonstatistics::selected_sequences_with_assessments(); |
if (! ref($navmap)) { |
if (! ref($navmap)) { |
Line 1060 sub excel_initialize {
|
Line 1150 sub excel_initialize {
|
my $sectionstring = ''; |
my $sectionstring = ''; |
my @Sections = &Apache::lonstatistics::get_selected_sections(); |
my @Sections = &Apache::lonstatistics::get_selected_sections(); |
$excel_sheet->write($header_row,$cols_output++, |
$excel_sheet->write($header_row,$cols_output++, |
&Apache::lonstatistics::section_and_enrollment_description('plain text'), |
&Apache::lonstatistics::section_and_enrollment_description('plaintext'), |
$format->{'h3'}); |
$format->{'h3'}); |
# |
# |
# Put the date in there too |
# Put the date in there too |
Line 1135 sub excel_initialize {
|
Line 1225 sub excel_initialize {
|
! defined($formula_data{$symb}->{'Excel:endcell'})) { |
! defined($formula_data{$symb}->{'Excel:endcell'})) { |
$formula_data{$symb}->{'Excel:endcell'} = $formula_data{$symb}->{'Excel:startcell'}; |
$formula_data{$symb}->{'Excel:endcell'} = $formula_data{$symb}->{'Excel:startcell'}; |
} |
} |
|
|
|
my $start = $formula_data{$symb}->{'Excel:startcell'}; |
|
my $end = $formula_data{$symb}->{'Excel:endcell'}; |
$formula_data{$symb}->{'Excel:sum'}= $excel_sheet->store_formula |
$formula_data{$symb}->{'Excel:sum'}= $excel_sheet->store_formula |
('=SUM('.$formula_data{$symb}->{'Excel:startcell'}. |
("=IF(COUNT($start\:$end),SUM($start\:$end),\"\")"); |
':'.$formula_data{$symb}->{'Excel:endcell'}.')'); |
|
# Determine cell the score is held in |
# Determine cell the score is held in |
$formula_data{$symb}->{'Excel:scorecell'} = |
$formula_data{$symb}->{'Excel:scorecell'} = |
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell |
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell |
Line 1222 sub excel_initialize {
|
Line 1314 sub excel_initialize {
|
$weight = 1; |
$weight = 1; |
if ($chosen_output->{'scores'}) { |
if ($chosen_output->{'scores'}) { |
$weight = &Apache::lonnet::EXT |
$weight = &Apache::lonnet::EXT |
('resource.'.$part.'.weight',$resource->{'symb'}, |
('resource.'.$part.'.weight',$resource->symb, |
undef,undef,undef); |
undef,undef,undef); |
if (!defined($weight) || ($weight eq '')) { |
if (!defined($weight) || ($weight eq '')) { |
$weight=1; |
$weight=1; |
Line 1246 sub excel_initialize {
|
Line 1338 sub excel_initialize {
|
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell($maximum_data_row,$formula_data{$symb}->{'Excel:endcol'})); |
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell($maximum_data_row,$formula_data{$symb}->{'Excel:endcol'})); |
$excel_sheet->repeat_formula($maximum_data_row,$cols_output++, |
$excel_sheet->repeat_formula($maximum_data_row,$cols_output++, |
$formula_data{$symb}->{'Excel:sum'},undef, |
$formula_data{$symb}->{'Excel:sum'},undef, |
%replaceCells); |
%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 1357 sub excel_outputstudent {
|
Line 1449 sub excel_outputstudent {
|
foreach my $field (@to_show) { |
foreach my $field (@to_show) { |
my $value = $student->{$field}; |
my $value = $student->{$field}; |
if ($field eq 'comments') { |
if ($field eq 'comments') { |
$value = &Apache::lonmsg::retrieve_instructor_comments |
$value = &Apache::lonmsgdisplay::retrieve_instructor_comments |
($student->{'username'},$student->{'domain'}); |
($student->{'username'},$student->{'domain'}); |
} |
} |
$excel_sheet->write($rows_output,$cols_output++,$value); |
$excel_sheet->write($rows_output,$cols_output++,$value); |
Line 1396 sub excel_outputstudent {
|
Line 1488 sub excel_outputstudent {
|
} else { |
} else { |
($performance,$performance_length,$score,$seq_max,$rawdata) = |
($performance,$performance_length,$score,$seq_max,$rawdata) = |
&student_performance_on_sequence($student,\%StudentsData, |
&student_performance_on_sequence($student,\%StudentsData, |
$navmap,$seq,'no'); |
$navmap,$seq,'no', |
|
$chosen_output->{ignore_weight}); |
} |
} |
if ($chosen_output->{'every_problem'}) { |
if ($chosen_output->{'every_problem'}) { |
if ($chosen_output->{'correct'}) { |
if ($chosen_output->{'correct'}) { |
# only indiciate if each item is correct or not |
# only indiciate if each item is correct or not |
foreach my $value (@$rawdata) { |
foreach my $value (@$rawdata) { |
# nonzero means correct |
# positive means correct, 0 or negative means |
$value = 1 if ($value > 0); |
# incorrect |
|
$value = $value > 0 ? 1 : 0; |
$excel_sheet->write($rows_output,$cols_output++,$value); |
$excel_sheet->write($rows_output,$cols_output++,$value); |
} |
} |
} else { |
} else { |
Line 1429 sub excel_outputstudent {
|
Line 1523 sub excel_outputstudent {
|
# The undef is for the format |
# The undef is for the format |
$excel_sheet->repeat_formula($rows_output,$cols_output++, |
$excel_sheet->repeat_formula($rows_output,$cols_output++, |
$formula_data{$symb}->{'Excel:sum'},undef, |
$formula_data{$symb}->{'Excel:sum'},undef, |
%replaceCells); |
%replaceCells, %replaceCells); |
} elsif ($chosen_output->{'sequence_sum'}) { |
} elsif ($chosen_output->{'sequence_sum'}) { |
if ($score eq ' ') { |
if ($score eq ' ') { |
$cols_output++; |
$cols_output++; |
Line 1465 sub excel_outputstudent {
|
Line 1559 sub excel_outputstudent {
|
sub excel_finish { |
sub excel_finish { |
my ($r) = @_; |
my ($r) = @_; |
if ($request_aborted || ! defined($navmap) || ! defined($excel_sheet)) { |
if ($request_aborted || ! defined($navmap) || ! defined($excel_sheet)) { |
|
&excel_cleanup(); |
return; |
return; |
} |
} |
# |
# |
# Write the excel file |
# Write the excel file |
$excel_workbook->close(); |
$excel_workbook->close(); |
my $c = $r->connection(); |
|
# |
|
return if($c->aborted()); |
|
# |
# |
# Close the progress window |
# Close the progress window |
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
Line 1481 sub excel_finish {
|
Line 1573 sub excel_finish {
|
$r->print('<br />'. |
$r->print('<br />'. |
'<a href="'.$filename.'">Your Excel spreadsheet.</a>'."\n"); |
'<a href="'.$filename.'">Your Excel spreadsheet.</a>'."\n"); |
$r->rflush(); |
$r->rflush(); |
|
&excel_cleanup(); |
return; |
return; |
} |
} |
|
|
Line 1511 my %prog_state; # progress window state
|
Line 1604 my %prog_state; # progress window state
|
my $navmap; |
my $navmap; |
my @sequences; |
my @sequences; |
|
|
sub csv_initialize{ |
sub csv_cleanup { |
my ($r) = @_; |
|
# |
|
# Clean up |
|
undef($outputfile); |
undef($outputfile); |
undef($filename); |
undef($filename); |
undef($request_aborted); |
undef($request_aborted); |
Line 1522 sub csv_initialize{
|
Line 1612 sub csv_initialize{
|
# |
# |
undef($navmap); |
undef($navmap); |
undef(@sequences); |
undef(@sequences); |
|
} |
|
|
|
sub csv_initialize{ |
|
my ($r) = @_; |
|
|
|
&csv_cleanup(); |
($navmap,@sequences) = |
($navmap,@sequences) = |
&Apache::lonstatistics::selected_sequences_with_assessments(); |
&Apache::lonstatistics::selected_sequences_with_assessments(); |
if (! ref($navmap)) { |
if (! ref($navmap)) { |
Line 1635 sub csv_outputstudent {
|
Line 1731 sub csv_outputstudent {
|
foreach my $field (@to_show) { |
foreach my $field (@to_show) { |
my $value = $student->{$field}; |
my $value = $student->{$field}; |
if ($field eq 'comments') { |
if ($field eq 'comments') { |
$value = &Apache::lonmsg::retrieve_instructor_comments |
$value = &Apache::lonmsgdisplay::retrieve_instructor_comments |
($student->{'username'},$student->{'domain'}); |
($student->{'username'},$student->{'domain'}); |
} |
} |
$Str .= '"'.&Apache::loncommon::csv_translate($value).'",'; |
$Str .= '"'.&Apache::loncommon::csv_translate($value).'",'; |
Line 1663 sub csv_outputstudent {
|
Line 1759 sub csv_outputstudent {
|
} else { |
} else { |
($performance,$performance_length,$score,$seq_max,$rawdata) = |
($performance,$performance_length,$score,$seq_max,$rawdata) = |
&student_performance_on_sequence($student,\%StudentsData, |
&student_performance_on_sequence($student,\%StudentsData, |
$navmap,$seq,'no'); |
$navmap,$seq,'no', |
|
$chosen_output->{ignore_weight}); |
} |
} |
if ($chosen_output->{'every_problem'}) { |
if ($chosen_output->{'every_problem'}) { |
if ($chosen_output->{'correct'}) { |
if ($chosen_output->{'correct'}) { |
Line 1707 sub csv_outputstudent {
|
Line 1804 sub csv_outputstudent {
|
sub csv_finish { |
sub csv_finish { |
my ($r) = @_; |
my ($r) = @_; |
if ($request_aborted || ! defined($navmap) || ! defined($outputfile)) { |
if ($request_aborted || ! defined($navmap) || ! defined($outputfile)) { |
|
&csv_cleanup(); |
return; |
return; |
} |
} |
close($outputfile); |
close($outputfile); |
# |
# |
my $c = $r->connection(); |
|
return if ($c->aborted()); |
|
# |
|
# Close the progress window |
# Close the progress window |
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
# |
# |
Line 1721 sub csv_finish {
|
Line 1816 sub csv_finish {
|
$r->print('<br />'. |
$r->print('<br />'. |
'<a href="'.$filename.'">'.&mt('Your csv file.').'</a>'."\n"); |
'<a href="'.$filename.'">'.&mt('Your csv file.').'</a>'."\n"); |
$r->rflush(); |
$r->rflush(); |
|
&csv_cleanup(); |
return; |
return; |
|
|
} |
} |
|
|
} |
} |
|
|
|
# This function will return an HTML string including a star, with |
|
# a mouseover popup showing the "real" value. An optional second |
|
# argument lets you show something other than a star. |
|
sub show_star { |
|
my $popup = shift; |
|
my $symbol = shift || '*'; |
|
# Escape the popup for JS. |
|
$popup =~ s/([^-a-zA-Z0-9:;,._ ()|!\/?=&*])/'\\' . sprintf("%lo", ord($1))/ge; |
|
|
|
return "<span onmouseover='popup_score(this, \"$popup\");return false;' onmouseout='popdown_score();return false;' style='border: 1px solid #339933; margin: -1px;'>$symbol</span>"; |
|
} |
|
|
####################################################### |
####################################################### |
####################################################### |
####################################################### |
|
|
Line 1792 sub student_tries_on_sequence {
|
Line 1900 sub student_tries_on_sequence {
|
if ($status eq 'excused') { |
if ($status eq 'excused') { |
$symbol = 'x'; |
$symbol = 'x'; |
$max--; |
$max--; |
} elsif ($status eq 'correct_by_override') { |
} elsif ($status eq 'correct_by_override' && !$resource->is_task()) { |
$symbol = '+'; |
$symbol = '+'; |
$sum++; |
$sum++; |
} elsif ($tries > 0) { |
} elsif ($tries > 0) { |
if ($tries > 9) { |
if ($tries > 9) { |
$symbol = '*'; |
$symbol = show_star($tries); |
} else { |
} else { |
$symbol = $tries; |
$symbol = $tries; |
} |
} |
Line 1814 sub student_tries_on_sequence {
|
Line 1922 sub student_tries_on_sequence {
|
} elsif ($status eq 'incorrect_by_override') { |
} elsif ($status eq 'incorrect_by_override') { |
$symbol = '-'; |
$symbol = '-'; |
} elsif ($status eq 'ungraded_attempted') { |
} elsif ($status eq 'ungraded_attempted') { |
$symbol = '#'; |
$symbol = 'u'; |
} elsif ($status eq 'incorrect_attempted' || |
} elsif ($status eq 'incorrect_attempted' || |
$tries > 0) { |
$tries > 0) { |
$symbol = '.'; |
$symbol = '.'; |
Line 1840 sub student_tries_on_sequence {
|
Line 1948 sub student_tries_on_sequence {
|
if (length($symbol) > 1) { |
if (length($symbol) > 1) { |
&Apache::lonnet::logthis('length of symbol "'.$symbol.'" > 1'); |
&Apache::lonnet::logthis('length of symbol "'.$symbol.'" > 1'); |
} |
} |
$symbol = '<a href="/adm/grades'. |
my $link = '/adm/grades'. |
'?symb='.&Apache::lonnet::escape($resource->symb). |
'?symb='.&escape($resource->symb). |
'&student='.$student->{'username'}. |
'&student='.$student->{'username'}. |
'&userdom='.$student->{'domain'}. |
'&userdom='.$student->{'domain'}. |
'&command=submission">'.$symbol.'</a>'; |
'&command=submission'; |
|
$symbol = &link($symbol, $link); |
} |
} |
$value .= $symbol; |
$value .= $symbol; |
} |
} |
Line 1859 sub student_tries_on_sequence {
|
Line 1968 sub student_tries_on_sequence {
|
return ($Str,$performance_length,$sum,$max,\@TriesData); |
return ($Str,$performance_length,$sum,$max,\@TriesData); |
} |
} |
|
|
|
=pod |
|
|
|
=item &link |
|
|
|
Inputs: |
|
|
|
=over 4 |
|
|
|
=item $text |
|
|
|
=item $target |
|
|
|
=back |
|
|
|
Takes the text and creates a link to the $text that honors |
|
the value of 'new window' if clicked on, but uses a real |
|
'href' so middle and right clicks still work. |
|
|
|
$target and $text are assumed to be already correctly escaped; i.e., it |
|
can be dumped out directly into the output stream as-is. |
|
|
|
=cut |
|
|
|
sub link { |
|
my ($text,$target) = @_; |
|
return |
|
"<a href='$target' onclick=\"t=this.href;if(new_window)" |
|
."{window.open(t)}else{return void(window." |
|
."location=t)};return false;\">$text</a>"; |
|
} |
|
|
####################################################### |
####################################################### |
####################################################### |
####################################################### |
|
|
Line 1885 Inputs:
|
Line 2025 Inputs:
|
####################################################### |
####################################################### |
####################################################### |
####################################################### |
sub student_performance_on_sequence { |
sub student_performance_on_sequence { |
my ($student,$studentdata,$navmap,$seq,$links) = @_; |
my ($student,$studentdata,$navmap,$seq,$links,$awarded_only) = @_; |
$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 1899 sub student_performance_on_sequence {
|
Line 2039 sub student_performance_on_sequence {
|
my $resource_data = $studentdata->{$symb}; |
my $resource_data = $studentdata->{$symb}; |
foreach my $part (@{$resource->parts()}) { |
foreach my $part (@{$resource->parts()}) { |
$partscore = undef; |
$partscore = undef; |
my $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight', |
my $weight; |
$symb, |
if (!$awarded_only){ |
$student->{'domain'}, |
$weight = &Apache::lonnet::EXT('resource.'.$part.'.weight', |
$student->{'username'}, |
$symb, |
$student->{'section'}); |
$student->{'domain'}, |
|
$student->{'username'}, |
|
$student->{'section'}); |
|
} |
if (!defined($weight) || ($weight eq '')) { |
if (!defined($weight) || ($weight eq '')) { |
$weight=1; |
$weight=1; |
} |
} |
Line 1919 sub student_performance_on_sequence {
|
Line 2062 sub student_performance_on_sequence {
|
$hasdata = 1; |
$hasdata = 1; |
} |
} |
# |
# |
$partscore = $weight*$awarded; |
$partscore = &Apache::grades::compute_points($weight,$awarded); |
if (! defined($awarded)) { |
if (! defined($awarded)) { |
$partscore = undef; |
$partscore = undef; |
} |
} |
Line 1929 sub student_performance_on_sequence {
|
Line 2072 sub student_performance_on_sequence {
|
$symbol = sprintf("%.0f",$symbol); |
$symbol = sprintf("%.0f",$symbol); |
} |
} |
if (length($symbol) > 1) { |
if (length($symbol) > 1) { |
$symbol = '*'; |
$symbol = show_star($symbol); |
} |
} |
if (exists($resource_data->{'resource.'.$part.'.solved'})) { |
if (exists($resource_data->{'resource.'.$part.'.solved'}) && |
|
$resource_data->{'resource.'.$part.'.solved'} ne '') { |
my $status = $resource_data->{'resource.'.$part.'.solved'}; |
my $status = $resource_data->{'resource.'.$part.'.solved'}; |
if ($status eq 'excused') { |
if ($status eq 'excused') { |
$symbol = 'x'; |
$symbol = 'x'; |
$max -= $weight; # Do not count 'excused' problems. |
$max -= $weight; # Do not count 'excused' problems. |
|
} elsif ($status eq 'ungraded_attempted') { |
|
$symbol = 'u'; |
} |
} |
$hasdata = 1; |
$hasdata = 1; |
|
} elsif ($resource_data->{'resource.'.$part.'.award'} eq 'DRAFT') { |
|
$symbol = 'd'; |
|
$hasdata = 1; |
} elsif (!exists($resource_data->{'resource.'.$part.'.awarded'})){ |
} 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'})){ |
Line 1954 sub student_performance_on_sequence {
|
Line 2103 sub student_performance_on_sequence {
|
push (@ScoreData,$partscore); |
push (@ScoreData,$partscore); |
# |
# |
if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) { |
if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) { |
$symbol = '<a href="/adm/grades'. |
my $link = '/adm/grades' . |
'?symb='.&Apache::lonnet::escape($symb). |
'?symb='.&escape($symb). |
'&student='.$student->{'username'}. |
'&student='.$student->{'username'}. |
'&userdom='.$student->{'domain'}. |
'&userdom='.$student->{'domain'}. |
'&command=submission">'.$symbol.'</a>'; |
'&command=submission'; |
|
$symbol = &link($symbol, $link); |
} |
} |
$Str .= $symbol; |
$Str .= $symbol; |
} |
} |
Line 1986 problems.
|
Line 2136 problems.
|
####################################################### |
####################################################### |
sub CreateLegend { |
sub CreateLegend { |
my $Str = "<p><pre>". |
my $Str = "<p><pre>". |
" 1 correct by student in 1 try\n". |
" digit score or number of tries to get correct ". |
" 7 correct by student in 7 tries\n". |
|
" * correct by student in more than 9 tries\n". |
" * correct by student in more than 9 tries\n". |
" + correct by hand grading or override\n". |
" + correct by hand grading or override\n". |
" - incorrect by override\n". |
" - incorrect by override\n". |
" . incorrect attempted\n". |
" . incorrect attempted\n". |
" # ungraded attempted\n". |
" u ungraded attempted\n". |
|
" d draft answer saved but not submitted\n". |
" not attempted (blank field)\n". |
" not attempted (blank field)\n". |
" x excused". |
" x excused". |
"</pre><p>"; |
"</pre><p>"; |