--- loncom/interface/slotrequest.pm 2006/02/09 18:04:51 1.47 +++ loncom/interface/slotrequest.pm 2006/03/30 04:34:32 1.54 @@ -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.47 2006/02/09 18:04:51 albertel Exp $ +# $Id: slotrequest.pm,v 1.54 2006/03/30 04:34:32 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 { @@ -53,14 +54,12 @@ sub fail { sub start_page { my ($r,$title)=@_; - my $html=&Apache::lonxml::xmlbegin(); - $r->print($html.''.&mt($title).''); - $r->print(&Apache::loncommon::bodytag($title)); + $r->print(&Apache::loncommon::start_page($title)); } sub end_page { my ($r)=@_; - $r->print(&Apache::loncommon::endbodytag().''); + $r->print(&Apache::loncommon::end_page()); } =pod @@ -159,35 +158,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 +526,73 @@ 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"); + + # reserve time not yet started + if ($slot->{'startreserve'} > time) { + return 0; + } + &Apache::lonxml::debug("$slot_name reserve 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; + } + + if (!defined($slot->{'allowedusers'}) + && !defined($slot->{'allowedsections'})) { + $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 +618,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(''); &Apache::lonxml::debug("Checking Slots"); @@ -555,7 +628,8 @@ sub show_choices { (keys(%slots))) { &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++; @@ -571,7 +645,8 @@ sub show_choices { $command='release'; } else { my $conflict = &check_for_conflict($symb,$slot,$slots{$slot}, - \%slots); + \%slots, + $consumed_uniqueperiods); if ($conflict) { $text=&mt('Change Reservation'); $command='get'; @@ -603,12 +678,27 @@ STUFF } sub to_show { - my ($slot,$when,$deleted) = @_; + my ($slotname,$slot,$when,$deleted,$name) = @_; my $time=time; my $week=60*60*24*7; + if ($deleted eq 'hide' && $slot->{'type'} eq 'deleted') { return 0; } + + if ($name && $name->{'value'} =~ /\w/) { + if ($name->{'type'} eq 'substring') { + if ($slotname !~ /\Q$name->{'value'}\E/) { + return 0; + } + } + if ($name->{'type'} eq 'exact') { + if ($slotname eq $name->{'value'}) { + return 0; + } + } + } + if ($when eq 'any') { return 1; } elsif ($when eq 'now') { @@ -689,10 +779,12 @@ sub show_table { $r->print(''); } - my %Saveable_Parameters = ('show' => 'array', - 'when' => 'scalar', - 'order' => 'scalar', - 'deleted' => 'scalar', + my %Saveable_Parameters = ('show' => 'array', + 'when' => 'scalar', + 'order' => 'scalar', + 'deleted' => 'scalar', + 'name_filter_type' => 'scalar', + 'name_filter_value' => 'scalar', ); &Apache::loncommon::store_course_settings('slotrequest', \%Saveable_Parameters); @@ -702,28 +794,33 @@ sub show_table { my ($classlist,$section,$fullname)=&Apache::grades::getclasslist('all'); &Apache::grades::reset_perm(); + # what to display filtering my %show_fields=&Apache::lonlocal::texthash( - 'name' => 'Slot Name', - 'description' => 'Description', - 'type' => 'Type', - 'starttime' => 'Start time', - 'endtime' => 'End Time', - 'startreserve' => 'Time students can start reserving', - 'secret' => 'Secret Word', - 'maxspace' => 'Maximum # of students', - 'ip' => 'IP or DNS restrictions', - 'symb' => 'Resource slot is restricted to.', - 'uniqueperiod' => 'Period of time slot is unique', - 'scheduled' => 'Scheduled Students', - 'proctor' => 'List of proctors'); + 'name' => 'Slot Name', + 'description' => 'Description', + 'type' => 'Type', + 'starttime' => 'Start time', + 'endtime' => 'End Time', + 'startreserve' => 'Time students can start reserving', + 'secret' => 'Secret Word', + 'maxspace' => 'Maximum # of students', + 'ip' => 'IP or DNS restrictions', + 'symb' => 'Resource slot is restricted to.', + 'allowedsections' => 'Sections slot is restricted to.', + 'allowedusers' => 'Users slot is restricted to.', + 'uniqueperiod' => 'Period of time slot is unique', + 'scheduled' => 'Scheduled Students', + 'proctor' => 'List of proctors'); my @show_order=('name','description','type','starttime','endtime', - 'startreserve','secret','maxspace','ip','symb', - 'uniqueperiod','scheduled','proctor'); + 'startreserve','secret','maxspace','ip','symb', + 'allowedsections','allowedusers','uniqueperiod', + 'scheduled','proctor'); my @show = (exists($env{'form.show'})) ? &Apache::loncommon::get_env_multiple('form.show') : keys(%show_fields); my %show = map { $_ => 1 } (@show); + #when filtering setup my %when_fields=&Apache::lonlocal::texthash( 'now' => 'Open now', 'nextweek' => 'Open within the next week', @@ -737,6 +834,7 @@ sub show_table { my $when = (exists($env{'form.when'})) ? $env{'form.when'} : 'now'; + #display of students setup my %stu_display_fields= &Apache::lonlocal::texthash('username' => 'User name', 'fullname' => 'Full name', @@ -747,6 +845,22 @@ sub show_table { : keys(%stu_display_fields); my %stu_display = map { $_ => 1 } (@stu_display); + #name filtering setup + my %name_filter_type_fields= + &Apache::lonlocal::texthash('substring' => 'Substring', + 'exact' => 'Exact', + #'reg' => 'Regular Expression', + ); + my @name_filter_type_order=('substring','exact'); + + $name_filter_type_fields{'select_form_order'} = \@name_filter_type_order; + my $name_filter_type = + (exists($env{'form.name_filter_type'})) ? $env{'form.name_filter_type'} + : 'substring'; + my $name_filter = {'type' => $name_filter_type, + 'value' => $env{'form.name_filter_value'},}; + + #deleted slot filtering my $hide_radio = &Apache::lonhtmlcommon::radio('deleted',$env{'form.deleted'},'hide'); my $show_radio = @@ -759,6 +873,7 @@ sub show_table { + +
'.&mt('Show').' '.&mt('Student Display').' '.&mt('Open').''.&mt('Slot Name Filter').' '.&mt('Options').'
'.&Apache::loncommon::multiple_select_form('show',\@show,6,\%show_fields,\@show_order). @@ -770,6 +885,14 @@ sub show_table { '.&Apache::loncommon::select_form($when,'when',%when_fields). ''.&Apache::loncommon::select_form($name_filter_type, + 'name_filter_type', + %name_filter_type_fields). + '
'. + &Apache::lonhtmlcommon::textbox('name_filter_value', + $env{'form.name_filter_value'}, + 15). + '		 @@ -797,7 +920,7 @@ sub show_table { my %name_cache; my $slotsort = sub { - if ($env{'form.order'}=~/^(type|description|endtime|startreserve|maxspace|ip|symb)$/) { + if ($env{'form.order'}=~/^(type|description|endtime|startreserve|maxspace|ip|symb|allowedsections|allowedusers)$/) { if (lc($slots{$a}->{$env{'form.order'}}) ne lc($slots{$b}->{$env{'form.order'}})) { return (lc($slots{$a}->{$env{'form.order'}}) @@ -823,7 +946,8 @@ sub show_table { return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'}; }; foreach my $slot (sort $slotsort (keys(%slots))) { - if (!&to_show($slots{$slot},$when,$env{'form.deleted'})) { next; } + if (!&to_show($slot,$slots{$slot},$when, + $env{'form.deleted'},$name_filter)) { next; } if (defined($slots{$slot}->{'type'}) && $slots{$slot}->{'type'} ne 'schedulable_student') { #next; @@ -835,7 +959,9 @@ sub show_table { "^$slot\0"); my ($tmp)=%consumed; if ($tmp !~ /^error: /) { - foreach my $entry (sort(keys(%consumed))) { + foreach my $entry (sort { $consumed{$a}{name} cmp + $consumed{$b}{name} } + (keys(%consumed))) { my (undef,$id)=split("\0",$entry); my ($uname,$udom) = split('@',$consumed{$entry}{'name'}); $ids.= ''; @@ -876,6 +1002,28 @@ sub show_table { $title=''.$title.''; } + my $allowedsections; + if (exists($show{'allowedsections'})) { + $allowedsections = + join(', ',sort(split(/\s*,\s*/, + $slots{$slot}->{'allowedsections'}))); + } + + my @allowedusers; + if (exists($show{'allowedusers'})) { + @allowedusers= map { + my ($uname,$udom)=split(/:/,$_); + my $fullname=$name_cache{$_}; + if (!defined($fullname)) { + $fullname = &Apache::loncommon::plainname($uname,$udom); + $fullname =~s/\s/ /g; + $name_cache{$_} = $fullname; + } + &Apache::loncommon::aboutmewrapper($fullname,$uname,$udom); + } (sort(split(/\s*,\s*/,$slots{$slot}->{'allowedusers'}))); + } + my $allowedusers=join(', ',@allowedusers); + my @proctors; my $rowspan=1; my $colspan=1; @@ -885,7 +1033,6 @@ sub show_table { my ($uname,$udom)=split(/@/,$_); my $fullname=$name_cache{$_}; if (!defined($fullname)) { - &Apache::lonnet::logthis("Gettign $uname $udom"); $fullname = &Apache::loncommon::plainname($uname,$udom); $fullname =~s/\s/ /g; $name_cache{$_} = $fullname; @@ -935,8 +1082,11 @@ DELETELINK if (exists($show{'symb'})) { $colspan++;$r->print("\n"); } - if (exists($show{'uniqueperiod'})) { - $colspan++;$r->print("\n"); + if (exists($show{'allowedsections'})) { + $colspan++;$r->print("\n"); + } + if (exists($show{'allowedusers'})) { + $colspan++;$r->print("\n"); } if (exists($show{'scheduled'})) { $colspan++;$r->print("\n\n"); @@ -1121,7 +1271,10 @@ sub csvupload_fields { ['maxspace','Maximum number of reservations'], ['symb','Resource Restriction'], ['uniqueperiod','Date range of slot exclusion'], - ['secret','Secret word proctor uses to validate']); + ['secret','Secret word proctor uses to validate'], + ['allowedsections','Sections slot is restricted to'], + ['allowedusers','Users slot is restricted to'], + ); } sub csv_upload_assign {
$title$unique$allowedsections$allowedusers$ids