--- loncom/interface/statistics/lonstudentsubmissions.pm 2010/04/12 16:28:22 1.59 +++ 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.59 2010/04/12 16:28:22 bisitz Exp $ +# $Id: lonstudentsubmissions.pm,v 1.60 2010/08/04 01:56:07 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -76,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) { @@ -97,24 +101,82 @@ 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; + 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); + } + # $r->print('

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

'); @@ -131,11 +193,11 @@ sub BuildStudentSubmissionsPage { } } if ($env{'form.output'} eq 'excel') { - &prepare_excel_output($r,\@Problems,\@Students); + &prepare_excel_output($r,\@Problems,\@Students,\%anoncounter,$show_named); } elsif ($env{'form.output'} eq 'csv') { - &prepare_csv_output($r,\@Problems,\@Students); + &prepare_csv_output($r,\@Problems,\@Students,\%anoncounter,$show_named); } else { - &prepare_html_output($r,\@Problems,\@Students); + &prepare_html_output($r,\@Problems,\@Students,\%anoncounter,$show_named); } } $r->print('
'); @@ -150,23 +212,40 @@ sub BuildStudentSubmissionsPage { &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)); } } +sub array_shuffle { + my $array = shift; + return unless (ref($array) eq 'ARRAY'); + my $i = scalar(@$array); + my $j; + foreach my $item (@$array) { + --$i; + $j = int(rand($i+1)); + next if($i == $j); + @$array [$i,$j] = @$array[$j,$i]; + } + return @$array; +} + ## ## get_extra_response_headers ## sub get_extra_response_headers { + my ($show_named) = @_; my @extra_resp_headers; if ($env{'form.correctans'} eq 'true') { push(@extra_resp_headers,'Correct'); - } - if ($env{'form.prob_status'} eq 'true') { - push(@extra_resp_headers,'Award Detail'); - push(@extra_resp_headers,'Time'); - push(@extra_resp_headers,'Attempt'); - push(@extra_resp_headers,'Awarded'); + } + if ($show_named) { + if ($env{'form.prob_status'} eq 'true') { + push(@extra_resp_headers,'Award Detail'); + push(@extra_resp_headers,'Time'); + push(@extra_resp_headers,'Attempt'); + push(@extra_resp_headers,'Awarded'); + } } return @extra_resp_headers; } @@ -211,7 +290,7 @@ sub get_headers { ######################################################### ######################################################### sub prepare_html_output { - my ($r,$problems,$students) = @_; + my ($r,$problems,$students,$anoncounter,$show_named) = @_; my $c = $r->connection(); # # Set a flag for the case when there is just one problem @@ -222,14 +301,17 @@ sub prepare_html_output { } # # Compute the number of columns per response - my @extra_resp_headers = &get_extra_response_headers(); + my @extra_resp_headers = &get_extra_response_headers($show_named); # # Create the table header - my @student_columns = @Apache::lonstatistics::SelectedStudentData; - foreach (@student_columns) { - if($_ eq 'all') { - @student_columns = ('fullname','username','domain','id','section','status','groups','comments'); + 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 %headers; @@ -247,13 +329,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)]; @@ -294,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}; @@ -330,17 +421,21 @@ sub prepare_html_output { $count = 0; } last if ($c->aborted()); - foreach my $field (@student_columns) { - $student_row_data .= ''; - # handle comments like in lonstudentassessment.pm - if($field eq 'comments') { - $student_row_data .= + if ($show_named) { + foreach my $field (@student_columns) { + $student_row_data .= ''; + # handle comments like in lonstudentassessment.pm + if($field eq 'comments') { + $student_row_data .= ''.&mt('Comments').''; - } else { - $student_row_data .= $student->{$field}; + } else { + $student_row_data .= $student->{$field}; + } + $student_row_data .= ''; } - $student_row_data .= ''; + } else { + $student_row_data = ''.&mt('Anonymized').''; } # # Figure out what it is we need to output for this student @@ -348,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++) { @@ -639,19 +740,26 @@ sub html_non_essay_results { ######################################################### ######################################################### sub prepare_excel_output { - my ($r,$Problems,$Students) = @_; + my ($r,$Problems,$Students,$anoncounter,$show_named) = @_; my $c = $r->connection(); # # # 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; } @@ -709,7 +819,12 @@ 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 = ('username','domain','id','section'); + my @StudentColumns; + if ($show_named) { + @StudentColumns = qw(username domain id section); + } else { + @StudentColumns = qw(username); + } foreach (@StudentColumns) { $worksheet->write($header_row,$cols_output++,ucfirst($_), $format->{'bold'}); @@ -718,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)]; @@ -757,12 +878,23 @@ sub prepare_excel_output { $cols_output = 0; my $student_row = $max_row; foreach my $field (@StudentColumns) { - $worksheet->write($student_row,$cols_output++, - $student->{$field}); + 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++) { @@ -813,8 +945,13 @@ sub prepare_excel_output { for (my $row = $student_row+1;$row<$max_row;$row++) { my $cols = 0; foreach my $field (@StudentColumns) { - $worksheet->write($row,$cols++, - $student->{$field}); + if ($show_named) { + $worksheet->write($row,$cols++, + $student->{$field}); + } else { + $worksheet->write($row,$cols++, + &mt('Anonymized')); + } } } &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, @@ -924,7 +1061,7 @@ sub excel_format_item { ######################################################### ######################################################### sub prepare_csv_output { - my ($r,$problems,$students) = @_; + my ($r,$problems,$students,$anoncounter,$show_named) = @_; my $c = $r->connection(); # $r->print('

'. @@ -956,10 +1093,16 @@ sub prepare_csv_output { } # # Compute the number of columns per response - my @extra_resp_headers = &get_extra_response_headers(); + my @extra_resp_headers = &get_extra_response_headers($show_named); # # Create the table header 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); @@ -973,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)]; @@ -1010,7 +1159,13 @@ sub prepare_csv_output { last if ($c->aborted()); 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++) { @@ -1048,10 +1203,16 @@ sub prepare_csv_output { } } foreach my $row (@rows) { - print $outputfile '"'.join('","', - map { $student->{$_}; } - @student_columns).'"'; - for (my $i=scalar(@student_columns);$i<$max_column;$i++) { + my $student_row_data = ''; + if ($show_named) { + $student_row_data = '"'.join('","', + map { $student->{$_}; } + @student_columns).'"'; + } else { + $student_row_data = '"'.&mt('Anonymized').'"'; + } + print $outputfile $student_row_data; + for (my $i=$student_column_count;$i<$max_column;$i++) { my $value = &Apache::loncommon::csv_translate($row->[$i]); $value ||=''; print $outputfile ',"'.$value.'"';