--- loncom/interface/statistics/lonsubmissiontimeanalysis.pm 2005/03/10 17:06:21 1.21 +++ loncom/interface/statistics/lonsubmissiontimeanalysis.pm 2011/12/21 21:25:51 1.33 @@ -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.33 2011/12/21 21:25:51 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -28,9 +28,10 @@ package Apache::lonsubmissiontimeanalysis; use strict; -use Apache::lonnet(); +use Apache::lonnet; use Apache::loncommon(); use Apache::lonhtmlcommon(); +use Apache::lonquickgrades(); use Apache::loncoursedata(); use Apache::lonstatistics; use Apache::lonstathelpers; @@ -66,25 +67,32 @@ sub BuildSubmissionTimePage { # &Apache::lonstatistics::PrepareClasslist(); # + $r->print(&Apache::lonhtmlcommon::breadcrumbs('Submission Time Plots')); + &Apache::lonquickgrades::startGradeScreen($r,'statistics'); $r->print(&CreateInterface()); # my @Students = @Apache::lonstatistics::Students; # if (@Students < 1) { - $r->print('<h2>There are no students in the sections selected</h2>'); + $r->print('<div class="LC_warning">' + .&mt('There are no students in the sections selected.' + .'</div>') + ); } # my @CacheButtonHTML = &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').'" />'; + &mt('Generate Graph').'" />'; + $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,41 +106,50 @@ 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(); # my $resource = $current_problem->{'resource'}; if (! defined($resource)) { - $r->print('resource is undefined'); + $r->print('<div class="LC_warning">' + .&mt('Resource is undefined.') + .'</div>' + ); } 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('<hr />'); $r->print(&Apache::lonstathelpers::render_resource($resource)); - $r->print('<br />'); + $r->print('<hr /><br />'); $r->rflush(); - $r->print(&analyze_times($r,$resource->symb,\@Students, - $current_problem->{'part'})); + if (@Students) { + $r->print(&analyze_times($r,$resource->symb,\@Students, + $current_problem->{'part'})); + } } $r->print('<hr />'); } @@ -169,16 +186,21 @@ 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)) { - $html.= '<h2>There is no submission data for this problem at all</h2>'; + $html.= '<div class="LC_warning">' + .&mt('There is no submission data for this problem at all.') + .'</div>'; return $html; } my $NumSub = scalar(@{$SubData}); if (! @{$SubData}) { - $html.= '<h2>There is no submission data for this problem</h2>'; + $html.= '<div class="LC_warning">' + .&mt('There is no submission data for this problem.') + .'</div>'; return $html; } # Process the data @@ -288,13 +310,13 @@ sub analyze_times { next if (! defined($BinEnd[$i]) || $BinEnd[$i] == 0); $htmltable .= '<tr>'. - '<td align="right"><nobr>'. + '<td align="right"><span class="LC_nobreak">'. &Apache::lonlocal::locallocaltime($BinEnd[$i]-$binsize). - '</nobr></td>'. + '</span></td>'. '<td> </td>'. - '<td align="right"><nobr>'. + '<td align="right"><span class="LC_nobreak">'. &Apache::lonlocal::locallocaltime($BinEnd[$i]).'</td>'. - '</nobr></td>'. + '</span></td>'. '<td align="right">'.$Ydata[$i].(' 'x3).'</td>'. '<td> </td>'. '<td align="right">'.$AnsData[$i].(' 'x3).'</td>'. @@ -385,36 +407,38 @@ 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 .= '<p>'; - $Str .= '<table cellspacing="5">'."\n"; - $Str .= '<tr>'; - $Str .= '<th align="center">'.&mt('Sections').'</th>'; - $Str .= '<th align="center">'.&mt('Enrollment Status').'</th>'; - $Str .= '</tr>'."\n"; + $Str .= &Apache::loncommon::start_data_table(); + $Str .= &Apache::loncommon::start_data_table_header_row(); + $Str .= '<th>'.&mt('Sections').'</th>'; + $Str .= '<th>'.&mt('Groups').'</th>'; + $Str .= '<th>'.&mt('Access Status').'</th>'; + $Str .= &Apache::loncommon::end_data_table_header_row(); ## ## - $Str .= '<tr><td align="center">'."\n"; + $Str .= &Apache::loncommon::start_data_table_row(); + $Str .= '<td align="center">'."\n"; $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>'; # - $Str .= '</tr>'."\n"; - $Str .= '</table>'."\n"; + $Str .= &Apache::loncommon::end_data_table_row(); + $Str .= &Apache::loncommon::end_data_table(); # - $Str .= '<nobr>'.&mt('Status: [_1]', - '<input type="text" '. - 'name="stats_status" size="60" value="" />'). - '</nobr>'.'</p>'; + $Str .= '</p>'; ## return $Str; }