--- loncom/interface/lonstatistics.pm 2003/06/10 19:19:57 1.76 +++ loncom/interface/lonstatistics.pm 2003/08/29 21:11:25 1.80 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstatistics.pm,v 1.76 2003/06/10 19:19:57 matthew Exp $ +# $Id: lonstatistics.pm,v 1.80 2003/08/29 21:11:25 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -797,6 +797,110 @@ 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(); + # + 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, + 'last student'); + } + &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); + $r->rflush(); +} + ################################################## ################################################## sub DisplayClasslist { @@ -805,8 +909,46 @@ sub DisplayClasslist { my @Fields = ('fullname','username','domain','id','section'); # my $Str=''; + if (! @Students) { + if ($SelectedSections[0] eq 'all') { + if (lc($ENV{'form.Status'}) eq 'any') { + $Str .= '

There are no students in the course.

'; + } elsif (lc($ENV{'form.Status'}) eq 'active') { + $Str .= '

There are no currently enrolled students in '. + 'the course.

'; + } elsif (lc($ENV{'form.Status'}) eq 'expired') { + $Str .= '

There are no previously enrolled '. + 'students in the course.

'; + } + } else { + my $sections; + if (@SelectedSections == 1) { + $sections = 'section '.$SelectedSections[0]; + } elsif (@SelectedSections > 2) { + $sections = 'sections '.join(', ',@SelectedSections); + $sections =~ s/, ([^,])*$/, and $1/; + } else { + $sections = 'sections '.join(' and ',@SelectedSections); + } + if (lc($ENV{'form.Status'}) eq 'any') { + $Str .= '

There are no students in '.$sections.'.

'; + } elsif (lc($ENV{'form.Status'}) eq 'active') { + $Str .= '

There are no currently enrolled students '. + 'in '.$sections.'.

'; + } elsif (lc($ENV{'form.Status'}) eq 'expired') { + $Str .= '

There are no previously enrolled students '. + 'in '.$sections.'.

'; + } + } + $Str.= ''. + 'Return to the chart.'; + $r->print($Str); + $r->rflush(); + return; + } + # "Click" is asinine but it is probably not my place to change the world. - $Str .= '

Click on a users name to view their chart

'; + $Str .= '

Click on a students name or username to view their chart

'; $Str .= '
'."\n"; $Str .= ''."\n"; foreach my $field (@Fields) { @@ -827,7 +969,7 @@ sub DisplayClasslist { # foreach my $field (@Fields) { $Str .= ''."\n"; - $Str .= ''."\n"; - $Str .= ''."\n"; - # - $Str .= ''; - $Str .= '\n"; - $Str .= '
'; - if ($field eq 'fullname') { + if ($field eq 'fullname' || $field eq 'username') { $Str .= '
Report:'; - $Str .= ''.(' 'x30).''. - ''. - "
'."\n"; - $Str .= '
'."\n"; + $Str = ''; +# $Str .= ''."\n"; +# $Str .= ''."\n"; +# $Str .= ''."\n"; +# # +# $Str .= ''; +# $Str .= '\n"; +# $Str .= '
Report:'; +# $Str .= ''.(' 'x30).''. +# ''. +# "
'."\n"; +# $Str .= '
'."\n"; # return $Str; } @@ -987,8 +1130,6 @@ END &Apache::lonstudentassessment::BuildStudentAssessmentPage($r,$c); } elsif($GoToPage eq 'DoDiffGraph' || $GoToPage eq 'PercentWrongGraph') { # &Apache::lonproblemstatistics::BuildGraphicChart($r,$c); - } elsif($GoToPage eq 'classlist') { - &DisplayClasslist($r); } elsif($GoToPage eq 'Correct-problems Plot') { # &Apache::lonpercentage::BuildPercentageGraph($r,$c); }