version 1.125, 2005/08/26 21:53:23
|
version 1.135, 2006/03/21 16:49:59
|
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 Apache::grades; |
use Time::HiRes; |
use Time::HiRes; |
use Spreadsheet::WriteExcel; |
use Spreadsheet::WriteExcel; |
use Spreadsheet::WriteExcel::Utility(); |
use Spreadsheet::WriteExcel::Utility(); |
Line 472 my @OutputDataOptions =
|
Line 473 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 492 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 510 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 528 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 645 sub html_initialize {
|
Line 650 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 714 sub html_initialize {
|
Line 731 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 781 sub html_outputstudent {
|
Line 853 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 1144 sub excel_initialize {
|
Line 1217 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 1231 sub excel_initialize {
|
Line 1306 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 1255 sub excel_initialize {
|
Line 1330 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 1405 sub excel_outputstudent {
|
Line 1480 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 1438 sub excel_outputstudent {
|
Line 1515 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 1674 sub csv_outputstudent {
|
Line 1751 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 1737 sub csv_finish {
|
Line 1815 sub csv_finish {
|
|
|
} |
} |
|
|
|
# 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 1807 sub student_tries_on_sequence {
|
Line 1897 sub student_tries_on_sequence {
|
$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 1850 sub student_tries_on_sequence {
|
Line 1940 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='.&Apache::lonnet::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 1869 sub student_tries_on_sequence {
|
Line 1960 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 1895 Inputs:
|
Line 2017 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 1909 sub student_performance_on_sequence {
|
Line 2031 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 1929 sub student_performance_on_sequence {
|
Line 2054 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 1939 sub student_performance_on_sequence {
|
Line 2064 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 '') { |
$resource_data->{'resource.'.$part.'.solved'} ne '') { |
Line 1970 sub student_performance_on_sequence {
|
Line 2095 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='.&Apache::lonnet::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; |
} |
} |