version 1.47, 2006/02/09 18:04:51
|
version 1.48, 2006/02/26 19:40:14
|
Line 34 use Apache::Constants qw(:common :http :
|
Line 34 use Apache::Constants qw(:common :http :
|
use Apache::loncommon(); |
use Apache::loncommon(); |
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::lonnet; |
use Apache::lonnet; |
|
use Apache::lonnavmaps(); |
use Date::Manip; |
use Date::Manip; |
|
|
sub fail { |
sub fail { |
Line 159 sub check_for_reservation {
|
Line 160 sub check_for_reservation {
|
return (undef,undef); |
return (undef,undef); |
} |
} |
|
|
sub check_for_conflict { |
sub get_consumed_uniqueperiods { |
my ($symb,$new_slot_name,$new_slot,$slots)=@_; |
my ($slots) = @_; |
|
my $navmap=Apache::lonnavmaps::navmap->new; |
if (!defined($new_slot->{'uniqueperiod'})) { return undef; } |
my @problems = $navmap->retrieveResources(undef, |
|
sub { $_[0]->is_problem() },1,0); |
|
my %used_slots; |
|
foreach my $problem (@problems) { |
|
my $symb = $problem->symb(); |
|
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'}); |
|
if (&network_error($student) || &network_error($course)) { |
|
return 'error: Unable to determine current status'; |
|
} |
|
foreach my $slot (split(/:/,$student), split(/:/, $course)) { |
|
$used_slots{$slot}=1; |
|
} |
|
} |
|
|
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 @slots = (split(/:/,$student), split(/:/, $course)); |
|
my ($cnum,$cdom)=&get_course(); |
|
if (!ref($slots)) { |
if (!ref($slots)) { |
my %slots=&Apache::lonnet::get('slots', [@slots], $cdom, $cnum); |
my ($cnum,$cdom)=&get_course(); |
|
my %slots=&Apache::lonnet::get('slots', [keys(%used_slots)], $cdom, $cnum); |
|
if (&network_error(%slots)) { |
|
return 'error: Unable to determine current status'; |
|
} |
$slots = \%slots; |
$slots = \%slots; |
} |
} |
|
|
if (&network_error($student) || &network_error($course) || |
my %consumed_uniqueperiods; |
&network_error(%$slots)) { |
foreach my $slot_name (keys(%used_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}) || |
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'}}; |
$consumed_uniqueperiods{$slot_name} = |
|
$slots->{$slot_name}{'uniqueperiod'}; |
|
} |
|
return \%consumed_uniqueperiods; |
|
} |
|
|
|
sub check_for_conflict { |
|
my ($symb,$new_slot_name,$new_slot,$slots,$consumed_uniqueperiods)=@_; |
|
|
|
if (!defined($new_slot->{'uniqueperiod'})) { return undef; } |
|
|
|
if (!ref($consumed_uniqueperiods)) { |
|
$consumed_uniqueperiods = &get_consumed_uniqueperiods($slots); |
|
if (&network_error(%$consumed_uniqueperiods)) { |
|
return 'error: Unable to determine current status'; |
|
} |
|
} |
|
|
|
my ($new_uniq_start,$new_uniq_end) = @{$new_slot->{'uniqueperiod'}}; |
|
foreach my $slot_name (keys(%$consumed_uniqueperiods)) { |
|
my ($start,$end)=@{$consumed_uniqueperiods->{$slot_name}}; |
if (! |
if (! |
($start < $new_uniq_start && $end < $new_uniq_start) || |
($start < $new_uniq_start && $end < $new_uniq_start) || |
($start > $new_uniq_end && $end > $new_uniq_end )) { |
($start > $new_uniq_end && $end > $new_uniq_end )) { |
Line 497 STUFF
|
Line 528 STUFF
|
} |
} |
|
|
sub allowed_slot { |
sub allowed_slot { |
my ($slot_name,$slot,$symb,$slots)=@_; |
my ($slot_name,$slot,$symb,$slots,$consumed_uniqueperiods)=@_; |
#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 520 sub allowed_slot {
|
Line 551 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); |
my $conflict = &check_for_conflict($symb,$slot_name,$slot,$slots, |
|
$consumed_uniqueperiods); |
if ($conflict) { |
if ($conflict) { |
if ($slots->{$conflict}{'starttime'} < time) { |
if ($slots->{$conflict}{'starttime'} < time) { |
return 0; |
return 0; |
Line 546 sub show_choices {
|
Line 578 sub show_choices {
|
|
|
my ($cnum,$cdom)=&get_course(); |
my ($cnum,$cdom)=&get_course(); |
my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum); |
my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum); |
|
my $consumed_uniqueperiods = &get_consumed_uniqueperiods(\%slots); |
my $available; |
my $available; |
$r->print('<table border="1">'); |
$r->print('<table border="1">'); |
&Apache::lonxml::debug("Checking Slots"); |
&Apache::lonxml::debug("Checking Slots"); |
Line 555 sub show_choices {
|
Line 588 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},undef,\%slots)); |
next if (!&allowed_slot($slot,$slots{$slot},undef,\%slots, |
|
$consumed_uniqueperiods)); |
|
|
$available++; |
$available++; |
|
|
Line 571 sub show_choices {
|
Line 605 sub show_choices {
|
$command='release'; |
$command='release'; |
} else { |
} else { |
my $conflict = &check_for_conflict($symb,$slot,$slots{$slot}, |
my $conflict = &check_for_conflict($symb,$slot,$slots{$slot}, |
\%slots); |
\%slots, |
|
$consumed_uniqueperiods); |
if ($conflict) { |
if ($conflict) { |
$text=&mt('Change Reservation'); |
$text=&mt('Change Reservation'); |
$command='get'; |
$command='get'; |