--- loncom/interface/slotrequest.pm 2006/03/07 21:47:06 1.51
+++ loncom/interface/slotrequest.pm 2006/05/12 05:12:27 1.61
@@ -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.51 2006/03/07 21:47:06 albertel Exp $
+# $Id: slotrequest.pm,v 1.61 2006/05/12 05:12:27 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -41,7 +41,8 @@ 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 +55,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
@@ -245,10 +244,22 @@ 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");
+ &Apache::lonxml::debug("use_slots is $use_slots<br />");
+
+ if (&network_error($value) || &network_error($use_slots)) {
return 'error: Unable to determine current status';
}
+ my $parm_symb = $symb;
+ my $parm_level = 1;
+ if ($use_slots eq '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,
@@ -256,7 +267,7 @@ sub make_reservation {
if (&network_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];
@@ -286,9 +297,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 +313,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");
@@ -315,37 +327,106 @@ sub make_reservation {
sub remove_registration {
my ($r) = @_;
+ if ($env{'form.entry'} ne 'remove all') {
+ return &remove_registration_user($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");
+ if (&network_error(%consumed)) {
+ $r->print("<p>".&mt('A network error has occured.').'</p>');
+ return;
+ }
+ if (!%consumed) {
+ $r->print("<p>".&mt('Slot <tt>[_1]</tt> has no reservations.',
+ $slot_name)."</p>");
+ return;
+ }
+
+ my @names = map { $consumed{$_}{'name'} } (sort(keys(%consumed)));
+ my $names = join(' ',@names);
+
+ my $msg = &mt('Remove all of [_1] from slot [_2]?',$names,$slot_name);
+ &remove_registration_confirmation($r,$msg,['entry','slotname']);
+}
+
+sub remove_registration_user {
+ my ($r) = @_;
+
+ my $slot_name = $env{'form.slotname'};
+
my $name = &Apache::loncommon::plainname($env{'form.uname'},
$env{'form.udom'});
my $title = &Apache::lonnet::gettitle($env{'form.symb'});
+ my $msg = &mt('Remove [_1] from slot [_2] for [_3]',
+ $name,$slot_name,$title);
+
+ &remove_registration_confirmation($r,$msg,['uname','udom','slotname',
+ 'entry','symb']);
+}
+
+sub remove_registration_confirmation {
+ my ($r,$msg,$inputs) =@_;
+
my $hidden_input;
- foreach my $parm ('uname','udom','slotname','entry','symb') {
+ foreach my $parm (@{$inputs}) {
$hidden_input .=
'<input type="hidden" name="'.$parm.'" value="'
.&HTML::Entities::encode($env{'form.'.$parm},'"<>&\'').'" />'."\n";
}
+ my %lt = &Apache::lonlocal::texthash('yes' => 'Yes',
+ 'no' => 'No',);
$r->print(<<"END_CONFIRM");
-<p> Remove $name from slot $env{'form.slotname'} for $title</p>
+<p> $msg </p>
<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" name="Yes" value="yes" />
+ <input type="submit" value="$lt{'yes'}" />
</form>
<form action="/adm/slotrequest" method="POST">
<input type="hidden" name="command" value="showslots" />
- <input type="submit" name="No" value="no" />
+ <input type="submit" value="$lt{'no'}" />
</form>
END_CONFIRM
}
+sub release_all_slot {
+ my ($r,$mgr)=@_;
+
+ my $slot_name = $env{'form.slotname'};
+
+ my ($cnum,$cdom)=&get_course();
+
+ my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
+ "^$slot_name\0");
+
+ $r->print('<p>'.&mt('Releasing reservations').'</p>');
+
+ foreach my $entry (sort { $consumed{$a}{'name'} cmp
+ $consumed{$b}{'name'} } (keys(%consumed))) {
+ 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>");
+ $r->rflush();
+ }
+ $r->print('<p><a href="/adm/slotrequest?command=showslots">'.
+ &mt('Return to slot list').'</a></p>');
+ &return_link($r);
+}
+
sub release_slot {
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'
@@ -357,14 +438,28 @@ sub release_slot {
&& defined($env{'form.symb'})) {
$symb = $env{'form.symb'};
}
+
+ my ($result,$msg) =
+ &release_reservation($slot_name,$uname,$udom,$symb,$mgr);
+ $r->print("<p>$msg</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) { &return_link($r); }
+ return $result;
+}
+
+sub release_reservation {
+ my ($slot_name,$uname,$udom,$symb,$mgr) = @_;
my %slot=&Apache::lonnet::get_slot($slot_name);
- my $description=&get_description($env{'form.slotname'},\%slot);
+ my $description=&get_description($slot_name,\%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;
+ return (0,&mt('Not allowed to release Reservation: [_1], as it has already ended.',$description));
}
}
# get parameter string, check for existance, rebuild string with the slot
@@ -378,28 +473,42 @@ sub release_slot {
}
my $new_param = join(':',@new_slots);
+ my ($cnum,$cdom)=&get_course();
+
# get slot reservations, check if user has one, if so remove 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");
+ &Apache::lonxml::debug("use_slots is $use_slots<br />");
+
+ if (&network_error($use_slots)) {
+ return (0,'error: Unable to determine current status');
+ }
+
+ my $parm_level = 1;
+ if ($use_slots eq 'map') {
+ $parm_level = 2;
+ }
# store new parameter string
my $result=&Apache::lonparmset::storeparm_by_symb($symb,
'0_availablestudent',
- 1, $new_param, 'string',
- $uname,$udom);
- $r->print("<p>Released Reservation: $description</p>");
+ $parm_level, $new_param,
+ 'string', $uname, $udom);
+
+ my $msg;
if ($mgr eq 'F') {
- $r->print('<p><a href="/adm/slotrequest?command=showslots">'.
- &mt('Return to slot list').'</a></p>');
+ $msg = &mt('Released Reservation for user: [_1]',"$uname:$udom");
+ } else {
+ $msg = &mt('Released Reservation: [_1]',$description);
}
- if (!$inhibit_return_link) { &return_link($r); }
- return 1;
+ return (1,$msg);
}
sub delete_slot {
@@ -550,6 +659,12 @@ sub allowed_slot {
}
&Apache::lonxml::debug("$slot_name type good");
+ # 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'})) {
@@ -674,12 +789,27 @@ STUFF
}
sub to_show {
- my ($slot,$when,$deleted) = @_;
+ my ($slotname,$slot,$when,$deleted,$name) = @_;
my $time=time;
my $week=60*60*24*7;
+
if ($deleted eq 'hide' && $slot->{'type'} eq 'deleted') {
return 0;
}
+
+ if ($name && $name->{'value'} =~ /\w/) {
+ if ($name->{'type'} eq 'substring') {
+ if ($slotname !~ /\Q$name->{'value'}\E/) {
+ return 0;
+ }
+ }
+ if ($name->{'type'} eq 'exact') {
+ if ($slotname eq $name->{'value'}) {
+ return 0;
+ }
+ }
+ }
+
if ($when eq 'any') {
return 1;
} elsif ($when eq 'now') {
@@ -724,14 +854,20 @@ sub to_show {
sub remove_link {
my ($slotname,$entry,$uname,$udom,$symb) = @_;
+ my $remove = &mt('Remove');
+
+ if ($entry eq 'remove all') {
+ $remove = &mt('Remove All');
+ undef($uname);
+ 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);
- my $remove= &mt('Remove');
-
return <<"END_LINK";
<a href="/adm/slotrequest?command=remove_registration&slotname=$slotname&entry=$entry&uname=$uname&udom=$udom&symb=$symb"
>($remove)</a>
@@ -760,10 +896,12 @@ sub show_table {
$r->print('</div>');
}
- my %Saveable_Parameters = ('show' => 'array',
- 'when' => 'scalar',
- 'order' => 'scalar',
- 'deleted' => 'scalar',
+ my %Saveable_Parameters = ('show' => 'array',
+ 'when' => 'scalar',
+ 'order' => 'scalar',
+ 'deleted' => 'scalar',
+ 'name_filter_type' => 'scalar',
+ 'name_filter_value' => 'scalar',
);
&Apache::loncommon::store_course_settings('slotrequest',
\%Saveable_Parameters);
@@ -773,6 +911,7 @@ sub show_table {
my ($classlist,$section,$fullname)=&Apache::grades::getclasslist('all');
&Apache::grades::reset_perm();
+ # what to display filtering
my %show_fields=&Apache::lonlocal::texthash(
'name' => 'Slot Name',
'description' => 'Description',
@@ -798,6 +937,7 @@ sub show_table {
: keys(%show_fields);
my %show = map { $_ => 1 } (@show);
+ #when filtering setup
my %when_fields=&Apache::lonlocal::texthash(
'now' => 'Open now',
'nextweek' => 'Open within the next week',
@@ -811,6 +951,7 @@ sub show_table {
my $when = (exists($env{'form.when'})) ? $env{'form.when'}
: 'now';
+ #display of students setup
my %stu_display_fields=
&Apache::lonlocal::texthash('username' => 'User name',
'fullname' => 'Full name',
@@ -821,6 +962,22 @@ sub show_table {
: keys(%stu_display_fields);
my %stu_display = map { $_ => 1 } (@stu_display);
+ #name filtering setup
+ my %name_filter_type_fields=
+ &Apache::lonlocal::texthash('substring' => 'Substring',
+ 'exact' => 'Exact',
+ #'reg' => 'Regular Expression',
+ );
+ my @name_filter_type_order=('substring','exact');
+
+ $name_filter_type_fields{'select_form_order'} = \@name_filter_type_order;
+ my $name_filter_type =
+ (exists($env{'form.name_filter_type'})) ? $env{'form.name_filter_type'}
+ : 'substring';
+ my $name_filter = {'type' => $name_filter_type,
+ 'value' => $env{'form.name_filter_value'},};
+
+ #deleted slot filtering
my $hide_radio =
&Apache::lonhtmlcommon::radio('deleted',$env{'form.deleted'},'hide');
my $show_radio =
@@ -833,6 +990,7 @@ sub show_table {
<tr><th>'.&mt('Show').'</th>
<th>'.&mt('Student Display').'</th>
<th>'.&mt('Open').'</th>
+ <th>'.&mt('Slot Name Filter').'</th>
<th>'.&mt('Options').'</th>
</tr>
<tr><td>'.&Apache::loncommon::multiple_select_form('show',\@show,6,\%show_fields,\@show_order).
@@ -844,6 +1002,14 @@ sub show_table {
</td>
<td>'.&Apache::loncommon::select_form($when,'when',%when_fields).
'</td>
+ <td>'.&Apache::loncommon::select_form($name_filter_type,
+ 'name_filter_type',
+ %name_filter_type_fields).
+ '<br />'.
+ &Apache::lonhtmlcommon::textbox('name_filter_value',
+ $env{'form.name_filter_value'},
+ 15).
+ '</td>
<td>
<table>
<tr>
@@ -897,7 +1063,8 @@ sub show_table {
return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'};
};
foreach my $slot (sort $slotsort (keys(%slots))) {
- if (!&to_show($slots{$slot},$when,$env{'form.deleted'})) { next; }
+ if (!&to_show($slot,$slots{$slot},$when,
+ $env{'form.deleted'},$name_filter)) { next; }
if (defined($slots{$slot}->{'type'})
&& $slots{$slot}->{'type'} ne 'schedulable_student') {
#next;
@@ -909,16 +1076,18 @@ sub show_table {
"^$slot\0");
my ($tmp)=%consumed;
if ($tmp !~ /^error: /) {
- foreach my $entry (sort(keys(%consumed))) {
+ foreach my $entry (sort { $consumed{$a}{name} cmp
+ $consumed{$b}{name} }
+ (keys(%consumed))) {
my (undef,$id)=split("\0",$entry);
- my ($uname,$udom) = split('@',$consumed{$entry}{'name'});
+ 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.="<tt>$uname:$udom</tt> ";
}
}
}
@@ -997,7 +1166,14 @@ EDITLINK
my $delete=(<<"DELETELINK");
<a href="/adm/slotrequest?command=delete&slotname=$slot">Delete</a>
DELETELINK
+
+ my $remove_all=&remove_link($slot,'remove all').'<br />';
+
if ($ids ne '') { undef($delete); }
+ if ($slots{$slot}{'type'} ne 'schedulable_student'
+ || $ids eq '') {
+ undef($remove_all);
+ }
$r->print("<tr>\n<td rowspan=\"$rowspan\">$edit $delete</td>\n");
if (exists($show{'name'})) {
@@ -1037,7 +1213,7 @@ DELETELINK
$colspan++;$r->print("<td>$allowedusers</td>\n");
}
if (exists($show{'scheduled'})) {
- $colspan++;$r->print("<td>$ids</td>\n</tr>\n");
+ $colspan++;$r->print("<td>$remove_all $ids</td>\n</tr>\n");
}
if (exists($show{'proctor'})) {
$r->print(<<STUFF);
@@ -1269,22 +1445,49 @@ 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('.');
@@ -1324,7 +1527,11 @@ sub handler {
} elsif ($env{'form.command'} eq 'remove_registration' && $mgr eq 'F') {
&remove_registration($r);
} elsif ($env{'form.command'} eq 'release' && $mgr eq 'F') {
- &release_slot($r,undef,undef,undef,$mgr);
+ if ($env{'form.entry'} eq 'remove all') {
+ &release_all_slot($r,$mgr);
+ } else {
+ &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') {
@@ -1344,10 +1551,14 @@ sub handler {
}
} else {
my $symb=&Apache::lonnet::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') {
+ &fail($r,'not_available');
return OK;
}
$env{'request.symb'}=$symb;