');
$r->rflush();
- $r->print(&render_resource($resource));
+ $r->print('');
+ $r->print(&Apache::lonstathelpers::render_resource($resource));
+ $r->print(' ');
$r->rflush();
- $r->print(&analyze_times($r,$resource,\@Students,$part));
+ if (@Students) {
+ $r->print(&analyze_times($r,$resource->symb,\@Students,
+ $current_problem->{'part'}));
+ }
}
$r->print('');
}
@@ -158,7 +174,8 @@ sub get_week_start {
}
sub analyze_times {
- my ($r,$resource,$students,$part) = @_;
+ my ($r,$symb,$students,$part) = @_;
+ my $htmltable;
#
# Convenience arrays
my @FullWeekDay = (qw/Sunday Monday Tuesday Wednesday Thursday Friday
@@ -169,14 +186,21 @@ sub analyze_times {
my $html; # holds results of analysis
# Get the data
my $SubData = &Apache::loncoursedata::get_response_time_data
- ($students,$resource->{'symb'},$part);
+ ([&Apache::lonstatistics::get_selected_sections()],
+ [&Apache::lonstatistics::get_selected_groups()],
+ $Apache::lonstatistics::enrollment_status,
+ $symb,$part);
if (! defined($SubData) || ! ref($SubData)) {
- $html.= '
There is no submission data for this resource
';
+ $html.= '
'
+ .&mt('There is no submission data for this problem at all.')
+ .'
';
return $html;
}
my $NumSub = scalar(@{$SubData});
if (! @{$SubData}) {
- $html.= '
There is no submission data for this resource
';
+ $html.= '
'
+ .&mt('There is no submission data for this problem.')
+ .'
';
return $html;
}
# Process the data
@@ -192,20 +216,23 @@ sub analyze_times {
my $endtime = $day_start;
#
# Initialize loop variables
- my $max;
- my @Ydata=(0);
- my @AnsData=(0);
- my @Xlabel=($WeekDay[$wday]);
- my $cumulative_answers = 0;
+ my $max; # The sum of @Ydata
+ my @Ydata=(0); # number of submissions
+ my @AnsData=(0); # number of correct submissions
+ my @Xlabel=($WeekDay[$wday]); # Labels of itmes
+ my @BinEnd; # The end time of each bin
+ my $cumulative_answers = 0; # The sum of @AnsData
+ my %students; # which students have attempted the problem?
#
foreach my $row (@$SubData) {
my $subtime = &get_time_from_row($row);
while ($subtime > $endtime && $endtime < time) {
# Create a new bin
$bincount++;
- $Ydata[$bincount]=0;
- $AnsData[$bincount]=$AnsData[$bincount-1];
+ $Ydata[$bincount] = 0;
+ $AnsData[$bincount] = 0;
$endtime += $binsize;
+ push(@BinEnd,$endtime);
if ($bincount % (86400/$binsize) == 0) {
$wday++;
$wday %= 7;
@@ -218,21 +245,16 @@ sub analyze_times {
$max = $Ydata[$bincount] if ($max < $Ydata[$bincount]);
$AnsData[$bincount] += &successful_submission($row);
$cumulative_answers += &successful_submission($row);
+ $students{$row->[&Apache::loncoursedata::RT_student_id()]}++;
}
- foreach my $maximum (10,15,20,25,30,40,50,60,70,80,90,100,
- 120,150,200,250,300,350,400,450,500,
- 600,700,800,900,1000,1100,1200,1500,2000,
- 2500,3000,4000,5000) {
- if ($max < $maximum) {
- $max = $maximum;
- last;
- }
- }
+ #
+ # Pad the data to a full day
while ($bincount % $bins_per_day != 0) {
$bincount++;
$Ydata[$bincount]=0;
- $AnsData[$bincount]=$AnsData[$bincount-1];
+ $AnsData[$bincount]=0;
$endtime += $binsize;
+ push(@BinEnd,$endtime);
if ($bincount % (86400/$binsize) == 0) {
$wday ++;
$wday %= 7;
@@ -241,11 +263,65 @@ sub analyze_times {
$Xlabel[$bincount] = '';
}
}
- my $numstudents = scalar(@$students);
- for (my $i=0;$i<=$#AnsData;$i++) {
- $AnsData[$i] = int(100*($AnsData[$i]/$numstudents));
+ my $numstudents = scalar(keys(%students));
+ #
+ # Determine a nice maximum value to use
+ foreach my $maximum (10,15,20,25,30,40,50,60,70,80,90,100,
+ 120,150,200,250,300,350,400,450,500,
+ 600,700,800,900,1000,1100,1200,1500,2000,
+ 2500,3000,4000,5000) {
+ if ($max < $maximum) {
+ $max = $maximum;
+ last;
+ }
+ }
+ #
+ # Build the data table
+ $htmltable = '
'.
+ &Apache::loncommon::end_data_table_row().$/;
+ }
}
- my $title = 'Number of Submissions and Number Correct';
+ $htmltable .= ''.&Apache::loncommon::end_data_table().'
';
+ #
+ # Build the plot
+ my $title = '';#'Number of Submissions and Number Correct';
my $xlabel;
(undef,undef,undef,$mday,$month,$year,$wday) = localtime($day_start);
$xlabel .= $FullWeekDay[$wday].' '.
@@ -253,23 +329,29 @@ sub analyze_times {
(undef,undef,undef,$mday,$month,$year,$wday) = localtime($endtime);
$xlabel .= $FullWeekDay[$wday].' '.
join(' ',($Month[$month],$mday,1900+$year));
+ my $width = 50+2*$bincount;
+ if ($width < 250) {
+ $width = 250;
+ }
+ #
$html .= &Apache::loncommon::DrawXYYGraph($title,
$xlabel,
'Submissions vs Time',
$plotcolors,
\@Xlabel,
- \@Ydata,
- 0,$max,
- \@AnsData,
- 0,100,
+ \@Ydata,0,$max,
+ \@corr_as_percent_of_selected,0,100,
(xskip => $bins_per_day,
x_ticks => $bins_per_day,
x_tick_offset => $bins_per_day,
- width => 50+2*$bincount,
- y1_label=>'Number of Submissions per hour',
- y2_label=>'Percent of Students answering Correctly')
+ width => $width,
+ y1_label=>'Number of Submissions per hour',
+ y2_label=>'Percent of Students answering Correctly',
+ 'data.1.label'=>'Submissions per hour',
+ 'data.2.label'=>'Percent correct',
+ )
);
- $html .= ' ';
+ $html .= ' '.$htmltable;
return $html;
}
@@ -279,7 +361,6 @@ sub successful_submission {
return $row->[&Apache::loncoursedata::RT_awarded()];
}
return undef;
- return 0;
}
sub get_time_from_row {
@@ -315,125 +396,42 @@ 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 .= '