[LON-CAPA-cvs] cvs: loncom /interface lonmenu.pm

[raeburn]

raeburn		Tue May 29 19:40:45 2012 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm 
  Log:
  - Bug 5891. Expand test of whether to display countdown/timer icon.
  - If this is for an interval, check first access set, and user still has
    time left.
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.380 loncom/interface/lonmenu.pm:1.381
--- loncom/interface/lonmenu.pm:1.380	Tue May 29 16:25:53 2012
+++ loncom/interface/lonmenu.pm	Tue May 29 19:40:44 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.380 2012/05/29 16:25:53 raeburn Exp $
+# $Id: lonmenu.pm,v 1.381 2012/05/29 19:40:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1815,10 +1815,19 @@
         ($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) {
         my $duedate = &Apache::lonnet::EXT("resource.0.duedate");
         my @interval=&Apache::lonnet::EXT("resource.0.interval");
+        my $hastimeleft;
+        if (@interval > 1) {
+            my $first_access=&Apache::lonnet::get_first_access($interval[1]);
+            if ($first_access > 0) {
+                if ($first_access+$interval[0] > time) {
+                    $hastimeleft = 1;
+                }
+            }
+        }
         if (($duedate && $duedate > time) ||
-            (!$duedate && @interval > 1)) {
+            (!$duedate && $hastimeleft)) {
             my ($collapse,$expand,$alttxt,$title,$currdisp);
-            if (@interval > 1) {
+            if (@interval > 1 && $hastimeleft) {
                 $currdisp = 'inline';
                 $collapse = '► ';
             } else {