[Fmsystem-commits] [9580]

[Torstein]

Revision: 9580
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9580
Author:   vator
Date:     2012-06-13 13:22:11 +0000 (Wed, 13 Jun 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.socontrol.inc.php
    trunk/controller/inc/class.uicalendar.inc.php
    trunk/controller/templates/base/css/base.css

Modified: trunk/controller/inc/class.socontrol.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol.inc.php        2012-06-13 12:59:02 UTC 
(rev 9579)
+++ trunk/controller/inc/class.socontrol.inc.php        2012-06-13 13:22:11 UTC 
(rev 9580)
@@ -180,7 +180,7 @@
                        }
                }
                
-               public function get_controls_by_component($location_code, 
$from_date, $to_date, $repeat_type, $return_type = "return_object")
+               public function get_controls_by_component($location_code, 
$from_date, $to_date, $repeat_type = null, $return_type = "return_object")
                {
                        $controls_array = array();
                        
@@ -192,15 +192,13 @@
                        $sql  .= "AND bim_item.type = bim_type.id ";
                        $sql  .= "AND bim_item.location_code LIKE 
'$location_code%'";
                        
-                       if( is_numeric($repeat_type) )
+                       if( $repeat_type != null){
                                $sql .= "AND c.repeat_type = $repeat_type ";
+                       }
                        
                        $sql .= "AND (c.start_date <= $from_date AND c.end_date 
IS NULL ";
                        $sql .= "OR c.start_date > $from_date AND c.start_date 
< $to_date)";
                        
-                       $sql .= "AND (c.start_date <= $from_date AND c.end_date 
IS NULL ";
-                       $sql .= "OR c.end_date > $from_date AND c.start_date < 
$to_date)";
-                       //var_dump($sql."<br/>");
                        $this->db->query($sql);
                        
                        while($this->db->next_record()) {

Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php       2012-06-13 12:59:02 UTC 
(rev 9579)
+++ trunk/controller/inc/class.uicalendar.inc.php       2012-06-13 13:22:11 UTC 
(rev 9580)
@@ -190,6 +190,8 @@
                        // Fetches all controls for the components on location 
within time period
                        $controls_for_component_array = 
$this->so_control->get_controls_by_component($location_code, $from_date_ts, 
$to_date_ts, $repeat_type = null);
                        
+                       print_r( $controls_for_component_array );
+                       
                        $controls_calendar_array = array();
                        
                        // Loops through controls with repeat type day or week 
in controls_for_location_array

Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css        2012-06-13 12:59:02 UTC 
(rev 9579)
+++ trunk/controller/templates/base/css/base.css        2012-06-13 13:22:11 UTC 
(rev 9580)
@@ -168,12 +168,6 @@
     position:absolute; z-index:1;
 }
 
-#toolbar {
-    background-color: #DEEAF8;
-    border: 1px solid #C7D8EB;
-    padding: 10px 30px;
-}
-
 #datatableToolbar {
        background-color: white;
     margin-bottom: 0em;
@@ -729,7 +723,10 @@
 }
 
 #toolbar {
-    padding: 10px;
+  display: inline-block;
+  padding: 10px;
+  background-color: #DEEAF8;
+  border: 1px solid #CEE3F9;
 }
 
 #toolbar input[type="text"] {