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

matthew lon-capa-cvs@mail.lon-capa.org
Fri, 20 Feb 2004 16:24:20 -0000


This is a MIME encoded message

--matthew1077294260
Content-Type: text/plain

matthew		Fri Feb 20 11:24:20 2004 EDT

  Modified files:              
    /loncom/interface	lonstatistics.pm 
    /loncom/interface/statistics	loncorrectproblemplot.pm 
                                	lonproblemanalysis.pm 
                                	lonproblemstatistics.pm 
                                	lonstudentassessment.pm 
                                	lonstudentsubmissions.pm 
                                	lonsubmissiontimeanalysis.pm 
  Log:
  Modified to use &Apache::htmlcommon breadcrumb routines.
  
  
--matthew1077294260
Content-Type: text/plain
Content-Disposition: attachment; filename="matthew-20040220112420.txt"

Index: loncom/interface/lonstatistics.pm
diff -u loncom/interface/lonstatistics.pm:1.97 loncom/interface/lonstatistics.pm:1.98
--- loncom/interface/lonstatistics.pm:1.97	Thu Feb 19 15:17:01 2004
+++ loncom/interface/lonstatistics.pm	Fri Feb 20 11:24:20 2004
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstatistics.pm,v 1.97 2004/02/19 20:17:01 matthew Exp $
+# $Id: lonstatistics.pm,v 1.98 2004/02/20 16:24:20 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1052,7 +1052,7 @@
     #
     # Create the menu
     my $Str;
-    $Str .= '<h1>'.&mt('Please select a report to generate').'</h1>';
+    $Str .= '<h2>'.&mt('Please select a report to generate').'</h2>';
     foreach my $reportdata (@reports) {
         $Str .='    <h3><a href="/adm/statistics?reportSelected='.
             $reportdata->{'internal_name'}.'" >'.
@@ -1106,15 +1106,21 @@
     $r->print('<html><head><title>'.
               &mt('Course Statistics and Charts').
               "</title></head>\n".
-              &Apache::loncommon::bodytag('Course Statistics and Charts')."\n".
-	      &Apache::loncommon::help_open_faq(139).
-	      &Apache::loncommon::help_open_bug('Statistics and Charts'));
+              &Apache::loncommon::bodytag('Course Statistics and Charts'));
     $r->rflush();
     # 
     # Either print out a menu for them or send them to a report
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/statistics',
+                                            title=>'Statistics',
+                                            text =>'Statistics',
+                                            faq=>139,
+                                            bug=>'Statistics and Charts'});
     if (! exists($ENV{'form.reportSelected'}) || 
         $ENV{'form.reportSelected'} eq '') {
-        $r->print(&CreateMainMenu());
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs
+                  (undef,'Statistics Main Page').
+                  &CreateMainMenu());
     } else {
     #
         if (! &Apache::lonmysql::verify_sql_connection()) {
@@ -1154,21 +1160,44 @@
         if($GoToPage eq 'activitylog') {
 #        &Apache::lonproblemstatistics::Activity();
         } elsif($GoToPage eq 'problem_statistics') {
+            &Apache::lonhtmlcommon::add_breadcrumb
+                ({href=>'/adm/statistics?reportselected=problem_statistics',
+                  text=>'Overall Problem Statistics',
+                  faq=>139,bug=>'Statistics and Charts'});
             &Apache::lonproblemstatistics::BuildProblemStatisticsPage($r,$c);
         } elsif($GoToPage eq 'problem_analysis') {
+            &Apache::lonhtmlcommon::add_breadcrumb
+                ({href=>'/adm/statistics?reportselected=problem_analysis',
+                  text=>'Detailed Problem Analysis',
+                  faq=>139,bug=>'Statistics and Charts'});
             &Apache::lonproblemanalysis::BuildProblemAnalysisPage($r,$c);
         } elsif($GoToPage eq 'submissiontime_analysis') {
+            &Apache::lonhtmlcommon::add_breadcrumb
+                ({href=>
+                      '/adm/statistics?reportselected=submissiontime_analysis',
+                      text=>'Submission Time Plots',
+                      faq=>139,bug=>'Statistics and Charts'});
             &Apache::lonsubmissiontimeanalysis::BuildSubmissionTimePage($r,$c);
         } elsif($GoToPage eq 'student_submission_reports') {
+            &Apache::lonhtmlcommon::add_breadcrumb
+                ({href=>
+                  '/adm/statistics?reportselected=student_submission_reports',
+                  text=>'Student Submission Reports',
+                  faq=>139,bug=>'Statistics and Charts'});
             &Apache::lonstudentsubmissions::BuildStudentSubmissionsPage($r,$c);
         } elsif($GoToPage eq 'correct_problems_plot') {
+            &Apache::lonhtmlcommon::add_breadcrumb
+                ({href=>'/adm/statistics?reportselected=correct_problems_plot',
+                  text=>'Correct Problems Plot',
+                  faq=>139,bug=>'Statistics and Charts'});
             &Apache::loncorrectproblemplot::BuildCorrectProblemsPage($r,$c);
         } elsif($GoToPage eq 'student_assessment') {
+            &Apache::lonhtmlcommon::clear_breadcrumbs();
+            &Apache::lonhtmlcommon::add_breadcrumb
+                ({href=>'/adm/statistics?reportselected=student_assessment',
+                  text=>'Chart',
+                  faq=>139,bug=>'Statistics and Charts'});
             &Apache::lonstudentassessment::BuildStudentAssessmentPage($r,$c);
-        } elsif($GoToPage eq 'DoDiffGraph' || $GoToPage eq 'PercentWrongGraph') {
-#        &Apache::lonproblemstatistics::BuildGraphicChart($r,$c);
-        } elsif($GoToPage eq 'Correct-problems Plot') {
-            #	&Apache::lonpercentage::BuildPercentageGraph($r,$c);
         }
         #
         $r->print("</form>\n");
Index: loncom/interface/statistics/loncorrectproblemplot.pm
diff -u loncom/interface/statistics/loncorrectproblemplot.pm:1.5 loncom/interface/statistics/loncorrectproblemplot.pm:1.6
--- loncom/interface/statistics/loncorrectproblemplot.pm:1.5	Tue Feb  3 11:28:55 2004
+++ loncom/interface/statistics/loncorrectproblemplot.pm	Fri Feb 20 11:24:20 2004
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncorrectproblemplot.pm,v 1.5 2004/02/03 16:28:55 matthew Exp $
+# $Id: loncorrectproblemplot.pm,v 1.6 2004/02/20 16:24:20 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -71,7 +71,6 @@
     #
     &Apache::lonstatistics::PrepareClasslist();    
     #
-    $r->print('<h2>'.&mt('Number of Correct Problems Plot').'</h2>');
     $r->print(&CreateInterface());
     #
     my @Students = @Apache::lonstatistics::Students;
@@ -256,6 +255,7 @@
     ##
     ## Environment variable initialization
     my $Str;
+    $Str .= &Apache::lonhtmlcommon::breadcrumbs(undef,'Correct Problems Plot');
     $Str .= '<table cellspacing="5">'."\n";
     $Str .= '<tr>';
     $Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>';
Index: loncom/interface/statistics/lonproblemanalysis.pm
diff -u loncom/interface/statistics/lonproblemanalysis.pm:1.71 loncom/interface/statistics/lonproblemanalysis.pm:1.72
--- loncom/interface/statistics/lonproblemanalysis.pm:1.71	Thu Feb 19 15:17:01 2004
+++ loncom/interface/statistics/lonproblemanalysis.pm	Fri Feb 20 11:24:20 2004
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.71 2004/02/19 20:17:01 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.72 2004/02/20 16:24:20 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -77,7 +77,6 @@
     #
     &Apache::lonstatistics::PrepareClasslist();
     #
-    $r->print('<h2>'.&mt('Detailed Problem Analysis').'</h2>');
     $r->print(&CreateInterface());
     #
     my @Students = @Apache::lonstatistics::Students;
@@ -1299,6 +1298,8 @@
     ##
     ## Build the menu
     my $Str = '';
+    $Str .= &Apache::lonhtmlcommon::breadcrumbs
+        (undef,'Detailed Problem Analysis');
     $Str .= '<table cellspacing="5">'."\n";
     $Str .= '<tr>';
     $Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>';
Index: loncom/interface/statistics/lonproblemstatistics.pm
diff -u loncom/interface/statistics/lonproblemstatistics.pm:1.66 loncom/interface/statistics/lonproblemstatistics.pm:1.67
--- loncom/interface/statistics/lonproblemstatistics.pm:1.66	Tue Feb  3 15:44:06 2004
+++ loncom/interface/statistics/lonproblemstatistics.pm	Fri Feb 20 11:24:20 2004
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemstatistics.pm,v 1.66 2004/02/03 20:44:06 matthew Exp $
+# $Id: lonproblemstatistics.pm,v 1.67 2004/02/20 16:24:20 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -208,9 +208,8 @@
 
 sub CreateInterface {
     my $Str = '';
-    $Str .= '<h2>Overall Problem Statistics'.
-        &Apache::loncommon::help_open_topic('Statistics_Overall_Key').
-        '</h2>'."\n";
+    $Str .= &Apache::lonhtmlcommon::breadcrumbs
+        (undef,'Overall Problem Statistics','Statistics_Overall_Key');
     $Str .= '<table cellspacing="5">'."\n";
     $Str .= '<tr>';
     $Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>';
Index: loncom/interface/statistics/lonstudentassessment.pm
diff -u loncom/interface/statistics/lonstudentassessment.pm:1.91 loncom/interface/statistics/lonstudentassessment.pm:1.92
--- loncom/interface/statistics/lonstudentassessment.pm:1.91	Wed Feb 18 10:43:00 2004
+++ loncom/interface/statistics/lonstudentassessment.pm	Fri Feb 20 11:24:20 2004
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentassessment.pm,v 1.91 2004/02/18 15:43:00 matthew Exp $
+# $Id: lonstudentassessment.pm,v 1.92 2004/02/20 16:24:20 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -306,6 +306,7 @@
 #######################################################
 sub CreateInterface {
     my $Str = '';
+    $Str .= &Apache::lonhtmlcommon::breadcrumbs(undef,'Chart');
 #    $Str .= &CreateLegend();
     $Str .= '<table cellspacing="5">'."\n";
     $Str .= '<tr>';
Index: loncom/interface/statistics/lonstudentsubmissions.pm
diff -u loncom/interface/statistics/lonstudentsubmissions.pm:1.1 loncom/interface/statistics/lonstudentsubmissions.pm:1.2
--- loncom/interface/statistics/lonstudentsubmissions.pm:1.1	Thu Feb 19 15:17:01 2004
+++ loncom/interface/statistics/lonstudentsubmissions.pm	Fri Feb 20 11:24:20 2004
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentsubmissions.pm,v 1.1 2004/02/19 20:17:01 matthew Exp $
+# $Id: lonstudentsubmissions.pm,v 1.2 2004/02/20 16:24:20 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -67,7 +67,6 @@
     #
     &Apache::lonstatistics::PrepareClasslist();
     #
-    $r->print('<h2>'.&mt('Student Submissions Report').'</h2>');
     $r->print(&CreateInterface());
     #
     my @Students = @Apache::lonstatistics::Students;
@@ -328,6 +327,8 @@
     ##
     ## Environment variable initialization
     my $Str = '';
+    $Str .= &Apache::lonhtmlcommon::breadcrumbs
+        (undef,'Student Submission Reports');
     $Str .= '<table cellspacing="5">'."\n";
     $Str .= '<tr>';
     $Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>';
Index: loncom/interface/statistics/lonsubmissiontimeanalysis.pm
diff -u loncom/interface/statistics/lonsubmissiontimeanalysis.pm:1.11 loncom/interface/statistics/lonsubmissiontimeanalysis.pm:1.12
--- loncom/interface/statistics/lonsubmissiontimeanalysis.pm:1.11	Tue Jan 20 10:51:06 2004
+++ loncom/interface/statistics/lonsubmissiontimeanalysis.pm	Fri Feb 20 11:24:20 2004
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonsubmissiontimeanalysis.pm,v 1.11 2004/01/20 15:51:06 matthew Exp $
+# $Id: lonsubmissiontimeanalysis.pm,v 1.12 2004/02/20 16:24:20 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -67,7 +67,6 @@
     #
     &Apache::lonstatistics::PrepareClasslist();    
     #
-    $r->print('<h2>'.&mt('Submission Time Plots').'</h2>');
     $r->print(&CreateInterface());
     #
     my @Students = @Apache::lonstatistics::Students;
@@ -334,6 +333,7 @@
     ##
     ## Build the menu
     my $Str = '';
+    $Str .= &Apache::lonhtmlcommon::breadcrumbs(undef,'Submission Time Plots');
     $Str .= '<table cellspacing="5">'."\n";
     $Str .= '<tr>';
     $Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>';

--matthew1077294260--