';
}
#
# Figure out what it is we need to output for this student
@@ -535,7 +444,6 @@ sub prepare_html_output {
undef(@essays);
}
} # end of student loop
- $r->print(''.$/);
return;
}
@@ -717,9 +625,8 @@ sub html_non_essay_results {
#########################################################
#########################################################
sub prepare_excel_output {
- my ($r,$Problems,$Students,$show_named) = @_;
+ my ($r,$Problems,$Students) = @_;
my $c = $r->connection();
- my $salt = '$1$'.$Apache::lonnet::perlvar{'AnonymousSalt'};
#
#
# Determine the number of columns in the spreadsheet
@@ -788,12 +695,7 @@ sub prepare_excel_output {
$worksheet->write($partid_row,0,'Part ID',$format->{'bold'});
$worksheet->write($respid_row,0,'Response ID',$format->{'bold'});
# Student headers
- my @StudentColumns;
- if ($show_named) {
- @StudentColumns = qw(username domain id section);
- } else {
- @StudentColumns = qw(username);
- }
+ my @StudentColumns = ('username','domain','id','section');
foreach (@StudentColumns) {
$worksheet->write($header_row,$cols_output++,ucfirst($_),
$format->{'bold'});
@@ -802,9 +704,6 @@ sub prepare_excel_output {
my %start_col;
foreach my $prob (@$Problems) {
my $title = $prob->compTitle;
- unless (&Apache::loncommon::needs_gci_custom()) {
- ($title) = ($prob->src =~ m{/([^/]+)$});
- }
$worksheet->write($title_row,$cols_output,
$title,$format->{'h3'});
foreach my $partid (@{$prob->parts}) {
@@ -843,9 +742,11 @@ sub prepare_excel_output {
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});
+ }
+ my $last_student_col = $cols_output-1;
foreach my $prob (@$Problems) {
foreach my $partid (@{$prob->parts}) {
my @Response = $prob->responseIds($partid);
@@ -895,16 +796,11 @@ sub prepare_excel_output {
}
}
# Fill in the remaining rows with the students data
- for (my $row = $student_row;$row<$max_row;$row++) {
+ for (my $row = $student_row+1;$row<$max_row;$row++) {
my $cols = 0;
foreach my $field (@StudentColumns) {
- if ($show_named) {
- $worksheet->write($row,$cols++,
- $student->{$field});
- } else {
- $worksheet->write($row,$cols++,
- $anonid);
- }
+ $worksheet->write($row,$cols++,
+ $student->{$field});
}
}
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
@@ -1014,9 +910,8 @@ sub excel_format_item {
#########################################################
#########################################################
sub prepare_csv_output {
- my ($r,$problems,$students,$show_named) = @_;
+ my ($r,$problems,$students) = @_;
my $c = $r->connection();
- my $salt = '$1$'.$Apache::lonnet::perlvar{'AnonymousSalt'};
#
$r->print('
'.
&mt('Generating CSV report of student responses').'
');
@@ -1036,24 +931,21 @@ sub prepare_csv_output {
time.'_'.rand(1000000000).'.csv';
unless ($outputfile = Apache::File->new('>/home/httpd'.$filename)) {
$r->log_error("Couldn't open $filename for output $!");
- $r->print('
'
- .&mt('Problems occurred in writing the CSV file. '
- .'This error has been logged. '
- .'Please alert your LON-CAPA administrator.')
- .'
');
+ $r->print(
+ '
'
+ .&mt('Problems occurred in writing the CSV file.')
+ .' '.&mt('This error has been logged.')
+ .' '.&mt('Please alert your LON-CAPA administrator.')
+ .'
'
+ );
$outputfile = undef;
}
#
# Compute the number of columns per response
- my @extra_resp_headers = &get_extra_response_headers($show_named);
+ my @extra_resp_headers = &get_extra_response_headers();
#
# Create the table header
- my @student_columns;
- if ($show_named) {
- @student_columns = qw(username domain id section);
- } else {
- @student_columns = qw(username);
- }
+ my @student_columns = ('username','domain','id','section');
#
my %headers;
push(@{$headers{'student'}},@student_columns);
@@ -1069,11 +961,7 @@ sub prepare_csv_output {
foreach my $prob (@$problems) {
my %analysis = &Apache::lonstathelpers::get_problem_data($prob->src);
$problem_analysis{$prob->src}=\%analysis;
- my $title = $prob->compTitle;
- unless (&Apache::loncommon::needs_gci_custom()) {
- ($title) = ($prob->src =~ m{/([^/]+)$});
- }
- $headers{'problem'}->[$max_column] = $title;
+ $headers{'problem'}->[$max_column] = $prob->compTitle;
foreach my $partid (@{$prob->parts}) {
$headers{'part'}->[$max_column] = $prob->part_display($partid);
my $responses = [$prob->responseIds($partid)];
@@ -1106,9 +994,6 @@ sub prepare_csv_output {
# 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}) {
@@ -1149,15 +1034,9 @@ sub prepare_csv_output {
}
}
foreach my $row (@rows) {
- 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;
+ print $outputfile '"'.join('","',
+ map { $student->{$_}; }
+ @student_columns).'"';
for (my $i=scalar(@student_columns);$i<$max_column;$i++) {
my $value = &Apache::loncommon::csv_translate($row->[$i]);
$value ||='';
@@ -1204,7 +1083,7 @@ sub CreateInterface {
foreach ('HTML','Excel','CSV') {
$output_selector .= '