{'_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 $correct_plot = &Apache::loncommon::DrawBarGraph('Correct Statements',
+ 'Statement Number',
+ 'Percent Correct',
+ 100,
+ $plotcolors,
+ undef,
+ $plotdata[0]);
+ for (my $j=0; $j< scalar(@{$plotdata[0]});$j++) {
+ $plotdata[0]->[$j]=0;
+ }
+ my $incorrect_plot =
+ &Apache::loncommon::DrawBarGraph('Incorrect Statements',
+ 'Statement Number',
+ 'Incorrect Option Choice',
+ 100,
+ $plotcolors,
+ undef,
+ @plotdata);
+ 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;
+ return &Apache::loncommon::DrawBarGraph('Correct Concepts',
+ 'Concept Number',
+ 'Percent Correct',
+ 100,
+ $plotcolors,
+ undef,
+ \@plotdata);
+}
+
+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;
+ }
+ # 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;
+ }
+ }
+ }
+ return (\%processed_time_data,$correct,$data_count,
+ scalar(keys(%distinct_students)));
}
#########################################################
@@ -840,7 +1264,7 @@ sub OR_Concept_Time_Analysis {
#########################################################
#########################################################
sub OR_excel_sheet {
- my ($r,$resource,$PerformanceData,$ORdata) = @_;
+ my ($r,$resource,$performance_data,$ORdata) = @_;
my $response = '';
my (undef,$Foils,$Concepts) = &build_foil_index($ORdata);
#
@@ -859,22 +1283,11 @@ sub OR_excel_sheet {
}
#
$workbook->set_tempdir('/home/httpd/perl/tmp');
- #
- # Define some potentially useful formats
- my $format;
- $format->{'header'} = $workbook->add_format(bold => 1,
- bottom => 1,
- align => 'center');
- $format->{'bold'} = $workbook->add_format(bold=>1);
- $format->{'h1'} = $workbook->add_format(bold=>1, size=>18);
- $format->{'h2'} = $workbook->add_format(bold=>1, size=>16);
- $format->{'h3'} = $workbook->add_format(bold=>1, size=>14);
- $format->{'date'} = $workbook->add_format(num_format=>
- 'mmm d yyyy hh:mm AM/PM');
+ my $format = &Apache::loncommon::define_excel_formats($workbook);
#
# Create and populate main worksheets
my $problem_data_sheet = $workbook->addworksheet('Problem Data');
- my $student_data_sheet = $workbook->addworksheet('Student Data');
+ my $student_data_sheet = &build_student_data_worksheet($workbook,$format);
my $response_data_sheet = $workbook->addworksheet('Response Data');
foreach my $sheet ($problem_data_sheet,$student_data_sheet,
$response_data_sheet) {
@@ -888,12 +1301,8 @@ sub OR_excel_sheet {
if ($result ne 'okay') {
# Do something useful
}
- $result = &OR_build_student_data_worksheet($student_data_sheet,$format);
- if ($result ne 'okay') {
- # Do something useful
- }
$result = &OR_build_response_data_worksheet($response_data_sheet,$format,
- $PerformanceData,$Foils,
+ $performance_data,$Foils,
$ORdata);
if ($result ne 'okay') {
# Do something useful
@@ -980,34 +1389,8 @@ sub OR_build_problem_data_worksheet {
return 'okay';
}
-sub OR_build_student_data_worksheet {
- my ($worksheet,$format) = @_;
- my $rows_output = 3;
- my $cols_output = 0;
- $worksheet->write($rows_output++,0,'Student Data',$format->{'h3'});
- my @Headers = ('full name','username','domain','section',
- "student\nnumber",'identifier');
- $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'});
- my @Students = @Apache::lonstatistics::Students;
- my $studentrows = &Apache::loncoursedata::get_student_data(\@Students);
- my %ids;
- foreach my $row (@$studentrows) {
- my ($mysqlid,$student) = @$row;
- $ids{$student}=$mysqlid;
- }
- foreach my $student (@Students) {
- my $name_domain = $student->{'username'}.':'.$student->{'domain'};
- $worksheet->write_row($rows_output++,0,
- [$student->{'fullname'},
- $student->{'username'},$student->{'domain'},
- $student->{'section'},$student->{'id'},
- $ids{$name_domain}]);
- }
- return;
-}
-
sub OR_build_response_data_worksheet {
- my ($worksheet,$format,$PerformanceData,$Foils,$ORdata)=@_;
+ my ($worksheet,$format,$performance_data,$Foils,$ORdata)=@_;
my $rows_output = 3;
my $cols_output = 0;
$worksheet->write($rows_output++,0,'Response Data',$format->{'h3'});
@@ -1020,29 +1403,29 @@ sub OR_build_response_data_worksheet {
}
$worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'});
#
- foreach my $row (@$PerformanceData) {
+ foreach my $row (@$performance_data) {
next if (! defined($row));
my ($student,$award,$grading,$submission,$time,$tries) = @$row;
my @Foilgrades = split('&',$grading);
my @Foilsubs = split('&',$submission);
- my %ResponseData;
+ my %response_data;
for (my $j=0;$j<=$#Foilgrades;$j++) {
my ($foilid,$correct) = split('=',$Foilgrades[$j]);
my (undef,$submission) = split('=',$Foilsubs[$j]);
$submission = &Apache::lonnet::unescape($submission);
- $ResponseData{$foilid.' submission'}=$submission;
- $ResponseData{$foilid.' award'}=$correct;
+ $response_data{$foilid.' submission'}=$submission;
+ $response_data{$foilid.' award'}=$correct;
}
$worksheet->write($rows_output,$cols_output++,$student);
$worksheet->write($rows_output,$cols_output++,
- &calc_serial($time),$format->{'date'});
+ &Apache::lonstathelpers::calc_serial($time),$format->{'date'});
$worksheet->write($rows_output,$cols_output++,$award);
$worksheet->write($rows_output,$cols_output++,$tries);
foreach my $foilid (@$Foils) {
$worksheet->write($rows_output,$cols_output++,
- $ResponseData{$foilid.' submission'});
+ $response_data{$foilid.' submission'});
$worksheet->write($rows_output,$cols_output++,
- $ResponseData{$foilid.' award'});
+ $response_data{$foilid.' award'});
}
$rows_output++;
$cols_output = 0;
@@ -1050,185 +1433,6 @@ sub OR_build_response_data_worksheet {
return;
}
-
-##
-## The following is copied from datecalc1.pl, part of the
-## Spreadsheet::WriteExcel CPAN module.
-##
-##
-######################################################################
-#
-# Demonstration of writing date/time cells to Excel spreadsheets,
-# using UNIX/Perl time as source of date/time.
-#
-# Copyright 2000, Andrew Benham, adsb@bigfoot.com
-#
-######################################################################
-#
-# UNIX/Perl time is the time since the Epoch (00:00:00 GMT, 1 Jan 1970)
-# measured in seconds.
-#
-# An Excel file can use exactly one of two different date/time systems.
-# In these systems, a floating point number represents the number of days
-# (and fractional parts of the day) since a start point. The floating point
-# number is referred to as a 'serial'.
-# The two systems ('1900' and '1904') use different starting points:
-# '1900'; '1.00' is 1 Jan 1900 BUT 1900 is erroneously regarded as
-# a leap year - see:
-# http://support.microsoft.com/support/kb/articles/Q181/3/70.asp
-# for the excuse^H^H^H^H^H^Hreason.
-# '1904'; '1.00' is 2 Jan 1904.
-#
-# The '1904' system is the default for Apple Macs. Windows versions of
-# Excel have the option to use the '1904' system.
-#
-# Note that Visual Basic's "DateSerial" function does NOT erroneously
-# regard 1900 as a leap year, and thus its serials do not agree with
-# the 1900 serials of Excel for dates before 1 Mar 1900.
-#
-# Note that StarOffice (at least at version 5.2) does NOT erroneously
-# regard 1900 as a leap year, and thus its serials do not agree with
-# the 1900 serials of Excel for dates before 1 Mar 1900.
-#
-######################################################################
-#
-# Calculation description
-# =======================
-#
-# 1900 system
-# -----------
-# Unix time is '0' at 00:00:00 GMT 1 Jan 1970, i.e. 70 years after 1 Jan 1900.
-# Of those 70 years, 17 (1904,08,12,16,20,24,28,32,36,40,44,48,52,56,60,64,68)
-# were leap years with an extra day.
-# Thus there were 17 + 70*365 days = 25567 days between 1 Jan 1900 and
-# 1 Jan 1970.
-# In the 1900 system, '1' is 1 Jan 1900, but as 1900 was not a leap year
-# 1 Jan 1900 should really be '2', so 1 Jan 1970 is '25569'.
-#
-# 1904 system
-# -----------
-# Unix time is '0' at 00:00:00 GMT 1 Jan 1970, i.e. 66 years after 1 Jan 1904.
-# Of those 66 years, 17 (1904,08,12,16,20,24,28,32,36,40,44,48,52,56,60,64,68)
-# were leap years with an extra day.
-# Thus there were 17 + 66*365 days = 24107 days between 1 Jan 1904 and
-# 1 Jan 1970.
-# In the 1904 system, 2 Jan 1904 being '1', 1 Jan 1970 is '24107'.
-#
-######################################################################
-#
-# Copyright (c) 2000, Andrew Benham.
-# This program is free software. It may be used, redistributed and/or
-# modified under the same terms as Perl itself.
-#
-# Andrew Benham, adsb@bigfoot.com
-# London, United Kingdom
-# 11 Nov 2000
-#
-######################################################################
-
-# Use 1900 date system on all platforms other than Apple Mac (for which
-# use 1904 date system).
-my $DATE_SYSTEM = ($^O eq 'MacOS') ? 1 : 0;
-
-#-----------------------------------------------------------
-# calc_serial()
-#
-# Called with (up to) 2 parameters.
-# 1. Unix timestamp. If omitted, uses current time.
-# 2. GMT flag. Set to '1' to return serial in GMT.
-# If omitted, returns serial in appropriate timezone.
-#
-# Returns date/time serial according to $DATE_SYSTEM selected
-#-----------------------------------------------------------
-sub calc_serial {
- my $time = (defined $_[0]) ? $_[0] : time();
- my $gmtflag = (defined $_[1]) ? $_[1] : 0;
-
- # Divide timestamp by number of seconds in a day.
- # This gives a date serial with '0' on 1 Jan 1970.
- my $serial = $time / 86400;
-
- # Adjust the date serial by the offset appropriate to the
- # currently selected system (1900/1904).
- if ($DATE_SYSTEM == 0) { # use 1900 system
- $serial += 25569;
- } else { # use 1904 system
- $serial += 24107;
- }
-
- unless ($gmtflag) {
- # Now have a 'raw' serial with the right offset. But this
- # gives a serial in GMT, which is false unless the timezone
- # is GMT. We need to adjust the serial by the appropriate
- # timezone offset.
- # Calculate the appropriate timezone offset by seeing what
- # the differences between localtime and gmtime for the given
- # time are.
-
- my @gmtime = gmtime($time);
- my @ltime = localtime($time);
-
- # For the first 7 elements of the two arrays, adjust the
- # date serial where the elements differ.
- for (0 .. 6) {
- my $diff = $ltime[$_] - $gmtime[$_];
- if ($diff) {
- $serial += _adjustment($diff,$_);
- }
- }
- }
-
- # Perpetuate the error that 1900 was a leap year by decrementing
- # the serial if we're using the 1900 system and the date is prior to
- # 1 Mar 1900. This has the effect of making serial value '60'
- # 29 Feb 1900.
-
- # This fix only has any effect if UNIX/Perl time on the platform
- # can represent 1900. Many can't.
-
- unless ($DATE_SYSTEM) {
- $serial-- if ($serial < 61); # '61' is 1 Mar 1900
- }
- return $serial;
-}
-
-sub _adjustment {
- # Based on the difference in the localtime/gmtime array elements
- # number, return the adjustment required to the serial.
-
- # We only look at some elements of the localtime/gmtime arrays:
- # seconds unlikely to be different as all known timezones
- # have an offset of integral multiples of 15 minutes,
- # but it's easy to do.
- # minutes will be different for timezone offsets which are
- # not an exact number of hours.
- # hours very likely to be different.
- # weekday will differ when localtime/gmtime difference
- # straddles midnight.
- #
- # Assume that difference between localtime and gmtime is less than
- # 5 days, then don't have to do maths for day of month, month number,
- # year number, etc...
-
- my ($delta,$element) = @_;
- my $adjust = 0;
-
- if ($element == 0) { # Seconds
- $adjust = $delta/86400; # 60 * 60 * 24
- } elsif ($element == 1) { # Minutes
- $adjust = $delta/1440; # 60 * 24
- } elsif ($element == 2) { # Hours
- $adjust = $delta/24; # 24
- } elsif ($element == 6) { # Day of week number
- # Catch difference straddling Sat/Sun in either direction
- $delta += 7 if ($delta < -4);
- $delta -= 7 if ($delta > 4);
-
- $adjust = $delta;
- }
- return $adjust;
-}
-
sub build_foil_index {
my ($ORdata) = @_;
return if (! exists($ORdata->{'_Foils'}));
@@ -1257,15 +1461,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;
@@ -1306,18 +1510,18 @@ sub build_foil_index {
if (@Concepts > 1) {
$table .= ''.
'| '.$conceptindex.' | '.
- ''.$concept->{'name'}.' | '.
+ ''.&HTML::Entities::encode($concept->{'name'},'<>&"').' | '.
''.$foilindex++.' | '.
- ''.$Foildata{$firstfoil}->{'name'}.' | '.
+ ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').' | '.
''.$Foildata{$firstfoil}->{'text'}.' | '.
- ''.$Foildata{$firstfoil}->{'value'}.' | '.
+ ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'},'<>&"').' | '.
"
\n";
} else {
$table .= ''.
'| '.$foilindex++.' | '.
- ''.$Foildata{$firstfoil}->{'name'}.' | '.
+ ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').' | '.
''.$Foildata{$firstfoil}->{'text'}.' | '.
- ''.$Foildata{$firstfoil}->{'value'}.' | '.
+ ''.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'},'<>&"').' | '.
"
\n";
}
foreach my $foilid (@FoilsInConcept) {
@@ -1326,16 +1530,16 @@ sub build_foil_index {
' | '.
' | '.
''.$foilindex.' | '.
- ''.$Foildata{$foilid}->{'name'}.' | '.
+ ''.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').' | '.
''.$Foildata{$foilid}->{'text'}.' | '.
- ''.$Foildata{$foilid}->{'value'}.' | '.
+ ''.&HTML::Entities::encode($Foildata{$foilid}->{'value'},'<>&"').' | '.
"\n";
} else {
$table .= ''.
'| '.$foilindex.' | '.
- ''.$Foildata{$foilid}->{'name'}.' | '.
+ ''.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').' | '.
''.$Foildata{$foilid}->{'text'}.' | '.
- ''.$Foildata{$foilid}->{'value'}.' | '.
+ ''.&HTML::Entities::encode($Foildata{$foilid}->{'value'},'<>&"').' | '.
"
\n";
}
} continue {
@@ -1356,11 +1560,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 +1573,27 @@ sub build_option_index {
$table .= "