--- loncom/interface/lonnavmaps.pm	2016/06/02 16:03:57	1.521
+++ loncom/interface/lonnavmaps.pm	2016/11/26 01:47:04	1.526
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.521 2016/06/02 16:03:57 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.526 2016/11/26 01:47:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -995,7 +995,8 @@ sub render_resource {
             $linkopen = "";
             $linkclose = "";
         }
-        if ((&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) &&
+        if (((&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) ||
+              (&Apache::lonnet::allowed('cev',$env{'request.course.id'}))) &&
             ($resource->symb=~/\_\_\_[^\_]+\_\_\_uploaded/)) {
             if (!$params->{'map_no_edit_link'}) {
                 my $icon = &Apache::loncommon::lonhttpdurl('/res/adm/pages').'/editmap.png';
@@ -1540,7 +1541,8 @@ END
 	$result.='</form>';
     }
     if (($args->{'caller'} eq 'navmapsdisplay') &&
-        (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
+        ((&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) ||
+         (&Apache::lonnet::allowed('cev',$env{'request.course.id'})))) {
         my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
         my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
         if ($env{'course.'.$env{'request.course.id'}.'.url'} eq 
@@ -2686,7 +2688,13 @@ sub parmval_real {
         }
         foreach my $item (@recurseup) {
             my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what;
-            last if (defined($$useropt{$norecursechk}));
+            if (defined($$useropt{$norecursechk})) {
+                if ($what =~ /\.(encrypturl|hiddenresource)$/) {
+                    return [$$useropt{$norecursechk},'map'];
+                } else {
+                    last;
+                }
+            }
             my $recursechk=$usercourseprefix.'.'.$item.'___(rec).'.$what;
             if (defined($$useropt{$recursechk})) { return [$$useropt{$recursechk},'map']; } 
         }
@@ -2704,7 +2712,13 @@ sub parmval_real {
         }
         foreach my $item (@recurseup) {
             my $norecursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(all).'.$what;
-            last if (defined($$courseopt{$norecursechk}));
+            if (defined($$courseopt{$norecursechk})) {
+                if ($what =~ /\.(encrypturl|hiddenresource)$/) {
+                    return [$$courseopt{$norecursechk},'map'];
+                } else {
+                   last;
+                }
+            }
             my $recursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(rec).'.$what;
             if (defined($$courseopt{$recursechk})) { return [$$courseopt{$recursechk},'map']; }      
         }
@@ -2721,7 +2735,13 @@ sub parmval_real {
         }
         foreach my $item (@recurseup) {
             my $norecursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(all).'.$what;
-            last if (defined($$courseopt{$norecursechk}));
+            if (defined($$courseopt{$norecursechk})) {
+                if ($what =~ /\.(encrypturl|hiddenresource)$/) {
+                    return [$$courseopt{$norecursechk},'map'];
+                } else {
+                    last;
+                }
+            }
             my $recursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(rec).'.$what;
             if (defined($$courseopt{$recursechk})) { return [$$courseopt{$recursechk},'map']; }
         }
@@ -2755,7 +2775,13 @@ sub parmval_real {
         }
         foreach my $item (@recurseup) {
             my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what;
-            last if (defined($$courseopt{$norecursechk}));
+            if (defined($$courseopt{$norecursechk})) {
+                if ($what =~ /\.(encrypturl|hiddenresource)$/) {
+                    return [$$courseopt{$norecursechk},'map'];
+                } else {
+                    last;
+                }
+            }
             my $recursechk=$usercourseprefix.'.'.$item.'___(rec).'.$what;
             if (defined($$courseopt{$recursechk})) {
                 return [$$courseopt{$recursechk},'map'];
@@ -2894,7 +2920,13 @@ sub get_mapparam {
         }
         foreach my $item (@recurseup) {
             my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what;
-            last if (defined($$useropt{$norecursechk}));
+            if (defined($$useropt{$norecursechk})) {
+                if ($what =~ /\.(encrypturl|hiddenresource)$/) {
+                    return $$useropt{$norecursechk};
+                } else {
+                    last;
+                }
+            }
             my $recursechk=$usercourseprefix.'.'.$item.'___(rec).'.$what;
             if (defined($$useropt{$recursechk})) {
                 return $$useropt{$recursechk};
@@ -2919,7 +2951,13 @@ sub get_mapparam {
         }
         foreach my $item (@recurseup) {
             my $norecursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(all).'.$what;
-            last if (defined($$courseopt{$norecursechk}));
+            if (defined($$courseopt{$norecursechk})) {
+                if ($what =~ /\.(encrypturl|hiddenresource)$/) {
+                    return $$courseopt{$norecursechk};
+                } else {
+                    last;
+                }
+            }
             my $recursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(rec).'.$what;
             if (defined($$courseopt{$recursechk})) {
                 return $$courseopt{$recursechk};
@@ -2943,7 +2981,13 @@ sub get_mapparam {
         }
         foreach my $item (@recurseup) {
             my $norecursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(all).'.$what;
-            last if (defined($$courseopt{$norecursechk}));
+            if (defined($$courseopt{$norecursechk})) {
+                if ($what =~ /\.(encrypturl|hiddenresource)$/) {
+                    return $$courseopt{$norecursechk};
+                } else {
+                    last;
+                }
+            }
             my $recursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(rec).'.$what;
             if (defined($$courseopt{$recursechk})) {
                 return $$courseopt{$recursechk};
@@ -2974,7 +3018,13 @@ sub get_mapparam {
         if (@recurseup) {
             foreach my $item (@recurseup) {
                 my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what;
-                last if (defined($$courseopt{$norecursechk}));
+                if (defined($$courseopt{$norecursechk})) {
+                    if ($what =~ /\.(encrypturl|hiddenresource)$/) {
+                        return $$courseopt{$norecursechk};
+                    } else {
+                        last;
+                    }
+                }
                 my $recursechk=$usercourseprefix.'.'.$item.'___(rec).'.$what;
                 if (defined($$courseopt{$recursechk})) {
                     return $$courseopt{$recursechk};
@@ -4152,6 +4202,7 @@ sub enclosing_map_src {
 }
 sub symb {
     my $self=shift;
+    if (defined $self->{SYMB}) { return $self->{SYMB}; }
     (my $first, my $second) = $self->{ID} =~ /(\d+).(\d+)/;
     my $symbSrc = &Apache::lonnet::declutter($self->src());
     my $symb = &Apache::lonnet::declutter($self->navHash('map_id_'.$first)) 
@@ -4786,8 +4837,14 @@ sub getReturnHash {
     my $self = shift;
     
     if (!defined($self->{RETURN_HASH})) {
-        my %tmpHash  = &Apache::lonnet::restore($self->{SYMB},undef,$self->{DOMAIN},$self->{USERNAME});
-        $self->{RETURN_HASH} = \%tmpHash;
+        #my %tmpHash  = &Apache::lonnet::restore($self->{SYMB},undef,$self->{DOMAIN},$self->{USERNAME});
+        #$self->{RETURN_HASH} = \%tmpHash;
+        # When info is retrieved for several resources (as when rendering a directory),
+        # it is much faster to use the user profile dump and avoid repeated lonnet requests
+        # (especially since lonnet::currentdump is using Lond directly whenever possible,
+        # and lonnet::restore is not at this point).
+        $self->{NAV_MAP}->get_user_data();
+        $self->{RETURN_HASH} = $self->{NAV_MAP}->{STUDENT_DATA}->{$self->{SYMB}};
     }
 }       
 
@@ -5562,13 +5619,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'};
@@ -5602,19 +5659,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); 
@@ -5652,6 +5720,17 @@ sub check_for_slot {
                         }
                     }
                     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'});
                     }
                 }
@@ -5682,6 +5761,17 @@ sub check_for_slot {
                         $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'});
                     }
                 }