--- loncom/interface/lonstatistics.pm 2009/12/16 13:00:45 1.148 +++ loncom/interface/lonstatistics.pm 2010/08/04 01:56:02 1.153 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstatistics.pm,v 1.148 2009/12/16 13:00:45 bisitz Exp $ +# $Id: lonstatistics.pm,v 1.153 2010/08/04 01:56:02 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -405,10 +405,10 @@ sub StudentDataSelect { $Str .= 'size="'.$numvisible.'" >'."\n"; # # Deal with 'all' - $Str .= ' <option value="all" '; + $Str .= ' <option value="all"'; foreach (@SelectedStudentData) { if ($_ eq 'all') { - $Str .= 'selected '; + $Str .= ' selected="selected"'; last; } } @@ -416,10 +416,10 @@ sub StudentDataSelect { # # Loop through the student data fields foreach my $item (@StudentDataOrder) { - $Str .= ' <option value="'.$item.'" '; + $Str .= ' <option value="'.$item.'"'; foreach (@SelectedStudentData) { if ($item eq $_ ) { - $Str .= 'selected '; + $Str .= ' selected="selected"'; last; } } @@ -506,9 +506,9 @@ sub map_select { $form .= 'size="'.$numvisible.'" >'."\n"; # # Put in option for 'all' - $form .= ' <option value="all" '; + $form .= ' <option value="all"'; if ($selected_maps[0] eq 'all') { - $form .= 'selected '; + $form .= ' selected="selected"'; } $form .= ">all</option>\n"; # @@ -521,10 +521,10 @@ sub map_select { $navmap = shift(@sequences); } foreach my $seq (@sequences){ - $form .= ' <option value="'.$seq->symb.'" '; + $form .= ' <option value="'.$seq->symb.'"'; foreach (@selected_maps) { if ($seq->symb eq $_) { - $form .= 'selected '; + $form .= ' selected="selected"'; last; } } @@ -556,10 +556,10 @@ sub SectionSelect { # # Loop through the sequences foreach my $s (@Sections) { - $Str .= ' <option value="'.$s.'" '; + $Str .= ' <option value="'.$s.'"'; foreach (&get_selected_sections()) { if ($s eq $_) { - $Str .= 'selected '; + $Str .= ' selected="selected"'; last; } } @@ -591,10 +591,10 @@ sub GroupSelect { # # Loop through the groups foreach my $s (@Groups) { - $Str .= ' <option value="'.$s.'" '; + $Str .= ' <option value="'.$s.'"'; foreach my $group (&get_selected_groups()) { if ($s eq $group) { - $Str .= 'selected '; + $Str .= ' selected="selected"'; last; } } @@ -749,7 +749,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 +777,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 +792,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'}= @@ -873,15 +865,17 @@ ENDSTYLE &Apache::loncoursedata::delete_caches($env{'requres.course.id'}); } # + my $GoToPage = $env{'form.reportSelected'}; + # # Begin form output $r->print('<form name="Statistics" '); + if ($GoToPage eq 'student_submission_reports') { + $r->print('onsubmit="return checkanon();" '); + } $r->print('method="post" action="/adm/statistics">'); $r->rflush(); - # - my $GoToPage = $env{'form.reportSelected'}; - # $r->print('<input type="hidden" name="reportSelected" value="'. - $GoToPage.'">'); + $GoToPage.'" />'); if($GoToPage eq 'activitylog') { # &Apache::lonproblemstatistics::Activity(); } elsif($GoToPage eq 'problem_statistics') {