--- loncom/interface/slotrequest.pm 2006/12/18 22:59:30 1.73
+++ loncom/interface/slotrequest.pm 2009/01/23 21:34:47 1.86
@@ -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.73 2006/12/18 22:59:30 albertel Exp $
+# $Id: slotrequest.pm,v 1.86 2009/01/23 21:34:47 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -165,6 +165,9 @@ sub check_for_reservation {
sub get_consumed_uniqueperiods {
my ($slots) = @_;
my $navmap=Apache::lonnavmaps::navmap->new;
+ if (!defined($navmap)) {
+ return 'error: Unable to determine current status';
+ }
my @problems = $navmap->retrieveResources(undef,
sub { $_[0]->is_problem() },1,0);
my %used_slots;
@@ -214,9 +217,13 @@ sub check_for_conflict {
if (!ref($consumed_uniqueperiods)) {
$consumed_uniqueperiods = &get_consumed_uniqueperiods($slots);
- if (&Apache::lonnet::error(%$consumed_uniqueperiods)) {
- return 'error: Unable to determine current status';
- }
+ if (ref($consumed_uniqueperiods) eq 'HASH') {
+ if (&Apache::lonnet::error(%$consumed_uniqueperiods)) {
+ return 'error: Unable to determine current status';
+ }
+ } else {
+ return 'error: Unable to determine current status';
+ }
}
my ($new_uniq_start,$new_uniq_end) = @{$new_slot->{'uniqueperiod'}};
@@ -229,7 +236,6 @@ sub check_for_conflict {
}
}
return undef;
-
}
sub make_reservation {
@@ -241,7 +247,8 @@ sub make_reservation {
$env{'user.domain'},$env{'user.name'});
&Apache::lonxml::debug("value is $value
");
- my $use_slots = &Apache::lonnet::EXT("resource.0.useslots");
+ my $use_slots = &Apache::lonnet::EXT("resource.0.useslots",$symb,
+ $env{'user.domain'},$env{'user.name'});
&Apache::lonxml::debug("use_slots is $use_slots
");
if (&Apache::lonnet::error($value)
@@ -334,7 +341,7 @@ sub remove_registration {
my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
"^$slot_name\0");
if (&Apache::lonnet::error(%consumed)) {
- $r->print("
".&mt('A network error has occured.').'
');
+ $r->print("".&mt('A network error has occurred.').'
');
return;
}
if (!%consumed) {
@@ -412,7 +419,11 @@ sub release_all_slot {
my ($result,$msg) =
&release_reservation($slot_name,$uname,$udom,
$consumed{$entry}{'symb'},$mgr);
- $r->print("$msg
");
+ if (!$result) {
+ $r->print(''.&mt($msg).'
');
+ } else {
+ $r->print("$msg
");
+ }
$r->rflush();
}
$r->print(''.
@@ -438,7 +449,11 @@ sub release_slot {
my ($result,$msg) =
&release_reservation($slot_name,$uname,$udom,$symb,$mgr);
- $r->print("$msg
");
+ if (!$result) {
+ $r->print(''.&mt($msg).'
');
+ } else {
+ $r->print("$msg
");
+ }
if ($mgr eq 'F') {
$r->print(''.
@@ -459,9 +474,25 @@ sub release_reservation {
return (0,&mt('Not allowed to release Reservation: [_1], as it has already ended.',$description));
}
}
+
+ # if the reservation symb is for a map get a resource in that map
+ # to check slot parameters on
+ my $navmap=Apache::lonnavmaps::navmap->new;
+ if (!defined($navmap)) {
+ return (0,'error: Unable to determine current status');
+ }
+ my $passed_resource = $navmap->getBySymb($symb);
+ if ($passed_resource->is_map()) {
+ my ($a_resource) =
+ $navmap->retrieveResources($passed_resource,
+ sub {$_[0]->is_problem()},0,1);
+ $symb = $a_resource->symb();
+ }
+
# get parameter string, check for existance, rebuild string with the slot
- my @slots = split(/:/,&Apache::lonnet::EXT("resource.0.availablestudent",
- $symb,$udom,$uname));
+ my $student = &Apache::lonnet::EXT("resource.0.availablestudent",
+ $symb,$udom,$uname);
+ my @slots = split(/:/,$student);
my @new_slots;
foreach my $exist_slot (@slots) {
@@ -482,7 +513,8 @@ sub release_reservation {
}
}
- my $use_slots = &Apache::lonnet::EXT("resource.0.useslots");
+ my $use_slots = &Apache::lonnet::EXT("resource.0.useslots",
+ $symb,$udom,$uname);
&Apache::lonxml::debug("use_slots is $use_slots
");
if (&Apache::lonnet::error($use_slots)) {
@@ -527,7 +559,7 @@ sub delete_slot {
if ($ret eq 'ok') {
$r->print("Slot $slot_name marked as deleted.
");
} else {
- $r->print(" An error ($ret) occurse when attempting to delete Slot $slot_name.
");
+ $r->print(" An error ($ret) occurse when attempting to delete Slot $slot_name.
");
}
} else {
if (%consumed) {
@@ -548,17 +580,19 @@ sub return_link {
}
sub get_slot {
- my ($r,$symb)=@_;
+ my ($r,$symb,$conflictable_slot,$inhibit_return_link)=@_;
my %slot=&Apache::lonnet::get_slot($env{'form.slotname'});
my $slot_name=&check_for_conflict($symb,$env{'form.slotname'},\%slot);
if ($slot_name =~ /^error: (.*)/) {
- $r->print("An error occured while attempting to make a reservation. ($1)
");
+ $r->print(''
+ .&mt('An error occurred while attempting to make a reservation. ([_1])',$1)
+ .'
');
&return_link($r);
- return;
+ return 0;
}
- if ($slot_name) {
+ if ($slot_name && $slot_name ne $conflictable_slot) {
my %slot=&Apache::lonnet::get_slot($slot_name);
my $description1=&get_description($slot_name,\%slot);
%slot=&Apache::lonnet::get_slot($env{'form.slotname'});
@@ -586,36 +620,46 @@ STUFF
} else {
&return_link($r);
}
- return;
+ return 0;
}
my $reserved=&make_reservation($env{'form.slotname'},
\%slot,$symb);
my $description=&get_description($env{'form.slotname'},\%slot);
if (defined($reserved)) {
+ my $retvalue = 0;
if ($slot_name =~ /^error: (.*)/) {
- $r->print("An error occured while attempting to make a reservation. ($1)
");
+ $r->print(''
+ .&mt('An error occurred while attempting to make a reservation. ([_1])',$1)
+ .'
');
} elsif ($reserved > -1) {
$r->print("Success: $description
");
+ $retvalue = 1;
} elsif ($reserved < 0) {
$r->print("Already reserved: $description
");
}
- &return_link($r);
- return;
+ if (!$inhibit_return_link) { &return_link($r); }
+ return 1;
}
my %lt=('request'=>"Availibility list",
'try' =>'Try again');
%lt=&Apache::lonlocal::texthash(%lt);
+ my $extra_input;
+ if ($conflictable_slot) {
+ $extra_input='';
+ }
+
$r->print(< Failed to reserve a spot for $description.
+ Failed to reserve a spot for $description.
?
@@ -629,8 +673,8 @@ or
or
STUFF
- &return_link($r);
- return;
+ if (!$inhibit_return_link) { &return_link($r); }
+ return 0;
}
sub allowed_slot {
@@ -638,8 +682,7 @@ sub allowed_slot {
#already started
if ($slot->{'starttime'} < time) {
- # all open slot to be schedulable
- #return 0;
+ return 0;
}
&Apache::lonxml::debug("$slot_name starttime good");
@@ -711,7 +754,9 @@ sub allowed_slot {
my $conflict = &check_for_conflict($symb,$slot_name,$slot,$slots,
$consumed_uniqueperiods);
- if ($conflict) {
+ if ($conflict =~ /^error: /) {
+ return 0;
+ } elsif ($conflict ne '') {
if ($slots->{$conflict}{'starttime'} < time) {
return 0;
}
@@ -737,10 +782,29 @@ sub show_choices {
my ($cnum,$cdom)=&get_course();
my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum);
my $consumed_uniqueperiods = &get_consumed_uniqueperiods(\%slots);
+ if (ref($consumed_uniqueperiods) eq 'HASH') {
+ if (&Apache::lonnet::error(%$consumed_uniqueperiods)) {
+ $r->print(''.
+ &mt('An error occurred determining slot availability').
+ '');
+ return;
+ }
+ } elsif ($consumed_uniqueperiods =~ /^error: /) {
+ $r->print(''.
+ &mt('An error occurred determining slot availability').
+ '');
+ return;
+ }
my $available;
- $r->print('');
&Apache::lonxml::debug("Checking Slots");
my @got_slots=&check_for_reservation($symb,'allslots');
+ if ($got_slots[0] =~ /^error: /) {
+ $r->print(''.
+ &mt('An error occurred determining slot availability').
+ '');
+ return;
+ }
+ $r->print('');
foreach my $slot (sort
{ return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'} }
(keys(%slots))) {
@@ -765,10 +829,16 @@ sub show_choices {
my $conflict = &check_for_conflict($symb,$slot,$slots{$slot},
\%slots,
$consumed_uniqueperiods);
- if ($conflict) {
- $text=&mt('Change Reservation');
- $command='get';
- }
+ if ($conflict) {
+ if ($conflict =~ /^error: /) {
+ $r->print(''
+ .&mt('Slot: [_1] has unknown status.',$description)
+ .' |
');
+ } else {
+ $text=&mt('Change Reservation');
+ $command='get';
+ }
+ }
}
my $escsymb=&escape($symb);
$form=< 'End Time',
'startreserve' => 'Time students can start reserving',
'secret' => 'Secret Word',
- 'maxspace' => 'Maximum # of students',
+ 'space' => '# of students/max',
'ip' => 'IP or DNS restrictions',
'symb' => 'Resource slot is restricted to.',
'allowedsections' => 'Sections slot is restricted to.',
@@ -941,7 +1011,7 @@ sub show_table {
'scheduled' => 'Scheduled Students',
'proctor' => 'List of proctors');
my @show_order=('name','description','type','starttime','endtime',
- 'startreserve','secret','maxspace','ip','symb',
+ 'startreserve','secret','space','ip','symb',
'allowedsections','allowedusers','uniqueperiod',
'scheduled','proctor');
my @show =
@@ -1053,12 +1123,16 @@ sub show_table {
my %name_cache;
my $slotsort = sub {
- if ($env{'form.order'}=~/^(type|description|endtime|startreserve|maxspace|ip|symb|allowedsections|allowedusers)$/) {
+ if ($env{'form.order'}=~/^(type|description|endtime|startreserve|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'}})
cmp lc($slots{$b}->{$env{'form.order'}}));
}
+ } elsif ($env{'form.order'} eq 'space') {
+ if ($slots{$a}{'maxspace'} ne $slots{$b}{'maxspace'}) {
+ return ($slots{$a}{'maxspace'} cmp $slots{$b}{'maxspace'});
+ }
} elsif ($env{'form.order'} eq 'name') {
if (lc($a) cmp lc($b)) {
return lc($a) cmp lc($b);
@@ -1078,6 +1152,14 @@ sub show_table {
}
return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'};
};
+
+ my %consumed;
+ if (exists($show{'scheduled'}) || exists($show{'space'}) ) {
+ %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum);
+ my ($tmp)=%consumed;
+ if ($tmp =~ /^error: /) { undef(%consumed); }
+ }
+
foreach my $slot (sort $slotsort (keys(%slots))) {
if (!&to_show($slot,$slots{$slot},$when,
$env{'form.deleted'},$name_filter)) { next; }
@@ -1086,18 +1168,19 @@ sub show_table {
#next;
}
my $description=&get_description($slot,$slots{$slot});
- my $ids;
- if (exists($show{'scheduled'})) {
- my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
- "^$slot\0");
- my ($tmp)=%consumed;
- if ($tmp !~ /^error: /) {
+ my ($id_count,$ids);
+
+ if (exists($show{'scheduled'}) || exists($show{'space'}) ) {
+ my $re_str = "$slot\0";
+ my @this_slot = grep(/^\Q$re_str\E/,keys(%consumed));
+ $id_count = scalar(@this_slot);
+ if (exists($show{'scheduled'})) {
foreach my $entry (sort { $consumed{$a}{name} cmp
$consumed{$b}{name} }
- (keys(%consumed))) {
+ (@this_slot)) {
my (undef,$id)=split("\0",$entry);
my ($uname,$udom) = split(':',$consumed{$entry}{'name'});
- $ids.= '';
+ $ids.= '';
foreach my $item (@stu_display_order) {
if ($stu_display{$item}) {
if ($item eq 'fullname') {
@@ -1108,7 +1191,7 @@ sub show_table {
}
}
$ids.=&remove_link($slot,$entry,$uname,$udom,
- $consumed{$entry}{'symb'}).'
';
+ $consumed{$entry}{'symb'}).'
';
}
}
}
@@ -1216,8 +1299,15 @@ DELETELINK
if (exists($show{'secret'})) {
$colspan++;$r->print("$slots{$slot}{'secret'} | \n");
}
- if (exists($show{'maxspace'})) {
- $colspan++;$r->print("$slots{$slot}{'maxspace'} | \n");
+ if (exists($show{'space'})) {
+ my $display = $id_count;
+ if ($slots{$slot}{'maxspace'}>0) {
+ $display.='/'.$slots{$slot}{'maxspace'};
+ if ($slots{$slot}{'maxspace'} <= $id_count) {
+ $display = ''.$display.' (full) ';
+ }
+ }
+ $colspan++;$r->print("$display | \n");
}
if (exists($show{'ip'})) {
$colspan++;$r->print("$slots{$slot}{'ip'} | \n");
@@ -1521,7 +1611,7 @@ sub csv_upload_assign {
}
$r->print("Created $countdone slots\n
");
foreach my $error (@errors) {
- $r->print("$error\n
");
+ $r->print("$error
\n");
}
&show_table($r,$mgr);
return '';
@@ -1605,8 +1695,8 @@ sub handler {
} elsif ($env{'form.command'} eq 'get') {
&get_slot($r,$symb);
} elsif ($env{'form.command'} eq 'change') {
- if (&release_slot($r,$symb,$env{'form.releaseslot'},1)) {
- &get_slot($r,$symb);
+ if (&get_slot($r,$symb,$env{'form.releaseslot'},1)) {
+ &release_slot($r,$symb,$env{'form.releaseslot'});
}
} else {
$r->print("Unknown command: ".$env{'form.command'}."
");