--- loncom/interface/statistics/lonsubmissiontimeanalysis.pm 2004/01/08 19:20:12 1.9
+++ loncom/interface/statistics/lonsubmissiontimeanalysis.pm 2004/06/25 18:23:02 1.16
@@ -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.16 2004/06/25 18:23:02 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();
@@ -44,29 +45,16 @@ my $plotcolors = ['#33ff00',
];
my @SubmitButtons = (
- { name => 'ProblemAnalyis',
+ { name => 'PrevProblemAnalysis',
+ text => 'Previous Problem' },
+ { name => 'ProblemAnalysis',
text => 'Analyze Problem Again' },
+ { name => 'NextProblemAnalysis',
+ text => 'Next Problem' },
{ name => 'SelectAnother',
- text => 'Choose a different resource' },
+ text => 'Choose a different Problem' },
);
-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)=@_;
#
@@ -79,7 +67,6 @@ sub BuildSubmissionTimePage {
#
&Apache::lonstatistics::PrepareClasslist();
#
- $r->print(''.&mt('Submission Time Plots').'
');
$r->print(&CreateInterface());
#
my @Students = @Apache::lonstatistics::Students;
@@ -88,18 +75,8 @@ sub BuildSubmissionTimePage {
$r->print('There are no students in the sections selected
');
}
#
- &Apache::loncoursedata::clear_internal_caches();
- if (exists($ENV{'form.ClearCache'}) ||
- exists($ENV{'form.updatecaches'}) ||
- (exists($ENV{'form.firstanalysis'}) &&
- $ENV{'form.firstanalysis'} ne 'no')) {
- &Apache::lonstatistics::Gather_Full_Student_Data($r);
- }
- if (! exists($ENV{'form.firstanalysis'})) {
- $r->print('');
- } else {
- $r->print('');
- }
+ my @CacheButtonHTML =
+ &Apache::lonstathelpers::manage_caches($r,'Statistics','stats_status');
$r->rflush();
#
if (! exists($ENV{'form.problemchoice'}) ||
@@ -108,32 +85,55 @@ sub BuildSubmissionTimePage {
&mt('Graph Problem Submission Times').'" />');
$r->print(' 'x5);
$r->print(''.&mt('Please select a problem to analyze').'
');
- $r->print(&ProblemSelector());
+ $r->print(&Apache::lonstathelpers::ProblemSelector('.'));
} else {
foreach my $button (@SubmitButtons) {
$r->print('{'text'}).'" />');
$r->print(' 'x5);
}
+ foreach my $html (@CacheButtonHTML) {
+ $r->print($html.(' 'x5));
+ }
+ $r->rflush();
+ #
+ # Determine which problem we are to analyze
+ my $current_problem = &Apache::lonstathelpers::get_target_from_id
+ ($ENV{'form.problemchoice'});
+ #
+ my ($prev,$curr,$next) =
+ &Apache::lonstathelpers::get_prev_curr_next($current_problem,
+ '.',
+ 'part');
+ if (exists($ENV{'form.PrevProblemAnalysis'}) && defined($prev)) {
+ $current_problem = $prev;
+ } 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'} =
+ &Apache::lonstathelpers::make_target_id($current_problem);
$r->print('');
#
$r->print('
');
- #
- my ($symb,$part) = &get_problem_symb(
- &Apache::lonnet::unescape($ENV{'form.problemchoice'}));
$r->rflush();
#
- my $resource = &get_resource_from_symb($symb);
+ my $resource = $current_problem->{'resource'};
if (! defined($resource)) {
$r->print('resource is undefined');
} else {
$r->print(''.$resource->{'title'}.'
');
$r->print(''.$resource->{'src'}.'
');
$r->rflush();
- $r->print(&render_resource($resource));
+ $r->print(&Apache::lonstathelpers::render_resource($resource));
+ $r->print('
');
$r->rflush();
- $r->print(&analyze_times($r,$resource,\@Students,$part));
+ $r->print(&analyze_times($r,$resource,\@Students,
+ $current_problem->{'part'}));
}
$r->print('
');
}
@@ -159,6 +159,7 @@ sub get_week_start {
sub analyze_times {
my ($r,$resource,$students,$part) = @_;
+ my $htmltable;
#
# Convenience arrays
my @FullWeekDay = (qw/Sunday Monday Tuesday Wednesday Thursday Friday
@@ -196,6 +197,7 @@ sub analyze_times {
my @Ydata=(0);
my @AnsData=(0);
my @Xlabel=($WeekDay[$wday]);
+ my @BinEnd;
my $cumulative_answers = 0;
#
foreach my $row (@$SubData) {
@@ -206,6 +208,7 @@ sub analyze_times {
$Ydata[$bincount]=0;
$AnsData[$bincount]=$AnsData[$bincount-1];
$endtime += $binsize;
+ push(@BinEnd,$endtime);
if ($bincount % (86400/$binsize) == 0) {
$wday++;
$wday %= 7;
@@ -242,9 +245,42 @@ sub analyze_times {
}
}
my $numstudents = scalar(@$students);
+ $htmltable = ''.
+ '
'.
+ ''.
+ ''.
+ ''.&mt('Begin Date').' | '.
+ ''.(' 'x3).' | '.
+ ''.&mt('End Date').' | '.
+ ''.&mt('Submissions').' | '.
+ ''.(' 'x3).' | '.
+ ''.&mt('Correct Submissions').' | '.
+ ''.(' 'x3).' | '.
+ ''.&mt('Percent Correct').' | '.
+ '
'.
+ ''.
+ '';
for (my $i=0;$i<=$#AnsData;$i++) {
$AnsData[$i] = int(100*($AnsData[$i]/$numstudents));
+ if ($Ydata[$i] != 0) {
+ next if (! defined($BinEnd[$i]) || $BinEnd[$i] == 0);
+ $htmltable .=
+ ''.
+ ''.
+ &Apache::lonlocal::locallocaltime($BinEnd[$i]-$binsize).
+ ' | '.
+ ' | '.
+ ''.
+ &Apache::lonlocal::locallocaltime($BinEnd[$i]).' | '.
+ ''.
+ ''.$Ydata[$i].(' 'x3).' | '.
+ ' | '.
+ ''.($i>0?$AnsData[$i]-$AnsData[$i-1]:$AnsData[$i]).(' 'x3).' | '.
+ '
'.$/;
+ }
}
+ $htmltable .= '
';
my $title = 'Number of Submissions and Number Correct';
my $xlabel;
(undef,undef,undef,$mday,$month,$year,$wday) = localtime($day_start);
@@ -276,7 +312,7 @@ sub analyze_times {
'data.2.label'=>'Percent correct',
)
);
- $html .= '
';
+ $html .= '
'.$htmltable;
return $html;
}
@@ -328,119 +364,34 @@ sub CreateInterface {
##
## Build the menu
my $Str = '';
+ $Str .= &Apache::lonhtmlcommon::breadcrumbs(undef,'Submission Time Plots');
+ $Str .= '';
$Str .= '
'."\n";
$Str .= '';
- $Str .= ''.&mt('Sections').' | ';
- $Str .= ''.&mt('Enrollment Status').' | ';
- $Str .= ' | ';
+ $Str .= ''.&mt('Sections').' | ';
+ $Str .= ''.&mt('Enrollment Status').' | ';
$Str .= '
'."\n";
##
##
$Str .= ''."\n";
- $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5);
+ $Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',4);
$Str .= ' | ';
#
$Str .= '';
- $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5);
+ $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,4);
$Str .= ' | ';
#
- my $only_seq_with_assessments = sub {
- my $s=shift;
- if ($s->{'num_assess'} < 1) {
- return 0;
- } else {
- return 1;
- }
- };
- &Apache::lonstatistics::MapSelect('Maps','multiple,all',5,
- $only_seq_with_assessments);
- ##
- ##
$Str .= '
'."\n";
$Str .= '
'."\n";
+ #
+ $Str .= ''.&mt('Status: [_1]',
+ '').
+ ''.'';
+ ##
return $Str;
}
-sub ProblemSelector {
- my $Str;
- $Str = "\n";
- return $Str;
-}
-
-#########################################################
-#########################################################
-##
-## Misc functions (ought to be put in a module)
-##
-#########################################################
-#########################################################
-sub get_problem_symb {
- my $problemstring = shift();
- my ($symb,$partid) = ($problemstring=~ /^(.*):([^:]*)$/);
- return ($symb,$partid);
-}
-
-sub get_resource_from_symb {
- my ($symb) = @_;
- foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
- foreach my $res (@{$seq->{'contents'}}) {
- if ($res->{'symb'} eq $symb) {
- return $res;
- }
- }
- }
- return undef;
-}
-
1;
__END__