--- loncom/interface/spreadsheet/classcalc.pm 2004/01/14 16:48:51 1.18 +++ loncom/interface/spreadsheet/classcalc.pm 2010/12/03 21:33:56 1.30 @@ -1,5 +1,5 @@ # -# $Id: classcalc.pm,v 1.18 2004/01/14 16:48:51 matthew Exp $ +# $Id: classcalc.pm,v 1.30 2010/12/03 21:33:56 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -83,17 +83,25 @@ sub html_header { my $self = shift; my ($toprow,$bottomrow); &Apache::lonstatistics::clear_classlist_variables(); - foreach (['Sections',&Apache::lonstatistics::SectionSelect('Section','multpile',3)], - ['Enrollment Status',&Apache::lonhtmlcommon::StatusOptions(undef,undef,3)], + foreach (['Sections',&Apache::lonstatistics::SectionSelect('Section','multiple',3)], + ['Groups',&Apache::lonstatistics::GroupSelect('Group','multiple',3)], + ['Access Status',&Apache::lonhtmlcommon::StatusOptions(undef,undef,3)], ['Output Format',$self->output_selector()]) { my ($name,$selector) = @{$_}; $toprow .= ''.&mt($name).''; $bottomrow .= ''.$selector.''; } + my $status .= '

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

'; + return "

\n\n". "".$toprow."\n". "".$bottomrow."\n". - "
\n

"; + "\n".$status."\n". + "

"; } sub get_title { @@ -138,6 +146,7 @@ sub outsheet_html { 'username' => 'Username', 'domain' => 'Domain', 'section' => 'Section', + 'groups' => 'Groups', 'row' => 'Row', ); my $tableheader =<<"END"; @@ -183,6 +192,7 @@ END $header{'username'} $header{'domain'} $header{'section'} + $header{'groups'} $header{'status'} END foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){ @@ -209,6 +219,7 @@ END ''.$link.$student->{'username'}.''. ''.$student->{'domain'} .''. ''.$student->{'section'} .''. + ''.$student->{'groups'} .''. ''.$student->{'status'} .''. $self->html_row($num_uneditable,$rownum,$exportcolor, $importcolor). @@ -222,12 +233,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)); + foreach my $value ('Fullname','Username','Domain','Section','Group','Status','ID') { + $worksheet->write($rows_output,$cols_output++,&mt($value),$format->{'h4'}); } $rows_output++; # @@ -241,6 +252,7 @@ sub excel_rows { $student->{'username'}, $student->{'domain'}, $student->{'section'}, + $student->{'groups'}, $student->{'status'}, $student->{'id'}); $self->excel_output_row($worksheet,$rownum,$rows_output++, @@ -257,7 +269,7 @@ sub csv_rows { # # Write a header row $self->csv_output_row($filehandle,undef, - (&mt('Fullname'),&mt('Username'),&mt('Domain'),&mt('Section'),&mt('Status'),&mt('ID'))); + (&mt('Fullname'),&mt('Username'),&mt('Domain'),&mt('Section'),&mt('Group'),&mt('Status'),&mt('ID'))); # # Write each students row foreach my $student (@Students) { @@ -268,6 +280,7 @@ sub csv_rows { $student->{'username'}, $student->{'domain'}, $student->{'section'}, + $student->{'groups'}, $student->{'status'}, $student->{'id'}); $self->csv_output_row($filehandle,$rownum,@studentdata); @@ -279,6 +292,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', @@ -299,6 +314,18 @@ sub outsheet_htmlclasslist { my $self = shift; my ($r) = @_; # + # Determine if we should output expire caches links... + my $show_expire_link = 0; + if (exists($env{'user.role.dc./'.$env{'request.role.domain'}.'/'})){ + $show_expire_link = 1; + } + # + if ($show_expire_link) { + $r->print(''. + &mt('Expire all student spreadsheets').''.$/); + } + # $r->print('

'. &mt('Click on a student to be taken to their spreadsheet'). '

'); @@ -309,6 +336,7 @@ sub outsheet_htmlclasslist { 'username' => 'Username', 'domain' => 'Domain', 'section' => 'Section', + 'groups' => 'Groups', ); # # Prepare to output rows @@ -321,9 +349,13 @@ sub outsheet_htmlclasslist { $header{'username'} $header{'domain'} $header{'section'} + $header{'groups'} $header{'status'} - END + if ($show_expire_link) { + $tableheader.= ' '; + } + $tableheader.= "\n"; # my $num_output = 0; foreach my $student (@Students) { @@ -339,13 +371,31 @@ END ''.$link.$student->{'username'}.''. ''.$student->{'domain'} .''. ''.$student->{'section'} .''. - ''.$student->{'status'} .''. - "\n"); + ''.$student->{'groups'} .''. + ''.$student->{'status'} .''); + if ($show_expire_link) { + $r->print(''. + 'Expire Record'.$/); + } + $r->print("\n"); } $r->print("

\n"); return; } +sub update_status { + my ($r,$message) = @_; + $r->print(''); + $r->rflush(); + return; +} + sub compute { my $self = shift; my ($r) = @_; @@ -354,19 +404,20 @@ sub compute { $self->initialize_safe_space(); my %c = $self->constants(); my %f = $self->formulas(); + &update_status($r,'Initializing Course Structure'); + &Apache::studentcalc::initialize_package(); my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin ($r,&mt('Spreadsheet Computation Status'), - &mt('Spreadsheet Computation'), scalar(@Students)); - &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, - &mt('Processing course structure')); - &Apache::studentcalc::initialize_package(); + &mt('Spreadsheet Computation'), scalar(@Students),'inline',undef, + 'sheet','spreadsheet_status'); &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state, &mt('Processing first student')); foreach my $student (@Students) { 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->{'groupref'} ); if ($connection->aborted()) { $self->cleanup(); return; } my @exportdata = $studentsheet->export_data($r); if ($studentsheet->badcalc()) { @@ -390,11 +441,13 @@ sub compute { 'last student'); } &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); + &update_status($r,'Done computing student sheets'); $r->rflush(); $self->constants(\%c); $self->formulas(\%f); $self->calcsheet(); $self->save() if ($self->need_to_save()); + &update_status($r,'Done!'); } 1;