--- loncom/interface/statistics/lonstudentsubmissions.pm 2009/04/21 13:28:23 1.54 +++ 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 2009/04/21 13:28:23 bisitz 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; @@ -61,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; @@ -76,6 +79,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)); + } +} + +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 +310,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,10 +321,18 @@ 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 = ('username','domain','id','section'); + 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; my $student_column_count = scalar(@student_columns); @@ -242,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)]; @@ -289,6 +404,7 @@ sub prepare_html_output { } $prob_span += $part_span; } + next if (!$shown_parts); my $title = $prob->compTitle; if ($prob_span > 0) { $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; } @@ -695,7 +839,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'}); @@ -704,9 +853,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)]; @@ -742,13 +897,14 @@ sub prepare_excel_output { last if ($c->aborted()); $cols_output = 0; my $student_row = $max_row; - foreach my $field (@StudentColumns) { - $worksheet->write($student_row,$cols_output++, - $student->{$field}); - } - 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++) { @@ -795,12 +951,17 @@ 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) { - $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, @@ -910,7 +1071,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('' + .&mt('Problems occurred in writing the CSV file.') + .' '.&mt('This error has been logged.') + .' '.&mt('Please alert your LON-CAPA administrator.') + .'
' + ); $outputfile = undef; } # # 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); @@ -957,10 +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; $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)]; @@ -994,7 +1169,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++) { @@ -1032,10 +1213,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.'"'; @@ -1081,7 +1268,7 @@ sub CreateInterface { foreach ('HTML','Excel','CSV') { $output_selector .= '