--- loncom/interface/slotrequest.pm	2006/06/16 19:54:02	1.65
+++ loncom/interface/slotrequest.pm	2008/01/14 14:32:30	1.81
@@ -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.65 2006/06/16 19:54:02 albertel Exp $
+# $Id: slotrequest.pm,v 1.81 2008/01/14 14:32:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -77,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);
@@ -90,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;
@@ -127,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;
@@ -175,7 +176,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)) {
@@ -186,7 +188,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;
@@ -212,7 +214,7 @@ sub check_for_conflict {
 
     if (!ref($consumed_uniqueperiods)) {
 	$consumed_uniqueperiods = &get_consumed_uniqueperiods($slots);
-	if (&network_error(%$consumed_uniqueperiods)) {
+	if (&Apache::lonnet::error(%$consumed_uniqueperiods)) {
 	    return 'error: Unable to determine current status';
 	}
     }
@@ -230,14 +232,6 @@ 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)=@_;
 
@@ -247,16 +241,18 @@ sub make_reservation {
 				   $env{'user.domain'},$env{'user.name'});
     &Apache::lonxml::debug("value is  $value<br />");
 
-    my $use_slots = &Apache::lonnet::EXT("resource.0.useslots");
+    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 (&network_error($value) || &network_error($use_slots)) { 
+    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') {
+    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;
@@ -266,7 +262,7 @@ sub make_reservation {
 	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'};
@@ -283,7 +279,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;
@@ -338,8 +334,8 @@ 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 occured.').'</span></p>');
 	return;
     }
     if (!%consumed) {
@@ -438,7 +434,7 @@ sub release_slot {
 
     if ($mgr eq 'F' 
 	&& defined($env{'form.symb'})) {
-	$symb = $env{'form.symb'};
+	$symb = &unescape($env{'form.symb'});
     }
 
     my ($result,$msg) =
@@ -464,9 +460,22 @@ 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;
+    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) {
@@ -487,15 +496,16 @@ sub release_reservation {
 	}
     }
 
-    my $use_slots = &Apache::lonnet::EXT("resource.0.useslots");
+    my $use_slots = &Apache::lonnet::EXT("resource.0.useslots",
+					 $symb,$udom,$uname);
     &Apache::lonxml::debug("use_slots is  $use_slots<br />");
 
-    if (&network_error($use_slots)) { 
+    if (&Apache::lonnet::error($use_slots)) { 
 	return (0,'error: Unable to determine current status');
     }
 
     my $parm_level = 1;
-    if ($use_slots eq 'map') {
+    if ($use_slots eq 'map' || $use_slots eq 'map_map') {
 	$parm_level = 2;
     }
     # store new parameter string
@@ -532,7 +542,7 @@ sub delete_slot {
 	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>");
+	    $r->print("<p><span class=\"LC_error\"> An error ($ret) occurse when attempting to delete Slot <tt>$slot_name</tt>.</span></p>");
 	}
     } else {
 	if (%consumed) {
@@ -553,17 +563,17 @@ 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\">An error occured while attempting to make a reservation. ($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'});
@@ -591,36 +601,44 @@ 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\">An error occured while attempting to make a reservation. ($1)</span></p>");
 	} elsif ($reserved > -1) {
 	    $r->print("<p>Success: $description</p>");
+	    $retvalue = 1;
 	} elsif ($reserved < 0) {
 	    $r->print("<p>Already reserved: $description</p>");
 	}
-	&return_link($r);
-	return;
+	if (!$inhibit_return_link) { &return_link($r); }
+	return 1;
     }
 
     my %lt=('request'=>"Availibility list",
 	    'try'    =>'Try again');
     %lt=&Apache::lonlocal::texthash(%lt);
 
+    my $extra_input;
+    if ($conflictable_slot) {
+	$extra_input='<input type="hidden" name="releaseslot" value="'.$env{'form.slotname'}.'" />';
+    }
+
     $r->print(<<STUFF);
-<p> <font color="red">Failed</font> to reserve a spot for $description. </p>
+<p> <span class="LC_warning">Failed</span> to reserve a spot for $description. </p>
 <p>
 <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>
@@ -634,8 +652,8 @@ or
 or
 STUFF
 
-    &return_link($r);
-    return;
+    if (!$inhibit_return_link) { &return_link($r); }
+    return 0;
 }
 
 sub allowed_slot {
@@ -643,8 +661,7 @@ sub allowed_slot {
 
     #already started
     if ($slot->{'starttime'} < time) {
-	# all open slot to be schedulable
-	#return 0;
+	return 0;
     }
     &Apache::lonxml::debug("$slot_name starttime good");
 
@@ -680,6 +697,16 @@ sub allowed_slot {
 		    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");
 
@@ -754,7 +781,7 @@ 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},
@@ -887,14 +914,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">
 <input type="hidden" name="command" value="uploadstart" />
 <input type="submit" name="start" value="'.&mt('Upload Slot List').'" />
 </form>');
+	$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>');
     }
     
@@ -922,7 +954,7 @@ sub show_table {
 	     'endtime'         => 'End Time',
              'startreserve'    => 'Time students can start reserving',
 	     'secret'          => 'Secret Word',
-	     'maxspace'        => 'Maximum # of students',
+	     'space'           => '# of students/max',
 	     'ip'              => 'IP or DNS restrictions',
 	     'symb'            => 'Resource slot is restricted to.',
 	     'allowedsections' => 'Sections slot is restricted to.',
@@ -931,7 +963,7 @@ sub show_table {
 	     'scheduled'       => 'Scheduled Students',
 	     'proctor'         => 'List of proctors');
     my @show_order=('name','description','type','starttime','endtime',
-		    'startreserve','secret','maxspace','ip','symb',
+		    'startreserve','secret','space','ip','symb',
 		    'allowedsections','allowedusers','uniqueperiod',
 		    'scheduled','proctor');
     my @show = 
@@ -1043,12 +1075,16 @@ sub show_table {
 
     my %name_cache;
     my $slotsort = sub {
-	if ($env{'form.order'}=~/^(type|description|endtime|startreserve|maxspace|ip|symb|allowedsections|allowedusers)$/) {
+	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);
@@ -1068,6 +1104,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; }
@@ -1076,15 +1120,16 @@ 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>';
@@ -1206,8 +1251,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");
@@ -1273,9 +1325,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 />
@@ -1509,7 +1563,7 @@ sub csv_upload_assign {
     }
     $r->print("<p>Created $countdone slots\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 '';
@@ -1570,7 +1624,9 @@ sub handler {
 	}
 	my (undef,undef,$res)=&Apache::lonnet::decode_symb($symb);
 	my $useslots = &Apache::lonnet::EXT("resource.0.useslots",$symb);
-	if ($useslots ne 'resource' && $useslots ne 'map') {
+	if ($useslots ne 'resource' 
+	    && $useslots ne 'map' 
+	    && $useslots ne 'map_map') {
 	    &fail($r,'not_available');
 	    return OK;
 	}
@@ -1591,8 +1647,8 @@ 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>");