--- loncom/interface/statistics/lonstudentsubmissions.pm 2011/11/18 22:20:20 1.54.10.3 +++ loncom/interface/statistics/lonstudentsubmissions.pm 2010/08/04 01:56:07 1.60 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentsubmissions.pm,v 1.54.10.3 2011/11/18 22:20:20 raeburn Exp $ +# $Id: lonstudentsubmissions.pm,v 1.60 2010/08/04 01:56:07 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,7 +37,6 @@ use Apache::lonstathelpers; use HTML::Entities(); use Time::Local(); use Spreadsheet::WriteExcel(); -use Crypt::PasswdMD5; use lib '/home/httpd/lib/perl/'; use LONCAPA; @@ -77,6 +76,10 @@ sub BuildStudentSubmissionsPage { '
'.&mt('Loading student data...').'
'); $r->rflush(); # + my %anoncounter = + &Apache::lonnet::dump('nohist_anonsurveys', + $env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'}); if (exists($env{'form.problemchoice'}) && ! exists($env{'form.SelectAnother'})) { foreach my $button (@SubmitButtons) { @@ -98,52 +101,87 @@ sub BuildStudentSubmissionsPage { # Determine which problems we are to analyze my @Symbs = &Apache::lonstathelpers::get_selected_symbs('problemchoice'); - foreach my $selected (@Symbs) { - $r->print(''.$/); + + # If there are multi-part problems with anonymous survey and named + # parts check if named was picked for display. + # + my %mixed_named; + foreach my $envkey (%env) { + if ($envkey =~ /^form\.mixed_(\d+:\d+)$/) { + my $item = $1; + if ($env{$envkey} =~ /^symb_(.+)$/) { + my $symb = &unescape($1); + if (ref($mixed_named{$symb}) eq 'ARRAY') { + push(@{$mixed_named{$symb}},$item); + } else { + @{$mixed_named{$symb}} = ($item); + } + } + } } # # Get resource objects my $navmap = Apache::lonnavmaps::navmap->new(); if (!defined($navmap)) { + foreach my $selected (@Symbs) { + $r->print(''.$/); + if (ref($mixed_named{$selected}) eq 'ARRAY') { + foreach my $item (@{$mixed_named{$selected}}) { + $r->print(''.$/); + } + } + } $r->print('
'.&mt("Internal error").'
'); return; } my %already_seen; - my (@Problems,$show_named); - unless (&Apache::loncommon::needs_gci_custom()) { - $show_named = 1; - } + my (@Problems,@anonProbs,@namedProbs,$show_named); foreach my $symb (@Symbs) { my $resource = $navmap->getBySymb($symb); - push(@Problems,$resource); + my ($hasanon,$hasnamed); + if (ref($resource)) { + foreach my $partid (@{$resource->parts}) { + if (($anoncounter{$symb."\0".$partid}) || ($resource->is_anonsurvey($partid))) { + unless (exists($mixed_named{$symb})) { + $hasanon = 1; + } + } else { + $hasnamed = 1; + } + } + if ($hasanon) { + push(@anonProbs,$resource); + } elsif ($hasnamed) { + push(@namedProbs,$resource); + } + } + } + if (@namedProbs > 0) { + @Problems = @namedProbs; + $show_named = 1; + } elsif (@anonProbs > 0) { + @Problems = @anonProbs; + } + foreach my $selected (@Symbs) { + $r->print(''.$/); + if (ref($mixed_named{$selected}) eq 'ARRAY') { + foreach my $item (@{$mixed_named{$selected}}) { + $r->print(''.$/); + } + } } # 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('

'. &Apache::lonstatistics::section_and_enrollment_description(). '

'); 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.').'
'.&mt('There must be at least [quant,_1,student].',$threshold).' '.&mt('Contact the LON-CAPA [_1]Helpdesk[_2] if you need the threshold to be changed for this course.','responseIds($partid)]; my $resptypes = [$prob->responseType($partid)]; @@ -340,6 +384,7 @@ sub prepare_html_output { } $prob_span += $part_span; } + next if (!$shown_parts); my $title = $prob->compTitle; if ($prob_span > 0) { $headers{'problem'}.= qq{$title}; @@ -390,11 +435,7 @@ sub prepare_html_output { $student_row_data .= ''; } } else { - my $anonid = &Crypt::PasswdMD5::unix_md5_crypt($student->{'username'}, - $salt); - $anonid = substr($anonid,length($salt)+1); - $student_row_data = ''. - $anonid.''; + $student_row_data = ''.&mt('Anonymized').''; } # # Figure out what it is we need to output for this student @@ -402,8 +443,14 @@ sub prepare_html_output { my %prob_data; my $maxrow; foreach my $prob (@$problems) { - $prob_data{$prob->symb}={}; + my $symb = $prob->symb; + $prob_data{$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++) { @@ -693,20 +740,26 @@ sub html_non_essay_results { ######################################################### ######################################################### sub prepare_excel_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'}; # # # Determine the number of columns in the spreadsheet my $columncount = 3; # username, domain, id - my @extra_resp_headers = &get_extra_response_headers(); + my @extra_resp_headers = &get_extra_response_headers($show_named); my $lastprob; my %problem_analysis; foreach my $prob (@$Problems) { + my $symb = $prob->symb(); my %analysis = &Apache::lonstathelpers::get_problem_data($prob->src); $problem_analysis{$prob->src}=\%analysis; 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 $resptypes = [$prob->responseType($partid)]; for (my $i=0;$i 255) { $r->print('

'.&mt('Unable to complete request').'

'.$/. '

'.&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; } @@ -768,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($_), @@ -778,9 +833,15 @@ sub prepare_excel_output { 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,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++) { @@ -867,8 +941,8 @@ sub prepare_excel_output { } } } - # Prepend current student's user information to all rows - for (my $row = $student_row;$row<$max_row;$row++) { + # Fill in the remaining rows with the students data + for (my $row = $student_row+1;$row<$max_row;$row++) { my $cols = 0; foreach my $field (@StudentColumns) { if ($show_named) { @@ -876,7 +950,7 @@ sub prepare_excel_output { $student->{$field}); } else { $worksheet->write($row,$cols++, - $anonid); + &mt('Anonymized')); } } } @@ -987,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('Generating CSV report of student responses').'

'); @@ -1009,11 +1082,13 @@ 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; } # @@ -1021,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); @@ -1040,10 +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; $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)]; @@ -1075,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++) { @@ -1124,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.'"'; @@ -1173,7 +1258,7 @@ sub CreateInterface { foreach ('HTML','Excel','CSV') { $output_selector .= '