loncom/interface/slotrequest.pm - diff

Return to slotrequest.pm CVS log

Up to [LON-CAPA] / loncom / interface

version 1.43, 2006/02/03 23:42:54	version 1.44, 2006/02/03 23:53:30
Line 498 STUFF	Line 498 STUFF
}	}

sub allowed_slot {	sub allowed_slot {
my ($slot_name,$slot,$symb)=@_;	my ($slot_name,$slot,$symb,$slots)=@_;
#already started	#already started
if ($slot->{'starttime'} < time) {	if ($slot->{'starttime'} < time) {
# all open slot to be schedulable	# all open slot to be schedulable
Line 521 sub allowed_slot {	Line 521 sub allowed_slot {
&& $slot->{'symb'} ne $symb) {	&& $slot->{'symb'} ne $symb) {
return 0;	return 0;
}	}
	my $conflict = &check_for_conflict($symb,$slot_name,$slot,$slots);
	if ($conflict) {
	if ($slots->{$conflict}{'starttime'} < time) {
	return 0;
	}
	}
&Apache::lonxml::debug("$slot_name symb good");	&Apache::lonxml::debug("$slot_name symb good");
return 1;	return 1;
}	}
Line 550 sub show_choices {	Line 556 sub show_choices {
(keys(%slots))) {	(keys(%slots))) {

&Apache::lonxml::debug("Checking Slot $slot");	&Apache::lonxml::debug("Checking Slot $slot");
next if (!&allowed_slot($slot,$slots{$slot}));	next if (!&allowed_slot($slot,$slots{$slot},undef,\%slots));

$available++;	$available++;