'.&mt('LON-CAPA is unable to produce your Excel spreadsheet because your selections will result in more than 255 columns. Excel allows only 255 columns in a spreadsheet.').'
'.$/. - ''.&mt('Consider selecting fewer problems to generate reports on, or reducing the number of items per problem. Or use HTML or CSV output.').'
'.$/. - ''.&mt('The last problem that will fit in the current spreadsheet is [_1].',$lastprob->compTitle).'
'); + ''.&mt('Consider selecting fewer problems to generate reports on, or reducing the number of items per problem. Or use HTML or CSV output.').'
'.$/); + if (ref($lastprob)) { + $r->print(''.&mt('The last problem that will fit in the current spreadsheet is [_1].',$lastprob->compTitle).'
'); + } $r->rflush(); return; } @@ -792,7 +823,7 @@ sub prepare_excel_output { if ($show_named) { @StudentColumns = qw(username domain id section); } else { - @StudentColumns = qw(username); + @StudentColumns = qw(username); } foreach (@StudentColumns) { $worksheet->write($header_row,$cols_output++,ucfirst($_), @@ -802,12 +833,15 @@ 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{/([^/]+)$}); - } + my $symb = $prob->symb(); $worksheet->write($title_row,$cols_output, $title,$format->{'h3'}); foreach my $partid (@{$prob->parts}) { + if (($prob->is_anonsurvey($partid)) || ($anoncounter->{$symb."\0".$partid})) { + next if ($show_named); + } else { + next unless ($show_named); + } $worksheet->write($partid_row,$cols_output, $prob->part_display($partid)); my $responses = [$prob->responseIds($partid)]; @@ -843,11 +877,24 @@ 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) { + if ($show_named) { + $worksheet->write($student_row,$cols_output++, + $student->{$field}); + } else { + $worksheet->write($student_row,$cols_output++, + &mt('Anonymized')); + } + } + my $last_student_col = $cols_output-1; foreach my $prob (@$Problems) { + my $symb = $prob->symb(); foreach my $partid (@{$prob->parts}) { + if (($prob->is_anonsurvey($partid)) || ($anoncounter->{$symb."\0".$partid})) { + next if ($show_named); + } else { + next unless ($show_named); + } my @Response = $prob->responseIds($partid); my @ResponseType = $prob->responseType($partid); for (my $i=0;$i<=$#Response;$i++) { @@ -895,7 +942,7 @@ 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) { @@ -903,7 +950,7 @@ sub prepare_excel_output { $student->{$field}); } else { $worksheet->write($row,$cols++, - $anonid); + &mt('Anonymized')); } } } @@ -1014,9 +1061,8 @@ sub excel_format_item { ######################################################### ######################################################### sub prepare_csv_output { - my ($r,$problems,$students,$show_named) = @_; + my ($r,$problems,$students,$anoncounter,$show_named) = @_; my $c = $r->connection(); - my $salt = '$1$'.$Apache::lonnet::perlvar{'AnonymousSalt'}; # $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; } # @@ -1048,12 +1096,13 @@ sub prepare_csv_output { my @extra_resp_headers = &get_extra_response_headers($show_named); # # Create the table header - my @student_columns; + my @student_columns = ('username','domain','id','section'); if ($show_named) { @student_columns = qw(username domain id section); } else { @student_columns = qw(username); } + my $student_column_count = scalar(@student_columns); # my %headers; push(@{$headers{'student'}},@student_columns); @@ -1067,14 +1116,16 @@ sub prepare_csv_output { my %start_col; my $max_column = scalar(@student_columns); foreach my $prob (@$problems) { + my $symb = $prob->symb(); 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}) { + if (($prob->is_anonsurvey($partid)) || ($anoncounter->{$symb."\0".$partid})) { + next if ($show_named); + } else { + next unless ($show_named); + } $headers{'part'}->[$max_column] = $prob->part_display($partid); my $responses = [$prob->responseIds($partid)]; my $resptypes = [$prob->responseType($partid)]; @@ -1106,12 +1157,15 @@ 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) { + my $symb = $prob->symb; foreach my $partid (@{$prob->parts}) { + if (($prob->is_anonsurvey($partid)) || ($anoncounter->{$symb."\0".$partid})) { + next if ($show_named); + } else { + next unless ($show_named); + } my @responses = $prob->responseIds($partid); my @response_type = $prob->responseType($partid); for (my $i=0;$i<=$#responses;$i++) { @@ -1155,10 +1209,10 @@ sub prepare_csv_output { map { $student->{$_}; } @student_columns).'"'; } else { - $student_row_data = '"'.$anonid.'"'; + $student_row_data = '"'.&mt('Anonymized').'"'; } print $outputfile $student_row_data; - for (my $i=scalar(@student_columns);$i<$max_column;$i++) { + for (my $i=$student_column_count;$i<$max_column;$i++) { my $value = &Apache::loncommon::csv_translate($row->[$i]); $value ||=''; print $outputfile ',"'.$value.'"'; @@ -1204,7 +1258,7 @@ sub CreateInterface { foreach ('HTML','Excel','CSV') { $output_selector .= '