--- loncom/interface/lonstatistics.pm 2005/02/17 08:29:43 1.114 +++ loncom/interface/lonstatistics.pm 2014/02/26 01:19:55 1.156.2.4 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstatistics.pm,v 1.114 2005/02/17 08:29:43 albertel Exp $ +# $Id: lonstatistics.pm,v 1.156.2.4 2014/02/26 01:19:55 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -28,19 +28,7 @@ # ### -=pod - -=head1 NAME - -lonstatistics - -=head1 SYNOPSIS - -Main handler for statistics and chart. - -=over 4 -=cut package Apache::lonstatistics; @@ -49,24 +37,21 @@ use Apache::Constants qw(:common :http); use vars qw( @FullClasslist @Students - @Sections - @SelectedSections + @Sections + @Groups %StudentData @StudentDataOrder @SelectedStudentData - $top_map - @Sequences - @SelectedMaps - @Assessments $enrollment_status); -use Apache::lonnet(); +use Apache::lonnet; use Apache::lonhomework; use Apache::loncommon; use Apache::loncoursedata; use Apache::lonhtmlcommon; use Apache::lonmysql; use Apache::lonlocal; +use Apache::longroup; use Time::HiRes; # # Statistics Packages @@ -78,32 +63,10 @@ use Apache::lonstudentassessment(); use Apache::lonpercentage; use Apache::lonstudentsubmissions(); use Apache::lonsurveyreports(); +use Apache::longradinganalysis(); +use Apache::lonquickgrades(); +use LONCAPA; -####################################################### -####################################################### - -=pod - -=item Package Variables - -=item @FullClasslist The full classlist - -=item @Students The students we are concerned with for this invocation - -=item @Sections The sections available in this class - -=item $curr_student The student currently being examined - -=item $prev_student The student previous in the classlist - -=item $next_student The student next in the classlist - -=over - -=cut - -####################################################### -####################################################### # # Classlist variables # @@ -111,48 +74,12 @@ my $curr_student; my $prev_student; my $next_student; -####################################################### -####################################################### -=pod - -=item &clear_classlist_variables() - -undef the following package variables: - -=over - -=item @FullClasslist - -=item @Students - -=item @Sections - -=item @SelectedSections - -=item %StudentData - -=item @StudentDataOrder - -=item @SelectedStudentData - -=item $curr_student - -=item $prev_student - -=item $next_student - -=back - -=cut - -####################################################### -####################################################### sub clear_classlist_variables { undef(@FullClasslist); undef(@Students); undef(@Sections); - undef(@SelectedSections); + undef(@Groups); undef(%StudentData); undef(@SelectedStudentData); undef($curr_student); @@ -160,76 +87,27 @@ sub clear_classlist_variables { undef($next_student); } -####################################################### -####################################################### - -=pod - -=item &PrepareClasslist() - -Build up the classlist information. The classlist information is kept in -the following package variables: - -=over -=item @FullClasslist - -=item @Students - -=item @Sections - -=item @SelectedSections - -=item %StudentData - -=item @SelectedStudentData - -=item $curr_student - -=item $prev_student - -=item $next_student - -=back - -$curr_student, $prev_student, and $next_student may not be defined, depending -upon the calling context. - -=cut - -####################################################### -####################################################### sub PrepareClasslist { my %Sections; &clear_classlist_variables(); # # Retrieve the classlist - my $cid = $ENV{'request.course.id'}; - my $cdom = $ENV{'course.'.$cid.'.domain'}; - my $cnum = $ENV{'course.'.$cid.'.num'}; - my ($classlist,$field_names) = &Apache::loncoursedata::get_classlist($cid, - $cdom,$cnum); - if (exists($ENV{'form.Section'})) { - if (ref($ENV{'form.Section'})) { - @SelectedSections = @{$ENV{'form.Section'}}; - } elsif ($ENV{'form.Section'} !~ /^\s*$/) { - @SelectedSections = ($ENV{'form.Section'}); - } - } - @SelectedSections = ('all') if (! @SelectedSections); - foreach (@SelectedSections) { - if ($_ eq 'all') { - @SelectedSections = ('all'); - } - } + my $cid = $env{'request.course.id'}; + my $cdom = $env{'course.'.$cid.'.domain'}; + my $cnum = $env{'course.'.$cid.'.num'}; + my ($classlist,$field_names) = &Apache::loncoursedata::get_classlist($cdom, + $cnum); + my @selected_sections = &get_selected_sections(); + my @selected_groups = &get_selected_groups(); # # Deal with instructors with restricted section access - if ($ENV{'request.course.sec'} !~ /^\s*$/) { - @SelectedSections = ($ENV{'request.course.sec'}); + if ($env{'request.course.sec'} !~ /^\s*$/) { + @selected_sections = ($env{'request.course.sec'}); } # # Set up %StudentData - @StudentDataOrder = qw/fullname username domain id section status comments/; + @StudentDataOrder = qw/fullname username domain id section status groups comments/; foreach my $field (@StudentDataOrder) { $StudentData{$field}->{'title'} = &mt($field); $StudentData{$field}->{'base_width'} = length(&mt($field)); @@ -239,8 +117,19 @@ sub PrepareClasslist { # # get the status requested $enrollment_status = 'Active'; - $enrollment_status = $ENV{'form.Status'} if (exists($ENV{'form.Status'})); + $enrollment_status = $env{'form.Status'} if (exists($env{'form.Status'})); # + # Get groupmembership + my ($classgroups,$studentgroups); + my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum); + if (%curr_groups) { + ($classgroups,$studentgroups) = + &Apache::loncoursedata::get_group_memberships($classlist, + $field_names, + $cdom,$cnum); + } + my $now = time; + # Process the classlist while (my ($student,$student_data) = each (%$classlist)) { my $studenthash = (); @@ -255,6 +144,16 @@ sub PrepareClasslist { $StudentData{$field}->{'width'} = $length; } } + my @studentsgroups = &Apache::loncoursedata::get_students_groups + ($student,$enrollment_status, + $classgroups); + if (@studentsgroups) { + $studenthash->{'groups'} = join(', ',@studentsgroups); + $studenthash->{'groupref'} = \@studentsgroups; + } else { + $studenthash->{'groups'} = 'none'; + $studenthash->{'groupref'} = []; + } push (@FullClasslist,$studenthash); # # Build up a list of sections @@ -266,38 +165,66 @@ sub PrepareClasslist { $Sections{$section}++; # # Only put in the list those students we are interested in - foreach my $sect (@SelectedSections) { + foreach my $sect (@selected_sections) { if ( (($sect eq 'all') || ($section eq $sect)) && (($studenthash->{'status'} eq $enrollment_status) || ($enrollment_status eq 'Any')) ){ - push (@Students,$studenthash); - last; + my $groupcheck = 0; + if (grep(/^all$/,@selected_groups)) { + push(@Students,$studenthash); + last; + } elsif (grep(/^none$/,@selected_groups)) { + if ($studenthash->{'groups'} eq 'none') { + push(@Students,$studenthash); + last; + } + } else { + foreach my $group (@selected_groups) { + if (grep(/^$group$/,@studentsgroups)) { + push(@Students,$studenthash); + $groupcheck = 1; + last; + } + } + if ($groupcheck) { + last; + } + } } } } # # Put the consolidated section data in the right place - if ($ENV{'request.course.sec'} !~ /^\s*$/) { - @Sections = ($ENV{'request.course.sec'}); + if ($env{'request.course.sec'} !~ /^\s*$/) { + @Sections = ($env{'request.course.sec'}); } else { - @Sections = sort {$a cmp $b} keys(%Sections); + @Sections = sort { + if ($a == $a && $b == $b ) { return $a <=> $b; } + return $a cmp $b; + } keys(%Sections); + unshift(@Sections,'all'); # Put 'all' at the front of the list } + # Sort the groups + @Groups = sort {$a cmp $b} keys(%{$studentgroups}); + unshift(@Groups,'all'); # Put 'all' at the front of the list + # # Sort the Students my $sortby = 'fullname'; - $sortby = $ENV{'form.sort'} if (exists($ENV{'form.sort'})); - my @TmpStudents = sort { $a->{$sortby} cmp $b->{$sortby} || - $a->{'fullname'} cmp $b->{'fullname'} } @Students; + $sortby = $env{'form.sort'} if (exists($env{'form.sort'})); + my @TmpStudents = sort { lc($a->{$sortby}) cmp lc($b->{$sortby}) || + lc($a->{'fullname'}) cmp lc($b->{'fullname'}) || + lc($a->{'username'}) cmp lc($b->{'username'}) } @Students; @Students = @TmpStudents; # # Now deal with that current student thing.... $curr_student = undef; - if (exists($ENV{'form.SelectedStudent'})) { + if (exists($env{'form.SelectedStudent'})) { my ($current_uname,$current_dom) = - split(':',$ENV{'form.SelectedStudent'}); + split(':',$env{'form.SelectedStudent'}); my $i; for ($i = 0; $i<=$#Students; $i++) { next if (($Students[$i]->{'username'} ne $current_uname) || @@ -319,12 +246,9 @@ sub PrepareClasslist { } } # - if (exists($ENV{'form.StudentData'})) { - if (ref($ENV{'form.StudentData'}) eq 'ARRAY') { - @SelectedStudentData = @{$ENV{'form.StudentData'}}; - } else { - @SelectedStudentData = ($ENV{'form.StudentData'}); - } + if (exists($env{'form.StudentData'})) { + @SelectedStudentData = + &Apache::loncommon::get_env_multiple('form.StudentData'); } else { @SelectedStudentData = ('username'); } @@ -339,271 +263,134 @@ sub PrepareClasslist { } -####################################################### -####################################################### - -=pod - -=item get_students - -Returns a list of the selected students - -=cut - -####################################################### -####################################################### -sub get_students { - if (! @Students) { - &PrepareClasslist() +sub get_selected_sections { + my @selected_sections = + &Apache::loncommon::get_env_multiple('form.Section'); + @selected_sections = ('all') if (! @selected_sections); + foreach (@selected_sections) { + if ($_ eq 'all') { + @selected_sections = ('all'); + } } - return @Students; -} - -####################################################### -####################################################### - -=pod - -=item ¤t_student() - -Returns a pointer to a hash containing data about the currently -selected student. - -=cut - -####################################################### -####################################################### -sub current_student { - return $curr_student; -} - -####################################################### -####################################################### - -=pod - -=item &previous_student() - -Returns a pointer to a hash containing data about the student prior -in the list of students. Or something. - -=cut - -####################################################### -####################################################### -sub previous_student { - return $prev_student; -} - -####################################################### -####################################################### - -=pod - -=item &next_student() - -Returns a pointer to a hash containing data about the next student -to be viewed. - -=cut - -####################################################### -####################################################### -sub next_student { - return $next_student; + # + # Deal with instructors with restricted section access + if ($env{'request.course.sec'} !~ /^\s*$/) { + @selected_sections = ($env{'request.course.sec'}); + } + return @selected_sections; } -####################################################### -####################################################### -=pod - -=item &clear_sequence_variables() - -=cut - -####################################################### -####################################################### -sub clear_sequence_variables { - undef($top_map); - undef(@Sequences); - undef(@Assessments); +sub get_selected_groups { + my @selected_groups = + &Apache::loncommon::get_env_multiple('form.Group'); + @selected_groups = ('all') if (! @selected_groups); + foreach my $grp (@selected_groups) { + if ($grp eq 'all') { + @selected_groups = ('all'); + last; + } + } + return @selected_groups; } + -####################################################### -####################################################### -=pod - -=item &SetSelectedMaps($elementname) - -Sets the @SelectedMaps array from $ENV{'form.'.$elementname}; - -=cut - -####################################################### -####################################################### -sub SetSelectedMaps { - my $elementname = shift; - if (exists($ENV{'form.'.$elementname})) { - if (ref($ENV{'form.'.$elementname})) { - @SelectedMaps = @{$ENV{'form.'.$elementname}}; - } else { - @SelectedMaps = ($ENV{'form.'.$elementname}); - } +sub section_and_enrollment_description { + my ($mode) = @_; + if (! defined($mode)) { $mode = 'localized'; } + my @sections = &Apache::lonstatistics::get_selected_sections(); + my @groups = &Apache::lonstatistics::get_selected_groups(); + my $description; + if ($mode eq 'localized') { + $description = &mt('Unable to determine section, groups and access status'); + } elsif ($mode eq 'plaintext') { + $description = 'Unable to determine section, groups and access status'; } else { - @SelectedMaps = ('all'); + $description = 'Bad parameter passed to lonstatistics::section_and_enrollment_description'; + &Apache::lonnet::logthis($description); + } + $description = §ion_or_group_text($mode,'section',@sections). + ' '.§ion_or_group_text($mode,'group',@groups); + if ($mode eq 'localized') { + $description .= ' '.&mt($env{'form.Status'}.' access status.'); + } elsif ($mode eq 'plaintext') { + $description .= ' '.$env{'form.Status'}.' access status.'; } + return $description; } -####################################################### -####################################################### - -=pod - -=item &Sequences_with_Assess() - -Returns an array containing the subset of @Sequences which contain -assessments. -=cut -####################################################### -####################################################### -sub Sequences_with_Assess { - my ($mode) = @_; - $mode = 'selected' if (! defined($mode)); - my @Sequences_to_Show; - foreach my $sequence (@Sequences) { - next if ($sequence->{'num_assess'} < 1); - if ($mode eq 'all') { - push (@Sequences_to_Show,$sequence); - } elsif ($mode eq 'selected') { - foreach my $map_symb (@SelectedMaps) { - if ($sequence->{'symb'} eq $map_symb || $map_symb eq 'all'){ - push (@Sequences_to_Show,$sequence); - last; # Only put it in once - } - } +sub section_or_group_text { + my ($mode,$type,@items) = @_; + my $text; + my %phrases = (); + %{$phrases{'section'}} = ( + single => 'Section', + all => 'All sections', + plural => 'Sections', + ); + %{$phrases{'group'}} = ( + single => 'Group', + all => 'All groups', + plural => 'Groups', + ); + if (scalar(@items) == 1 && $items[0] ne 'all') { + if ($mode eq 'localized') { + $text = &mt($phrases{$type}{single}.' [_1].',$items[0]); + } elsif ($mode eq 'plaintext') { + $text = $phrases{$type}{single}.' '.$items[0].'.'; + + } + } elsif (scalar(@items) && $items[0] eq 'all') { + if ($mode eq 'localized') { + $text = &mt($phrases{$type}{all}.'.'); + } elsif ($mode eq 'plaintext') { + $text = $phrases{$type}{all}.'.'; + } + } elsif (scalar(@items)) { + my $lastitem = pop(@items); + if ($mode eq 'localized') { + $text = &mt($phrases{$type}{plural}.' [_1] and [_2].', + join(', ',@items),$lastitem); + } elsif ($mode eq 'plaintext') { + $text = $phrases{$type}{plural}.' '.join(', ',@items).' and '. + $lastitem.'.'; } - } - return @Sequences_to_Show; + return $text; } -####################################################### -####################################################### -=pod - -=item &PrepareCourseData($r) - -=cut - -####################################################### -####################################################### -sub PrepareCourseData { - my ($r) = @_; - &clear_sequence_variables(); - my ($top,$sequences,$assessments) = - &Apache::loncoursedata::get_sequence_assessment_data(); - if (! defined($top) || ! ref($top)) { - # There has been an error, better report it - &Apache::lonnet::logthis('top is undefined'); - return; +sub get_students { + if (! @Students) { + &PrepareClasslist() } - $top_map = $top if (ref($top)); - @Sequences = @{$sequences} if (ref($sequences) eq 'ARRAY'); - @Assessments = @{$assessments} if (ref($assessments) eq 'ARRAY'); - return; + return @Students; } -####################################################### -####################################################### - -=pod - -=item &log_sequence($sequence,$recursive,$padding) -Write data about the sequence to a logfile. If $recursive is not -undef the data is written recursively. $padding is used for recursive -calls. - -=cut -####################################################### -####################################################### -sub log_sequence { - my ($seq,$recursive,$padding) = @_; - $padding = '' if (! defined($padding)); - if (ref($seq) ne 'HASH') { - &Apache::lonnet::logthis('log_sequence passed bad sequnce'); - return; - } - &Apache::lonnet::logthis($padding.'sequence '.$seq->{'title'}); - while (my($key,$value) = each(%$seq)) { - next if ($key eq 'contents'); - if (ref($value) eq 'ARRAY') { - for (my $i=0;$i< scalar(@$value);$i++) { - &Apache::lonnet::logthis($padding.$key.'['.$i.']='. - $value->[$i]); - } - } else { - &Apache::lonnet::logthis($padding.$key.'='.$value); - } - } - if (defined($recursive)) { - &Apache::lonnet::logthis($padding.'-'x20); - &Apache::lonnet::logthis($padding.'contains:'); - foreach my $item (@{$seq->{'contents'}}) { - if ($item->{'type'} eq 'container') { - &log_sequence($item,$recursive,$padding.' '); - } else { - &Apache::lonnet::logthis($padding.'title = '.$item->{'title'}); - while (my($key,$value) = each(%$item)) { - next if ($key eq 'title'); - if (ref($value) eq 'ARRAY') { - for (my $i=0;$i< scalar(@$value);$i++) { - &Apache::lonnet::logthis($padding.$key.'['.$i.']='. - $value->[$i]); - } - } else { - &Apache::lonnet::logthis($padding.$key.'='.$value); - } - } - } - } - &Apache::lonnet::logthis($padding.'end contents of '.$seq->{'title'}); - &Apache::lonnet::logthis($padding.'-'x20); - } - return; +sub current_student { + return $curr_student; } -############################################## -############################################## - -=pod - -=item &StudentDataSelect($elementname,$status,$numvisible,$selected) -Returns html for a selection box allowing the user to choose one (or more) -of the fields of student data available (fullname, username, id, section, etc) -=over 4 +sub previous_student { + return $prev_student; +} -=item $elementname The name of the HTML form element -=item $status 'multiple' or 'single' selection box -=item $numvisible The number of options to be visible +sub next_student { + return $next_student; +} -=back -=cut -############################################## -############################################## sub StudentDataSelect { my ($elementname,$status,$numvisible)=@_; if ($numvisible < 1) { @@ -614,144 +401,141 @@ sub StudentDataSelect { my $Str = "\n"; $Str .= '\n"; return $Str; } -############################################## -############################################## -=pod -=item &MapSelect($elementname,$status,$numvisible,$restriction) +sub get_selected_maps { + my ($elementname) = @_; + my @selected_maps = + &Apache::loncommon::get_env_multiple('form.'.$elementname); + @selected_maps = ('all') if (! @selected_maps); + foreach my $map (@selected_maps) { + if ($map eq 'all') { + @selected_maps = ('all'); + last; + } + } + return @selected_maps; +} -Returns html for a selection box allowing the user to choose one (or more) -of the sequences in the course. The values of the sequences are the symbs. -If the top sequence is selected, the value 'top' will result. -=over 4 -=item $elementname The name of the HTML form element -=item $status 'multiple' or 'single' selection box - -=item $numvisible The number of options to be visible +sub selected_sequences_with_assessments { + my ($mode) = @_; + $mode = 'selected' if (! defined($mode)); + my $navmap = Apache::lonnavmaps::navmap->new(); + if (!defined($navmap)) { + return ('Can not open Coursemap'); + } + # + my @sequences = $navmap->retrieveResources(undef, + sub { shift->is_map(); },1,0,1); + my $toplevelseq = $navmap->getById('0.0'); + if (!grep(/^\Q$toplevelseq\E$/,@sequences)) { + unshift(@sequences,$toplevelseq); + } -=item $restriction Code reference to subroutine which returns true or -false. The code must expect a reference to a sequence data structure. + my @sequences_with_assessments; + foreach my $sequence (@sequences) { + if ($navmap->hasResource($sequence,sub { shift->is_problem(); },0,1)){ + push(@sequences_with_assessments,$sequence); + } + } + # + my @sequences_to_show; + foreach my $sequence (@sequences_with_assessments) { + if ($mode eq 'all') { + push (@sequences_to_show,$sequence); + } elsif ($mode eq 'selected') { + foreach my $map_symb (&get_selected_maps('Maps')) { + if ($sequence->symb eq $map_symb || $map_symb eq 'all'){ + push (@sequences_to_show,$sequence); + last; # Only put it in once + } + } + } -=back + } + return $navmap,@sequences_to_show; +} -=cut -############################################## -############################################## -sub MapSelect { - my ($elementname,$status,$numvisible,$restriction)=@_; +sub map_select { + my ($elementname,$status,$numvisible)=@_; if ($numvisible < 1) { return; } # # Set up array of selected items - &SetSelectedMaps($elementname); - # - # Set up the restriction call - if (! defined($restriction)) { - $restriction = sub { 1; }; - } + my @selected_maps = &get_selected_maps($elementname); # # Build the form element - my $Str = "\n"; - $Str .= '\n"; - return $Str; + $form .= "\n"; + return $form; } -############################################## -############################################## -=pod - -=item &SectionSelect($elementname,$status,$numvisible) - -Returns html for a selection box allowing the user to choose one (or more) -of the sections in the course. - -Uses the package variables @Sections and @SelectedSections -=over 4 - -=item $elementname The name of the HTML form element - -=item $status 'multiple' or 'single' selection box - -=item $numvisible The number of options to be visible - -=back - -=cut - -############################################## -############################################## sub SectionSelect { my ($elementname,$status,$numvisible)=@_; if ($numvisible < 1) { @@ -767,16 +551,16 @@ sub SectionSelect { my $Str = "\n"; $Str .= '\n"; +} + + + + sub DisplayClasslist { my ($r)=@_; &Apache::lonhtmlcommon::add_breadcrumb @@ -795,111 +614,123 @@ sub DisplayClasslist { # # Output some of the standard interface components my $Str; - $Str .= &Apache::lonhtmlcommon::breadcrumbs(undef,'Select One Student'); - $Str .= '

'."\n"; + $Str .= &Apache::lonhtmlcommon::breadcrumbs('Select One Student'); + $Str .= '
'."\n"; $Str .= ''; $Str .= ''; - $Str .= ''; + $Str .= ''; + $Str .= ''; $Str .= ''.$/; $Str .= ''; $Str .= ''; + $Str .= ''; $Str .= ''; $Str .= ''.$/; - $Str .= '
'.&mt('Sections').''.&mt('Enrollment Status').''.&mt('Groups').''.&mt('Access Status').'
'. &Apache::lonstatistics::SectionSelect('Section','multiple',5). ''. + &Apache::lonstatistics::GroupSelect('Group','multiple',5). + ''. &Apache::lonhtmlcommon::StatusOptions(undef,undef,5). '

'; + $Str .= ''; $Str .= ''; $r->print($Str); $r->rflush(); # - my @Fields = ('fullname','username','domain','id','section','status'); + my @Fields = ('fullname','username','domain','id','section','status','groups'); # $Str = ''; + my @selected_sections = &get_selected_sections(); if (! @Students) { - if ($SelectedSections[0] eq 'all') { - if (lc($ENV{'form.Status'}) eq 'any') { - $Str .= '

'. - &mt('There are no students in the course.'). - '

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

'. + if ($selected_sections[0] eq 'all') { + if (lc($env{'form.Status'}) eq 'active') { + $Str .= '

'. &mt('There are no currently enrolled students in the course.'). - '

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

'. + '

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

'. &mt('There are no previously enrolled students in the course.'). - '

'; + '

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

'. + &mt('There are no students with future access in the course.'). + '

'; + } else { # 'any' and any others + $Str .= '

'. + &mt('There are no students in the course.'). + '

'; } } else { - my $sections; - if (lc($ENV{'form.Status'}) eq 'any') { - $Str .= '

'. - &mt('There are no students in the selected sections.'). - '

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

'. + if (lc($env{'form.Status'}) eq 'active') { + $Str .= '

'. &mt('There are no currently enrolled students in the selected sections.'). - '

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

'. + '

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

'. &mt('There are no previously enrolled students in the selected sections.'). - '

'; + '

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

'. + &mt('There are no students with future access in the selected sections.'). + '

'; + } else { # 'any' and any others + $Str .= '

'. + &mt('There are no students in the selected sections.'). + '

'; } } - $Str.= ''. - &mt('Click here to return to the chart').''; + $Str.= '

' + .'' + .&mt('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 students name or username to view their chart

'; - $Str .= '
'."\n"; - $Str .= ''."\n"; + $Str .= '

'.&mt('Select One Student').'

' + .'

'.&mt("Click on a student's name or username to view their chart.").'

' + .&Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row(); foreach my $field (@Fields) { $Str .= ''; } - $Str .= ''."\n"; + $Str .= &Apache::loncommon::end_data_table_header_row(); # - my $alternate = 0; foreach my $student (@Students) { # @Students is a package variable my $sname = $student->{'username'}.':'.$student->{'domain'}; - if($alternate) { - $Str .= ''; - } else { - $Str .= ''; - } - $alternate = ($alternate + 1) % 2; + $Str .= &Apache::loncommon::start_data_table_row(); # foreach my $field (@Fields) { $Str .= ''; } - $Str .= "\n"; + $Str .= &Apache::loncommon::end_data_table_row(); } - $Str .= '
'.&mt($field). '
'; if ($field eq 'fullname' || $field eq 'username') { $Str .= ''; - $Str .= $student->{$field}.' '; + $Str .= &escape('student_assessment'); + $Str .= '&sort='.&escape($env{'form.sort'}); + $Str .= '&SelectedStudent='; + $Str .= &escape($sname).'">'; + $Str .= $student->{$field}; $Str .= ''; } elsif ($field eq 'status') { $Str .= &mt($student->{$field}); } else { - $Str .= $student->{$field}; + if ($student->{$field} eq 'none') { + $Str .= &mt('none') + } else { + $Str .= $student->{$field}; + } } $Str .= '
'."\n"; + $Str .= &Apache::loncommon::end_data_table(); # $r->print($Str); $r->rflush(); @@ -907,86 +738,72 @@ sub DisplayClasslist { return; } -############################################## -############################################## + + sub CreateMainMenu { # # Define menu data - my @reports = ({ internal_name => 'problem_statistics', - name => &mt('Overall Problem Statistics'), - short_description => - &mt('Student performance statistics on all problems.'), - }, - { internal_name => 'problem_analysis', - name => &mt('Detailed Problem Analysis'), - short_description => - &mt('Detailed statistics and graphs of student performance on problems.'), - }, - { internal_name => 'submissiontime_analysis', - name => &mt('Submission Time Plots'), - short_description => - &mt('Display and analysis of submission times on assessments.'), - }, - { internal_name => 'student_submission_reports', - name => &mt('Student Submission Reports'), - short_description => - &mt('Prepare reports of student submissions.'), - }, - { internal_name => 'survey_reports', - name => &mt('Survey Reports'), - short_description => - &mt('Prepare reports on survey results.'), - }, - { internal_name => 'correct_problems_plot', - name => &mt('Correct Problems Plot'), - short_description => - &mt('Display a histogram of student performance in the course.'), - }, -# { internal_name => 'student_assessment', -# name => &mt('Problem Status Chart'), -# short_description => -# &mt('Brief view of each students performance in course.'), -# }, - # 'percentage' => 'Correct-problems Plot', - # 'activitylog' => 'Activity Log', - ); - # - # Create the menu - my $Str; - $Str .= '

'.&mt('Please select a report to generate').'

'; - foreach my $reportdata (@reports) { - $Str .='

'. - $reportdata->{'name'}."

\n"; - $Str .= ' '.(' 'x8).$reportdata->{'short_description'}. - "\n"; - } - $Str .="\n"; - # - return $Str; + my @reports = ( + {categorytitle => 'Statistics and Analyses', + items => [ + {url => '/adm/statistics?reportSelected=problem_statistics', + permission => 'F', + icon => 'document-open.png', + linktext => ('Overall Problem Statistics'), + linktitle => ('Student performance statistics on all problems.')}, + + {url => '/adm/statistics?reportSelected=problem_analysis', + permission => 'F', + icon => 'prob_ana.png', + linktext => ('Detailed Problem Analysis'), + linktitle => ('Detailed statistics and graphs of student performance on problems.')}, + ]}, + {categorytitle => 'Plots', + items => [ + {url => '/adm/statistics?reportSelected=submissiontime_analysis', + permission => 'F', + icon => 'subtimpl.png', + linktext => ('Submission Time Plots'), + linktitle => ('Display and analysis of submission times on assessments.')}, + + {url => '/adm/statistics?reportSelected=correct_problems_plot', + permission => 'F', + icon => 'coprplot.png', + linktext => ('Correct Problems Plot'), + linktitle => ('Display a histogram of student performance in the course.')}, + ]}, + {categorytitle => 'Reports', + items => [ + {url => '/adm/statistics?reportSelected=student_submission_reports', + permission => 'F', + icon => 'edit-copy.png', + linktext => ('Student Submission Reports'), + linktitle => ('Prepare reports of student submissions.')}, + + {url => '/adm/statistics?reportSelected=survey_reports', + permission => 'F', + icon => 'survey_rep.png', + linktext => ('Survey Reports'), + linktitle => ('Prepare reports on survey results.')}, + ]}); + +return &Apache::lonhtmlcommon::generate_menu(@reports); + } -############################################## -############################################## + + sub handler { my $r=shift; my $c = $r->connection(); # - # Check for overloading - my $loaderror=&Apache::lonnet::overloaderror($r); - if ($loaderror) { return $loaderror; } - $loaderror= - &Apache::lonnet::overloaderror($r, - $ENV{'course.'.$ENV{'request.course.id'}.'.home'}); - if ($loaderror) { return $loaderror; } - # # Check for access - if (! &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) { - $ENV{'user.error.msg'}= + if (! &Apache::lonnet::allowed('vgr',$env{'request.course.id'})) { + $env{'user.error.msg'}= $r->uri.":vgr:0:0:Cannot view grades for complete course"; if (! &Apache::lonnet::allowed('vgr', - $ENV{'request.course.id'}.'/'.$ENV{'request.course.sec'})) { - $ENV{'user.error.msg'}= + $env{'request.course.id'}.'/'.$env{'request.course.sec'})) { + $env{'user.error.msg'}= $r->uri.":vgr:0:0:Cannot view grades with given role"; return HTTP_NOT_ACCEPTABLE; } @@ -1012,12 +829,9 @@ sub handler { td.essay { border: 1px solid gray; } ENDSTYLE - my $html=&Apache::lonxml::xmlbegin(); - $r->print($html.''. - &mt('Course Statistics and Charts'). - ''.$style. - "\n". - &Apache::loncommon::bodytag('Course Statistics and Charts')); + + $r->print(&Apache::loncommon::start_page('Course Statistics and Charts', + $style)); $r->rflush(); # # Either print out a menu for them or send them to a report @@ -1027,47 +841,46 @@ ENDSTYLE text =>'Statistics', faq=>139, bug=>'Statistics and Charts'}); - if (! exists($ENV{'form.reportSelected'}) || - $ENV{'form.reportSelected'} eq '') { - $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,&mt('Statistics Main Page')). + if (! exists($env{'form.reportSelected'}) || + $env{'form.reportSelected'} eq '') { + $r->print(&Apache::lonhtmlcommon::breadcrumbs('Statistics Main Page'). &CreateMainMenu()); } else { # if (! &Apache::lonmysql::verify_sql_connection()) { my $serveradmin = $r->dir_config('lonAdmEMail'); - $r->print('

'. + $r->print('

'. &mt('Unable to connect to database!'). - '

'); - $r->print('

'. - &mt('Please notify the server administrator '). - ''.$serveradmin.'

'); + '

'); + $r->print('

' + .&mt('Please notify the server administrator [_1]', + ,''.$serveradmin.'') + .'

'); $r->print('

'. &mt('Course Statistics and Charts cannot be '. - 'retrieved until the database is restarted. '. + 'retrieved until the database is restarted. '. 'Your data is intact but cannot be displayed '. 'at this time.').'

'); - $r->print(''); + $r->print(&Apache::loncommon::end_page()); return; } # # Clean out the caches - if (exists($ENV{'form.ClearCache'})) { - &Apache::loncoursedata::delete_caches($ENV{'requres.course.id'}); + if (exists($env{'form.ClearCache'})) { + &Apache::loncoursedata::delete_caches($env{'requres.course.id'}); } # + my $GoToPage = $env{'form.reportSelected'}; + # # Begin form output $r->print('
print('onsubmit="return checkanon();" '); + } $r->print('method="post" action="/adm/statistics">'); $r->rflush(); - # - my $GoToPage = $ENV{'form.reportSelected'}; - # - # Set up the statistics and chart environment - &PrepareCourseData($r); - # $r->print(''); + $GoToPage.'" />'); if($GoToPage eq 'activitylog') { # &Apache::lonproblemstatistics::Activity(); } elsif($GoToPage eq 'problem_statistics') { @@ -1109,11 +922,16 @@ ENDSTYLE ({href=>'/adm/statistics?reportselected=student_assessment', text=>'Chart'}); &Apache::lonstudentassessment::BuildStudentAssessmentPage($r,$c); - } + } elsif($GoToPage eq 'grading_analysis') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>'/adm/statistics?reportselected=grading_anaylsis', + text=>'Grading Analysis'}); + &Apache::longradinganalysis::build_grading_analysis_page($r,$c); + } # $r->print("
\n"); } - $r->print("\n\n"); + $r->print(&Apache::loncommon::end_page()); $r->rflush(); # return OK; @@ -1121,17 +939,227 @@ ENDSTYLE 1; -####################################################### -####################################################### +__END__ =pod +=head1 NAME + +lonstatistics + +=head1 SYNOPSIS + +Main handler for statistics and chart. + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + + +=head1 PACKAGE VARIABLES + +=over + +=item @FullClasslist The full classlist + +=item @Students The students we are concerned with for this invocation + +=item @Sections The sections available in this class + +=item @Groups The groups available in the class + +=item $curr_student The student currently being examined + +=item $prev_student The student previous in the classlist + +=item $next_student The student next in the classlist + =back -=cut +=head1 SUBROUTINES + +=over -####################################################### -####################################################### +=item &clear_classlist_variables() -__END__ +undef the following package variables: + +=over 4 + +=item * @FullClasslist + +=item * @Students + +=item * @Sections + +=item * @Groups + +=item * %StudentData + +=item * @StudentDataOrder + +=item * @SelectedStudentData + +=item * $curr_student + +=item * $prev_student + +=item * $next_student + +=back + +=item &PrepareClasslist() + +Build up the classlist information. The classlist information is kept in +the following package variables: + +=over 4 + +=item * @FullClasslist + +=item * @Students + +=item * @Sections + +=item * @Groups + +=item * %StudentData + +=item * @SelectedStudentData + +=item * $curr_student + +=item * $prev_student + +=item * $next_student + +=back + +$curr_student, $prev_student, and $next_student may not be defined, depending +upon the calling context. + +=item get_selected_sections() + +Returns an array of the selected sections + +=item get_selected_groups() + +Returns an array of the selected groups + +=item §ion_and_enrollment_description() + +Returns a string describing the currently selected section(s), group(s) and +access status. + +Inputs: mode = 'plaintext' or 'localized' (defaults to 'localized') + 'plaintext' is used for example in Excel spreadsheets. +Returns: scalar description string. + +=item section_or_group_text() + +=item get_students() + +Returns a list of the selected students + +=item ¤t_student() + +Returns a pointer to a hash containing data about the currently +selected student. + +=item &previous_student() + +Returns a pointer to a hash containing data about the student prior +in the list of students. Or something. + +=item &next_student() + +Returns a pointer to a hash containing data about the next student +to be viewed. + +=item &StudentDataSelect($elementname,$status,$numvisible,$selected) + +Returns html for a selection box allowing the user to choose one (or more) +of the fields of student data available (fullname, username, id, section, etc) + +=over 4 + +=item * $elementname The name of the HTML form element + +=item * $status 'multiple' or 'single' selection box + +=item * $numvisible The number of options to be visible + +=back + +=item &get_selected_maps($elementname) + +Input: Name of the