[LON-CAPA-cvs] cvs: loncom /interface lonstatistics.pm /interface/statistics lonproblemstatistics.pm lonstudentassessment.pm

[matthew]

matthew		Mon Jun 16 11:54:59 2003 EDT

  Modified files:              
    /loncom/interface	lonstatistics.pm 
    /loncom/interface/statistics	lonstudentassessment.pm 
                                	lonproblemstatistics.pm 
  Log:
  Interface changes - get rid of drop down box of reports.  Move 
  'Clear Caches' button to below chart/stat selection boxes.
  
  
Index: loncom/interface/lonstatistics.pm
diff -u loncom/interface/lonstatistics.pm:1.76 loncom/interface/lonstatistics.pm:1.77
--- loncom/interface/lonstatistics.pm:1.76	Tue Jun 10 15:19:57 2003
+++ loncom/interface/lonstatistics.pm	Mon Jun 16 11:54:58 2003
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstatistics.pm,v 1.76 2003/06/10 19:19:57 matthew Exp $
+# $Id: lonstatistics.pm,v 1.77 2003/06/16 15:54:58 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -857,26 +857,27 @@
     #
     my $Str = '';
     #
-    $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>'.('&nbsp;'x30).'</td>';
-    $Str .= '<td align="center">'.
-        '<input type="submit" name="ClearCache" value="Clear Caches" />'.
-            "</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>'.('&nbsp;'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;
 }
@@ -987,8 +988,6 @@
         &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);
     }
Index: loncom/interface/statistics/lonstudentassessment.pm
diff -u loncom/interface/statistics/lonstudentassessment.pm:1.58 loncom/interface/statistics/lonstudentassessment.pm:1.59
--- loncom/interface/statistics/lonstudentassessment.pm:1.58	Wed Jun 11 12:19:39 2003
+++ loncom/interface/statistics/lonstudentassessment.pm	Mon Jun 16 11:54:58 2003
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentassessment.pm,v 1.58 2003/06/11 16:19:39 matthew Exp $
+# $Id: lonstudentassessment.pm,v 1.59 2003/06/16 15:54:58 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -140,6 +140,10 @@
     my ($r,$c)=@_;
     undef($Statistics);
     $single_student_mode = 1 if ($ENV{'form.SelectedStudent'});
+    if ($ENV{'form.selectstudent'}) {
+        &Apache::lonstatistics::DisplayClasslist($r);
+        return;
+    }
     #
     # Print out the HTML headers for the interface
     #    This also parses the output mode selector
@@ -326,7 +330,12 @@
     $Str .= '</td></tr>'."\n";
     $Str .= '</table>'."\n";
     $Str .= '<input type="submit" value="Generate Chart" />';
-    $Str .= '&nbsp;'x8;
+    $Str .= '&nbsp;'x5;
+    $Str .= '<input type="submit" name="selectstudent" '.
+                                  'value="Select One Student" />';
+    $Str .= '&nbsp;'x5;
+    $Str .= '<input type="submit" name="ClearCache" value="Clear Caches" />';
+    $Str .= '&nbsp;'x5;
     return $Str;
 }
 
Index: loncom/interface/statistics/lonproblemstatistics.pm
diff -u loncom/interface/statistics/lonproblemstatistics.pm:1.53 loncom/interface/statistics/lonproblemstatistics.pm:1.54
--- loncom/interface/statistics/lonproblemstatistics.pm:1.53	Fri Jun 13 16:27:17 2003
+++ loncom/interface/statistics/lonproblemstatistics.pm	Mon Jun 16 11:54:58 2003
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemstatistics.pm,v 1.53 2003/06/13 20:27:17 matthew Exp $
+# $Id: lonproblemstatistics.pm,v 1.54 2003/06/16 15:54:58 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -203,6 +203,9 @@
     $Str .= '</td></tr>'."\n";
     $Str .= '</table>'."\n";
     $Str .= '<input type="submit" value="Generate Statistics" />';
+    $Str .= '&nbsp;'x5;
+    $Str .= '<input type="submit" name="ClearCache" value="Clear Caches" />';
+    $Str .= '&nbsp;'x5;
     return $Str;
 }