--- loncom/interface/statistics/lonproblemanalysis.pm 2004/10/05 14:03:45 1.93
+++ loncom/interface/statistics/lonproblemanalysis.pm 2005/03/14 20:28:22 1.118
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonproblemanalysis.pm,v 1.93 2004/10/05 14:03:45 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.118 2005/03/14 20:28:22 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -37,7 +37,7 @@ use Apache::lonstathelpers();
use Apache::lonstudentsubmissions();
use HTML::Entities();
use Time::Local();
-use Spreadsheet::WriteExcel();
+use capa;
my $plotcolors = ['#33ff00',
'#0033cc', '#990000', '#aaaa66', '#663399', '#ff9933',
@@ -52,9 +52,7 @@ my @SubmitButtons = ({ name => 'PrevProb
text => 'Next Problem' },
{ name => 'break'},
{ name => 'SelectAnother',
- text => 'Choose a different Problem' },
- { name => 'ExcelOutput',
- text => 'Produce Excel Output' });
+ text => 'Choose a different Problem' });
sub BuildProblemAnalysisPage {
my ($r,$c)=@_;
@@ -83,10 +81,7 @@ sub BuildProblemAnalysisPage {
&Apache::lonstathelpers::manage_caches($r,'Statistics','stats_status');
$r->rflush();
#
- # Support for numerical and radio response isn't complete enough to
- # include in 1.2 release.
- # my $problem_types = '(option|radiobutton|numerical)';
- my $problem_types = '(option)';
+ my $problem_types = '(option|radiobutton|numerical)';
if (exists($ENV{'form.problemchoice'}) &&
! exists($ENV{'form.SelectAnother'})) {
foreach my $button (@SubmitButtons) {
@@ -102,6 +97,9 @@ sub BuildProblemAnalysisPage {
$r->print($html.(' 'x5));
}
#
+ $r->print(&Apache::lonstathelpers::submission_report_form
+ ('problem_analysis'));
+ #
$r->print('
');
$r->rflush();
#
@@ -109,7 +107,7 @@ sub BuildProblemAnalysisPage {
my $current_problem = &Apache::lonstathelpers::get_target_from_id
($ENV{'form.problemchoice'});
#
- my ($prev,$curr,$next) =
+ my ($navmap,$prev,$curr,$next) =
&Apache::lonstathelpers::get_prev_curr_next($current_problem,
$problem_types,
'response',
@@ -132,14 +130,15 @@ sub BuildProblemAnalysisPage {
$r->print('resource is undefined');
} else {
my $resource = $current_problem->{'resource'};
- $r->print(''.$resource->{'title'}.' ');
- $r->print(''.$resource->{'src'}.' ');
+ $r->print(''.$resource->compTitle.' ');
+ $r->print(''.$resource->src.' ');
+ $r->print(''.&Apache::lonstatistics::section_and_enrollment_description().' ');
if ($ENV{'form.show_prob'} eq 'true') {
$r->print(&Apache::lonstathelpers::render_resource($resource));
}
$r->rflush();
my %Data = &Apache::lonstathelpers::get_problem_data
- ($resource->{'src'});
+ ($resource->src);
my $problem_data = $Data{$current_problem->{'part'}.
'.'.
$current_problem->{'respid'}};
@@ -148,23 +147,14 @@ sub BuildProblemAnalysisPage {
$problem_data,
\@Students);
} elsif ($current_problem->{'resptype'} eq 'radiobutton') {
- &RadioResponseAnalysis($r,$current_problem,
- $problem_data,
- \@Students);
+ &radio_response_analysis($r,$current_problem,
+ $problem_data,
+ \@Students);
} elsif ($current_problem->{'resptype'} eq 'numerical') {
- ##
- ## analyze all responses of a problem at once
- my $res = $current_problem->{'resource'};
- foreach my $partid (@{$res->{'parts'}}) {
- $current_problem->{'part'} = $partid;
- foreach my $respid (@{$res->{'partdata'}->{$partid}->{'ResponseIds'}}) {
- $current_problem->{'respid'}=$respid;
- &NumericalResponseAnalysis($r,$current_problem,
- $problem_data,\@Students);
- }
- }
+ &numerical_response_analysis($r,$current_problem,
+ $problem_data,\@Students);
} else {
- $r->print('This analysis is not supported ');
+ $r->print('Analysis of '.$current_problem->{'resptype'}.' is not supported ');
}
}
$r->print(' ');
@@ -173,12 +163,10 @@ sub BuildProblemAnalysisPage {
&mt('Analyze Problem').'" />');
$r->print(' 'x5);
$r->print(''.&mt('Please select a problem to analyze').' ');
- $r->print(&Apache::lonstathelpers::ProblemSelector
- ($problem_types));
+ $r->print(&Apache::lonstathelpers::problem_selector($problem_types));
}
}
-
#########################################################
#########################################################
##
@@ -186,80 +174,481 @@ sub BuildProblemAnalysisPage {
##
#########################################################
#########################################################
-sub NumericalResponseAnalysis {
- my ($r,$problem,$problem_data,$Students) = @_;
+sub numerical_response_analysis {
+ my ($r,$problem,$problem_analysis,$students) = @_;
my $c = $r->connection();
+ #
+ if ($ENV{'form.AnalyzeOver'} !~ /^(tries|time)$/) {
+ $r->print('Bad request');
+ }
+ #
my ($resource,$partid,$respid) = ($problem->{'resource'},
$problem->{'part'},
$problem->{'respid'});
+ # Gather student data
+ my $response_data = &Apache::loncoursedata::get_response_data
+ ([&Apache::lonstatistics::get_selected_sections()],
+ $Apache::lonstatistics::enrollment_status,
+ $resource->symb,$respid);
#
- if (scalar(@{$resource->{'parts'}})>1) {
- if (@{$resource->{'partdata'}->{$partid}->{'ResponseIds'}}>1) {
- $r->print(''.
- &mt('Part [_1], response [_2].',$partid,$respid).
- ' ');
- } else {
- $r->print(''.
- &mt('Part [_1]',$partid,$respid).
- ' ');
- }
- } elsif (@{$resource->{'partdata'}->{$partid}->{'ResponseIds'}}>1) {
- $r->print(''.&mt('Response [_1]',$respid).' ');
+ $problem_analysis->{'answercomputed'} = 1;
+ if ($problem_analysis->{'answercomputed'}) {
+ my $answers =
+ &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$students,
+ 'Statistics',
+ 'stats_status');
+ $r->print(&numerical_one_dimensional_plot($r,600,150,$answers));
}
#
- my $analysis_html;
- my $PerformanceData = &Apache::loncoursedata::get_response_data
- (\@Apache::lonstatistics::SelectedSections,
- $Apache::lonstatistics::enrollment_status,
- $resource->{'symb'},$respid);
- if (! defined($PerformanceData) ||
- ref($PerformanceData) ne 'ARRAY' ) {
- $analysis_html = ''.
- &mt('There is no submission data for this resource').
- ' ';
- $r->print($analysis_html);
+ if (ref($response_data) ne 'ARRAY') {
+ $r->print(''.
+ &mt('There is no submission data for this resource').
+ ' ');
return;
}
+ my $analysis_html = '';
+ for (my $plot_num = 1;$plot_num<=$ENV{'form.NumPlots'};$plot_num++) {
+ my $restriction_function;
+ my $header_message;
+ my $stats_message;
+ my $post_message; # passed through &mt sooner rather than later
+ my $no_data_message;
+ my @extra_data;
+ if ($ENV{'form.AnalyzeOver'} eq 'tries') {
+ $restriction_function = sub {($_[0]->{'tries'} == $plot_num?1:0)};
+ $header_message = 'Attempt [_1]';
+ $stats_message =
+ '[_1] submissions, [_2] correct, [_3] incorrect';
+ $post_message = '';
+ $no_data_message = 'No data exists for attempt [_1]';
+ } else {
+ my $starttime = &Apache::lonhtmlcommon::get_date_from_form
+ ('startdate_'.$plot_num);
+ my $endtime = &Apache::lonhtmlcommon::get_date_from_form
+ ('enddate_'.$plot_num);
+ ($starttime,$endtime) = &ensure_start_end_times
+ ($starttime,$endtime,
+ &get_time_from_row($response_data->[0]),
+ &get_time_from_row($response_data->[-1]),
+ $plot_num);
+ $header_message = 'Data from [_2] to [_3]';
+ $extra_data[0] = &Apache::lonlocal::locallocaltime($starttime);
+ $extra_data[1] = &Apache::lonlocal::locallocaltime($endtime);
+ #
+ $stats_message =
+ '[_1] submissions from [_4] students, [_2] correct, [_3] incorrect';
+ #
+ $post_message =
+ &mt('Start time: [_1]',
+ &Apache::lonhtmlcommon::date_setter
+ ('Statistics','startdate_'.$plot_num,$starttime)).
+ ' '.
+ &mt('End time: [_1]',
+ &Apache::lonhtmlcommon::date_setter
+ ('Statistics','enddate_'.$plot_num,$endtime));
+ $restriction_function =
+ sub {
+ my $t = $_[0]->{'timestamp'};
+ if ($t >= $starttime && $t < $endtime) {
+ return 1;
+ } else {
+ return 0;
+ }
+ };
+ $no_data_message = 'No data for [_2] to [_3]';
+ }
+ #
+ my ($correct,$answers) =
+ &numerical_determine_answers($r,$resource,$partid,
+ $respid,$students);
+ if ($c->aborted()) { return; };
+ #
+ my ($responses,$stats) =
+ &numerical_classify_responses($response_data,$correct,
+ $restriction_function);
+ if ($stats->{'submission_count'} == 0) {
+ $analysis_html.=
+ ''.
+ &mt($no_data_message,$plot_num,@extra_data).
+ ' ';
+ } else {
+ $analysis_html.=
+ ''.
+ &mt($header_message,$plot_num,@extra_data).
+ ' '.
+ ''.
+ &mt($stats_message,
+ $stats->{'submission_count'},
+ $stats->{'correct_count'},
+ $stats->{'incorrect_count'},
+ $stats->{'students'},
+ @extra_data).
+ ' '.
+ ''.''.
+ &numerical_plot_percent($r,$responses,$stats).' '.
+ ''.
+ &numerical_plot_differences($r,$responses,$stats).' '.
+ ' ';
+ }
+ if ($post_message ne '') {
+ $analysis_html .=
+ ''.$post_message.' ';
+ }
+ }
+ $analysis_html.='
';
+ $r->print($analysis_html);
#
- # This next call causes all the waiting around that people complain about
- my ($max,$min) =
- &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$Students,
- 'Statistics',
- 'stats_status');
- return if ($c->aborted());
- #
- # Collate the data
- my %Data;
- foreach my $student (@$Students) {
- my $answer = $student->{'answer'};
- $Data{$answer}++;
- }
- my @Labels = sort {$a <=> $b } keys(%Data);
- my @PlotData = @Data{@Labels};
- #
- my $width = 500;
- my $height = 100;
- my $plot = &one_dimensional_plot($r,500,100,scalar(@$Students),
- \@Labels,\@PlotData);
- $r->print($plot);
return;
}
-sub one_dimensional_plot {
- my ($r,$width,$height,$N,$Labels,$Data)=@_;
+sub numerical_plot_percent {
+ my ($r,$responses,$stats) = @_;
#
- # Compute data -> image scaling factors
- my $min = $Labels->[0];
- my $max = $Labels->[-1];
- if ($max == $min) {
- $max =$min+1;
+ my $total = $stats->{'submission_count'};
+ return '' if ($total == 0);
+ my $max_bins = 50;
+ my $lowest_percent = $stats->{'min_percent'};
+ my $highest_percent = $stats->{'max_percent'};
+ my $percent_spread = $highest_percent - $lowest_percent;
+ foreach (qw/20 30 40 50 100 200/) {
+ if ($percent_spread < $_) {
+ $highest_percent =$_/2;
+ last;
+ }
+ }
+ my $bin_size = 1;
+ foreach (qw/0.01 0.05 0.1 0.5 1 2 5 10 20 25 50 100/) {
+ if ($lowest_percent/2 < $_){
+ $bin_size = $_;
+ last;
+ }
+ }
+ my @bins;
+ for (my $bin = -$highest_percent;$bin<0;$bin+=$bin_size) {
+ push (@bins,$bin);
+ }
+ for (my $bin = 0; $bin<$highest_percent;$bin+=$bin_size) {
+ push (@bins,$bin);
+ }
+ push(@bins,$highest_percent);
+ #
+ my @correct;
+ my @incorrect;
+ my @count;
+ while (my ($ans,$submissions) = each(%$responses)) {
+ while (my ($submission,$counts) = each(%$submissions)) {
+ my ($correct_count,$incorrect_count) = @$counts;
+ my $scaled_value = 100*($submission-$ans)/abs($ans);
+ if ($scaled_value < $bins[0]) {
+ $bins[0]=$scaled_value -1;
+ }
+ my $bin;
+ for ($bin=0;$bin<$#bins;$bin++) {
+ last if ($bins[$bin]>$scaled_value);
+ }
+ $correct[$bin-1]+=$correct_count;
+ $incorrect[$bin-1]+=$incorrect_count;
+ $count[$bin-1]+=$correct_count+$incorrect_count;
+ }
+ }
+ #
+ my @plot_correct = @correct;
+ my @plot_incorrect = @incorrect;
+ my $max;
+ for (my $i=0;$i<$#bins;$i++) {
+ $plot_correct[$i] *= 100/$total;
+ $plot_incorrect[$i] *= 100/$total;
+ if (! defined($max) ||
+ $max < $plot_correct[$i]+$plot_incorrect[$i] ) {
+ $max = $plot_correct[$i]+$plot_incorrect[$i];
+ }
+ }
+ foreach (qw/1 5 10 15 20 25 30 40 50 75 100/) {
+ if ($max <$_) { $max = $_; last; }
+ }
+ #
+ my $title = &mt('Percent Difference');
+ my @labels = (1..scalar(@bins)-1);
+ my $graph = &Apache::loncommon::DrawBarGraph
+ ($title,'Percent Difference from Correct','Percent of Answers',
+ $max,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect,
+ {xskip=>1});
+ #
+ my $table = $graph.$/.
+ &numerical_bin_table(\@bins,\@labels,\@incorrect,\@correct,\@count).$/;
+ return $table;
+}
+
+sub numerical_plot_differences {
+ my ($r,$responses,$stats) = @_;
+ #
+ my $total = $stats->{'submission_count'};
+ return '' if ($total == 0);
+ my $max_bins = 21;
+ my $min_bin_size = $stats->{'min_abs'};
+ my $low_bin = $stats->{'lowest_ans'}-$stats->{'max_bin_size'};
+ my $high_bin = $stats->{'highest_ans'}+$stats->{'max_bin_size'};
+ if ($high_bin > 0 && $low_bin > -$high_bin) {
+ $low_bin = -$high_bin;
+ } elsif ($low_bin < 0 && $high_bin < -$low_bin) {
+ $high_bin = -$low_bin;
+ }
+ if (($high_bin -$low_bin)/$min_bin_size * 2 > $max_bins) {
+ $min_bin_size = abs($high_bin - $low_bin) / $max_bins * 2;
+ }
+ my @bins;
+ for (my $num = $low_bin;$num <= $high_bin;$num+=($min_bin_size/2)) {
+ push(@bins,$num);
+ }
+ #
+ my @correct;
+ my @incorrect;
+ my @count;
+ while (my ($ans,$submissions) = each(%$responses)) {
+ while (my ($submission,$counts) = each(%$submissions)) {
+ my ($correct_count,$incorrect_count) = @$counts;
+ my $scaled_value = $submission-$ans;
+ if ($scaled_value < $bins[0]) {
+ $bins[0]=$scaled_value-1;
+ }
+ my $bin=0;
+ for ($bin=0;$bin<$#bins;$bin++) {
+ last if ($bins[$bin]>$scaled_value);
+ }
+ $correct[$bin-1]+=$correct_count;
+ $incorrect[$bin-1]+=$incorrect_count;
+ $count[$bin-1]+=$correct_count+$incorrect_count;
+ }
+ }
+ my @plot_correct = @correct;
+ my @plot_incorrect = @incorrect;
+ my $max;
+ for (my $i=0;$i<=$#bins;$i++) {
+ $plot_correct[$i] *= 100/$total;
+ $plot_incorrect[$i] *= 100/$total;
+ if (! defined($max) ||
+ $max < $plot_correct[$i]+$plot_incorrect[$i] ) {
+ $max = $plot_correct[$i]+$plot_incorrect[$i];
+ }
+ }
+ foreach (qw/1 5 10 15 20 25 30 40 50 75 100/) {
+ if ($max <$_) { $max = $_; last; }
+ }
+ #
+ my $title = &mt('Difference between submission and correct');
+ my @labels = (1..scalar(@bins)-1);
+ my $graph = &Apache::loncommon::DrawBarGraph
+ ($title,'Difference from Correct','Percent of Answers',
+ $max,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect,
+ {xskip=>1});
+ #
+ my $table = $graph.$/.
+ &numerical_bin_table(\@bins,\@labels,\@incorrect,\@correct,\@count).$/;
+ return $table;
+}
+
+sub numerical_classify_responses {
+ my ($full_row_data,$correct,$function) = @_;
+ my %submission_data;
+ my %students;
+ my %stats;
+ my $max=0;
+ foreach my $row (@$full_row_data) {
+ my %subm = &hashify_attempt($row);
+ if (ref($correct) eq 'HASH') {
+ my $s_correct = $correct->{$subm{'student'}};
+ $subm{'correct'} = $s_correct->{'answer'};
+ foreach my $item ('unit','ans_low','ans_high') {
+ $subm{$item} = $s_correct->{$item};
+ }
+ } else { # This probably never happens....
+ $subm{'correct'} = $correct->{'answer'};
+ $subm{'unit'} = $correct->{'unit'};
+ }
+ #
+ my $abs_low =abs($subm{'correct'}-$subm{'ans_low'});
+ my $abs_high=abs($subm{'correct'}-$subm{'ans_high'});
+ if (! defined($stats{'min_abs'}) ||
+ $stats{'min_abs'} > $abs_low) {
+ $stats{'min_abs'} = $abs_low;
+ }
+ if ($stats{'min_abs'} > $abs_high) {
+ $stats{'min_abs'} = $abs_high;
+ }
+ if (! defined($stats{'max_abs'}) ||
+ $stats{'max_abs'} < $abs_low) {
+ $stats{'max_abs'} = $abs_low;
+ }
+ if ($stats{'max_abs'} < $abs_high) {
+ $stats{'max_abs'} = $abs_high;
+ }
+ my $low_percent = 100 * abs($abs_low / $subm{'correct'});
+ my $high_percent = 100 * abs($abs_high / $subm{'correct'});
+ if (! defined($stats{'min_percent'}) ||
+ $stats{'min_percent'} > $low_percent) {
+ $stats{'min_percent'} = $low_percent;
+ }
+ if ($stats{'min_percent'} > $high_percent) {
+ $stats{'min_percent'} = $high_percent;
+ }
+ if (! defined($stats{'max_percent'}) ||
+ $stats{'max_percent'} < $low_percent) {
+ $stats{'max_percent'} = $low_percent;
+ }
+ if ($stats{'max_percent'} < $high_percent) {
+ $stats{'max_percent'} = $high_percent;
+ }
+ if (! defined($stats{'lowest_ans'}) ||
+ $stats{'lowest_ans'} > $subm{'correct'}) {
+ $stats{'lowest_ans'} = $subm{'correct'};
+ }
+ if (! defined($stats{'highest_ans'}) ||
+ $stats{'highest_ans'} < $subm{'correct'}) {
+ $stats{'highest_ans'} = $subm{'correct'};
+ }
+ #
+ $subm{'submission'} =~ s/=\d+\s*$//;
+ if (&$function(\%subm)) {
+ my $scaled = '1';
+ my ($sname,$sdom) = split(':',$subm{'student'});
+ my ($myunit,$mysub) = ($subm{'unit'},$subm{'submission'});
+ my $result =
+ &capa::caparesponse_get_real_response($myunit,
+ $mysub,
+ \$scaled);
+# &Apache::lonnet::logthis('scaled = '.$scaled.' result ='.$result);
+ next if (! defined($scaled));
+# next if ($result ne '6');
+ my $submission = $scaled;
+ $students{$subm{'student'}}++;
+ $stats{'submission_count'}++;
+ if (&numerical_submission_is_correct($subm{'award'})) {
+ $stats{'correct_count'}++;
+ $submission_data{$subm{'correct'}}->{$submission}->[0]++;
+ } elsif (&numerical_submission_is_incorrect($subm{'award'})) {
+ $stats{'incorrect_count'}++;
+ $submission_data{$subm{'correct'}}->{$submission}->[1]++;
+ }
+ }
+ }
+ $stats{'students'}=scalar(keys(%students));
+ return (\%submission_data,\%stats);
+}
+
+sub numerical_submission_is_correct {
+ my ($award) = @_;
+ if ($award =~ /^(APPROX_ANS|EXACT_ANS)$/) {
+ return 1;
+ } else {
+ return 0;
}
- my $h_scale = ($width-10)/($max-$min);
+}
+
+sub numerical_submission_is_incorrect {
+ my ($award) = @_;
+ if ($award =~ /^(INCORRECT)$/) {
+ return 1;
+ } else {
+ return 0;
+ }
+}
+
+sub numerical_bin_table {
+ my ($bins,$labels,$incorrect,$correct,$count)=@_;
+ my $table =
+ ''.&mt('Bar').' '.
+ ''.&mt('Range').' '.
+ ''.&mt('Incorrect').' '.
+ ''.&mt('Correct').' '.
+ ''.&mt('Count').' '.
+ ' '.$/;
+ for (my $i=0;$i[$i];
+ if ($i == 0) { $lownum = '-∞'; }
+ my $highnum = $bins->[$i+1];
+ if ($i == scalar(@{$bins})-2) { $highnum = '∞'; }
+ $table .=
+ ''.
+ ''.$labels->[$i].' '.
+ ''.$lownum.' '.
+ ' - '.
+ ''.$highnum.' '.
+ ''.$incorrect->[$i].' '.
+ ''.$correct->[$i].' '.
+ ''.$count->[$i].' '.
+ ' '.$/;
+ }
+ $table.= '
';
+ return $table;
+}
+
+sub numerical_determine_answers {
+ my ($r,$resource,$partid,$respid,$students)=@_;
+ my $c = $r->connection();
+ #
+ my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
+ ($r,'Student Answer Compilation Status',
+ 'Student Answer Compilation Progress', scalar(@$students),
+ 'inline',undef,'Statistics','stats_status');
+ #
+ # Read in the cache (if it exists) before we start timing things.
+ &Apache::lonstathelpers::ensure_proper_cache($resource->{'symb'});
+ #
+ my $correct;
+ my %answers;
+ foreach my $student (@$students) {
+ last if ($c->aborted());
+ my $sname = $student->{'username'};
+ my $sdom = $student->{'domain'};
+ # analyze problem
+ my $analysis =
+ &Apache::lonstathelpers::analyze_problem_as_student($resource,
+ $sname,
+ $sdom);
+ # make the key
+ my $key = $partid.'.'.$respid;
+ foreach my $item ('answer','unit','ans_high','ans_low') {
+ $correct->{$sname.':'.$sdom}->{$item} =
+ $analysis->{$key.'.'.$item}->[0];
+ }
+ $answers{$analysis->{$key.'.answer'}->[0]}++;
+ &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
+ &mt('last student'));
+ }
+ &Apache::lonstathelpers::write_analysis_cache();
+ &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+ return ($correct,\%answers);
+}
+
+#
+# Inputs: $r, $width, $height, $data
+# $n = number of students
+# $data = hashref of $answer => $frequency pairs
+sub numerical_one_dimensional_plot {
+ my ($r,$width,$height,$data)=@_;
#
+ # Compute data -> image scaling factors
my $max_y = 0;
- foreach (@$Data) {
- $max_y = $_ if ($max_y < $_);
+ my $min_x = undef;
+ my $max_x = undef;
+ my $n = 0;
+ while (my ($answer,$count) = each(%$data)) {
+ $n+=$count;
+ $max_y = $count if ($max_y < $count);
+ if (! defined($min_x) || $answer < $min_x) {
+ $min_x = $answer;
+ }
+ if (! defined($max_x) || $answer > $max_x) {
+ $max_x = $answer;
+ }
+ }
+ #
+ my $min_max_difference = $max_x - $min_x;
+ if (! defined($min_max_difference) || $min_max_difference == 0) {
+ $min_max_difference = 1;
}
+ my $h_scale = ($width-10)/$min_max_difference;
+ #
my $ticscale = 5;
if ($max_y * $ticscale > $height/2) {
$ticscale = int($height/2/$max_y);
@@ -269,17 +658,16 @@ sub one_dimensional_plot {
# Create the plot
my $plot =
qq{};
- for (my $idx=0;$idx[$idx] - $min);
- my $top = $height/2-$Data->[$idx]*$ticscale;
- my $bottom = $height/2+$Data->[$idx]*$ticscale;
- $plot .=
- &line($xloc,$top,$xloc,$bottom,'888888',1);
+ while (my ($answer,$count) = each(%$data)) {
+ my $xloc = 5+$h_scale*($answer - $min_x);
+ my $top = $height/2-$count*$ticscale;
+ my $bottom = $height/2+$count*$ticscale;
+ $plot .= &line($xloc,$top,$xloc,$bottom,'888888',1);
}
#
# Put the scale on last to ensure it is on top of the data.
- if ($min < 0 && $max > 0) {
- my $circle_x = 5+$h_scale*abs($min); # '0' in data coordinates
+ if ($min_x < 0 && $max_x > 0) {
+ my $circle_x = 5+$h_scale*abs($min_x); # '0' in data coordinates
my $r = 4;
$plot .= &line(5,$height/2,$circle_x-$r,$height/2,'000000',1);
$plot .= &circle($circle_x,$height/2,$r+1,'000000');
@@ -289,21 +677,18 @@ sub one_dimensional_plot {
}
$plot .= ' ';
my $plotresult = &Apache::lonxml::xmlparse($r,'web',$plot);
-
- my $title = 'Distribution of correct answers';
my $result = ''.
''.
- ''.$title.' (N='.$N.')'.
- ' '.
+ ''.&mt('Distribution of correct answers').' '.
+ ' '.&mt('[_1] students, [_2] distinct correct answers',
+ $n,scalar(keys(%$data))).
+ ' '.&mt('Maximum number of coinciding values: [_1]',$max_y).
' '.
''.
- ''.$min.' '.
+ ''.$min_x.' '.
''.$plotresult.' '.
- ''.$max.' '.
+ ''.$max_x.' '.
' '.
- ''.
- 'Maximum Number of Coinciding Values: '.$max_y.
- ' '.
'
';
return $result;
}
@@ -313,7 +698,7 @@ sub one_dimensional_plot {
## These should probably go somewhere more suitable soon.
sub line {
my ($x1,$y1,$x2,$y2,$color,$thickness) = @_;
- return qq{ $/};
+ return qq{ };
}
sub text {
@@ -342,33 +727,6 @@ sub circle {
return &arc($x,$y,$radius,$radius,0,360,$color,$thickness,$filled);
}
-sub build_student_data_worksheet {
- my ($workbook,$format) = @_;
- my $rows_output = 3;
- my $cols_output = 0;
- my $worksheet = $workbook->addworksheet('Student Data');
- $worksheet->write($rows_output++,0,'Student Data',$format->{'h3'});
- my @Headers = ('full name','username','domain','section',
- "student\nnumber",'identifier');
- $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'});
- my @Students = @Apache::lonstatistics::Students;
- my $studentrows = &Apache::loncoursedata::get_student_data(\@Students);
- my %ids;
- foreach my $row (@$studentrows) {
- my ($mysqlid,$student) = @$row;
- $ids{$student}=$mysqlid;
- }
- foreach my $student (@Students) {
- my $name_domain = $student->{'username'}.':'.$student->{'domain'};
- $worksheet->write_row($rows_output++,0,
- [$student->{'fullname'},
- $student->{'username'},$student->{'domain'},
- $student->{'section'},$student->{'id'},
- $ids{$name_domain}]);
- }
- return $worksheet;
-}
-
#########################################################
#########################################################
##
@@ -376,176 +734,432 @@ sub build_student_data_worksheet {
##
#########################################################
#########################################################
-sub RadioResponseAnalysis {
- my ($r,$problem,$problem_data,$Students) = @_;
- my ($resource,$respid) = ($problem->{'resource'},
- $problem->{'respid'});
+sub radio_response_analysis {
+ my ($r,$problem,$problem_analysis,$students) = @_;
+ #
+ if ($ENV{'form.AnalyzeOver'} !~ /^(tries|time)$/) {
+ $r->print('Bad request');
+ }
+ #
+ my ($resource,$partid,$respid) = ($problem->{'resource'},
+ $problem->{'part'},
+ $problem->{'respid'});
+ #
my $analysis_html;
- my $PerformanceData = &Apache::loncoursedata::get_response_data
- (\@Apache::lonstatistics::SelectedSections,
+ my $foildata = $problem_analysis->{'_Foils'};
+ my ($table,$foils,$concepts) = &build_foil_index($problem_analysis);
+ if (! defined($concepts)) {
+ $concepts = [];
+ }
+ #
+ my %true_foils;
+ my $num_true = 0;
+ if (! $problem_analysis->{'answercomputed'}) {
+ foreach my $foil (@$foils) {
+ if ($foildata->{$foil}->{'value'} eq 'true') {
+ $true_foils{$foil}++;
+ }
+ }
+ $num_true = scalar(keys(%true_foils));
+ }
+ #
+ $analysis_html .= $table;
+ # Gather student data
+ my $response_data = &Apache::loncoursedata::get_response_data
+ ([&Apache::lonstatistics::get_selected_sections()],
$Apache::lonstatistics::enrollment_status,
- $resource->{'symb'},$respid);
- if (! defined($PerformanceData) ||
- ref($PerformanceData) ne 'ARRAY' ) {
+ $resource->symb,$respid);
+ my $correct; # either a hash reference or a scalar
+ if ($problem_analysis->{'answercomputed'} || scalar(@$concepts) > 1) {
+ # This takes a while for large classes...
+ &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$students,
+ 'Statistics',
+ 'stats_status');
+ foreach my $student (@$students) {
+ my ($idx,@remainder) = split('&',$student->{'answer'});
+ my ($answer) = ($remainder[$idx]=~/^(.*)=([^=]*)$/);
+ $correct->{$student->{'username'}.':'.$student->{'domain'}}=
+ &Apache::lonnet::unescape($answer);
+ }
+ } else {
+ foreach my $foil (keys(%$foildata)) {
+ if ($foildata->{$foil}->{'value'} eq 'true') {
+ $correct = $foildata->{$foil}->{'name'};
+ }
+ }
+ }
+ #
+ if (! defined($response_data) || ref($response_data) ne 'ARRAY' ) {
$analysis_html = ''.
&mt('There is no submission data for this resource').
' ';
$r->print($analysis_html);
return;
}
- if (exists($ENV{'form.ExcelOutput'})) {
- $analysis_html .= &RR_Excel_output($r,$problem->{'resource'},
- $PerformanceData,$problem_data);
- } elsif ($ENV{'form.AnalyzeOver'} eq 'Tries') {
- $analysis_html .= &RR_Tries_Analysis($r,$problem->{'resource'},
- $PerformanceData,$problem_data);
- } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
- $analysis_html .= &RR_Time_Analysis($r,$problem->{'resource'},
- $PerformanceData,$problem_data);
- } else {
- $analysis_html .= ''.
- &mt('The analysis you have selected is not supported at this time').
- ' ';
- }
+ #
+ $analysis_html.='';
+ for (my $plot_num = 1;$plot_num<=$ENV{'form.NumPlots'};$plot_num++) {
+ # classify data ->correct foil -> selected foil
+ my ($restriction_function,
+ $correct_foil_title,$incorrect_foil_title,
+ $pre_graph_text,$post_graph_text,
+ $no_data_text,@extra_data);
+ if ($ENV{'form.AnalyzeOver'} eq 'tries') {
+ $restriction_function = sub {($_[0]->{'tries'} == $plot_num?1:0)};
+ $correct_foil_title = 'Attempt '.$plot_num;
+ $incorrect_foil_title = 'Attempt '.$plot_num;
+ $pre_graph_text =
+ 'Attempt [_1], [_2] submissions, [_3] correct, [_4] incorrect';
+ $post_graph_text = '';
+ $no_data_text = 'No data exists for attempt [_1]';
+ } elsif ($ENV{'form.AnalyzeOver'} eq 'time') {
+ my $starttime = &Apache::lonhtmlcommon::get_date_from_form
+ ('startdate_'.$plot_num);
+ my $endtime = &Apache::lonhtmlcommon::get_date_from_form
+ ('enddate_'.$plot_num);
+ ($starttime,$endtime) = &ensure_start_end_times
+ ($starttime,$endtime,
+ &get_time_from_row($response_data->[0]),
+ &get_time_from_row($response_data->[-1]),
+ $plot_num);
+ $pre_graph_text =
+ 'Data from [_6] to [_7] [_2] submissions from [_5] students, [_3] correct, [_4] incorrect';
+ $extra_data[0] = &Apache::lonlocal::locallocaltime($starttime);
+ $extra_data[1] = &Apache::lonlocal::locallocaltime($endtime);
+ #
+ $post_graph_text =
+ &mt('Start time: [_1]',
+ &Apache::lonhtmlcommon::date_setter
+ ('Statistics','startdate_'.$plot_num,$starttime)).
+ ' '.
+ &mt('End time: [_1]',
+ &Apache::lonhtmlcommon::date_setter
+ ('Statistics','enddate_'.$plot_num,$endtime));
+ $restriction_function =
+ sub {
+ my $t = $_[0]->{'timestamp'};
+ if ($t >= $starttime && $t < $endtime) {
+ return 1;
+ } else {
+ return 0;
+ }
+ };
+ $no_data_text = 'No data for [_5] to [_6]';
+ }
+ my $foil_choice_data =
+ &classify_response_data($response_data,$correct,
+ $restriction_function);
+ # &Apache::lonstathelpers::log_hash_ref($foil_choice_data);
+ my $answers;
+ if (ref($correct)) {
+ my %tmp;
+ foreach my $foil (values(%$correct)) {
+ $tmp{$foil}++;
+ }
+ $answers = [keys(%tmp)];
+ } else {
+ $answers = [$correct];
+ }
+ # Concept Plot
+ my $concept_plot = '';
+ if (scalar(@$concepts) > 1) {
+ $concept_plot = &RR_concept_plot($concepts,$foil_choice_data,
+ 'Correct Concepts');
+ }
+ # % Choosing plot
+ my $choice_plot = &RR_create_percent_selected_plot
+ ($concepts,$foils,$foil_choice_data,$correct_foil_title);
+ # for each correct foil, how did they mark it? (stacked bar graph)
+ my ($stacked_plot,$count_by_foil);
+ if ($problem_analysis->{'answercomputed'} || $num_true > 1) {
+ ($stacked_plot,$count_by_foil) =
+ &RR_create_stacked_selection_plot($foils,$foil_choice_data,
+ $incorrect_foil_title,
+ \%true_foils);
+ }
+ #
+ if ($concept_plot ne '' ||
+ $choice_plot ne '' ||
+ $stacked_plot ne '') {
+ my $correct = $foil_choice_data->{'_correct'};
+ if (! defined($correct) || $correct eq '') {
+ $correct = 0;
+ }
+ my $incorrect =
+ $analysis_html.= ''.
+ ''.
+ &mt($pre_graph_text,
+ $plot_num,$foil_choice_data->{'_count'},
+ $correct,
+ $foil_choice_data->{'_count'}-$correct,
+ $foil_choice_data->{'_students'},
+ @extra_data).
+ ' '.$/;
+ $analysis_html.=
+ ''.
+ ''.$concept_plot.' '.
+ ''.$choice_plot.' ';
+ if ($stacked_plot ne '') {
+ $analysis_html .=
+ ''.$stacked_plot.' '.
+ ''.&build_foil_key($foils,$count_by_foil).' ';
+ } else {
+ $analysis_html .= (' 'x2);
+ }
+ $analysis_html.=' '.$/;
+ if (defined($post_graph_text)) {
+ $analysis_html.= ''.
+ $post_graph_text.' '.$/;
+ }
+ } elsif ($no_data_text ne '') {
+ $analysis_html.=''.
+ &mt($no_data_text,
+ $plot_num,$foil_choice_data->{'_count'},
+ $correct,
+ $foil_choice_data->{'_count'}-$correct,
+ @extra_data);
+ if (defined($post_graph_text)) {
+ $analysis_html.=' '.$post_graph_text;
+ }
+ $analysis_html.=' '.$/;
+ }
+ } # end of loop for plots
+ $analysis_html.='
';
$r->print($analysis_html);
}
-sub RR_Excel_output {
- my ($r,$PerformanceData,$problem_data) = @_;
- return 'No! ';
+sub ensure_start_end_times {
+ my ($start,$end,$first,$last,$plot_num) = @_;
+ if (! defined($start) || ! defined($end)) {
+ my $sec_in_day = 86400;
+ my ($sday,$smon,$syear) =
+ (localtime($last - $sec_in_day*($plot_num-1)))[3..5];
+ $start = &Time::Local::timelocal(0,0,0,$sday,$smon,$syear);
+ $end = $start + $sec_in_day;
+ if ($plot_num == $ENV{'form.NumPlots'}) {
+ $start = $first;
+ }
+ }
+ return ($start,$end);
+}
+
+sub RR_concept_plot {
+ my ($concepts,$foil_data,$title) = @_;
+ #
+ my %correct_by_concept;
+ my %incorrect_by_concept;
+ my %true;
+ foreach my $concept (@$concepts) {
+ foreach my $foil (@{$concept->{'foils'}}) {
+ next if (! exists($foil_data->{$foil}));
+ foreach my $choice (keys(%{$foil_data->{$foil}})) {
+ if ($choice eq $foil) {
+ $correct_by_concept{$concept->{'name'}} +=
+ $foil_data->{$foil}->{$choice};
+ } else {
+ $incorrect_by_concept{$concept->{'name'}} +=
+ $foil_data->{$foil}->{$choice};
+ }
+ }
+ }
+ }
+ #
+ # need arrays for incorrect and correct because we want to use different
+ # colors for them
+ my @correct;
+ #
+ my $total =0;
+ for (my $i=0;$i[$i];
+ $correct[$i] = $correct_by_concept{$concept->{'name'}};
+ $total += $correct_by_concept{$concept->{'name'}}+
+ $incorrect_by_concept{$concept->{'name'}};
+ }
+ if ($total == 0) { return ''; };
+ for (my $i=0;$i<=$#correct;$i++) {
+ $correct[$i] = sprintf('%0f',$correct[$i]/$total*100);
+ }
+ my $xlabel = 'concept';
+ my $plot= &Apache::loncommon::DrawBarGraph($title,
+ $xlabel,
+ 'Percent Choosing',
+ 100,
+ ['#33ff00','#ff3300'],
+ undef,
+ \@correct);
+ return $plot;
+}
+
+sub RR_create_percent_selected_plot {
+ my ($concepts,$foils,$foil_data,$title) = @_;
+ #
+ if ($foil_data->{'_count'} == 0) { return ''; };
+ my %correct_selections;
+ my %incorrect_selections;
+ foreach my $foil (@$foils) {
+ # foil_data has format $foil_data->{true_foil}->{selected foil}=count
+ next if (! exists($foil_data->{$foil}));
+ while (my ($f,$count)= each(%{$foil_data->{$foil}})) {
+ if ($f eq $foil) {
+ $correct_selections{$foil} += $count;
+ } else {
+ $incorrect_selections{$f} += $count;
+ }
+ }
+ }
+ #
+ # need arrays for incorrect and correct because we want to use different
+ # colors for them
+ my @correct;
+ my @incorrect;
+ #
+ my $total = $foil_data->{'_count'};
+ for (my $i=0;$i[$i];
+ $correct[$i] = $correct_selections{$foil};
+ $incorrect[$i] = $incorrect_selections{$foil};
+ }
+ for (my $i=0;$i<=$#correct;$i++) {
+ $correct[$i] = sprintf('%2f',$correct[$i]/$total*100);
+ }
+ for (my $i=0;$i<=$#incorrect;$i++) {
+ $incorrect[$i] = sprintf('%2f',$incorrect[$i]/$total*100);
+ }
+ #
+ # Put a blank in the data sets between concepts, if there are concepts
+ my @labels;
+ if (defined($concepts) && scalar(@$concepts) > 1) {
+ my @new_correct;
+ my @new_incorrect;
+ my $foil_count = 0;
+ foreach my $concept (@$concepts) {
+ foreach (@{$concept->{'foils'}}) {
+ push(@new_correct, $correct[$foil_count]);
+ push(@new_incorrect,$incorrect[$foil_count]);
+ push(@labels,++$foil_count);
+ }
+ push(@new_correct,'');
+ push(@new_incorrect,'');
+ push(@labels,'');
+ }
+ @correct = @new_correct;
+ @incorrect = @new_incorrect;
+ } else {
+ @labels = (1 .. scalar(@correct));
+ }
+ #
+ my $xlabel = 'foil chosen';
+ my $plot= &Apache::loncommon::DrawBarGraph($title,
+ $xlabel,
+ 'Percent Choosing',
+ 100,
+ ['#33ff00','#ff3300'],
+ \@labels,
+ \@correct,
+ \@incorrect);
+ return $plot;
}
-sub RR_Tries_Analysis {
- my ($r,$resource,$PerformanceData,$problem_data) = @_;
- my $analysis_html;
- my $mintries = 1;
- my $maxtries = $ENV{'form.NumPlots'};
- my ($table,$Foils,$Concepts) = &build_foil_index($problem_data);
- if ((! defined($Concepts)) || (@$Concepts < 2)) {
- $table = ''.
- &mt('Not enough data for concept analysis. '.
- 'Performing Foil Analysis').
- ' '.$table;
- }
- $analysis_html .= $table;
- my @TryData = &RR_tries_data_analysis($r,$PerformanceData);
- $analysis_html .= &RR_Tries_Foil_Analysis($mintries,$maxtries,$Foils,
- \@TryData,$problem_data);
- return $analysis_html;
-}
-
-sub RR_tries_data_analysis {
- my ($r,$Attempt_data) = @_;
- my @TryData;
- foreach my $attempt (@$Attempt_data) {
- my %Attempt = &hashify_attempt($attempt);
- my ($answer,undef) = split('=',$Attempt{'submission'});
- $TryData[$Attempt{'tries'}]->{$answer}++;
- }
- return @TryData;
-}
-
-sub RR_Time_Analysis {
- my ($r,$PerformanceData,$problem_data) = @_;
- my $html;
- return $html;
-}
-
-sub RR_Tries_Foil_Analysis {
- my ($min,$max,$Foils,$TryData,$problem_data) = @_;
- my $html;
- #
- # Compute the data neccessary to make the plots
- for (my $try=$min;$try<=$max;$try++) {
- my @PlotData_Correct;
- my @PlotData_Incorrect;
- next if ($try > scalar(@{$TryData}));
- next if (! defined($TryData->[$try]));
- my %DataSet = %{$TryData->[$try]};
- my $total = 0;
- foreach my $foilid (@$Foils) {
- $total += $DataSet{$foilid};
+sub RR_create_stacked_selection_plot {
+ my ($foils,$foil_data,$title,$true_foils)=@_;
+ #
+ my @dataset; # array of array refs - multicolor rows $datasets[row]->[col]
+ my @labels;
+ my $count;
+ my %column; # maps foil name to column in @datasets
+ for (my $i=0;$i[$i];
+ if (defined($true_foils) && scalar(keys(%$true_foils)) > 0 ) {
+ next if (! $true_foils->{$foil} );
+ push(@labels,$i+1);
+ } else {
+ next if (! exists($foil_data->{$foil}));
+ push(@labels,$i+1);
}
- foreach my $foilid (@$Foils) {
- if ($total == 0) {
- push (@PlotData_Correct,0);
- push (@PlotData_Incorrect,0);
- } else {
- if ($problem_data->{'_Foils'}->{$foilid}->{'value'} eq 'true') {
- push (@PlotData_Correct,
- int(100*$DataSet{$foilid}/$total));
- push (@PlotData_Incorrect,0);
- } else {
- push (@PlotData_Correct,0);
- push (@PlotData_Incorrect,
- int(100*$DataSet{$foilid}/$total));
- }
+ next if (! exists($foil_data->{$foils->[$i]}));
+ $column{$foil}= $count++;
+ for (my $j=0;$j{$foil}->{$foils->[$j]};
}
+ $dataset[$j]->[$column{$foil}]=$value;
}
- my $title='Attempt '.$try.' (N='.$total.')';
- my $xlabel = 'Foil Chosen';
- $html.= &Apache::loncommon::DrawBarGraph($title,
- $xlabel,
- 'Percent Choosing',
- 100,
- ['#33ff00','#ff3300'],
- undef,
- \@PlotData_Correct,
- \@PlotData_Incorrect);
- }
- return $html;
-}
-
-sub RR_Tries_Concept_Analysis {
- my ($min,$max,$Concepts,$ResponseData,$problem_data) = @_;
- my $html;
- return $html;
-}
-
-sub RR_Time_Foil_Analysis {
- my ($min,$max,$Foils,$ResponseData,$problem_data) = @_;
- my $html;
- return $html;
-}
-
-sub RR_Time_Concept_Analysis {
- my ($min,$max,$Concepts,$ResponseData,$problem_data) = @_;
- my $html;
- return $html;
+ }
+ #
+ return '' if (! scalar(keys(%column)));
+ #
+ my $grand_total = 0;
+ my %count_per_foil;
+ while (my ($foil,$bar) = each (%column)) {
+ my $bar_total = 0;
+ for (my $j=0;$j[$bar];
+ }
+ next if ($bar_total == 0);
+ for (my $j=0;$j[$bar] =
+ sprintf('%2f',$dataset[$j]->[$bar]/$bar_total * 100);
+ }
+ $count_per_foil{$foil}=' ( '.$bar_total.' )';
+ $grand_total += $bar_total;
+ }
+ if ($grand_total == 0) {
+ return ('',undef);
+ }
+ my @empty_row = ();
+ foreach (@{$dataset[0]}) {
+ push(@empty_row,0);
+ }
+ #
+ my $graph = &Apache::loncommon::DrawBarGraph
+ ($title,'Correct Foil','foils chosen Incorrectly',
+ 100,$plotcolors,\@labels,\@empty_row,@dataset);
+ return ($graph,\%count_per_foil);
}
-sub get_Radio_problem_data {
- my ($url) = @_;
- my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze'));
- (my $garbage,$Answ)=split('_HASH_REF__',$Answ,2);
- my %Answer = &Apache::lonnet::str2hash($Answ);
- my %Partdata;
- foreach my $part (@{$Answer{'parts'}}) {
- while (my($key,$value) = each(%Answer)) {
-# if (ref($value) eq 'ARRAY') {
-# &Apache::lonnet::logthis('is ref part:'.$part.' '.$key.'='.join(',',@$value));
-# } else {
-# &Apache::lonnet::logthis('notref part:'.$part.' '.$key.'='.$value);
-# }
- next if ($key !~ /^$part/);
- $key =~ s/^$part\.//;
- if ($key eq 'foils') {
- $Partdata{$part}->{'_Foils'}=$value;
- } elsif ($key eq 'options') {
- $Partdata{$part}->{'_Options'}=$value;
- } elsif ($key eq 'shown') {
- $Partdata{$part}->{'_Shown'}=$value;
- } elsif ($key =~ /^foil.value.(.*)$/) {
- $Partdata{$part}->{$1}->{'value'}=$value;
- } elsif ($key =~ /^foil.text.(.*)$/) {
- $Partdata{$part}->{$1}->{'text'}=$value;
+#########################################################
+#########################################################
+##
+## Misc routines
+##
+#########################################################
+#########################################################
+
+# if $correct is a hash ref, it is assumed to be indexed by student names.
+# the values are assumed to be hash refs with a key of 'answer'.
+sub classify_response_data {
+ my ($full_row_data,$correct,$function) = @_;
+ my %submission_data;
+ my %students;
+ my $max=0;
+ foreach my $row (@$full_row_data) {
+ my %subm = &hashify_attempt($row);
+ if (ref($correct) eq 'HASH') {
+ $subm{'correct'} = $correct->{$subm{'student'}};
+ } else {
+ $subm{'correct'} = $correct;
+ }
+ $subm{'submission'} =~ s/=\d+\s*$//;
+ if (&$function(\%subm)) {
+ $students{$subm{'student'}}++;
+ $submission_data{'_count'}++;
+ if (&submission_is_correct($subm{'award'})) {
+ $submission_data{'_correct'}++;
+ }
+
+ if($max<++$submission_data{$subm{'correct'}}->{$subm{'submission'}}) {
+ $max=$submission_data{$subm{'correct'}}->{$subm{'submission'}};
}
}
}
- return %Partdata;
+ $submission_data{'_max'} = $max;
+ $submission_data{'_students'}=scalar(keys(%students));
+ return \%submission_data;
}
+
#########################################################
#########################################################
##
@@ -559,9 +1173,9 @@ sub OptionResponseAnalysis {
$problem->{'respid'});
# Note: part data is not needed.
my $PerformanceData = &Apache::loncoursedata::get_response_data
- (\@Apache::lonstatistics::SelectedSections,
+ ([&Apache::lonstatistics::get_selected_sections()],
$Apache::lonstatistics::enrollment_status,
- $resource->{'symb'},$respid);
+ $resource->symb,$respid);
if (! defined($PerformanceData) ||
ref($PerformanceData) ne 'ARRAY' ) {
$r->print(''.
@@ -569,37 +1183,29 @@ sub OptionResponseAnalysis {
' ');
} else {
$r->rflush();
- if (exists($ENV{'form.ExcelOutput'})) {
- my $result = &OR_excel_sheet($r,$resource,
- $PerformanceData,
- $problem_data);
- $r->print($result);
+ if ($ENV{'form.AnalyzeOver'} eq 'tries') {
+ my $analysis_html = &OR_tries_analysis($r,
+ $PerformanceData,
+ $problem_data);
+ $r->print($analysis_html);
+ $r->rflush();
+ } elsif ($ENV{'form.AnalyzeOver'} eq 'time') {
+ my $analysis_html = &OR_time_analysis($PerformanceData,
+ $problem_data);
+ $r->print($analysis_html);
$r->rflush();
} else {
- if ($ENV{'form.AnalyzeOver'} eq 'Tries') {
- my $analysis_html = &OR_tries_analysis($r,
- $PerformanceData,
- $problem_data);
- $r->print($analysis_html);
- $r->rflush();
- } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
- my $analysis_html = &OR_time_analysis($PerformanceData,
- $problem_data);
- $r->print($analysis_html);
- $r->rflush();
- } else {
- $r->print(''.
- &mt('The analysis you have selected is '.
- 'not supported at this time').
- ' ');
- }
+ $r->print(''.
+ &mt('The analysis you have selected is '.
+ 'not supported at this time').
+ ' ');
}
}
}
#########################################################
#
-# Option Response: Tries Analysis
+# Option Response: tries Analysis
#
#########################################################
sub OR_tries_analysis {
@@ -607,6 +1213,9 @@ sub OR_tries_analysis {
my $mintries = 1;
my $maxtries = $ENV{'form.NumPlots'};
my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
+ if (! defined($Concepts)) {
+ $Concepts = [];
+ }
my %response_data = &OR_analyze_by_tries($r,$PerformanceData,
$mintries,$maxtries);
my $analysis = '';
@@ -657,7 +1266,7 @@ sub OR_tries_analysis {
} # End of concept loops
#
# Build a table for the plots
- my $analysis_html = "\n";
+ my $analysis_html = "\n";
my $optionkey = &build_option_index($ORdata);
my $num_concepts = 1;
if (defined($Concepts)) { $num_concepts = scalar(@$Concepts); }
@@ -692,17 +1301,15 @@ sub OR_tries_analysis {
}
}
#
- my $title;
- my $count = $response_data{'_total'}->[$try];
- $title = 'Attempt '.$try.' (N='.$count.')';
$concept_graph = &Apache::loncommon::DrawBarGraph
- ($title,'Concept Number','Percent Correct',
- 100,$plotcolors,undef,\@concept_plot_data);
+ ('Correct Concepts','Concept Number','Percent Correct',
+ 100,$plotcolors,undef,\@concept_plot_data,{xskip=>1});
}
#
# Create Foil Plots
- my $count = $response_data{'_total'}->[$try];
- my $title = 'Attempt '.$try.' (N='.$count.')';
+ my $data_count = $response_data{'_total'}->[$try];
+ my $correct = $response_data{'_correct'}->[$try];
+ if (! defined($correct)) { $correct = 0; }
my @Datasets;
foreach my $option ('_correct',@{$ORdata->{'_Options'}}) {
next if (! exists($foil_plot[$try]->{$option}));
@@ -734,8 +1341,8 @@ sub OR_tries_analysis {
}
#
my $correct_graph = &Apache::loncommon::DrawBarGraph
- ($title,'Foil Number','Percent Correct',
- 100,$plotcolors,\@Labels,$Datasets[0]);
+ ('Correct Statements','Statement','% Answered Correct',
+ 100,$plotcolors,\@Labels,$Datasets[0],{xskip=>1});
#
#
@@ -743,13 +1350,17 @@ sub OR_tries_analysis {
for (my $i=0; $i< scalar(@{$Datasets[0]});$i++) {
$Datasets[0]->[$i]=0;
}
- $count = $response_data{'_total'}->[$try] -
+ my $count = $response_data{'_total'}->[$try] -
$response_data{'_correct'}->[$try];
- $title = 'Attempt '.$try.' (N='.$count.')';
my $incorrect_graph = &Apache::loncommon::DrawBarGraph
- ($title,'Foil Number','% Option Chosen Incorrectly',
- 100,$plotcolors,\@Labels,@Datasets);
+ ('Incorrect Statements','Statement','% Chosen Incorrectly',
+ 100,$plotcolors,\@Labels,@Datasets,{xskip=>1});
$analysis_html.=
+ ''.
+ ''.
+ &mt('Attempt [_1], [_2] submissions, [_3] correct, [_4] incorrect',
+ $try,$data_count,$correct,$data_count-$correct).
+ ' '.' '.$/.
''.
''.$concept_graph.' '.
''.$correct_graph.' '.
@@ -767,11 +1378,14 @@ sub OR_analyze_by_tries {
my %Trydata;
$mintries = 1 if (! defined($mintries) || $mintries < 1);
$maxtries = $mintries if (! defined($maxtries) || $maxtries < $mintries);
+ my @students;
foreach my $row (@$PerformanceData) {
next if (! defined($row));
my $tries = &get_tries_from_row($row);
my %Row = &Process_OR_Row($row);
next if (! %Row);
+ my $student_id = $row->[&Apache::loncoursedata::RD_student_id()];
+ $students[$tries]->{$student_id}++;
while (my ($foilid,$href) = each(%Row)) {
if (! ref($href)) {
$Trydata{$foilid}->[$tries] += $href;
@@ -782,6 +1396,9 @@ sub OR_analyze_by_tries {
}
}
}
+ for (my $try=$mintries;$try<=$maxtries;$try++) {
+ $Trydata{'_studentcount'}->[$try] = scalar(keys(%{$students[$try]}));
+ }
return %Trydata;
}
@@ -806,8 +1423,8 @@ sub OR_time_analysis {
#
my $num_plots = $ENV{'form.NumPlots'};
my $num_data = scalar(@$performance_data)-1;
- my $percent = sprintf('%2f',100/$num_plots);
#
+ my $current_index;
$table .= "\n";
for (my $i=0;$i<$num_plots;$i++) {
##
@@ -818,19 +1435,19 @@ sub OR_time_analysis {
if (! defined($starttime) || ! defined($endtime)) {
my $sec_in_day = 86400;
my $last_sub_time = &get_time_from_row($performance_data->[-1]);
- my ($sday,$smon,$syear);
- (undef,undef,undef,$sday,$smon,$syear) =
- localtime($last_sub_time - $sec_in_day*$i);
+ my ($sday,$smon,$syear) =
+ (localtime($last_sub_time - $sec_in_day*$i))[3..5];
$starttime = &Time::Local::timelocal(0,0,0,$sday,$smon,$syear);
$endtime = $starttime + $sec_in_day;
if ($i == ($num_plots -1 )) {
$starttime = &get_time_from_row($performance_data->[0]);
}
}
- $table .= ''.
+ $table .= ' '.
&mt('Data from [_1] to [_2]',
&Apache::lonlocal::locallocaltime($starttime),
- &Apache::lonlocal::locallocaltime($endtime)).' '.$/;
+ &Apache::lonlocal::locallocaltime($endtime)).
+ ''.$/;
my $startdateform = &Apache::lonhtmlcommon::date_setter
('Statistics','startdate_'.$i,$starttime);
my $enddateform = &Apache::lonhtmlcommon::date_setter
@@ -853,33 +1470,32 @@ sub OR_time_analysis {
}
$end_index = $j;
##
- my $interval = {
- begin_index => $begin_index,
- end_index => $end_index,
- startdateform => $startdateform,
- enddateform => $enddateform,
- };
+ my ($processed_time_data,$correct,$data_count,$student_count) =
+ &OR_time_process_data($performance_data,$begin_index,$end_index);
+ ##
+ $table .= ''.
+ &mt('[_1] submissions from [_2] students, [_3] correct, [_4] incorrect',
+ $data_count,$student_count,$correct,$data_count-$correct).
+ ' '.$/;
my $concept_correct_plot = '';
if ($num_concepts > 1) {
$concept_correct_plot =
- &OR_Concept_Time_Analysis($performance_data,
- $ORdata,$Concepts,
- $interval);
+ &OR_Concept_Time_Analysis($processed_time_data,
+ $correct,$data_count,$student_count,
+ $ORdata,$Concepts);
}
my ($foil_correct_plot,$foil_incorrect_plot) =
- &OR_Foil_Time_Analysis($performance_data,$ORdata,
- $Foils,$Concepts,$interval);
+ &OR_Foil_Time_Analysis($processed_time_data,
+ $correct,$data_count,$student_count,
+ $ORdata,$Foils,$Concepts);
$table .= ''.
''.$concept_correct_plot.' '.
''.$foil_correct_plot.' '.
''.$foil_incorrect_plot.' '.
''.$foilkey.' '.$/;
$table .= ''.
- &mt('Start time: [_1]',
- $interval->{'startdateform'}).' '.
- &mt('End time: [_1]',
- $interval->{'enddateform'}).
- ' '.$/;
+ &mt('Start time: [_1]',$startdateform).' '.
+ &mt('End time: [_1]',$enddateform).''.$/;
$table.= '  '.$/;
}
$table .= '
';
@@ -888,47 +1504,32 @@ sub OR_time_analysis {
}
sub OR_Foil_Time_Analysis {
- my ($performance_data,$ORdata,$Foils,$Concepts,$interval) = @_;
- my $analysis_html;
- my ($begin_index,$end_index) = ($interval->{'begin_index'},
- $interval->{'end_index'});
- my %TimeData;
- #
- # Compute the number getting the foils correct or incorrects
- for (my $j=$begin_index;$j<=$end_index;$j++) {
- my $row = $performance_data->[$j];
- next if (! defined($row));
- my %Row = &Process_OR_Row($row);
- while (my ($foilid,$href) = each(%Row)) {
- if (! ref($href)) {
- $TimeData{$foilid} += $href;
- next;
- }
- while (my ($option,$value) = each(%$href)) {
- $TimeData{$foilid}->{$option}+=$value;
- }
- }
+ my ($processed_time_data,$correct,$data_count,$student_count,
+ $ORdata,$Foils,$Concepts) = @_;
+ if ($data_count <= 0) {
+ return (''.&mt('There is no data to plot').' ','');
}
+ my $analysis_html;
my @plotdata;
my @labels;
foreach my $concept (@{$Concepts}) {
foreach my $foil (@{$concept->{'foils'}}) {
push(@labels,scalar(@labels)+1);
- my $total = $TimeData{$foil}->{'_total'};
+ my $total = $processed_time_data->{$foil}->{'_total'};
if ($total == 0) {
push(@{$plotdata[0]},0);
} else {
push(@{$plotdata[0]},
- 100 * $TimeData{$foil}->{'_correct'} / $total);
+ 100 * $processed_time_data->{$foil}->{'_correct'} / $total);
}
- my $total_incorrect = $total - $TimeData{$foil}->{'_correct'};
+ my $total_incorrect = $total - $processed_time_data->{$foil}->{'_correct'};
for (my $i=0;$i{'_Options'}});$i++) {
my $option = $ORdata->{'_Options'}->[$i];
if ($total_incorrect == 0) {
push(@{$plotdata[$i+1]},0);
} else {
push(@{$plotdata[$i+1]},
- 100 * $TimeData{$foil}->{$option} / $total_incorrect);
+ 100 * $processed_time_data->{$foil}->{$option} / $total_incorrect);
}
}
}
@@ -941,77 +1542,40 @@ sub OR_Foil_Time_Analysis {
}
#
# Create the plot
- my $count = $end_index-$begin_index;
- return ('No data','') if ($count <= 0);
- my $title;
- if ($count == 0) {
- $title = 'no submissions';
- } elsif ($count == 1) {
- $title = 'one submission';
- } elsif ($count > 1) {
- $title = $count.' submissions';
- }
- my $correct_plot = &Apache::loncommon::DrawBarGraph($title,
- 'Foil Number',
- 'Percent Correct',
- 100,
- $plotcolors,
- undef,
- $plotdata[0]);
+ my $correct_plot = &Apache::loncommon::DrawBarGraph('Correct Statements',
+ 'Statement Number',
+ 'Percent Correct',
+ 100,
+ $plotcolors,
+ undef,
+ $plotdata[0],
+ {xskip=>1});
for (my $j=0; $j< scalar(@{$plotdata[0]});$j++) {
$plotdata[0]->[$j]=0;
}
- $count = $end_index-$begin_index-$TimeData{'_correct'};
- if ($count == 0) {
- $title = 'no submissions';
- } elsif ($count < 0) {
- return ($correct_plot,'');
- } elsif ($count == 1) {
- $title = 'one submission';
- } else {
- $title = $count.' submissions';
- }
- my $incorrect_plot = &Apache::loncommon::DrawBarGraph($title,
- 'Foil Number',
- 'Incorrect Option Choice',
- 100,
- $plotcolors,
- undef,
- @plotdata);
+ my $incorrect_plot =
+ &Apache::loncommon::DrawBarGraph('Incorrect Statements',
+ 'Statement Number',
+ 'Incorrect Option Choice',
+ 100,
+ $plotcolors,
+ undef,
+ @plotdata,{xskip=>1});
return ($correct_plot,$incorrect_plot);
}
sub OR_Concept_Time_Analysis {
- my ($performance_data,$ORdata,$Concepts,$interval) = @_;
- ##
- ## Determine starttime, endtime, startindex, endindex
- my ($begin_index,$end_index) = ($interval->{'begin_index'},
- $interval->{'end_index'});
- my %TimeData;
- #
- # Compute the number getting the foils correct or incorrects
- for (my $j=$begin_index;$j<=$end_index;$j++) {
- my $row = $performance_data->[$j];
- next if (! defined($row));
- my %Row = &Process_OR_Row($row);
- while (my ($foilid,$href) = each(%Row)) {
- if (! ref($href)) {
- $TimeData{$foilid} += $href;
- next;
- }
- while (my ($option,$value) = each(%$href)) {
- $TimeData{$foilid}->{$option}+=$value;
- }
- }
- }
+ my ($processed_time_data,$correct,$data_count,$student_count,
+ $ORdata,$Concepts) = @_;
+ return '' if ($data_count == 0);
#
# Put the data in plottable form
my @plotdata;
foreach my $concept (@$Concepts) {
my ($total,$correct);
foreach my $foil (@{$concept->{'foils'}}) {
- $total += $TimeData{$foil}->{'_total'};
- $correct += $TimeData{$foil}->{'_correct'};
+ $total += $processed_time_data->{$foil}->{'_total'};
+ $correct += $processed_time_data->{$foil}->{'_correct'};
}
if ($total == 0) {
push(@plotdata,0);
@@ -1021,191 +1585,51 @@ sub OR_Concept_Time_Analysis {
}
#
# Create the plot
- my $title = ($end_index - $begin_index).' submissions';
- return &Apache::loncommon::DrawBarGraph($title,
+ return &Apache::loncommon::DrawBarGraph('Correct Concepts',
'Concept Number',
'Percent Correct',
100,
$plotcolors,
undef,
- \@plotdata);
+ \@plotdata,{xskip=>1});
}
-#########################################################
-#########################################################
-##
-## Excel output
-##
-#########################################################
-#########################################################
-sub OR_excel_sheet {
- my ($r,$resource,$performance_data,$ORdata) = @_;
- my $response = '';
- my (undef,$Foils,$Concepts) = &build_foil_index($ORdata);
- #
- # Create excel worksheet
- my $filename = '/prtspool/'.
- $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
- time.'_'.rand(1000000000).'.xls';
- my $workbook = Spreadsheet::WriteExcel->new('/home/httpd'.$filename);
- if (! defined($workbook)) {
- $r->log_error("Error creating excel spreadsheet $filename: $!");
- $r->print(''.&mt("Unable to create new Excel file. ".
- "This error has been logged. ".
- "Please alert your LON-CAPA administrator").
- '
');
+sub OR_time_process_data {
+ my ($performance_data,$begin_index,$end_index)=@_;
+ my %processed_time_data;
+ my %distinct_students;
+ my ($correct,$data_count);
+ if (($begin_index == $end_index) &&
+ ($end_index != scalar(@$performance_data)-1)) {
return undef;
}
- #
- $workbook->set_tempdir('/home/httpd/perl/tmp');
- my $format = &Apache::loncommon::define_excel_formats($workbook);
- #
- # Create and populate main worksheets
- my $problem_data_sheet = $workbook->addworksheet('Problem Data');
- my $student_data_sheet = &build_student_data_worksheet($workbook,$format);
- my $response_data_sheet = $workbook->addworksheet('Response Data');
- foreach my $sheet ($problem_data_sheet,$student_data_sheet,
- $response_data_sheet) {
- $sheet->write(0,0,$resource->{'title'},$format->{'h2'});
- $sheet->write(1,0,$resource->{'src'},$format->{'h3'});
- }
- #
- my $result;
- $result = &OR_build_problem_data_worksheet($problem_data_sheet,$format,
- $Concepts,$ORdata);
- if ($result ne 'okay') {
- # Do something useful
- }
- $result = &OR_build_response_data_worksheet($response_data_sheet,$format,
- $performance_data,$Foils,
- $ORdata);
- if ($result ne 'okay') {
- # Do something useful
- }
- $response_data_sheet->activate();
- #
- # Close the excel file
- $workbook->close();
- #
- # Write a link to allow them to download it
- $result .= ''.&mt('Excel Raw Data Output').' '.
- ''.
- &mt('Your Excel spreadsheet.').
- '
'."\n";
- return $result;
-}
-
-sub OR_build_problem_data_worksheet {
- my ($worksheet,$format,$Concepts,$ORdata) = @_;
- my $rows_output = 3;
- my $cols_output = 0;
- $worksheet->write($rows_output++,0,'Problem Structure',$format->{'h3'});
- ##
- ##
- my @Headers;
- if (@$Concepts > 1) {
- @Headers = ("Concept\nNumber",'Concept',"Foil\nNumber",
- 'Foil Name','Foil Text','Correct value');
- } else {
- @Headers = ('Foil Number','FoilName','Foil Text','Correct value');
- }
- $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'});
- my %Foildata = %{$ORdata->{'_Foils'}};
- my $conceptindex = 1;
- my $foilindex = 1;
- foreach my $concept (@$Concepts) {
- my @FoilsInConcept = @{$concept->{'foils'}};
- my $firstfoil = shift(@FoilsInConcept);
- if (@$Concepts > 1) {
- $worksheet->write_row($rows_output++,0,
- [$conceptindex,
- $concept->{'name'},
- $foilindex++,
- $Foildata{$firstfoil}->{'name'},
- $Foildata{$firstfoil}->{'text'},
- $Foildata{$firstfoil}->{'value'},]);
- } else {
- $worksheet->write_row($rows_output++,0,
- [ $foilindex++,
- $Foildata{$firstfoil}->{'name'},
- $Foildata{$firstfoil}->{'text'},
- $Foildata{$firstfoil}->{'value'},]);
- }
- foreach my $foilid (@FoilsInConcept) {
- if (@$Concepts > 1) {
- $worksheet->write_row($rows_output++,0,
- ['',
- '',
- $foilindex,
- $Foildata{$foilid}->{'name'},
- $Foildata{$foilid}->{'text'},
- $Foildata{$foilid}->{'value'},]);
- } else {
- $worksheet->write_row($rows_output++,0,
- [$foilindex,
- $Foildata{$foilid}->{'name'},
- $Foildata{$foilid}->{'text'},
- $Foildata{$foilid}->{'value'},]);
- }
- } continue {
- $foilindex++;
- }
- } continue {
- $conceptindex++;
- }
- $rows_output++;
- $rows_output++;
- ##
- ## Option data output
- $worksheet->write($rows_output++,0,'Options',$format->{'header'});
- foreach my $string (@{$ORdata->{'_Options'}}) {
- $worksheet->write($rows_output++,0,$string);
- }
- return 'okay';
-}
-
-sub OR_build_response_data_worksheet {
- my ($worksheet,$format,$performance_data,$Foils,$ORdata)=@_;
- my $rows_output = 3;
- my $cols_output = 0;
- $worksheet->write($rows_output++,0,'Response Data',$format->{'h3'});
- $worksheet->set_column(1,1,20);
- $worksheet->set_column(2,2,13);
- my @Headers = ('identifier','time','award detail','attempt');
- foreach my $foil (@$Foils) {
- push (@Headers,$foil.' submission');
- push (@Headers,$foil.' grading');
- }
- $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'});
- #
- foreach my $row (@$performance_data) {
- next if (! defined($row));
- my ($student,$award,$grading,$submission,$time,$tries) = @$row;
- my @Foilgrades = split('&',$grading);
- my @Foilsubs = split('&',$submission);
- my %response_data;
- for (my $j=0;$j<=$#Foilgrades;$j++) {
- my ($foilid,$correct) = split('=',$Foilgrades[$j]);
- my (undef,$submission) = split('=',$Foilsubs[$j]);
- $submission = &Apache::lonnet::unescape($submission);
- $response_data{$foilid.' submission'}=$submission;
- $response_data{$foilid.' award'}=$correct;
- }
- $worksheet->write($rows_output,$cols_output++,$student);
- $worksheet->write($rows_output,$cols_output++,
- &Apache::lonstathelpers::calc_serial($time),$format->{'date'});
- $worksheet->write($rows_output,$cols_output++,$award);
- $worksheet->write($rows_output,$cols_output++,$tries);
- foreach my $foilid (@$Foils) {
- $worksheet->write($rows_output,$cols_output++,
- $response_data{$foilid.' submission'});
- $worksheet->write($rows_output,$cols_output++,
- $response_data{$foilid.' award'});
+ # Be sure we include the last one if we are asked for it.
+ # That we have to correct here (and not when $end_index is
+ # given a value) should probably be considered a bug.
+ if ($end_index == scalar(@$performance_data)-1) {
+ $end_index++;
+ }
+ my $count;
+ for (my $i=$begin_index;$i<$end_index;$i++) {
+ my $attempt = $performance_data->[$i];
+ $count++;
+ next if (! defined($attempt));
+ my %attempt = &Process_OR_Row($attempt);
+ $data_count++;
+ $correct += $attempt{'_correct'};
+ $distinct_students{$attempt->[&Apache::loncoursedata::RD_student_id()]}++;
+ while (my ($foilid,$href) = each(%attempt)) {
+ if (! ref($href)) {
+ $processed_time_data{$foilid} += $href;
+ next;
+ }
+ while (my ($option,$value) = each(%$href)) {
+ $processed_time_data{$foilid}->{$option}+=$value;
+ }
}
- $rows_output++;
- $cols_output = 0;
}
- return;
+ return (\%processed_time_data,$correct,$data_count,
+ scalar(keys(%distinct_students)));
}
sub build_foil_index {
@@ -1335,10 +1759,11 @@ sub build_option_index {
my $optionindex = 0;
my @Rows;
foreach my $option (&mt('correct option chosen'),@{$ORdata->{'_Options'}}) {
+ my $color = $plotcolors->[$optionindex++];
push (@Rows,
''.
- ''.
- (' 'x4).' '.
+ ''.
+ ''.('*'x3).' '.' '.
''.&HTML::Entities::encode($option,'<>&"').' '.
" \n");
}
@@ -1347,6 +1772,27 @@ sub build_option_index {
$table .= "
\n";
}
+sub build_foil_key {
+ my ($foils,$extra_data)= @_;
+ if (! defined($extra_data)) { $extra_data = {}; }
+ my $table = "\n";
+ my $foil_index = 0;
+ my @rows;
+ foreach my $foil (&mt('correct foil chosen'),@{$foils}) {
+ my $color = $plotcolors->[$foil_index++];
+ push (@rows,
+ ''.
+ ''.
+ ''.('*'x4).' '.
+ ''.&HTML::Entities::encode($foil,'<>&"').
+ (' 'x2).$extra_data->{$foil}.' '.
+ " \n");
+ }
+ shift(@rows); # Throw away 'correct foil chosen' color
+ $table .= join('',reverse(@rows));
+ $table .= "
\n";
+}
+
#########################################################
#########################################################
##
@@ -1358,7 +1804,7 @@ sub CreateInterface {
##
## Environment variable initialization
if (! exists$ENV{'form.AnalyzeOver'}) {
- $ENV{'form.AnalyzeOver'} = 'Tries';
+ $ENV{'form.AnalyzeOver'} = 'tries';
}
##
## Build the menu
@@ -1369,7 +1815,6 @@ sub CreateInterface {
$Str .= '';
$Str .= ''.&mt('Sections').' ';
$Str .= ''.&mt('Enrollment Status').' ';
-# $Str .= ''.&mt('Sequences and Folders').' ';
$Str .= ' ';
$Str .= ' '."\n";
##
@@ -1382,17 +1827,6 @@ sub CreateInterface {
$Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5);
$Str .= '';
#
-# $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 .= ' ';
@@ -1408,15 +1842,15 @@ sub CreateInterface {
' ';
##
my $analyze_selector = '';
- $analyze_selector .= '';
- $analyze_selector .= ' ';
$analyze_selector .= ' ';
$Str .= ''.
@@ -1479,8 +1913,9 @@ sub get_tries_from_row {
sub hashify_attempt {
my ($row) = @_;
my %attempt;
+ $attempt{'student'} = $row->[&Apache::loncoursedata::RD_sname()];
$attempt{'tries'} = $row->[&Apache::loncoursedata::RD_tries()];
- $attempt{'submission'} = $row->[&Apache::loncoursedata::RD_submission()];
+ $attempt{'submission'} = &Apache::lonnet::unescape($row->[&Apache::loncoursedata::RD_submission()]);
$attempt{'award'} = $row->[&Apache::loncoursedata::RD_awarddetail()];
$attempt{'timestamp'} = $row->[&Apache::loncoursedata::RD_timestamp()];
return %attempt;
@@ -1489,14 +1924,14 @@ sub hashify_attempt {
sub Process_OR_Row {
my ($row) = @_;
my %RowData;
- my $student_id = $row->[&Apache::loncoursedata::RD_student_id()];
+# my $student_id = $row->[&Apache::loncoursedata::RD_student_id()];
my $award = $row->[&Apache::loncoursedata::RD_awarddetail()];
my $grading = $row->[&Apache::loncoursedata::RD_response_eval()];
my $submission = $row->[&Apache::loncoursedata::RD_submission()];
my $time = $row->[&Apache::loncoursedata::RD_timestamp()];
- my $tries = $row->[&Apache::loncoursedata::RD_tries()];
+# my $tries = $row->[&Apache::loncoursedata::RD_tries()];
return undef if ($award eq 'MISSING_ANSWER');
- if ($award =~ /(APPROX_ANS|EXACT_ANS)/) {
+ if (&submission_is_correct($award)) {
$RowData{'_correct'} = 1;
}
$RowData{'_total'} = 1;
@@ -1517,6 +1952,15 @@ sub Process_OR_Row {
return %RowData;
}
+sub submission_is_correct {
+ my ($award) = @_;
+ if ($award =~ /(APPROX_ANS|EXACT_ANS)/) {
+ return 1;
+ } else {
+ return 0;
+ }
+}
+
1;
__END__