--- loncom/interface/slotrequest.pm 2006/03/30 05:20:44 1.56 +++ loncom/interface/slotrequest.pm 2006/06/16 19:54:02 1.65 @@ -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.56 2006/03/30 05:20:44 albertel Exp $ +# $Id: slotrequest.pm,v 1.65 2006/06/16 19:54:02 albertel 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('

'.&mt('Unable to understand what resource you wanted to sign up for.').'

'); - + } elsif ($code eq 'not_available') { + $r->print('

'.&mt('No slots are available.').'

'); } elsif ($code eq 'not_allowed') { $r->print('

'.&mt('Not allowed to sign up or change reservations at this time.').'

'); } else { @@ -243,10 +246,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
"); - if (&network_error($value)) { + + my $use_slots = &Apache::lonnet::EXT("resource.0.useslots"); + &Apache::lonxml::debug("use_slots is $use_slots
"); + + 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, @@ -254,7 +269,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]; @@ -284,9 +299,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" => @@ -300,7 +315,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"); @@ -369,13 +385,13 @@ sub remove_registration_confirmation { 'no' => 'No',); $r->print(<<"END_CONFIRM");

$msg

-
+ $hidden_input
-
+
@@ -397,7 +413,7 @@ 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); @@ -465,17 +481,28 @@ 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"); + &Apache::lonxml::debug("use_slots is $use_slots
"); + + 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); + $parm_level, $new_param, + 'string', $uname, $udom); my $msg; if ($mgr eq 'F') { @@ -544,7 +571,7 @@ sub get_slot { $r->print("

Already have a reservation: $description1

"); if ($slot_name ne $env{'form.slotname'}) { $r->print(< +
@@ -589,7 +616,7 @@ STUFF $r->print(< Failed to reserve a spot for $description.

- + @@ -599,7 +626,7 @@ STUFF

or - +

@@ -738,9 +765,9 @@ sub show_choices { $command='get'; } } - my $escsymb=&Apache::lonnet::escape($symb); + my $escsymb=&escape($symb); $form=< +
@@ -837,14 +864,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"; - ($remove) END_LINK @@ -861,11 +888,11 @@ sub show_table { my $available; if ($mgr eq 'F') { $r->print('
'); - $r->print(' + $r->print(' '); - $r->print('
+ $r->print('
'); $r->print('
'); @@ -952,13 +979,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('
+ $r->print(' '); $r->print('
'); $r->print(' @@ -1001,14 +1031,15 @@ sub show_table { $r->print(''); $r->print('

'); my $linkstart=' - - '); + $r->print(&Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row().' + '); foreach my $which (@show_order) { if ($which ne 'proctor' && exists($show{$which})) { $r->print(''); } } + $r->print(&Apache::loncommon::end_data_table_header_row()); my %name_cache; my $slotsort = sub { @@ -1055,14 +1086,14 @@ sub show_table { $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.= ''; foreach my $item (@stu_display_order) { if ($stu_display{$item}) { if ($item eq 'fullname') { $ids.=$fullname->{"$uname:$udom"}.' '; } elsif ($item eq 'username') { - $ids.="$uname\@$udom "; + $ids.="$uname:$udom "; } } } @@ -1081,7 +1112,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]); } @@ -1122,7 +1153,7 @@ sub show_table { if (exists($show{'proctor'})) { $rowspan=2; @proctors= map { - my ($uname,$udom)=split(/@/,$_); + my ($uname,$udom)=split(/:/,$_); my $fullname=$name_cache{$_}; if (!defined($fullname)) { $fullname = &Apache::loncommon::plainname($uname,$udom); @@ -1139,7 +1170,7 @@ sub show_table { EDITLINK my $delete=(<<"DELETELINK"); -Delete +Delete DELETELINK my $remove_all=&remove_link($slot,'remove all').'
'; @@ -1150,7 +1181,10 @@ DELETELINK undef($remove_all); } - $r->print("\n\n"); + my $row_start=&Apache::loncommon::start_data_table_row(); + my $row_end=&Apache::loncommon::end_data_table_row(); + $r->print($row_start. + "\n\n"); if (exists($show{'name'})) { $colspan++;$r->print(""); } @@ -1187,18 +1221,22 @@ DELETELINK if (exists($show{'allowedusers'})) { $colspan++;$r->print("\n"); } + if (exists($show{'uniqueperiod'})) { + $colspan++;$r->print("\n"); + } if (exists($show{'scheduled'})) { - $colspan++;$r->print("\n\n"); + $colspan++;$r->print("\n"); } + $r->print("$row_end\n"); if (exists($show{'proctor'})) { $r->print(< +$row_start - +$row_end STUFF } } - $r->print('
'.$linkstart.$which.'">'.$show_fields{$which}.'
$edit $delete$edit $delete$slot$allowedusers$unique$remove_all $ids
$remove_all $ids$proctors
'); + $r->print(''); } sub upload_start { @@ -1420,22 +1458,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('.'); @@ -1498,11 +1563,15 @@ 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') { + &fail($r,'not_available'); return OK; } $env{'request.symb'}=$symb;