';
+ for (my $try = 1;$try<=$ENV{'form.NumPlots'};$try++) {
+ # classify data ->correct foil -> selected foil
+ my $attempt_restriction_function =
+ my $foil_choice_data =
+ &RR_classify_response_data($response_data,$correct,
+ sub {($_[0]->{'tries'} == $try?1:0)});
+ 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,
+ '% choosing');
+ }
+ # % Choosing plot
+ my $choice_plot = &RR_create_percent_selected_plot
+ ($foils,$foil_choice_data,'Attempt '.$try);
+ # for each correct foil, how did they mark it? (stacked bar graph)
+ my ($stacked_plot,$count_by_foil) =
+ &RR_create_stacked_selection_plot($foils,$foil_choice_data,'');
+ #
+ if ($concept_plot ne '' ||
+ $choice_plot ne '' ||
+ $stacked_plot ne '') {
+ $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.='
'.$/;
+ }
+ }
+ $analysis_html.='
';
+ $r->print($analysis_html);
+}
+
+
+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';
+ $title.= ' (N='.$total.')';
+ my $plot= &Apache::loncommon::DrawBarGraph($title,
+ $xlabel,
+ 'Percent Choosing',
+ 100,
+ ['#33ff00','#ff3300'],
+ undef,
+ \@correct);
+ return $plot;
+}
+
+
+sub RR_create_percent_selected_plot {
+ my ($foils,$foil_data,$title) = @_;
+ #
+ my %foil_selections;
+ my %true;
+ foreach my $foil (@$foils) {
+ # foil_data has format $foil_data->{true_foil}->{selected foil}
+ next if (! exists($foil_data->{$foil}));
+ $true{$foil}++;
+ while (my ($f,$count)= each(%{$foil_data->{$foil}})) {
+ $foil_selections{$f}+=$count;
+ }
+ }
+ #
+ # need arrays for incorrect and correct because we want to use different
+ # colors for them
+ my @correct;
+ my @incorrect;
+ #
+ my $total =0;
+ for (my $i=0;$i[$i];
+ if ($true{$foil}) {
+ $correct[$i] = $foil_selections{$foil};
+ $incorrect[$i] = 0;
+ } else {
+ $correct[$i] = 0;
+ $incorrect[$i] = $foil_selections{$foil};
+ }
+ $total+=$foil_selections{$foil};
+ }
+ if ($total == 0) { return ''; };
+ for (my $i=0;$i<=$#correct;$i++) {
+ $correct[$i] = sprintf('%0f',$correct[$i]/$total*100);
+ }
+ for (my $i=0;$i<=$#incorrect;$i++) {
+ $incorrect[$i] = sprintf('%0f',$incorrect[$i]/$total*100);
+ }
+ my $xlabel = 'foil chosen';
+ $title.= ' (N='.$total.')';
+ my $plot= &Apache::loncommon::DrawBarGraph($title,
+ $xlabel,
+ 'Percent Choosing',
+ 100,
+ ['#33ff00','#ff3300'],
+ undef,
+ \@correct,
+ \@incorrect);
+ return $plot;
+}
+
+
+sub RR_create_stacked_selection_plot {
+ my ($foils,$foil_data,$title)=@_;
+ #
+ my @correct_choice; # the green row
+ my @dataset; # array of array refs - multicolor rows.
+ my %filled;
+ my @labels;
+ my $count=-1;
+ my %column;
+ for (my $i=0;$i{$foils->[$i]}));
+ my $correct_foil = $foils->[$i];
+ push(@labels,$i+1);
+ $column{$correct_foil}= ++$count;
+ for (my $j=0;$j{$correct_foil}->{$foils->[$j]};
+ }
+ $dataset[$j]->[$column{$correct_foil}]=$value;
+ }
+ }
+ #
+ 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}=' (N='.$bar_total.')';
+ $grand_total += $bar_total;
+ }
+ if ($grand_total == 0) {
+ return ('',undef);
+ }
+ my @empty_row = ();
+ foreach (@{$dataset[0]}) {
+ push(@empty_row,0);
+ }
+ #
+ $title .= ' (N='.$grand_total.')';
+ my $graph = &Apache::loncommon::DrawBarGraph
+ ($title,'Correct Foil','foils chosen Incorrectly',
+ 100,$plotcolors,\@labels,\@empty_row,@dataset);
+ return ($graph,\%count_per_foil);
+}
+
+
+# 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 RR_classify_response_data {
+ my ($full_row_data,$correct,$function) = @_;
+ my %submission_data;
+ 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)) {
+ $submission_data{$subm{'correct'}}->{$subm{'submission'}}++;
+ }
+ }
+ return \%submission_data;
+}
+
+sub RR_static_time_analysis {
+ my ($r,$problem,$problem_analysis) = @_;
+ my ($resource,$partid,$respid) = ($problem->{'resource'},
+ $problem->{'part'},
+ $problem->{'respid'});
+ $r->print('
The time answer you seek is static
');
+ my $analysis_html;
+ # Gather student data
+ my $response_data = &Apache::loncoursedata::get_response_data
+ (\@Apache::lonstatistics::SelectedSections,
+ $Apache::lonstatistics::enrollment_status,
+ $resource->{'symb'},$respid);
+ 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;
+ }
+ # for time division
+
+ # limit to between start time & end time
+ # loop through data, classifying it by
+ # correct foil -> selected foil
+ # if there is concept data
+ # make a concept correct plot
+ # for each correct foil
+ # make a plot of the data
+
+}
+
+
+=pod
+
+
+ } 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').
- '
';
+ '';
}
$r->print($analysis_html);
}
sub RR_Excel_output {
- my ($r,$PerformanceData,$ProblemData) = @_;
+ my ($r,$PerformanceData,$problem_data) = @_;
return '
No!
';
}
-sub RR_Tries_Analysis {
- my ($r,$resource,$PerformanceData,$ProblemData) = @_;
+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($ProblemData);
- if ((! defined($Concepts)) || ((@$Concepts < 2) &&
- ($ENV{'form.AnalyzeAs'} ne 'Foils'))) {
+ 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;
- $ENV{'form.AnalyzeAs'} = 'Foils';
}
$analysis_html .= $table;
my @TryData = &RR_tries_data_analysis($r,$PerformanceData);
-# if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
- $analysis_html .= &RR_Tries_Foil_Analysis($mintries,$maxtries,$Foils,
- \@TryData,$ProblemData);
-# } else {
-# $analysis_html = &RR_Tries_Concept_Analysis($mintries,$maxtries,
-# $Concepts,
-# \@TryData,
-# $ProblemData);
-# }
+ $analysis_html .= &RR_tries_Foil_Analysis($mintries,$maxtries,$Foils,
+ \@TryData,$problem_data);
return $analysis_html;
}
@@ -322,14 +779,14 @@ sub RR_tries_data_analysis {
return @TryData;
}
-sub RR_Time_Analysis {
- my ($r,$PerformanceData,$ProblemData) = @_;
+sub RR_time_Analysis {
+ my ($r,$PerformanceData,$problem_data) = @_;
my $html;
return $html;
}
-sub RR_Tries_Foil_Analysis {
- my ($min,$max,$Foils,$TryData,$ProblemData) = @_;
+sub RR_tries_Foil_Analysis {
+ my ($min,$max,$Foils,$TryData,$problem_data) = @_;
my $html;
#
# Compute the data neccessary to make the plots
@@ -348,7 +805,7 @@ sub RR_Tries_Foil_Analysis {
push (@PlotData_Correct,0);
push (@PlotData_Incorrect,0);
} else {
- if ($ProblemData->{'_Foils'}->{$foilid}->{'value'} eq 'true') {
+ if ($problem_data->{'_Foils'}->{$foilid}->{'value'} eq 'true') {
push (@PlotData_Correct,
int(100*$DataSet{$foilid}/$total));
push (@PlotData_Incorrect,0);
@@ -359,8 +816,8 @@ sub RR_Tries_Foil_Analysis {
}
}
}
- my $title='Attempt '.$try;
- my $xlabel = $total.' Submissions';
+ my $title='Attempt '.$try.' (N='.$total.')';
+ my $xlabel = 'Foil Chosen';
$html.= &Apache::loncommon::DrawBarGraph($title,
$xlabel,
'Percent Choosing',
@@ -373,20 +830,20 @@ sub RR_Tries_Foil_Analysis {
return $html;
}
-sub RR_Tries_Concept_Analysis {
- my ($min,$max,$Concepts,$ResponseData,$ProblemData) = @_;
+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,$ProblemData) = @_;
+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,$ProblemData) = @_;
+sub RR_time_Concept_Analysis {
+ my ($min,$max,$Concepts,$ResponseData,$problem_data) = @_;
my $html;
return $html;
}
@@ -423,6 +880,8 @@ sub get_Radio_problem_data {
return %Partdata;
}
+=cut
+
#########################################################
#########################################################
##
@@ -431,13 +890,14 @@ sub get_Radio_problem_data {
#########################################################
#########################################################
sub OptionResponseAnalysis {
- my ($r,$problem,$ProblemData,$Students) = @_;
+ my ($r,$problem,$problem_data,$Students) = @_;
my ($resource,$respid) = ($problem->{'resource'},
$problem->{'respid'});
# Note: part data is not needed.
- my $PerformanceData =
- &Apache::loncoursedata::get_response_data
- ($Students,$resource->{'symb'},$respid);
+ my $PerformanceData = &Apache::loncoursedata::get_response_data
+ (\@Apache::lonstatistics::SelectedSections,
+ $Apache::lonstatistics::enrollment_status,
+ $resource->{'symb'},$respid);
if (! defined($PerformanceData) ||
ref($PerformanceData) ne 'ARRAY' ) {
$r->print('
'.
@@ -448,19 +908,19 @@ sub OptionResponseAnalysis {
if (exists($ENV{'form.ExcelOutput'})) {
my $result = &OR_excel_sheet($r,$resource,
$PerformanceData,
- $ProblemData);
+ $problem_data);
$r->print($result);
$r->rflush();
} else {
- if ($ENV{'form.AnalyzeOver'} eq 'Tries') {
+ if ($ENV{'form.AnalyzeOver'} eq 'tries') {
my $analysis_html = &OR_tries_analysis($r,
$PerformanceData,
- $ProblemData);
+ $problem_data);
$r->print($analysis_html);
$r->rflush();
- } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
+ } elsif ($ENV{'form.AnalyzeOver'} eq 'time') {
my $analysis_html = &OR_time_analysis($PerformanceData,
- $ProblemData);
+ $problem_data);
$r->print($analysis_html);
$r->rflush();
} else {
@@ -475,7 +935,7 @@ sub OptionResponseAnalysis {
#########################################################
#
-# Option Response: Tries Analysis
+# Option Response: tries Analysis
#
#########################################################
sub OR_tries_analysis {
@@ -483,173 +943,159 @@ sub OR_tries_analysis {
my $mintries = 1;
my $maxtries = $ENV{'form.NumPlots'};
my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
- if ((@$Concepts < 2) && ($ENV{'form.AnalyzeAs'} ne 'Foils')) {
- $table = '
'.
- &mt('Not enough data for concept analysis. '.
- 'Performing Foil Analysis').
- '
'.$table;
- $ENV{'form.AnalyzeAs'} = 'Foils';
- }
- my %ResponseData = &OR_analyze_by_tries($r,$PerformanceData,
+ my %response_data = &OR_analyze_by_tries($r,$PerformanceData,
$mintries,$maxtries);
my $analysis = '';
- if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
- $analysis = &OR_Tries_Foil_Analysis($mintries,$maxtries,$Foils,
- \%ResponseData,$ORdata);
- } else {
- $analysis = &OR_Tries_Concept_Analysis($mintries,$maxtries,
- $Concepts,\%ResponseData,$ORdata);
- }
- $table .= $analysis;
- return $table;
-}
-
-sub OR_Tries_Foil_Analysis {
- my ($mintries,$maxtries,$Foils,$respdat,$ORdata) = @_;
- my %ResponseData = %$respdat;
#
- # Compute the data neccessary to make the plots
- my @PlotData;
- foreach my $foilid (@$Foils) {
- for (my $i=$mintries;$i<=$maxtries;$i++) {
- if ($ResponseData{$foilid}->[$i]->{'_total'} == 0) {
- push(@{$PlotData[$i]->{'_correct'}},0);
- } else {
- push(@{$PlotData[$i]->{'_correct'}},
- 100*$ResponseData{$foilid}->[$i]->{'_correct'}/
- $ResponseData{$foilid}->[$i]->{'_total'});
- }
- foreach my $option (@{$ORdata->{'_Options'}}) {
- push(@{$PlotData[$i]->{'_total'}},
- $ResponseData{$foilid}->[$i]->{'_total'});
- if ($ResponseData{$foilid}->[$i]->{'_total'} == 0) {
- push (@{$PlotData[$i]->{$option}},0);
+ # Compute the data necessary to make the plots
+ my @foil_plot;
+ my @concept_data;
+ for (my $j=0;$j<=scalar(@$Concepts);$j++) {
+ my $concept = $Concepts->[$j];
+ foreach my $foilid (@{$concept->{'foils'}}) {
+ for (my $try=$mintries;$try<=$maxtries;$try++) {
+ # concept analysis data
+ $concept_data[$j]->[$try]->{'_correct'} +=
+ $response_data{$foilid}->[$try]->{'_correct'};
+ $concept_data[$j]->[$try]->{'_total'} +=
+ $response_data{$foilid}->[$try]->{'_total'};
+ #
+ # foil analysis data
+ if ($response_data{$foilid}->[$try]->{'_total'} == 0) {
+ push(@{$foil_plot[$try]->{'_correct'}},0);
} else {
- if ($ResponseData{$foilid}->[$i]->{'_total'} ==
- $ResponseData{$foilid}->[$i]->{'_correct'}) {
- push(@{$PlotData[$i]->{$option}},0);
+ push(@{$foil_plot[$try]->{'_correct'}},
+ 100*$response_data{$foilid}->[$try]->{'_correct'}/
+ $response_data{$foilid}->[$try]->{'_total'});
+ }
+ foreach my $option (@{$ORdata->{'_Options'}}) {
+ push(@{$foil_plot[$try]->{'_total'}},
+ $response_data{$foilid}->[$try]->{'_total'});
+ if ($response_data{$foilid}->[$try]->{'_total'} == 0) {
+ push (@{$foil_plot[$try]->{$option}},0);
} else {
- push (@{$PlotData[$i]->{$option}},
- 100 * $ResponseData{$foilid}->[$i]->{$option} /
- ($ResponseData{$foilid}->[$i]->{'_total'} -
- $ResponseData{$foilid}->[$i]->{'_correct'}));
+ if ($response_data{$foilid}->[$try]->{'_total'} ==
+ $response_data{$foilid}->[$try]->{'_correct'}) {
+ push(@{$foil_plot[$try]->{$option}},0);
+ } else {
+ push (@{$foil_plot[$try]->{$option}},
+ 100 *
+ $response_data{$foilid}->[$try]->{$option} /
+ ($response_data{$foilid}->[$try]->{'_total'}
+ -
+ $response_data{$foilid}->[$try]->{'_correct'}
+ ));
+ }
}
- }
+ } # End of foreach my $option
}
- }
- }
+ } # End of foreach my $foilid
+ } # End of concept loops
#
# Build a table for the plots
my $analysis_html = "
\n";
- my $foilkey = &build_option_index($ORdata);
- for (my $i=$mintries;$i<=$maxtries;$i++) {
- my $count = $ResponseData{'_total'}->[$i];
- if ($count == 0) {
- $count = 'no submissions';
- } elsif ($count == 1) {
- $count = '1 submission';
- } else {
- $count = $count.' submissions';
+ my $optionkey = &build_option_index($ORdata);
+ my $num_concepts = 1;
+ if (defined($Concepts)) { $num_concepts = scalar(@$Concepts); }
+ #
+ for (my $try=$mintries;$try<=$maxtries;$try++) {
+ if (! defined($response_data{'_total'}->[$try]) ||
+ $response_data{'_total'}->[$try] == 0) {
+ if ($try > 1) {
+ $analysis_html.= '
'.
+ &mt('None of the selected students attempted the problem more than [_1] times.',$try-1).
+ '
';
+ } else {
+ $analysis_html.= '
'.
+ &mt('None of the selected students have attempted the problem').'
';
+ }
+ last;
}
- my $title = 'Attempt '.$i.', '.$count;
+ my $concept_graph='';
+ if ($num_concepts > 1) {
+ #
+ # Create concept plot
+ my @concept_plot_data;
+ for (my $j=0;$j<=$#concept_data;$j++) {
+ my $total = $concept_data[$j]->[$try]->{'_total'};
+ if ($total == 0) {
+ $concept_plot_data[$j] = 0;
+ } else {
+ $concept_plot_data[$j] = 100 *
+ sprintf('%0.3f',
+ $concept_data[$j]->[$try]->{'_correct'} /
+ $total);
+ }
+ }
+ #
+ 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);
+ }
+ #
+ # Create Foil Plots
+ my $count = $response_data{'_total'}->[$try];
+ my $title = 'Attempt '.$try.' (N='.$count.')';
my @Datasets;
foreach my $option ('_correct',@{$ORdata->{'_Options'}}) {
- next if (! exists($PlotData[$i]->{$option}));
- push(@Datasets,$PlotData[$i]->{$option});
- }
- my $correctgraph = &Apache::loncommon::DrawBarGraph
- ($title,'Foil Number','Percent Correct',
- 100,$plotcolors,undef,$Datasets[0]);
- $analysis_html.= '
'.$correctgraph.'
';
- ##
- ##
- next if (! defined($Datasets[0]));
- for (my $i=0; $i< scalar(@{$Datasets[0]});$i++) {
- $Datasets[0]->[$i]=0;
+ next if (! exists($foil_plot[$try]->{$option}));
+ push(@Datasets,$foil_plot[$try]->{$option});
}
- $count = $ResponseData{'_total'}->[$i]-$ResponseData{'_correct'}->[$i];
- if ($count == 0) {
- $count = 'no submissions';
- } elsif ($count == 1) {
- $count = '1 submission';
- } else {
- $count = $count.' submissions';
+ #
+ # Put a blank in the data set between concepts
+ for (my $set =0;$set<=$#Datasets;$set++) {
+ my @Data = @{$Datasets[$set]};
+ my $idx = 0;
+ foreach my $concept (@{$Concepts}) {
+ foreach my $foilid (@{$concept->{'foils'}}) {
+ $Datasets[$set]->[$idx++]=shift(@Data);
+ }
+ if ($concept->{'name'} ne $Concepts->[-1]->{'name'}) {
+ $Datasets[$set]->[$idx++] = 0;
+ }
+ }
}
- $title = 'Attempt '.$i.', '.$count;
- my $incorrectgraph = &Apache::loncommon::DrawBarGraph
- ($title,'Foil Number','% Option Chosen Incorrectly',
- 100,$plotcolors,undef,@Datasets);
- $analysis_html.= '
'.$incorrectgraph.'
';
- $analysis_html.= '
'.$foilkey."
\n";
- }
- $analysis_html .= "
\n";
- return $analysis_html;
-}
-
-sub OR_Tries_Concept_Analysis {
- my ($mintries,$maxtries,$Concepts,$respdat,$ORdata) = @_;
- my %ResponseData = %$respdat;
- my $analysis_html = "
\n";
- #
- # Compute the data neccessary to make the plots
- my @PlotData;
- # Concept analysis
- #
- # Note: we do not bother with characterizing the students incorrect
- # answers at the concept level because an incorrect answer for one foil
- # may be a correct answer for another foil.
- my %ConceptData;
- foreach my $concept (@{$Concepts}) {
- for (my $i=$mintries;$i<=$maxtries;$i++) {
- #
- # Gather the per-attempt data
- my $cdata = $ConceptData{$concept}->[$i];
+ #
+ # Set up the labels needed for the bar graph
+ my @Labels;
+ my $idx = 1;
+ foreach my $concept (@{$Concepts}) {
foreach my $foilid (@{$concept->{'foils'}}) {
- $cdata->{'_correct'} +=
- $ResponseData{$foilid}->[$i]->{'_correct'};
- $cdata->{'_total'} +=
- $ResponseData{$foilid}->[$i]->{'_total'};
- }
- push (@{$PlotData[$i]->{'_total'}},$cdata->{'_total'});
- if ($cdata->{'_total'} == 0) {
- push (@{$PlotData[$i]->{'_correct'}},0);
- } else {
- push (@{$PlotData[$i]->{'_correct'}},
- 100*$cdata->{'_correct'}/$cdata->{'_total'});
- }
+ push(@Labels,$idx++);
+ }
+ push(@Labels,'');
}
- }
- # Build a table for the plots
- for (my $i=$mintries;$i<=$maxtries;$i++) {
- my $minstu = $PlotData[$i]->{'_total'}->[0];
- my $maxstu = $PlotData[$i]->{'_total'}->[0];
- foreach my $count (@{$PlotData[$i]->{'_total'}}) {
- if ($minstu > $count) {
- $minstu = $count;
- }
- if ($maxstu < $count) {
- $maxstu = $count;
- }
- }
- $maxstu = 0 if (! defined($maxstu));
- $minstu = 0 if (! defined($minstu));
- my $title;
- my $count = $ResponseData{'_total'}->[$i];
- if ($count == 0) {
- $count = 'no submissions';
- } elsif ($count == 1) {
- $count = '1 submission';
- } else {
- $count = $count.' submissions';
+ #
+ my $correct_graph = &Apache::loncommon::DrawBarGraph
+ ($title,'Statement','% Answered Correct',
+ 100,$plotcolors,\@Labels,$Datasets[0]);
+
+ #
+ #
+ next if (! defined($Datasets[0]));
+ for (my $i=0; $i< scalar(@{$Datasets[0]});$i++) {
+ $Datasets[0]->[$i]=0;
}
- $title = 'Attempt '.$i.', '.$count;
- my $graphlink = &Apache::loncommon::DrawBarGraph
- ($title,'Concept Number','Percent Correct',
- 100,$plotcolors,undef,$PlotData[$i]->{'_correct'});
- $analysis_html.= '
\n";
- return $analysis_html;
+ return &Apache::loncommon::DrawBarGraph($title,
+ 'Concept Number',
+ 'Percent Correct',
+ 100,
+ $plotcolors,
+ undef,
+ \@plotdata);
}
#########################################################
@@ -916,7 +1375,7 @@ sub OR_Concept_Time_Analysis {
#########################################################
#########################################################
sub OR_excel_sheet {
- my ($r,$resource,$PerformanceData,$ORdata) = @_;
+ my ($r,$resource,$performance_data,$ORdata) = @_;
my $response = '';
my (undef,$Foils,$Concepts) = &build_foil_index($ORdata);
#
@@ -935,22 +1394,11 @@ sub OR_excel_sheet {
}
#
$workbook->set_tempdir('/home/httpd/perl/tmp');
- #
- # Define some potentially useful formats
- my $format;
- $format->{'header'} = $workbook->add_format(bold => 1,
- bottom => 1,
- align => 'center');
- $format->{'bold'} = $workbook->add_format(bold=>1);
- $format->{'h1'} = $workbook->add_format(bold=>1, size=>18);
- $format->{'h2'} = $workbook->add_format(bold=>1, size=>16);
- $format->{'h3'} = $workbook->add_format(bold=>1, size=>14);
- $format->{'date'} = $workbook->add_format(num_format=>
- 'mmm d yyyy hh:mm AM/PM');
+ 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 = $workbook->addworksheet('Student 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) {
@@ -964,12 +1412,8 @@ sub OR_excel_sheet {
if ($result ne 'okay') {
# Do something useful
}
- $result = &OR_build_student_data_worksheet($student_data_sheet,$format);
- if ($result ne 'okay') {
- # Do something useful
- }
$result = &OR_build_response_data_worksheet($response_data_sheet,$format,
- $PerformanceData,$Foils,
+ $performance_data,$Foils,
$ORdata);
if ($result ne 'okay') {
# Do something useful
@@ -1056,34 +1500,8 @@ sub OR_build_problem_data_worksheet {
return 'okay';
}
-sub OR_build_student_data_worksheet {
- my ($worksheet,$format) = @_;
- my $rows_output = 3;
- my $cols_output = 0;
- $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;
-}
-
sub OR_build_response_data_worksheet {
- my ($worksheet,$format,$PerformanceData,$Foils,$ORdata)=@_;
+ my ($worksheet,$format,$performance_data,$Foils,$ORdata)=@_;
my $rows_output = 3;
my $cols_output = 0;
$worksheet->write($rows_output++,0,'Response Data',$format->{'h3'});
@@ -1096,29 +1514,29 @@ sub OR_build_response_data_worksheet {
}
$worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'});
#
- foreach my $row (@$PerformanceData) {
+ 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 %ResponseData;
+ 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);
- $ResponseData{$foilid.' submission'}=$submission;
- $ResponseData{$foilid.' award'}=$correct;
+ $response_data{$foilid.' submission'}=$submission;
+ $response_data{$foilid.' award'}=$correct;
}
$worksheet->write($rows_output,$cols_output++,$student);
$worksheet->write($rows_output,$cols_output++,
- &calc_serial($time),$format->{'date'});
+ &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++,
- $ResponseData{$foilid.' submission'});
+ $response_data{$foilid.' submission'});
$worksheet->write($rows_output,$cols_output++,
- $ResponseData{$foilid.' award'});
+ $response_data{$foilid.' award'});
}
$rows_output++;
$cols_output = 0;
@@ -1126,185 +1544,6 @@ sub OR_build_response_data_worksheet {
return;
}
-
-##
-## The following is copied from datecalc1.pl, part of the
-## Spreadsheet::WriteExcel CPAN module.
-##
-##
-######################################################################
-#
-# Demonstration of writing date/time cells to Excel spreadsheets,
-# using UNIX/Perl time as source of date/time.
-#
-# Copyright 2000, Andrew Benham, adsb@bigfoot.com
-#
-######################################################################
-#
-# UNIX/Perl time is the time since the Epoch (00:00:00 GMT, 1 Jan 1970)
-# measured in seconds.
-#
-# An Excel file can use exactly one of two different date/time systems.
-# In these systems, a floating point number represents the number of days
-# (and fractional parts of the day) since a start point. The floating point
-# number is referred to as a 'serial'.
-# The two systems ('1900' and '1904') use different starting points:
-# '1900'; '1.00' is 1 Jan 1900 BUT 1900 is erroneously regarded as
-# a leap year - see:
-# http://support.microsoft.com/support/kb/articles/Q181/3/70.asp
-# for the excuse^H^H^H^H^H^Hreason.
-# '1904'; '1.00' is 2 Jan 1904.
-#
-# The '1904' system is the default for Apple Macs. Windows versions of
-# Excel have the option to use the '1904' system.
-#
-# Note that Visual Basic's "DateSerial" function does NOT erroneously
-# regard 1900 as a leap year, and thus its serials do not agree with
-# the 1900 serials of Excel for dates before 1 Mar 1900.
-#
-# Note that StarOffice (at least at version 5.2) does NOT erroneously
-# regard 1900 as a leap year, and thus its serials do not agree with
-# the 1900 serials of Excel for dates before 1 Mar 1900.
-#
-######################################################################
-#
-# Calculation description
-# =======================
-#
-# 1900 system
-# -----------
-# Unix time is '0' at 00:00:00 GMT 1 Jan 1970, i.e. 70 years after 1 Jan 1900.
-# Of those 70 years, 17 (1904,08,12,16,20,24,28,32,36,40,44,48,52,56,60,64,68)
-# were leap years with an extra day.
-# Thus there were 17 + 70*365 days = 25567 days between 1 Jan 1900 and
-# 1 Jan 1970.
-# In the 1900 system, '1' is 1 Jan 1900, but as 1900 was not a leap year
-# 1 Jan 1900 should really be '2', so 1 Jan 1970 is '25569'.
-#
-# 1904 system
-# -----------
-# Unix time is '0' at 00:00:00 GMT 1 Jan 1970, i.e. 66 years after 1 Jan 1904.
-# Of those 66 years, 17 (1904,08,12,16,20,24,28,32,36,40,44,48,52,56,60,64,68)
-# were leap years with an extra day.
-# Thus there were 17 + 66*365 days = 24107 days between 1 Jan 1904 and
-# 1 Jan 1970.
-# In the 1904 system, 2 Jan 1904 being '1', 1 Jan 1970 is '24107'.
-#
-######################################################################
-#
-# Copyright (c) 2000, Andrew Benham.
-# This program is free software. It may be used, redistributed and/or
-# modified under the same terms as Perl itself.
-#
-# Andrew Benham, adsb@bigfoot.com
-# London, United Kingdom
-# 11 Nov 2000
-#
-######################################################################
-
-# Use 1900 date system on all platforms other than Apple Mac (for which
-# use 1904 date system).
-my $DATE_SYSTEM = ($^O eq 'MacOS') ? 1 : 0;
-
-#-----------------------------------------------------------
-# calc_serial()
-#
-# Called with (up to) 2 parameters.
-# 1. Unix timestamp. If omitted, uses current time.
-# 2. GMT flag. Set to '1' to return serial in GMT.
-# If omitted, returns serial in appropriate timezone.
-#
-# Returns date/time serial according to $DATE_SYSTEM selected
-#-----------------------------------------------------------
-sub calc_serial {
- my $time = (defined $_[0]) ? $_[0] : time();
- my $gmtflag = (defined $_[1]) ? $_[1] : 0;
-
- # Divide timestamp by number of seconds in a day.
- # This gives a date serial with '0' on 1 Jan 1970.
- my $serial = $time / 86400;
-
- # Adjust the date serial by the offset appropriate to the
- # currently selected system (1900/1904).
- if ($DATE_SYSTEM == 0) { # use 1900 system
- $serial += 25569;
- } else { # use 1904 system
- $serial += 24107;
- }
-
- unless ($gmtflag) {
- # Now have a 'raw' serial with the right offset. But this
- # gives a serial in GMT, which is false unless the timezone
- # is GMT. We need to adjust the serial by the appropriate
- # timezone offset.
- # Calculate the appropriate timezone offset by seeing what
- # the differences between localtime and gmtime for the given
- # time are.
-
- my @gmtime = gmtime($time);
- my @ltime = localtime($time);
-
- # For the first 7 elements of the two arrays, adjust the
- # date serial where the elements differ.
- for (0 .. 6) {
- my $diff = $ltime[$_] - $gmtime[$_];
- if ($diff) {
- $serial += _adjustment($diff,$_);
- }
- }
- }
-
- # Perpetuate the error that 1900 was a leap year by decrementing
- # the serial if we're using the 1900 system and the date is prior to
- # 1 Mar 1900. This has the effect of making serial value '60'
- # 29 Feb 1900.
-
- # This fix only has any effect if UNIX/Perl time on the platform
- # can represent 1900. Many can't.
-
- unless ($DATE_SYSTEM) {
- $serial-- if ($serial < 61); # '61' is 1 Mar 1900
- }
- return $serial;
-}
-
-sub _adjustment {
- # Based on the difference in the localtime/gmtime array elements
- # number, return the adjustment required to the serial.
-
- # We only look at some elements of the localtime/gmtime arrays:
- # seconds unlikely to be different as all known timezones
- # have an offset of integral multiples of 15 minutes,
- # but it's easy to do.
- # minutes will be different for timezone offsets which are
- # not an exact number of hours.
- # hours very likely to be different.
- # weekday will differ when localtime/gmtime difference
- # straddles midnight.
- #
- # Assume that difference between localtime and gmtime is less than
- # 5 days, then don't have to do maths for day of month, month number,
- # year number, etc...
-
- my ($delta,$element) = @_;
- my $adjust = 0;
-
- if ($element == 0) { # Seconds
- $adjust = $delta/86400; # 60 * 60 * 24
- } elsif ($element == 1) { # Minutes
- $adjust = $delta/1440; # 60 * 24
- } elsif ($element == 2) { # Hours
- $adjust = $delta/24; # 24
- } elsif ($element == 6) { # Day of week number
- # Catch difference straddling Sat/Sun in either direction
- $delta += 7 if ($delta < -4);
- $delta -= 7 if ($delta > 4);
-
- $adjust = $delta;
- }
- return $adjust;
-}
-
sub build_foil_index {
my ($ORdata) = @_;
return if (! exists($ORdata->{'_Foils'}));
@@ -1333,15 +1572,15 @@ sub build_foil_index {
my $a1 = lc($a);
my $b1 = lc($b);
if (exists($Numbers{$a1})) {
- $a = $Numbers{$a1};
+ $a1 = $Numbers{$a1};
}
if (exists($Numbers{$b1})) {
- $b = $Numbers{$b1};
+ $b1 = $Numbers{$b1};
}
- if (($a =~/^\d+$/) && ($b =~/^\d+$/)) {
- return $a <=> $b;
+ if (($a1 =~/^\d+$/) && ($b1 =~/^\d+$/)) {
+ return $a1 <=> $b1;
} else {
- return $a cmp $b;
+ return $a1 cmp $b1;
}
};
my @Concepts;
@@ -1382,18 +1621,18 @@ sub build_foil_index {
if (@Concepts > 1) {
$table .= '