--- loncom/interface/lonstatistics.pm 2003/05/27 14:51:24 1.71
+++ loncom/interface/lonstatistics.pm 2003/08/29 21:11:25 1.80
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstatistics.pm,v 1.71 2003/05/27 14:51:24 matthew Exp $
+# $Id: lonstatistics.pm,v 1.80 2003/08/29 21:11:25 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -300,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) ||
@@ -310,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];
+ }
}
}
#
@@ -329,7 +332,7 @@ sub PrepareClasslist {
@SelectedStudentData = ($ENV{'form.StudentData'});
}
} else {
- @SelectedStudentData = ('fullname');
+ @SelectedStudentData = ('username');
}
foreach (@SelectedStudentData) {
if ($_ eq 'all') {
@@ -377,11 +380,7 @@ selected student.
#######################################################
#######################################################
sub current_student {
- if (defined($curr_student)) {
- return $curr_student;
- } else {
- return 'All Students';
- }
+ return $curr_student;
}
#######################################################
@@ -399,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;
}
#######################################################
@@ -421,11 +416,7 @@ to be viewed.
#######################################################
#######################################################
sub next_student {
- if (defined($next_student)) {
- return $next_student;
- } else {
- return 'No Student Selected';
- }
+ return $next_student;
}
#######################################################
@@ -528,10 +519,8 @@ sub PrepareCourseData {
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;
+ # Use 3 digits for each the sum and total, which means 7 total...
+ my $num_col = $num_parts+7;
if ($num_col < $name_length) {
$num_col = $name_length;
}
@@ -808,6 +797,110 @@ sub SectionSelect {
return $Str;
}
+#######################################################
+#######################################################
+
+=pod
+
+=item &CreateAndParseOutputSelector()
+
+Construct a selection list of options for output and parse output selections.
+
+=cut
+
+#######################################################
+#######################################################
+sub OutputDescriptions {
+ my (@OutputOptions) = @_;
+ my $Str = '';
+ $Str .= "<h2>Output Modes</h2>\n";
+ $Str .= "<dl>\n";
+ foreach my $outputmode (@OutputOptions) {
+ $Str .=" <dt>".$outputmode->{'name'}."</dt>\n";
+ $Str .=" <dd>".$outputmode->{'description'}."</dd>\n";
+ }
+ $Str .= "</dl>\n";
+ return $Str;
+}
+
+sub CreateAndParseOutputSelector {
+ my ($elementname,$default,@OutputOptions) = @_;
+ my $output_mode;
+ my $show;
+ my $Str = '';
+ #
+ # Format for output options is 'mode, restrictions';
+ my $selected = $default;
+ if (exists($ENV{'form.'.$elementname})) {
+ if (ref($ENV{'form.'.$elementname} eq 'ARRAY')) {
+ $selected = $ENV{'form.'.$elementname}->[0];
+ } else {
+ $selected = $ENV{'form.'.$elementname};
+ }
+ }
+ #
+ # Set package variables describing output mode
+ $output_mode = 'html';
+ $show = 'all';
+ foreach my $option (@OutputOptions) {
+ next if ($option->{'value'} ne $selected);
+ $output_mode = $option->{'mode'};
+ $show = $option->{'show'};
+ }
+ #
+ # Build the form element
+ $Str = qq/<select size="5" name="$elementname">/;
+ foreach my $option (@OutputOptions) {
+ if (exists($option->{'special'}) &&
+ $option->{'special'} =~ /do not show/) {
+ next;
+ }
+ $Str .= "\n".' <option value="'.$option->{'value'}.'"';
+ $Str .= " selected " if ($option->{'value'} eq $selected);
+ $Str .= ">".$option->{'name'}."<\/option>";
+ }
+ $Str .= "\n</select>";
+ return ($Str,$output_mode,$show);
+}
+
+###############################################
+###############################################
+
+=pod
+
+=item &Gather_Student_Data()
+
+Ensures all student data is up to date.
+
+=cut
+
+###############################################
+###############################################
+sub Gather_Student_Data {
+ my ($r) = @_;
+ my $c = $r->connection();
+ #
+ my @Sequences = &Apache::lonstatistics::Sequences_with_Assess();
+ #
+ my @Students = @Apache::lonstatistics::Students;
+ #
+ # Open the progress window
+ my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
+ ($r,'Statistics Compilation Status',
+ 'Statistics Compilation Progress', scalar(@Students));
+ #
+ while (my $student = shift @Students) {
+ return if ($c->aborted());
+ my ($status,undef) = &Apache::loncoursedata::ensure_current_data
+ ($student->{'username'},$student->{'domain'},
+ $ENV{'request.course.id'});
+ &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
+ 'last student');
+ }
+ &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+ $r->rflush();
+}
+
##################################################
##################################################
sub DisplayClasslist {
@@ -816,6 +909,46 @@ sub DisplayClasslist {
my @Fields = ('fullname','username','domain','id','section');
#
my $Str='';
+ if (! @Students) {
+ if ($SelectedSections[0] eq 'all') {
+ if (lc($ENV{'form.Status'}) eq 'any') {
+ $Str .= '<h2>There are no students in the course.</h2>';
+ } elsif (lc($ENV{'form.Status'}) eq 'active') {
+ $Str .= '<h2>There are no currently enrolled students in '.
+ 'the course.</h2>';
+ } elsif (lc($ENV{'form.Status'}) eq 'expired') {
+ $Str .= '<h2>There are no previously enrolled '.
+ 'students in the course.</h2>';
+ }
+ } else {
+ my $sections;
+ if (@SelectedSections == 1) {
+ $sections = 'section '.$SelectedSections[0];
+ } elsif (@SelectedSections > 2) {
+ $sections = 'sections '.join(', ',@SelectedSections);
+ $sections =~ s/, ([^,])*$/, and $1/;
+ } else {
+ $sections = 'sections '.join(' and ',@SelectedSections);
+ }
+ if (lc($ENV{'form.Status'}) eq 'any') {
+ $Str .= '<h2>There are no students in '.$sections.'.</h2>';
+ } elsif (lc($ENV{'form.Status'}) eq 'active') {
+ $Str .= '<h2>There are no currently enrolled students '.
+ 'in '.$sections.'.</h2>';
+ } elsif (lc($ENV{'form.Status'}) eq 'expired') {
+ $Str .= '<h2>There are no previously enrolled students '.
+ 'in '.$sections.'.</h2>';
+ }
+ }
+ $Str.= '<a href="/adm/statistics?reportSelected=student_assessment">'.
+ 'Return to the chart.</a>';
+ $r->print($Str);
+ $r->rflush();
+ return;
+ }
+
+ # "Click" is asinine but it is probably not my place to change the world.
+ $Str .= '<h2>Click on a students name or username to view their chart</h2>';
$Str .= '<table border="0"><tr><td bgcolor="#777777">'."\n";
$Str .= '<table border="0" cellpadding="3"><tr bgcolor="#e6ffff">'."\n";
foreach my $field (@Fields) {
@@ -836,10 +969,11 @@ sub DisplayClasslist {
#
foreach my $field (@Fields) {
$Str .= '<td>';
- if ($field eq 'fullname') {
+ if ($field eq 'fullname' || $field eq 'username') {
$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>';
@@ -865,32 +999,27 @@ sub CreateMainMenu {
#
my $Str = '';
#
- $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 .= '<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";
- foreach (sort(keys(%$reports))) {
- $Str .= '<option value="'.$_.'"';
- if($current eq $_) {
- $Str .= ' selected';
- }
- $Str .= '>'.$reports->{$_}.'</option>'."\n";
- }
- $Str .= '</select></td>'."\n";
- #
- $Str .= '</tr></tbody></table>'."\n";
- $Str .= '<hr>'."\n";
+ $Str = '<input type="hidden" name="reportSelected" value="'.$current.'">';
+# $Str .= '<table border="0"><tbody><tr>'."\n";
+# $Str .= '<td align="center"><b>Report:</b></td>'."\n";
+# $Str .= '<td align="center">';
+# $Str .= '<select name="reportSelected" '.
+# 'onchange="document.Statistics.submit()">'."\n";
+# foreach (sort(keys(%$reports))) {
+# $Str .= '<option value="'.$_.'"';
+# if($current eq $_) {
+# $Str .= ' selected';
+# }
+# $Str .= '>'.$reports->{$_}.'</option>'."\n";
+# }
+# $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";
#
return $Str;
}
@@ -940,7 +1069,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';
}
@@ -982,8 +1111,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'},
@@ -1001,8 +1130,6 @@ END
&Apache::lonstudentassessment::BuildStudentAssessmentPage($r,$c);
} elsif($GoToPage eq 'DoDiffGraph' || $GoToPage eq 'PercentWrongGraph') {
# &Apache::lonproblemstatistics::BuildGraphicChart($r,$c);
- } elsif($GoToPage eq 'classlist') {
- &DisplayClasslist($r);
} elsif($GoToPage eq 'Correct-problems Plot') {
# &Apache::lonpercentage::BuildPercentageGraph($r,$c);
}