--- loncom/interface/lonstatistics.pm 2005/01/05 20:34:20 1.112
+++ loncom/interface/lonstatistics.pm 2006/05/18 01:08:50 1.135
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstatistics.pm,v 1.112 2005/01/05 20:34:20 matthew Exp $
+# $Id: lonstatistics.pm,v 1.135 2006/05/18 01:08:50 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -49,24 +49,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,6 +75,7 @@ use Apache::lonstudentassessment();
use Apache::lonpercentage;
use Apache::lonstudentsubmissions();
use Apache::lonsurveyreports();
+use Apache::longradinganalysis();
#######################################################
#######################################################
@@ -92,6 +90,8 @@ use Apache::lonsurveyreports();
=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
@@ -128,7 +128,7 @@ undef the following package variables:
=item @Sections
-=item @SelectedSections
+=item @Groups
=item %StudentData
@@ -152,7 +152,7 @@ sub clear_classlist_variables {
undef(@FullClasslist);
undef(@Students);
undef(@Sections);
- undef(@SelectedSections);
+ undef(@Groups);
undef(%StudentData);
undef(@SelectedStudentData);
undef($curr_student);
@@ -178,7 +178,7 @@ the following package variables:
=item @Sections
-=item @SelectedSections
+=item @Groups
=item %StudentData
@@ -204,32 +204,21 @@ sub PrepareClasslist {
&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 +228,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 +255,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 +276,62 @@ 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);
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 +353,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');
}
@@ -338,158 +369,178 @@ sub PrepareClasslist {
return;
}
-
#######################################################
#######################################################
=pod
-=item get_students
+=item get_selected_sections
-Returns a list of the selected students
+Returns an array of the selected sections
=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;
+ #
+ # Deal with instructors with restricted section access
+ if ($env{'request.course.sec'} !~ /^\s*$/) {
+ @selected_sections = ($env{'request.course.sec'});
+ }
+ return @selected_sections;
}
#######################################################
#######################################################
-
+
=pod
-
-=item ¤t_student()
-
-Returns a pointer to a hash containing data about the currently
-selected student.
-
+
+=item get_selected_groups
+
+Returns an array of the selected groups
+
=cut
-
+
#######################################################
#######################################################
-sub current_student {
- return $curr_student;
+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 &previous_student()
-
-Returns a pointer to a hash containing data about the student prior
-in the list of students. Or something.
-
-=cut
+=item §ion_and_enrollment_description
-#######################################################
-#######################################################
-sub previous_student {
- return $prev_student;
-}
+Returns a string describing the currently selected section(s), group(s) and
+enrollment status.
-#######################################################
-#######################################################
-
-=pod
-
-=item &next_student()
-
-Returns a pointer to a hash containing data about the next student
-to be viewed.
+Inputs: mode = 'plaintext' or 'localized' (defaults to 'localized')
+ 'plaintext' is used for example in Excel spreadsheets.
+Returns: scalar description string.
=cut
#######################################################
#######################################################
-sub next_student {
- return $next_student;
+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 enrollment');
+ } elsif ($mode eq 'plaintext') {
+ $description = 'Unable to determine section, groups and enrollment';
+ } else {
+ $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(' [_1] enrollment status.',$env{'form.Status'});
+ } elsif ($mode eq 'plaintext') {
+ $description .= ' '.$env{'form.Status'}.' enrollment status.';
+ }
+ return $description;
}
#######################################################
#######################################################
-=pod
-
-=item &clear_sequence_variables()
-
-=cut
-
-#######################################################
-#######################################################
-sub clear_sequence_variables {
- undef($top_map);
- undef(@Sequences);
- undef(@Assessments);
+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('[_1] [_2].',$phrases{$type}{single},$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('[_1].',$phrases{$type}{all});
+ } elsif ($mode eq 'plaintext') {
+ $text = $phrases{$type}{all}.'.';
+ }
+ } elsif (scalar(@items)) {
+ my $lastitem = pop(@items);
+ if ($mode eq 'localized') {
+ $text = &mt('[_1] [_2] and [_3].',$phrases{$type}{plural},
+ join(', ',@items),$lastitem);
+ } elsif ($mode eq 'plaintext') {
+ $text = $phrases{$type}{plural}.' '.join(', ',@items).' and '.
+ $lastitem.'.';
+ }
+ }
+ return $text;
}
-#######################################################
-#######################################################
=pod
-=item &SetSelectedMaps($elementname)
+=item get_students
-Sets the @SelectedMaps array from $ENV{'form.'.$elementname};
+Returns a list of the selected students
=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');
+sub get_students {
+ if (! @Students) {
+ &PrepareClasslist()
}
+ return @Students;
}
-
#######################################################
#######################################################
=pod
-=item &Sequences_with_Assess()
+=item ¤t_student()
-Returns an array containing the subset of @Sequences which contain
-assessments.
+Returns a pointer to a hash containing data about the currently
+selected student.
=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
- }
- }
- }
-
- }
- return @Sequences_to_Show;
+sub current_student {
+ return $curr_student;
}
#######################################################
@@ -497,26 +548,17 @@ sub Sequences_with_Assess {
=pod
-=item &PrepareCourseData($r)
+=item &previous_student()
+
+Returns a pointer to a hash containing data about the student prior
+in the list of students. Or something.
=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;
- }
- $top_map = $top if (ref($top));
- @Sequences = @{$sequences} if (ref($sequences) eq 'ARRAY');
- @Assessments = @{$assessments} if (ref($assessments) eq 'ARRAY');
- return;
+sub previous_student {
+ return $prev_student;
}
#######################################################
@@ -524,60 +566,17 @@ sub PrepareCourseData {
=pod
-=item &log_sequence($sequence,$recursive,$padding)
+=item &next_student()
-Write data about the sequence to a logfile. If $recursive is not
-undef the data is written recursively. $padding is used for recursive
-calls.
+Returns a pointer to a hash containing data about the next student
+to be viewed.
=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 next_student {
+ return $next_student;
}
##############################################
@@ -643,12 +642,96 @@ sub StudentDataSelect {
return $Str;
}
+#######################################################
+#######################################################
+
+=pod
+
+=item &get_selected_maps($elementname)
+
+Input: Name of the <select> form element used to specify the maps.
+
+Returns: Array of symbs of selected maps or the description 'all'.
+ If form.$elementname does not exist, 'all' is returned.
+
+=cut
+
+#######################################################
+#######################################################
+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;
+}
+
+
+#######################################################
+#######################################################
+
+=pod
+
+=item &selected_sequences_with_assessments
+
+Retrieve the sequences which were selected by the user to show.
+
+Input: $mode: scalar. Either 'selected' or 'all'. If not specified,
+ 'selected' is used.
+
+Returns: an array containing a navmap object and navmap resources,
+ or an array containing a scalar with an error message.
+
+=cut
+
+#######################################################
+#######################################################
+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 @sequences_with_assessments;
+ for my $sequence ($navmap->getById('0.0'), @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
+ }
+ }
+ }
+
+ }
+ return $navmap,@sequences_to_show;
+}
+
##############################################
##############################################
=pod
-=item &MapSelect($elementname,$status,$numvisible,$restriction)
+=item &map_select($elementname,$status,$numvisible,$restriction)
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.
@@ -662,69 +745,56 @@ If the top sequence is selected, the val
=item $numvisible The number of options to be visible
-=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,$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 .= '<select name="'.$elementname.'" ';
+ my $form = "\n";
+ $form .= '<select name="'.$elementname.'" ';
if ($status ne 'single') {
- $Str .= 'multiple="true" ';
- }
- $Str .= 'size="'.$numvisible.'" >'."\n";
- #
- # Deal with 'all'
- foreach (@SelectedMaps) {
- if ($_ eq 'all') {
- @SelectedMaps = ('all');
- last;
- }
+ $form .= 'multiple="true" ';
}
+ $form .= 'size="'.$numvisible.'" >'."\n";
#
# Put in option for 'all'
- $Str .= ' <option value="all" ';
- foreach (@SelectedMaps) {
- if ($_ eq 'all') {
- $Str .= 'selected ';
- last;
- }
+ $form .= ' <option value="all" ';
+ if ($selected_maps[0] eq 'all') {
+ $form .= 'selected ';
}
- $Str .= ">all</option>\n";
+ $form .= ">all</option>\n";
#
# Loop through the sequences
- foreach my $seq (@Sequences) {
- next if (! $restriction->($seq));
- $Str .= ' <option value="'.$seq->{'symb'}.'" ';
- foreach (@SelectedMaps) {
- if ($seq->{'symb'} eq $_) {
- $Str .= 'selected ';
+ my @sequences = &selected_sequences_with_assessments('all');
+ my $navmap;
+ if (!ref($sequences[0])) {
+ return $sequences[0];
+ } else {
+ $navmap = shift(@sequences);
+ }
+ foreach my $seq (@sequences){
+ $form .= ' <option value="'.$seq->symb.'" ';
+ foreach (@selected_maps) {
+ if ($seq->symb eq $_) {
+ $form .= 'selected ';
last;
}
}
- $Str .= '>'.$seq->{'title'}."</option>\n";
+ $form .= '>'.$seq->compTitle."</option>\n";
}
- $Str .= "</select>\n";
- return $Str;
+ $form .= "</select>\n";
+ return $form;
}
##############################################
@@ -737,7 +807,7 @@ sub MapSelect {
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
+Uses the package variables @Sections
=over 4
=item $elementname The name of the HTML form element
@@ -774,7 +844,7 @@ sub SectionSelect {
# Loop through the sequences
foreach my $s (@Sections) {
$Str .= ' <option value="'.$s.'" ';
- foreach (@SelectedSections) {
+ foreach (&get_selected_sections()) {
if ($s eq $_) {
$Str .= 'selected ';
last;
@@ -786,91 +856,65 @@ sub SectionSelect {
return $Str;
}
-###############################################
-###############################################
-
-=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.
-
+##############################################
+##############################################
+
+=pod
+
+=item &GroupSelect($elementname,$status,$numvisible)
+
+Returns html for a selection box allowing the user to choose one (or more)
+of the groups in the course.
+
+Uses the package variables @Groups
+=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 Gather_Full_Student_Data {
- my ($r,$formname,$inputname) = @_;
- my $status_type;
- if (defined($formname)) {
- $status_type = 'inline';
- } else {
- $status_type = 'popup';
+
+##############################################
+##############################################
+sub GroupSelect {
+ my ($elementname,$status,$numvisible)=@_;
+ if ($numvisible < 1) {
+ return;
}
- my $c = $r->connection();
#
- &Apache::loncoursedata::clear_internal_caches();
+ # Make sure we have the data we need to continue
+ if (! @Groups) {
+ &PrepareClasslist();
+ }
#
- my @Students = @Apache::lonstatistics::Students;
+ # Build the form element
+ my $Str = "\n";
+ $Str .= '<select name="'.$elementname.'" ';
+ if ($status ne 'single') {
+ $Str .= 'multiple="true" ';
+ }
+ $Str .= 'size="'.$numvisible.'" >'."\n";
#
- # 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'));
+ # Loop through the groups
+ foreach my $s (@Groups) {
+ $Str .= ' <option value="'.$s.'" ';
+ foreach my $group (&get_selected_groups()) {
+ if ($s eq $group) {
+ $Str .= 'selected ';
+ last;
+ }
+ }
+ $Str .= '>'.$s."</option>\n";
}
- &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
- $r->rflush();
+ $Str .= "</select>\n";
}
+
##################################################
##################################################
sub DisplayClasslist {
@@ -880,16 +924,20 @@ sub DisplayClasslist {
#
# Output some of the standard interface components
my $Str;
- $Str .= &Apache::lonhtmlcommon::breadcrumbs(undef,'Select One Student');
+ $Str .= &Apache::lonhtmlcommon::breadcrumbs('Select One Student');
$Str .= '<p><table cellspacing="5">'."\n";
$Str .= '<tr>';
$Str .= '<th align="center"><b>'.&mt('Sections').'</b></th>';
+ $Str .= '<th align="center"><b>'.&mt('Groups').'</b></th>';
$Str .= '<th align="center"><b>'.&mt('Enrollment Status').'</b></th>';
$Str .= '</tr>'.$/;
$Str .= '<tr>';
$Str .= '<td>'.
&Apache::lonstatistics::SectionSelect('Section','multiple',5).
'</td>';
+ $Str .= '<td>'.
+ &Apache::lonstatistics::GroupSelect('Group','multiple',5).
+ '</td>';
$Str .= '<td>'.
&Apache::lonhtmlcommon::StatusOptions(undef,undef,5).
'</td>';
@@ -901,35 +949,36 @@ sub DisplayClasslist {
$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') {
+ if ($selected_sections[0] eq 'all') {
+ if (lc($env{'form.Status'}) eq 'any') {
$Str .= '<h2>'.
&mt('There are no students in the course.').
'</h2>';
- } elsif (lc($ENV{'form.Status'}) eq 'active') {
+ } elsif (lc($env{'form.Status'}) eq 'active') {
$Str .= '<h2>'.
&mt('There are no currently enrolled students in the course.').
'</h2>';
- } elsif (lc($ENV{'form.Status'}) eq 'expired') {
+ } elsif (lc($env{'form.Status'}) eq 'expired') {
$Str .= '<h2>'.
&mt('There are no previously enrolled students in the course.').
'</h2>';
}
} else {
my $sections;
- if (lc($ENV{'form.Status'}) eq 'any') {
+ if (lc($env{'form.Status'}) eq 'any') {
$Str .= '<h2>'.
&mt('There are no students in the selected sections.').
'</h2>';
- } elsif (lc($ENV{'form.Status'}) eq 'active') {
+ } elsif (lc($env{'form.Status'}) eq 'active') {
$Str .= '<h2>'.
&mt('There are no currently enrolled students in the selected sections.').
'</h2>';
- } elsif (lc($ENV{'form.Status'}) eq 'expired') {
+ } elsif (lc($env{'form.Status'}) eq 'expired') {
$Str .= '<h2>'.
&mt('There are no previously enrolled students in the selected sections.').
'</h2>';
@@ -970,7 +1019,7 @@ sub DisplayClasslist {
if ($field eq 'fullname' || $field eq 'username') {
$Str .= '<a href="/adm/statistics?reportSelected=';
$Str .= &Apache::lonnet::escape('student_assessment');
- $Str .= '&sort='.&Apache::lonnet::escape($ENV{'form.sort'});
+ $Str .= '&sort='.&Apache::lonnet::escape($env{'form.sort'});
$Str .= '&SelectedStudent=';
$Str .= &Apache::lonnet::escape($sname).'">';
$Str .= $student->{$field}.' ';
@@ -1027,6 +1076,11 @@ sub CreateMainMenu {
short_description =>
&mt('Display a histogram of student performance in the course.'),
},
+# { internal_name => 'grading_analysis',
+# name => &mt('Detailed Grading Analysis'),
+# short_description =>
+# &mt('Display statistics about who graded who.'),
+# },
# { internal_name => 'student_assessment',
# name => &mt('Problem Status Chart'),
# short_description =>
@@ -1062,16 +1116,16 @@ sub handler {
if ($loaderror) { return $loaderror; }
$loaderror=
&Apache::lonnet::overloaderror($r,
- $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+ $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;
}
@@ -1097,11 +1151,9 @@ sub handler {
td.essay { border: 1px solid gray; }
</style>
ENDSTYLE
- $r->print('<html><head><title>'.
- &mt('Course Statistics and Charts').
- '</title>'.$style.
- "</head>\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
@@ -1111,10 +1163,9 @@ 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 {
#
@@ -1131,13 +1182,13 @@ ENDSTYLE
'retrieved until the database is restarted. '.
'Your data is intact but cannot be displayed '.
'at this time.').'</p>');
- $r->print('</body></html>');
+ $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'});
}
#
# Begin form output
@@ -1145,10 +1196,7 @@ ENDSTYLE
$r->print('method="post" action="/adm/statistics">');
$r->rflush();
#
- my $GoToPage = $ENV{'form.reportSelected'};
- #
- # Set up the statistics and chart environment
- &PrepareCourseData($r);
+ my $GoToPage = $env{'form.reportSelected'};
#
$r->print('<input type="hidden" name="reportSelected" value="'.
$GoToPage.'">');
@@ -1193,11 +1241,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("</form>\n");
}
- $r->print("</body>\n</html>\n");
+ $r->print(&Apache::loncommon::end_page());
$r->rflush();
#
return OK;