فهرست منبع

Increased auto logout javascript timer to 10 minutes.

Adam Day 9 سال پیش
والد
کامیت
9475393443
2فایلهای تغییر یافته به همراه12 افزوده شده و 7 حذف شده
  1. 2 2
      application/layouts/main.phtml
  2. 10 5
      application/views/reports/index.phtml

+ 2 - 2
application/layouts/main.phtml

@@ -101,10 +101,10 @@
         <?php $this->content(); ?>
         <script>
             $(document).foundation();
+            var delay = 600000; //10 Minutes
             $(document).ready(function() {
-                var delay = 600000;
                 setTimeout(function(){window.location = "<?php echo $this->link(array('account','logout')) ?>"; }, delay);
             });
         </script>
     </body>
-</html>
+</html>

+ 10 - 5
application/views/reports/index.phtml

@@ -161,6 +161,11 @@
                         {
                             $totalSick += $entry['timeWorked'];
                         }
+
+                        if($entry['code'] == "Sick (Family)")
+                        {
+                            $totalSick += $entry['timeWorked'];
+                        }
                    }
                 }
 
@@ -238,21 +243,21 @@
 
         $(".timeTitle").click(function() {
             $(this).next(".wrapper").slideToggle("slow");
-            $(this).find("i").toggleClass("fa-chevron-up fa-chevron-down")
+            $(this).find("i").toggleClass("fa-chevron-up fa-chevron-down");
             return false;
         });
 
         $("#hideAll").click(function() {
             $(".wrapper").slideUp();
-            $(".timeTitle").find("i").removeClass("fa-chevron-up")
-            $(".timeTitle").find("i").addClass("fa-chevron-down")
+            $(".timeTitle").find("i").removeClass("fa-chevron-up");
+            $(".timeTitle").find("i").addClass("fa-chevron-down");
             return false;
         });
 
         $("#showAll").click(function() {
             $(".wrapper").slideDown();
-            $(".timeTitle").find("i").removeClass("fa-chevron-down")
-            $(".timeTitle").find("i").addClass("fa-chevron-up")
+            $(".timeTitle").find("i").removeClass("fa-chevron-down");
+            $(".timeTitle").find("i").addClass("fa-chevron-up");
             return false;
         });