[LON-CAPA-cvs] cvs: loncom /interface lonstatistics.pm /interface/statistics lonproblemstatistics.pm lonstudentassessment.pm
matthew
lon-capa-cvs@mail.lon-capa.org
Tue, 10 Jun 2003 19:19:57 -0000
matthew Tue Jun 10 15:19:57 2003 EDT
Modified files:
/loncom/interface lonstatistics.pm
/loncom/interface/statistics lonstudentassessment.pm
lonproblemstatistics.pm
Log:
Interface cleanups - 'Update Display' is no more.
"Generate Statistics" and "Generate Chart" buttons now appear below the
selection dialogs, obviating the need for explainatory verbage.
Added a brief instructional messages to the classlist display.
Cleaned up the output of just a table in the single student mode.
Index: loncom/interface/lonstatistics.pm
diff -u loncom/interface/lonstatistics.pm:1.75 loncom/interface/lonstatistics.pm:1.76
--- loncom/interface/lonstatistics.pm:1.75 Tue Jun 10 14:22:17 2003
+++ loncom/interface/lonstatistics.pm Tue Jun 10 15:19:57 2003
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstatistics.pm,v 1.75 2003/06/10 18:22:17 matthew Exp $
+# $Id: lonstatistics.pm,v 1.76 2003/06/10 19:19:57 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -805,6 +805,8 @@
my @Fields = ('fullname','username','domain','id','section');
#
my $Str='';
+ # "Click" is asinine but it is probably not my place to change the world.
+ $Str .= '<h2>Click on a users name 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) {
@@ -856,18 +858,10 @@
my $Str = '';
#
$Str .= '<table border="0"><tbody><tr>'."\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"><b>Report:</b></td>'."\n";
$Str .= '<td align="center">';
- $Str .= '<select name="reportSelected" >'."\n";
+ $Str .= '<select name="reportSelected" '.
+ 'onchange="document.Statistics.submit()">'."\n";
foreach (sort(keys(%$reports))) {
$Str .= '<option value="'.$_.'"';
if($current eq $_) {
Index: loncom/interface/statistics/lonstudentassessment.pm
diff -u loncom/interface/statistics/lonstudentassessment.pm:1.54 loncom/interface/statistics/lonstudentassessment.pm:1.55
--- loncom/interface/statistics/lonstudentassessment.pm:1.54 Tue Jun 10 11:42:51 2003
+++ loncom/interface/statistics/lonstudentassessment.pm Tue Jun 10 15:19:57 2003
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstudentassessment.pm,v 1.54 2003/06/10 15:42:51 matthew Exp $
+# $Id: lonstudentassessment.pm,v 1.55 2003/06/10 19:19:57 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -150,15 +150,6 @@
$ENV{'form.sort'}.'" />');
$r->rflush();
if (! exists($ENV{'form.notfirstrun'}) && ! $single_student_mode) {
- $r->print(<<ENDMSG);
-<p>
-<font size="+2">
-Please make your selections in the boxes above and hit
-the button marked "Update Display".
-</font>
-</p>
-ENDMSG
-# $r->print(&OutputDescriptions());
return;
}
#
@@ -322,6 +313,8 @@
$Str .= &CreateAndParseOutputDataSelector();
$Str .= '</td></tr>'."\n";
$Str .= '</table>'."\n";
+ $Str .= '<input type="submit" value="Generate Chart" />';
+ $Str .= ' 'x8;
return $Str;
}
@@ -573,7 +566,9 @@
$r->print("<h3>".$ENV{'course.'.$ENV{'request.course.id'}.'.description'}.
" ".localtime(time)."</h3>");
- $r->print("<h3>".$datadescription."</h3>");
+ if ($data !~ /^final table/) {
+ $r->print("<h3>".$datadescription."</h3>");
+ }
#
# Set up progress window for 'final table' display only
if ($data =~ /^final table/) {
@@ -614,7 +609,7 @@
my ($r,$student) = @_;
my $Str = '';
#
- if($count++ % 5 == 0 && $count > 0) {
+ if($count++ % 5 == 0 && $count > 0 && $data !~ /^final table/) {
$r->print("</pre><pre>");
}
# First, the @StudentData fields need to be listed
Index: loncom/interface/statistics/lonproblemstatistics.pm
diff -u loncom/interface/statistics/lonproblemstatistics.pm:1.51 loncom/interface/statistics/lonproblemstatistics.pm:1.52
--- loncom/interface/statistics/lonproblemstatistics.pm:1.51 Mon Jun 2 09:58:43 2003
+++ loncom/interface/statistics/lonproblemstatistics.pm Tue Jun 10 15:19:57 2003
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonproblemstatistics.pm,v 1.51 2003/06/02 13:58:43 matthew Exp $
+# $Id: lonproblemstatistics.pm,v 1.52 2003/06/10 19:19:57 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -202,6 +202,7 @@
$Str .= &CreateAndParseOutputSelector();
$Str .= '</td></tr>'."\n";
$Str .= '</table>'."\n";
+ $Str .= '<input type="submit" value="Generate Statistics" />';
return $Str;
}
@@ -362,14 +363,6 @@
'" />');
$r->print('<input type="hidden" name="plot" value="" />');
if (! exists($ENV{'form.statsfirstcall'})) {
- $r->print(<<ENDMSG);
-<p>
-<font size="+1">
-Please make your selections in the boxes above and hit
-the button marked "Update Display".
-</font>
-</p>
-ENDMSG
return;
}
#
@@ -786,7 +779,6 @@
}
}
return if (! defined($sortfield) || $sortfield eq '');
- &Apache::lonnet::logthis('data field = '.$datafield);
#
my $Max = 0;
my $problem_num = 0;