--- loncom/interface/statistics/lonsubmissiontimeanalysis.pm 2005/03/10 17:06:21 1.21 +++ loncom/interface/statistics/lonsubmissiontimeanalysis.pm 2006/05/05 20:03:43 1.26 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonsubmissiontimeanalysis.pm,v 1.21 2005/03/10 17:06:21 matthew Exp $ +# $Id: lonsubmissiontimeanalysis.pm,v 1.26 2006/05/05 20:03:43 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -28,7 +28,7 @@ package Apache::lonsubmissiontimeanalysis; use strict; -use Apache::lonnet(); +use Apache::lonnet; use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::loncoursedata(); @@ -78,13 +78,14 @@ sub BuildSubmissionTimePage { &Apache::lonstathelpers::manage_caches($r,'Statistics','stats_status'); $r->rflush(); # - if (! exists($ENV{'form.problemchoice'}) || - exists($ENV{'form.SelectAnother'})) { - $r->print('<input type="submit" name="" value="'. - &mt('Graph Problem Submission Times').'" />'); - $r->print(' 'x5); + if (! exists($env{'form.problemchoice'}) || + exists($env{'form.SelectAnother'})) { + my $submit_button = '<input type="submit" name="" value="'. + &mt('Graph Problem Submission Times').'" />'; + $r->print($submit_button.' 'x5); $r->print('<h3>'.&mt('Please select a problem to analyze').'</h3>'); - $r->print(&Apache::lonstathelpers::problem_selector('.')); + $r->print(&Apache::lonstathelpers::problem_selector('.', + $submit_button)); } else { foreach my $button (@SubmitButtons) { $r->print('<input type="submit" name="'.$button->{'name'}.'" '. @@ -98,25 +99,25 @@ sub BuildSubmissionTimePage { # # Determine which problem we are to analyze my $current_problem = &Apache::lonstathelpers::get_target_from_id - ($ENV{'form.problemchoice'}); + ($env{'form.problemchoice'}); # my ($navmap,$prev,$curr,$next) = &Apache::lonstathelpers::get_prev_curr_next($current_problem, '.', 'part'); - if (exists($ENV{'form.PrevProblemAnalysis'}) && defined($prev)) { + if (exists($env{'form.PrevProblemAnalysis'}) && defined($prev)) { $current_problem = $prev; - } elsif (exists($ENV{'form.NextProblemAnalysis'}) && defined($next)) { + } elsif (exists($env{'form.NextProblemAnalysis'}) && defined($next)) { $current_problem = $next; } else { $current_problem = $curr; } # # Store the current problem choice and send it out in the form - $ENV{'form.problemchoice'} = + $env{'form.problemchoice'} = &Apache::lonstathelpers::make_target_id($current_problem); $r->print('<input type="hidden" name="problemchoice" value="'. - $ENV{'form.problemchoice'}.'" />'); + $env{'form.problemchoice'}.'" />'); # $r->print('<hr />'); $r->rflush(); @@ -127,6 +128,9 @@ sub BuildSubmissionTimePage { } else { $r->print('<h1>'.$resource->compTitle.'</h1>'); $r->print('<h3>'.$resource->src.'</h3>'); + $r->print('<h4>'. + &Apache::lonstatistics::section_and_enrollment_description(). + '</h4>'); $r->rflush(); $r->print(&Apache::lonstathelpers::render_resource($resource)); $r->print('<br />'); @@ -169,7 +173,8 @@ sub analyze_times { my $html; # holds results of analysis # Get the data my $SubData = &Apache::loncoursedata::get_response_time_data - (\@Apache::lonstatistics::SelectedSections, + ([&Apache::lonstatistics::get_selected_sections()], + [&Apache::lonstatistics::get_selected_groups()], $Apache::lonstatistics::enrollment_status, $symb,$part); if (! defined($SubData) || ! ref($SubData)) { @@ -385,17 +390,18 @@ sub Process_Row { sub CreateInterface { ## ## Environment variable initialization - if (! exists$ENV{'form.AnalyzeOver'}) { - $ENV{'form.AnalyzeOver'} = 'Tries'; + if (! exists$env{'form.AnalyzeOver'}) { + $env{'form.AnalyzeOver'} = 'Tries'; } ## ## Build the menu my $Str = ''; - $Str .= &Apache::lonhtmlcommon::breadcrumbs(undef,'Submission Time Plots'); + $Str .= &Apache::lonhtmlcommon::breadcrumbs('Submission Time Plots'); $Str .= '<p>'; $Str .= '<table cellspacing="5">'."\n"; $Str .= '<tr>'; $Str .= '<th align="center">'.&mt('Sections').'</th>'; + $Str .= '<th align="center">'.&mt('Groups').'</th>'; $Str .= '<th align="center">'.&mt('Enrollment Status').'</th>'; $Str .= '</tr>'."\n"; ## @@ -404,6 +410,10 @@ sub CreateInterface { $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',4); $Str .= '</td>'; # + $Str .= '<td align="center">'."\n"; + $Str .= &Apache::lonstatistics::GroupSelect('Group','multiple',4); + $Str .= '</td>'; + # $Str .= '<td align="center">'; $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,4); $Str .= '</td>';