Changeset 2160 for sandbox/workflow/trunk/inc/local/classes/class.wf_location.php

Timestamp:

03/04/10 13:29:43 (14 years ago)

Author:

pedroerp

Message:

Ticket #950 - Merged 2108:2139 /trunk/workflow em /sandbox/workflow/trunk

File:

• sandbox/workflow/trunk/inc/local/classes/class.wf_location.php (modified) (6 diffs)

sandbox/workflow/trunk/inc/local/classes/class.wf_location.php

@@ -72 +72 @@
                         c.id_city AS id_city,
                         c.city_name AS city_name,
+                        c.is_district,
                         s.id_state AS id_state,
                         s.state_name AS state_name,
@@ -125 +126 @@
          * Busca as cidades de um estado
          * @param int $state_id Numero ID do estado
-         * @return mixed (array ou boolean)
-         * @access public
-         */
-        function getCitiesFromState($state_id)
-        {
-                if (!is_numeric($state_id))
+         * @param bool $include_districts True, busca cidades e distritos. False, busca apenas cidades.
+         * @return mixed (array ou boolean)
+         * @access public
+         */
+        function getCitiesFromState($state_id, $include_districts = true)
+        {
+                if (!is_numeric($state_id) || !is_bool($include_districts))
                         return false;
 
@@ -137 +139 @@
                         return $this->citiesFromState[$state_id];
 
+                $where = "";
+                if(!$include_districts){
+                        $where = " AND c.is_district = 'F' ";
+                }
+
                 $sql =
                 "SELECT
                         c.id_city AS id_city,
-                        c.city_name AS city_name
+                        c.city_name AS city_name,
+                        c.is_district
                 FROM
                         phpgw_cc_state s,
@@ -147 +155 @@
                         c.id_state = s.id_state AND
                         s.id_country = 'BR' AND
-                        c.id_state = ?
+                        c.id_state = ? " . $where . "
                 ORDER BY
                         city_name";
@@ -160 +168 @@
         }
     /**
-         * Busca os estados brasileiros
-         * @return mixed (array ou boolean)
-         * @access public
-         */
-        function getStates()
-        {
-                $sql =
-                "SELECT
-                        id_state,
-                        state_name
-                FROM
-                        phpgw_cc_state
-                WHERE
-                        id_country = 'BR'
+         * Busca as cidades por parte do nome, sem considerar maiúsculas e/ou minúsculas e nem acentuação (retorna 10 resultados)
+         * @param string Parte do nome da cidade
+         * @param int $state_id Numero ID do estado
+         * @param bool $include_districts True, busca cidades e distritos. False, busca apenas cidades.
+         * @return mixed (array ou boolean)
+         * @access public
+         */
+        function getCitiesByKey($key, $state_id = 0, $include_districts = true)
+        {
+                if (!is_string($key) || !is_numeric($state_id) || !is_bool($include_districts))
+                        return false;
+
+                $where = "";
+                if($state_id > 0){
+                        $where = " AND c.id_state = " . $state_id;
+                }
+
+                if(!$include_districts){
+                        $where = " AND c.is_district = 'F' ";
+                }
+
+                $sql =
+                "SELECT
+                        c.id_city AS id_city,
+                        c.city_name AS city_name,
+                        s.id_state AS id_state,
+                        s.state_name AS state_name,
+                        s.state_symbol AS state_symbol
+                FROM
+                        phpgw_cc_state s,
+                        phpgw_cc_city c
+                WHERE
+                        c.id_state = s.id_state AND
+                        s.id_country = 'BR' AND
+                        TO_ASCII(c.city_name) ILIKE TO_ASCII('" . $key . "%')
+                        " . $where . "
                 ORDER BY
-                        state_name";
+                        city_name
+                LIMIT 10";
 
                 $result = $this->db->query($sql);
@@ -184 +215 @@
                 return $output;
         }
+        /**
+         * Busca os estados brasileiros
+         * @return mixed (array ou boolean)
+         * @access public
+         */
+        function getStates()
+        {
+                $sql =
+                "SELECT
+                        id_state,
+                        state_name
+                FROM
+                        phpgw_cc_state
+                WHERE
+                        id_country = 'BR'
+                ORDER BY
+                        state_name";
+
+                $result = $this->db->query($sql);
+                $output = array();
+                while ($row = $result->fetchRow())
+                        $output[] = $row;
+
+                return $output;
+        }
 }
 ?>