";
$r->print($Str);
$r->rflush();
+
+ $r->print(<
+// 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;
+}
+
+JS
+
+ #
+ # Let the user know what we are doing
+ my $studentcount = scalar(@Apache::lonstatistics::Students);
+ if ($env{'form.SelectedStudent'}) {
+ $studentcount = '1';
+ }
+ #
+ # Initialize progress window
+ %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
+ ($r,'HTML Chart Status',
+ 'HTML Chart Progress', $studentcount,
+ 'inline',undef,'Statistics','stats_status');
+ #
+ &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
+ 'Processing first student');
return;
}
@@ -737,7 +829,7 @@ sub html_outputstudent {
my %StudentsData;
my @tmp = &Apache::loncoursedata::get_current_state
($student->{'username'},$student->{'domain'},undef,
- $ENV{'request.course.id'});
+ $env{'request.course.id'});
if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:/)) {
%StudentsData = @tmp;
}
@@ -753,7 +845,7 @@ sub html_outputstudent {
my $studentstats;
my $PerformanceStr = '';
foreach my $seq (@sequences) {
- &Apache::lonnet::logthis('computing student data for '.$seq->compTitle);
+ my $symb = $seq->symb;
my ($performance,$performance_length,$score,$seq_max,$rawdata);
if ($chosen_output->{'tries'}) {
($performance,$performance_length,$score,$seq_max,$rawdata) =
@@ -762,14 +854,17 @@ sub html_outputstudent {
} else {
($performance,$performance_length,$score,$seq_max,$rawdata) =
&student_performance_on_sequence($student,\%StudentsData,
- $navmap,$seq,$show_links);
+ $navmap,$seq,$show_links,
+ $chosen_output->{ignore_weight});
}
my $ratio='';
- if ($chosen_output->{'every_problem'}) {
+ if ($chosen_output->{'every_problem'} &&
+ $chosen_output->{'sequence_sum'}) {
$ratio .= ' ';
}
if ($chosen_output->{'sequence_sum'} && $score ne ' ') {
- $ratio .= sprintf("%3.0f",$score);
+ my $score .= sprintf("%3.0f",$score);
+ $ratio .= (' 'x(3-length($score))).$score;
} elsif($chosen_output->{'sequence_sum'}) {
$ratio .= ' 'x3;
}
@@ -784,15 +879,15 @@ sub html_outputstudent {
$performance = '';
$performance_length=0;
}
- $performance .= ' 'x($width{$seq->symb}->{'width_total'} -
+ $performance .= ' 'x($width{$symb}->{'width_total'} -
$performance_length -
- $width{$seq->symb}->{'width_sum'}).
+ $width{$symb}->{'width_sum'}).
$ratio;
#
$Str .= $performance.$padding;
#
- $studentstats->{$seq->symb}->{'score'}= $score;
- $studentstats->{$seq->symb}->{'max'} = $seq_max;
+ $studentstats->{$symb}->{'score'}= $score;
+ $studentstats->{$symb}->{'max'} = $seq_max;
}
#
# Total it up and store the statistics info.
@@ -812,6 +907,7 @@ sub html_outputstudent {
$score = ' ' x $total_sum_width;
} else {
$score = sprintf("%.0f",$score);
+ $score = (' 'x(3-length($score))).$score;
}
$Str .= ' '.' 'x($total_sum_width-length($score)).$score.' / '.$max;
$Str .= " \n";
@@ -819,6 +915,7 @@ sub html_outputstudent {
$r->print($Str);
#
$r->rflush();
+ &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
return;
}
@@ -836,7 +933,8 @@ sub html_finish {
}
}
$r->rflush();
- undef($navmap);
+ &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+ &html_cleanup();
return;
}
@@ -870,6 +968,7 @@ sub StudentAverageTotal {
}
sub SingleStudentTotal {
+ return if (! defined($navmap));
my $student = &Apache::lonstatistics::current_student();
my $Str = ''.&mt('Summary table for [_1] ([_2]@[_3])',
$student->{'fullname'},
@@ -887,7 +986,7 @@ sub SingleStudentTotal {
$Str .= ''.&mt('Maximum').' '."\n";
my $total = 0;
my $total_max = 0;
- foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+ foreach my $seq (@sequences) {
my $value = $Statistics->{$seq->symb}->{'score'};
my $max = $Statistics->{$seq->symb}->{'max'};
$Str .= ''.&HTML::Entities::encode($seq->compTitle).' '.
@@ -926,6 +1025,7 @@ sub SingleStudentTotal {
my $excel_sheet;
my $excel_workbook;
+my $format;
my $filename;
my $rows_output;
@@ -936,9 +1036,12 @@ my $request_aborted;
my $total_formula;
my $maximum_formula;
+my %formula_data;
-sub excel_initialize {
- my ($r) = @_;
+my $navmap;
+my @sequences;
+
+sub excel_cleanup {
#
undef ($excel_sheet);
undef ($excel_workbook);
@@ -950,12 +1053,31 @@ sub excel_initialize {
undef ($total_formula);
undef ($maximum_formula);
#
+ undef(%formula_data);
+ #
+ undef($navmap);
+ undef(@sequences);
+}
+
+sub excel_initialize {
+ my ($r) = @_;
+
+ &excel_cleanup();
+ ($navmap,@sequences) =
+ &Apache::lonstatistics::selected_sequences_with_assessments();
+ if (! ref($navmap)) {
+ # Unable to get data, so bail out
+ $r->print("".
+ &mt('Unable to retrieve course information.').
+ '
');
+ }
+ #
my $total_columns = scalar(&get_student_fields_to_show());
my $num_students = scalar(@Apache::lonstatistics::Students);
#
- foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+ foreach my $seq (@sequences) {
if ($chosen_output->{'every_problem'}) {
- $total_columns += $seq->{'num_assess_parts'};
+ $total_columns+=&count_parts($navmap,$seq);
}
# Add 2 because we need a 'sequence_sum' and 'total' column for each
$total_columns += 2;
@@ -975,9 +1097,6 @@ sub excel_initialize {
}
return if ($request_aborted);
#
- $filename = '/prtspool/'.
- $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
- time.'_'.rand(1000000000).'.xls';
#
$excel_workbook = undef;
$excel_sheet = undef;
@@ -993,7 +1112,7 @@ sub excel_initialize {
my $summary_header_row;
if ($chosen_output->{'summary_table'}) {
$summary_header_row = $rows_output++;
- $rows_output+= scalar(&Apache::lonstatistics::Sequences_with_Assess());
+ $rows_output+= scalar(@sequences);
$rows_output++;
}
my $sequence_name_row = $rows_output++;
@@ -1005,56 +1124,27 @@ sub excel_initialize {
my $first_data_row = $rows_output++;
#
# Create sheet
- $excel_workbook = Spreadsheet::WriteExcel->new('/home/httpd'.$filename);
- #
- # Check for errors
- if (! defined($excel_workbook)) {
- $r->log_error("Error creating excel spreadsheet $filename: $!");
- $r->print("Problems creating new Excel file. ".
- "This error has been logged. ".
- "Please alert your LON-CAPA administrator");
- return ;
- }
- #
- # The excel spreadsheet stores temporary data in files, then put them
- # together. If needed we should be able to disable this (memory only).
- # The temporary directory must be specified before calling 'addworksheet'.
- # File::Temp is used to determine the temporary directory.
- $excel_workbook->set_tempdir($Apache::lonnet::tmpdir);
- #
- my $format = &Apache::loncommon::define_excel_formats($excel_workbook);
+ ($excel_workbook,$filename,$format)=
+ &Apache::loncommon::create_workbook($r);
+ return if (! defined($excel_workbook));
#
# Add a worksheet
- my $sheetname = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+ my $sheetname = $env{'course.'.$env{'request.course.id'}.'.description'};
$sheetname = &Apache::loncommon::clean_excel_name($sheetname);
$excel_sheet = $excel_workbook->addworksheet($sheetname);
#
# Put the course description in the header
$excel_sheet->write($header_row,$cols_output++,
- $ENV{'course.'.$ENV{'request.course.id'}.'.description'},
+ $env{'course.'.$env{'request.course.id'}.'.description'},
$format->{'h1'});
$cols_output += 3;
#
# Put a description of the sections listed
my $sectionstring = '';
- my @Sections = @Apache::lonstatistics::SelectedSections;
- if (scalar(@Sections) > 1) {
- if (scalar(@Sections) > 2) {
- my $last = pop(@Sections);
- $sectionstring = "Sections ".join(', ',@Sections).', and '.$last;
- } else {
- $sectionstring = "Sections ".join(' and ',@Sections);
- }
- } else {
- if ($Sections[0] eq 'all') {
- $sectionstring = "All sections";
- } else {
- $sectionstring = "Section ".$Sections[0];
- }
- }
- $excel_sheet->write($header_row,$cols_output++,$sectionstring,
+ my @Sections = &Apache::lonstatistics::get_selected_sections();
+ $excel_sheet->write($header_row,$cols_output++,
+ &Apache::lonstatistics::section_and_enrollment_description('plaintext'),
$format->{'h3'});
- $cols_output += scalar(@Sections);
#
# Put the date in there too
$excel_sheet->write($header_row,$cols_output++,
@@ -1084,63 +1174,60 @@ sub excel_initialize {
# Add the remaining column headers
my $total_formula_string = '=0';
my $maximum_formula_string = '=0';
- foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+ foreach my $seq (@sequences) {
+ my $symb = $seq->symb;
$excel_sheet->write($sequence_name_row,,
- $cols_output,$seq->{'title'},$format->{'bold'});
+ $cols_output,$seq->compTitle,$format->{'bold'});
# Determine starting cell
- $seq->{'Excel:startcell'}=
+ $formula_data{$symb}->{'Excel:startcell'}=
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
($first_data_row,$cols_output);
- $seq->{'Excel:startcol'}=$cols_output;
+ $formula_data{$symb}->{'Excel:startcol'}=$cols_output;
my $count = 0;
if ($chosen_output->{'every_problem'}) {
# Put the names of the problems and parts into the sheet
- foreach my $res (@{$seq->{'contents'}}) {
- if ($res->{'type'} ne 'assessment' ||
- ! exists($res->{'parts'}) ||
- ref($res->{'parts'}) ne 'ARRAY' ||
- scalar(@{$res->{'parts'}}) < 1) {
- next;
- }
- if (scalar(@{$res->{'parts'}}) > 1) {
- foreach my $part (@{$res->{'parts'}}) {
+ foreach my $res (&get_resources($navmap,$seq)) {
+ if (scalar(@{$res->parts}) > 1) {
+ foreach my $part (@{$res->parts}) {
$excel_sheet->write($resource_name_row,
$cols_output++,
- $res->{'title'}.' part '.$part,
+ $res->compTitle.' part '.$res->part_display($part),
$format->{'bold'});
$count++;
}
} else {
$excel_sheet->write($resource_name_row,
$cols_output++,
- $res->{'title'},$format->{'bold'});
+ $res->compTitle,$format->{'bold'});
$count++;
}
}
}
# Determine ending cell
if ($count <= 1) {
- $seq->{'Excel:endcell'} = $seq->{'Excel:startcell'};
- $seq->{'Excel:endcol'} = $seq->{'Excel:startcol'};
+ $formula_data{$symb}->{'Excel:endcell'} = $formula_data{$symb}->{'Excel:startcell'};
+ $formula_data{$symb}->{'Excel:endcol'} = $formula_data{$symb}->{'Excel:startcol'};
} else {
- $seq->{'Excel:endcell'} =
+ $formula_data{$symb}->{'Excel:endcell'} =
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
($first_data_row,$cols_output-1);
- $seq->{'Excel:endcol'} = $cols_output-1;
+ $formula_data{$symb}->{'Excel:endcol'} = $cols_output-1;
}
# Create the formula for summing up this sequence
- if (! exists($seq->{'Excel:endcell'}) ||
- ! defined($seq->{'Excel:endcell'})) {
- $seq->{'Excel:endcell'} = $seq->{'Excel:startcell'};
- }
- $seq->{'Excel:sum'}= $excel_sheet->store_formula
- ('=SUM('.$seq->{'Excel:startcell'}.
- ':'.$seq->{'Excel:endcell'}.')');
+ if (! exists($formula_data{$symb}->{'Excel:endcell'}) ||
+ ! defined($formula_data{$symb}->{'Excel:endcell'})) {
+ $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
+ ("=IF(COUNT($start\:$end),SUM($start\:$end),\"\")");
# Determine cell the score is held in
- $seq->{'Excel:scorecell'} =
+ $formula_data{$symb}->{'Excel:scorecell'} =
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
($first_data_row,$cols_output);
- $seq->{'Excel:scorecol'}=$cols_output;
+ $formula_data{$symb}->{'Excel:scorecol'}=$cols_output;
if ($chosen_output->{'base'} eq 'parts correct total') {
$excel_sheet->write($resource_name_row,$cols_output++,
'parts correct',
@@ -1165,10 +1252,10 @@ sub excel_initialize {
$excel_sheet->write($resource_name_row,$cols_output,
'maximum',
$format->{'bold'});
- $seq->{'Excel:maxcell'} =
+ $formula_data{$symb}->{'Excel:maxcell'} =
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
($first_data_row,$cols_output);
- $seq->{'Excel:maxcol'}=$cols_output;
+ $formula_data{$symb}->{'Excel:maxcol'}=$cols_output;
$maximum_formula_string.='+'.
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
($first_data_row,$cols_output);
@@ -1204,23 +1291,23 @@ sub excel_initialize {
# Add the maximums for each sequence or assessment
my %total_cell_translation;
my %maximum_cell_translation;
- foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
- $cols_output=$seq->{'Excel:startcol'};
- $total_cell_translation{$seq->{'Excel:scorecell'}} =
+ foreach my $seq (@sequences) {
+ my $symb = $seq->symb;
+ $cols_output=$formula_data{$symb}->{'Excel:startcol'};
+ $total_cell_translation{$formula_data{$symb}->{'Excel:scorecell'}}=
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
- ($maximum_data_row,$seq->{'Excel:scorecol'});
- $maximum_cell_translation{$seq->{'Excel:maxcell'}} =
+ ($maximum_data_row,$formula_data{$symb}->{'Excel:scorecol'});
+ $maximum_cell_translation{$formula_data{$symb}->{'Excel:maxcell'}}=
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
- ($maximum_data_row,$seq->{'Excel:maxcol'});
+ ($maximum_data_row,$formula_data{$symb}->{'Excel:maxcol'});
my $weight;
my $max = 0;
- foreach my $resource (@{$seq->{'contents'}}) {
- next if ($resource->{'type'} ne 'assessment');
- foreach my $part (@{$resource->{'parts'}}) {
+ foreach my $resource (&get_resources($navmap,$seq)) {
+ foreach my $part (@{$resource->parts}){
$weight = 1;
if ($chosen_output->{'scores'}) {
$weight = &Apache::lonnet::EXT
- ('resource.'.$part.'.weight',$resource->{'symb'},
+ ('resource.'.$part.'.weight',$resource->symb,
undef,undef,undef);
if (!defined($weight) || ($weight eq '')) {
$weight=1;
@@ -1238,13 +1325,13 @@ sub excel_initialize {
if ($chosen_output->{'sequence_sum'} &&
$chosen_output->{'every_problem'}) {
my %replaceCells=
- ('^'.$seq->{'Excel:startcell'}.':'.
- $seq->{'Excel:endcell'}.'$' =>
- &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell($maximum_data_row,$seq->{'Excel:startcol'}).':'.
- &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell($maximum_data_row,$seq->{'Excel:endcol'}));
+ ('^'.$formula_data{$symb}->{'Excel:startcell'}.':'.
+ $formula_data{$symb}->{'Excel:endcell'}.'$' =>
+ &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell($maximum_data_row,$formula_data{$symb}->{'Excel:startcol'}).':'.
+ &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell($maximum_data_row,$formula_data{$symb}->{'Excel:endcol'}));
$excel_sheet->repeat_formula($maximum_data_row,$cols_output++,
- $seq->{'Excel:sum'},undef,
- %replaceCells);
+ $formula_data{$symb}->{'Excel:sum'},undef,
+ %replaceCells, %replaceCells);
} elsif ($chosen_output->{'sequence_sum'}) {
$excel_sheet->write($maximum_data_row,$cols_output++,$max);
@@ -1284,25 +1371,26 @@ sub excel_initialize {
$excel_sheet->write($summary_header_row,$cols_output++,
'Std Dev',$format->{'bold'});
my $row = $summary_header_row+1;
- foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+ foreach my $seq (@sequences) {
+ my $symb = $seq->symb;
$cols_output = 0;
$excel_sheet->write($row,$cols_output++,
- $seq->{'title'},
+ $seq->compTitle,
$format->{'bold'});
if ($chosen_output->{'maximum_row'}) {
$excel_sheet->write
($row,$cols_output++,
'='.
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
- ($maximum_data_row,$seq->{'Excel:scorecol'})
+ ($maximum_data_row,$formula_data{$symb}->{'Excel:scorecol'})
);
}
my $range =
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
- ($first_data_row,$seq->{'Excel:scorecol'}).
+ ($first_data_row,$formula_data{$symb}->{'Excel:scorecol'}).
':'.
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
- ($first_data_row+$num_students-1,$seq->{'Excel:scorecol'});
+ ($first_data_row+$num_students-1,$formula_data{$symb}->{'Excel:scorecol'});
$excel_sheet->write($row,$cols_output++,
'=AVERAGE('.$range.')');
$excel_sheet->write($row,$cols_output++,
@@ -1318,7 +1406,7 @@ sub excel_initialize {
#
# Let the user know what we are doing
my $studentcount = scalar(@Apache::lonstatistics::Students);
- if ($ENV{'form.SelectedStudent'}) {
+ if ($env{'form.SelectedStudent'}) {
$studentcount = '1';
}
if ($studentcount > 1) {
@@ -1344,8 +1432,9 @@ sub excel_initialize {
sub excel_outputstudent {
my ($r,$student) = @_;
- return if ($request_aborted);
- return if (! defined($excel_sheet));
+ if ($request_aborted || ! defined($navmap) || ! defined($excel_sheet)) {
+ return;
+ }
$cols_output=0;
#
# Write out student data
@@ -1353,7 +1442,7 @@ sub excel_outputstudent {
foreach my $field (@to_show) {
my $value = $student->{$field};
if ($field eq 'comments') {
- $value = &Apache::lonmsg::retrieve_instructor_comments
+ $value = &Apache::lonmsgdisplay::retrieve_instructor_comments
($student->{'username'},$student->{'domain'});
}
$excel_sheet->write($rows_output,$cols_output++,$value);
@@ -1364,7 +1453,7 @@ sub excel_outputstudent {
my @tmp = &Apache::loncoursedata::get_current_state($student->{'username'},
$student->{'domain'},
undef,
- $ENV{'request.course.id'});
+ $env{'request.course.id'});
if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:/)) {
%StudentsData = @tmp;
}
@@ -1372,33 +1461,36 @@ sub excel_outputstudent {
# Write out sequence scores and totals data
my %total_cell_translation;
my %maximum_cell_translation;
- foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
- $cols_output = $seq->{'Excel:startcol'};
+ foreach my $seq (@sequences) {
+ my $symb = $seq->symb;
+ $cols_output = $formula_data{$symb}->{'Excel:startcol'};
# Keep track of cells to translate in total cell
- $total_cell_translation{$seq->{'Excel:scorecell'}} =
+ $total_cell_translation{$formula_data{$symb}->{'Excel:scorecell'}} =
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
- ($rows_output,$seq->{'Excel:scorecol'});
+ ($rows_output,$formula_data{$symb}->{'Excel:scorecol'});
# and maximum cell
- $maximum_cell_translation{$seq->{'Excel:maxcell'}} =
+ $maximum_cell_translation{$formula_data{$symb}->{'Excel:maxcell'}} =
&Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell
- ($rows_output,$seq->{'Excel:maxcol'});
+ ($rows_output,$formula_data{$symb}->{'Excel:maxcol'});
#
my ($performance,$performance_length,$score,$seq_max,$rawdata);
if ($chosen_output->{'tries'} || $chosen_output->{'correct'}){
($performance,$performance_length,$score,$seq_max,$rawdata) =
- &StudentTriesOnSequence($student,\%StudentsData,
- $seq,'no');
+ &student_tries_on_sequence($student,\%StudentsData,
+ $navmap,$seq,'no');
} else {
($performance,$performance_length,$score,$seq_max,$rawdata) =
- &StudentPerformanceOnSequence($student,\%StudentsData,
- $seq,'no');
+ &student_performance_on_sequence($student,\%StudentsData,
+ $navmap,$seq,'no',
+ $chosen_output->{ignore_weight});
}
if ($chosen_output->{'every_problem'}) {
if ($chosen_output->{'correct'}) {
# only indiciate if each item is correct or not
foreach my $value (@$rawdata) {
- # nonzero means correct
- $value = 1 if ($value > 0);
+ # positive means correct, 0 or negative means
+ # incorrect
+ $value = $value > 0 ? 1 : 0;
$excel_sheet->write($rows_output,$cols_output++,$value);
}
} else {
@@ -1416,15 +1508,15 @@ sub excel_outputstudent {
$chosen_output->{'every_problem'}) {
# Write a formula for the sum of this sequence
my %replaceCells=
- ('^'.$seq->{'Excel:startcell'}.':'.$seq->{'Excel:endcell'}.'$'
+ ('^'.$formula_data{$symb}->{'Excel:startcell'}.':'.$formula_data{$symb}->{'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:endcol'})
+ &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell($rows_output,$formula_data{$symb}->{'Excel:startcol'}).':'.
+ &Spreadsheet::WriteExcel::Utility::xl_rowcol_to_cell($rows_output,$formula_data{$symb}->{'Excel:endcol'})
);
# The undef is for the format
$excel_sheet->repeat_formula($rows_output,$cols_output++,
- $seq->{'Excel:sum'},undef,
- %replaceCells);
+ $formula_data{$symb}->{'Excel:sum'},undef,
+ %replaceCells, %replaceCells);
} elsif ($chosen_output->{'sequence_sum'}) {
if ($score eq ' ') {
$cols_output++;
@@ -1459,14 +1551,13 @@ sub excel_outputstudent {
sub excel_finish {
my ($r) = @_;
- return if ($request_aborted);
- return if (! defined($excel_sheet));
+ if ($request_aborted || ! defined($navmap) || ! defined($excel_sheet)) {
+ &excel_cleanup();
+ return;
+ }
#
# Write the excel file
$excel_workbook->close();
- my $c = $r->connection();
- #
- return if($c->aborted());
#
# Close the progress window
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
@@ -1475,6 +1566,7 @@ sub excel_finish {
$r->print('
'.
'Your Excel spreadsheet.'."\n");
$r->rflush();
+ &excel_cleanup();
return;
}
@@ -1502,16 +1594,32 @@ my $outputfile;
my $filename;
my $request_aborted;
my %prog_state; # progress window state
+my $navmap;
+my @sequences;
-sub csv_initialize{
- my ($r) = @_;
- #
- # Clean up
+sub csv_cleanup {
undef($outputfile);
undef($filename);
undef($request_aborted);
undef(%prog_state);
#
+ undef($navmap);
+ undef(@sequences);
+}
+
+sub csv_initialize{
+ my ($r) = @_;
+
+ &csv_cleanup();
+ ($navmap,@sequences) =
+ &Apache::lonstatistics::selected_sequences_with_assessments();
+ if (! ref($navmap)) {
+ # Unable to get data, so bail out
+ $r->print("".
+ &mt('Unable to retrieve course information.').
+ '
');
+ }
+ #
# Deal with unimplemented requests
$request_aborted = undef;
if ($chosen_output->{'base'} =~ /final table/) {
@@ -1533,22 +1641,18 @@ END
'inline',undef,'Statistics','stats_status');
#
# Open a file
- $filename = '/prtspool/'.
- $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
- time.'_'.rand(1000000000).'.csv';
- unless ($outputfile = Apache::File->new('>/home/httpd'.$filename)) {
- $r->log_error("Couldn't open $filename for output $!");
- $r->print("Problems occured in writing the csv file. ".
- "This error has been logged. ".
- "Please alert your LON-CAPA administrator.");
- $outputfile = undef;
- }
+ ($outputfile,$filename) = &Apache::loncommon::create_text_file($r,'csv');
+ if (! defined($outputfile)) { return ''; }
#
# Datestamp
- my $description = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+ my $description = $env{'course.'.$env{'request.course.id'}.'.description'};
print $outputfile '"'.&Apache::loncommon::csv_translate($description).'",'.
'"'.&Apache::loncommon::csv_translate(scalar(localtime(time))).'"'.
"\n";
+ print $outputfile '"'.
+ &Apache::loncommon::csv_translate
+ (&Apache::lonstatistics::section_and_enrollment_description()).
+ '"'."\n";
foreach my $item ('shortdesc','non_html_notes') {
next if (! exists($chosen_output->{$item}));
print $outputfile
@@ -1563,23 +1667,19 @@ END
$sequence_row .='"",';
$resource_row .= '"'.&Apache::loncommon::csv_translate($field).'",';
}
- foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+ foreach my $seq (@sequences) {
$sequence_row .= '"'.
- &Apache::loncommon::csv_translate($seq->{'title'}).'",';
+ &Apache::loncommon::csv_translate($seq->compTitle).'",';
my $count = 0;
if ($chosen_output->{'every_problem'}) {
- foreach my $res (@{$seq->{'contents'}}) {
- if ($res->{'type'} ne 'assessment' ||
- ! exists($res->{'parts'}) ||
- ref($res->{'parts'}) ne 'ARRAY' ||
- scalar(@{$res->{'parts'}}) < 1) {
+ foreach my $res (&get_resources($navmap,$seq)) {
+ if (scalar(@{$res->parts}) < 1) {
next;
}
- foreach my $part (@{$res->{'parts'}}) {
+ foreach my $part (@{$res->parts}) {
$resource_row .= '"'.
- &Apache::loncommon::csv_translate($res->{'title'}.
- ', Part '.$part
- ).'",';
+ &Apache::loncommon::csv_translate
+ ($res->compTitle.', Part '.$res->part_display($part)).'",';
$count++;
}
}
@@ -1614,8 +1714,9 @@ END
sub csv_outputstudent {
my ($r,$student) = @_;
- return if ($request_aborted);
- return if (! defined($outputfile));
+ if ($request_aborted || ! defined($navmap) || ! defined($outputfile)) {
+ return;
+ }
my $Str = '';
#
# Output student fields
@@ -1623,7 +1724,7 @@ sub csv_outputstudent {
foreach my $field (@to_show) {
my $value = $student->{$field};
if ($field eq 'comments') {
- $value = &Apache::lonmsg::retrieve_instructor_comments
+ $value = &Apache::lonmsgdisplay::retrieve_instructor_comments
($student->{'username'},$student->{'domain'});
}
$Str .= '"'.&Apache::loncommon::csv_translate($value).'",';
@@ -1634,7 +1735,7 @@ sub csv_outputstudent {
my @tmp = &Apache::loncoursedata::get_current_state($student->{'username'},
$student->{'domain'},
undef,
- $ENV{'request.course.id'});
+ $env{'request.course.id'});
if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:/)) {
%StudentsData = @tmp;
}
@@ -1642,16 +1743,17 @@ sub csv_outputstudent {
# Output performance data
my $total = 0;
my $maximum = 0;
- foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+ foreach my $seq (@sequences) {
my ($performance,$performance_length,$score,$seq_max,$rawdata);
if ($chosen_output->{'tries'}){
($performance,$performance_length,$score,$seq_max,$rawdata) =
- &StudentTriesOnSequence($student,\%StudentsData,
- $seq,'no');
+ &student_tries_on_sequence($student,\%StudentsData,
+ $navmap,$seq,'no');
} else {
($performance,$performance_length,$score,$seq_max,$rawdata) =
- &StudentPerformanceOnSequence($student,\%StudentsData,
- $seq,'no');
+ &student_performance_on_sequence($student,\%StudentsData,
+ $navmap,$seq,'no',
+ $chosen_output->{ignore_weight});
}
if ($chosen_output->{'every_problem'}) {
if ($chosen_output->{'correct'}) {
@@ -1694,13 +1796,12 @@ sub csv_outputstudent {
sub csv_finish {
my ($r) = @_;
- return if ($request_aborted);
- return if (! defined($outputfile));
+ if ($request_aborted || ! defined($navmap) || ! defined($outputfile)) {
+ &csv_cleanup();
+ return;
+ }
close($outputfile);
#
- my $c = $r->connection();
- return if ($c->aborted());
- #
# Close the progress window
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
#
@@ -1708,12 +1809,25 @@ sub csv_finish {
$r->print('
'.
''.&mt('Your csv file.').''."\n");
$r->rflush();
+ &csv_cleanup();
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 "$symbol";
+}
+
#######################################################
#######################################################
@@ -1748,9 +1862,7 @@ sub student_tries_on_sequence {
my @TriesData = ();
my $tries;
my $hasdata = 0; # flag - true if the student has any data on the sequence
- my @resources =
- $navmap->retrieveResources($seq,sub { shift->is_problem(); },0,0,0);
- foreach my $resource (@resources) {
+ foreach my $resource (&get_resources($navmap,$seq)) {
my $resource_data = $studentdata->{$resource->symb};
my $value = '';
foreach my $partnum (@{$resource->parts()}) {
@@ -1786,7 +1898,7 @@ sub student_tries_on_sequence {
$sum++;
} elsif ($tries > 0) {
if ($tries > 9) {
- $symbol = '*';
+ $symbol = show_star($tries);
} else {
$symbol = $tries;
}
@@ -1803,7 +1915,7 @@ sub student_tries_on_sequence {
} elsif ($status eq 'incorrect_by_override') {
$symbol = '-';
} elsif ($status eq 'ungraded_attempted') {
- $symbol = '#';
+ $symbol = 'u';
} elsif ($status eq 'incorrect_attempted' ||
$tries > 0) {
$symbol = '.';
@@ -1829,11 +1941,12 @@ sub student_tries_on_sequence {
if (length($symbol) > 1) {
&Apache::lonnet::logthis('length of symbol "'.$symbol.'" > 1');
}
- $symbol = ''.$symbol.'';
+ '&command=submission';
+ $symbol = &link($symbol, $link);
}
$value .= $symbol;
}
@@ -1848,12 +1961,43 @@ sub student_tries_on_sequence {
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
+ "$text";
+}
+
#######################################################
#######################################################
=pod
-=item &StudentPerformanceOnSequence()
+=item &student_performance_on_sequence
Inputs:
@@ -1874,7 +2018,7 @@ Inputs:
#######################################################
#######################################################
sub student_performance_on_sequence {
- my ($student,$studentdata,$navmap,$seq,$links) = @_;
+ my ($student,$studentdata,$navmap,$seq,$links,$awarded_only) = @_;
$links = 'no' if (! defined($links));
my $Str = ''; # final result string
my ($score,$max) = (0,0);
@@ -1883,18 +2027,19 @@ sub student_performance_on_sequence {
my @ScoreData = ();
my $partscore;
my $hasdata = 0; # flag, 0 if there were no submissions on the sequence
- my @resources =
- $navmap->retrieveResources($seq,sub { shift->is_problem(); },0,0,0);
- foreach my $resource (@resources) {
+ foreach my $resource (&get_resources($navmap,$seq)) {
my $symb = $resource->symb;
my $resource_data = $studentdata->{$symb};
foreach my $part (@{$resource->parts()}) {
$partscore = undef;
- my $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight',
- $symb,
- $student->{'domain'},
- $student->{'username'},
- $student->{'section'});
+ my $weight;
+ if (!$awarded_only){
+ $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight',
+ $symb,
+ $student->{'domain'},
+ $student->{'username'},
+ $student->{'section'});
+ }
if (!defined($weight) || ($weight eq '')) {
$weight=1;
}
@@ -1910,7 +2055,7 @@ sub student_performance_on_sequence {
$hasdata = 1;
}
#
- $partscore = $weight*$awarded;
+ $partscore = &Apache::grades::compute_points($weight,$awarded);
if (! defined($awarded)) {
$partscore = undef;
}
@@ -1920,15 +2065,21 @@ sub student_performance_on_sequence {
$symbol = sprintf("%.0f",$symbol);
}
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'};
if ($status eq 'excused') {
$symbol = 'x';
$max -= $weight; # Do not count 'excused' problems.
+ } elsif ($status eq 'ungraded_attempted') {
+ $symbol = 'u';
}
$hasdata = 1;
+ } elsif ($resource_data->{'resource.'.$part.'.award'} eq 'DRAFT') {
+ $symbol = 'd';
+ $hasdata = 1;
} elsif (!exists($resource_data->{'resource.'.$part.'.awarded'})){
# Unsolved. Did they try?
if (exists($resource_data->{'resource.'.$part.'.tries'})){
@@ -1945,11 +2096,12 @@ sub student_performance_on_sequence {
push (@ScoreData,$partscore);
#
if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) {
- $symbol = ''.$symbol.'';
+ '&command=submission';
+ $symbol = &link($symbol, $link);
}
$Str .= $symbol;
}
@@ -1977,13 +2129,13 @@ problems.
#######################################################
sub CreateLegend {
my $Str = "".
- " 1 correct by student in 1 try\n".
- " 7 correct by student in 7 tries\n".
+ " digit score or number of tries to get correct ".
" * correct by student in more than 9 tries\n".
" + correct by hand grading or override\n".
" - incorrect by override\n".
" . incorrect attempted\n".
- " # ungraded attempted\n".
+ " u ungraded attempted\n".
+ " d draft answer saved but not submitted\n".
" not attempted (blank field)\n".
" x excused".
"";