--- loncom/interface/slotrequest.pm 2005/11/21 18:55:41 1.33
+++ loncom/interface/slotrequest.pm 2006/02/03 18:22:44 1.40
@@ -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.33 2005/11/21 18:55:41 albertel Exp $
+# $Id: slotrequest.pm,v 1.40 2006/02/03 18:22:44 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -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;
@@ -148,6 +150,11 @@ sub check_for_conflict {
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}));
@@ -163,6 +170,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 +186,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 +211,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 +298,17 @@ 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{$slot_name}{'starttime'} < time) {
+ $r->print("<p>Not allowed to release Reservation: $description, as it has already ended.</p>");
+ $r->print('<p><a href="/adm/flip?postdata=return:">'.
+ &mt('Return to last resource').'</a></p>');
+ 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,7 +335,6 @@ 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') {
@@ -316,10 +348,56 @@ sub release_slot {
return 1;
}
+sub delete_slot {
+ my ($r)=@_;
+
+ my $slot_name = $env{'form.slotname'};
+ my %slot=&Apache::lonnet::get_slot($slot_name);
+
+ my ($cnum,$cdom)=&get_course();
+ my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
+ "^$slot_name\0");
+ my ($tmp) = %consumed;
+ if ($tmp =~ /error: 2/) { undef(%consumed); }
+
+ if (%slot && !%consumed) {
+ $slot{'type'} = 'deleted';
+ my $ret = &Apache::lonnet::cput('slots', {$slot_name => \%slot},
+ $cdom, $cnum);
+ if ($ret eq 'ok') {
+ $r->print("<p>Slot <tt>$slot_name</tt> marked as deleted.</p>");
+ } else {
+ $r->print("<p> An error ($ret) occurse when attempting to delete Slot <tt>$slot_name</tt>.</p>");
+ }
+ } else {
+ if (%consumed) {
+ $r->print("<p>Slot <tt>$slot_name</tt> has active reservations.</p>");
+ } else {
+ $r->print("<p>Slot <tt>$slot_name</tt> does not exist.</p>");
+ }
+ }
+ $r->print('<p><a href="/adm/slotrequest?command=showslots">'.
+ &mt('Return to slot list').'</a></p>');
+ $r->print('<p><a href="/adm/flip?postdata=return:">'.
+ &mt('Return to last resource').'</a></p>');
+}
+
+sub return_link {
+ my ($r) = @_;
+ $r->print('<p><a href="/adm/flip?postdata=return:">'.
+ &mt('Return to last resource').'</a></p>');
+}
+
sub get_slot {
my ($r,$symb)=@_;
my $slot_name=&check_for_conflict($symb,$env{'form.slotname'});
+
+ 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);
@@ -340,14 +418,13 @@ 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;
}
@@ -356,17 +433,15 @@ STUFF
\%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",
@@ -492,10 +567,15 @@ STUFF
}
sub to_show {
- my ($when,$slot) = @_;
+ my ($slot,$when,$deleted) = @_;
my $time=time;
my $week=60*60*24*7;
- if ($when eq 'now') {
+ if ($deleted eq 'hide' && $slot->{'type'} eq 'deleted') {
+ return 0;
+ }
+ if ($when eq 'any') {
+ return 1;
+ } elsif ($when eq 'now') {
if ($time > $slot->{'starttime'} &&
$time < $slot->{'endtime'}) {
return 1;
@@ -573,10 +653,11 @@ sub show_table {
$r->print('</div>');
}
- my %Saveable_Parameters = ('show' => 'array',
- 'when' => 'scalar',
- 'order' => 'scalar');
-
+ my %Saveable_Parameters = ('show' => 'array',
+ 'when' => 'scalar',
+ 'order' => 'scalar',
+ 'deleted' => 'scalar',
+ );
&Apache::loncommon::store_course_settings('slotrequest',\%Saveable_Parameters);
&Apache::loncommon::restore_course_settings('slotrequest',\%Saveable_Parameters);
@@ -588,7 +669,7 @@ sub show_table {
'endtime' => 'End Time',
'startreserve' => 'Time students can start reserving',
'secret' => 'Secret Word',
- 'maxspace' => 'Maxium # of students',
+ 'maxspace' => 'Maximum # of students',
'ip' => 'IP or DNS restrictions',
'symb' => 'Resource slot is restricted to.',
'uniqueperiod' => 'Period of time slot is unique',
@@ -602,22 +683,48 @@ sub show_table {
my %show = map { $_ => 1 } (@show);
my %when_fields=&Apache::lonlocal::texthash(
- 'now' => 'Open now',
+ 'now' => 'Open now',
'nextweek' => 'Open within the next week',
'lastweek' => 'Were open last week',
'willopen' => 'Will open later',
- 'wereopen' => 'Were open');
- my @when_order=('now','nextweek','lastweek','willopen','wereopen');
+ 'wereopen' => 'Were open',
+ 'any' => 'Anytime',
+ );
+ my @when_order=('any','now','nextweek','lastweek','willopen','wereopen');
$when_fields{'select_form_order'} = \@when_order;
my $when = (exists($env{'form.when'})) ? $env{'form.when'}
: 'now';
+ my $hide_radio =
+ &Apache::lonhtmlcommon::radio('deleted',$env{'form.deleted'},'hide');
+ my $show_radio =
+ &Apache::lonhtmlcommon::radio('deleted',$env{'form.deleted'},'show');
+
$r->print('<form method="POST" action="/adm/slotrequest">
<input type="hidden" name="command" value="showslots" />');
$r->print('<div>');
- $r->print('<table class="inline"><tr><th>'.&mt('Show').'</th><th>'.&mt('Open').'</th></tr><tr><td>'.&Apache::loncommon::multiple_select_form('show',\@show,6,\%show_fields,\@show_order).
- '</td><td>'.&Apache::loncommon::select_form($when,'when',%when_fields).
- '</td></tr></table>');
+ $r->print('<table class="inline">
+ <tr><th>'.&mt('Show').'</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::select_form($when,'when',%when_fields).
+ '</td>
+ <td>
+ <table>
+ <tr>
+ <td rowspan="2">Deleted slots:</td>
+ <td><label>'.$show_radio.'Show</label></td>
+ </tr>
+ <tr>
+ <td><label>'.$hide_radio.'Hide</label></td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>');
$r->print('</div>');
$r->print('<p><input type="submit" name="start" value="'.&mt('Update Display').'" /></p>');
my $linkstart='<a href="/adm/slotrequest?command=showslots&order=';
@@ -659,7 +766,7 @@ sub show_table {
return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'};
};
foreach my $slot (sort $slotsort (keys(%slots))) {
- if (!&to_show($when,$slots{$slot})) { next; }
+ if (!&to_show($slots{$slot},$when,$env{'form.deleted'})) { next; }
if (defined($slots{$slot}->{'type'})
&& $slots{$slot}->{'type'} ne 'schedulable_student') {
#next;
@@ -668,13 +775,17 @@ sub show_table {
my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
"^$slot\0");
my $ids;
- 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 />';
+
+ 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 />';
+ }
}
my $start=($slots{$slot}->{'starttime'}?
@@ -718,11 +829,16 @@ sub show_table {
}
my $proctors=join(', ',@proctors);
- my $edit=(<<EDITLINK);
+ my $edit=(<<"EDITLINK");
<a href="/adm/helper/newslot.helper?name=$slot">Edit</a>
EDITLINK
-
- $r->print("<tr>\n<td rowspan=\"$rowspan\">$edit</td>\n");
+
+ my $delete=(<<"DELETELINK");
+<a href="/adm/slotrequest?command=delete&slotname=$slot">Delete</a>
+DELETELINK
+ if ($ids ne '') { undef($delete); }
+
+ $r->print("<tr>\n<td rowspan=\"$rowspan\">$edit $delete</td>\n");
if (exists($show{'name'})) {
$colspan++;$r->print("<td>$slot</td>");
}
@@ -1040,6 +1156,8 @@ sub handler {
&remove_registration($r);
} elsif ($env{'form.command'} eq 'release' && $mgr eq 'F') {
&release_slot($r,undef,undef,undef,$mgr);
+ } elsif ($env{'form.command'} eq 'delete' && $mgr eq 'F') {
+ &delete_slot($r);
} elsif ($env{'form.command'} eq 'uploadstart' && $mgr eq 'F') {
&upload_start($r);
} elsif ($env{'form.command'} eq 'csvuploadmap' && $mgr eq 'F') {
@@ -1058,12 +1176,15 @@ sub handler {
} else {
my $symb=&Apache::lonnet::unescape($env{'form.symb'});
my (undef,undef,$res)=&Apache::lonnet::decode_symb($symb);
- if ($res !~ /\.task$/) {
+ my $useslots = &Apache::lonnet::EXT("resource.0.useslots",$symb);
+ if ($useslots ne 'resource') {
&fail($r,'not_valid');
return OK;
}
$env{'request.symb'}=$symb;
- my ($status) = &Apache::lonhomework::check_task_access('0');
+ my $type = ($res =~ /\.task$/) ? 'Task'
+ : 'problem';
+ my ($status) = &Apache::lonhomework::check_slot_access('0',$type);
if ($status eq 'CAN_ANSWER' ||
$status eq 'NEEDS_CHECKIN' ||
$status eq 'WAITING_FOR_GRADE') {
@@ -1077,8 +1198,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>");
}