--- loncom/interface/slotrequest.pm 2006/02/03 18:22:44 1.40 +++ loncom/interface/slotrequest.pm 2009/10/31 05:39:25 1.105 @@ -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.40 2006/02/03 18:22:44 albertel Exp $ +# $Id: slotrequest.pm,v 1.105 2009/10/31 05:39:25 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,34 +34,39 @@ use Apache::Constants qw(:common :http : use Apache::loncommon(); use Apache::lonlocal; use Apache::lonnet; +use Apache::lonnavmaps(); use Date::Manip; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; sub fail { my ($r,$code)=@_; if ($code eq 'not_valid') { $r->print('

'.&mt('Unable to understand what resource you wanted to sign up for.').'

'); - + } elsif ($code eq 'not_available') { + $r->print('

'.&mt('No slots are available.').'

'); } elsif ($code eq 'not_allowed') { $r->print('

'.&mt('Not allowed to sign up or change reservations at this time.').'

'); } else { $r->print('

'.&mt('Failed.').'

'); } - $r->print('

'. - &mt('Return to last resource').'

'); + &return_link($r); &end_page($r); } sub start_page { - my ($r,$title)=@_; - my $html=&Apache::lonxml::xmlbegin(); - $r->print($html.''.&mt($title).''); - $r->print(&Apache::loncommon::bodytag($title)); + my ($r,$title,$brcrum)=@_; + my $args; + if (ref($brcrum) eq 'ARRAY') { + $args = {bread_crumbs => $brcrum}; + } + $r->print(&Apache::loncommon::start_page($title,undef,$args)); } sub end_page { my ($r)=@_; - $r->print(&Apache::loncommon::endbodytag().''); + $r->print(&Apache::loncommon::end_page()); } =pod @@ -76,7 +81,7 @@ sub end_page { =cut sub get_course { - (undef,my $courseid)=&Apache::lonxml::whichuser(); + (undef,my $courseid)=&Apache::lonnet::whichuser(); my $cdom=$env{'course.'.$courseid.'.domain'}; my $cnum=$env{'course.'.$courseid.'.num'}; return ($cnum,$cdom); @@ -89,7 +94,7 @@ sub get_reservation_ids { my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, "^$slot_name\0"); - if (&network_error(%consumed)) { + if (&Apache::lonnet::error(%consumed)) { return 'error: Unable to determine current status'; } my ($tmp)=%consumed; @@ -113,7 +118,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'}); @@ -126,7 +131,14 @@ sub check_for_reservation { my ($cnum,$cdom)=&get_course(); my %slots=&Apache::lonnet::get('slots', [@slots], $cdom, $cnum); - foreach my $slot_name (@slots) { + if (&Apache::lonnet::error($student) + || &Apache::lonnet::error($course) + || &Apache::lonnet::error(%slots)) { + return 'error: Unable to determine current status'; + } + my @got; + my @sorted_slots = &Apache::loncommon::sorted_slots(\@slots,\%slots); + foreach my $slot_name (@sorted_slots) { next if (!defined($slots{$slot_name}) || !ref($slots{$slot_name})); &Apache::lonxml::debug(time." $slot_name ". @@ -135,69 +147,127 @@ 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 $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(); - my %slots=&Apache::lonnet::get('slots', [@slots], $cdom, $cnum); - my ($tmp) = %slots; - if (&network_error($student) || &network_error($course) || - &network_error($tmp)) { - return 'error: Unable to determine current status'; - } - foreach my $slot_name (@slots) { - 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