[BACK]Return to slotrequest.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/slotrequest.pm between versions 1.54 and 1.55

version 1.54, 2006/03/30 04:34:32 version 1.55, 2006/03/30 04:35:58
Line 313  sub make_reservation { Line 313  sub make_reservation {
   
 sub remove_registration {  sub remove_registration {
     my ($r) = @_;      my ($r) = @_;
       if ($env{'form.entry'} ne 'remove all') {
    return &remove_registration_user($r);
       }
       my $slot_name = $env{'form.slotname'};
       my %slot=&Apache::lonnet::get_slot($slot_name);
   
       my ($cnum,$cdom)=&get_course();
       my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
          "^$slot_name\0");
       if (&network_error(%consumed)) {
    $r->print("<p>".&mt('A network error has occured.').'</p>');
    return;
       }
       if (!%consumed) {
    $r->print("<p>".&mt('Slot <tt>[_1]</tt> has no reservations.',
       $slot_name)."</p>");
    return;
       }
   
       my @names = map { $consumed{$_}{'name'} } (sort(keys(%consumed)));
       my $names = join(' ',@names);
   
       my $msg = &mt('Remove all of [_1] from slot [_2]?',$names,$slot_name);
       &remove_registration_confirmation($r,$msg,['entry','slotname']);
   }
   
   sub remove_registration_user {
       my ($r) = @_;
       
       my $slot_name = $env{'form.slotname'};
   
     my $name = &Apache::loncommon::plainname($env{'form.uname'},      my $name = &Apache::loncommon::plainname($env{'form.uname'},
      $env{'form.udom'});       $env{'form.udom'});
   
     my $title = &Apache::lonnet::gettitle($env{'form.symb'});      my $title = &Apache::lonnet::gettitle($env{'form.symb'});
   
       my $msg = &mt('Remove [_1] from slot [_2] for [_3]',
     $name,$slot_name,$title);
       
       &remove_registration_confirmation($r,$msg,['uname','udom','slotname',
          'entry','symb']);
   }
   
   sub remove_registration_confirmation {
       my ($r,$msg,$inputs) =@_;
   
     my $hidden_input;      my $hidden_input;
     foreach my $parm ('uname','udom','slotname','entry','symb') {      foreach my $parm (@{$inputs}) {
  $hidden_input .=   $hidden_input .=
     '<input type="hidden" name="'.$parm.'" value="'      '<input type="hidden" name="'.$parm.'" value="'
     .&HTML::Entities::encode($env{'form.'.$parm},'"<>&\'').'" />'."\n";      .&HTML::Entities::encode($env{'form.'.$parm},'"<>&\'').'" />'."\n";
     }      }
       my %lt = &Apache::lonlocal::texthash('yes' => 'Yes',
    'no'  => 'No',);
     $r->print(<<"END_CONFIRM");      $r->print(<<"END_CONFIRM");
 <p> Remove $name from slot $env{'form.slotname'} for $title</p>  <p> $msg </p>
 <form action="/adm/slotrequest" method="POST">  <form action="/adm/slotrequest" method="POST">
     <input type="hidden" name="command" value="release" />      <input type="hidden" name="command" value="release" />
       <input type="hidden" name="button" value="yes" />
     $hidden_input      $hidden_input
     <input type="submit" name="Yes" value="yes" />      <input type="submit" value="$lt{'yes'}" />
 </form>  </form>
 <form action="/adm/slotrequest" method="POST">  <form action="/adm/slotrequest" method="POST">
     <input type="hidden" name="command" value="showslots" />      <input type="hidden" name="command" value="showslots" />
     <input type="submit" name="No" value="no" />      <input type="submit" value="$lt{'no'}" />
 </form>  </form>
 END_CONFIRM  END_CONFIRM
   
 }  }
   
   sub release_all_slot {
       my ($r,$mgr)=@_;
       
       my $slot_name = $env{'form.slotname'};
   
       my ($cnum,$cdom)=&get_course();
   
       my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
          "^$slot_name\0");
       
       $r->print('<p>'.&mt('Releasing reservations').'</p>');
   
       foreach my $entry (sort { $consumed{$a}{'name'} cmp 
     $consumed{$b}{'name'} } (keys(%consumed))) {
    my ($uname,$udom) = split('@',$consumed{$entry}{'name'});
    my ($result,$msg) =
       &release_reservation($slot_name,$uname,$udom,
    $consumed{$entry}{'symb'},$mgr);
    $r->print("<p>$msg</p>");
    $r->rflush();
       }
       $r->print('<p><a href="/adm/slotrequest?command=showslots">'.
         &mt('Return to slot list').'</a></p>');
       &return_link($r);
   }
   
 sub release_slot {  sub release_slot {
     my ($r,$symb,$slot_name,$inhibit_return_link,$mgr)=@_;      my ($r,$symb,$slot_name,$inhibit_return_link,$mgr)=@_;
   
     if ($slot_name eq '') { $slot_name=$env{'form.slotname'}; }      if ($slot_name eq '') { $slot_name=$env{'form.slotname'}; }
     my ($cnum,$cdom)=&get_course();  
   
     my ($uname,$udom) = ($env{'user.name'}, $env{'user.domain'});      my ($uname,$udom) = ($env{'user.name'}, $env{'user.domain'});
     if ($mgr eq 'F'       if ($mgr eq 'F' 
Line 355  sub release_slot { Line 424  sub release_slot {
  && defined($env{'form.symb'})) {   && defined($env{'form.symb'})) {
  $symb = $env{'form.symb'};   $symb = $env{'form.symb'};
     }      }
   
       my ($result,$msg) =
    &release_reservation($slot_name,$uname,$udom,$symb,$mgr);
       $r->print("<p>$msg</p>");
       
       if ($mgr eq 'F') {
    $r->print('<p><a href="/adm/slotrequest?command=showslots">'.
     &mt('Return to slot list').'</a></p>');
       }
   
       if (!$inhibit_return_link) { &return_link($r);  }
       return $result;
   }
   
   sub release_reservation {
       my ($slot_name,$uname,$udom,$symb,$mgr) = @_;
     my %slot=&Apache::lonnet::get_slot($slot_name);      my %slot=&Apache::lonnet::get_slot($slot_name);
     my $description=&get_description($env{'form.slotname'},\%slot);      my $description=&get_description($slot_name,\%slot);
   
     if ($mgr ne 'F') {      if ($mgr ne 'F') {
  if ($slot{'starttime'} < time) {   if ($slot{'starttime'} < time) {
     $r->print("<p>Not allowed to release Reservation: $description, as it has already ended.  </p>");      return (0,&mt('Not allowed to release Reservation: [_1], as it has already ended.',$description));
     &return_link($r);  
     return 0;  
  }   }
     }      }
     # get parameter string, check for existance, rebuild string with the slot      # get parameter string, check for existance, rebuild string with the slot
Line 376  sub release_slot { Line 459  sub release_slot {
     }      }
     my $new_param = join(':',@new_slots);      my $new_param = join(':',@new_slots);
   
       my ($cnum,$cdom)=&get_course();
   
     # get slot reservations, check if user has one, if so remove reservation      # get slot reservations, check if user has one, if so remove reservation
     my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,      my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
        "^$slot_name\0");         "^$slot_name\0");
Line 391  sub release_slot { Line 476  sub release_slot {
       '0_availablestudent',        '0_availablestudent',
       1, $new_param, 'string',        1, $new_param, 'string',
       $uname,$udom);        $uname,$udom);
     $r->print("<p>Released Reservation: $description</p>");  
       my $msg;
     if ($mgr eq 'F') {      if ($mgr eq 'F') {
  $r->print('<p><a href="/adm/slotrequest?command=showslots">'.   $msg = &mt('Released Reservation for user: [_1]',"$uname:$udom");
   &mt('Return to slot list').'</a></p>');      } else {
    $msg = &mt('Released Reservation: [_1]',$description);
     }      }
     if (!$inhibit_return_link) { &return_link($r);  }      return (1,$msg);
     return 1;  
 }  }
   
 sub delete_slot {  sub delete_slot {
Line 743  sub to_show { Line 829  sub to_show {
 sub remove_link {  sub remove_link {
     my ($slotname,$entry,$uname,$udom,$symb) = @_;      my ($slotname,$entry,$uname,$udom,$symb) = @_;
   
       my $remove = &mt('Remove');
   
       if ($entry eq 'remove all') {
    $remove = &mt('Remove All');
    undef($uname);
    undef($udom);
       }
   
     $slotname  = &Apache::lonnet::escape($slotname);      $slotname  = &Apache::lonnet::escape($slotname);
     $entry     = &Apache::lonnet::escape($entry);      $entry     = &Apache::lonnet::escape($entry);
     $uname     = &Apache::lonnet::escape($uname);      $uname     = &Apache::lonnet::escape($uname);
     $udom      = &Apache::lonnet::escape($udom);      $udom      = &Apache::lonnet::escape($udom);
     $symb      = &Apache::lonnet::escape($symb);      $symb      = &Apache::lonnet::escape($symb);
   
     my $remove= &mt('Remove');  
   
     return <<"END_LINK";      return <<"END_LINK";
  <a href="/adm/slotrequest?command=remove_registration&slotname=$slotname&entry=$entry&uname=$uname&udom=$udom&symb=$symb"   <a href="/adm/slotrequest?command=remove_registration&slotname=$slotname&entry=$entry&uname=$uname&udom=$udom&symb=$symb"
    >($remove)</a>     >($remove)</a>
Line 1049  EDITLINK Line 1141  EDITLINK
  my $delete=(<<"DELETELINK");   my $delete=(<<"DELETELINK");
 <a href="/adm/slotrequest?command=delete&slotname=$slot">Delete</a>  <a href="/adm/slotrequest?command=delete&slotname=$slot">Delete</a>
 DELETELINK  DELETELINK
   
           my $remove_all=&remove_link($slot,'remove all');
   
         if ($ids ne '') { undef($delete); }          if ($ids ne '') { undef($delete); }
    if ($slots{$slot}{'type'} ne 'schedulable_student') { 
       undef($remove_all);
    }
   
         $r->print("<tr>\n<td rowspan=\"$rowspan\">$edit $delete</td>\n");          $r->print("<tr>\n<td rowspan=\"$rowspan\">$edit $delete $remove_all</td>\n");
  if (exists($show{'name'})) {   if (exists($show{'name'})) {
     $colspan++;$r->print("<td>$slot</td>");      $colspan++;$r->print("<td>$slot</td>");
  }   }
Line 1376  sub handler { Line 1474  sub handler {
     } elsif ($env{'form.command'} eq 'remove_registration' && $mgr eq 'F') {      } elsif ($env{'form.command'} eq 'remove_registration' && $mgr eq 'F') {
  &remove_registration($r);   &remove_registration($r);
     } elsif ($env{'form.command'} eq 'release' && $mgr eq 'F') {      } elsif ($env{'form.command'} eq 'release' && $mgr eq 'F') {
  &release_slot($r,undef,undef,undef,$mgr);   if ($env{'form.entry'} eq 'remove all') {
       &release_all_slot($r,$mgr);
    } else {
       &release_slot($r,undef,undef,undef,$mgr);
    }
     } elsif ($env{'form.command'} eq 'delete' && $mgr eq 'F') {      } elsif ($env{'form.command'} eq 'delete' && $mgr eq 'F') {
  &delete_slot($r);   &delete_slot($r);
     } elsif ($env{'form.command'} eq 'uploadstart' && $mgr eq 'F') {      } elsif ($env{'form.command'} eq 'uploadstart' && $mgr eq 'F') {
Removed from v.1.54  
changed lines
  Added in v.1.55

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