[LON-CAPA-cvs] cvs: loncom(GCI_3) /interface lonstatistics.pm /interface/statistics lonstathelpers.pm lonstudentsubmissions.pm
raeburn
raeburn@source.lon-capa.org
Sat, 11 Sep 2010 19:08:23 -0000
This is a MIME encoded message
--raeburn1284232103
Content-Type: text/plain
raeburn Sat Sep 11 19:08:23 2010 EDT
Modified files: (Branch: GCI_3)
/loncom/interface lonstatistics.pm
/loncom/interface/statistics lonstudentsubmissions.pm
lonstathelpers.pm
Log:
- Customization for GCI_3.
- Submission data available for GCI questions
with username hashed to preserve anonymity.
--raeburn1284232103
Content-Type: text/plain
Content-Disposition: attachment; filename="raeburn-20100911190823.txt"
Index: loncom/interface/lonstatistics.pm
diff -u loncom/interface/lonstatistics.pm:1.148.2.3 loncom/interface/lonstatistics.pm:1.148.2.4
--- loncom/interface/lonstatistics.pm:1.148.2.3 Mon Jan 11 04:11:52 2010
+++ loncom/interface/lonstatistics.pm Sat Sep 11 19:08:19 2010
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstatistics.pm,v 1.148.2.3 2010/01/11 04:11:52 raeburn Exp $
+# $Id: lonstatistics.pm,v 1.148.2.4 2010/09/11 19:08:19 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -767,7 +767,17 @@
linktext => ('Correct Problems Plot'),
linktitle => ('Display a histogram of student performance in the course.')},
]});
- unless(&Apache::loncommon::needs_gci_custom()) {
+ if (&Apache::loncommon::needs_gci_custom()) {
+ push(@reports,
+ {categorytitle => 'Reports',
+ items => [
+ {url => '/adm/statistics?reportSelected=student_submission_reports',
+ permission => 'F',
+ icon => 'edit-copy.png',
+ linktext => ('Student Submission Reports'),
+ linktitle => ('Prepare reports of student submissions.')},
+ ]});
+ } else {
push(@reports,
{categorytitle => 'Reports',
items => [
@@ -930,11 +940,7 @@
({href=>
'/adm/statistics?reportselected=student_submission_reports',
text=>'Student Submission Reports'});
- if ($gcicustom) {
- $r->print(&mt('Only aggregate performance data are available for Concept Tests.'));
- } else {
- &Apache::lonstudentsubmissions::BuildStudentSubmissionsPage($r,$c);
- }
+ &Apache::lonstudentsubmissions::BuildStudentSubmissionsPage($r,$c);
} elsif($GoToPage eq 'survey_reports') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>
Index: loncom/interface/statistics/lonstudentsubmissions.pm
diff -u loncom/interface/statistics/lonstudentsubmissions.pm:1.54 loncom/interface/statistics/lonstudentsubmissions.pm:1.54.10.1
--- loncom/interface/statistics/lonstudentsubmissions.pm:1.54 Tue Apr 21 13:28:23 2009
+++ loncom/interface/statistics/lonstudentsubmissions.pm Sat Sep 11 19:08:22 2010
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstudentsubmissions.pm,v 1.54 2009/04/21 13:28:23 bisitz Exp $
+# $Id: lonstudentsubmissions.pm,v 1.54.10.1 2010/09/11 19:08:22 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -37,6 +37,7 @@
use HTML::Entities();
use Time::Local();
use Spreadsheet::WriteExcel();
+use Crypt::PasswdMD5;
use lib '/home/httpd/lib/perl/';
use LONCAPA;
@@ -109,17 +110,40 @@
return;
}
my %already_seen;
- my @Problems;
+ my (@Problems,$show_named);
+ unless (&Apache::loncommon::needs_gci_custom()) {
+ $show_named = 1;
+ }
foreach my $symb (@Symbs) {
my $resource = $navmap->getBySymb($symb);
push(@Problems,$resource);
}
+ # If these are to be anonymized, do a random shuffle of @Students.
+ unless ($show_named) {
+ &array_shuffle(\@Students);
+ }
+ my $threshold = $env{'course.'.$env{'request.course.id'}.'.internal.anonsurvey_threshold'};
+ if ($threshold eq '') {
+ my %domconfig =
+ &Apache::lonnet::get_dom('configuration',['coursedefaults'],
+ $env{'course.'.$env{'request.course.id'}.'.domain'});
+ if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
+ $threshold = $domconfig{'coursedefaults'}{'anonsurvey_threshold'};
+ if ($threshold eq '') {
+ $threshold = 10;
+ }
+ } else {
+ $threshold = 10;
+ }
+ }
#
$r->print('<h4>'.
&Apache::lonstatistics::section_and_enrollment_description().
'</h4>');
if (! scalar(@Problems) || ! defined($Problems[0])) {
$r->print('resource is undefined');
+ } elsif (!$show_named && @Students < $threshold) {
+ $r->print(&mt('The number of students matching the selection criteria is too few for display of submission data for anonymous surveys.').'<br />'.&mt('There must be at least [quant,_1,student].',$threshold).' '.&mt('Contact a Domain Coordinator if you need the threshold to be changed for this course.'));
} else {
if (scalar(@Problems) == 1) {
my $resource = $Problems[0];
@@ -131,11 +155,11 @@
}
}
if ($env{'form.output'} eq 'excel') {
- &prepare_excel_output($r,\@Problems,\@Students);
+ &prepare_excel_output($r,\@Problems,\@Students,$show_named);
} elsif ($env{'form.output'} eq 'csv') {
- &prepare_csv_output($r,\@Problems,\@Students);
+ &prepare_csv_output($r,\@Problems,\@Students,$show_named);
} else {
- &prepare_html_output($r,\@Problems,\@Students);
+ &prepare_html_output($r,\@Problems,\@Students,$show_named);
}
}
$r->print('<hr />');
@@ -154,19 +178,37 @@
}
}
+sub array_shuffle {
+ my $array = shift;
+ return unless (ref($array) eq 'ARRAY');
+ my $i = scalar(@$array);
+ my $j;
+ foreach my $item (@$array) {
+ --$i;
+ $j = int(rand($i+1));
+ next if($i == $j);
+ @$array [$i,$j] = @$array[$j,$i];
+ }
+ return @$array;
+}
+
##
## get_extra_response_headers
##
+
sub get_extra_response_headers {
+ my ($show_named) = @_;
my @extra_resp_headers;
if ($env{'form.correctans'} eq 'true') {
push(@extra_resp_headers,'Correct');
- }
- if ($env{'form.prob_status'} eq 'true') {
- push(@extra_resp_headers,'Award Detail');
- push(@extra_resp_headers,'Time');
- push(@extra_resp_headers,'Attempt');
- push(@extra_resp_headers,'Awarded');
+ }
+ if ($show_named) {
+ if ($env{'form.prob_status'} eq 'true') {
+ push(@extra_resp_headers,'Award Detail');
+ push(@extra_resp_headers,'Time');
+ push(@extra_resp_headers,'Attempt');
+ push(@extra_resp_headers,'Awarded');
+ }
}
return @extra_resp_headers;
}
@@ -211,8 +253,9 @@
#########################################################
#########################################################
sub prepare_html_output {
- my ($r,$problems,$students) = @_;
+ my ($r,$problems,$students,$show_named) = @_;
my $c = $r->connection();
+ my $salt = '$1$'.$Apache::lonnet::perlvar{'AnonymousSalt'};
#
# Set a flag for the case when there is just one problem
my $single_response = 0;
@@ -222,10 +265,18 @@
}
#
# Compute the number of columns per response
- my @extra_resp_headers = &get_extra_response_headers();
+ my @extra_resp_headers = &get_extra_response_headers($show_named);
#
# Create the table header
- my @student_columns = ('username','domain','id','section');
+ my @student_columns;
+ if ($show_named) {
+ @student_columns = @Apache::lonstatistics::SelectedStudentData;
+ if (grep(/^all$/,@student_columns)) {
+ @student_columns = qw(fullname username domain id section status groups comments);
+ }
+ } else {
+ @student_columns = ('username');
+ }
#
my %headers;
my $student_column_count = scalar(@student_columns);
@@ -325,9 +376,25 @@
$count = 0;
}
last if ($c->aborted());
- foreach my $field (@student_columns) {
- $student_row_data .=
- '<td valign="top">'.$student->{$field}.'</td>';
+ if ($show_named) {
+ foreach my $field (@student_columns) {
+ $student_row_data .= '<td valign="top">';
+ # handle comments like in lonstudentassessment.pm
+ if($field eq 'comments') {
+ $student_row_data .=
+ '<a href="/adm/'.$student->{'domain'}.'/'.
+ $student->{'username'}.'/'.'aboutme#coursecomment">'.&mt('Comments').'</a>';
+ } else {
+ $student_row_data .= $student->{$field};
+ }
+ $student_row_data .= '</td>';
+ }
+ } else {
+ my $anonid = &Crypt::PasswdMD5::unix_md5_crypt($student->{'username'},
+ $salt);
+ $anonid = substr($anonid,length($salt)+1);
+ $student_row_data = '<td valign="top" colspan="'.$student_column_count.'">'.
+ $anonid.'</td>';
}
#
# Figure out what it is we need to output for this student
@@ -444,6 +511,7 @@
undef(@essays);
}
} # end of student loop
+ $r->print('</table>'.$/);
return;
}
@@ -625,8 +693,9 @@
#########################################################
#########################################################
sub prepare_excel_output {
- my ($r,$Problems,$Students) = @_;
+ my ($r,$Problems,$Students,$show_named) = @_;
my $c = $r->connection();
+ my $salt = '$1$'.$Apache::lonnet::perlvar{'AnonymousSalt'};
#
#
# Determine the number of columns in the spreadsheet
@@ -695,7 +764,16 @@
$worksheet->write($partid_row,0,'Part ID',$format->{'bold'});
$worksheet->write($respid_row,0,'Response ID',$format->{'bold'});
# Student headers
- my @StudentColumns = ('username','domain','id','section');
+ my @StudentColumns;
+ if ($show_named) {
+ @StudentColumns = qw(username domain id section);
+ } else {
+ @StudentColumns = qw(username);
+ }
+ foreach (@StudentColumns) {
+ $worksheet->write($header_row,$cols_output++,ucfirst($_),
+ $format->{'bold'});
+ }
foreach (@StudentColumns) {
$worksheet->write($header_row,$cols_output++,ucfirst($_),
$format->{'bold'});
@@ -742,9 +820,17 @@
last if ($c->aborted());
$cols_output = 0;
my $student_row = $max_row;
+ my $anonid = &Crypt::PasswdMD5::unix_md5_crypt($student->{'username'},
+ $salt);
+ $anonid = substr($anonid,length($salt)+1);
foreach my $field (@StudentColumns) {
- $worksheet->write($student_row,$cols_output++,
- $student->{$field});
+ if ($show_named) {
+ $worksheet->write($student_row,$cols_output++,
+ $student->{$field});
+ } else {
+ $worksheet->write($student_row,$cols_output++,
+ $anonid);
+ }
}
my $last_student_col = $cols_output-1;
foreach my $prob (@$Problems) {
@@ -799,8 +885,13 @@
for (my $row = $student_row+1;$row<$max_row;$row++) {
my $cols = 0;
foreach my $field (@StudentColumns) {
- $worksheet->write($row,$cols++,
- $student->{$field});
+ if ($show_named) {
+ $worksheet->write($row,$cols++,
+ $student->{$field});
+ } else {
+ $worksheet->write($row,$cols++,
+ $anonid);
+ }
}
}
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
@@ -910,8 +1001,9 @@
#########################################################
#########################################################
sub prepare_csv_output {
- my ($r,$problems,$students) = @_;
+ my ($r,$problems,$students,$show_named) = @_;
my $c = $r->connection();
+ my $salt = '$1$'.$Apache::lonnet::perlvar{'AnonymousSalt'};
#
$r->print('<h2>'.
&mt('Generating CSV report of student responses').'</h2>');
@@ -940,10 +1032,15 @@
}
#
# Compute the number of columns per response
- my @extra_resp_headers = &get_extra_response_headers();
+ my @extra_resp_headers = &get_extra_response_headers($show_named);
#
# Create the table header
- my @student_columns = ('username','domain','id','section');
+ my @student_columns;
+ if ($show_named) {
+ @student_columns = qw(username domain id section);
+ } else {
+ @student_columns = qw(username);
+ }
#
my %headers;
push(@{$headers{'student'}},@student_columns);
@@ -992,6 +1089,9 @@
# Main loop
foreach my $student (@$students) {
last if ($c->aborted());
+ my $anonid = &Crypt::PasswdMD5::unix_md5_crypt($student->{'username'},
+ $salt);
+ $anonid = substr($anonid,length($salt)+1);
my @rows;
foreach my $prob (@$problems) {
foreach my $partid (@{$prob->parts}) {
@@ -1032,9 +1132,15 @@
}
}
foreach my $row (@rows) {
- print $outputfile '"'.join('","',
- map { $student->{$_}; }
- @student_columns).'"';
+ my $student_row_data = '';
+ if ($show_named) {
+ $student_row_data = '"'.join('","',
+ map { $student->{$_}; }
+ @student_columns).'"';
+ } else {
+ $student_row_data = '"'.$anonid.'"';
+ }
+ print $outputfile $student_row_data;
for (my $i=scalar(@student_columns);$i<$max_column;$i++) {
my $value = &Apache::loncommon::csv_translate($row->[$i]);
$value ||='';
@@ -1081,7 +1187,7 @@
foreach ('HTML','Excel','CSV') {
$output_selector .= ' <option value="'.lc($_).'"';
if ($env{'form.output'} eq lc($_)) {
- $output_selector .= ' selected ';
+ $output_selector .= ' selected="selected" ';
}
$output_selector .='>'.&mt($_).'</option>'.$/;
}
@@ -1090,7 +1196,7 @@
## Environment variable initialization
my $Str = '';
$Str .= &Apache::lonhtmlcommon::breadcrumbs('Student Submission Reports');
- $Str .= '<p>';
+ $Str .= '<br />';
$Str .= &Apache::loncommon::start_data_table();
$Str .= &Apache::loncommon::start_data_table_header_row();
$Str .= '<th>'.&mt('Sections').'</th>';
@@ -1166,7 +1272,6 @@
'<input type="text" name="stats_status"'
.' size="60" value="" readonly="readonly" />')
.'</span></p>';
- $Str .= '</p>';
##
return $Str;
}
Index: loncom/interface/statistics/lonstathelpers.pm
diff -u loncom/interface/statistics/lonstathelpers.pm:1.59 loncom/interface/statistics/lonstathelpers.pm:1.59.12.1
--- loncom/interface/statistics/lonstathelpers.pm:1.59 Wed May 6 16:19:42 2009
+++ loncom/interface/statistics/lonstathelpers.pm Sat Sep 11 19:08:23 2010
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstathelpers.pm,v 1.59 2009/05/06 16:19:42 bisitz Exp $
+# $Id: lonstathelpers.pm,v 1.59.12.1 2010/09/11 19:08:23 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -262,14 +262,29 @@
(' 'x4).
'<a href="javascript:checkall(false)">'.&mt('Unselect All').'</a>';
$Str .= $/.'<table>'.$/;
- my $iterator = $navmap->getIterator(undef, undef, undef, 1);
- my $sequence_string;
+ my ($iterator,$sequence_string,@Accumulator);
my $seq_id = 0;
- my @Accumulator = (&new_accumulator($env{'course.'.$cid.'.description'},
- '',
- '',
- $seq_id++,
- $inputname));
+ if (&Apache::loncommon::needs_gci_custom()) {
+ my $cdom = $env{'course.'.$cid.'.domain'};
+ my $cnum = $env{'course.'.$cid.'.num'};
+ my $mapurl = "/uploaded/$cdom/$cnum/default_1261144274.sequence";
+ my $map = $navmap->getResourceByUrl($mapurl);
+ my $firstResource = $map->map_start();
+ my $lastResource = $map->map_finish();
+ $iterator = $navmap->getIterator($firstResource,$lastResource,undef,1);
+ @Accumulator = (&new_accumulator($map->compTitle,
+ $map->src,
+ $map->symb,
+ $seq_id++,
+ $inputname));
+ } else {
+ $iterator = $navmap->getIterator(undef, undef, undef, 1);
+ @Accumulator = (&new_accumulator($env{'course.'.$cid.'.description'},
+ '',
+ '',
+ $seq_id++,
+ $inputname));
+ }
my @Sequence_Data;
while (my $curRes = $iterator->next()) {
if ($curRes == $iterator->END_MAP) {
--raeburn1284232103--