Diff for /loncom/interface/spreadsheet/classcalc.pm between versions 1.18 and 1.20

version 1.18, 2004/01/14 16:48:51 version 1.20, 2004/06/04 21:43:36
Line 299  sub outsheet_htmlclasslist { Line 299  sub outsheet_htmlclasslist {
     my $self = shift;      my $self = shift;
     my ($r) = @_;      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('<a href="/adm/classcalc?output_format=htmlclasslist&'.
                     'recalc=ilovewastingtime&not_first_run=1">'.
                     &mt('Expire all student spreadsheets').'</a>'.$/);
       }
       #
     $r->print('<h3>'.      $r->print('<h3>'.
               &mt('Click on a student to be taken to their spreadsheet').                &mt('Click on a student to be taken to their spreadsheet').
               '</h3>');                '</h3>');
Line 322  sub outsheet_htmlclasslist { Line 334  sub outsheet_htmlclasslist {
   <th>$header{'domain'}</th>    <th>$header{'domain'}</th>
   <th>$header{'section'}</th>    <th>$header{'section'}</th>
   <th>$header{'status'}</th>    <th>$header{'status'}</th>
 </tr>  
 END  END
       if ($show_expire_link) {
           $tableheader.= '<th>&nbsp;</th>';
       }
       $tableheader.= "</tr>\n";
     #      #
     my $num_output = 0;      my $num_output = 0;
     foreach my $student (@Students) {      foreach my $student (@Students) {
Line 339  END Line 354  END
   '<td>'.$link.$student->{'username'}.'</a></td>'.    '<td>'.$link.$student->{'username'}.'</a></td>'.
   '<td>'.$student->{'domain'}  .'</td>'.    '<td>'.$student->{'domain'}  .'</td>'.
   '<td>'.$student->{'section'} .'</td>'.    '<td>'.$student->{'section'} .'</td>'.
   '<td>'.$student->{'status'}  .'</td>'.    '<td>'.$student->{'status'}  .'</td>');
                   "</tr>\n");          if ($show_expire_link) {
               $r->print('<td>'.
                         '<a href="/adm/classcalc?recalc=student:'.
                         $student->{'username'}.':'.$student->{'domain'}.'&'.
                         'output_format=htmlclasslist&'.
                         'not_first_run=1'.'">Expire Record</a>'.$/);
           }
           $r->print("</tr>\n");
     }      }
     $r->print("</table></p>\n");      $r->print("</table></p>\n");
     return;      return;
Line 354  sub compute { Line 376  sub compute {
     $self->initialize_safe_space();      $self->initialize_safe_space();
     my %c = $self->constants();      my %c = $self->constants();
     my %f = $self->formulas();      my %f = $self->formulas();
       &Apache::studentcalc::initialize_package();
     my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin      my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
         ($r,&mt('Spreadsheet Computation Status'),          ($r,&mt('Spreadsheet Computation Status'),
          &mt('Spreadsheet Computation'), scalar(@Students));           &mt('Spreadsheet Computation'), scalar(@Students));
     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,      &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
                                           &mt('Processing course structure'));  
     &Apache::studentcalc::initialize_package();  
     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,  
                                           &mt('Processing first student'));                                            &mt('Processing first student'));
     foreach my $student (@Students) {      foreach my $student (@Students) {
         if ($connection->aborted()) { $self->cleanup(); return; }          if ($connection->aborted()) { $self->cleanup(); return; }

Removed from v.1.18  
changed lines
  Added in v.1.20


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>