--- loncom/interface/slotrequest.pm 2006/03/30 04:37:22 1.48.2.2
+++ loncom/interface/slotrequest.pm 2009/02/02 02:56:12 1.87
@@ -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.48.2.2 2006/03/30 04:37:22 albertel Exp $
+# $Id: slotrequest.pm,v 1.87 2009/02/02 02:56:12 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,12 +36,15 @@ use Apache::lonlocal;
use Apache::lonnet;
use Apache::lonnavmaps();
use Date::Manip;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
sub fail {
my ($r,$code)=@_;
if ($code eq 'not_valid') {
$r->print('<p>'.&mt('Unable to understand what resource you wanted to sign up for.').'</p>');
-
+ } elsif ($code eq 'not_available') {
+ $r->print('<p>'.&mt('No slots are available.').'</p>');
} elsif ($code eq 'not_allowed') {
$r->print('<p>'.&mt('Not allowed to sign up or change reservations at this time.').'</p>');
} else {
@@ -54,14 +57,12 @@ sub fail {
sub start_page {
my ($r,$title)=@_;
- my $html=&Apache::lonxml::xmlbegin();
- $r->print($html.'<head><title>'.&mt($title).'</title></head>');
- $r->print(&Apache::loncommon::bodytag($title));
+ $r->print(&Apache::loncommon::start_page($title));
}
sub end_page {
my ($r)=@_;
- $r->print(&Apache::loncommon::endbodytag().'</html>');
+ $r->print(&Apache::loncommon::end_page());
}
=pod
@@ -76,7 +77,7 @@ sub end_page {
=cut
sub get_course {
- (undef,my $courseid)=&Apache::lonxml::whichuser();
+ (undef,my $courseid)=&Apache::lonnet::whichuser();
my $cdom=$env{'course.'.$courseid.'.domain'};
my $cnum=$env{'course.'.$courseid.'.num'};
return ($cnum,$cdom);
@@ -89,7 +90,7 @@ sub get_reservation_ids {
my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
"^$slot_name\0");
- if (&network_error(%consumed)) {
+ if (&Apache::lonnet::error(%consumed)) {
return 'error: Unable to determine current status';
}
my ($tmp)=%consumed;
@@ -126,8 +127,9 @@ sub check_for_reservation {
my ($cnum,$cdom)=&get_course();
my %slots=&Apache::lonnet::get('slots', [@slots], $cdom, $cnum);
- if (&network_error($student) || &network_error($course) ||
- &network_error(%slots)) {
+ if (&Apache::lonnet::error($student)
+ || &Apache::lonnet::error($course)
+ || &Apache::lonnet::error(%slots)) {
return 'error: Unable to determine current status';
}
my @got;
@@ -163,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;
@@ -174,7 +179,8 @@ sub get_consumed_uniqueperiods {
my $course = &Apache::lonnet::EXT("resource.0.available",
$symb, $env{'user.domain'},
$env{'user.name'});
- if (&network_error($student) || &network_error($course)) {
+ if (&Apache::lonnet::error($student)
+ || &Apache::lonnet::error($course)) {
return 'error: Unable to determine current status';
}
foreach my $slot (split(/:/,$student), split(/:/, $course)) {
@@ -185,7 +191,7 @@ sub get_consumed_uniqueperiods {
if (!ref($slots)) {
my ($cnum,$cdom)=&get_course();
my %slots=&Apache::lonnet::get('slots', [keys(%used_slots)], $cdom, $cnum);
- if (&network_error(%slots)) {
+ if (&Apache::lonnet::error(%slots)) {
return 'error: Unable to determine current status';
}
$slots = \%slots;
@@ -211,9 +217,13 @@ sub check_for_conflict {
if (!ref($consumed_uniqueperiods)) {
$consumed_uniqueperiods = &get_consumed_uniqueperiods($slots);
- if (&network_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'}};
@@ -226,15 +236,6 @@ sub check_for_conflict {
}
}
return undef;
-
-}
-
-sub network_error {
- my ($result) = @_;
- if ($result =~ /^(con_lost|no_such_host|error: [^2])/) {
- return 1;
- }
- return 0;
}
sub make_reservation {
@@ -245,18 +246,32 @@ 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)) {
+
+ my $use_slots = &Apache::lonnet::EXT("resource.0.useslots",$symb,
+ $env{'user.domain'},$env{'user.name'});
+ &Apache::lonxml::debug("use_slots is $use_slots<br />");
+
+ if (&Apache::lonnet::error($value)
+ || &Apache::lonnet::error($use_slots)) {
return 'error: Unable to determine current status';
}
+ my $parm_symb = $symb;
+ my $parm_level = 1;
+ if ($use_slots eq 'map' || $use_slots eq 'map_map') {
+ my ($map) = &Apache::lonnet::decode_symb($symb);
+ $parm_symb = &Apache::lonnet::symbread($map);
+ $parm_level = 2;
+ }
+
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)) {
+ if (&Apache::lonnet::error($value)) {
return 'error: Unable to determine current status';
}
- my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+ my $me=$env{'user.name'}.':'.$env{'user.domain'};
foreach my $key (keys(%consumed)) {
if ($consumed{$key}->{'name'} eq $me) {
my $num=(split('\0',$key))[1];
@@ -270,7 +285,7 @@ sub make_reservation {
if (!defined($max)) { $max=99999; }
my (@ids)=&get_reservation_ids($slot_name);
- if (&network_error(@ids)) {
+ if (&Apache::lonnet::error(@ids)) {
return 'error: Unable to determine current status';
}
my $last=0;
@@ -286,9 +301,9 @@ sub make_reservation {
return undef;
}
- my %reservation=('name' => $env{'user.name'}.'@'.$env{'user.domain'},
+ my %reservation=('name' => $env{'user.name'}.':'.$env{'user.domain'},
'timestamp' => time,
- 'symb' => $symb);
+ 'symb' => $parm_symb);
my $success=&Apache::lonnet::newput('slot_reservations',
{"$slot_name\0$wanted" =>
@@ -302,7 +317,8 @@ sub make_reservation {
}
my $result=&Apache::lonparmset::storeparm_by_symb($symb,
'0_availablestudent',
- 1, $new_value, 'string',
+ $parm_level, $new_value,
+ 'string',
$env{'user.name'},
$env{'user.domain'});
&Apache::lonxml::debug("hrrm $result");
@@ -324,13 +340,13 @@ sub remove_registration {
my ($cnum,$cdom)=&get_course();
my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
"^$slot_name\0");
- if (&network_error(%consumed)) {
- $r->print("<p>".&mt('A network error has occured.').'</p>');
+ if (&Apache::lonnet::error(%consumed)) {
+ $r->print("<p><span class=\"LC_error\">".&mt('A network error has occurred.').'</span></p>');
return;
}
if (!%consumed) {
- $r->print("<p>".&mt('Slot <tt>[_1]</tt> has no reservations.',
- $slot_name)."</p>");
+ $r->print('<p>'.&mt('Slot [_1] has no reservations.',
+ '<tt>'.$slot_name.'</tt>').'</p>');
return;
}
@@ -371,13 +387,13 @@ sub remove_registration_confirmation {
'no' => 'No',);
$r->print(<<"END_CONFIRM");
<p> $msg </p>
-<form action="/adm/slotrequest" method="POST">
+<form action="/adm/slotrequest" method="post">
<input type="hidden" name="command" value="release" />
<input type="hidden" name="button" value="yes" />
$hidden_input
<input type="submit" value="$lt{'yes'}" />
</form>
-<form action="/adm/slotrequest" method="POST">
+<form action="/adm/slotrequest" method="post">
<input type="hidden" name="command" value="showslots" />
<input type="submit" value="$lt{'no'}" />
</form>
@@ -399,11 +415,15 @@ sub release_all_slot {
foreach my $entry (sort { $consumed{$a}{'name'} cmp
$consumed{$b}{'name'} } (keys(%consumed))) {
- my ($uname,$udom) = split('@',$consumed{$entry}{'name'});
+ my ($uname,$udom) = split(':',$consumed{$entry}{'name'});
my ($result,$msg) =
&release_reservation($slot_name,$uname,$udom,
$consumed{$entry}{'symb'},$mgr);
- $r->print("<p>$msg</p>");
+ if (!$result) {
+ $r->print('<p><span class="LC_error">'.&mt($msg).'</span></p>');
+ } else {
+ $r->print("<p>$msg</p>");
+ }
$r->rflush();
}
$r->print('<p><a href="/adm/slotrequest?command=showslots">'.
@@ -424,12 +444,16 @@ sub release_slot {
if ($mgr eq 'F'
&& defined($env{'form.symb'})) {
- $symb = $env{'form.symb'};
+ $symb = &unescape($env{'form.symb'});
}
my ($result,$msg) =
&release_reservation($slot_name,$uname,$udom,$symb,$mgr);
- $r->print("<p>$msg</p>");
+ if (!$result) {
+ $r->print('<p><span class="LC_error">'.&mt($msg).'</span></p>');
+ } else {
+ $r->print("<p>$msg</p>");
+ }
if ($mgr eq 'F') {
$r->print('<p><a href="/adm/slotrequest?command=showslots">'.
@@ -450,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) {
@@ -467,17 +507,29 @@ sub release_reservation {
my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
"^$slot_name\0");
foreach my $entry (keys(%consumed)) {
- if ( $consumed{$entry}->{'name'} eq ($uname.'@'.$udom) ) {
+ if ( $consumed{$entry}->{'name'} eq ($uname.':'.$udom) ) {
&Apache::lonnet::del('slot_reservations',[$entry],
$cdom,$cnum);
}
}
+ my $use_slots = &Apache::lonnet::EXT("resource.0.useslots",
+ $symb,$udom,$uname);
+ &Apache::lonxml::debug("use_slots is $use_slots<br />");
+
+ if (&Apache::lonnet::error($use_slots)) {
+ return (0,'error: Unable to determine current status');
+ }
+
+ my $parm_level = 1;
+ if ($use_slots eq 'map' || $use_slots eq 'map_map') {
+ $parm_level = 2;
+ }
# store new parameter string
my $result=&Apache::lonparmset::storeparm_by_symb($symb,
'0_availablestudent',
- 1, $new_param, 'string',
- $uname,$udom);
+ $parm_level, $new_param,
+ 'string', $uname, $udom);
my $msg;
if ($mgr eq 'F') {
@@ -505,15 +557,15 @@ sub delete_slot {
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>");
+ $r->print('<p>'.&mt('Slot [_1] marked as deleted.','<tt>'.$slot_name.'</tt>').'</p>');
} else {
- $r->print("<p> An error ($ret) occurse when attempting to delete Slot <tt>$slot_name</tt>.</p>");
+ $r->print('<p><span class="LC_error">'.&mt('An error occurred when attempting to delete slot: [_1]','<tt>'.$slot_name.'</tt>')." ($ret)</span></p>");
}
} else {
if (%consumed) {
- $r->print("<p>Slot <tt>$slot_name</tt> has active reservations.</p>");
+ $r->print('<p>'.&mt('Slot [_1] has active reservations.','<tt>'.$slot_name.'</tt>').'</p>');
} else {
- $r->print("<p>Slot <tt>$slot_name</tt> does not exist.</p>");
+ $r->print('<p>'.&mt('Slot [_1] does not exist.','<tt>'.$slot_name.'</tt>').'</p>');
}
}
$r->print('<p><a href="/adm/slotrequest?command=showslots">'.
@@ -528,37 +580,33 @@ 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("<p>An error occured while attempting to make a reservation. ($1)</p>");
+ $r->print('<p><span class="LC_error">'
+ .&mt('An error occurred while attempting to make a reservation. ([_1])',$1)
+ .'</span></p>');
&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'});
my $description2=&get_description($env{'form.slotname'},\%slot);
- $r->print("<p>Already have a reservation: $description1</p>");
+ $r->print('<p>'.&mt('Already have a reservation: [_1].',$description1).'</p>');
if ($slot_name ne $env{'form.slotname'}) {
$r->print(<<STUFF);
-<form method="POST" action="/adm/slotrequest">
+<form method="post" action="/adm/slotrequest">
<input type="hidden" name="symb" value="$env{'form.symb'}" />
<input type="hidden" name="slotname" value="$env{'form.slotname'}" />
<input type="hidden" name="releaseslot" value="$slot_name" />
<input type="hidden" name="command" value="change" />
STUFF
- $r->print("<p>You can either ");
- $r->print(<<STUFF);
- <input type="submit" name="change" value="Change" />
-STUFF
- $r->print(' your reservation from <b>'.$description1.'</b> to <b>'.
- $description2.
- '</b> <br />or </p>');
+ $r->print('<p>'.&mt('You can either [_1] your reservation from [2] to [_3] or [_4]','<input type="submit" name="change" value="'.&mt('Change').'" />','<b>'.$description1.'</b>','<b>'.$description2.'</b><br />','</p>'));
&return_link($r);
$r->print(<<STUFF);
</form>
@@ -566,86 +614,145 @@ 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("<p>An error occured while attempting to make a reservation. ($1)</p>");
+ $r->print('<p><span class="LC_error">'
+ .&mt('An error occurred while attempting to make a reservation. ([_1])',$1)
+ .'</span></p>');
} elsif ($reserved > -1) {
- $r->print("<p>Success: $description</p>");
+ $r->print('<p>'.&mt('Success: [_1]',$description).'</p>');
+ $retvalue = 1;
} elsif ($reserved < 0) {
- $r->print("<p>Already reserved: $description</p>");
+ $r->print('<p>'.&mt('Already reserved: [_1]',$description).'</p>');
}
- &return_link($r);
- return;
+ if (!$inhibit_return_link) { &return_link($r); }
+ return 1;
}
my %lt=('request'=>"Availibility list",
- 'try' =>'Try again');
+ 'try' =>'Try again?',
+ 'or' => 'or');
%lt=&Apache::lonlocal::texthash(%lt);
+ my $extra_input;
+ if ($conflictable_slot) {
+ $extra_input='<input type="hidden" name="releaseslot" value="'.$env{'form.slotname'}.'" />';
+ }
+
+ $r->print('<p>'.&mt('[_1]Failed[_2] to reserve a slot for [_3].','<span class="LC_warning">','</span>',$description).'</p>');
$r->print(<<STUFF);
-<p> <font color="red">Failed</font> to reserve a spot for $description. </p>
<p>
-<form method="POST" action="/adm/slotrequest">
+<form method="post" action="/adm/slotrequest">
<input type="submit" name="Try Again" value="$lt{'try'}" />
<input type="hidden" name="symb" value="$env{'form.symb'}" />
<input type="hidden" name="slotname" value="$env{'form.slotname'}" />
- <input type="hidden" name="command" value="get" />
+ <input type="hidden" name="command" value="$env{'form.command'}" />
+ $extra_input
</form>
-?
</p>
<p>
-or
-<form method="POST" action="/adm/slotrequest">
+$lt{'or'}
+<form method="post" action="/adm/slotrequest">
<input type="hidden" name="symb" value="$env{'form.symb'}" />
<input type="submit" name="requestattempt" value="$lt{'request'}" />
</form>
-</p>
-or
STUFF
- &return_link($r);
- return;
+ if (!$inhibit_return_link) {
+ $r->print(&mt('or').'</p>').&return_link($r);
+ } else {
+ $r->print('</p>');
+ }
+ return 0;
}
sub allowed_slot {
my ($slot_name,$slot,$symb,$slots,$consumed_uniqueperiods)=@_;
+
#already started
if ($slot->{'starttime'} < time) {
- # all open slot to be schedulable
- #return 0;
+ 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");
- # not allowed for this resource
- if (defined($slot->{'symb'})
- && $slot->{'symb'} ne $symb) {
- return 0;
- }
+
# 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;
+ }
+ if (defined($env{'request.course.groups'})) {
+ my @groups = split(/:/,$env{'request.course.groups'});
+ my @allowed_sec = split(',',$slot->{'allowedsections'});
+ foreach my $group (@groups) {
+ if (grep {$_ eq $group} (@allowed_sec)) {
+ $userallowed=1;
+ last;
+ }
+ }
+ }
+ }
+ &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,
$consumed_uniqueperiods);
- if ($conflict) {
+ if ($conflict =~ /^error: /) {
+ return 0;
+ } elsif ($conflict ne '') {
if ($slots->{$conflict}{'starttime'} < time) {
return 0;
}
@@ -671,10 +778,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('<span class="LC_error">'.
+ &mt('An error occurred determining slot availability').
+ '</span>');
+ return;
+ }
+ } elsif ($consumed_uniqueperiods =~ /^error: /) {
+ $r->print('<span class="LC_error">'.
+ &mt('An error occurred determining slot availability').
+ '</span>');
+ return;
+ }
my $available;
- $r->print('<table border="1">');
&Apache::lonxml::debug("Checking Slots");
my @got_slots=&check_for_reservation($symb,'allslots');
+ if ($got_slots[0] =~ /^error: /) {
+ $r->print('<span class="LC_error">'.
+ &mt('An error occurred determining slot availability').
+ '</span>');
+ return;
+ }
+ $r->print('<table border="1">');
foreach my $slot (sort
{ return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'} }
(keys(%slots))) {
@@ -693,20 +819,26 @@ sub show_choices {
my $text=&mt('Select');
my $command='get';
if (grep(/^\Q$slot\E$/,@got_slots)) {
- $text=&mt('Free Reservation');
+ $text=&mt('Drop Reservation');
$command='release';
} else {
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('<tr><td><span class="LC_error" colspan="2">'
+ .&mt('Slot: [_1] has unknown status.',$description)
+ .'</span></td></tr>');
+ } else {
+ $text=&mt('Change Reservation');
+ $command='get';
+ }
+ }
}
- my $escsymb=&Apache::lonnet::escape($symb);
+ my $escsymb=&escape($symb);
$form=<<STUFF;
- <form method="POST" action="/adm/slotrequest">
+ <form method="post" action="/adm/slotrequest">
<input type="submit" name="Select" value="$text" />
<input type="hidden" name="symb" value="$escsymb" />
<input type="hidden" name="slotname" value="$slot" />
@@ -723,7 +855,8 @@ STUFF
}
if (!$available) {
- $r->print('<tr><td>No available times. <a href="/adm/flip?postdata=return:">'.
+ $r->print('<tr><td>'.&mt('No available times.').
+ ' <a href="/adm/flip?postdata=return:">'.
&mt('Return to last resource').'</a></td></tr>');
}
$r->print('</table>');
@@ -803,14 +936,14 @@ sub remove_link {
undef($udom);
}
- $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);
+ $slotname = &escape($slotname);
+ $entry = &escape($entry);
+ $uname = &escape($uname);
+ $udom = &escape($udom);
+ $symb = &escape($symb);
return <<"END_LINK";
- <a href="/adm/slotrequest?command=remove_registration&slotname=$slotname&entry=$entry&uname=$uname&udom=$udom&symb=$symb"
+ <a href="/adm/slotrequest?command=remove_registration&slotname=$slotname&entry=$entry&uname=$uname&udom=$udom&symb=$symb"
>($remove)</a>
END_LINK
@@ -826,14 +959,19 @@ sub show_table {
}
my $available;
if ($mgr eq 'F') {
+ # FIXME: This line should be deleted once Slots uses breadcrumbs
+ $r->print(&Apache::loncommon::help_open_topic('Slot About', 'Help on slots'));
+
$r->print('<div>');
- $r->print('<form method="POST" action="/adm/slotrequest">
+ $r->print('<form method="post" action="/adm/slotrequest">
<input type="hidden" name="command" value="uploadstart" />
<input type="submit" name="start" value="'.&mt('Upload Slot List').'" />
</form>');
- $r->print('<form method="POST" action="/adm/helper/newslot.helper">
+ $r->print(&Apache::loncommon::help_open_topic('Slot CommaDelimited'));
+ $r->print('<form method="post" action="/adm/helper/newslot.helper">
<input type="submit" name="newslot" value="'.&mt('Create a New Slot').'" />
</form>');
+ $r->print(&Apache::loncommon::help_open_topic('Slot AddInterface'));
$r->print('</div>');
}
@@ -854,22 +992,25 @@ sub show_table {
# 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',
+ 'space' => '# of students/max',
+ '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','space','ip','symb',
+ 'allowedsections','allowedusers','uniqueperiod',
+ 'scheduled','proctor');
my @show =
(exists($env{'form.show'})) ? &Apache::loncommon::get_env_multiple('form.show')
: keys(%show_fields);
@@ -915,13 +1056,16 @@ sub show_table {
my $name_filter = {'type' => $name_filter_type,
'value' => $env{'form.name_filter_value'},};
+
#deleted slot filtering
+ #default to hide if no value
+ $env{'form.deleted'} ||= 'hide';
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">
+ $r->print('<form method="post" action="/adm/slotrequest">
<input type="hidden" name="command" value="showslots" />');
$r->print('<div>');
$r->print('<table class="inline">
@@ -964,23 +1108,28 @@ sub show_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=';
- $r->print('<table class="thinborder">
-<tr>
- <th></th>');
+ $r->print(&Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().'
+ <th></th>');
foreach my $which (@show_order) {
if ($which ne 'proctor' && exists($show{$which})) {
$r->print('<th>'.$linkstart.$which.'">'.$show_fields{$which}.'</a></th>');
}
}
+ $r->print(&Apache::loncommon::end_data_table_header_row());
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|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);
@@ -1000,6 +1149,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; }
@@ -1008,29 +1165,30 @@ 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.= '<nobr>';
+ my ($uname,$udom) = split(':',$consumed{$entry}{'name'});
+ $ids.= '<span class="LC_nobreak">';
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.="<tt>$uname:$udom</tt> ";
}
}
}
$ids.=&remove_link($slot,$entry,$uname,$udom,
- $consumed{$entry}{'symb'}).'</nobr><br />';
+ $consumed{$entry}{'symb'}).'</span><br />';
}
}
}
@@ -1044,7 +1202,7 @@ sub show_table {
my $unique;
if (ref($slots{$slot}{'uniqueperiod'})) {
- $unique=localtime($slots{$slot}{'uniqueperiod'}[0]).','.
+ $unique=localtime($slots{$slot}{'uniqueperiod'}[0]).', '.
localtime($slots{$slot}{'uniqueperiod'}[1]);
}
@@ -1057,16 +1215,37 @@ sub show_table {
$title='<a href="'.$res.'?symb='.$slots{$slot}{'symb'}.'">'.$title.'</a>';
}
+ 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;
if (exists($show{'proctor'})) {
$rowspan=2;
@proctors= map {
- my ($uname,$udom)=split(/@/,$_);
+ 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;
@@ -1081,17 +1260,21 @@ sub show_table {
EDITLINK
my $delete=(<<"DELETELINK");
-<a href="/adm/slotrequest?command=delete&slotname=$slot">Delete</a>
+<a href="/adm/slotrequest?command=delete&slotname=$slot">Delete</a>
DELETELINK
- my $remove_all=&remove_link($slot,'remove all');
+ my $remove_all=&remove_link($slot,'remove all').'<br />';
if ($ids ne '') { undef($delete); }
- if ($slots{$slot}{'type'} ne 'schedulable_student') {
+ if ($slots{$slot}{'type'} ne 'schedulable_student'
+ || $ids eq '') {
undef($remove_all);
}
- $r->print("<tr>\n<td rowspan=\"$rowspan\">$edit $delete $remove_all</td>\n");
+ my $row_start=&Apache::loncommon::start_data_table_row();
+ my $row_end=&Apache::loncommon::end_data_table_row();
+ $r->print($row_start.
+ "\n<td rowspan=\"$rowspan\">$edit $delete</td>\n");
if (exists($show{'name'})) {
$colspan++;$r->print("<td>$slot</td>");
}
@@ -1113,8 +1296,15 @@ DELETELINK
if (exists($show{'secret'})) {
$colspan++;$r->print("<td>$slots{$slot}{'secret'}</td>\n");
}
- if (exists($show{'maxspace'})) {
- $colspan++;$r->print("<td>$slots{$slot}{'maxspace'}</td>\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 = '<strong>'.$display.' (full) </strong>';
+ }
+ }
+ $colspan++;$r->print("<td>$display</td>\n");
}
if (exists($show{'ip'})) {
$colspan++;$r->print("<td>$slots{$slot}{'ip'}</td>\n");
@@ -1122,21 +1312,28 @@ DELETELINK
if (exists($show{'symb'})) {
$colspan++;$r->print("<td>$title</td>\n");
}
+ if (exists($show{'allowedsections'})) {
+ $colspan++;$r->print("<td>$allowedsections</td>\n");
+ }
+ if (exists($show{'allowedusers'})) {
+ $colspan++;$r->print("<td>$allowedusers</td>\n");
+ }
if (exists($show{'uniqueperiod'})) {
$colspan++;$r->print("<td>$unique</td>\n");
}
if (exists($show{'scheduled'})) {
- $colspan++;$r->print("<td>$ids</td>\n</tr>\n");
+ $colspan++;$r->print("<td>$remove_all $ids</td>\n");
}
+ $r->print("$row_end\n");
if (exists($show{'proctor'})) {
$r->print(<<STUFF);
-<tr>
+$row_start
<td colspan="$colspan">$proctors</td>
-</tr>
+$row_end
STUFF
}
}
- $r->print('</table>');
+ $r->print('</table></form>');
}
sub upload_start {
@@ -1146,7 +1343,7 @@ sub upload_start {
$result.=' <b>'.
&mt('Specify a file containing the slot definitions.').
'</b></td></tr>'."\n";
- $result.='<tr bgcolor=#ffffe6><td>'."\n";
+ $result.='<tr bgcolor="#ffffe6"><td>'."\n";
my $upfile_select=&Apache::loncommon::upfile_select_html();
my $ignore=&mt('Ignore First Line');
$result.=<<ENDUPFORM;
@@ -1173,9 +1370,11 @@ sub csvuploadmap_header {
my $checked=(($env{'form.noFirstLine'})?' checked="checked"':'');
my $ignore=&mt('Ignore First Line');
+ my $help_field = &Apache::loncommon::help_open_topic('Slot SelectingField');
+
$r->print(<<ENDPICK);
<form method="post" enctype="multipart/form-data" action="/adm/slotrequest" name="slotupload">
-<h3>Identify fields</h3>
+<h3>Identify fields $help_field</h3>
Total number of records found in file: $distotal <hr />
Enter as many fields as you can. The system will inform you and bring you back
to this page if the data selected is insufficient to create the slots.<hr />
@@ -1199,11 +1398,12 @@ ENDPICK
sub csvuploadmap_footer {
my ($request,$i,$keyfields) =@_;
+ my $buttontext = &mt('Create Slots');
$request->print(<<ENDPICK);
</table>
<input type="hidden" name="nfields" value="$i" />
<input type="hidden" name="keyfields" value="$keyfields" />
-<input type="button" onClick="javascript:verify(this.form)" value="Create Slots" /><br />
+<input type="button" onClick="javascript:verify(this.form)" value="$buttontext" /><br />
</form>
ENDPICK
}
@@ -1308,7 +1508,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 {
@@ -1317,7 +1520,7 @@ sub csv_upload_assign {
my @slotdata = &Apache::loncommon::upfile_record_sep();
if ($env{'form.noFirstLine'}) { shift(@slotdata); }
my %fields=&Apache::grades::get_fields();
- $r->print('<h3>Creating Slots</h3>');
+ $r->print('<h3>'.&mt('Creating Slots').'</h3>');
my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
my $countdone=0;
@@ -1355,31 +1558,58 @@ sub csv_upload_assign {
if ($entries{$fields{'endtime'}}) {
$slot{'endtime'}=&UnixDate($entries{$fields{'endtime'}},"%s");
}
+
+ # start/endtime must be defined and greater than zero
+ if (!$slot{'starttime'}) {
+ push(@errors,"$name not created -- Invalid start time");
+ next;
+ }
+ if (!$slot{'endtime'}) {
+ push(@errors,"$name not created -- Invalid end time");
+ next;
+ }
+ if ($slot{'starttime'} > $slot{'endtime'}) {
+ push(@errors,"$name not created -- Slot starts after it ends");
+ next;
+ }
+
if ($entries{$fields{'startreserve'}}) {
$slot{'startreserve'}=
&UnixDate($entries{$fields{'startreserve'}},"%s");
}
+ if (defined($slot{'startreserve'})
+ && $slot{'startreserve'} > $slot{'starttime'}) {
+ push(@errors,"$name not created -- Slot's reservation start time is after the slot's start time.");
+ next;
+ }
+
foreach my $key ('ip','proctor','description','maxspace',
'secret','symb') {
if ($entries{$fields{$key}}) {
$slot{$key}=$entries{$fields{$key}};
}
}
+
if ($entries{$fields{'uniqueperiod'}}) {
my ($start,$end)=split(',',$entries{$fields{'uniqueperiod'}});
my @times=(&UnixDate($start,"%s"),
&UnixDate($end,"%s"));
$slot{'uniqueperiod'}=\@times;
}
+ if (defined($slot{'uniqueperiod'})
+ && $slot{'uniqueperiod'}[0] > $slot{'uniqueperiod'}[1]) {
+ push(@errors,"$name not created -- Slot's unique period start time is later than the unique period's end time.");
+ next;
+ }
&Apache::lonnet::cput('slots',{$name=>\%slot},$cdom,$cname);
$r->print('.');
$r->rflush();
$countdone++;
}
- $r->print("<p>Created $countdone slots\n</p>");
+ $r->print('<p>'.&mt('Created [quant,_1,slot]',$countdone)."\n".'</p>');
foreach my $error (@errors) {
- $r->print("<p>$error\n</p>");
+ $r->print('<p><span class="LC_warning">'.$error.'</span></p>'."\n");
}
&show_table($r,$mgr);
return '';
@@ -1433,11 +1663,17 @@ sub handler {
&csv_upload_map($r);
}
} else {
- my $symb=&Apache::lonnet::unescape($env{'form.symb'});
+ my $symb=&unescape($env{'form.symb'});
+ if (!defined($symb)) {
+ &fail($r,'not_valid');
+ return OK;
+ }
my (undef,undef,$res)=&Apache::lonnet::decode_symb($symb);
my $useslots = &Apache::lonnet::EXT("resource.0.useslots",$symb);
- if ($useslots ne 'resource') {
- &fail($r,'not_valid');
+ if ($useslots ne 'resource'
+ && $useslots ne 'map'
+ && $useslots ne 'map_map') {
+ &fail($r,'not_available');
return OK;
}
$env{'request.symb'}=$symb;
@@ -1457,11 +1693,11 @@ 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("<p>Unknown command: ".$env{'form.command'}."</p>");
+ $r->print('<p>'.&mt('Unknown command: [_1]',$env{'form.command'}).'</p>');
}
}
&end_page($r);