--- loncom/interface/statistics/lonsubmissiontimeanalysis.pm 2004/01/08 19:20:12 1.9 +++ loncom/interface/statistics/lonsubmissiontimeanalysis.pm 2004/01/19 21:31:08 1.10 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonsubmissiontimeanalysis.pm,v 1.9 2004/01/08 19:20:12 matthew Exp $ +# $Id: lonsubmissiontimeanalysis.pm,v 1.10 2004/01/19 21:31:08 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,6 +33,7 @@ use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::loncoursedata(); use Apache::lonstatistics; +use Apache::lonstathelpers; use Apache::lonlocal; use HTML::Entities(); use Time::Local(); @@ -50,23 +51,6 @@ my @SubmitButtons = ( text => 'Choose a different resource' }, ); -sub render_resource { - my ($resource) = @_; - ## - ## Render the problem - my $base; - ($base,undef) = ($resource->{'src'} =~ m|(.*/)[^/]*$|); - $base = "http://".$ENV{'SERVER_NAME'}.$base; - my $rendered_problem = - &Apache::lonnet::ssi_body($resource->{'src'}); - $rendered_problem =~ s/<\s*form\s*/)|<\/nop>|g; - return '
'. - ''. - $rendered_problem. - '
'; -} - sub BuildSubmissionTimePage { my ($r,$c)=@_; # @@ -131,7 +115,7 @@ sub BuildSubmissionTimePage { $r->print('

'.$resource->{'title'}.'

'); $r->print('

'.$resource->{'src'}.'

'); $r->rflush(); - $r->print(&render_resource($resource)); + $r->print(&Apache::lonstathelpers::render_resource($resource)); $r->rflush(); $r->print(&analyze_times($r,$resource,\@Students,$part)); }