--- loncom/interface/slotrequest.pm 2005/11/18 16:26:47 1.31
+++ 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.31 2005/11/18 16:26:47 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
");
+ 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];
@@ -231,17 +254,65 @@ sub make_reservation {
return undef;
}
+sub remove_registration {
+ my ($r) = @_;
+ my $name = &Apache::loncommon::plainname($env{'form.uname'},
+ $env{'form.udom'});
+
+ my $title = &Apache::lonnet::gettitle($env{'form.symb'});
+
+ my $hidden_input;
+ foreach my $parm ('uname','udom','slotname','entry','symb') {
+ $hidden_input .=
+ '&\'').'" />'."\n";
+ }
+ $r->print(<<"END_CONFIRM");
+
Remove $name from slot $env{'form.slotname'} for $title
+ + +END_CONFIRM + +} + sub release_slot { - my ($r,$symb,$slot_name,$inhibit_return_link)=@_; + my ($r,$symb,$slot_name,$inhibit_return_link,$mgr)=@_; if ($slot_name eq '') { $slot_name=$env{'form.slotname'}; } my ($cnum,$cdom)=&get_course(); + my ($uname,$udom) = ($env{'user.name'}, $env{'user.domain'}); + if ($mgr eq 'F' + && defined($env{'form.uname'}) && defined($env{'form.udom'})) { + ($uname,$udom) = ($env{'form.uname'}, $env{'form.udom'}); + } + + if ($mgr eq 'F' + && 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("Not allowed to release Reservation: $description, as it has already ended.
"); + $r->print(''. + &mt('Return to last resource').'
'); + return 0; + } + } # get parameter string, check for existance, rebuild string with the slot - my @slots = split(/:/,&Apache::lonnet::EXT("resource.0.availablestudent", - $symb,$env{'user.domain'}, - $env{'user.name'})); + $symb,$udom,$uname)); + my @new_slots; foreach my $exist_slot (@slots) { if ($exist_slot eq $slot_name) { next; } @@ -253,21 +324,23 @@ sub release_slot { my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, "^$slot_name\0"); foreach my $entry (keys(%consumed)) { - if ( $consumed{$entry}->{'name'} eq - ($env{'user.name'}.'@'.$env{'user.domain'}) ) { + if ( $consumed{$entry}->{'name'} eq ($uname.'@'.$udom) ) { &Apache::lonnet::del('slot_reservations',[$entry], $cdom,$cnum); } } + # store new parameter string my $result=&Apache::lonparmset::storeparm_by_symb($symb, '0_availablestudent', 1, $new_param, 'string', - $env{'user.name'}, - $env{'user.domain'}); - my %slot=&Apache::lonnet::get_slot($slot_name); + $uname,$udom); my $description=&get_description($env{'form.slotname'},\%slot); $r->print("Released Reservation: $description
"); + if ($mgr eq 'F') { + $r->print(''. + &mt('Return to slot list').'
'); + } if (!$inhibit_return_link) { $r->print(''. &mt('Return to last resource').'
'); @@ -275,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("Slot $slot_name marked as deleted.
"); + } else { + $r->print("An error ($ret) occurse when attempting to delete Slot $slot_name.
"); + } + } else { + if (%consumed) { + $r->print("Slot $slot_name has active reservations.
"); + } else { + $r->print("Slot $slot_name does not exist.
"); + } + } + $r->print(''. + &mt('Return to slot list').'
'); + $r->print(''. + &mt('Return to last resource').'
'); +} + +sub return_link { + my ($r) = @_; + $r->print(''. + &mt('Return to last resource').'
'); +} + sub get_slot { my ($r,$symb)=@_; my $slot_name=&check_for_conflict($symb,$env{'form.slotname'}); + + if ($slot_name =~ /^error: (.*)/) { + $r->print("An error occured while attempting to make a reservation. ($1)
"); + &return_link($r); + return; + } if ($slot_name) { my %slot=&Apache::lonnet::get_slot($slot_name); my $description1=&get_description($slot_name,\%slot); @@ -299,14 +418,13 @@ STUFF STUFF $r->print(' your reservation from '.$description1.' to '. $description2. - ''. - &mt('Return to last resource').'
'); + &return_link($r); } return; } @@ -315,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("An error occured while attempting to make a reservation. ($1)
"); + } elsif ($reserved > -1) { $r->print("Success: $description
"); - $r->print(''. - &mt('Return to last resource').'
'); - return; } elsif ($reserved < 0) { $r->print("Already reserved: $description
"); - $r->print(''. - &mt('Return to last resource').'
'); - return; } + &return_link($r); + return; } my %lt=('request'=>"Availibility list", @@ -451,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; @@ -493,6 +614,24 @@ sub to_show { return 1; } +sub remove_link { + my ($slotname,$entry,$uname,$udom,$symb) = @_; + + $slotname = &Apache::lonnet::escape($slotname); + $entry = &Apache::lonnet::escape($entry); + $uname = &Apache::lonnet::escape($uname); + $udom = &Apache::lonnet::escape($udom); + $symb = &Apache::lonnet::escape($symb); + + my $remove= &mt('Remove'); + + return <<"END_LINK"; + ($remove) +END_LINK + +} + sub show_table { my ($r,$mgr)=@_; @@ -514,10 +653,11 @@ sub show_table { $r->print(''); } - 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); @@ -529,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', @@ -543,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(' -EDITFORM - my $edit=(<Unknown command: ".$env{'form.command'}."
"); }