--- loncom/interface/slotrequest.pm 2006/02/06 22:42:11 1.45 +++ loncom/interface/slotrequest.pm 2006/03/07 21:37:29 1.50 @@ -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.45 2006/02/06 22:42:11 albertel Exp $ +# $Id: slotrequest.pm,v 1.50 2006/03/07 21:37:29 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,6 +34,7 @@ use Apache::Constants qw(:common :http : use Apache::loncommon(); use Apache::lonlocal; use Apache::lonnet; +use Apache::lonnavmaps(); use Date::Manip; sub fail { @@ -159,35 +160,65 @@ sub check_for_reservation { return (undef,undef); } -sub check_for_conflict { - my ($symb,$new_slot_name,$new_slot,$slots)=@_; - - if (!defined($new_slot->{'uniqueperiod'})) { return undef; } +sub get_consumed_uniqueperiods { + my ($slots) = @_; + my $navmap=Apache::lonnavmaps::navmap->new; + 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)) { - 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; } - if (&network_error($student) || &network_error($course) || - &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) { + my %consumed_uniqueperiods; + foreach my $slot_name (keys(%used_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'}}; + $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 (! ($start < $new_uniq_start && $end < $new_uniq_start) || ($start > $new_uniq_end && $end > $new_uniq_end )) { @@ -497,30 +528,61 @@ STUFF } sub allowed_slot { - my ($slot_name,$slot,$symb,$slots)=@_; + my ($slot_name,$slot,$symb,$slots,$consumed_uniqueperiods)=@_; + #already started if ($slot->{'starttime'} < time) { # all open slot to be schedulable #return 0; } &Apache::lonxml::debug("$slot_name starttime good"); + #already ended if ($slot->{'endtime'} < time) { return 0; } &Apache::lonxml::debug("$slot_name endtime good"); + # not allowed to pick this one if (defined($slot->{'type'}) && $slot->{'type'} ne 'schedulable_student') { return 0; } &Apache::lonxml::debug("$slot_name type good"); + + my $userallowed=0; + # its for a different set of users + if (defined($slot->{'allowedsections'})) { + if (!defined($env{'request.role.sec'}) + && grep(/^No section assigned$/, + split(',',$slot->{'allowedsections'}))) { + $userallowed=1; + } + if (defined($env{'request.role.sec'}) + && grep(/^\Q$env{'request.role.sec'}\E$/, + split(',',$slot->{'allowedsections'}))) { + $userallowed=1; + } + } + &Apache::lonxml::debug("$slot_name sections is $userallowed"); + + # its for a different set of users + if (defined($slot->{'allowedusers'}) + && grep(/^\Q$env{'user.name'}:$env{'user.domain'}\E$/, + split(',',$slot->{'allowedusers'}))) { + $userallowed=1; + } + &Apache::lonxml::debug("$slot_name user is $userallowed"); + return 0 if (!$userallowed); + # not allowed for this resource if (defined($slot->{'symb'}) && $slot->{'symb'} ne $symb) { 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 ($slots->{$conflict}{'starttime'} < time) { return 0; @@ -546,6 +608,7 @@ sub show_choices { my ($cnum,$cdom)=&get_course(); my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum); + my $consumed_uniqueperiods = &get_consumed_uniqueperiods(\%slots); my $available; $r->print('
'.&mt('Show').' | +'.&mt('Student Display').' | '.&mt('Open').' | '.&mt('Options').' | ||
---|---|---|---|---|---|
'.&Apache::loncommon::multiple_select_form('show',\@show,6,\%show_fields,\@show_order). ' | ++ '.&Apache::loncommon::multiple_select_form('studisplay',\@stu_display, + 6,\%stu_display_fields, + \@stu_display_order).' + | '.&Apache::loncommon::select_form($when,'when',%when_fields). ' | @@ -772,11 +862,10 @@ sub show_table { $r->print(' | '.$linkstart.$which.'">'.$show_fields{$which}.' | '); } } - $r->print('Scheduled Students | $title | \n"); } - if (exists($show{'uniqueperiod'})) { - $colspan++;$r->print("$unique | \n"); + if (exists($show{'allowedsections'})) { + $colspan++;$r->print("$allowedsections | \n"); + } + if (exists($show{'allowedusers'})) { + $colspan++;$r->print("$allowedusers | \n"); + } + if (exists($show{'scheduled'})) { + $colspan++;$r->print("$ids | \n\n"); } - $colspan++;$r->print("$ids | \n\n"); if (exists($show{'proctor'})) { $r->print(<