--- loncom/interface/statistics/lonstudentsubmissions.pm 2010/09/12 17:37:24 1.54.10.2 +++ loncom/interface/statistics/lonstudentsubmissions.pm 2011/11/22 01:34:39 1.63.2.3 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentsubmissions.pm,v 1.54.10.2 2010/09/12 17:37:24 raeburn Exp $ +# $Id: lonstudentsubmissions.pm,v 1.63.2.3 2011/11/22 01:34:39 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,10 +34,10 @@ use Apache::loncoursedata(); use Apache::lonstatistics; use Apache::lonlocal; use Apache::lonstathelpers; +use Apache::lonmsgdisplay(); use HTML::Entities(); use Time::Local(); use Spreadsheet::WriteExcel(); -use Crypt::PasswdMD5; use lib '/home/httpd/lib/perl/'; use LONCAPA; @@ -77,6 +77,10 @@ sub BuildStudentSubmissionsPage { '
'. - &mt('Computing correct answers greatly increasese the amount of time required to prepare a report.'). + &mt('Computing correct answers greatly increases the amount of time required to prepare a report.'). '
'); $r->print(''. &mt('Please select problems and use the [_1]Prepare Report[_2] button to continue.','',''). '
'); $r->print(&Apache::lonstathelpers::MultipleProblemSelector - (undef,'problemchoice','Statistics')); + (undef,'problemchoice','Statistics',\%anoncounter)); } } @@ -195,7 +251,6 @@ sub array_shuffle { ## ## get_extra_response_headers ## - sub get_extra_response_headers { my ($show_named) = @_; my @extra_resp_headers; @@ -253,9 +308,8 @@ sub get_headers { ######################################################### ######################################################### sub prepare_html_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'}; # # Set a flag for the case when there is just one problem my $single_response = 0; @@ -268,38 +322,37 @@ sub prepare_html_output { my @extra_resp_headers = &get_extra_response_headers($show_named); # # Create the table header - 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 @student_columns = &get_student_columns($show_named); my %headers; my $student_column_count = scalar(@student_columns); $headers{'problem'} = qq{'.&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; } @@ -764,23 +828,24 @@ 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); - } - foreach (@StudentColumns) { - $worksheet->write($header_row,$cols_output++,ucfirst($_), + my @StudentColumns = &get_student_columns($show_named); + foreach my $field (@StudentColumns) { + $worksheet->write($header_row,$cols_output++,ucfirst($field), $format->{'bold'}); } # Problem headers my %start_col; foreach my $prob (@$Problems) { my $title = $prob->compTitle; + 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)]; @@ -816,21 +881,14 @@ 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++, - $anonid); - } - } - 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++) { @@ -877,16 +935,20 @@ sub prepare_excel_output { } } } - # Fill in the remaining rows with the students data - for (my $row = $student_row+1;$row<$max_row;$row++) { + # Prepend current student's user information to all rows + for (my $row = $student_row;$row<$max_row;$row++) { my $cols = 0; foreach my $field (@StudentColumns) { if ($show_named) { - $worksheet->write($row,$cols++, - $student->{$field}); + my $value = $student->{$field}; + if ($field eq 'comments') { + $value = &Apache::lonmsgdisplay::retrieve_instructor_comments + ($student->{'username'},$student->{'domain'}); + } + $worksheet->write($row,$cols++,$value); } else { $worksheet->write($row,$cols++, - $anonid); + &mt('Anonymized')); } } } @@ -997,9 +1059,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; } # @@ -1031,12 +1094,8 @@ sub prepare_csv_output { my @extra_resp_headers = &get_extra_response_headers($show_named); # # 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 = &get_student_columns($show_named); + my $student_column_count = scalar(@student_columns); # my %headers; push(@{$headers{'student'}},@student_columns); @@ -1048,12 +1107,18 @@ sub prepare_csv_output { # we put the headers into the %headers hash my %problem_analysis; my %start_col; - my $max_column = scalar(@student_columns); + my $max_column = $student_column_count; foreach my $prob (@$problems) { + my $symb = $prob->symb(); my %analysis = &Apache::lonstathelpers::get_problem_data($prob->src); $problem_analysis{$prob->src}=\%analysis; $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)]; @@ -1085,12 +1150,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++) { @@ -1130,14 +1198,20 @@ sub prepare_csv_output { foreach my $row (@rows) { my $student_row_data = ''; if ($show_named) { - $student_row_data = '"'.join('","', - map { $student->{$_}; } - @student_columns).'"'; + foreach my $field (@student_columns) { + my $value = $student->{$field}; + if ($field eq 'comments') { + $value = &Apache::lonmsgdisplay::retrieve_instructor_comments + ($student->{'username'},$student->{'domain'}); + } + $student_row_data .= '"'.&Apache::loncommon::csv_translate($value).'",'; + } + $student_row_data =~ s/,$//; } 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.'"'; @@ -1183,7 +1257,7 @@ sub CreateInterface { foreach ('HTML','Excel','CSV') { $output_selector .= '