[Fmsystem-commits] [8228]

[Torstein]

Revision: 8228
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8228
Author:   vator
Date:     2011-12-02 07:04:19 +0000 (Fri, 02 Dec 2011)
Log Message:
-----------


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

Modified: trunk/controller/inc/class.socontrol.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol.inc.php        2011-12-01 10:08:11 UTC 
(rev 8227)
+++ trunk/controller/inc/class.socontrol.inc.php        2011-12-02 07:04:19 UTC 
(rev 8228)
@@ -28,7 +28,6 @@
         */
        function add(&$control)
        {
-               
                $title = $control->get_title();
                
                $sql = "INSERT INTO controller_control (title) VALUES 
('$title')";
@@ -45,8 +44,7 @@
                else
                {
                        return false;
-               }
-               
+               }       
        }
 
        /**
@@ -89,7 +87,7 @@
        
        function get_controls_by_control_area($control_area_id)
        {
-               $results = array();
+               $controls_array = array();
                
                $sql = "SELECT * FROM controller_control WHERE 
control_area_id=$control_area_id";
                $this->db->query($sql);
@@ -127,12 +125,12 @@
        
        function get_locations_for_control($control_id)
        {
-               $results = array();
+               $controls_array = array();
                
-               $sql =  "SELECT DISTINCT c.id, c.title, cl.location_code "; 
-               $sql .= "FROM controller_control c, controller_check_list cl ";
-               $sql .= "WHERE c.id = $control_id ";
-               $sql .= "AND cl.control_id = c.id";
+               $sql =  "SELECT c.id, c.title, cll.location_code "; 
+               $sql .= "FROM controller_control c, 
controller_control_location_list cll ";
+               $sql .= "WHERE cll.control_id = $control_id ";
+               $sql .= "AND cll.control_id = c.id";
 
                $this->db->query($sql);
                
@@ -153,9 +151,12 @@
                }
        }
        
-       
-       
-       
+       function add_location_to_control($control_id, $location_code)
+       {
+               $sql =  "INSERT INTO controller_control_location_list 
(control_id, location_code) values($control_id, $location_code)";
+               $this->db->query($sql);
+       }
+               
        function get_id_field_name($extended_info = false)
        {
                if(!$extended_info)