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

Diff for /loncom/interface/slotrequest.pm between versions 1.6 and 1.7

version 1.6, 2005/08/09 15:04:50 version 1.7, 2005/08/09 15:38:13
Line 125  sub check_for_reservation { Line 125  sub check_for_reservation {
  &Apache::lonxml::debug(time." $slot_name ".   &Apache::lonxml::debug(time." $slot_name ".
        $slots{$slot_name}->{'starttime'}." -- ".         $slots{$slot_name}->{'starttime'}." -- ".
        $slots{$slot_name}->{'startreserve'});         $slots{$slot_name}->{'startreserve'});
  if ($slots{$slot_name}->{'starttime'} > time &&   if ($slots{$slot_name}->{'endtime'} > time &&
     $slots{$slot_name}->{'startreserve'} < time) {      $slots{$slot_name}->{'startreserve'} < time) {
     # between start of reservation times and start of slot      # between start of reservation times and end of slot
     return($slot_name, $slots{$slot_name});      return($slot_name, $slots{$slot_name});
  }   }
     }      }
Line 158  sub check_for_conflict { Line 158  sub check_for_conflict {
   
 }  }
   
 # FIXME - depends on the parameter for the resource to be correct  
 #         to prevent multiple reservations  
   
 sub make_reservation {  sub make_reservation {
     my ($slot_name,$slot,$symb)=@_;      my ($slot_name,$slot,$symb)=@_;
   
Line 189  sub make_reservation { Line 186  sub make_reservation {
   
     my (@ids)=&get_reservation_ids($slot_name);      my (@ids)=&get_reservation_ids($slot_name);
   
     # FIXME we could end up having holes...   
     my $last=0;      my $last=0;
     foreach my $id (@ids) {      foreach my $id (@ids) {
  my $num=(split('\0',$id))[1];   my $num=(split('\0',$id))[1];
Line 198  sub make_reservation { Line 194  sub make_reservation {
           
     my $wanted=$last+1;      my $wanted=$last+1;
     &Apache::lonxml::debug("wanted $wanted<br />");      &Apache::lonxml::debug("wanted $wanted<br />");
     if ($wanted >= $max) {      if (scalar(@ids) >= $max) {
  # full up   # full up
  return -1;   return undef;
     }      }
           
     my %reservation=('name'      => $env{'user.name'}.'@'.$env{'user.domain'},      my %reservation=('name'      => $env{'user.name'}.'@'.$env{'user.domain'},
Line 213  sub make_reservation { Line 209  sub make_reservation {
  $cdom, $cnum);   $cdom, $cnum);
   
     if ($success eq 'ok') {      if ($success eq 'ok') {
  #FIXME need to set the parm  
  my $new_value=$slot_name;   my $new_value=$slot_name;
  if ($value) {   if ($value) {
     $new_value=$value.':'.$new_value;      $new_value=$value.':'.$new_value;
Line 268  sub release_slot { Line 263  sub release_slot {
     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($env{'form.slotname'},\%slot);
     $r->print("<p>Released Reservation: $description</p>");      $r->print("<p>Released Reservation: $description</p>");
     if ($inhibit_return_link) {      if (!$inhibit_return_link) {
  $r->print('<p><a href="/adm/flip?postdata=return:">'.   $r->print('<p><a href="/adm/flip?postdata=return:">'.
   &mt('Return to last resource').'</a></p>');    &mt('Return to last resource').'</a></p>');
     }      }
Line 285  sub get_slot { Line 280  sub get_slot {
  %slot=&Apache::lonnet::get_slot($env{'form.slotname'});   %slot=&Apache::lonnet::get_slot($env{'form.slotname'});
  my $description2=&get_description($env{'form.slotname'},\%slot);   my $description2=&get_description($env{'form.slotname'},\%slot);
  $r->print("<p>Already have a reservation: $description1</p>");   $r->print("<p>Already have a reservation: $description1</p>");
  $r->print(<<STUFF);   if ($slot_name ne $env{'form.slotname'}) {
       $r->print(<<STUFF);
 <form method="POST" action="/adm/slotrequest">  <form method="POST" action="/adm/slotrequest">
    <input type="hidden" name="symb" value="$env{'form.symb'}" />     <input type="hidden" name="symb" value="$env{'form.symb'}" />
    <input type="hidden" name="slotname" value="$env{'form.slotname'}" />     <input type="hidden" name="slotname" value="$env{'form.slotname'}" />
    <input type="hidden" name="releaseslot" value="$slot_name" />     <input type="hidden" name="releaseslot" value="$slot_name" />
    <input type="hidden" name="command" value="change" />     <input type="hidden" name="command" value="change" />
 STUFF  STUFF
  $r->print("<p>You can either ");              $r->print("<p>You can either ");
  $r->print(<<STUFF);      $r->print(<<STUFF);
    <input type="submit" name="change" value="Change" />     <input type="submit" name="change" value="Change" />
 STUFF  STUFF
  $r->print(' your reservation from <b>'.$description1.'</b> to <b>'.      $r->print(' your reservation from <b>'.$description1.'</b> to <b>'.
   $description2.        $description2.
   '</b> <br />or <a href="/adm/flip?postdata=return:">'.        '</b> <br />or <a href="/adm/flip?postdata=return:">'.
   &mt('Return to last resource').'</a></p>');        &mt('Return to last resource').'</a></p>');
  $r->print(<<STUFF);      $r->print(<<STUFF);
 </form>  </form>
 STUFF  STUFF
  # FIXME add button to free current reservation and get new one          } else {
       $r->print('<p><a href="/adm/flip?postdata=return:">'.
         &mt('Return to last resource').'</a></p>');
    }
  return;   return;
     }      }
     my %slot=&Apache::lonnet::get_slot($env{'form.slotname'});      my %slot=&Apache::lonnet::get_slot($env{'form.slotname'});
     my $reserved=&make_reservation($env{'form.slotname'},      my $reserved=&make_reservation($env{'form.slotname'},
    \%slot,$symb);     \%slot,$symb);
     my $description=&get_description($env{'form.slotname'},\%slot);      my $description=&get_description($env{'form.slotname'},\%slot);
     if ($reserved > -1) {      if (defined($reserved)) {
  $r->print("<p>Success: $description</p>");   if ($reserved > -1) {
  $r->print('<p><a href="/adm/flip?postdata=return:">'.      $r->print("<p>Success: $description</p>");
   &mt('Return to last resource').'</a></p>');      $r->print('<p><a href="/adm/flip?postdata=return:">'.
  return;        &mt('Return to last resource').'</a></p>');
     } elsif ($reserved < 0) {      return;
  $r->print("<p>Already reserved: $description</p>");   } elsif ($reserved < 0) {
  $r->print('<p><a href="/adm/flip?postdata=return:">'.      $r->print("<p>Already reserved: $description</p>");
   &mt('Return to last resource').'</a></p>');      $r->print('<p><a href="/adm/flip?postdata=return:">'.
  return;        &mt('Return to last resource').'</a></p>');
       return;
    }
     }      }
   
     my %lt=('request'=>"Request another attempt",      my %lt=('request'=>"Availibility list",
     'try'    =>'Try again');      'try'    =>'Try again');
     %lt=&Apache::lonlocal::texthash(%lt);      %lt=&Apache::lonlocal::texthash(%lt);
   
Line 411  sub show_choices { Line 412  sub show_choices {
  my $description=&get_description($slot,$slots{$slot});   my $description=&get_description($slot,$slots{$slot});
   
  my $form=&mt('Unavailable');   my $form=&mt('Unavailable');
  if (&space_available($slot,$slots{$slot},$symb)) {   if (($slot eq $got_slot) ||
       &space_available($slot,$slots{$slot},$symb)) {
     my $text=&mt('Select');      my $text=&mt('Select');
     my $command='get';      my $command='get';
     if ($slot eq $got_slot) {      if ($slot eq $got_slot) {
Removed from v.1.6  
changed lines
  Added in v.1.7

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