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

Diff for /loncom/interface/slotrequest.pm between versions 1.42 and 1.43

version 1.42, 2006/02/03 18:53:08 version 1.43, 2006/02/03 23:42:54
Line 112  sub space_available { Line 112  sub space_available {
 }  }
   
 sub check_for_reservation {  sub check_for_reservation {
     my ($symb)=@_;      my ($symb,$mode)=@_;
     my $student = &Apache::lonnet::EXT("resource.0.availablestudent", $symb,      my $student = &Apache::lonnet::EXT("resource.0.availablestudent", $symb,
        $env{'user.domain'}, $env{'user.name'});         $env{'user.domain'}, $env{'user.name'});
   
Line 129  sub check_for_reservation { Line 129  sub check_for_reservation {
  &network_error(%slots)) {   &network_error(%slots)) {
  return 'error: Unable to determine current status';   return 'error: Unable to determine current status';
     }          }    
     foreach my $slot_name (@slots) {      my @got;
       foreach my $slot_name (sort {
    if (ref($slots{$a}) && ref($slots{$b})) {
       return $slots{$a}{'starttime'} <=> $slots{$b}{'starttime'}
    }
    if (ref($slots{$a})) { return -1;}
    if (ref($slots{$b})) { return 1;}
    return 0;
       } @slots) {
  next if (!defined($slots{$slot_name}) ||   next if (!defined($slots{$slot_name}) ||
  !ref($slots{$slot_name}));   !ref($slots{$slot_name}));
  &Apache::lonxml::debug(time." $slot_name ".   &Apache::lonxml::debug(time." $slot_name ".
Line 138  sub check_for_reservation { Line 146  sub check_for_reservation {
  if ($slots{$slot_name}->{'endtime'} > time &&   if ($slots{$slot_name}->{'endtime'} > time &&
     $slots{$slot_name}->{'startreserve'} < time) {      $slots{$slot_name}->{'startreserve'} < time) {
     # between start of reservation times and end of slot      # between start of reservation times and end of slot
     return($slot_name, $slots{$slot_name});      if ($mode eq 'allslots') {
    push(@got,$slot_name);
       } else {
    return($slot_name, $slots{$slot_name});
       }
  }   }
     }      }
       if ($mode eq 'allslots' && @got) {
    return @got;
       }
     return (undef,undef);      return (undef,undef);
 }  }
   
 sub check_for_conflict {  sub check_for_conflict {
     my ($symb,$new_slot_name)=@_;      my ($symb,$new_slot_name,$new_slot,$slots)=@_;
   
       if (!defined($new_slot->{'uniqueperiod'})) { return undef; }
   
     my $student = &Apache::lonnet::EXT("resource.0.availablestudent", $symb,      my $student = &Apache::lonnet::EXT("resource.0.availablestudent", $symb,
        $env{'user.domain'}, $env{'user.name'});         $env{'user.domain'}, $env{'user.name'});
     my $course = &Apache::lonnet::EXT("resource.0.available", $symb,      my $course =  &Apache::lonnet::EXT("resource.0.available",        $symb,
       $env{'user.domain'}, $env{'user.name'});         $env{'user.domain'}, $env{'user.name'});
     my @slots = (split(/:/,$student), split(/:/, $course));      my @slots = (split(/:/,$student), split(/:/, $course));
     my ($cnum,$cdom)=&get_course();      my ($cnum,$cdom)=&get_course();
     my %slots=&Apache::lonnet::get('slots', [@slots], $cdom, $cnum);      if (!ref($slots)) {
    my %slots=&Apache::lonnet::get('slots', [@slots], $cdom, $cnum);
    $slots = \%slots;
       }
   
     if (&network_error($student) || &network_error($course)  ||      if (&network_error($student) || &network_error($course)  ||
  &network_error(%slots)) {   &network_error(%$slots)) {
  return 'error: Unable to determine current status';   return 'error: Unable to determine current status';
     }          }    
   
       my ($new_uniq_start,$new_uniq_end) = @{$new_slot->{'uniqueperiod'}};
     foreach my $slot_name (@slots) {      foreach my $slot_name (@slots) {
  next if (!defined($slots{$slot_name}) ||   next if (!defined($slots->{$slot_name}) ||
  !ref($slots{$slot_name}));   !ref($slots->{$slot_name}));
   
         next if (!defined($slots{$slot_name}->{'uniqueperiod'}) ||          next if (!defined($slots->{$slot_name}{'uniqueperiod'}) ||
  !ref($slots{$slot_name}->{'uniqueperiod'}));   !ref($slots->{$slot_name}{'uniqueperiod'}));
  my ($start,$end)=@{$slots{$slot_name}->{'uniqueperiod'}};   my ($start,$end)=@{$slots->{$slot_name}{'uniqueperiod'}};
  if ($start<time && time < $end) {   if (!
       ($start < $new_uniq_start &&  $end < $new_uniq_start) ||
       ($start > $new_uniq_end   &&  $end > $new_uniq_end  )) {
     return $slot_name;      return $slot_name;
  }   }
     }      }
Line 305  sub release_slot { Line 330  sub release_slot {
     my $description=&get_description($env{'form.slotname'},\%slot);      my $description=&get_description($env{'form.slotname'},\%slot);
   
     if ($mgr ne 'F') {      if ($mgr ne 'F') {
  if ($slot{$slot_name}{'starttime'} < time) {   if ($slot{'starttime'} < time) {
     $r->print("<p>Not allowed to release Reservation: $description, as it has already ended.</p>");      $r->print("<p>Not allowed to release Reservation: $description, as it has already ended.  </p>");
     &return_link($r);      &return_link($r);
     return 0;      return 0;
  }   }
Line 389  sub return_link { Line 414  sub return_link {
 sub get_slot {  sub get_slot {
     my ($r,$symb)=@_;      my ($r,$symb)=@_;
   
     my $slot_name=&check_for_conflict($symb,$env{'form.slotname'});      my %slot=&Apache::lonnet::get_slot($env{'form.slotname'});
       my $slot_name=&check_for_conflict($symb,$env{'form.slotname'},\%slot);
   
     if ($slot_name =~ /^error: (.*)/) {      if ($slot_name =~ /^error: (.*)/) {
  $r->print("<p>An error occured while attempting to make a reservation. ($1)</p>");   $r->print("<p>An error occured while attempting to make a reservation. ($1)</p>");
Line 518  sub show_choices { Line 544  sub show_choices {
     my $available;      my $available;
     $r->print('<table border="1">');      $r->print('<table border="1">');
     &Apache::lonxml::debug("Checking Slots");      &Apache::lonxml::debug("Checking Slots");
     my ($got_slot)=&check_for_reservation($symb);      my @got_slots=&check_for_reservation($symb,'allslots');
     foreach my $slot (sort       foreach my $slot (sort 
       { return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'} }        { return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'} }
       (keys(%slots)))  {        (keys(%slots)))  {
Line 531  sub show_choices { Line 557  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 (($slot eq $got_slot) ||   if ((grep(/^\Q$slot\E$/,@got_slots)) ||
     &space_available($slot,$slots{$slot},$symb)) {      &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 (grep(/^\Q$slot\E$/,@got_slots)) {
  $text=&mt('Free Reservation');   $text=&mt('Free Reservation');
  $command='release';   $command='release';
       } else {
    my $conflict = &check_for_conflict($symb,$slot,$slots{$slot},
      \%slots);
    if ($conflict) {
       $text=&mt('Change Reservation');
       $command='get';
    }
     }      }
     my $escsymb=&Apache::lonnet::escape($symb);      my $escsymb=&Apache::lonnet::escape($symb);
     $form=<<STUFF;      $form=<<STUFF;
Removed from v.1.42  
changed lines
  Added in v.1.43

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