--- loncom/interface/slotrequest.pm 2006/01/24 06:41:16 1.38
+++ loncom/interface/slotrequest.pm 2006/02/26 19:40:14 1.48
@@ -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.38 2006/01/24 06:41:16 albertel Exp $
+# $Id: slotrequest.pm,v 1.48 2006/02/26 19:40:14 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 {
@@ -47,8 +48,7 @@ sub fail {
$r->print('<p>'.&mt('Failed.').'</p>');
}
- $r->print('<p><a href="/adm/flip?postdata=return:">'.
- &mt('Return to last resource').'</a></p>');
+ &return_link($r);
&end_page($r);
}
@@ -89,7 +89,9 @@ sub get_reservation_ids {
my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
"^$slot_name\0");
-
+ if (&network_error(%consumed)) {
+ return 'error: Unable to determine current status';
+ }
my ($tmp)=%consumed;
if ($tmp=~/^error: 2 / ) {
return 0;
@@ -111,7 +113,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'});
@@ -124,7 +126,19 @@ sub check_for_reservation {
my ($cnum,$cdom)=&get_course();
my %slots=&Apache::lonnet::get('slots', [@slots], $cdom, $cnum);
- foreach my $slot_name (@slots) {
+ if (&network_error($student) || &network_error($course) ||
+ &network_error(%slots)) {
+ return 'error: Unable to determine current status';
+ }
+ my @got;
+ foreach my $slot_name (sort {
+ if (ref($slots{$a}) && ref($slots{$b})) {
+ return $slots{$a}{'starttime'} <=> $slots{$b}{'starttime'}
+ }
+ if (ref($slots{$a})) { return -1;}
+ if (ref($slots{$b})) { return 1;}
+ return 0;
+ } @slots) {
next if (!defined($slots{$slot_name}) ||
!ref($slots{$slot_name}));
&Apache::lonxml::debug(time." $slot_name ".
@@ -133,29 +147,81 @@ 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 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;
+ }
+ }
+
+ if (!ref($slots)) {
+ 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;
+ }
+
+ 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'}));
+ $consumed_uniqueperiods{$slot_name} =
+ $slots->{$slot_name}{'uniqueperiod'};
+ }
+ return \%consumed_uniqueperiods;
+}
+
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);
- foreach my $slot_name (@slots) {
- next if (!defined($slots{$slot_name}) ||
- !ref($slots{$slot_name}));
+ my ($symb,$new_slot_name,$new_slot,$slots,$consumed_uniqueperiods)=@_;
+
+ if (!defined($new_slot->{'uniqueperiod'})) { return undef; }
- next if (!defined($slots{$slot_name}->{'uniqueperiod'}) ||
- !ref($slots{$slot_name}->{'uniqueperiod'}));
- my ($start,$end)=@{$slots{$slot_name}->{'uniqueperiod'}};
- if ($start<time && time < $end) {
+ 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 )) {
return $slot_name;
}
}
@@ -163,6 +229,14 @@ sub check_for_conflict {
}
+sub network_error {
+ my ($result) = @_;
+ if ($result =~ /^(con_lost|no_such_host|error: [^2])/) {
+ return 1;
+ }
+ return 0;
+}
+
sub make_reservation {
my ($slot_name,$slot,$symb)=@_;
@@ -171,11 +245,17 @@ sub make_reservation {
my $value=&Apache::lonnet::EXT("resource.0.availablestudent",$symb,
$env{'user.domain'},$env{'user.name'});
&Apache::lonxml::debug("value is $value<br />");
+ if (&network_error($value)) {
+ return 'error: Unable to determine current status';
+ }
+
foreach my $other_slot (split(/:/, $value)) {
if ($other_slot eq $slot_name) {
my %consumed=&Apache::lonnet::dump('slot_reservations', $cdom,
$cnum, "^$slot_name\0");
-
+ if (&network_error($value)) {
+ return 'error: Unable to determine current status';
+ }
my $me=$env{'user.name'}.'@'.$env{'user.domain'};
foreach my $key (keys(%consumed)) {
if ($consumed{$key}->{'name'} eq $me) {
@@ -190,7 +270,9 @@ sub make_reservation {
if (!defined($max)) { $max=99999; }
my (@ids)=&get_reservation_ids($slot_name);
-
+ if (&network_error(@ids)) {
+ return 'error: Unable to determine current status';
+ }
my $last=0;
foreach my $id (@ids) {
my $num=(split('\0',$id))[1];
@@ -275,7 +357,16 @@ sub release_slot {
&& defined($env{'form.symb'})) {
$symb = $env{'form.symb'};
}
+ my %slot=&Apache::lonnet::get_slot($slot_name);
+ my $description=&get_description($env{'form.slotname'},\%slot);
+ if ($mgr ne 'F') {
+ if ($slot{'starttime'} < time) {
+ $r->print("<p>Not allowed to release Reservation: $description, as it has already ended. </p>");
+ &return_link($r);
+ return 0;
+ }
+ }
# get parameter string, check for existance, rebuild string with the slot
my @slots = split(/:/,&Apache::lonnet::EXT("resource.0.availablestudent",
$symb,$udom,$uname));
@@ -302,17 +393,12 @@ sub release_slot {
'0_availablestudent',
1, $new_param, 'string',
$uname,$udom);
- my %slot=&Apache::lonnet::get_slot($slot_name);
- my $description=&get_description($env{'form.slotname'},\%slot);
$r->print("<p>Released Reservation: $description</p>");
if ($mgr eq 'F') {
$r->print('<p><a href="/adm/slotrequest?command=showslots">'.
&mt('Return to slot list').'</a></p>');
}
- if (!$inhibit_return_link) {
- $r->print('<p><a href="/adm/flip?postdata=return:">'.
- &mt('Return to last resource').'</a></p>');
- }
+ if (!$inhibit_return_link) { &return_link($r); }
return 1;
}
@@ -346,6 +432,11 @@ sub delete_slot {
}
$r->print('<p><a href="/adm/slotrequest?command=showslots">'.
&mt('Return to slot list').'</a></p>');
+ &return_link($r);
+}
+
+sub return_link {
+ my ($r) = @_;
$r->print('<p><a href="/adm/flip?postdata=return:">'.
&mt('Return to last resource').'</a></p>');
}
@@ -353,7 +444,14 @@ sub delete_slot {
sub get_slot {
my ($r,$symb)=@_;
- my $slot_name=&check_for_conflict($symb,$env{'form.slotname'});
+ 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("<p>An error occured while attempting to make a reservation. ($1)</p>");
+ &return_link($r);
+ return;
+ }
if ($slot_name) {
my %slot=&Apache::lonnet::get_slot($slot_name);
my $description1=&get_description($slot_name,\%slot);
@@ -374,33 +472,30 @@ STUFF
STUFF
$r->print(' your reservation from <b>'.$description1.'</b> to <b>'.
$description2.
- '</b> <br />or <a href="/adm/flip?postdata=return:">'.
- &mt('Return to last resource').'</a></p>');
+ '</b> <br />or </p>');
+ &return_link($r);
$r->print(<<STUFF);
</form>
STUFF
} else {
- $r->print('<p><a href="/adm/flip?postdata=return:">'.
- &mt('Return to last resource').'</a></p>');
+ &return_link($r);
}
return;
}
- my %slot=&Apache::lonnet::get_slot($env{'form.slotname'});
+
my $reserved=&make_reservation($env{'form.slotname'},
\%slot,$symb);
my $description=&get_description($env{'form.slotname'},\%slot);
if (defined($reserved)) {
- if ($reserved > -1) {
+ if ($slot_name =~ /^error: (.*)/) {
+ $r->print("<p>An error occured while attempting to make a reservation. ($1)</p>");
+ } elsif ($reserved > -1) {
$r->print("<p>Success: $description</p>");
- $r->print('<p><a href="/adm/flip?postdata=return:">'.
- &mt('Return to last resource').'</a></p>');
- return;
} elsif ($reserved < 0) {
$r->print("<p>Already reserved: $description</p>");
- $r->print('<p><a href="/adm/flip?postdata=return:">'.
- &mt('Return to last resource').'</a></p>');
- return;
}
+ &return_link($r);
+ return;
}
my %lt=('request'=>"Availibility list",
@@ -427,13 +522,13 @@ or
</p>
or
STUFF
- $r->print('<p><a href="/adm/flip?postdata=return:">'.
- &mt('Return to last resource').'</a></p>');
+
+ &return_link($r);
return;
}
sub allowed_slot {
- my ($slot_name,$slot,$symb)=@_;
+ my ($slot_name,$slot,$symb,$slots,$consumed_uniqueperiods)=@_;
#already started
if ($slot->{'starttime'} < time) {
# all open slot to be schedulable
@@ -456,6 +551,13 @@ sub allowed_slot {
&& $slot->{'symb'} ne $symb) {
return 0;
}
+ my $conflict = &check_for_conflict($symb,$slot_name,$slot,$slots,
+ $consumed_uniqueperiods);
+ if ($conflict) {
+ if ($slots->{$conflict}{'starttime'} < time) {
+ return 0;
+ }
+ }
&Apache::lonxml::debug("$slot_name symb good");
return 1;
}
@@ -476,29 +578,39 @@ 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('<table border="1">');
&Apache::lonxml::debug("Checking Slots");
- my ($got_slot)=&check_for_reservation($symb);
+ my @got_slots=&check_for_reservation($symb,'allslots');
foreach my $slot (sort
{ return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'} }
(keys(%slots))) {
&Apache::lonxml::debug("Checking Slot $slot");
- next if (!&allowed_slot($slot,$slots{$slot}));
+ next if (!&allowed_slot($slot,$slots{$slot},undef,\%slots,
+ $consumed_uniqueperiods));
$available++;
my $description=&get_description($slot,$slots{$slot});
my $form=&mt('Unavailable');
- if (($slot eq $got_slot) ||
+ if ((grep(/^\Q$slot\E$/,@got_slots)) ||
&space_available($slot,$slots{$slot},$symb)) {
my $text=&mt('Select');
my $command='get';
- if ($slot eq $got_slot) {
+ if (grep(/^\Q$slot\E$/,@got_slots)) {
$text=&mt('Free Reservation');
$command='release';
+ } else {
+ my $conflict = &check_for_conflict($symb,$slot,$slots{$slot},
+ \%slots,
+ $consumed_uniqueperiods);
+ if ($conflict) {
+ $text=&mt('Change Reservation');
+ $command='get';
+ }
}
my $escsymb=&Apache::lonnet::escape($symb);
$form=<<STUFF;
@@ -617,8 +729,13 @@ sub show_table {
'order' => 'scalar',
'deleted' => 'scalar',
);
- &Apache::loncommon::store_course_settings('slotrequest',\%Saveable_Parameters);
- &Apache::loncommon::restore_course_settings('slotrequest',\%Saveable_Parameters);
+ &Apache::loncommon::store_course_settings('slotrequest',
+ \%Saveable_Parameters);
+ &Apache::loncommon::restore_course_settings('slotrequest',
+ \%Saveable_Parameters);
+ &Apache::grades::init_perm();
+ my ($classlist,$section,$fullname)=&Apache::grades::getclasslist('all');
+ &Apache::grades::reset_perm();
my %show_fields=&Apache::lonlocal::texthash(
'name' => 'Slot Name',
@@ -632,10 +749,11 @@ sub show_table {
'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');
my @show_order=('name','description','type','starttime','endtime',
'startreserve','secret','maxspace','ip','symb',
- 'uniqueperiod','proctor');
+ 'uniqueperiod','scheduled','proctor');
my @show =
(exists($env{'form.show'})) ? &Apache::loncommon::get_env_multiple('form.show')
: keys(%show_fields);
@@ -654,6 +772,16 @@ sub show_table {
my $when = (exists($env{'form.when'})) ? $env{'form.when'}
: 'now';
+ my %stu_display_fields=
+ &Apache::lonlocal::texthash('username' => 'User name',
+ 'fullname' => 'Full name',
+ );
+ my @stu_display_order=('fullname','username');
+ my @stu_display =
+ (exists($env{'form.studisplay'})) ? &Apache::loncommon::get_env_multiple('form.studisplay')
+ : keys(%stu_display_fields);
+ my %stu_display = map { $_ => 1 } (@stu_display);
+
my $hide_radio =
&Apache::lonhtmlcommon::radio('deleted',$env{'form.deleted'},'hide');
my $show_radio =
@@ -664,11 +792,17 @@ sub show_table {
$r->print('<div>');
$r->print('<table class="inline">
<tr><th>'.&mt('Show').'</th>
+ <th>'.&mt('Student Display').'</th>
<th>'.&mt('Open').'</th>
<th>'.&mt('Options').'</th>
</tr>
<tr><td>'.&Apache::loncommon::multiple_select_form('show',\@show,6,\%show_fields,\@show_order).
'</td>
+ <td>
+ '.&Apache::loncommon::multiple_select_form('studisplay',\@stu_display,
+ 6,\%stu_display_fields,
+ \@stu_display_order).'
+ </td>
<td>'.&Apache::loncommon::select_form($when,'when',%when_fields).
'</td>
<td>
@@ -695,7 +829,6 @@ sub show_table {
$r->print('<th>'.$linkstart.$which.'">'.$show_fields{$which}.'</a></th>');
}
}
- $r->print('<th>Scheduled Students</th></tr>');
my %name_cache;
my $slotsort = sub {
@@ -731,19 +864,28 @@ sub show_table {
#next;
}
my $description=&get_description($slot,$slots{$slot});
- my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
- "^$slot\0");
my $ids;
-
- my ($tmp)=%consumed;
- if ($tmp !~ /^error: /) {
- foreach my $entry (sort(keys(%consumed))) {
- my (undef,$id)=split("\0",$entry);
- my ($uname,$udom) = split('@',$consumed{$entry}{'name'});
- my $name = &Apache::loncommon::plainname($uname,$udom);
- $ids.= '<nobr>'.$name.&remove_link($slot,$entry,$uname,$udom,
- $consumed{$entry}{'symb'})
- .'</nobr><br />';
+ if (exists($show{'scheduled'})) {
+ my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
+ "^$slot\0");
+ my ($tmp)=%consumed;
+ if ($tmp !~ /^error: /) {
+ foreach my $entry (sort(keys(%consumed))) {
+ my (undef,$id)=split("\0",$entry);
+ my ($uname,$udom) = split('@',$consumed{$entry}{'name'});
+ $ids.= '<nobr>';
+ foreach my $item (@stu_display_order) {
+ if ($stu_display{$item}) {
+ if ($item eq 'fullname') {
+ $ids.=$fullname->{"$uname:$udom"}.' ';
+ } elsif ($item eq 'username') {
+ $ids.="<tt>$uname\@$udom</tt> ";
+ }
+ }
+ }
+ $ids.=&remove_link($slot,$entry,$uname,$udom,
+ $consumed{$entry}{'symb'}).'</nobr><br />';
+ }
}
}
@@ -831,7 +973,9 @@ DELETELINK
if (exists($show{'uniqueperiod'})) {
$colspan++;$r->print("<td>$unique</td>\n");
}
- $colspan++;$r->print("<td>$ids</td>\n</tr>\n");
+ if (exists($show{'scheduled'})) {
+ $colspan++;$r->print("<td>$ids</td>\n</tr>\n");
+ }
if (exists($show{'proctor'})) {
$r->print(<<STUFF);
<tr>
@@ -1157,8 +1301,9 @@ sub handler {
} elsif ($env{'form.command'} eq 'get') {
&get_slot($r,$symb);
} elsif ($env{'form.command'} eq 'change') {
- &release_slot($r,$symb,$env{'form.releaseslot'},1);
- &get_slot($r,$symb);
+ if (&release_slot($r,$symb,$env{'form.releaseslot'},1)) {
+ &get_slot($r,$symb);
+ }
} else {
$r->print("<p>Unknown command: ".$env{'form.command'}."</p>");
}