--- loncom/interface/lonstatistics.pm 2003/02/25 20:47:47 1.60 +++ loncom/interface/lonstatistics.pm 2003/06/03 18:10:33 1.74 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstatistics.pm,v 1.60 2003/02/25 20:47:47 matthew Exp $ +# $Id: lonstatistics.pm,v 1.74 2003/06/03 18:10:33 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -51,8 +51,7 @@ Main handler for statistics and chart. use Apache::lonproblemstatistics; use Apache::lonstudentassessment; use Apache::lonpercentage; - use GDBM_File; - + use Apache::lonmysql; =over 4 =cut @@ -61,20 +60,30 @@ package Apache::lonstatistics; use strict; use Apache::Constants qw(:common :http); +use vars qw( + @FullClasslist + @Students + @Sections + @SelectedSections + %StudentData + @StudentDataOrder + @SelectedStudentData + $top_map + @Sequences + @SelectedMaps + @Assessments); + use Apache::lonnet(); use Apache::lonhomework; use Apache::loncommon; use Apache::loncoursedata; use Apache::lonhtmlcommon; -use Apache::lonproblemanalysis; -use Apache::lonproblemstatistics; -use Apache::lonstudentassessment; +use Apache::lonproblemanalysis(); +use Apache::lonproblemstatistics(); +use Apache::lonstudentassessment(); use Apache::lonpercentage; -use GDBM_File; - -use vars qw/@FullClasslist @Students @Sections @SelectedSections - $curr_student $prev_student $next_student - $top_map @Sequences @Assessments /; +use Apache::lonmysql; +use Time::HiRes; ####################################################### ####################################################### @@ -104,10 +113,6 @@ use vars qw/@FullClasslist @Students @Se # # Classlist variables # -my @FullClasslist; -my @Students; -my @Sections; -my @SelectedSections; my $curr_student; my $prev_student; my $next_student; @@ -131,6 +136,12 @@ undef the following package variables: =item @SelectedSections +=item %StudentData + +=item @StudentDataOrder + +=item @SelectedStudentData + =item $curr_student =item $prev_student @@ -148,6 +159,8 @@ sub clear_classlist_variables { undef(@Students); undef(@Sections); undef(@SelectedSections); + undef(%StudentData); + undef(@SelectedStudentData); undef($curr_student); undef($prev_student); undef($next_student); @@ -173,6 +186,10 @@ the following package variables: =item @SelectedSections +=item %StudentData + +=item @SelectedStudentData + =item $curr_student =item $prev_student @@ -189,7 +206,6 @@ upon the calling context. ####################################################### ####################################################### sub PrepareClasslist { - my $r = shift; my %Sections; &clear_classlist_variables(); # @@ -201,26 +217,49 @@ sub PrepareClasslist { $cdom,$cnum); if (exists($ENV{'form.Section'})) { if (ref($ENV{'form.Section'})) { - @SelectedSections = @$ENV{'form.Section'}; - # Remove the empty sections - for (my $i=0; $i<=$#SelectedSections; $i++) { - if ($SelectedSections[$i] =~ /^\s*$/) { - splice(@SelectedSections,$i,1); - } - } - } else { - if ($ENV{'form.Section'} !~ /^\s*$/) { - @SelectedSections = ($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'); } } - @SelectedSections = ('any') if (! @SelectedSections); + # + # Deal with instructors with restricted section access + if ($ENV{'request.course.sec'} !~ /^\s*$/) { + @SelectedSections = ($ENV{'request.course.sec'}); + } + # + # Set up %StudentData + @StudentDataOrder = qw/fullname username domain id section status/; + foreach my $field (@StudentDataOrder) { + $StudentData{$field}->{'title'} = $field; + $StudentData{$field}->{'base_width'} = length($field); + $StudentData{$field}->{'width'} = + $StudentData{$field}->{'base_width'}; + } + # + # get the status requested + my $requested_status = 'Active'; + $requested_status = $ENV{'form.Status'} if (exists($ENV{'form.Status'})); # # Process the classlist while (my ($student,$student_data) = each (%$classlist)) { my $studenthash = (); for (my $i=0; $i< scalar(@$field_names);$i++) { - $studenthash->{$field_names->[$i]}=$student_data->[$i]; + my $field = $field_names->[$i]; + # Store the data + $studenthash->{$field}=$student_data->[$i]; + # Keep track of the width of the fields + next if (! exists($StudentData{$field})); + my $length = length($student_data->[$i]); + if ($StudentData{$field}->{'width'} < $length) { + $StudentData{$field}->{'width'} = $length; + } } push (@FullClasslist,$studenthash); # @@ -234,7 +273,11 @@ sub PrepareClasslist { # # Only put in the list those students we are interested in foreach my $sect (@SelectedSections) { - if (($sect eq 'any') || ($section eq $sect)) { + if ( (($sect eq 'all') || + ($section eq $sect)) && + (($studenthash->{'status'} eq $requested_status) || + ($requested_status eq 'Any')) + ){ push (@Students,$studenthash); last; } @@ -242,20 +285,25 @@ sub PrepareClasslist { } # # Put the consolidated section data in the right place - @Sections = sort {$a cmp $b} keys(%Sections); + if ($ENV{'request.course.sec'} !~ /^\s*$/) { + @Sections = ($ENV{'request.course.sec'}); + } else { + @Sections = sort {$a cmp $b} keys(%Sections); + unshift(@Sections,'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; - @Students = @TmpStudents; # # Now deal with that current student thing.... - if (exists($ENV{'form.StudentAssessmentStudent'})) { + $curr_student = undef; + if (exists($ENV{'form.SelectedStudent'})) { my ($current_uname,$current_dom) = - split(':',$ENV{'form.StudentAssessmentStudent'}); + split(':',$ENV{'form.SelectedStudent'}); my $i; for ($i = 0; $i<=$#Students; $i++) { next if (($Students[$i]->{'username'} ne $current_uname) || @@ -263,27 +311,113 @@ sub PrepareClasslist { $curr_student = $Students[$i]; last; # If we get here, we have our student. } - if ($i == 0) { - $prev_student = 'none'; - } else { - $prev_student = $Students[$i-1]; + if (defined($curr_student)) { + if ($i == 0) { + $prev_student = undef; + } else { + $prev_student = $Students[$i-1]; + } + if ($i == $#Students) { + $next_student = undef; + } else { + $next_student = $Students[$i+1]; + } } - if ($i == $#Students) { - $next_student = 'none'; + } + # + if (exists($ENV{'form.StudentData'})) { + if (ref($ENV{'form.StudentData'}) eq 'ARRAY') { + @SelectedStudentData = @{$ENV{'form.StudentData'}}; } else { - $next_student = $Students[$i+1]; + @SelectedStudentData = ($ENV{'form.StudentData'}); } + } else { + @SelectedStudentData = ('username'); } + foreach (@SelectedStudentData) { + if ($_ eq 'all') { + @SelectedStudentData = ('all'); + last; + } + } + # + return; } + ####################################################### ####################################################### -# -# Course Sequences variables -# -my $top_map; -my @Sequences; -my @Assessments; + +=pod + +=item get_students + +Returns a list of the selected students + +=cut + +####################################################### +####################################################### +sub get_students { + if (! @Students) { + &PrepareClasslist() + } + 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; +} ####################################################### ####################################################### @@ -307,6 +441,59 @@ sub clear_sequence_variables { =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}); + } + } else { + @SelectedMaps = ('all'); + } +} + + +####################################################### +####################################################### + +=pod + +=item &Sequences_with_Assess() + +Returns an array containing the subset of @Sequences which contain +assessments. + +=cut + +####################################################### +####################################################### +sub Sequences_with_Assess { + my @Sequences_to_Show; + foreach my $map_symb (@SelectedMaps) { + foreach my $sequence (@Sequences) { + next if ($sequence->{'symb'} ne $map_symb && $map_symb ne 'all'); + next if ($sequence->{'num_assess'} < 1); + push (@Sequences_to_Show,$sequence); + } + } + return @Sequences_to_Show; +} + +####################################################### +####################################################### + +=pod + =item &PrepareCourseData($r) =cut @@ -316,7 +503,8 @@ sub clear_sequence_variables { sub PrepareCourseData { my ($r) = @_; &clear_sequence_variables(); - my ($top,$sequences,$assessments) = &Apache::loncoursedata::get_sequence_assessment_data(); + 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'); @@ -324,28 +512,84 @@ sub PrepareCourseData { } $top_map = $top if (ref($top)); @Sequences = @{$sequences} if (ref($sequences) eq 'ARRAY'); - @Assessments = @{$assessments} if (ref($assessments) eq 'HASH'); + @Assessments = @{$assessments} if (ref($assessments) eq 'ARRAY'); + # + # Compute column widths + foreach my $seq (@Sequences) { + my $name_length = length($seq->{'title'}); + my $num_parts = $seq->{'num_assess_parts'}; + # + # The number of columns needed for the summation text: + # " 1/5" = 1+3 columns, " 10/99" = 1+5 columns + my $sum_length = 1+1+2*(length($num_parts)); + my $num_col = $num_parts+$sum_length; + if ($num_col < $name_length) { + $num_col = $name_length; + } + $seq->{'base_width'} = $name_length; + $seq->{'width'} = $num_col; + } + return; +} + +####################################################### +####################################################### =pod - ## - ## Debugging code - ## - foreach my $s (@Sequences) { - next if ($s->{'title'} ne 'Bioenergetics: Enzyme Regulation'); - &Apache::lonnet::logthis('-----------------------------------'); - &Apache::lonnet::logthis('title = '.$s->{'title'}); - &Apache::lonnet::logthis('symb = '.$s->{'symb'}); - &Apache::lonnet::logthis('num_assess = '.$s->{'num_assess'}); - foreach my $a (@{$s->{'contents'}}) { - &Apache::lonnet::logthis(' --------------------------------'); - &Apache::lonnet::logthis(' title = '.$a->{'title'}); - &Apache::lonnet::logthis(' symb = '.$a->{'symb'}); - } - } +=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; } @@ -354,11 +598,10 @@ sub PrepareCourseData { =pod -=item &MapSelect($elementname,$status,$numvisible,$selected,$restriction) +=item &StudentDataSelect($elementname,$status,$numvisible,$selected) 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. +of the fields of student data available (fullname, username, id, section, etc) =over 4 @@ -368,50 +611,18 @@ If the top sequence is selected, the val =item $numvisible The number of options to be visible -=item $selected Array ref to the names of the already selected maps. -If undef, $ENV{'form.'.$elementname} is used. -If $ENV{'form.'.$elementname} is also empty, none will be selected. - -=item $restriction Code reference to subroutine which returns true or -false. The code must expect a reference to a sequence data structure. - =back =cut ############################################## ############################################## -sub MapSelect { - my ($elementname,$status,$numvisible,$selected,$restriction)=@_; +sub StudentDataSelect { + my ($elementname,$status,$numvisible)=@_; if ($numvisible < 1) { return; } # - # Set up array of selected items - my @Selected; - if (! defined($selected)) { - if (exists($ENV{'form.'.$elementname})) { - if (ref($ENV{'form.'.$elementname})) { - @Selected = @$ENV{'form.'.$elementname}; - } else { - @Selected = ($ENV{'form.'.$elementname}); - } - } else { - @Selected = (); - } - } else { - if (ref($selected)) { - @Selected = @$selected; - } else { - @Selected = ($selected); - } - } - # - # Set up the restriction call - if (! defined($restriction)) { - $restriction = sub { 1; }; - } - # # Build the form element my $Str = "\n"; $Str .= '\n"; return $Str; } - ############################################## ############################################## =pod -=item &SectionSelect($elementname,$status,$numvisible) +=item &MapSelect($elementname,$status,$numvisible,$restriction) Returns html for a selection box allowing the user to choose one (or more) -of the sections in the course. +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 @@ -455,10 +675,6 @@ of the sections in the course. =item $numvisible The number of options to be visible -=item $selected Array ref to the names of the already selected sections. -If undef, $ENV{'form.'.$elementname} is used. -If $ENV{'form.'.$elementname} is also empty, none will be selected. - =item $restriction Code reference to subroutine which returns true or false. The code must expect a reference to a sequence data structure. @@ -468,12 +684,20 @@ false. The code must expect a reference ############################################## ############################################## -sub SectionSelect { - my ($elementname,$status,$numvisible)=@_; +sub MapSelect { + my ($elementname,$status,$numvisible,$restriction)=@_; if ($numvisible < 1) { return; } # + # Set up array of selected items + &SetSelectedMaps($elementname); + # + # Set up the restriction call + if (! defined($restriction)) { + $restriction = sub { 1; }; + } + # # Build the form element my $Str = "\n"; $Str .= '\n"; return $Str; @@ -500,371 +743,64 @@ sub SectionSelect { ############################################## ############################################## -sub CheckFormElement { - my ($cache, $ENVName, $cacheName, $default)=@_; - - if(defined($ENV{'form.'.$ENVName})) { - $cache->{$cacheName} = $ENV{'form.'.$ENVName}; - } elsif(!defined($cache->{$cacheName})) { - $cache->{$cacheName} = $default; - } else { - $ENV{'form.'.$ENVName} = $cache->{$cacheName}; - } - return; -} - -sub ProcessFormData{ - my ($cache)=@_; - - $cache->{'reportKey'} = 'false'; - - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['download', - 'reportSelected', - 'StudentAssessmentStudent', - 'ProblemStatisticsSort']); - &CheckFormElement($cache, 'DownloadAll', 'DownloadAll', 'false'); - if ($cache->{'DownloadAll'} ne 'false') { - # Clean the hell out of that cache! - # We cannot untie the hash at this scope (stupid libgd :( ) - # So, remove every single key. What a waste of time.... - # Of course, if you are doing this you are probably resigned - # to waiting a while. - &Apache::lonnet::logthis("Cleaning out the cache file"); - while (my ($key,undef)=each(%$cache)) { - next if ($key eq 'DownloadAll'); - delete($cache->{$key}); - } - } - &CheckFormElement($cache, 'Status', 'Status', 'Active'); - &CheckFormElement($cache, 'postdata', 'reportSelected', 'Class list'); - &CheckFormElement($cache, 'reportSelected', 'reportSelected', - 'Class list'); - $cache->{'reportSelected'} = - &Apache::lonnet::unescape($cache->{'reportSelected'}); - &CheckFormElement($cache, 'sort', 'sort', 'fullname'); - &CheckFormElement($cache, 'download', 'download', 'false'); - &CheckFormElement($cache, 'StatisticsMaps', - 'StatisticsMaps', 'All Maps'); - &CheckFormElement($cache, 'StatisticsProblemSelect', - 'StatisticsProblemSelect', 'All Problems'); - &CheckFormElement($cache, 'StatisticsPartSelect', - 'StatisticsPartSelect', 'All Parts'); - if(defined($ENV{'form.Section'})) { - my @sectionsSelected = (ref($ENV{'form.Section'}) ? - @{$ENV{'form.Section'}} : - ($ENV{'form.Section'})); - $cache->{'sectionsSelected'} = join(':', @sectionsSelected); - } elsif(!defined($cache->{'sectionsSelected'})) { - $cache->{'sectionsSelected'} = $cache->{'sectionList'}; - } - - # student assessment - if(defined($ENV{'form.CreateStudentAssessment'}) || - defined($ENV{'form.NextStudent'}) || - defined($ENV{'form.PreviousStudent'})) { - $cache->{'reportSelected'} = 'Student Assessment'; - } - if(defined($ENV{'form.NextStudent'})) { - $cache->{'StudentAssessmentMove'} = 'next'; - } elsif(defined($ENV{'form.PreviousStudent'})) { - $cache->{'StudentAssessmentMove'} = 'previous'; - } else { - $cache->{'StudentAssessmentMove'} = 'selected'; - } - &CheckFormElement($cache, 'StudentAssessmentStudent', - 'StudentAssessmentStudent', 'All Students'); - $cache->{'StudentAssessmentStudent'} = - &Apache::lonnet::unescape($cache->{'StudentAssessmentStudent'}); - &CheckFormElement($cache, 'DefaultColumns', 'DefaultColumns', 'false'); - - # Problem analysis - &CheckFormElement($cache, 'Interval', 'Interval', '1'); - - # ProblemStatistcs - &CheckFormElement($cache, 'DisplayCSVFormat', - 'DisplayFormat', 'Display Table Format'); - &CheckFormElement($cache, 'ProblemStatisticsAscend', - 'ProblemStatisticsAscend', 'Ascending'); - &CheckFormElement($cache, 'ProblemStatisticsSort', - 'ProblemStatisticsSort', 'Homework Sets Order'); - &CheckFormElement($cache, 'DisplayLegend', 'DisplayLegend', - 'Hide Legend'); - &CheckFormElement($cache, 'SortProblems', 'SortProblems', - 'Sort Within Sequence'); - - # Search only form elements - my @headingColumns=(); - my @sequenceColumns=(); - my $foundColumn = 0; - if(defined($ENV{'form.ReselectColumns'})) { - my @reselected = (ref($ENV{'form.ReselectColumns'}) ? - @{$ENV{'form.ReselectColumns'}} - : ($ENV{'form.ReselectColumns'})); - foreach (@reselected) { - if(/HeadingColumn/) { - push(@headingColumns, $_); - $foundColumn = 1; - } elsif(/SequenceColumn/) { - push(@sequenceColumns, $_); - $foundColumn = 1; - } - } - } - - $cache->{'reportKey'} = 'false'; - if($cache->{'reportSelected'} eq 'Analyze') { - $cache->{'reportKey'} = 'Analyze'; - } elsif($cache->{'reportSelected'} eq 'DoDiffGraph') { - $cache->{'reportKey'} = 'DoDiffGraph'; - } elsif($cache->{'reportSelected'} eq 'PercentWrongGraph') { - $cache->{'reportKey'} = 'PercentWrongGraph'; - } - - if(defined($ENV{'form.DoDiffGraph'})) { - $cache->{'reportSelected'} = 'DoDiffGraph'; - $cache->{'reportKey'} = 'DoDiffGraph'; - } elsif(defined($ENV{'form.PercentWrongGraph'})) { - $cache->{'reportSelected'} = 'PercentWrongGraph'; - $cache->{'reportKey'} = 'PercentWrongGraph'; - } - - foreach (keys(%ENV)) { - if(/form\.Analyze/) { - $cache->{'reportSelected'} = 'Analyze'; - $cache->{'reportKey'} = 'Analyze'; - my $data; - (undef, $data)=split(':::', $_); - $cache->{'AnalyzeInfo'}=$data; - } elsif(/form\.HeadingColumn/) { - my $value = $_; - $value =~ s/form\.//; - push(@headingColumns, $value); - $foundColumn=1; - } elsif(/form\.SequenceColumn/) { - my $value = $_; - $value =~ s/form\.//; - push(@sequenceColumns, $value); - $foundColumn=1; - } - } - - if($foundColumn) { - $cache->{'HeadingsFound'} = join(':', @headingColumns); - $cache->{'SequencesFound'} = join(':', @sequenceColumns);; - } - if(!defined($cache->{'HeadingsFound'}) || - $cache->{'DefaultColumns'} ne 'false') { - $cache->{'HeadingsFound'}='HeadingColumnFull Name'; - } - if(!defined($cache->{'SequencesFound'}) || - $cache->{'DefaultColumns'} ne 'false') { - $cache->{'SequencesFound'}='All Sequences'; - } - $cache->{'DefaultColumns'} = 'false'; - - return; -} - -=pod - -=item &SortStudents() - -Determines which students to display and in which order. Which are -displayed are determined by their status(active/expired). The order -is determined by the sort button pressed (default to username). The -type of sorting is username, lastname, or section. - -=over 4 - -Input: $students, $CacheData - -$students: A array pointer to a list of students (username:domain) - -$CacheData: A pointer to the hash tied to the cached data - -Output: \@order - -@order: An ordered list of students (username:domain) - -=back - -=cut - -sub SortStudents { - my ($cache)=@_; - - my @students = split(':::',$cache->{'NamesOfStudents'}); - my @sorted1Students=(); - foreach (@students) { - if($cache->{'Status'} eq 'Any' || - $cache->{$_.':Status'} eq $cache->{'Status'}) { - push(@sorted1Students, $_); - } - } - - my $sortBy = ''; - if(defined($cache->{'sort'})) { - $sortBy = ':'.$cache->{'sort'}; - } else { - $sortBy = ':fullname'; - } - my @order = sort { lc($cache->{$a.$sortBy}) cmp lc($cache->{$b.$sortBy}) || - lc($cache->{$a.':fullname'}) cmp lc($cache->{$b.':fullname'}) } - @sorted1Students; - - return \@order; -} - -=pod +=pod -=item &SpaceColumns() +=item &SectionSelect($elementname,$status,$numvisible) -Determines the width of all the columns in the chart. It is based on -the max of the data for that column and its header. +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 -Input: $students, $studentInformation, $headings, $ChartDB - -$students: An array pointer to a list of students (username:domain) - -$studentInformatin: The type of data for the student information. It is -used as part of the key in $CacheData. - -$headings: The name of the student information columns. +=item $elementname The name of the HTML form element -$ChartDB: The name of the cache database which is opened for read/write. +=item $status 'multiple' or 'single' selection box -Output: None - All data stored in cache. +=item $numvisible The number of options to be visible =back =cut -sub SpaceColumns { - my ($students,$studentInformation,$headings,$cache)=@_; - - # Initialize Lengths - for(my $index=0; $index<(scalar @$headings); $index++) { - my @titleLength=split(//,$headings->[$index]); - $cache->{$studentInformation->[$index].':columnWidth'}= - scalar @titleLength; - } - - foreach my $name (@$students) { - foreach (@$studentInformation) { - my @dataLength=split(//,$cache->{$name.':'.$_}); - my $length=(scalar @dataLength); - if($length > $cache->{$_.':columnWidth'}) { - $cache->{$_.':columnWidth'}=$length; - } - } - } - - return; -} - -sub PrepareData { - my ($c, $cacheDB, $studentInformation, $headings,$r)=@_; - - # Test for access to the cache data - my $courseID=$ENV{'request.course.id'}; - my $isRecalculate=0; - if(defined($ENV{'form.Recalculate'})) { - $isRecalculate=1; - } - - my $isCached = &Apache::loncoursedata::TestCacheData($cacheDB, - $isRecalculate); - if($isCached < 0) { - return "Unable to tie hash to db file."; - } - - # Download class list information if not using cached data - my %cache; - unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_WRCREAT(),0640)) { - return "Unable to tie hash to db file."; - } - -# if(!$isCached) { - my $processTopResourceMapReturn= - &Apache::loncoursedata::ProcessTopResourceMap(\%cache, $c); - if($processTopResourceMapReturn ne 'OK') { - untie(%cache); - return $processTopResourceMapReturn; - } - # } - - if($c->aborted()) { - untie(%cache); - return 'aborted'; - } - - my $classlist=&Apache::loncoursedata::DownloadClasslist($courseID, - $cache{'ClasslistTimestamp'}, - $c); - foreach (keys(%$classlist)) { - if(/^(con_lost|error|no_such_host)/i) { - untie(%cache); - return "Error getting student data."; - } - } - - if($c->aborted()) { - untie(%cache); - return 'aborted'; +############################################## +############################################## +sub SectionSelect { + my ($elementname,$status,$numvisible)=@_; + if ($numvisible < 1) { + return; } - - # Active is a temporary solution, remember to change - Apache::loncoursedata::ProcessClasslist(\%cache,$classlist,$courseID,$c); - if($c->aborted()) { - untie(%cache); - return 'aborted'; + # + # Make sure we have the data we need to continue + if (! @Sections) { + &PrepareClasslist() } - - &ProcessFormData(\%cache); - my $students = &SortStudents(\%cache); - &SpaceColumns($students, $studentInformation, $headings, \%cache); - $cache{'updateTime:columnWidth'}=24; - - my $download = $cache{'download'}; - my $downloadAll = $cache{'DownloadAll'}; - my @allStudents=(); - if($download ne 'false') { - $cache{'download'} = 'false'; - } elsif($downloadAll ne 'false') { - $cache{'DownloadAll'} = 'false'; - if($downloadAll eq 'sorted') { - @allStudents = @$students; - } else { - @allStudents = split(':::', $cache{'NamesOfStudents'}); - } + # + # Build the form element + my $Str = "\n"; + $Str .= '\n"; + return $Str; } +################################################## +################################################## sub DisplayClasslist { my ($r)=@_; # @@ -874,13 +810,13 @@ sub DisplayClasslist { $Str .= '
'."\n"; $Str .= ''."\n"; foreach my $field (@Fields) { - $Str .= ''; } $Str .= ''."\n"; # my $alternate = 0; - foreach my $student (@Students) { + foreach my $student (@Students) { # @Students is a package variable my $sname = $student->{'username'}.':'.$student->{'domain'}; if($alternate) { $Str .= ''; @@ -893,9 +829,10 @@ sub DisplayClasslist { $Str .= '
'.$field. + $Str .= ''.$field. '
'; if ($field eq 'fullname') { $Str .= ''; + $Str .= &Apache::lonnet::escape('student_assessment'); + $Str .= '&sort='.&Apache::lonnet::escape($ENV{'form.sort'}); + $Str .= '&SelectedStudent='; + $Str .= &Apache::lonnet::escape($sname).'">'; $Str .= $student->{$field}.' '; $Str .= ''; } else { @@ -913,249 +850,71 @@ sub DisplayClasslist { return; } -sub BuildClasslist { - my ($cacheDB,$students,$studentInformation,$headings,$r)=@_; - - my %cache; - unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) { - return 'Unable to tie database.'; - } - -# my $Ptr = ''; -# $Ptr .= ''; -# $Ptr .= ''."\n"; -# $Ptr .= '
Select Sections'; -# $Ptr .= ''."\n"; -# my @sectionsSelected = split(':',$cache{'sectionsSelected'}); -# my @sections = split(':',$cache{'sectionList'}); -# $Ptr .= &Apache::lonhtmlcommon::MultipleSectionSelect(\@sections, -# \@sectionsSelected, -# 'Statistics'); -# $Ptr .= '

'; -# $r->print($Ptr); -# $r->rflush(); -# my %mySections = (); -# foreach (@sections) { $mySections{$_} = 'True'; } -# $r->print("
$cache{'sectionsSelected'}
"); - - my $Str=''; - $Str .= '
'."\n"; - $Str .= ''."\n"; - - my $displayString = ''."\n"; - $Str .= &Apache::lonhtmlcommon::CreateHeadings(\%cache, - $studentInformation, - $headings, $displayString); - $Str .= ''."\n"; - - my $alternate=0; - foreach (@$students) { -# if ($mySections{$cache{$_.':'.'section'}} ne 'True') {next;} - my ($username, $domain) = split(':', $_); - if($alternate) { - $Str .= ''; - } else { - $Str .= ''; - } - $alternate = ($alternate + 1) % 2; - foreach my $data (@$studentInformation) { - $Str .= ''."\n"; - } - } - - $Str .= ''."\n"; - $Str .= '
DISPLAYDATA 
'; - if($data eq 'fullname') { - $Str .= ''; - $Str .= $cache{$_.':'.$data}.' '; - $Str .= ''; - } elsif($data eq 'updateTime') { - $Str .= ''; - $Str .= $cache{$_.':'.$data}.' '; - $Str .= ' '; - } else { - $Str .= $cache{$_.':'.$data}.' '; - } - - $Str .= '
'."\n"; - $r->print($Str); - $r->rflush(); - - untie(%cache); - - return; -} - +############################################## +############################################## sub CreateMainMenu { - my ($status, $reports)=@_; - + my ($status,$reports,$current)=@_; + # my $Str = ''; - + # $Str .= ''."\n"; - $Str .= ''."\n"; + $Str .= ''."\n"; $Str .= ''."\n"; - $Str .= ''."\n"; + $Str .= ''."\n"; + $Str .= ''."\n"; $Str .= ''."\n"; - $Str .= '\n"; + # $Str .= ''."\n"; - - $Str .= ''."\n"; - + # + $Str .= ''; + $Str .= '\n"; $Str .= '
Select a ReportStudent Status
'. + "'; - $Str .= ''."\n"; foreach (sort(keys(%$reports))) { - next if($_ eq 'reportSelected'); - $Str .= ''."\n"; } $Str .= ''; - $Str .= &Apache::lonhtmlcommon::StatusOptions($status, 'Statistics'); - $Str .= ''.(' 'x30).''. + ''. + "
'."\n"; $Str .= '
'."\n"; - + # return $Str; } -sub BuildStatistics { - my ($r)=@_; - - my $c = $r->connection; - my @studentInformation=('fullname','section','id','domain','username', - 'updateTime'); - my @headings=('Full Name', 'Section', 'PID', 'Domain', 'User Name', - 'Last Updated'); - my $spacing = ' '; - - my %reports = ('classlist' => 'Class list', - 'problem_statistics' => 'Problem Statistics', - 'student_assessment' => 'Student Assessment', - 'percentage' => 'Correct-problems Plot', -# 'activitylog' => 'Activity Log', - 'reportSelected' => 'Class list'); - - my %cache; - my $courseID=$ENV{'request.course.id'}; - my $cacheDB = "/home/httpd/perl/tmp/$ENV{'user.name'}". - "_$ENV{'user.domain'}_$courseID\_statistics.db"; - - $r->print(&Apache::lonhtmlcommon::Title('Course Statistics and Charts')); - - my ($returnValue, $students) = &PrepareData($c, $cacheDB, - \@studentInformation, - \@headings,$r); - if($returnValue ne 'OK') { - $r->print($returnValue."\n".''); - return OK; - } - if(!$c->aborted()) { - &Apache::loncoursedata::CheckForResidualDownload($cacheDB, - 'true', 'true', - $courseID, - $r, $c); - } - - my $GoToPage; - if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) { - $GoToPage = $cache{'reportSelected'}; - $reports{'reportSelected'} = $cache{'reportSelected'}; - if(defined($cache{'reportKey'}) && - !exists($reports{$cache{'reportKey'}}) && - $cache{'reportKey'} ne 'false') { - $reports{$cache{'reportKey'}} = $cache{'reportSelected'}; - } - - if(defined($cache{'OptionResponses'})) { - $reports{'problem_analysis'} = 'Option Response Analysis'; - } - - $r->print('
print('method="post" action="/adm/statistics">'); - $r->print(&CreateMainMenu($cache{'Status'}, \%reports)); - $r->rflush(); - untie(%cache); - } else { - $r->print('Unable to tie database.'); - return OK; - } - - if($GoToPage eq 'Activity Log') { - &Apache::lonproblemstatistics::Activity(); - } elsif($GoToPage eq 'Problem Statistics') { - &Apache::lonproblemstatistics::BuildProblemStatisticsPage($cacheDB, - $students, - $courseID, - $c,$r); - } elsif($GoToPage eq 'Option Response Analysis') { - &Apache::lonproblemanalysis::BuildProblemAnalysisPage($cacheDB, $r); - } elsif($GoToPage eq 'Student Assessment') { - &Apache::lonstudentassessment::BuildStudentAssessmentPage($cacheDB, - $students, - $courseID, - 'Statistics', - \@headings, - $spacing, - \@studentInformation, - $r, $c); - } elsif($GoToPage eq 'Analyze') { - &Apache::lonproblemanalysis::BuildAnalyzePage($cacheDB, $students, - $courseID, $r); - } elsif($GoToPage eq 'DoDiffGraph' || $GoToPage eq 'PercentWrongGraph') { - my $courseDescription = $ENV{'course.'.$courseID.'.description'}; - $courseDescription =~ s/\ /"_"/eg; - &Apache::lonproblemstatistics::BuildGraphicChart($GoToPage, $cacheDB, - $courseDescription, - $students, $courseID, - $r, $c); - } elsif($GoToPage eq 'Class list') { - &DisplayClasslist($r); -# &BuildClasslist($cacheDB, $students, \@studentInformation, -# \@headings, $r); - } elsif($GoToPage eq 'Correct-problems Plot') { - &Apache::lonpercentage::BuildPercentageGraph($cacheDB, $students, - $courseID, $c, $r); - } - - $r->print('
'."\n"); - $r->print("\n".''."\n".''); - $r->rflush(); - - return OK; -} - -# ================================================================ Main Handler - +############################################## +############################################## sub handler { my $r=shift; - -# $jr = $r; - + 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; } - - unless(&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) { + # + # Check for access + if (! &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) { $ENV{'user.error.msg'}= - $r->uri.":vgr:0:0:Cannot view grades for complete course"; - return HTTP_NOT_ACCEPTABLE; + $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'}= + $r->uri.":vgr:0:0:Cannot view grades with given role"; + return HTTP_NOT_ACCEPTABLE; + } } - + # # Set document type for header only if($r->header_only) { if ($ENV{'browser.mathml'}) { @@ -1167,34 +926,101 @@ sub handler { $r->send_http_header; return OK; } - - unless($ENV{'request.course.fn'}) { - my $requrl=$r->uri; - $ENV{'user.error.msg'}="$requrl:bre:0:0:Course not initialized"; - return HTTP_NOT_ACCEPTABLE; - } - + # + # Send the header $r->content_type('text/html'); $r->send_http_header; - + # + # Extract form elements from query string &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['sort']); - - &PrepareClasslist($r); - + ['sort','reportSelected', + 'SelectedStudent']); + if (! exists($ENV{'form.reportSelected'})) { + $ENV{'form.reportSelected'} = 'student_assessment'; + } + # + # Give the LON-CAPA page header + $r->print(&Apache::lonhtmlcommon::Title('Course Statistics and Charts')); + $r->rflush(); + # + if (! &Apache::lonmysql::verify_sql_connection()) { + my $serveradmin = $r->dir_config('lonAdmEMail'); + $r->print(<Unable to connect to database! +

+Please notify the server administrator $serveradmin. +

+Course Statistics and Charts cannot be retrieved until the database is +restarted. Your data is intact but cannot be displayed at this time. +

+ + +END + return; + } + # + # Clean out the caches + if (exists($ENV{'form.ClearCache'})) { + &Apache::loncoursedata::delete_caches($ENV{'requres.course.id'}); + } + # + # Set up the statistics and chart environment + &PrepareClasslist(); &PrepareCourseData($r); - - &BuildStatistics($r); - + # + # Begin form output + $r->print('
print('method="post" action="/adm/statistics">'); + # + # Print main menu + my %reports = ('classlist' => 'Class list', + 'problem_statistics' => 'Problem Statistics', + 'student_assessment' => 'Problem Status Chart', +# 'percentage' => 'Correct-problems Plot', +# 'option_response' => 'Option Response Analysis', +# 'activitylog' => 'Activity Log', + ); + $r->print(&CreateMainMenu($ENV{'form.status'}, + \%reports,$ENV{'form.reportSelected'})); + $r->rflush(); + # + my $GoToPage = $ENV{'form.reportSelected'}; + if($GoToPage eq 'activitylog') { +# &Apache::lonproblemstatistics::Activity(); + } elsif($GoToPage eq 'problem_statistics') { + &Apache::lonproblemstatistics::BuildProblemStatisticsPage($r,$c); + } elsif($GoToPage eq 'option_response') { +# &Apache::lonproblemanalysis::BuildProblemAnalysisPage($r,$c); + } elsif($GoToPage eq 'student_assessment') { + &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); + } + # + $r->print("
\n"); + $r->print("\n\n"); + $r->rflush(); + # return OK; } + 1; +####################################################### +####################################################### + =pod =back =cut +####################################################### +####################################################### + __END__