'
+ .&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);
+ if ($env{'form.AnalyzeOver'} eq 'tries') {
+ my $analysis_html = &OR_tries_analysis($r,
+ $PerformanceData,
+ $problem_data);
+ $r->print($analysis_html);
+ $r->rflush();
+ } elsif ($env{'form.AnalyzeOver'} eq 'time') {
+ my $analysis_html = &OR_time_analysis($PerformanceData,
+ $problem_data);
+ $r->print($analysis_html);
$r->rflush();
} else {
- if ($ENV{'form.AnalyzeOver'} eq 'Tries') {
- my $analysis_html = &OR_tries_analysis($r,
- $PerformanceData,
- $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(''
+ );
}
}
}
#########################################################
#
-# Option Response: Tries Analysis
+# Option Response: tries Analysis
#
#########################################################
sub OR_tries_analysis {
my ($r,$PerformanceData,$ORdata) = @_;
my $mintries = 1;
- my $maxtries = $ENV{'form.NumPlots'};
+ 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';
+ if (! defined($Concepts)) {
+ $Concepts = [];
}
- 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 $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++) {
+ 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 [quant,_1,time].'
+ ,$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 %lt = &Apache::lonlocal::texthash(
+ 'title' => 'Correct Concepts',
+ 'xlabel' => 'Concept Number',
+ 'ylabel' => 'Percent Correct');
+ $concept_graph = &Apache::loncommon::DrawBarGraph
+ ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'},
+ 100,$plotcolors,undef,\@concept_plot_data,{xskip=>1});
+ }
+ #
+ # Create Foil Plots
+ my $data_count = $response_data{'_total'}->[$try];
+ my $correct = $response_data{'_correct'}->[$try];
+ $correct |= 0;
my @Datasets;
foreach my $option ('_correct',@{$ORdata->{'_Options'}}) {
- next if (! exists($PlotData[$i]->{$option}));
- push(@Datasets,$PlotData[$i]->{$option});
+ next if (! exists($foil_plot[$try]->{$option}));
+ push(@Datasets,$foil_plot[$try]->{$option});
}
- my $correctgraph = &Apache::loncommon::DrawBarGraph
- ($title,'Foil Number','Percent Correct',
- 100,$plotcolors,$Datasets[0]);
- $analysis_html.= ''.$correctgraph.' ';
- ##
- ##
- next if (! defined($Datasets[0]));
- for (my $i=0; $i< scalar(@{$Datasets[0]});$i++) {
- $Datasets[0]->[$i]=0;
- }
- $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,@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 %lt = &Apache::lonlocal::texthash(
+ 'title' => 'Correct Statements',
+ 'xlabel' => 'Statement',
+ 'ylabel' => '% Answered Correct');
+ my $correct_graph = &Apache::loncommon::DrawBarGraph
+ ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'},
+ 100,$plotcolors,\@Labels,$Datasets[0],{xskip=>1});
+
+ #
+ #
+ 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,$PlotData[$i]->{'_correct'});
- $analysis_html.= ''.$graphlink." \n";
+ my $count = $response_data{'_total'}->[$try] -
+ $response_data{'_correct'}->[$try];
+ %lt = &Apache::lonlocal::texthash(
+ 'title' => 'Incorrect Statements',
+ 'xlabel' => 'Statement',
+ 'ylabel' => '% Chosen Incorrectly');
+ my $incorrect_graph = &Apache::loncommon::DrawBarGraph
+ ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'},
+ 100,$plotcolors,\@Labels,@Datasets,{xskip=>1});
+ $analysis_html.=
+ ''.
+ ''.
+ &mt('Attempt [_1], [_2] submissions, [_3] correct, [_4] incorrect',
+ $try,$data_count,$correct,$data_count-$correct).
+ ' '.' '.$/.
+ ''.
+ ''.$concept_graph.' '.
+ ''.$correct_graph.' '.
+ ''.$incorrect_graph.' '.
+ ''.$optionkey.' '.
+ ' '.$/;
}
$analysis_html .= "
\n";
- return $analysis_html;
+ $table .= $analysis_html;
+ return $table;
}
sub OR_analyze_by_tries {
@@ -584,11 +1471,14 @@ sub OR_analyze_by_tries {
my %Trydata;
$mintries = 1 if (! defined($mintries) || $mintries < 1);
$maxtries = $mintries if (! defined($maxtries) || $maxtries < $mintries);
+ my @students;
foreach my $row (@$PerformanceData) {
next if (! defined($row));
my $tries = &get_tries_from_row($row);
my %Row = &Process_OR_Row($row);
next if (! %Row);
+ my $student_id = $row->[&Apache::loncoursedata::RD_student_id()];
+ $students[$tries]->{$student_id}++;
while (my ($foilid,$href) = each(%Row)) {
if (! ref($href)) {
$Trydata{$foilid}->[$tries] += $href;
@@ -599,6 +1489,9 @@ sub OR_analyze_by_tries {
}
}
}
+ for (my $try=$mintries;$try<=$maxtries;$try++) {
+ $Trydata{'_studentcount'}->[$try] = scalar(keys(%{$students[$try]}));
+ }
return %Trydata;
}
@@ -608,19 +1501,24 @@ 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')) {
- $table = ''.
- &mt('Not enough data for concept analysis. '.
- 'Performing Foil Analysis').
- ' '.$table;
- $ENV{'form.AnalyzeAs'} = 'Foils';
- }
- my $num_plots = $ENV{'form.NumPlots'};
- my $num_data = scalar(@$PerformanceData)-1;
- my $percent = sprintf('%2f',100/$num_plots);
+ 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 instead.').
+ '
'.
+ $table;
+ }
#
+ my $num_plots = $env{'form.NumPlots'};
+ my $num_data = scalar(@$performance_data)-1;
+ #
+ my $current_index;
$table .= "\n";
for (my $i=0;$i<$num_plots;$i++) {
##
@@ -630,16 +1528,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 ($sday,$smon,$syear);
- (undef,undef,undef,$sday,$smon,$syear) =
- localtime($last_sub_time - $sec_in_day*$i);
+ my $last_sub_time = &get_time_from_row($performance_data->[-1]);
+ my ($sday,$smon,$syear) =
+ (localtime($last_sub_time - $sec_in_day*$i))[3..5];
$starttime = &Time::Local::timelocal(0,0,0,$sday,$smon,$syear);
$endtime = $starttime + $sec_in_day;
if ($i == ($num_plots -1 )) {
- $starttime = &get_time_from_row($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
@@ -648,585 +1550,197 @@ 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;
##
- my $interval = {
- begin_index => $begin_index,
- end_index => $end_index,
- startdateform => $startdateform,
- enddateform => $enddateform,
- };
- if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
- $table .= &OR_Foil_Time_Analysis($PerformanceData,$ORdata,$Foils,
- $interval);
- } else {
- $table .= &OR_Concept_Time_Analysis($PerformanceData,$ORdata,
- $Concepts,$interval);
- }
+ my ($processed_time_data,$correct,$data_count,$student_count) =
+ &OR_time_process_data($performance_data,$begin_index,$end_index);
+ $correct |= 0;
+ ##
+ $table .= ''.
+ &mt('[quant,_1,submission,submissions,No submissions] from [quant,_2,student], [_3] correct, [_4] incorrect',
+ $data_count,$student_count,$correct,$data_count-$correct).
+ ' '.$/;
+ my $concept_correct_plot = '';
+ if ($num_concepts > 1) {
+ $concept_correct_plot =
+ &OR_Concept_Time_Analysis($processed_time_data,
+ $correct,$data_count,$student_count,
+ $ORdata,$Concepts);
+ }
+ my ($foil_correct_plot,$foil_incorrect_plot) =
+ &OR_Foil_Time_Analysis($processed_time_data,
+ $correct,$data_count,$student_count,
+ $ORdata,$Foils,$Concepts);
+ $table .= ''.
+ ''.$concept_correct_plot.' '.
+ ''.$foil_correct_plot.' '.
+ ''.$foil_incorrect_plot.' '.
+ ''.$foilkey.' '.$/;
+ $table .= ''.
+ &mt('Start time: [_1]',$startdateform).' '.
+ &mt('End time: [_1]',$enddateform).' '.$/;
+ $table.= ' '.$/;
}
+ $table .= '
';
#
return $table;
}
sub OR_Foil_Time_Analysis {
- my ($PerformanceData,$ORdata,$Foils,$interval) = @_;
+ my ($processed_time_data,$correct,$data_count,$student_count,
+ $ORdata,$Foils,$Concepts) = @_;
+ if ($data_count <= 0) {
+ return (''
+ .&mt('There is no data to plot.')
+ .'
'
+ ,''
+ );
+ }
my $analysis_html;
- my $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];
- next if (! defined($row));
- my %Row = &Process_OR_Row($row);
- while (my ($foilid,$href) = each(%Row)) {
- if (! ref($href)) {
- $TimeData{$foilid} += $href;
- next;
+ my @plotdata;
+ my @labels;
+ foreach my $concept (@{$Concepts}) {
+ foreach my $foil (@{$concept->{'foils'}}) {
+ push(@labels,scalar(@labels)+1);
+ my $total = $processed_time_data->{$foil}->{'_total'};
+ if ($total == 0) {
+ push(@{$plotdata[0]},0);
+ } else {
+ push(@{$plotdata[0]},
+ 100 * $processed_time_data->{$foil}->{'_correct'} / $total);
}
- while (my ($option,$value) = each(%$href)) {
- $TimeData{$foilid}->{$option}+=$value;
+ my $total_incorrect = $total - $processed_time_data->{$foil}->{'_correct'};
+ for (my $i=0;$i{'_Options'}});$i++) {
+ my $option = $ORdata->{'_Options'}->[$i];
+ if ($total_incorrect == 0) {
+ push(@{$plotdata[$i+1]},0);
+ } else {
+ push(@{$plotdata[$i+1]},
+ 100 * $processed_time_data->{$foil}->{$option} / $total_incorrect);
+ }
}
}
- }
- 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);
- } else {
- push(@{$Plotdata[$optionidx]},
- 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;
- my $title;
- if ($count == 0) {
- $title = 'no submissions';
- } elsif ($count == 1) {
- $title = 'one submission';
- } else {
- $title = $count.' submissions';
- }
- my $correctplot = &Apache::loncommon::DrawBarGraph($title,
- 'Foil Number',
- 'Percent Correct',
- 100,
- $plotcolors,
- $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 == 1) {
- $title = 'one submission';
- } else {
- $title = $count.' submissions';
- }
- my $incorrectplot = &Apache::loncommon::DrawBarGraph($title,
- 'Foil Number',
- 'Incorrect Option Choice',
- 100,
- $plotcolors,
- @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;
+ my %lt = &Apache::lonlocal::texthash(
+ 'title' => 'Correct Statements',
+ 'xlabel' => 'Statement Number',
+ 'ylabel' => 'Percent Correct');
+ my $correct_plot = &Apache::loncommon::DrawBarGraph($lt{'title'},
+ $lt{'xlabel'},
+ $lt{'ylabel'},
+ 100,
+ $plotcolors,
+ undef,
+ $plotdata[0],
+ {xskip=>1});
+ for (my $j=0; $j< scalar(@{$plotdata[0]});$j++) {
+ $plotdata[0]->[$j]=0;
+ }
+ %lt = &Apache::lonlocal::texthash(
+ 'title' => 'Incorrect Statements',
+ 'xlabel' => 'Statement Number',
+ 'ylabel' => 'Incorrect Option Choice');
+ my $incorrect_plot =
+ &Apache::loncommon::DrawBarGraph($lt{'title'},
+ $lt{'xlabel'},
+ $lt{'ylabel'},
+ 100,
+ $plotcolors,
+ undef,
+ @plotdata,{xskip=>1});
+ return ($correct_plot,$incorrect_plot);
}
sub OR_Concept_Time_Analysis {
- my ($PerformanceData,$ORdata,$Concepts,$interval) = @_;
- my $analysis_html;
- ##
- ## Determine starttime, endtime, startindex, endindex
- my ($begin_index,$end_index) = ($interval->{'begin_index'},
- $interval->{'end_index'});
- my %TimeData;
- #
- # Compute the number getting the foils correct or incorrects
- for (my $j=$begin_index;$j<=$end_index;$j++) {
- my $row = $PerformanceData->[$j];
- next if (! defined($row));
- my %Row = &Process_OR_Row($row);
- while (my ($foilid,$href) = each(%Row)) {
- if (! ref($href)) {
- $TimeData{$foilid} += $href;
- next;
- }
- while (my ($option,$value) = each(%$href)) {
- $TimeData{$foilid}->{$option}+=$value;
- }
- }
- }
+ my ($processed_time_data,$correct,$data_count,$student_count,
+ $ORdata,$Concepts) = @_;
+ return '' if ($data_count == 0);
#
# Put the data in plottable form
- my @Plotdata;
+ my @plotdata;
foreach my $concept (@$Concepts) {
my ($total,$correct);
foreach my $foil (@{$concept->{'foils'}}) {
- $total += $TimeData{$foil}->{'_total'};
- $correct += $TimeData{$foil}->{'_correct'};
+ $total += $processed_time_data->{$foil}->{'_total'};
+ $correct += $processed_time_data->{$foil}->{'_correct'};
}
if ($total == 0) {
- push(@Plotdata,0);
+ 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,
- \@Plotdata);
- $analysis_html.=''.
- ''.$correctplot.' '.
- ''.
- 'Start Time : '.$interval->{'startdateform'}.' '.
- 'End Time : '.
- ' '.$interval->{'enddateform'}.' '.
-# 'Plot Title :'.(" "x3).
-# $interval->{'titleform'}.
- ' '.
- " \n";
- return $analysis_html;
-}
-
-#########################################################
-#########################################################
-##
-## Excel output
-##
-#########################################################
-#########################################################
-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").
- '
');
+ my %lt = &Apache::lonlocal::texthash(
+ 'title' => 'Correct Concepts',
+ 'xlabel' => 'Concept Number',
+ 'ylabel' => 'Percent Correct');
+ return &Apache::loncommon::DrawBarGraph($lt{'title'},
+ $lt{'xlabel'},
+ $lt{'ylabel'},
+ 100,
+ $plotcolors,
+ undef,
+ \@plotdata,{xskip=>1});
+}
+
+sub OR_time_process_data {
+ my ($performance_data,$begin_index,$end_index)=@_;
+ my %processed_time_data;
+ my %distinct_students;
+ my ($correct,$data_count);
+ if (($begin_index == $end_index) &&
+ ($end_index != scalar(@$performance_data)-1)) {
return undef;
}
- #
- $workbook->set_tempdir('/home/httpd/perl/tmp');
- #
- # 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');
- #
- # Create and populate main worksheets
- my $problem_data_sheet = $workbook->addworksheet('Problem Data');
- my $student_data_sheet = $workbook->addworksheet('Student Data');
- 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_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,
- $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_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 $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++,
- &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'});
+ # Be sure we include the last one if we are asked for it.
+ # That we have to correct here (and not when $end_index is
+ # given a value) should probably be considered a bug.
+ if ($end_index == scalar(@$performance_data)-1) {
+ $end_index++;
+ }
+ my $count;
+ for (my $i=$begin_index;$i<$end_index;$i++) {
+ my $attempt = $performance_data->[$i];
+ $count++;
+ next if (! defined($attempt));
+ my %attempt = &Process_OR_Row($attempt);
+ $data_count++;
+ $correct += $attempt{'_correct'};
+ $distinct_students{$attempt->[&Apache::loncoursedata::RD_student_id()]}++;
+ while (my ($foilid,$href) = each(%attempt)) {
+ if (! ref($href)) {
+ $processed_time_data{$foilid} += $href;
+ next;
+ }
+ while (my ($option,$value) = each(%$href)) {
+ $processed_time_data{$foilid}->{$option}+=$value;
+ }
}
- $rows_output++;
- $cols_output = 0;
}
- return;
-}
-
-
-##
-## 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;
+ return (\%processed_time_data,$correct,$data_count,
+ scalar(keys(%distinct_students)));
}
sub build_foil_index {
@@ -1257,15 +1771,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;
@@ -1280,23 +1794,23 @@ sub build_foil_index {
}
#
# Build up the table of row labels.
- my $table = ''."\n";
+ my $table = &Apache::loncommon::start_data_table();
if (@Concepts > 1) {
- $table .= ''.
+ $table .= &Apache::loncommon::start_data_table_header_row().
''.&mt('Concept Number').' '.
''.&mt('Concept').' '.
''.&mt('Foil Number').' '.
''.&mt('Foil Name').' '.
''.&mt('Foil Text').' '.
''.&mt('Correct Value').' '.
- " \n";
+ &Apache::loncommon::end_data_table_header_row();
} else {
- $table .= ''.
+ $table .= &Apache::loncommon::start_data_table_header_row().
''.&mt('Foil Number').' '.
''.&mt('Foil Name').' '.
''.&mt('Foil Text').' '.
''.&mt('Correct Value').' '.
- " \n";
+ &Apache::loncommon::end_data_table_header_row();
}
my $conceptindex = 1;
my $foilindex = 1;
@@ -1304,39 +1818,39 @@ sub build_foil_index {
my @FoilsInConcept = @{$concept->{'foils'}};
my $firstfoil = shift(@FoilsInConcept);
if (@Concepts > 1) {
- $table .= ''.
+ $table .= &Apache::loncommon::start_data_table_row().
''.$conceptindex.' '.
- ''.$concept->{'name'}.' '.
+ ''.&HTML::Entities::encode($concept->{'name'},'<>&"').' '.
''.$foilindex++.' '.
- ''.$Foildata{$firstfoil}->{'name'}.' '.
+ ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').' '.
''.$Foildata{$firstfoil}->{'text'}.' '.
- ''.$Foildata{$firstfoil}->{'value'}.' '.
- " \n";
+ ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'},'<>&"').' '.
+ &Apache::loncommon::end_data_table_row();
} else {
- $table .= ''.
+ $table .= &Apache::loncommon::start_data_table_row().
''.$foilindex++.' '.
- ''.$Foildata{$firstfoil}->{'name'}.' '.
+ ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').' '.
''.$Foildata{$firstfoil}->{'text'}.' '.
- ''.$Foildata{$firstfoil}->{'value'}.' '.
- " \n";
+ ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'},'<>&"').' '.
+ &Apache::loncommon::end_data_table_row();
}
foreach my $foilid (@FoilsInConcept) {
if (@Concepts > 1) {
- $table .= ''.
+ $table .= &Apache::loncommon::start_data_table_row().
' '.
' '.
''.$foilindex.' '.
- ''.$Foildata{$foilid}->{'name'}.' '.
+ ''.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').' '.
''.$Foildata{$foilid}->{'text'}.' '.
- ''.$Foildata{$foilid}->{'value'}.' '.
- " \n";
+ ''.&HTML::Entities::encode($Foildata{$foilid}->{'value'},'<>&"').' '.
+ &Apache::loncommon::end_data_table_row();
} else {
- $table .= ''.
+ $table .= &Apache::loncommon::start_data_table_row().
''.$foilindex.' '.
- ''.$Foildata{$foilid}->{'name'}.' '.
+ ''.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').' '.
''.$Foildata{$foilid}->{'text'}.' '.
- ''.$Foildata{$foilid}->{'value'}.' '.
- " \n";
+ ''.&HTML::Entities::encode($Foildata{$foilid}->{'value'},'<>&"').' '.
+ &Apache::loncommon::end_data_table_row();
}
} continue {
$foilindex++;
@@ -1344,7 +1858,7 @@ sub build_foil_index {
} continue {
$conceptindex++;
}
- $table .= "
\n";
+ $table .= &Apache::loncommon::end_data_table();
#
# Build option index with color stuff
return ($table,\@Foils,\@Concepts);
@@ -1356,11 +1870,12 @@ sub build_option_index {
my $optionindex = 0;
my @Rows;
foreach my $option (&mt('correct option chosen'),@{$ORdata->{'_Options'}}) {
+ my $color = $plotcolors->[$optionindex++];
push (@Rows,
''.
- ''.
- (' 'x4).' '.
- ''.$option.' '.
+ ''.
+ ''.('*'x3).' '.' '.
+ ''.&HTML::Entities::encode($option,'<>&"').' '.
" \n");
}
shift(@Rows); # Throw away 'correct option chosen' color
@@ -1368,6 +1883,27 @@ sub build_option_index {
$table .= "
\n";
}
+sub build_foil_key {
+ my ($foils,$extra_data)= @_;
+ if (! defined($extra_data)) { $extra_data = {}; }
+ my $table = "
\n";
+ my $foil_index = 0;
+ my @rows;
+ foreach my $foil (&mt('correct foil chosen'),@{$foils}) {
+ my $color = $plotcolors->[$foil_index++];
+ push (@rows,
+ ''.
+ ''.
+ ''.('*'x4).' '.
+ ''.&HTML::Entities::encode($foil,'<>&"').
+ (' 'x2).$extra_data->{$foil}.' '.
+ " \n");
+ }
+ shift(@rows); # Throw away 'correct foil chosen' color
+ $table .= join('',reverse(@rows));
+ $table .= "
\n";
+}
+
#########################################################
#########################################################
##
@@ -1378,282 +1914,99 @@ sub build_option_index {
sub CreateInterface {
##
## Environment variable initialization
- if (! exists$ENV{'form.AnalyzeOver'}) {
- $ENV{'form.AnalyzeOver'} = 'Tries';
+ if (! exists($env{'form.AnalyzeOver'})) {
+ $env{'form.AnalyzeOver'} = 'tries';
}
##
## Build the menu
my $Str = '';
- $Str .= '
'."\n";
- $Str .= '';
- $Str .= ''.&mt('Sections').' ';
- $Str .= ''.&mt('Enrollment Status').' ';
-# $Str .= ''.&mt('Sequences and Folders').' ';
- $Str .= ' ';
- $Str .= ' '."\n";
+ $Str .= '';
+ $Str .= &Apache::loncommon::start_data_table();
+ $Str .= &Apache::loncommon::start_data_table_header_row();
+ $Str .= '
'.&mt('Sections').' ';
+ $Str .= ''.&mt('Groups').' ';
+ $Str .= ''.&mt('Access Status').' ';
+ $Str .= ''.&mt('Options').' ';
+ $Str .= &Apache::loncommon::end_data_table_header_row();
##
##
- $Str .= ''."\n";
+ $Str .= &Apache::loncommon::start_data_table_row();
+ $Str .= ' '."\n";
$Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5);
$Str .= ' ';
#
+ $Str .= ''."\n";
+ $Str .= &Apache::lonstatistics::GroupSelect('Group','multiple',5);
+ $Str .= ' ';
+ #
$Str .= '';
$Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5);
$Str .= ' ';
#
-# $Str .= '';
- my $only_seq_with_assessments = sub {
- my $s=shift;
- if ($s->{'num_assess'} < 1) {
- return 0;
- } else {
- return 1;
- }
- };
- &Apache::lonstatistics::MapSelect('Maps','multiple,all',5,
- $only_seq_with_assessments);
##
##
- $Str .= ' ';
- { # 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 .= ' ';
- }
- }
+ $Str .= ' ';
+ ##
+ my $showprob_checkbox =
+ ' ';
+ $Str.= ''.
+ $showprob_checkbox.' '.&mt('Show problem').
+ ' ';
+ ##
+ 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 .= ' ';
##
##
- $Str .= ' '."\n";
- $Str .= '
'."\n";
- return $Str;
-}
-
-sub ProblemSelector {
- my $Str;
- $Str = "\n
\n";
+ $Str .= &Apache::loncommon::end_data_table_row();
+ $Str .= &Apache::loncommon::end_data_table();
+ $Str .= '
'
+ .&mt('Status: [_1]',
+ ' ')
+ .'
';
+ $Str .= '';
return $Str;
}
#########################################################
#########################################################
##
-## Misc functions
-##
-#########################################################
-#########################################################
-sub get_problem_symb {
- my $problemstring = shift();
- my ($symb,$partid,$respid,$resptype) = split(':',$problemstring);
- return ({ symb => $symb,
- part => $partid,
- respid => $respid,
- type => $resptype } );
-}
-
-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_prev_curr_next {
- my ($target) = @_;
- #
- # Build an array with the data we need to search through
- my @Resource;
- foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
- foreach my $res (@{$seq->{'contents'}}) {
- next if ($res->{'type'} ne 'assessment');
- foreach my $part (@{$res->{'parts'}}) {
- my $partdata = $res->{'partdata'}->{$part};
- for (my $i=0;$i
{'ResponseTypes'}});$i++){
- my $respid = $partdata->{'ResponseIds'}->[$i];
- my $resptype = $partdata->{'ResponseTypes'}->[$i];
- next if ($resptype ne 'option' &&
- $resptype ne 'radiobutton');
- push (@Resource,
- { symb => $res->{symb},
- part => $part,
- respid => $partdata->{'ResponseIds'}->[$i],
- resource => $res,
- resptype => $resptype
- } );
- }
- }
- }
- }
- #
- #
- # Get the index of the current situation
- my $curr_idx;
- for ($curr_idx=0;$curr_idx<$#Resource;$curr_idx++) {
- my $curr_item = $Resource[$curr_idx];
- last if ($curr_item->{'symb'} eq $target->{'symb'} &&
- $curr_item->{'part'} eq $target->{'part'} &&
- $curr_item->{'respid'} eq $target->{'respid'} &&
- $curr_item->{'resptype'} eq $target->{'resptype'});
- }
- my $curr_item = $Resource[$curr_idx];
- if ($curr_item->{'symb'} ne $target->{'symb'} ||
- $curr_item->{'part'} ne $target->{'part'} ||
- $curr_item->{'respid'} ne $target->{'respid'} ||
- $curr_item->{'resptype'} ne $target->{'resptype'}){
- # bogus symb - return nothing
- return (undef,undef,undef);
- }
- #
- # Now just pick up the data we need
- my ($prev,$curr,$next);
- if ($curr_idx == 0) {
- $prev = undef;
- $curr = $Resource[$curr_idx ];
- $next = $Resource[$curr_idx+1];
- } elsif ($curr_idx == $#Resource) {
- $prev = $Resource[$curr_idx-1];
- $curr = $Resource[$curr_idx ];
- $next = undef;
- } else {
- $prev = $Resource[$curr_idx-1];
- $curr = $Resource[$curr_idx ];
- $next = $Resource[$curr_idx+1];
- }
- return ($prev,$curr,$next);
-}
-
-sub make_target_id {
- my ($target) = @_;
- my $id = &Apache::lonnet::escape($target->{'symb'}).':'.
- &Apache::lonnet::escape($target->{'part'}).':'.
- &Apache::lonnet::escape($target->{'respid'}).':'.
- &Apache::lonnet::escape($target->{'resptype'});
- return $id;
-}
-
-sub get_target_from_id {
- my ($id) = @_;
- my ($symb,$part,$respid,$resptype) = split(':',$id);
- return ({ symb =>&Apache::lonnet::unescape($symb),
- part =>&Apache::lonnet::unescape($part),
- respid =>&Apache::lonnet::unescape($respid),
- resptype =>&Apache::lonnet::unescape($resptype)});
-}
-
-#########################################################
-#########################################################
-##
## Misc Option Response functions
##
#########################################################
@@ -1677,8 +2030,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'} = &unescape($row->[&Apache::loncoursedata::RD_submission()]);
$attempt{'award'} = $row->[&Apache::loncoursedata::RD_awarddetail()];
$attempt{'timestamp'} = $row->[&Apache::loncoursedata::RD_timestamp()];
return %attempt;
@@ -1687,14 +2041,14 @@ sub hashify_attempt {
sub Process_OR_Row {
my ($row) = @_;
my %RowData;
- my $student_id = $row->[&Apache::loncoursedata::RD_student_id()];
+# my $student_id = $row->[&Apache::loncoursedata::RD_student_id()];
my $award = $row->[&Apache::loncoursedata::RD_awarddetail()];
my $grading = $row->[&Apache::loncoursedata::RD_response_eval()];
my $submission = $row->[&Apache::loncoursedata::RD_submission()];
my $time = $row->[&Apache::loncoursedata::RD_timestamp()];
- my $tries = $row->[&Apache::loncoursedata::RD_tries()];
+# my $tries = $row->[&Apache::loncoursedata::RD_tries()];
return undef if ($award eq 'MISSING_ANSWER');
- if ($award =~ /(APPROX_ANS|EXACT_ANS)/) {
+ if (&submission_is_correct($award)) {
$RowData{'_correct'} = 1;
}
$RowData{'_total'} = 1;
@@ -1702,12 +2056,12 @@ sub Process_OR_Row {
my @Foilsubs = split('&',$submission);
for (my $j=0;$j<=$#Foilgrades;$j++) {
my ($foilid,$correct) = split('=',$Foilgrades[$j]);
- $foilid = &Apache::lonnet::unescape($foilid);
+ $foilid = &unescape($foilid);
my (undef,$submission) = split('=',$Foilsubs[$j]);
if ($correct) {
$RowData{$foilid}->{'_correct'}++;
} else {
- $submission = &Apache::lonnet::unescape($submission);
+ $submission = &unescape($submission);
$RowData{$foilid}->{$submission}++;
}
$RowData{$foilid}->{'_total'}++;
@@ -1715,58 +2069,15 @@ sub Process_OR_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;
- $value =~ s/(\s*$|^\s*)//g;
- $Partdata{$part}->{'_Foils'}->{$foil}->{'text'}=$value;
- } elsif ($key =~ /^foil\.value\.(.*)$/) {
- my $foil = $1;
- $Partdata{$part}->{'_Foils'}->{$foil}->{'value'}=$value;
- }
- }
- }
+sub submission_is_correct {
+ my ($award) = @_;
+ if ($award =~ /(APPROX_ANS|EXACT_ANS)/) {
+ return 1;
+ } else {
+ return 0;
}
- return %Partdata;
}
1;
__END__
-
-#####
-# partdata{part}->{_Foils}->{foilid}->{'name'} = $
-# ->{'text'} = $
-# ->{'value'} = $
-# ->{'_Concept'} = $
-# partdata{part}->{_Options} = @
-# partdata{part}->{_Concepts} = @