version 1.125, 2005/08/26 21:53:23
|
version 1.131, 2006/02/27 19:40:30
|
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 781 sub html_outputstudent {
|
Line 786 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 1150 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 1239 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 1263 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 1413 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 1448 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 1684 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 1895 Inputs:
|
Line 1906 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 1920 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 1943 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; |
} |
} |