Diff for /loncom/interface/slotrequest.pm between versions 1.16 and 1.18

version 1.16, 2005/09/13 07:33:59 version 1.18, 2005/09/13 08:12:03
Line 58  sub start_page { Line 58  sub start_page {
     $r->print($html.'<head><title>'.      $r->print($html.'<head><title>'.
       &mt('Request another Worktime').'</title></head>');        &mt('Request another Worktime').'</title></head>');
     $r->print(&Apache::loncommon::bodytag('Requesting another Worktime'));      $r->print(&Apache::loncommon::bodytag('Requesting another Worktime'));
     $r->print('<p>'.$env{'form.command'}.'</p>');  
 }  }
   
 sub end_page {  sub end_page {
Line 692  sub csvupload_fields { Line 691  sub csvupload_fields {
 }  }
   
 sub csv_upload_assign {  sub csv_upload_assign {
     my ($r,$symb)= @_;      my ($r,$symb,$mgr)= @_;
     &Apache::loncommon::load_tmp_file($r);      &Apache::loncommon::load_tmp_file($r);
     my @slotdata = &Apache::loncommon::upfile_record_sep();      my @slotdata = &Apache::loncommon::upfile_record_sep();
     if ($env{'form.noFirstLine'}) { shift(@slotdata); }      if ($env{'form.noFirstLine'}) { shift(@slotdata); }
Line 737  sub csv_upload_assign { Line 736  sub csv_upload_assign {
     }      }
     $r->print("<br />Created $countdone slots\n");      $r->print("<br />Created $countdone slots\n");
     $r->print("<br />\n");      $r->print("<br />\n");
     &show_table($r,$symb);      &show_table($r,$symb,$mgr);
     return '';      return '';
 }  }
   
Line 763  sub handler { Line 762  sub handler {
  &csv_upload_map($r,$symb);   &csv_upload_map($r,$symb);
     } elsif ($env{'form.command'} eq 'csvuploadassign' && $mgr eq 'F') {      } elsif ($env{'form.command'} eq 'csvuploadassign' && $mgr eq 'F') {
  if ($env{'form.associate'} ne 'Reverse Association') {   if ($env{'form.associate'} ne 'Reverse Association') {
     &csv_upload_assign($r,$symb);      &csv_upload_assign($r,$symb,$mgr);
  } else {   } else {
     if ( $env{'form.upfile_associate'} ne 'reverse' ) {      if ( $env{'form.upfile_associate'} ne 'reverse' ) {
  $env{'form.upfile_associate'} = 'reverse';   $env{'form.upfile_associate'} = 'reverse';

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


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