[BACK]Return to lonstatistics.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonstatistics.pm between versions 1.84 and 1.85

version 1.84, 2003/10/02 17:08:53 version 1.85, 2003/10/08 15:32:00
Line 1036  sub DisplayClasslist { Line 1036  sub DisplayClasslist {
 ##############################################  ##############################################
 ##############################################  ##############################################
 sub CreateMainMenu {  sub CreateMainMenu {
     my ($status,$reports,$current)=@_;  
     #      #
     my $Str = '';      # Define menu data
       my @reports = ({ internal_name => 'problem_statistics',
                        name => &mt('Overall Problem Statistics'),
                        short_description => 
       &mt('Student performance statistics on all problems.'),
                    },
                      { internal_name => 'problem_analysis',
                        name => &mt('Detailed Problem Analysis'),
                        short_description => 
       &mt('Detailed statistics and graphs of student performance on problems.'),
                    },
                      { internal_name => 'student_assessment',
                        name => &mt('Problem Status Chart'),
                        short_description => 
       &mt('Brief view of each students performance in course.'),
                    },
                      # 'percentage'  => 'Correct-problems Plot',
                      # 'activitylog' => 'Activity Log',
                      );
   
     #      #
     $Str  = '<input type="hidden" name="reportSelected" value="'.$current.'">';      # Create the menu
 #    $Str .= '<table border="0"><tbody><tr>'."\n";      my $Str;
 #    $Str .= '<td align="center"><b>Report:</b></td>'."\n";      $Str =  "<h2>".&mt('Statistics and Problem Analysis')."</h2>\n";
 #    $Str .= '<td align="center">';      $Str .= &mt('Please select a report to generate.');
 #    $Str .= '<select name="reportSelected" '.      $Str .= "<dl>\n";
 #        'onchange="document.Statistics.submit()">'."\n";      foreach my $reportdata (@reports) {
 #    foreach (sort(keys(%$reports))) {          $Str .='    <dt><a href="/adm/statistics?reportSelected='.
 #        $Str .= '<option value="'.$_.'"';              $reportdata->{'internal_name'}.'" >'.
 #        if($current eq $_) {              $reportdata->{'name'}."</a></dt>\n";
 #            $Str .= ' selected';          $Str .= '        <dd>'.$reportdata->{'short_description'}.
 #        }              "</dd>\n";
 #        $Str .= '>'.$reports->{$_}.'</option>'."\n";      }
 #    }      $Str .="</dl>\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;      return $Str;
 }  }
Line 1111  sub handler { Line 1121  sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['sort','reportSelected',                                              ['sort','reportSelected',
                                              'SelectedStudent']);                                               'SelectedStudent']);
     if (! exists($ENV{'form.reportSelected'})) {  
         $ENV{'form.reportSelected'} = 'student_assessment';  
     }  
     #      #
     # Give the LON-CAPA page header      # Give the LON-CAPA page header
     $r->print(&Apache::lonhtmlcommon::Title('Course Statistics and Charts'));      $r->print(&Apache::lonhtmlcommon::Title('Course Statistics and Charts'));
     $r->rflush();      $r->rflush();
     #      # 
     if (! &Apache::lonmysql::verify_sql_connection()) {      # Either print out a menu for them or send them to a report
         my $serveradmin = $r->dir_config('lonAdmEMail');      if (! exists($ENV{'form.reportSelected'}) || 
         $r->print(<<END);          $ENV{'form.reportSelected'} eq '') {
 <h2><font color="Red">Unable to connect to database!</font></h2>          $r->print(&CreateMainMenu());
 <p>      } else {
 Please notify the server administrator <b>$serveradmin</b>.      #
 </p><p>          if (! &Apache::lonmysql::verify_sql_connection()) {
 Course Statistics and Charts cannot be retrieved until the database is              my $serveradmin = $r->dir_config('lonAdmEMail');
 restarted.  Your data is intact but cannot be displayed at this time.              $r->print('<h2><font color="Red">'.
 </p>                        &mt('Unable to connect to database!').
 </body>                        '</font></h2>');
 </html>              $r->print('<p>'.
 END                        &mt('Please notify the server administrator ').
         return;                        '<b>'.$serveradmin.'</b></p>');
     }              $r->print('<p>'.
     #                        &mt('Course Statistics and Charts cannot be '.
     # Clean out the caches                            'retrieved until the database is restarted.  '.
     if (exists($ENV{'form.ClearCache'})) {                            'Your data is intact but cannot be displayed '.
         &Apache::loncoursedata::delete_caches($ENV{'requres.course.id'});                            'at this time.').'</p>');
     }              $r->print('</body></html>');
     #              return;
     # Set up the statistics and chart environment          }
     &PrepareClasslist();          #
     &PrepareCourseData($r);          # Clean out the caches
     #          if (exists($ENV{'form.ClearCache'})) {
     # Begin form output              &Apache::loncoursedata::delete_caches($ENV{'requres.course.id'});
     $r->print('<form name="Statistics" ');          }
     $r->print('method="post" action="/adm/statistics">');          #
     #          # Set up the statistics and chart environment
     # Print main menu          &PrepareClasslist();
     my %reports = ('classlist'          => 'Class list',          &PrepareCourseData($r);
                    'problem_statistics' => 'Problem Statistics',          #
                    'student_assessment' => 'Problem Status Chart',          # Begin form output
 #                   'percentage'         => 'Correct-problems Plot',          $r->print('<form name="Statistics" ');
 #                   'option_response'    => 'Option Response Analysis',          $r->print('method="post" action="/adm/statistics">');
 #                   'activitylog'        => 'Activity Log',          $r->rflush();
                    );          #
     $r->print(&CreateMainMenu($ENV{'form.status'},          my $GoToPage = $ENV{'form.reportSelected'};
                               \%reports,$ENV{'form.reportSelected'}));          $r->print('<input type="hidden" name="reportSelected" value="'.
     $r->rflush();                    $GoToPage.'">');
     #          if($GoToPage eq 'activitylog') {
     my $GoToPage = $ENV{'form.reportSelected'};  
     if($GoToPage eq 'activitylog') {  
 #        &Apache::lonproblemstatistics::Activity();  #        &Apache::lonproblemstatistics::Activity();
     } elsif($GoToPage eq 'problem_statistics') {          } elsif($GoToPage eq 'problem_statistics') {
         &Apache::lonproblemstatistics::BuildProblemStatisticsPage($r,$c);              &Apache::lonproblemstatistics::BuildProblemStatisticsPage($r,$c);
     } elsif($GoToPage eq 'problem_analysis') {          } elsif($GoToPage eq 'problem_analysis') {
         &Apache::lonproblemanalysis::BuildProblemAnalysisPage($r,$c);              &Apache::lonproblemanalysis::BuildProblemAnalysisPage($r,$c);
     } elsif($GoToPage eq 'student_assessment') {          } elsif($GoToPage eq 'student_assessment') {
         &Apache::lonstudentassessment::BuildStudentAssessmentPage($r,$c);              &Apache::lonstudentassessment::BuildStudentAssessmentPage($r,$c);
     } elsif($GoToPage eq 'DoDiffGraph' || $GoToPage eq 'PercentWrongGraph') {          } elsif($GoToPage eq 'DoDiffGraph' || $GoToPage eq 'PercentWrongGraph') {
 #        &Apache::lonproblemstatistics::BuildGraphicChart($r,$c);  #        &Apache::lonproblemstatistics::BuildGraphicChart($r,$c);
     } elsif($GoToPage eq 'Correct-problems Plot') {          } elsif($GoToPage eq 'Correct-problems Plot') {
 # &Apache::lonpercentage::BuildPercentageGraph($r,$c);              # &Apache::lonpercentage::BuildPercentageGraph($r,$c);
           }
           #
           $r->print("</form>\n");
     }      }
     #  
     $r->print("</form>\n");  
     $r->print("</body>\n</html>\n");      $r->print("</body>\n</html>\n");
     $r->rflush();      $r->rflush();
     #      #
Removed from v.1.84  
changed lines
  Added in v.1.85

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>