--- loncom/interface/statistics/lonproblemanalysis.pm 2004/03/31 05:24:00 1.83
+++ loncom/interface/statistics/lonproblemanalysis.pm 2004/10/15 16:50:30 1.94
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonproblemanalysis.pm,v 1.83 2004/03/31 05:24:00 albertel Exp $
+# $Id: lonproblemanalysis.pm,v 1.94 2004/10/15 16:50:30 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -51,23 +51,17 @@ my @SubmitButtons = ({ name => 'PrevProb
{ name => 'NextProblemAnalysis',
text => 'Next Problem' },
{ name => 'break'},
- { name => 'ClearCache',
- text => 'Clear Caches' },
- { name => 'updatecaches',
- text => 'Update Student Data' },
{ name => 'SelectAnother',
text => 'Choose a different Problem' },
{ name => 'ExcelOutput',
text => 'Produce Excel Output' });
-
sub BuildProblemAnalysisPage {
my ($r,$c)=@_;
#
my %Saveable_Parameters = ('Status' => 'scalar',
'Section' => 'array',
'NumPlots' => 'scalar',
- 'AnalyzeAs' => 'scalar',
'AnalyzeOver' => 'scalar',
);
&Apache::loncommon::store_course_settings('problem_analysis',
@@ -81,25 +75,18 @@ sub BuildProblemAnalysisPage {
#
my @Students = @Apache::lonstatistics::Students;
#
- if (@Students < 1) {
+ if (@Students < 1 && exists($ENV{'form.firstrun'})) {
$r->print('
There are no students in the sections selected ');
}
#
- &Apache::loncoursedata::clear_internal_caches();
- if (exists($ENV{'form.ClearCache'}) ||
- exists($ENV{'form.updatecaches'}) ||
- (exists($ENV{'form.firstanalysis'}) &&
- $ENV{'form.firstanalysis'} ne 'no')) {
- &Apache::lonstatistics::Gather_Full_Student_Data($r);
- }
- if (! exists($ENV{'form.firstanalysis'})) {
- $r->print(' ');
- } else {
- $r->print(' ');
- }
+ my @CacheButtonHTML =
+ &Apache::lonstathelpers::manage_caches($r,'Statistics','stats_status');
$r->rflush();
#
- my $problem_types = '(option|radiobutton|numerical)';
+ # 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)';
if (exists($ENV{'form.problemchoice'}) &&
! exists($ENV{'form.SelectAnother'})) {
foreach my $button (@SubmitButtons) {
@@ -111,6 +98,9 @@ sub BuildProblemAnalysisPage {
$r->print(' 'x5);
}
}
+ foreach my $html (@CacheButtonHTML) {
+ $r->print($html.(' 'x5));
+ }
#
$r->print(' ');
$r->rflush();
@@ -144,20 +134,22 @@ sub BuildProblemAnalysisPage {
my $resource = $current_problem->{'resource'};
$r->print(''.$resource->{'title'}.' ');
$r->print(''.$resource->{'src'}.' ');
- $r->print(&Apache::lonstathelpers::render_resource($resource));
+ 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'});
- my $ProblemData = $Data{$current_problem->{'part'}.
+ my $problem_data = $Data{$current_problem->{'part'}.
'.'.
$current_problem->{'respid'}};
if ($current_problem->{'resptype'} eq 'option') {
&OptionResponseAnalysis($r,$current_problem,
- $ProblemData,
+ $problem_data,
\@Students);
} elsif ($current_problem->{'resptype'} eq 'radiobutton') {
&RadioResponseAnalysis($r,$current_problem,
- $ProblemData,
+ $problem_data,
\@Students);
} elsif ($current_problem->{'resptype'} eq 'numerical') {
##
@@ -168,7 +160,7 @@ sub BuildProblemAnalysisPage {
foreach my $respid (@{$res->{'partdata'}->{$partid}->{'ResponseIds'}}) {
$current_problem->{'respid'}=$respid;
&NumericalResponseAnalysis($r,$current_problem,
- $ProblemData,\@Students);
+ $problem_data,\@Students);
}
}
} else {
@@ -195,7 +187,7 @@ sub BuildProblemAnalysisPage {
#########################################################
#########################################################
sub NumericalResponseAnalysis {
- my ($r,$problem,$ProblemData,$Students) = @_;
+ my ($r,$problem,$problem_data,$Students) = @_;
my $c = $r->connection();
my ($resource,$partid,$respid) = ($problem->{'resource'},
$problem->{'part'},
@@ -230,8 +222,9 @@ sub NumericalResponseAnalysis {
}
#
# This next call causes all the waiting around that people complain about
- my ($max,$min) = &Apache::lonstathelpers::GetStudentAnswers($r,$problem,
- $Students);
+ &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$Students,
+ 'Statistics',
+ 'stats_status');
return if ($c->aborted());
#
# Collate the data
@@ -383,69 +376,395 @@ sub build_student_data_worksheet {
#########################################################
#########################################################
sub RadioResponseAnalysis {
- my ($r,$problem,$ProblemData,$Students) = @_;
- my ($resource,$respid) = ($problem->{'resource'},
- $problem->{'respid'});
+ my ($r,$problem,$problem_analysis,$students) = @_;
+ if ($ENV{'form.AnalyzeOver'} eq 'tries') {
+ &RR_tries_analysis($r,$problem,$problem_analysis,$students);
+ } elsif ($ENV{'form.AnalyzeOver'} eq 'time') {
+ &RR_static_time_analysis($r,$problem,$problem_analysis,$students);
+ } else {
+ $r->print('Bad request');
+ }
+ return;
+}
+
+sub RR_computed_tries_analysis {
+ my ($r,$problem,$problem_analysis) = @_;
+ my ($resource,$partid,$respid) = ($problem->{'resource'},
+ $problem->{'part'},
+ $problem->{'respid'});
+ $r->print('The tries answer you seek must be computed');
+ # Gather student data
+ # for each try
+ # 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
+}
+
+sub RR_computed_time_analysis {
+ my ($r,$problem,$problem_analysis) = @_;
+ my ($resource,$partid,$respid) = ($problem->{'resource'},
+ $problem->{'part'},
+ $problem->{'respid'});
+ $r->print('The time answer you seek must be computed');
+ # Gather student data
+ # 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
+}
+
+sub RR_tries_analysis {
+ my ($r,$problem,$problem_analysis,$students) = @_;
+ my ($resource,$partid,$respid) = ($problem->{'resource'},
+ $problem->{'part'},
+ $problem->{'respid'});
+ #
my $analysis_html;
- my $PerformanceData = &Apache::loncoursedata::get_response_data
+ my $foildata = $problem_analysis->{'_Foils'};
+ my ($table,$foils,$concepts) = &build_foil_index($problem_analysis);
+ $analysis_html .= $table;
+ # Gather student data
+ my $response_data = &Apache::loncoursedata::get_response_data
(\@Apache::lonstatistics::SelectedSections,
$Apache::lonstatistics::enrollment_status,
$resource->{'symb'},$respid);
- if (! defined($PerformanceData) ||
- ref($PerformanceData) ne 'ARRAY' ) {
+ 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'};
+ last;
+ }
+ }
+ }
+ 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;
+ }
+ #
+ $analysis_html.='';
+ 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;
}
- if (exists($ENV{'form.ExcelOutput'})) {
- $analysis_html .= &RR_Excel_output($r,$problem->{'resource'},
- $PerformanceData,$ProblemData);
- } elsif ($ENV{'form.AnalyzeOver'} eq 'Tries') {
- $analysis_html .= &RR_Tries_Analysis($r,$problem->{'resource'},
- $PerformanceData,$ProblemData);
- } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
- $analysis_html .= &RR_Time_Analysis($r,$problem->{'resource'},
- $PerformanceData,$ProblemData);
+ # 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;
}
@@ -460,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
@@ -486,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);
@@ -497,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',
@@ -511,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;
}
@@ -561,6 +880,8 @@ sub get_Radio_problem_data {
return %Partdata;
}
+=cut
+
#########################################################
#########################################################
##
@@ -569,7 +890,7 @@ 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.
@@ -587,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 {
@@ -614,7 +935,7 @@ sub OptionResponseAnalysis {
#########################################################
#
-# Option Response: Tries Analysis
+# Option Response: tries Analysis
#
#########################################################
sub OR_tries_analysis {
@@ -622,78 +943,106 @@ sub OR_tries_analysis {
my $mintries = 1;
my $maxtries = $ENV{'form.NumPlots'};
my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
- if (! defined($Concepts) ||
- ((@$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,$Concepts,
- \%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,$Concepts,$respdat,$ORdata) = @_;
- my %ResponseData = %$respdat;
#
- # Compute the data neccessary to make the plots
- my @PlotData;
- foreach my $concept (@$Concepts) {
+ # 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++) {
- if ($ResponseData{$foilid}->[$try]->{'_total'} == 0) {
- push(@{$PlotData[$try]->{'_correct'}},0);
+ # 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 {
- push(@{$PlotData[$try]->{'_correct'}},
- 100*$ResponseData{$foilid}->[$try]->{'_correct'}/
- $ResponseData{$foilid}->[$try]->{'_total'});
+ push(@{$foil_plot[$try]->{'_correct'}},
+ 100*$response_data{$foilid}->[$try]->{'_correct'}/
+ $response_data{$foilid}->[$try]->{'_total'});
}
foreach my $option (@{$ORdata->{'_Options'}}) {
- push(@{$PlotData[$try]->{'_total'}},
- $ResponseData{$foilid}->[$try]->{'_total'});
- if ($ResponseData{$foilid}->[$try]->{'_total'} == 0) {
- push (@{$PlotData[$try]->{$option}},0);
+ push(@{$foil_plot[$try]->{'_total'}},
+ $response_data{$foilid}->[$try]->{'_total'});
+ if ($response_data{$foilid}->[$try]->{'_total'} == 0) {
+ push (@{$foil_plot[$try]->{$option}},0);
} else {
- if ($ResponseData{$foilid}->[$try]->{'_total'} ==
- $ResponseData{$foilid}->[$try]->{'_correct'}) {
- push(@{$PlotData[$try]->{$option}},0);
+ if ($response_data{$foilid}->[$try]->{'_total'} ==
+ $response_data{$foilid}->[$try]->{'_correct'}) {
+ push(@{$foil_plot[$try]->{$option}},0);
} else {
- push (@{$PlotData[$try]->{$option}},
+ push (@{$foil_plot[$try]->{$option}},
100 *
- $ResponseData{$foilid}->[$try]->{$option} /
- ($ResponseData{$foilid}->[$try]->{'_total'}
+ $response_data{$foilid}->[$try]->{$option} /
+ ($response_data{$foilid}->[$try]->{'_total'}
-
- $ResponseData{$foilid}->[$try]->{'_correct'}
+ $response_data{$foilid}->[$try]->{'_correct'}
));
}
}
} # End of foreach my $option
}
} # End of foreach my $foilid
- } # End of foreach my $concept
+ } # End of concept loops
#
# Build a table for the plots
my $analysis_html = "\n";
my $optionkey = &build_option_index($ORdata);
+ my $num_concepts = 1;
+ if (defined($Concepts)) { $num_concepts = scalar(@$Concepts); }
+ #
for (my $try=$mintries;$try<=$maxtries;$try++) {
- my $count = $ResponseData{'_total'}->[$try];
- my $title = 'Submission '.$try.' (N='.$count.')';
+ 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 $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[$try]->{$option}));
- push(@Datasets,$PlotData[$try]->{$option});
+ next if (! exists($foil_plot[$try]->{$option}));
+ push(@Datasets,$foil_plot[$try]->{$option});
}
#
# Put a blank in the data set between concepts
@@ -720,10 +1069,9 @@ sub OR_Tries_Foil_Analysis {
push(@Labels,'');
}
#
- my $correctgraph = &Apache::loncommon::DrawBarGraph
+ my $correct_graph = &Apache::loncommon::DrawBarGraph
($title,'Foil Number','Percent Correct',
100,$plotcolors,\@Labels,$Datasets[0]);
- $analysis_html.= ''.$correctgraph.' ';
#
#
@@ -731,83 +1079,23 @@ sub OR_Tries_Foil_Analysis {
for (my $i=0; $i< scalar(@{$Datasets[0]});$i++) {
$Datasets[0]->[$i]=0;
}
- $count = $ResponseData{'_total'}->[$try] -
- $ResponseData{'_correct'}->[$try];
- $title = 'Submission '.$try.' (N='.$count.')';
- my $incorrectgraph = &Apache::loncommon::DrawBarGraph
+ $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);
- $analysis_html.= ''.$incorrectgraph.' ';
- $analysis_html.= ''.$optionkey." \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];
- 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'});
- }
- }
- }
- # 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';
- }
- $title = 'Attempt '.$i.', '.$count;
- my $graphlink = &Apache::loncommon::DrawBarGraph
- ($title,'Concept Number','Percent Correct',
- 100,$plotcolors,undef,$PlotData[$i]->{'_correct'});
- $analysis_html.= ''.$graphlink." \n";
+ $analysis_html.=
+ ''.
+ ''.$concept_graph.' '.
+ ''.$correct_graph.' '.
+ ''.$incorrect_graph.' '.
+ ''.$optionkey.' '.
+ ' '.$/;
}
$analysis_html .= "
\n";
- return $analysis_html;
+ $table .= $analysis_html;
+ return $table;
}
sub OR_analyze_by_tries {
@@ -839,17 +1127,21 @@ sub OR_analyze_by_tries {
#
#########################################################
sub OR_time_analysis {
- my ($PerformanceData,$ORdata) = @_;
+ my ($performance_data,$ORdata) = @_;
my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
- if ((@$Concepts < 2) && ($ENV{'form.AnalyzeAs'} ne 'Foils')) {
+ my $foilkey = &build_option_index($ORdata);
+ my $num_concepts = 1;
+ if (defined($Concepts)) { $num_concepts = scalar(@$Concepts); }
+ #
+ if ($num_concepts < 2) {
$table = ''.
&mt('Not enough data for concept analysis. '.
'Performing Foil Analysis').
- ' '.$table;
- $ENV{'form.AnalyzeAs'} = 'Foils';
+ ''.$table;
}
+ #
my $num_plots = $ENV{'form.NumPlots'};
- my $num_data = scalar(@$PerformanceData)-1;
+ my $num_data = scalar(@$performance_data)-1;
my $percent = sprintf('%2f',100/$num_plots);
#
$table .= "\n";
@@ -861,16 +1153,20 @@ sub OR_time_analysis {
('enddate_'.$i);
if (! defined($starttime) || ! defined($endtime)) {
my $sec_in_day = 86400;
- my $last_sub_time = &get_time_from_row($PerformanceData->[-1]);
+ 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);
$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($PerformanceData->[0]);
+ $starttime = &get_time_from_row($performance_data->[0]);
}
}
+ $table .= ''.
+ &mt('Data from [_1] to [_2]',
+ &Apache::lonlocal::locallocaltime($starttime),
+ &Apache::lonlocal::locallocaltime($endtime)).' '.$/;
my $startdateform = &Apache::lonhtmlcommon::date_setter
('Statistics','startdate_'.$i,$starttime);
my $enddateform = &Apache::lonhtmlcommon::date_setter
@@ -879,13 +1175,17 @@ sub OR_time_analysis {
my $begin_index;
my $end_index;
my $j;
- while (++$j < scalar(@$PerformanceData)) {
- last if (&get_time_from_row($PerformanceData->[$j])
+ while (++$j < scalar(@$performance_data)) {
+ last if (&get_time_from_row($performance_data->[$j])
> $starttime);
}
$begin_index = $j;
- while (++$j < scalar(@$PerformanceData)) {
- last if (&get_time_from_row($PerformanceData->[$j]) > $endtime);
+ while ($j < scalar(@$performance_data)) {
+ if (&get_time_from_row($performance_data->[$j]) > $endtime) {
+ last;
+ } else {
+ $j++;
+ }
}
$end_index = $j;
##
@@ -895,29 +1195,44 @@ sub OR_time_analysis {
startdateform => $startdateform,
enddateform => $enddateform,
};
- if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
- $table .= &OR_Foil_Time_Analysis($PerformanceData,$ORdata,$Foils,
+ my $concept_correct_plot = '';
+ if ($num_concepts > 1) {
+ $concept_correct_plot =
+ &OR_Concept_Time_Analysis($performance_data,
+ $ORdata,$Concepts,
$interval);
- } else {
- $table .= &OR_Concept_Time_Analysis($PerformanceData,$ORdata,
- $Concepts,$interval);
}
+ my ($foil_correct_plot,$foil_incorrect_plot) =
+ &OR_Foil_Time_Analysis($performance_data,$ORdata,
+ $Foils,$Concepts,$interval);
+ $table .= ''.
+ ''.$concept_correct_plot.' '.
+ ''.$foil_correct_plot.' '.
+ ''.$foil_incorrect_plot.' '.
+ ''.$foilkey.' '.$/;
+ $table .= ''.
+ &mt('Start time: [_1]',
+ $interval->{'startdateform'}).' '.
+ &mt('End time: [_1]',
+ $interval->{'enddateform'}).
+ ' '.$/;
+ $table.= '  '.$/;
}
+ $table .= '
';
#
return $table;
}
sub OR_Foil_Time_Analysis {
- my ($PerformanceData,$ORdata,$Foils,$interval) = @_;
+ my ($performance_data,$ORdata,$Foils,$Concepts,$interval) = @_;
my $analysis_html;
- my $foilkey = &build_option_index($ORdata);
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 = $PerformanceData->[$j];
+ my $row = $performance_data->[$j];
next if (! defined($row));
my %Row = &Process_OR_Row($row);
while (my ($foilid,$href) = each(%Row)) {
@@ -930,83 +1245,80 @@ sub OR_Foil_Time_Analysis {
}
}
}
- my @Plotdata;
- foreach my $foil (@$Foils) {
- my $total = $TimeData{$foil}->{'_total'};
- if ($total == 0) {
- push(@{$Plotdata[0]},0);
- } else {
- push(@{$Plotdata[0]},
- 100 * $TimeData{$foil}->{'_correct'} / $total);
- }
- my $total_incorrect = $total - $TimeData{$foil}->{'_correct'};
- my $optionidx = 1;
- foreach my $option (@{$ORdata->{'_Options'}}) {
- if ($total_incorrect == 0) {
- push(@{$Plotdata[$optionidx]},0);
+ my @plotdata;
+ my @labels;
+ foreach my $concept (@{$Concepts}) {
+ foreach my $foil (@{$concept->{'foils'}}) {
+ push(@labels,scalar(@labels)+1);
+ my $total = $TimeData{$foil}->{'_total'};
+ if ($total == 0) {
+ push(@{$plotdata[0]},0);
} else {
- push(@{$Plotdata[$optionidx]},
- 100 * $TimeData{$foil}->{$option} / $total_incorrect);
+ push(@{$plotdata[0]},
+ 100 * $TimeData{$foil}->{'_correct'} / $total);
+ }
+ my $total_incorrect = $total - $TimeData{$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);
+ }
}
- } continue {
- $optionidx++;
+ }
+ # Put in a blank one
+ push(@labels,'');
+ push(@{$plotdata[0]},0);
+ for (my $i=0;$i{'_Options'}});$i++) {
+ push(@{$plotdata[$i+1]},0);
}
}
#
# 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';
- } else {
+ } elsif ($count > 1) {
$title = $count.' submissions';
}
- my $correctplot = &Apache::loncommon::DrawBarGraph($title,
+ my $correct_plot = &Apache::loncommon::DrawBarGraph($title,
'Foil Number',
'Percent Correct',
100,
$plotcolors,
undef,
- $Plotdata[0]);
- for (my $j=0; $j< scalar(@{$Plotdata[0]});$j++) {
- $Plotdata[0]->[$j]=0;
+ $plotdata[0]);
+ 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 $incorrectplot = &Apache::loncommon::DrawBarGraph($title,
+ my $incorrect_plot = &Apache::loncommon::DrawBarGraph($title,
'Foil Number',
'Incorrect Option Choice',
100,
$plotcolors,
undef,
- @Plotdata);
- $analysis_html.=''.
- ''.$correctplot.' '.
- ''.$incorrectplot.' '.
- ''.$foilkey.' '." \n";
- $analysis_html.= ''.''.
- 'Start Time :'.
- ' '.$interval->{'startdateform'}.' '.
- 'End Time : '.
- ' '.$interval->{'enddateform'}.' '.
-# 'Plot Title :'.
-# (" "x3).$interval->{'titleform'}.
- ' '.
- " \n";
- return $analysis_html;
+ @plotdata);
+ return ($correct_plot,$incorrect_plot);
}
sub OR_Concept_Time_Analysis {
- my ($PerformanceData,$ORdata,$Concepts,$interval) = @_;
- my $analysis_html;
+ my ($performance_data,$ORdata,$Concepts,$interval) = @_;
##
## Determine starttime, endtime, startindex, endindex
my ($begin_index,$end_index) = ($interval->{'begin_index'},
@@ -1015,7 +1327,7 @@ sub OR_Concept_Time_Analysis {
#
# Compute the number getting the foils correct or incorrects
for (my $j=$begin_index;$j<=$end_index;$j++) {
- my $row = $PerformanceData->[$j];
+ my $row = $performance_data->[$j];
next if (! defined($row));
my %Row = &Process_OR_Row($row);
while (my ($foilid,$href) = each(%Row)) {
@@ -1030,7 +1342,7 @@ sub OR_Concept_Time_Analysis {
}
#
# Put the data in plottable form
- my @Plotdata;
+ my @plotdata;
foreach my $concept (@$Concepts) {
my ($total,$correct);
foreach my $foil (@{$concept->{'foils'}}) {
@@ -1038,32 +1350,21 @@ sub OR_Concept_Time_Analysis {
$correct += $TimeData{$foil}->{'_correct'};
}
if ($total == 0) {
- push(@Plotdata,0);
+ push(@plotdata,0);
} else {
- push(@Plotdata,100 * $correct / $total);
+ push(@plotdata,100 * $correct / $total);
}
}
#
# Create the plot
my $title = ($end_index - $begin_index).' submissions';
- my $correctplot = &Apache::loncommon::DrawBarGraph($title,
- 'Concept Number',
- 'Percent Correct',
- 100,
- $plotcolors,
- undef,
- \@Plotdata);
- $analysis_html.=''.
- ''.$correctplot.' '.
- ''.
- 'Start Time : '.$interval->{'startdateform'}.' '.
- 'End Time : '.
- ' '.$interval->{'enddateform'}.' '.
-# 'Plot Title :'.(" "x3).
-# $interval->{'titleform'}.
- ' '.
- " \n";
- return $analysis_html;
+ return &Apache::loncommon::DrawBarGraph($title,
+ 'Concept Number',
+ 'Percent Correct',
+ 100,
+ $plotcolors,
+ undef,
+ \@plotdata);
}
#########################################################
@@ -1074,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);
#
@@ -1112,7 +1413,7 @@ sub OR_excel_sheet {
# 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
@@ -1200,7 +1501,7 @@ sub OR_build_problem_data_worksheet {
}
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'});
@@ -1213,18 +1514,18 @@ 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++,
@@ -1233,9 +1534,9 @@ sub OR_build_response_data_worksheet {
$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;
@@ -1342,7 +1643,7 @@ sub build_foil_index {
''.$foilindex.' '.
''.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').' '.
''.$Foildata{$foilid}->{'text'}.' '.
- ''.&HTML::Entities::encode($Foildata{$foilid}->{'value'}).' '.
+ ''.&HTML::Entities::encode($Foildata{$foilid}->{'value'},'<>&"').' '.
"\n";
} else {
$table .= ''.
@@ -1382,6 +1683,26 @@ 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}) {
+ 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";
+}
+
#########################################################
#########################################################
##
@@ -1393,7 +1714,7 @@ sub CreateInterface {
##
## Environment variable initialization
if (! exists$ENV{'form.AnalyzeOver'}) {
- $ENV{'form.AnalyzeOver'} = 'Tries';
+ $ENV{'form.AnalyzeOver'} = 'tries';
}
##
## Build the menu
@@ -1431,60 +1752,55 @@ sub CreateInterface {
##
##
$Str .= '';
- { # These braces are here to organize the code, not scope it.
- {
- $Str .= ''.&mt('Analyze Over ');
- $Str .= &Apache::loncommon::help_open_topic
- ('Analysis_Analyze_Over');
- $Str .='';
- $Str .= '';
- $Str .= ' ';
- $Str .= ' ';
- $Str .= ' ';
- }
- {
- $Str .= ''.&mt('Analyze as ');
- $Str .= &Apache::loncommon::help_open_topic
- ('Analysis_Analyze_as');
- $Str .='';
- $Str .= '';
- $Str .= ' ';
- $Str .= ' ';
- }
- {
- $Str .= ''.&mt('Number of Plots:');
- $Str .= &Apache::loncommon::help_open_topic
- ('Analysis_num_plots');
- $Str .= '';
- if (! exists($ENV{'form.NumPlots'})
- || $ENV{'form.NumPlots'} < 1
- || $ENV{'form.NumPlots'} > 20) {
- $ENV{'form.NumPlots'} = 5;
- }
- foreach my $i (1,2,3,4,5,6,7,8,10,15,20) {
- $Str .= '';
- }
- $Str .= ' ';
- }
- }
+ ##
+ my $showprob_checkbox =
+ ' ';
+ $Str.= ''.
+ &mt('Show problem [_1]',$showprob_checkbox).
+ ' ';
+ ##
+ my $analyze_selector = '';
+ $analyze_selector .= '';
+ $analyze_selector .= ' ';
+ $analyze_selector .= ' ';
+ $Str .= ''.
+ &mt('Analyze Over [_1] [_2]',
+ $analyze_selector,
+ &Apache::loncommon::help_open_topic('Analysis_Analyze_Over')).
+ ' '.$/;
+ ##
+ my $numplots_selector = '';
+ if (! exists($ENV{'form.NumPlots'})
+ || $ENV{'form.NumPlots'} < 1
+ || $ENV{'form.NumPlots'} > 20) {
+ $ENV{'form.NumPlots'} = 5;
+ }
+ foreach my $i (1,2,3,4,5,6,7,8,10,15,20) {
+ $numplots_selector .= '';
+ }
+ $numplots_selector .= ' ';
+ $Str .= ''.&mt('Number of Plots [_1]',$numplots_selector).
+ ' ';
+ ##
+ $Str .= ''.&mt('Status: [_1]',
+ ' '
+ ).
+ ' ';
$Str .= ' ';
##
##
@@ -1519,8 +1835,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;