--- loncom/interface/slotrequest.pm	2006/02/03 18:53:08	1.42
+++ loncom/interface/slotrequest.pm	2006/02/03 23:42:54	1.43
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for requesting to have slots added to a students record
 #
-# $Id: slotrequest.pm,v 1.42 2006/02/03 18:53:08 albertel Exp $
+# $Id: slotrequest.pm,v 1.43 2006/02/03 23:42:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -112,7 +112,7 @@ sub space_available {
 }
 
 sub check_for_reservation {
-    my ($symb)=@_;
+    my ($symb,$mode)=@_;
     my $student = &Apache::lonnet::EXT("resource.0.availablestudent", $symb,
 				       $env{'user.domain'}, $env{'user.name'});
 
@@ -129,7 +129,15 @@ sub check_for_reservation {
 	&network_error(%slots)) {
 	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}) ||
 		 !ref($slots{$slot_name}));
 	&Apache::lonxml::debug(time." $slot_name ".
@@ -138,34 +146,51 @@ sub check_for_reservation {
 	if ($slots{$slot_name}->{'endtime'} > time &&
 	    $slots{$slot_name}->{'startreserve'} < time) {
 	    # 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);
 }
 
 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,
 				       $env{'user.domain'}, $env{'user.name'});
-    my $course = &Apache::lonnet::EXT("resource.0.available", $symb,
-				      $env{'user.domain'}, $env{'user.name'});
+    my $course =  &Apache::lonnet::EXT("resource.0.available",        $symb,
+				       $env{'user.domain'}, $env{'user.name'});
     my @slots = (split(/:/,$student), split(/:/, $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)  ||
-	&network_error(%slots)) {
+	&network_error(%$slots)) {
 	return 'error: Unable to determine current status';
     }    
+
+    my ($new_uniq_start,$new_uniq_end) = @{$new_slot->{'uniqueperiod'}};
     foreach my $slot_name (@slots) {
-	next if (!defined($slots{$slot_name}) ||
-		 !ref($slots{$slot_name}));
+	next if (!defined($slots->{$slot_name}) ||
+		 !ref($slots->{$slot_name}));
 
-        next if (!defined($slots{$slot_name}->{'uniqueperiod'}) ||
-		 !ref($slots{$slot_name}->{'uniqueperiod'}));
-	my ($start,$end)=@{$slots{$slot_name}->{'uniqueperiod'}};
-	if ($start<time && time < $end) {
+        next if (!defined($slots->{$slot_name}{'uniqueperiod'}) ||
+		 !ref($slots->{$slot_name}{'uniqueperiod'}));
+	my ($start,$end)=@{$slots->{$slot_name}{'uniqueperiod'}};
+	if (!
+	    ($start < $new_uniq_start &&  $end < $new_uniq_start) ||
+	    ($start > $new_uniq_end   &&  $end > $new_uniq_end  )) {
 	    return $slot_name;
 	}
     }
@@ -305,8 +330,8 @@ sub release_slot {
     my $description=&get_description($env{'form.slotname'},\%slot);
 
     if ($mgr ne 'F') {
-	if ($slot{$slot_name}{'starttime'} < time) {
-	    $r->print("<p>Not allowed to release Reservation: $description, as it has already ended.</p>");
+	if ($slot{'starttime'} < time) {
+	    $r->print("<p>Not allowed to release Reservation: $description, as it has already ended.  </p>");
 	    &return_link($r);
 	    return 0;
 	}
@@ -389,7 +414,8 @@ sub return_link {
 sub get_slot {
     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: (.*)/) {
 	$r->print("<p>An error occured while attempting to make a reservation. ($1)</p>");
@@ -518,7 +544,7 @@ sub show_choices {
     my $available;
     $r->print('<table border="1">');
     &Apache::lonxml::debug("Checking Slots");
-    my ($got_slot)=&check_for_reservation($symb);
+    my @got_slots=&check_for_reservation($symb,'allslots');
     foreach my $slot (sort 
 		      { return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'} }
 		      (keys(%slots)))  {
@@ -531,13 +557,20 @@ sub show_choices {
 	my $description=&get_description($slot,$slots{$slot});
 
 	my $form=&mt('Unavailable');
-	if (($slot eq $got_slot) ||
+	if ((grep(/^\Q$slot\E$/,@got_slots)) ||
 	    &space_available($slot,$slots{$slot},$symb)) {
 	    my $text=&mt('Select');
 	    my $command='get';
-	    if ($slot eq $got_slot) {
+	    if (grep(/^\Q$slot\E$/,@got_slots)) {
 		$text=&mt('Free Reservation');
 		$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);
 	    $form=<<STUFF;