| '.&mt('Sections').' | '; + $Str .= ''.&mt('Groups').' | '; $Str .= ''.&mt('Student Data').' | '; $Str .= ''.&mt('Enrollment Status').' | '; $Str .= ''.&mt('Sequences and Folders').' | '; @@ -331,6 +338,8 @@ sub CreateInterface { $Str .= '
| '."\n"; $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5); $Str .= ' | '; + $Str .= &Apache::lonstatistics::GroupSelect('Group','multiple',5); + $Str .= ' | '; $Str .= &Apache::lonstatistics::StudentDataSelect('StudentData','multiple', 5,undef); $Str .= ' | '."\n";
@@ -353,7 +362,7 @@ sub CreateInterface {
&mt('Clear Caches').'" />';
$Str .= ' 'x5;
$Str .=
- &mt('Status[_1]',
+ &mt('Status [_1]',
'');
$Str .= ' '; return $Str; @@ -430,14 +439,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'; @@ -477,6 +481,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 '. @@ -495,6 +500,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', @@ -512,6 +518,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', @@ -529,6 +536,7 @@ my @OutputDataOptions = grand_maximum => 1, summary_table => 1, maximum_row => 0, + 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', @@ -551,14 +559,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) { @@ -581,6 +584,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 @@ -612,19 +635,43 @@ Return a line of the chart for a student 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); - undef(%width); - undef($navmap); - undef(@sequences); - &Apache::lonnet::logthis('called html_initialize'); + &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') { + $r->print(<".$ENV{'course.'.$ENV{'request.course.id'}.'.description'}.
+ $r->print("'.&mt('Summary table for [_1] ([_2]@[_3])',
$student->{'fullname'},
@@ -887,7 +993,7 @@ sub SingleStudentTotal {
$Str .= ' | |
| '.&HTML::Entities::encode($seq->compTitle).' | '. @@ -926,6 +1032,7 @@ sub SingleStudentTotal { my $excel_sheet; my $excel_workbook; +my $format; my $filename; my $rows_output; @@ -936,9 +1043,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 +1060,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("