--- loncom/interface/statistics/lonsubmissiontimeanalysis.pm 2005/04/07 06:56:24 1.23 +++ loncom/interface/statistics/lonsubmissiontimeanalysis.pm 2008/10/30 17:45:25 1.30 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonsubmissiontimeanalysis.pm,v 1.23 2005/04/07 06:56:24 albertel Exp $ +# $Id: lonsubmissiontimeanalysis.pm,v 1.30 2008/10/30 17:45:25 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -71,7 +71,10 @@ sub BuildSubmissionTimePage { 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 = @@ -80,11 +83,13 @@ sub BuildSubmissionTimePage { # if (! exists($env{'form.problemchoice'}) || exists($env{'form.SelectAnother'})) { - $r->print('<input type="submit" name="" value="'. - &mt('Graph Problem Submission Times').'" />'); - $r->print(' 'x5); + 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'}.'" '. @@ -123,7 +128,10 @@ sub BuildSubmissionTimePage { # 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>'); @@ -131,11 +139,14 @@ sub BuildSubmissionTimePage { &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 />'); } @@ -173,15 +184,20 @@ sub analyze_times { # Get the data my $SubData = &Apache::loncoursedata::get_response_time_data ([&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 @@ -394,30 +410,38 @@ sub CreateInterface { ## ## 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('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><span class="LC_nobreak">' + .&mt('Status: [_1]', + '<input type="text" name="stats_status"' + .' size="60" value="" readonly="readonly" />') + .'</span></p>'; + $Str .= '</p>'; ## return $Str; }