[Fmsystem-commits] [9980]

[Torstein]

Revision: 9980
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9980
Author:   vator
Date:     2012-09-06 12:42:05 +0000 (Thu, 06 Sep 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.socheck_list.inc.php

Modified: trunk/controller/inc/class.socheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_list.inc.php     2012-09-06 12:41:39 UTC 
(rev 9979)
+++ trunk/controller/inc/class.socheck_list.inc.php     2012-09-06 12:42:05 UTC 
(rev 9980)
@@ -362,6 +362,7 @@
         * @param $location_code location code
         * @return array with check list objects
         */
+       /* Tror ikke vi bruker denne: Torstein 6/9-2012
        function get_open_check_lists_for_control($control_id, $location_code, 
$from_date)
        {
                $control_id = (int) $control_id;
@@ -414,6 +415,7 @@
                        return null;
                }
        }
+       */
        
        /**
         * Get array with control id and number of open cases within time period
@@ -481,7 +483,7 @@
                        $sql .= "AND c.repeat_type $repeat_type_expr ";
                }
                
-               $sql .= "AND deadline BETWEEN $from_date_ts AND $to_date_ts ";
+         $sql .= "AND (deadline > $from_date_ts) AND (deadline < $to_date_ts) 
";
                $sql .= "ORDER BY c.id;";
                
                $this->db->query($sql);
@@ -556,7 +558,7 @@
                        $sql .= "AND c.repeat_type $repeat_type_expr ";
                }
                
-               $sql .= "AND deadline BETWEEN $from_date_ts AND $to_date_ts ";
+               $sql .= "AND (deadline > $from_date_ts) AND (deadline < 
$to_date_ts) ";
                $sql .= "ORDER BY c.id;";
                
                $this->db->query($sql);