--- loncom/interface/spreadsheet/classcalc.pm 2004/06/08 15:55:38 1.21 +++ loncom/interface/spreadsheet/classcalc.pm 2006/04/06 20:24:13 1.26 @@ -1,5 +1,5 @@ # -# $Id: classcalc.pm,v 1.21 2004/06/08 15:55:38 matthew Exp $ +# $Id: classcalc.pm,v 1.26 2006/04/06 20:24:13 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -228,12 +228,12 @@ sub excel_rows { # writes the meat of the spreadsheet to an excel worksheet. Called # by Spreadsheet::outsheet_excel; my $self = shift; - my ($connection,$worksheet,$cols_output,$rows_output) = @_; + my ($connection,$worksheet,$cols_output,$rows_output,$format) = @_; # # Write a header row $cols_output = 0; foreach my $value ('Fullname','Username','Domain','Section','Status','ID') { - $worksheet->write($rows_output,$cols_output++,&mt($value)); + $worksheet->write($rows_output,$cols_output++,&mt($value),$format->{'h4'}); } $rows_output++; # @@ -285,6 +285,8 @@ sub output_options { my $self = shift(); return ({value => 'htmlclasslist', description => 'Student Sheet Links'}, + {value => 'source', + description => 'Show Source'}, {value => 'html', description => 'HTML'}, {value => 'excel', @@ -307,7 +309,7 @@ sub outsheet_htmlclasslist { # # Determine if we should output expire caches links... my $show_expire_link = 0; - if (exists($ENV{'user.role.dc./'.$ENV{'request.role.domain'}.'/'})){ + if (exists($env{'user.role.dc./'.$env{'request.role.domain'}.'/'})){ $show_expire_link = 1; } # @@ -404,7 +406,8 @@ sub compute { if ($connection->aborted()) { $self->cleanup(); return; } my $sname = $student->{'username'}.':'.$student->{'domain'}; my $studentsheet = Apache::studentcalc->new - ($student->{'username'},$student->{'domain'},undef); + ($student->{'username'},$student->{'domain'},undef,undef, + $student->{'section'},$student->{'group'} ); if ($connection->aborted()) { $self->cleanup(); return; } my @exportdata = $studentsheet->export_data($r); if ($studentsheet->badcalc()) {