--- loncom/interface/statistics/lonproblemanalysis.pm 2003/10/17 22:05:45 1.42
+++ loncom/interface/statistics/lonproblemanalysis.pm 2004/03/01 16:39:19 1.74
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonproblemanalysis.pm,v 1.42 2003/10/17 22:05:45 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.74 2004/03/01 16:39:19 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -24,7 +24,6 @@
#
# http://www.lon-capa.org/
#
-
package Apache::lonproblemanalysis;
use strict;
@@ -34,21 +33,59 @@ use Apache::lonhtmlcommon();
use Apache::loncoursedata();
use Apache::lonstatistics;
use Apache::lonlocal;
+use Apache::lonstathelpers();
+use Apache::lonstudentsubmissions();
use HTML::Entities();
use Time::Local();
+use Spreadsheet::WriteExcel();
my $plotcolors = ['#33ff00',
'#0033cc', '#990000', '#aaaa66', '#663399', '#ff9933',
'#66ccff', '#ff9999', '#cccc33', '#660000', '#33cc66',
];
+my @SubmitButtons = ({ name => 'PrevProblemAnalysis',
+ text => 'Previous Problem' },
+ { name => 'ProblemAnalysis',
+ text => 'Analyze Problem Again' },
+ { 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)=@_;
- $r->print('
'.&mt('Option Response Problem Analysis').' ');
+ #
+ my %Saveable_Parameters = ('Status' => 'scalar',
+ 'Section' => 'array',
+ 'NumPlots' => 'scalar',
+ 'AnalyzeAs' => 'scalar',
+ 'AnalyzeOver' => 'scalar',
+ );
+ &Apache::loncommon::store_course_settings('problem_analysis',
+ \%Saveable_Parameters);
+ &Apache::loncommon::restore_course_settings('problem_analysis',
+ \%Saveable_Parameters);
+ #
+ &Apache::lonstatistics::PrepareClasslist();
+ #
$r->print(&CreateInterface());
#
my @Students = @Apache::lonstatistics::Students;
#
+ if (@Students < 1) {
+ $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'}) &&
@@ -61,75 +98,78 @@ sub BuildProblemAnalysisPage {
$r->print(' ');
}
$r->rflush();
+ #
+ my $problem_types = '(option|radiobutton|numerical)';
if (exists($ENV{'form.problemchoice'}) &&
! exists($ENV{'form.SelectAnother'})) {
- $r->print(' ');
- $r->print(' 'x5);
- $r->print(' ');
- $r->print(' 'x5);
- $r->print(' ');
- $r->print(' 'x5);
- $r->print(' ');
- $r->print(' ');
- $r->print(' 'x5);
+ foreach my $button (@SubmitButtons) {
+ if ($button->{'name'} eq 'break') {
+ $r->print(" \n");
+ } else {
+ $r->print(' {'text'}).'" />');
+ $r->print(' 'x5);
+ }
+ }
#
$r->print(' ');
+ $r->rflush();
#
- my ($symb,$part,$resid) = &get_problem_symb(
- &Apache::lonnet::unescape($ENV{'form.problemchoice'})
- );
+ # Determine which problem we are to analyze
+ my $current_problem = &Apache::lonstathelpers::get_target_from_id
+ ($ENV{'form.problemchoice'});
#
- my $resource = &get_resource_from_symb($symb);
- if (defined($resource)) {
+ my ($prev,$curr,$next) =
+ &Apache::lonstathelpers::get_prev_curr_next($current_problem,
+ $problem_types,
+ 'response',
+ );
+ if (exists($ENV{'form.PrevProblemAnalysis'}) && defined($prev)) {
+ $current_problem = $prev;
+ } elsif (exists($ENV{'form.NextProblemAnalysis'}) && defined($next)) {
+ $current_problem = $next;
+ } else {
+ $current_problem = $curr;
+ }
+ #
+ # Store the current problem choice and send it out in the form
+ $ENV{'form.problemchoice'} =
+ &Apache::lonstathelpers::make_target_id($current_problem);
+ $r->print(' ');
+ #
+ if (! defined($current_problem->{'resource'})) {
+ $r->print('resource is undefined');
+ } else {
+ my $resource = $current_problem->{'resource'};
+ $r->print(''.$resource->{'title'}.' ');
$r->print(''.$resource->{'src'}.' ');
- my %Data = &get_problem_data($resource->{'src'});
- my $ORdata = $Data{$part.'.'.$resid};
- ##
- ## Render the problem
- my $base;
- ($base,undef) = ($resource->{'src'} =~ m|(.*/)[^/]*$|);
- $base = "http://".$ENV{'SERVER_NAME'}.$base;
- my $rendered_problem =
- &Apache::lonnet::ssi_body($resource->{'src'});
- $rendered_problem =~ s/<\s*form\s*/)|<\/nop>|g;
- $r->print(''.
- ' '.
- $rendered_problem.
- '
');
- ##
- ## Analyze the problem
- my $PerformanceData =
- &Apache::loncoursedata::get_optionresponse_data
- (\@Students,$symb,$resid);
- if (defined($PerformanceData) &&
- ref($PerformanceData) eq 'ARRAY') {
- if ($ENV{'form.AnalyzeOver'} eq 'Tries') {
- my $analysis_html = &tries_analysis($PerformanceData,
- $ORdata);
- $r->print($analysis_html);
- } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
- my $analysis_html = &time_analysis($PerformanceData,
- $ORdata);
- $r->print($analysis_html);
- } else {
- $r->print(''.
- &mt('The analysis you have selected is '.
- 'not supported at this time').
- ' ');
- }
+ $r->print(&Apache::lonstathelpers::render_resource($resource));
+ $r->rflush();
+ my %Data = &Apache::lonstathelpers::get_problem_data
+ ($resource->{'src'});
+ my $ProblemData = $Data{$current_problem->{'part'}.
+ '.'.
+ $current_problem->{'respid'}};
+ if ($current_problem->{'resptype'} eq 'option') {
+ &OptionResponseAnalysis($r,$current_problem,
+ $ProblemData,
+ \@Students);
+ } elsif ($current_problem->{'resptype'} eq 'radiobutton') {
+ &RadioResponseAnalysis($r,$current_problem,
+ $ProblemData,
+ \@Students);
+ } elsif ($current_problem->{'resptype'} eq 'numerical') {
+# if (exists($ENV{'form.ExcelOutput'})) {
+ &Apache::lonstudentsubmissions::prepare_excel_output
+ ($r,$current_problem,$ProblemData,\@Students);
+# } else {
+# &NumericalResponseAnalysis($r,$current_problem,
+# $ProblemData,\@Students);
+# }
} else {
- $r->print(''.
- &mt('There is no student data for this problem.').
- ' ');
+ $r->print('This analysis is not supported ');
}
- } else {
- $r->print('resource is undefined');
}
$r->print(' ');
} else {
@@ -137,157 +177,367 @@ sub BuildProblemAnalysisPage {
&mt('Analyze Problem').'" />');
$r->print(' 'x5);
$r->print(''.&mt('Please select a problem to analyze').' ');
- $r->print(&OptionResponseProblemSelector());
+ $r->print(&Apache::lonstathelpers::ProblemSelector
+ ($problem_types));
}
}
+
#########################################################
#########################################################
##
-## Misc interface routines use by analysis code
+## Numerical Response Routines
##
#########################################################
#########################################################
-sub build_foil_index {
- my ($ORdata) = @_;
- return if (! exists($ORdata->{'Foils'}));
- my %Foildata = %{$ORdata->{'Foils'}};
- my @Foils = sort(keys(%Foildata));
- my %Concepts;
- foreach my $foilid (@Foils) {
- push(@{$Concepts{$Foildata{$foilid}->{'Concept'}}},
- $foilid);
+sub NumericalResponseAnalysis {
+ my ($r,$problem,$ProblemData,$Students) = @_;
+ $r->print('This analysis is not yet supported ');
+ my ($resource,$respid) = ($problem->{'resource'},
+ $problem->{'respid'});
+ my $analysis_html;
+ my $PerformanceData =
+ &Apache::loncoursedata::get_response_data
+ ($Students,$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);
+ return;
+ }
+ my ($max,$min) = &GetStudentAnswers($r,$problem,$Students);
+ $r->print('Maximum = '.$max.' Minimum = '.$min);
+ my $max_students = 0;
+ my %Data;
+ foreach my $student (@$Students) {
+ my $answer = $student->{'answer'};
+ $Data{$answer}++;
+ if ($max_students < $Data{$answer}) {
+ $max_students = $Data{$answer};
+ }
+ }
+ foreach (5,10,20,25,50,75,100,150,200,250,500,1000,1500,2000,2500,5000) {
+ if ($max_students < $_) {
+ $max_students = $_;
+ last;
+ }
+ }
+ my @Labels = sort {$a <=> $b } keys(%Data);
+ $r->print('number of labels = '.scalar(@Labels));
+ my @PlotData = @Data{@Labels};
+ $r->print('number of PlotData = '.scalar(@PlotData));
+ my $graph =
+ &Apache::loncommon::DrawXYGraph('Correct Answer Distribution',
+ 'Correct Answer',
+ 'Number of students',
+ $max_students,
+ undef,
+ \@Labels,
+ [\@PlotData],
+ (xskip=>10));
+ $r->print($graph);
+ return;
+}
+
+sub GetStudentAnswers {
+ my ($r,$problem,$Students) = @_;
+ my %Answers;
+ my ($resource,$partid,$respid) = ($problem->{'resource'},
+ $problem->{'part'},
+ $problem->{'respid'});
+ # Open progress window
+ my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
+ ($r,'Student Answer Compilation Status',
+ 'Student Answer Compilation Progress', scalar(@$Students));
+ $r->print("\n");
+ $r->rflush();
+ foreach my $student (@$Students) {
+ my $sname = $student->{'username'};
+ my $sdom = $student->{'domain'};
+ my $answer = &Apache::lonstathelpers::analyze_problem_as_student
+ ($resource,$sname,$sdom,$partid,$respid);
+ &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
+ &mt('last student'));
+ $student->{'answer'} = $answer;
}
- undef(@Foils);
- # Having gathered the concept information in a hash, we now translate it
- # into an array because we need to be consistent about order.
- # Also put the foils in order, too.
- my $sortfunction = sub {
- my %Numbers = (one => 1,
- two => 2,
- three => 3,
- four => 4,
- five => 5,
- six => 6,
- seven => 7,
- eight => 8,
- nine => 9,
- ten => 10,);
- my $a1 = $a;
- my $b1 = $b;
- if (exists($Numbers{lc($a)})) {
- $a1 = $Numbers{lc($a)};
- }
- if (exists($Numbers{lc($b)})) {
- $b1 = $Numbers{lc($b)};
- }
- $a1 cmp $b1;
- };
- my @Concepts;
- foreach my $concept (sort $sortfunction (keys(%Concepts))) {
- push(@Concepts,{ name => $concept,
- foils => [@{$Concepts{$concept}}]});
- push(@Foils,(@{$Concepts{$concept}}));
+ $r->print("
\n");
+ $r->rflush();
+ # close progress window
+ &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+ return;
+}
+
+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}]);
}
- #
- # Build up the table of row labels.
- my $table = ''."\n";
- if (@Concepts > 1) {
- $table .= ''.
- ''.&mt('Concept Number').' '.
- ''.&mt('Concept').' '.
- ''.&mt('Foil Number').' '.
- ''.&mt('Foil Name').' '.
- ''.&mt('Foil Text').' '.
- ''.&mt('Correct Value').' '.
- " \n";
+ return $worksheet;
+}
+
+#########################################################
+#########################################################
+##
+## Radio Response Routines
+##
+#########################################################
+#########################################################
+sub RadioResponseAnalysis {
+ my ($r,$problem,$ProblemData,$Students) = @_;
+ my ($resource,$respid) = ($problem->{'resource'},
+ $problem->{'respid'});
+ my $analysis_html;
+ my $PerformanceData =
+ &Apache::loncoursedata::get_response_data
+ ($Students,$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);
+ 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);
} else {
- $table .= ''.
- ''.&mt('Foil Number').' '.
- ''.&mt('Foil Name').' '.
- ''.&mt('Foil Text').' '.
- ''.&mt('Correct Value').' '.
- " \n";
- }
- my $conceptindex = 1;
- my $foilindex = 1;
- foreach my $concept (@Concepts) {
- my @FoilsInConcept = @{$concept->{'foils'}};
- my $firstfoil = shift(@FoilsInConcept);
- if (@Concepts > 1) {
- $table .= ''.
- ''.$conceptindex.' '.
- ''.$concept->{'name'}.' '.
- ''.$foilindex++.' '.
- ''.$Foildata{$firstfoil}->{'name'}.' '.
- ''.$Foildata{$firstfoil}->{'text'}.' '.
- ''.$Foildata{$firstfoil}->{'value'}.' '.
- " \n";
- } else {
- $table .= ''.
- ''.$foilindex++.' '.
- ''.$Foildata{$firstfoil}->{'name'}.' '.
- ''.$Foildata{$firstfoil}->{'text'}.' '.
- ''.$Foildata{$firstfoil}->{'value'}.' '.
- " \n";
- }
- foreach my $foilid (@FoilsInConcept) {
- if (@Concepts > 1) {
- $table .= ''.
- ' '.
- ' '.
- ''.$foilindex.' '.
- ''.$Foildata{$foilid}->{'name'}.' '.
- ''.$Foildata{$foilid}->{'text'}.' '.
- ''.$Foildata{$foilid}->{'value'}.' '.
- " \n";
+ $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) = @_;
+ return 'No! ';
+}
+
+sub RR_Tries_Analysis {
+ my ($r,$resource,$PerformanceData,$ProblemData) = @_;
+ 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'))) {
+ $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);
+# }
+ 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,$ProblemData) = @_;
+ my $html;
+ return $html;
+}
+
+sub RR_Tries_Foil_Analysis {
+ my ($min,$max,$Foils,$TryData,$ProblemData) = @_;
+ 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};
+ }
+ foreach my $foilid (@$Foils) {
+ if ($total == 0) {
+ push (@PlotData_Correct,0);
+ push (@PlotData_Incorrect,0);
} else {
- $table .= ''.
- ''.$foilindex.' '.
- ''.$Foildata{$foilid}->{'name'}.' '.
- ''.$Foildata{$foilid}->{'text'}.' '.
- ''.$Foildata{$foilid}->{'value'}.' '.
- " \n";
- }
- } continue {
- $foilindex++;
+ if ($ProblemData->{'_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));
+ }
+ }
}
- } continue {
- $conceptindex++;
+ my $title='Attempt '.$try;
+ my $xlabel = $total.' Submissions';
+ $html.= &Apache::loncommon::DrawBarGraph($title,
+ $xlabel,
+ 'Percent Choosing',
+ 100,
+ ['#33ff00','#ff3300'],
+ undef,
+ \@PlotData_Correct,
+ \@PlotData_Incorrect);
}
- $table .= "
\n";
- #
- # Build option index with color stuff
- return ($table,\@Foils,\@Concepts);
+ return $html;
}
-sub build_option_index {
- my ($ORdata)= @_;
- my $table = "\n";
- my $optionindex = 0;
- my @Rows;
- foreach my $option (&mt('correct option chosen'),@{$ORdata->{'Options'}}) {
- push (@Rows,
- ''.
- ''.
- (' 'x4).' '.
- ''.$option.' '.
- " \n");
+sub RR_Tries_Concept_Analysis {
+ my ($min,$max,$Concepts,$ResponseData,$ProblemData) = @_;
+ my $html;
+ return $html;
+}
+
+sub RR_Time_Foil_Analysis {
+ my ($min,$max,$Foils,$ResponseData,$ProblemData) = @_;
+ my $html;
+ return $html;
+}
+
+sub RR_Time_Concept_Analysis {
+ my ($min,$max,$Concepts,$ResponseData,$ProblemData) = @_;
+ my $html;
+ return $html;
+}
+
+
+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;
+ }
+ }
}
- shift(@Rows); # Throw away 'correct option chosen' color
- $table .= join('',reverse(@Rows));
- $table .= "
\n";
+ return %Partdata;
}
#########################################################
#########################################################
##
-## Tries Analysis
+## Option Response Routines
##
#########################################################
#########################################################
-sub tries_analysis {
- my ($PerformanceData,$ORdata) = @_;
+sub OptionResponseAnalysis {
+ my ($r,$problem,$ProblemData,$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);
+ if (! defined($PerformanceData) ||
+ ref($PerformanceData) ne 'ARRAY' ) {
+ $r->print(''.
+ &mt('There is no student data for this problem.').
+ ' ');
+ } else {
+ $r->rflush();
+ if (exists($ENV{'form.ExcelOutput'})) {
+ my $result = &OR_excel_sheet($r,$resource,
+ $PerformanceData,
+ $ProblemData);
+ $r->print($result);
+ $r->rflush();
+ } else {
+ if ($ENV{'form.AnalyzeOver'} eq 'Tries') {
+ my $analysis_html = &OR_tries_analysis($r,
+ $PerformanceData,
+ $ProblemData);
+ $r->print($analysis_html);
+ $r->rflush();
+ } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
+ my $analysis_html = &OR_time_analysis($PerformanceData,
+ $ProblemData);
+ $r->print($analysis_html);
+ $r->rflush();
+ } else {
+ $r->print(''.
+ &mt('The analysis you have selected is '.
+ 'not supported at this time').
+ ' ');
+ }
+ }
+ }
+}
+
+#########################################################
+#
+# Option Response: Tries Analysis
+#
+#########################################################
+sub OR_tries_analysis {
+ my ($r,$PerformanceData,$ORdata) = @_;
my $mintries = 1;
my $maxtries = $ENV{'form.NumPlots'};
my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
@@ -298,21 +548,21 @@ sub tries_analysis {
''.$table;
$ENV{'form.AnalyzeAs'} = 'Foils';
}
- my %ResponseData = &analyze_option_data_by_tries($PerformanceData,
+ my %ResponseData = &OR_analyze_by_tries($r,$PerformanceData,
$mintries,$maxtries);
my $analysis = '';
if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
- $analysis = &Tries_Foil_Analysis($mintries,$maxtries,$Foils,
+ $analysis = &OR_Tries_Foil_Analysis($mintries,$maxtries,$Foils,
\%ResponseData,$ORdata);
} else {
- $analysis = &Tries_Concept_Analysis($mintries,$maxtries,
+ $analysis = &OR_Tries_Concept_Analysis($mintries,$maxtries,
$Concepts,\%ResponseData,$ORdata);
}
$table .= $analysis;
return $table;
}
-sub Tries_Foil_Analysis {
+sub OR_Tries_Foil_Analysis {
my ($mintries,$maxtries,$Foils,$respdat,$ORdata) = @_;
my %ResponseData = %$respdat;
#
@@ -327,7 +577,7 @@ sub Tries_Foil_Analysis {
100*$ResponseData{$foilid}->[$i]->{'_correct'}/
$ResponseData{$foilid}->[$i]->{'_total'});
}
- foreach my $option (@{$ORdata->{'Options'}}) {
+ foreach my $option (@{$ORdata->{'_Options'}}) {
push(@{$PlotData[$i]->{'_total'}},
$ResponseData{$foilid}->[$i]->{'_total'});
if ($ResponseData{$foilid}->[$i]->{'_total'} == 0) {
@@ -361,16 +611,17 @@ sub Tries_Foil_Analysis {
}
my $title = 'Attempt '.$i.', '.$count;
my @Datasets;
- foreach my $option ('_correct',@{$ORdata->{'Options'}}) {
+ foreach my $option ('_correct',@{$ORdata->{'_Options'}}) {
next if (! exists($PlotData[$i]->{$option}));
push(@Datasets,$PlotData[$i]->{$option});
}
- my $correctgraph = &Apache::loncommon::DrawGraph
+ my $correctgraph = &Apache::loncommon::DrawBarGraph
($title,'Foil Number','Percent Correct',
- 100,$plotcolors,$Datasets[0]);
+ 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;
}
@@ -383,9 +634,9 @@ sub Tries_Foil_Analysis {
$count = $count.' submissions';
}
$title = 'Attempt '.$i.', '.$count;
- my $incorrectgraph = &Apache::loncommon::DrawGraph
+ my $incorrectgraph = &Apache::loncommon::DrawBarGraph
($title,'Foil Number','% Option Chosen Incorrectly',
- 100,$plotcolors,@Datasets);
+ 100,$plotcolors,undef,@Datasets);
$analysis_html.= ''.$incorrectgraph.' ';
$analysis_html.= ''.$foilkey." \n";
}
@@ -393,7 +644,7 @@ sub Tries_Foil_Analysis {
return $analysis_html;
}
-sub Tries_Concept_Analysis {
+sub OR_Tries_Concept_Analysis {
my ($mintries,$maxtries,$Concepts,$respdat,$ORdata) = @_;
my %ResponseData = %$respdat;
my $analysis_html = "\n";
@@ -450,24 +701,25 @@ sub Tries_Concept_Analysis {
$count = $count.' submissions';
}
$title = 'Attempt '.$i.', '.$count;
- my $graphlink = &Apache::loncommon::DrawGraph
+ my $graphlink = &Apache::loncommon::DrawBarGraph
($title,'Concept Number','Percent Correct',
- 100,$plotcolors,$PlotData[$i]->{'_correct'});
+ 100,$plotcolors,undef,$PlotData[$i]->{'_correct'});
$analysis_html.= ''.$graphlink." \n";
}
$analysis_html .= "
\n";
return $analysis_html;
}
-sub analyze_option_data_by_tries {
- my ($PerformanceData,$mintries,$maxtries) = @_;
+sub OR_analyze_by_tries {
+ my ($r,$PerformanceData,$mintries,$maxtries) = @_;
my %Trydata;
$mintries = 1 if (! defined($mintries) || $mintries < 1);
$maxtries = $mintries if (! defined($maxtries) || $maxtries < $mintries);
foreach my $row (@$PerformanceData) {
next if (! defined($row));
my $tries = &get_tries_from_row($row);
- my %Row = &Process_Row($row);
+ my %Row = &Process_OR_Row($row);
+ next if (! %Row);
while (my ($foilid,$href) = each(%Row)) {
if (! ref($href)) {
$Trydata{$foilid}->[$tries] += $href;
@@ -482,13 +734,11 @@ sub analyze_option_data_by_tries {
}
#########################################################
+#
+# Option Response: Time Analysis
+#
#########################################################
-##
-## Time Analysis
-##
-#########################################################
-#########################################################
-sub time_analysis {
+sub OR_time_analysis {
my ($PerformanceData,$ORdata) = @_;
my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
if ((@$Concepts < 2) && ($ENV{'form.AnalyzeAs'} ne 'Foils')) {
@@ -530,7 +780,8 @@ sub time_analysis {
my $end_index;
my $j;
while (++$j < scalar(@$PerformanceData)) {
- last if (&get_time_from_row($PerformanceData->[$j]) > $starttime);
+ last if (&get_time_from_row($PerformanceData->[$j])
+ > $starttime);
}
$begin_index = $j;
while (++$j < scalar(@$PerformanceData)) {
@@ -545,10 +796,10 @@ sub time_analysis {
enddateform => $enddateform,
};
if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
- $table .= &Foil_Time_Analysis($PerformanceData,$ORdata,$Foils,
+ $table .= &OR_Foil_Time_Analysis($PerformanceData,$ORdata,$Foils,
$interval);
} else {
- $table .= &Concept_Time_Analysis($PerformanceData,$ORdata,
+ $table .= &OR_Concept_Time_Analysis($PerformanceData,$ORdata,
$Concepts,$interval);
}
}
@@ -556,7 +807,7 @@ sub time_analysis {
return $table;
}
-sub Foil_Time_Analysis {
+sub OR_Foil_Time_Analysis {
my ($PerformanceData,$ORdata,$Foils,$interval) = @_;
my $analysis_html;
my $foilkey = &build_option_index($ORdata);
@@ -568,7 +819,7 @@ sub Foil_Time_Analysis {
for (my $j=$begin_index;$j<=$end_index;$j++) {
my $row = $PerformanceData->[$j];
next if (! defined($row));
- my %Row = &Process_Row($row);
+ my %Row = &Process_OR_Row($row);
while (my ($foilid,$href) = each(%Row)) {
if (! ref($href)) {
$TimeData{$foilid} += $href;
@@ -590,7 +841,7 @@ sub Foil_Time_Analysis {
}
my $total_incorrect = $total - $TimeData{$foil}->{'_correct'};
my $optionidx = 1;
- foreach my $option (@{$ORdata->{'Options'}}) {
+ foreach my $option (@{$ORdata->{'_Options'}}) {
if ($total_incorrect == 0) {
push(@{$Plotdata[$optionidx]},0);
} else {
@@ -612,12 +863,13 @@ sub Foil_Time_Analysis {
} else {
$title = $count.' submissions';
}
- my $correctplot = &Apache::loncommon::DrawGraph($title,
- 'Foil Number',
- 'Percent Correct',
- 100,
- $plotcolors,
- $Plotdata[0]);
+ my $correctplot = &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;
}
@@ -629,11 +881,12 @@ sub Foil_Time_Analysis {
} else {
$title = $count.' submissions';
}
- my $incorrectplot = &Apache::loncommon::DrawGraph($title,
+ my $incorrectplot = &Apache::loncommon::DrawBarGraph($title,
'Foil Number',
'Incorrect Option Choice',
100,
$plotcolors,
+ undef,
@Plotdata);
$analysis_html.=''.
''.$correctplot.' '.
@@ -651,7 +904,7 @@ sub Foil_Time_Analysis {
return $analysis_html;
}
-sub Concept_Time_Analysis {
+sub OR_Concept_Time_Analysis {
my ($PerformanceData,$ORdata,$Concepts,$interval) = @_;
my $analysis_html;
##
@@ -664,7 +917,7 @@ sub Concept_Time_Analysis {
for (my $j=$begin_index;$j<=$end_index;$j++) {
my $row = $PerformanceData->[$j];
next if (! defined($row));
- my %Row = &Process_Row($row);
+ my %Row = &Process_OR_Row($row);
while (my ($foilid,$href) = each(%Row)) {
if (! ref($href)) {
$TimeData{$foilid} += $href;
@@ -693,11 +946,12 @@ sub Concept_Time_Analysis {
#
# Create the plot
my $title = ($end_index - $begin_index).' submissions';
- my $correctplot = &Apache::loncommon::DrawGraph($title,
+ my $correctplot = &Apache::loncommon::DrawBarGraph($title,
'Concept Number',
'Percent Correct',
100,
$plotcolors,
+ undef,
\@Plotdata);
$analysis_html.=' '.
''.$correctplot.' '.
@@ -719,19 +973,319 @@ sub Concept_Time_Analysis {
##
#########################################################
#########################################################
-sub prepare_excel_sheet {
- my ($PerformanceData,$ORdata) = @_;
+sub OR_excel_sheet {
+ my ($r,$resource,$PerformanceData,$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").
+ '
');
+ 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,
+ $PerformanceData,$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,$PerformanceData,$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 (@$PerformanceData) {
+ next if (! defined($row));
+ my ($student,$award,$grading,$submission,$time,$tries) = @$row;
+ my @Foilgrades = split('&',$grading);
+ my @Foilsubs = split('&',$submission);
+ my %ResponseData;
+ 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;
+ }
+ $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++,
+ $ResponseData{$foilid.' submission'});
+ $worksheet->write($rows_output,$cols_output++,
+ $ResponseData{$foilid.' award'});
+ }
+ $rows_output++;
+ $cols_output = 0;
+ }
+ return;
+}
+
+sub build_foil_index {
+ my ($ORdata) = @_;
+ return if (! exists($ORdata->{'_Foils'}));
+ my %Foildata = %{$ORdata->{'_Foils'}};
+ my @Foils = sort(keys(%Foildata));
+ my %Concepts;
+ foreach my $foilid (@Foils) {
+ push(@{$Concepts{$Foildata{$foilid}->{'_Concept'}}},
+ $foilid);
+ }
+ undef(@Foils);
+ # Having gathered the concept information in a hash, we now translate it
+ # into an array because we need to be consistent about order.
+ # Also put the foils in order, too.
+ my $sortfunction = sub {
+ my %Numbers = (one => 1,
+ two => 2,
+ three => 3,
+ four => 4,
+ five => 5,
+ six => 6,
+ seven => 7,
+ eight => 8,
+ nine => 9,
+ ten => 10,);
+ my $a1 = lc($a);
+ my $b1 = lc($b);
+ if (exists($Numbers{$a1})) {
+ $a1 = $Numbers{$a1};
+ }
+ if (exists($Numbers{$b1})) {
+ $b1 = $Numbers{$b1};
+ }
+ if (($a1 =~/^\d+$/) && ($b1 =~/^\d+$/)) {
+ return $a1 <=> $b1;
+ } else {
+ return $a1 cmp $b1;
+ }
+ };
+ my @Concepts;
+ foreach my $concept (sort $sortfunction (keys(%Concepts))) {
+ if (! defined($Concepts{$concept})) {
+ $Concepts{$concept}=[];
+# next;
+ }
+ push(@Concepts,{ name => $concept,
+ foils => [@{$Concepts{$concept}}]});
+ push(@Foils,(@{$Concepts{$concept}}));
+ }
+ #
+ # Build up the table of row labels.
+ my $table = ''."\n";
+ if (@Concepts > 1) {
+ $table .= ''.
+ ''.&mt('Concept Number').' '.
+ ''.&mt('Concept').' '.
+ ''.&mt('Foil Number').' '.
+ ''.&mt('Foil Name').' '.
+ ''.&mt('Foil Text').' '.
+ ''.&mt('Correct Value').' '.
+ " \n";
+ } else {
+ $table .= ''.
+ ''.&mt('Foil Number').' '.
+ ''.&mt('Foil Name').' '.
+ ''.&mt('Foil Text').' '.
+ ''.&mt('Correct Value').' '.
+ " \n";
+ }
+ my $conceptindex = 1;
+ my $foilindex = 1;
+ foreach my $concept (@Concepts) {
+ my @FoilsInConcept = @{$concept->{'foils'}};
+ my $firstfoil = shift(@FoilsInConcept);
+ if (@Concepts > 1) {
+ $table .= ''.
+ ''.$conceptindex.' '.
+ ''.&HTML::Entities::encode($concept->{'name'}).' '.
+ ''.$foilindex++.' '.
+ ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'}).' '.
+ ''.$Foildata{$firstfoil}->{'text'}.' '.
+ ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'}).' '.
+ " \n";
+ } else {
+ $table .= ''.
+ ''.$foilindex++.' '.
+ ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'}).' '.
+ ''.$Foildata{$firstfoil}->{'text'}.' '.
+ ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'}).' '.
+ " \n";
+ }
+ foreach my $foilid (@FoilsInConcept) {
+ if (@Concepts > 1) {
+ $table .= ''.
+ ' '.
+ ' '.
+ ''.$foilindex.' '.
+ ''.&HTML::Entities::encode($Foildata{$foilid}->{'name'}).' '.
+ ''.$Foildata{$foilid}->{'text'}.' '.
+ ''.&HTML::Entities::encode($Foildata{$foilid}->{'value'}).' '.
+ " \n";
+ } else {
+ $table .= ''.
+ ''.$foilindex.' '.
+ ''.&HTML::Entities::encode($Foildata{$foilid}->{'name'}).' '.
+ ''.$Foildata{$foilid}->{'text'}.' '.
+ ''.&HTML::Entities::encode($Foildata{$foilid}->{'value'}).' '.
+ " \n";
+ }
+ } continue {
+ $foilindex++;
+ }
+ } continue {
+ $conceptindex++;
+ }
+ $table .= "
\n";
+ #
+ # Build option index with color stuff
+ return ($table,\@Foils,\@Concepts);
}
-sub process_data_for_excel_sheet {
- my ($PerformanceData,$Foils,$Concepts,$ORdata)=@_;
+sub build_option_index {
+ my ($ORdata)= @_;
+ my $table = "\n";
+ my $optionindex = 0;
+ my @Rows;
+ foreach my $option (&mt('correct option chosen'),@{$ORdata->{'_Options'}}) {
+ push (@Rows,
+ ''.
+ ''.
+ (' 'x4).' '.
+ ''.&HTML::Entities::encode($option).' '.
+ " \n");
+ }
+ shift(@Rows); # Throw away 'correct option chosen' color
+ $table .= join('',reverse(@Rows));
+ $table .= "
\n";
}
#########################################################
#########################################################
##
-## Interface
+## Generic Interface Routines
##
#########################################################
#########################################################
@@ -744,6 +1298,8 @@ sub CreateInterface {
##
## Build the menu
my $Str = '';
+ $Str .= &Apache::lonhtmlcommon::breadcrumbs
+ (undef,'Detailed Problem Analysis');
$Str .= '\n";
- return $Str;
-}
-
#########################################################
#########################################################
##
-## Misc functions
+## Misc Option Response functions
##
#########################################################
#########################################################
-sub get_problem_symb {
- my $problemstring = shift();
- my ($symb,$partid,$resid) = ($problemstring=~ /^(.*):([^:]*):([^:]*)$/);
- return ($symb,$partid,$resid);
-}
-
-sub get_resource_from_symb {
- my ($symb) = @_;
- foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
- foreach my $res (@{$seq->{'contents'}}) {
- if ($res->{'symb'} eq $symb) {
- return $res;
- }
- }
- }
- return undef;
-}
-
sub get_time_from_row {
my ($row) = @_;
if (ref($row)) {
- return $row->[3];
+ return $row->[&Apache::loncoursedata::RD_timestamp()];
}
return undef;
}
@@ -910,16 +1411,31 @@ sub get_time_from_row {
sub get_tries_from_row {
my ($row) = @_;
if (ref($row)) {
- return $row->[4];
+ return $row->[&Apache::loncoursedata::RD_tries()];
}
return undef;
}
-sub Process_Row {
+sub hashify_attempt {
+ my ($row) = @_;
+ my %attempt;
+ $attempt{'tries'} = $row->[&Apache::loncoursedata::RD_tries()];
+ $attempt{'submission'} = $row->[&Apache::loncoursedata::RD_submission()];
+ $attempt{'award'} = $row->[&Apache::loncoursedata::RD_awarddetail()];
+ $attempt{'timestamp'} = $row->[&Apache::loncoursedata::RD_timestamp()];
+ return %attempt;
+}
+
+sub Process_OR_Row {
my ($row) = @_;
my %RowData;
- my ($award,$grading,$submission,$time,$tries) = @$row;
- next if ($award eq 'MISSING_ANSWER');
+ 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()];
+ return undef if ($award eq 'MISSING_ANSWER');
if ($award =~ /(APPROX_ANS|EXACT_ANS)/) {
$RowData{'_correct'} = 1;
}
@@ -928,12 +1444,12 @@ sub Process_Row {
my @Foilsubs = split('&',$submission);
for (my $j=0;$j<=$#Foilgrades;$j++) {
my ($foilid,$correct) = split('=',$Foilgrades[$j]);
+ $foilid = &Apache::lonnet::unescape($foilid);
my (undef,$submission) = split('=',$Foilsubs[$j]);
if ($correct) {
$RowData{$foilid}->{'_correct'}++;
} else {
$submission = &Apache::lonnet::unescape($submission);
- $submission =~ s/\%20/ /g;
$RowData{$foilid}->{$submission}++;
}
$RowData{$foilid}->{'_total'}++;
@@ -941,49 +1457,6 @@ sub Process_Row {
return %RowData;
}
-##
-## get problem data and put it into a useful data structure.
-## note: we must force each foil and option to not begin or end with
-## spaces as they are stored without such data.
-##
-sub get_problem_data {
- my ($url) = @_;
- my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze'));
- (my $garbage,$Answ)=split(/_HASH_REF__/,$Answ,2);
- my %Answer;
- %Answer=&Apache::lonnet::str2hash($Answ);
- my %Partdata;
- foreach my $part (@{$Answer{'parts'}}) {
- while (my($key,$value) = each(%Answer)) {
- next if ($key !~ /^$part/);
- $key =~ s/^$part\.//;
- if (ref($value) eq 'ARRAY') {
- if ($key eq 'options') {
- $Partdata{$part}->{'Options'}=$value;
- } elsif ($key eq 'concepts') {
- $Partdata{$part}->{'Concepts'}=$value;
- } elsif ($key =~ /^concept\.(.*)$/) {
- my $concept = $1;
- foreach my $foil (@$value) {
- $Partdata{$part}->{'Foils'}->{$foil}->{'Concept'}=
- $concept;
- }
- }
- } else {
- if ($key=~ /^foil\.text\.(.*)$/) {
- my $foil = $1;
- $Partdata{$part}->{'Foils'}->{$foil}->{'name'}=$foil;
- $Partdata{$part}->{'Foils'}->{$foil}->{'text'}=$value;
- } elsif ($key =~ /^foil\.value\.(.*)$/) {
- my $foil = $1;
- $Partdata{$part}->{'Foils'}->{$foil}->{'value'}=$value;
- }
- }
- }
- }
- return %Partdata;
-}
-
1;
__END__