';
return $Str;
}
@@ -435,14 +448,9 @@ sub CreateAndParseOutputSelector {
[$elementname]);
#
# Format for output options is 'mode, restrictions';
- my $selected = 'html, without links';
- if (exists($ENV{'form.'.$elementname})) {
- if (ref($ENV{'form.'.$elementname} eq 'ARRAY')) {
- $selected = $ENV{'form.'.$elementname}->[0];
- } else {
- $selected = $ENV{'form.'.$elementname};
- }
- }
+ my $selected = (&Apache::loncommon::get_env_multiple('form.'.$elementname))[0];
+ $selected = 'html, without links' if (!$selected);
+
#
# Set package variables describing output mode
$show_links = 'no';
@@ -482,6 +490,7 @@ my @OutputDataOptions =
grand_maximum => 1,
summary_table => 1,
maximum_row => 1,
+ ignore_weight => 0,
shortdesc => 'Total Score and Maximum Possible for each '.
'Sequence or Folder',
longdesc => 'The score of each student as well as the '.
@@ -500,6 +509,7 @@ my @OutputDataOptions =
grand_maximum => 1,
summary_table => 1,
maximum_row => 1,
+ ignore_weight => 0,
shortdesc => 'Score on each Problem Part',
longdesc =>'The students score on each problem part, computed as'.
'the part weight * part awarded',
@@ -517,6 +527,7 @@ my @OutputDataOptions =
grand_maximum => 0,
summary_table => 0,
maximum_row => 0,
+ ignore_weight => 0,
shortdesc => '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',
@@ -534,7 +545,8 @@ my @OutputDataOptions =
grand_maximum => 1,
summary_table => 1,
maximum_row => 0,
- shortdesc => 'Number of Problem Parts completed successfully.',
+ ignore_weight => 1,
+ shortdesc => 'Number of Problem Parts completed successfully',
longdesc => 'The Number of Problem Parts completed successfully and '.
'the maximum possible for each student',
},
@@ -542,7 +554,7 @@ my @OutputDataOptions =
sub HTMLifyOutputDataDescriptions {
my $Str = '';
- $Str .= "
Output Data
\n";
+ $Str .= "
'.&mt('Output Data').'
\n";
$Str .= "
\n";
foreach my $option (@OutputDataOptions) {
$Str .= '
'.$option->{'name'}.'
';
@@ -556,14 +568,9 @@ sub CreateAndParseOutputDataSelector {
my $Str = '';
my $elementname = 'chartoutputdata';
#
- my $selected = 'scores';
- if (exists($ENV{'form.'.$elementname})) {
- if (ref($ENV{'form.'.$elementname} eq 'ARRAY')) {
- $selected = $ENV{'form.'.$elementname}->[0];
- } else {
- $selected = $ENV{'form.'.$elementname};
- }
- }
+ my $selected = (&Apache::loncommon::get_env_multiple('form.'.$elementname))[0];
+ $selected = 'scores' if (!$selected);
+
#
$chosen_output = $OutputDataOptions[0];
foreach my $option (@OutputDataOptions) {
@@ -586,6 +593,26 @@ sub CreateAndParseOutputDataSelector {
#######################################################
#######################################################
+sub count_parts {
+ my ($navmap,$sequence) = @_;
+ my @resources = &get_resources($navmap,$sequence);
+ my $count = 0;
+ foreach my $res (@resources) {
+ $count += scalar(@{$res->parts});
+ }
+ return $count;
+}
+
+sub get_resources {
+ my ($navmap,$sequence) = @_;
+ my @resources = $navmap->retrieveResources($sequence,
+ sub { shift->is_problem(); },
+ 0,0,0);
+ return @resources;
+}
+
+#######################################################
+#######################################################
=pod
@@ -613,19 +640,53 @@ Return a line of the chart for a student
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_cleanup {
+ undef(%prog_state);
+ undef(%width);
+ #
+ undef($navmap);
+ undef(@sequences);
+}
+
sub html_initialize {
my ($r) = @_;
#
$padding = ' 'x3;
$count = 0;
$nodata_count = 0;
- undef(%prog_state);
- #
- $r->print("
");
+ &html_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.')
+ .'
');
+ }
+
+ # If we're showing links, show a checkbox to open in new
+ # windows.
+ if ($show_links ne 'no') {
+ my $labeltext = &mt('Show links in new window');
+ $r->print(<new_window = true;
+
+NEW_WINDOW_CHECKBOX
+ }
+ #
+ $r->print("
'.
+ &Apache::loncommon::end_data_table_row()."\n";
+ $Str .= &Apache::loncommon::end_data_table()."\n";
return $Str;
}
@@ -893,6 +1061,7 @@ sub SingleStudentTotal {
my $excel_sheet;
my $excel_workbook;
+my $format;
my $filename;
my $rows_output;
@@ -903,9 +1072,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);
@@ -917,12 +1089,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;
@@ -942,9 +1133,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;
@@ -960,7 +1148,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++;
@@ -972,64 +1160,35 @@ 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++,
- 'Compiled on '.localtime(time),$format->{'h3'});
+ &mt('Compiled on [_1]',&Apache::lonlocal::locallocaltime(time)),$format->{'h3'});
#
$cols_output = 0;
$excel_sheet->write($description_row,$cols_output++,
- $chosen_output->{'shortdesc'},
+ &mt($chosen_output->{'shortdesc'}),
$format->{'b'});
#
$cols_output = 0;
@@ -1051,76 +1210,73 @@ 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',
+ &mt('parts correct'),
$format->{'bold'});
} elsif ($chosen_output->{'sequence_sum'}) {
if ($chosen_output->{'correct'}) {
# Only reporting the number correct, so do not call it score
$excel_sheet->write($resource_name_row,$cols_output++,
- 'sum',
+ &mt('sum'),
$format->{'bold'});
} else {
$excel_sheet->write($resource_name_row,$cols_output++,
- 'score',
+ &mt('score'),
$format->{'bold'});
}
}
@@ -1130,12 +1286,12 @@ sub excel_initialize {
($first_data_row,$cols_output-1);
if ($chosen_output->{'sequence_max'}) {
$excel_sheet->write($resource_name_row,$cols_output,
- 'maximum',
+ &mt('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);
@@ -1144,11 +1300,11 @@ sub excel_initialize {
}
}
if ($chosen_output->{'grand_total'}) {
- $excel_sheet->write($resource_name_row,$cols_output++,'Total',
+ $excel_sheet->write($resource_name_row,$cols_output++,&mt('Total'),
$format->{'bold'});
}
if ($chosen_output->{'grand_maximum'}) {
- $excel_sheet->write($resource_name_row,$cols_output++,'Max. Total',
+ $excel_sheet->write($resource_name_row,$cols_output++,&mt('Max. Total'),
$format->{'bold'});
}
$total_formula = $excel_sheet->store_formula($total_formula_string);
@@ -1171,23 +1327,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;
@@ -1205,13 +1361,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);
@@ -1239,37 +1395,38 @@ sub excel_initialize {
if ($chosen_output->{'summary_table'}) {
$cols_output = 0;
$excel_sheet->write($summary_header_row,$cols_output++,
- 'Summary Table',$format->{'bold'});
+ &mt('Summary Table'),$format->{'bold'});
if ($chosen_output->{'maximum_row'}) {
$excel_sheet->write($summary_header_row,$cols_output++,
- 'Maximum',$format->{'bold'});
+ &mt('Maximum'),$format->{'bold'});
}
$excel_sheet->write($summary_header_row,$cols_output++,
- 'Average',$format->{'bold'});
+ &mt('Average'),$format->{'bold'});
$excel_sheet->write($summary_header_row,$cols_output++,
- 'Median',$format->{'bold'});
+ &mt('Median'),$format->{'bold'});
$excel_sheet->write($summary_header_row,$cols_output++,
- 'Std Dev',$format->{'bold'});
+ &mt('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++,
@@ -1285,17 +1442,13 @@ 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) {
- $r->print('
'.&mt('Compiling Excel spreadsheet for [_1] students',
- $studentcount)."
\n");
- } else {
- $r->print('
'.
- &mt('Compiling Excel spreadsheet for 1 student').
- "
\n");
- }
+ $r->print('
'
+ .&mt('Compiling Excel spreadsheet for [quant,_1,student]...',$studentcount)
+ ."
\n"
+ );
$r->rflush();
#
# Initialize progress window
@@ -1311,8 +1464,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
@@ -1320,7 +1474,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);
@@ -1331,7 +1485,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;
}
@@ -1339,33 +1493,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 {
@@ -1383,15 +1540,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++;
@@ -1426,22 +1583,22 @@ 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);
#
# Tell the user where to get their excel file
$r->print(' '.
- 'Your Excel spreadsheet.'."\n");
+ ''.&mt('Your Excel spreadsheet').''."\n");
$r->rflush();
+ &excel_cleanup();
return;
}
@@ -1469,16 +1626,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/) {
@@ -1500,22 +1673,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
@@ -1530,23 +1699,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++;
}
}
@@ -1554,23 +1719,23 @@ END
$sequence_row.='"",'x$count;
if ($chosen_output->{'sequence_sum'}) {
if($chosen_output->{'correct'}) {
- $resource_row .= '"sum",';
+ $resource_row .= '"'.&mt('sum').'",';
} else {
- $resource_row .= '"score",';
+ $resource_row .= '"'.&mt('score').'",';
}
}
if ($chosen_output->{'sequence_max'}) {
$sequence_row.= '"",';
- $resource_row .= '"maximum possible",';
+ $resource_row .= '"'.&mt('maximum possible').'",';
}
}
if ($chosen_output->{'grand_total'}) {
$sequence_row.= '"",';
- $resource_row.= '"Total",';
+ $resource_row.= '"'.&mt('Total').'",';
}
if ($chosen_output->{'grand_maximum'}) {
$sequence_row.= '"",';
- $resource_row.= '"Maximum",';
+ $resource_row.= '"'.&mt('Maximum').'",';
}
chomp($sequence_row);
chomp($resource_row);
@@ -1581,8 +1746,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
@@ -1590,7 +1756,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).'",';
@@ -1601,7 +1767,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;
}
@@ -1609,16 +1775,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'}) {
@@ -1661,26 +1828,38 @@ 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);
#
# Tell the user where to get their csv file
$r->print(' '.
- ''.&mt('Your csv file.').''."\n");
+ ''.&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";
+}
+
#######################################################
#######################################################
@@ -1706,8 +1885,8 @@ Inputs:
#######################################################
#######################################################
-sub StudentTriesOnSequence {
- my ($student,$studentdata,$seq,$links) = @_;
+sub student_tries_on_sequence {
+ my ($student,$studentdata,$navmap,$seq,$links) = @_;
$links = 'no' if (! defined($links));
my $Str = '';
my ($sum,$max) = (0,0);
@@ -1715,11 +1894,10 @@ sub StudentTriesOnSequence {
my @TriesData = ();
my $tries;
my $hasdata = 0; # flag - true if the student has any data on the sequence
- foreach my $resource (@{$seq->{'contents'}}) {
- next if ($resource->{'type'} ne 'assessment');
- my $resource_data = $studentdata->{$resource->{'symb'}};
+ foreach my $resource (&get_resources($navmap,$seq)) {
+ my $resource_data = $studentdata->{$resource->symb};
my $value = '';
- foreach my $partnum (@{$resource->{'parts'}}) {
+ foreach my $partnum (@{$resource->parts()}) {
$tries = undef;
$max++;
$performance_length++;
@@ -1747,12 +1925,12 @@ sub StudentTriesOnSequence {
if ($status eq 'excused') {
$symbol = 'x';
$max--;
- } elsif ($status eq 'correct_by_override') {
+ } elsif ($status eq 'correct_by_override' && !$resource->is_task()) {
$symbol = '+';
$sum++;
} elsif ($tries > 0) {
if ($tries > 9) {
- $symbol = '*';
+ $symbol = show_star($tries);
} else {
$symbol = $tries;
}
@@ -1769,7 +1947,7 @@ sub StudentTriesOnSequence {
} elsif ($status eq 'incorrect_by_override') {
$symbol = '-';
} elsif ($status eq 'ungraded_attempted') {
- $symbol = '#';
+ $symbol = 'u';
} elsif ($status eq 'incorrect_attempted' ||
$tries > 0) {
$symbol = '.';
@@ -1792,21 +1970,19 @@ sub StudentTriesOnSequence {
#
if ( ($links eq 'yes' && $symbol ne ' ') ||
($links eq 'all')) {
- if (length($symbol) > 1) {
- &Apache::lonnet::logthis('length of symbol "'.$symbol.'" > 1');
- }
- $symbol = ''.$symbol.'';
+ '&command=submission';
+ $symbol = &link($symbol, $link);
}
$value .= $symbol;
}
$Str .= $value;
}
- if ($seq->{'randompick'}) {
- $max = $seq->{'randompick'};
+ if ($seq->randompick()) {
+ $max = $seq->randompick();
}
if (! $hasdata && $sum == 0) {
$sum = ' ';
@@ -1814,12 +1990,43 @@ sub StudentTriesOnSequence {
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:
@@ -1839,8 +2046,8 @@ Inputs:
#######################################################
#######################################################
-sub StudentPerformanceOnSequence {
- my ($student,$studentdata,$seq,$links) = @_;
+sub student_performance_on_sequence {
+ my ($student,$studentdata,$navmap,$seq,$links,$awarded_only) = @_;
$links = 'no' if (! defined($links));
my $Str = ''; # final result string
my ($score,$max) = (0,0);
@@ -1849,16 +2056,19 @@ sub StudentPerformanceOnSequence {
my @ScoreData = ();
my $partscore;
my $hasdata = 0; # flag, 0 if there were no submissions on the sequence
- foreach my $resource (@{$seq->{'contents'}}) {
- next if ($resource->{'type'} ne 'assessment');
- my $resource_data = $studentdata->{$resource->{'symb'}};
- foreach my $part (@{$resource->{'parts'}}) {
+ 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',
- $resource->{'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;
}
@@ -1874,7 +2084,7 @@ sub StudentPerformanceOnSequence {
$hasdata = 1;
}
#
- $partscore = $weight*$awarded;
+ $partscore = &Apache::grades::compute_points($weight,$awarded);
if (! defined($awarded)) {
$partscore = undef;
}
@@ -1884,16 +2094,22 @@ sub StudentPerformanceOnSequence {
$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;
- } else {
+ } 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'})){
$symbol = '.';
@@ -1909,11 +2125,12 @@ sub StudentPerformanceOnSequence {
push (@ScoreData,$partscore);
#
if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) {
- $symbol = ''.$symbol.'';
+ '&command=submission';
+ $symbol = &link($symbol, $link);
}
$Str .= $symbol;
}
@@ -1941,13 +2158,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".
"