--- loncom/interface/lonstatistics.pm 2010/04/12 15:55:29 1.149 +++ loncom/interface/lonstatistics.pm 2012/05/10 18:47:29 1.156.2.1 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstatistics.pm,v 1.149 2010/04/12 15:55:29 bisitz Exp $ +# $Id: lonstatistics.pm,v 1.156.2.1 2012/05/10 18:47:29 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -64,6 +64,7 @@ use Apache::lonpercentage; use Apache::lonstudentsubmissions(); use Apache::lonsurveyreports(); use Apache::longradinganalysis(); +use Apache::lonquickgrades(); use LONCAPA; # @@ -412,7 +413,7 @@ sub StudentDataSelect { last; } } - $Str .= ">all\n"; + $Str .= '>'.&mt('all')."\n"; # # Loop through the student data fields foreach my $item (@StudentDataOrder) { @@ -423,7 +424,7 @@ sub StudentDataSelect { last; } } - $Str .= '>'.$item."\n"; + $Str .= '>'.&mt($item)."\n"; } $Str .= "\n"; return $Str; @@ -749,7 +750,7 @@ sub CreateMainMenu { {url => '/adm/statistics?reportSelected=problem_analysis', permission => 'F', - icon => 'edit-find.png', + icon => 'prob_ana.png', linktext => ('Detailed Problem Analysis'), linktitle => ('Detailed statistics and graphs of student performance on problems.')}, ]}, @@ -777,7 +778,7 @@ sub CreateMainMenu { {url => '/adm/statistics?reportSelected=survey_reports', permission => 'F', - icon => 'docs.png', + icon => 'survey_rep.png', linktext => ('Survey Reports'), linktitle => ('Prepare reports on survey results.')}, ]}); @@ -792,14 +793,6 @@ sub handler { my $r=shift; my $c = $r->connection(); # - # Check for overloading - my $loaderror=&Apache::lonnet::overloaderror($r); - if ($loaderror) { return $loaderror; } - $loaderror= - &Apache::lonnet::overloaderror($r, - $env{'course.'.$env{'request.course.id'}.'.home'}); - if ($loaderror) { return $loaderror; } - # # Check for access if (! &Apache::lonnet::allowed('vgr',$env{'request.course.id'})) { $env{'user.error.msg'}= @@ -852,9 +845,9 @@ ENDSTYLE # if (! &Apache::lonmysql::verify_sql_connection()) { my $serveradmin = $r->dir_config('lonAdmEMail'); - $r->print('
'. &mt('Unable to connect to database!'). - ''); + '
'); $r->print('' .&mt('Please notify the server administrator [_1]', ,''.$serveradmin.'') @@ -873,13 +866,15 @@ ENDSTYLE &Apache::loncoursedata::delete_caches($env{'requres.course.id'}); } # + my $GoToPage = $env{'form.reportSelected'}; + # # Begin form output $r->print('