--- loncom/interface/statistics/lonstudentsubmissions.pm 2011/11/22 01:34:39 1.63.2.3 +++ loncom/interface/statistics/lonstudentsubmissions.pm 2012/05/12 03:52:02 1.68.2.1 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentsubmissions.pm,v 1.63.2.3 2011/11/22 01:34:39 raeburn Exp $ +# $Id: lonstudentsubmissions.pm,v 1.68.2.1 2012/05/12 03:52:02 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -62,6 +62,7 @@ sub BuildStudentSubmissionsPage { # &Apache::lonstatistics::PrepareClasslist(); # + $r->print( &Apache::lonhtmlcommon::breadcrumbs('Student Submission Reports')); $r->print(&CreateInterface()); # my @Students = @Apache::lonstatistics::Students; @@ -193,9 +194,9 @@ sub BuildStudentSubmissionsPage { $threshold = 10; } } - $r->print('

'. + $r->print('

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

'); + '

'); if (! scalar(@Problems) || ! defined($Problems[0])) { $r->print(&mt('resource is undefined')); } elsif (!$show_named && @Students < $threshold) { @@ -327,7 +328,7 @@ sub prepare_html_output { my $student_column_count = scalar(@student_columns); $headers{'problem'} = qq{\ }; foreach my $field (@student_columns) { - $headers{'student'}.= ''.ucfirst($field).''; + $headers{'student'}.= ''.&mt(ucfirst($field)).''; } # # we put the headers into the %headers hash @@ -411,7 +412,8 @@ sub prepare_html_output { qq{\ }. $headers{'response'}; } - my $full_header = $/.''.$/; + #my $full_header = $/.'
'.$/; + my $full_header = $/.&Apache::loncommon::start_data_table().$/; $full_header .= ''.$headers{'problem'}.''.$/; if ($nonempty_part_headers) { $full_header .= ''.$headers{'part'}.''.$/; @@ -422,11 +424,10 @@ sub prepare_html_output { # Main loop my $count; $r->print($/.$full_header.$/); - my $row_class = 'odd'; # css foreach my $student (@$students) { my $student_row_data; if ($count++ >= 30) { - $r->print('
'.$/.$full_header.$/); + $r->print(&Apache::loncommon::end_data_table().$/.$full_header.$/); $count = 0; } last if ($c->aborted()); @@ -524,11 +525,6 @@ sub prepare_html_output { next if (! $maxrow && ! scalar(@essays)); # # Go through the problem data and output a row. - if ($row_class eq 'even') { - $row_class = 'odd'; - } else { - $row_class = 'even'; - } my $printed_something; for (my $rows_output = 0;$rows_output<$maxrow;$rows_output++) { my $html; @@ -552,22 +548,23 @@ sub prepare_html_output { } } if (! $no_data) { - $r->print(qq{$student_row_data$html}.$/); + $r->print(&Apache::loncommon::start_data_table_row().$student_row_data.$html. + &Apache::loncommon::end_data_table_row().$/); $printed_something=1; } } if (@essays) { - my $tr = qq{}; + my $tr = &Apache::loncommon::start_data_table_row(); my $td = qq{}; if (! $printed_something) { - $r->print($tr.$student_row_data.''.$/); + $r->print($tr.$student_row_data.&Apache::loncommon::end_data_table_row().$/); } $r->print($tr.$td. join(''.$/.$tr.$td,@essays).''.$/); undef(@essays); } } # end of student loop - $r->print(''.$/); + $r->print(&Apache::loncommon::end_data_table().$/); return; } @@ -784,9 +781,9 @@ sub prepare_excel_output { $lastprob = $prob; } if ($columncount > 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.').'

'.$/); + $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.').'

'.$/); if (ref($lastprob)) { $r->print('

'.&mt('The last problem that will fit in the current spreadsheet is [_1].',$lastprob->compTitle).'

'); } @@ -796,14 +793,14 @@ sub prepare_excel_output { # # Print out a message telling them what we are doing if (scalar(@$Problems) > 1) { - $r->print('

'. + $r->print('

'. &mt('Preparing Excel spreadsheet of student responses to [_1] problems', scalar(@$Problems)). - '

'); + '

'); } else { - $r->print('

'. + $r->print('

'. &mt('Preparing Excel spreadsheet of student responses'). - '

'); + '

'); } $r->rflush(); # @@ -811,7 +808,17 @@ sub prepare_excel_output { my ($workbook,$filename,$format) = &Apache::loncommon::create_workbook($r); return if (! defined($workbook)); - my $worksheet = $workbook->addworksheet('Student Submission Data'); + + # Worksheet name + # The length of a worksheet name in Excel 95 is limited to 31 characters. + # Let's make sure to not exceed the maximum length in the translation files. + # Otherwise, no Excel file would be created. + my $worksheetname = &mt('Student Submission Data'); + if (length($worksheetname) > 31) { + # nice way to cut off too long name + $worksheetname = substr($worksheetname,0,28,).'...'; + } + my $worksheet = $workbook->addworksheet($worksheetname); # # Add headers to the worksheet my $rows_output = 0; @@ -824,13 +831,13 @@ sub prepare_excel_output { my $partid_row = $rows_output++; my $respid_row = $rows_output++; my $header_row = $rows_output++; - $worksheet->write($title_row ,0,'Problem Title',$format->{'bold'}); - $worksheet->write($partid_row,0,'Part ID',$format->{'bold'}); - $worksheet->write($respid_row,0,'Response ID',$format->{'bold'}); + $worksheet->write($title_row ,0,&mt('Problem Title'),$format->{'bold'}); + $worksheet->write($partid_row,0,&mt('Part ID'),$format->{'bold'}); + $worksheet->write($respid_row,0,&mt('Response ID'),$format->{'bold'}); # Student headers my @StudentColumns = &get_student_columns($show_named); foreach my $field (@StudentColumns) { - $worksheet->write($header_row,$cols_output++,ucfirst($field), + $worksheet->write($header_row,$cols_output++,&mt(ucfirst($field)), $format->{'bold'}); } # Problem headers @@ -872,10 +879,7 @@ sub prepare_excel_output { } # # Populate the worksheet with the student data - my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin - ($r,'Excel File Compilation Status', - 'Excel File Compilation Progress', - scalar(@$Students),'inline',undef,'Statistics','stats_status'); + my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@$Students)); my $max_row = $rows_output; foreach my $student (@$Students) { last if ($c->aborted()); @@ -952,8 +956,7 @@ sub prepare_excel_output { } } } - &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, - 'last student'); + &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student'); } &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); # @@ -1062,14 +1065,11 @@ sub prepare_csv_output { my ($r,$problems,$students,$anoncounter,$show_named) = @_; my $c = $r->connection(); # - $r->print('

'. - &mt('Generating CSV report of student responses').'

'); + $r->print('

'. + &mt('Generating CSV report of student responses').'

'); # # Progress window - my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin - ($r,'CSV File Compilation Status', - 'CSV File Compilation Progress', - scalar(@$students),'inline',undef,'Statistics','stats_status'); + my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@$students)); $r->rflush(); # @@ -1219,8 +1219,7 @@ sub prepare_csv_output { print $outputfile $/; } undef(@rows); - &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, - 'last student'); + &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student'); } close($outputfile); # @@ -1265,7 +1264,6 @@ sub CreateInterface { ## ## Environment variable initialization my $Str = ''; - $Str .= &Apache::lonhtmlcommon::breadcrumbs('Student Submission Reports'); $Str .= '
'; $Str .= &Apache::loncommon::start_data_table(); $Str .= &Apache::loncommon::start_data_table_header_row(); @@ -1345,17 +1343,11 @@ sub CreateInterface { $Str .= &Apache::loncommon::end_data_table_row(); $Str .= &Apache::loncommon::end_data_table(); # - $Str .= '

' - .&mt('Status: [_1]', - '') - .'

'; - ## return $Str; } sub get_student_columns { - my ($show_named) = @_; + my ($show_named) = @_; my @student_columns; if ($show_named) { @student_columns = @Apache::lonstatistics::SelectedStudentData; @@ -1366,7 +1358,7 @@ sub get_student_columns { @student_columns = ('username'); } return @student_columns; -} +} 1;