--- loncom/interface/lonnavmaps.pm	2015/06/19 15:36:53	1.508
+++ loncom/interface/lonnavmaps.pm	2016/08/06 23:22:30	1.509.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.508 2015/06/19 15:36:53 damieng Exp $
+# $Id: lonnavmaps.pm,v 1.509.2.2 2016/08/06 23:22:30 raeburn Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -624,44 +624,52 @@ sub getDescription {
     if ($status == $res->OPEN_LATER) {
         return &mt("Open [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($open,'start'),$res->symb(),'opendate',$part));
     }
+    my $slotinfo;
     if ($res->simpleStatus($part) == $res->OPEN) {
         unless (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) {
             my ($slot_status,$slot_time,$slot_name)=$res->check_for_slot($part);
+            my $slotmsg;
             if ($slot_status == $res->UNKNOWN) {
-                return &mt('Reservation status unknown');
+                $slotmsg = &mt('Reservation status unknown');
             } elsif ($slot_status == $res->RESERVED) {
-                return &mt('Reserved - ends [_1]',
+                $slotmsg = &mt('Reserved - ends [_1]',
                            timeToHumanString($slot_time,'end'));
             } elsif ($slot_status == $res->RESERVED_LOCATION) {
-                return &mt('Reserved - specific location(s) - ends [_1]',
+                $slotmsg = &mt('Reserved - specific location(s) - ends [_1]',
                            timeToHumanString($slot_time,'end'));
             } elsif ($slot_status == $res->RESERVED_LATER) {
-                return &mt('Reserved - next open [_1]',
+                $slotmsg = &mt('Reserved - next open [_1]',
                            timeToHumanString($slot_time,'start'));
             } elsif ($slot_status == $res->RESERVABLE) {
-                return &mt('Reservable, reservations close [_1]',
+                $slotmsg = &mt('Reservable, reservations close [_1]',
                            timeToHumanString($slot_time,'end'));
             } elsif ($slot_status == $res->RESERVABLE_LATER) {
-                return &mt('Reservable, reservations open [_1]',
+                $slotmsg = &mt('Reservable, reservations open [_1]',
                            timeToHumanString($slot_time,'start'));
             } elsif ($slot_status == $res->NOT_IN_A_SLOT) {
-                return &mt('Reserve a time/place to work');
+                $slotmsg = &mt('Reserve a time/place to work');
             } elsif ($slot_status == $res->NOTRESERVABLE) {
-                return &mt('Reservation not available');
+                $slotmsg = &mt('Reservation not available');
             } elsif ($slot_status == $res->WAITING_FOR_GRADE) {
-                return &mt('Submission in grading queue');
+                $slotmsg = &mt('Submission in grading queue');
+            }
+            if ($slotmsg) {
+                if ($res->is_task() || !$due) {
+                     return $slotmsg;
+                }
+                $slotinfo = (' ' x 2).'('.$slotmsg.')';
             }
         }
     }
     if ($status == $res->OPEN) {
         if ($due) {
 	    if ($res->is_practice()) {
-		return &mt("Closes [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start'),$res->symb(),'duedate',$part));
+		return &mt("Closes [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start'),$res->symb(),'duedate',$part)).$slotinfo;
 	    } else {
-		return &mt("Due [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end'),$res->symb(),'duedate',$part));
+		return &mt("Due [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'end'),$res->symb(),'duedate',$part)).$slotinfo;
 	    }
         } else {
-            return &Apache::lonhtmlcommon::direct_parm_link(&mt("Open, no due date"),$res->symb(),'duedate',$part);
+            return &Apache::lonhtmlcommon::direct_parm_link(&mt("Open, no due date"),$res->symb(),'duedate',$part).$slotinfo;
         }
     }
     if ($status == $res->PAST_DUE_ANSWER_LATER) {
@@ -907,6 +915,9 @@ sub render_resource {
     my $nonLinkedText = ''; # stuff after resource title not in link
 
     my $link = $params->{"resourceLink"};
+    if ($resource->ext()) {
+        $link =~ s/\#.+(\?)/$1/g;
+    }
 
     #  The URL part is not escaped at this point, but the symb is... 
 
@@ -2871,7 +2882,7 @@ sub getcourseparam {
     # 
     # We want the course level stuff from the way
     # parmval_real operates 
-    # TODO: Fator some of this stuff out of
+    # TODO: Factor some of this stuff out of
     # both parmval_real and here
     #
     my $courselevel = $cid . '.' .  $what;
@@ -2888,7 +2899,7 @@ sub getcourseparam {
     }
     # Try for the group's course level option:
 
-    if ($uname ne '' and defined($courseopt)) {
+    if ($cgroup ne '' and defined($courseopt)) {
 	if (defined($$courseopt{$grplevel})) {
 	    return $$courseopt{$grplevel};
 	}
@@ -2896,12 +2907,12 @@ sub getcourseparam {
 
     #  Try for section level parameters:
 
-    if ($csec and defined($courseopt)) {
+    if ($csec ne '' and defined($courseopt)) {
 	if (defined($$courseopt{$seclevel})) {
 	    return $$courseopt{$seclevel};
 	}
     }
-    # Try for 'additional' course parameterse:
+    # Try for 'additional' course parameters:
 
     if (defined($courseopt)) {
 	if (defined($$courseopt{$courselevel})) {
@@ -4522,7 +4533,7 @@ sub duedate {
     my $due_date=$self->parmval("duedate", $part);
     if ($interval[0] =~ /\d+/) {
        my $first_access=&Apache::lonnet::get_first_access($interval[1],
-                                                          $self->symb);
+                                                          $self->{SYMB});
 	if (defined($first_access)) {
            my $interval = $first_access+$interval[0];
 	    $date = (!$due_date || $interval < $due_date) ? $interval 
@@ -4604,7 +4615,7 @@ sub part_display {
     my $self= shift(); my $partID = shift();
     if (! defined($partID)) { $partID = '0'; }
     my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',
-                                     $self->symb);
+                                     $self->{SYMB});
     if (! defined($display) || $display eq '') {
         $display = $partID;
     }
@@ -5400,13 +5411,13 @@ sub check_for_slot {
         my $cnum=$env{'course.'.$cid.'.num'};
         my $now = time;
         my $num_usable_slots = 0;
+        my ($checkedin,$checkedinslot,%consumed_uniq,%slots);
         if (@slots > 0) {
-            my %slots=&Apache::lonnet::get('slots',[@slots],$cdom,$cnum);
+            %slots=&Apache::lonnet::get('slots',[@slots],$cdom,$cnum);
             if (&Apache::lonnet::error(%slots)) {
                 return (UNKNOWN);
             }
             my @sorted_slots = &Apache::loncommon::sorted_slots(\@slots,\%slots,'starttime');
-            my ($checkedin,$checkedinslot);
             foreach my $slot_name (@sorted_slots) {
                 next if (!defined($slots{$slot_name}) || !ref($slots{$slot_name}));
                 my $end = $slots{$slot_name}->{'endtime'};
@@ -5440,19 +5451,30 @@ sub check_for_slot {
                     $num_usable_slots ++;
                 }
             }
-            my ($is_correct,$got_grade);
+            my ($is_correct,$wait_for_grade);
             if ($self->is_task()) {
                 my $taskstatus = $self->taskstatus();
                 $is_correct = (($taskstatus eq 'pass') || 
                                ($self->solved() =~ /^correct_/));
-                $got_grade = ($taskstatus =~ /^(?:pass|fail)$/);
+                unless ($taskstatus =~ /^(?:pass|fail)$/) {
+                    $wait_for_grade = 1;
+                }
             } else {
-                $got_grade = 1;
-                $is_correct = ($self->solved() =~ /^correct_/);   
+                unless ($self->completable()) {
+                    $wait_for_grade = 1;
+                }
+                unless (($self->problemstatus($part) eq 'no') ||
+                        ($self->problemstatus($part) eq 'no_feedback_ever')) {
+                    $is_correct = ($self->solved($part) =~ /^correct_/);
+                    $wait_for_grade = 0;
+                }
             }
             ($checkedin,$checkedinslot) = $self->checkedin();
             if ($checkedin) {
-                if (!$got_grade) {
+                if (ref($slots{$checkedinslot}) eq 'HASH') {
+                    $consumed_uniq{$checkedinslot} = $slots{$checkedinslot}{'uniqueperiod'};
+                }
+                if ($wait_for_grade) {
                     return (WAITING_FOR_GRADE);
                 } elsif ($is_correct) {
                     return (CORRECT); 
@@ -5467,16 +5489,46 @@ sub check_for_slot {
         if (ref($reservable) eq 'HASH') {
             if ((ref($reservable->{'now_order'}) eq 'ARRAY') && (ref($reservable->{'now'}) eq 'HASH')) {
                 foreach my $slot (reverse (@{$reservable->{'now_order'}})) {
+                    my $canuse;
                     if (($reservable->{'now'}{$slot}{'symb'} eq '') ||
                         ($reservable->{'now'}{$slot}{'symb'} eq $symb)) {
+                        $canuse = 1;
+                    }
+                    if ($canuse) {
+                        if ($checkedin) {
+                            if (ref($consumed_uniq{$checkedinslot}) eq 'ARRAY') {
+                                my ($uniqstart,$uniqend)=@{$consumed_uniq{$checkedinslot}};
+                                if ($reservable->{'now'}{$slot}{'uniqueperiod'} =~ /^(\d+),(\d+)$/) {
+                                    my ($new_uniq_start,$new_uniq_end) = ($1,$2);
+                                    next if (!
+                                        ($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) ||
+                                        ($uniqstart > $new_uniq_end   &&  $uniqend > $new_uniq_end  ));
+                                }
+                            }
+                        }
                         return(RESERVABLE,$reservable->{'now'}{$slot}{'endreserve'});
                     }
                 }
             }
             if ((ref($reservable->{'future_order'}) eq 'ARRAY') && (ref($reservable->{'future'}) eq 'HASH')) {
                 foreach my $slot (@{$reservable->{'future_order'}}) {
+                    my $canuse;
                     if (($reservable->{'future'}{$slot}{'symb'} eq '') ||
                         ($reservable->{'future'}{$slot}{'symb'} eq $symb)) {
+                        $canuse = 1;
+                    }
+                    if ($canuse) {
+                        if ($checkedin) {
+                            if (ref($consumed_uniq{$checkedinslot}) eq 'ARRAY') {
+                                my ($uniqstart,$uniqend)=@{$consumed_uniq{$checkedinslot}};
+                                if ($reservable->{'future'}{$slot}{'uniqueperiod'} =~ /^(\d+),(\d+)$/) {
+                                    my ($new_uniq_start,$new_uniq_end) = ($1,$2);
+                                    next if (!
+                                        ($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) ||
+                                        ($uniqstart > $new_uniq_end   &&  $uniqend > $new_uniq_end  ));
+                                }
+                            }
+                        }
                         return(RESERVABLE_LATER,$reservable->{'future'}{$slot}{'startreserve'});
                     }
                 }