--- loncom/interface/lonstatistics.pm 2003/05/12 22:07:17 1.68
+++ 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.68 2003/05/12 22:07:17 matthew Exp $
+# $Id: lonstatistics.pm,v 1.74 2003/06/03 18:10:33 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -206,7 +206,6 @@ upon the calling context.
#######################################################
#######################################################
sub PrepareClasslist {
- my $r = shift;
my %Sections;
&clear_classlist_variables();
#
@@ -230,6 +229,11 @@ sub PrepareClasslist {
}
}
#
+ # 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) {
@@ -238,7 +242,6 @@ sub PrepareClasslist {
$StudentData{$field}->{'width'} =
$StudentData{$field}->{'base_width'};
}
-
#
# get the status requested
my $requested_status = 'Active';
@@ -282,8 +285,12 @@ sub PrepareClasslist {
}
#
# Put the consolidated section data in the right place
- @Sections = sort {$a cmp $b} keys(%Sections);
- unshift(@Sections,'all'); # Put 'all' at the front of the list
+ 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';
@@ -293,9 +300,10 @@ sub PrepareClasslist {
@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) ||
@@ -303,15 +311,17 @@ 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 ($i == $#Students) {
- $next_student = 'none';
- } else {
- $next_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];
+ }
}
}
#
@@ -322,7 +332,7 @@ sub PrepareClasslist {
@SelectedStudentData = ($ENV{'form.StudentData'});
}
} else {
- @SelectedStudentData = ('fullname');
+ @SelectedStudentData = ('username');
}
foreach (@SelectedStudentData) {
if ($_ eq 'all') {
@@ -334,6 +344,27 @@ sub PrepareClasslist {
return;
}
+
+#######################################################
+#######################################################
+
+=pod
+
+=item get_students
+
+Returns a list of the selected students
+
+=cut
+
+#######################################################
+#######################################################
+sub get_students {
+ if (! @Students) {
+ &PrepareClasslist()
+ }
+ return @Students;
+}
+
#######################################################
#######################################################
@@ -349,11 +380,7 @@ selected student.
#######################################################
#######################################################
sub current_student {
- if (defined($curr_student)) {
- return $curr_student;
- } else {
- return 'All Students';
- }
+ return $curr_student;
}
#######################################################
@@ -371,11 +398,7 @@ in the list of students. Or something.
#######################################################
#######################################################
sub previous_student {
- if (defined($prev_student)) {
- return $prev_student;
- } else {
- return 'No Student Selected';
- }
+ return $prev_student;
}
#######################################################
@@ -393,11 +416,7 @@ to be viewed.
#######################################################
#######################################################
sub next_student {
- if (defined($next_student)) {
- return $next_student;
- } else {
- return 'No Student Selected';
- }
+ return $next_student;
}
#######################################################
@@ -731,6 +750,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
=over 4
=item $elementname The name of the HTML form element
@@ -739,13 +759,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.
-
=back
=cut
@@ -758,6 +771,11 @@ sub SectionSelect {
return;
}
#
+ # Make sure we have the data we need to continue
+ if (! @Sections) {
+ &PrepareClasslist()
+ }
+ #
# Build the form element
my $Str = "\n";
$Str .= '<select name="'.$elementname.'" ';
@@ -812,7 +830,8 @@ sub DisplayClasslist {
if ($field eq 'fullname') {
$Str .= '<a href="/adm/statistics?reportSelected=';
$Str .= &Apache::lonnet::escape('student_assessment');
- $Str .= '&StudentAssessmentStudent=';
+ $Str .= '&sort='.&Apache::lonnet::escape($ENV{'form.sort'});
+ $Str .= '&SelectedStudent=';
$Str .= &Apache::lonnet::escape($sname).'">';
$Str .= $student->{$field}.' ';
$Str .= '</a>';
@@ -840,16 +859,14 @@ sub CreateMainMenu {
#
$Str .= '<table border="0"><tbody><tr>'."\n";
$Str .= '<td></td>'."\n";
- $Str .= '<td></td>'."\n";
$Str .= '<td align="center"><b>Select a Report</b></td>'."\n";
+ $Str .= '<td></td>'."\n";
+ $Str .= '<td></td>'."\n";
$Str .= '<tr>'."\n";
#
$Str .= '<td align="center">'.
'<input type="submit" name="Refresh" value="Update Display" />'.
"</td>\n";
- $Str .= '<td align="center">'.
- '<input type="submit" name="ClearCache" value="Clear Caches" />'.
- "</td>\n";
#
$Str .= '<td align="center">';
$Str .= '<select name="reportSelected" >'."\n";
@@ -862,6 +879,10 @@ sub CreateMainMenu {
}
$Str .= '</select></td>'."\n";
#
+ $Str .= '<td>'.(' 'x30).'</td>';
+ $Str .= '<td align="center">'.
+ '<input type="submit" name="ClearCache" value="Clear Caches" />'.
+ "</td>\n";
$Str .= '</tr></tbody></table>'."\n";
$Str .= '<hr>'."\n";
#
@@ -883,10 +904,15 @@ sub handler {
if ($loaderror) { return $loaderror; }
#
# Check for access
- unless(&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
+ 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
@@ -908,7 +934,7 @@ sub handler {
# Extract form elements from query string
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['sort','reportSelected',
- 'StudentAssessmentStudent']);
+ 'SelectedStudent']);
if (! exists($ENV{'form.reportSelected'})) {
$ENV{'form.reportSelected'} = 'student_assessment';
}
@@ -939,7 +965,7 @@ END
}
#
# Set up the statistics and chart environment
- &PrepareClasslist($r);
+ &PrepareClasslist();
&PrepareCourseData($r);
#
# Begin form output
@@ -950,8 +976,8 @@ END
my %reports = ('classlist' => 'Class list',
'problem_statistics' => 'Problem Statistics',
'student_assessment' => 'Problem Status Chart',
- 'percentage' => 'Correct-problems Plot',
- 'option_response' => 'Option Response Analysis',
+# 'percentage' => 'Correct-problems Plot',
+# 'option_response' => 'Option Response Analysis',
# 'activitylog' => 'Activity Log',
);
$r->print(&CreateMainMenu($ENV{'form.status'},