--- loncom/interface/lonstatistics.pm 2004/09/02 21:05:24 1.109 +++ loncom/interface/lonstatistics.pm 2005/02/01 15:15:28 1.113 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstatistics.pm,v 1.109 2004/09/02 21:05:24 matthew Exp $ +# $Id: lonstatistics.pm,v 1.113 2005/02/01 15:15:28 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -786,157 +786,6 @@ sub SectionSelect { return $Str; } -####################################################### -####################################################### - -=pod - -=item &CreateAndParseOutputSelector() - -Construct a selection list of options for output and parse output selections. - -=cut - -####################################################### -####################################################### -sub OutputDescriptions { - my (@OutputOptions) = @_; - my $Str = ''; - $Str .= "

Output Modes

\n"; - $Str .= "
\n"; - foreach my $outputmode (@OutputOptions) { - $Str .="
".$outputmode->{'name'}."
\n"; - $Str .="
".$outputmode->{'description'}."
\n"; - } - $Str .= "
\n"; - return $Str; -} - -sub CreateAndParseOutputSelector { - my ($elementname,$default,@OutputOptions) = @_; - my $output_mode; - my $show; - my $Str = ''; - # - # Format for output options is 'mode, restrictions'; - my $selected = $default; - if (exists($ENV{'form.'.$elementname})) { - if (ref($ENV{'form.'.$elementname} eq 'ARRAY')) { - $selected = $ENV{'form.'.$elementname}->[0]; - } else { - $selected = $ENV{'form.'.$elementname}; - } - } - # - # Set package variables describing output mode - $output_mode = 'html'; - $show = 'all'; - foreach my $option (@OutputOptions) { - next if ($option->{'value'} ne $selected); - $output_mode = $option->{'mode'}; - $show = $option->{'show'}; - } - # - # Build the form element - $Str = qq/"; - return ($Str,$output_mode,$show); -} - -############################################### -############################################### - -=pod - -=item &Gather_Student_Data() - -Ensures all student data is up to date. - -=cut - -############################################### -############################################### -sub Gather_Student_Data { - my ($r) = @_; - my $c = $r->connection(); - # - &Apache::loncoursedata::clear_internal_caches(); - # - my @Sequences = &Apache::lonstatistics::Sequences_with_Assess(); - # - my @Students = @Apache::lonstatistics::Students; - # - # Open the progress window - my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin - ($r,'Statistics Compilation Status', - 'Statistics Compilation Progress', scalar(@Students)); - # - while (my $student = shift @Students) { - return if ($c->aborted()); - my ($status,undef) = &Apache::loncoursedata::ensure_current_data - ($student->{'username'},$student->{'domain'}, - $ENV{'request.course.id'}); - &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, - &mt('last student')); - } - &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); - $r->rflush(); -} - -############################################### -############################################### - -=pod - -=item &Gather_Full_Student_Data() - -Ensures all student data is up to date. - -=cut - -############################################### -############################################### -sub Gather_Full_Student_Data { - my ($r,$formname,$inputname) = @_; - my $status_type; - if (defined($formname)) { - $status_type = 'inline'; - } else { - $status_type = 'popup'; - } - my $c = $r->connection(); - # - &Apache::loncoursedata::clear_internal_caches(); - # - my @Students = @Apache::lonstatistics::Students; - # - # Open the progress window - my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin - ($r,&mt('Student Data Compilation Status'), - &mt('Student Data Compilation Progress'), scalar(@Students), - $status_type,undef,$formname,$inputname); - # - while (my $student = shift @Students) { - return if ($c->aborted()); - my ($status,undef) = &Apache::loncoursedata::ensure_current_full_data - ($student->{'username'},$student->{'domain'}, - $ENV{'request.course.id'}); - &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, - &mt('last student')); - } - &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); - $r->rflush(); -} - ################################################## ################################################## sub DisplayClasslist { @@ -1081,7 +930,7 @@ sub CreateMainMenu { { internal_name => 'student_submission_reports', name => &mt('Student Submission Reports'), short_description => - &mt('Prepare Excel spreadsheets of student submissions.'), + &mt('Prepare reports of student submissions.'), }, { internal_name => 'survey_reports', name => &mt('Survey Reports'), @@ -1159,6 +1008,8 @@ sub handler { ENDSTYLE $r->print(''.