--- loncom/interface/statistics/lonstudentsubmissions.pm 2011/11/18 22:35:33 1.54.10.4 +++ loncom/interface/statistics/lonstudentsubmissions.pm 2011/11/18 21:08:22 1.64 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentsubmissions.pm,v 1.54.10.4 2011/11/18 22:35:33 raeburn Exp $ +# $Id: lonstudentsubmissions.pm,v 1.64 2011/11/18 21:08:22 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,6 +30,7 @@ use strict; use Apache::lonnet; use Apache::loncommon(); use Apache::lonhtmlcommon(); +use Apache::lonquickgrades(); use Apache::loncoursedata(); use Apache::lonstatistics; use Apache::lonlocal; @@ -37,7 +38,6 @@ use Apache::lonstathelpers; use HTML::Entities(); use Time::Local(); use Spreadsheet::WriteExcel(); -use Crypt::PasswdMD5; use lib '/home/httpd/lib/perl/'; use LONCAPA; @@ -62,6 +62,8 @@ sub BuildStudentSubmissionsPage { # &Apache::lonstatistics::PrepareClasslist(); # + $r->print( &Apache::lonhtmlcommon::breadcrumbs('Student Submission Reports')); + &Apache::lonquickgrades::startGradeScreen($r,'statistics'); $r->print(&CreateInterface()); # my @Students = @Apache::lonstatistics::Students; @@ -77,7 +79,11 @@ sub BuildStudentSubmissionsPage { '
'.&mt('Loading student data...').'
'); $r->rflush(); # - if ((exists($env{'form.problemchoice'}) || (exists($env{'form.allproblems'}))) && + 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) { if ($button->{'name'} eq 'break') { @@ -95,51 +101,86 @@ sub BuildStudentSubmissionsPage { $r->print('
'.$/); $r->rflush(); # - - # - # Get resource objects - my $navmap = Apache::lonnavmaps::navmap->new(); - # Determine which problems we are to analyze my @Symbs = &Apache::lonstathelpers::get_selected_symbs('problemchoice'); - if (defined($navmap)) { - if ($env{'form.allproblems'}) { - my $iterator = $navmap->getIterator(undef, undef, undef, 1); - while (my $curRes = $iterator->next()) { - next if (! ref($curRes)); - if ($curRes->is_problem) { - my $symb = $curRes->symb; - unless(grep(/^\Q$symb\E$/,@Symbs)) { - push(@Symbs,$symb); - } + + # 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); } } } } - foreach my $selected (@Symbs) { - $r->print(''.$/); - } + # + # 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()) { - unless ($env{'form.anonymized'} eq 'true') { - $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 = @@ -154,17 +195,13 @@ sub BuildStudentSubmissionsPage { $threshold = 10; } } - unless (&Apache::loncommon::needs_gci_custom()) { - $threshold = 0; - } - # $r->print('

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

'); if (! scalar(@Problems) || ! defined($Problems[0])) { - $r->print('resource is undefined'); + $r->print(&mt('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.',''); $r->print(' 'x5); $r->print('

'. - &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)); } } @@ -216,7 +253,6 @@ sub array_shuffle { ## ## get_extra_response_headers ## - sub get_extra_response_headers { my ($show_named) = @_; my @extra_resp_headers; @@ -274,9 +310,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; @@ -314,13 +349,21 @@ sub prepare_html_output { foreach my $prob (@$problems) { my %analysis = &Apache::lonstathelpers::get_problem_data($prob->src); $problem_analysis{$prob->src}=\%analysis; + my $symb = $prob->symb(); # my $prob_span = 0; my $single_part = 0; if (scalar(@{$prob->parts}) == 1) { $single_part = 1; } + my $shown_parts = 0; foreach my $partid (@{$prob->parts}) { + if (($prob->is_anonsurvey($partid)) || ($anoncounter->{$symb."\0".$partid})) { + next if ($show_named); + } else { + next unless ($show_named); + } + $shown_parts ++; my $part_span = 0; my $responses = [$prob->responseIds($partid)]; my $resptypes = [$prob->responseType($partid)]; @@ -361,10 +404,8 @@ sub prepare_html_output { } $prob_span += $part_span; } + next if (!$shown_parts); my $title = $prob->compTitle; - unless (&Apache::loncommon::needs_gci_custom()) { - ($title) = ($prob->src =~ m{/([^/]+)$}); - } if ($prob_span > 0) { $headers{'problem'}.= qq{$title}; } elsif ($single_response) { @@ -414,11 +455,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 @@ -426,8 +463,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++) { @@ -717,20 +760,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; } @@ -792,7 +843,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 +853,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 +897,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 $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++) { @@ -894,7 +951,7 @@ sub prepare_excel_output { } } } - # Fill in the remaining rows with the students data + # 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) { @@ -903,7 +960,7 @@ sub prepare_excel_output { $student->{$field}); } else { $worksheet->write($row,$cols++, - $anonid); + &mt('Anonymized')); } } } @@ -1014,9 +1071,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').'

'); @@ -1036,11 +1092,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; } # @@ -1048,12 +1106,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 +1126,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 +1167,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 +1219,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 +1268,7 @@ sub CreateInterface { foreach ('HTML','Excel','CSV') { $output_selector .= '