Changeset 2136 for trunk/workflow

Timestamp:

03/02/10 16:20:01 (14 years ago)

Author:

asaikawa

Message:

Ticket #942 - Alteracoes nos metodos para considerar a nova coluna is_district

File:

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

trunk/workflow/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
+         * @param bool $include_districts True, busca cidades e distritos. False, busca apenas cidades.
          * @return mixed (array ou boolean)
          * @access public
          */
-        function getCitiesFromState($state_id)
+        function getCitiesFromState($state_id, $include_districts = true)
         {
-                if (!is_numeric($state_id))
+                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";
@@ -159 +167 @@
                 return $output;
         }
-    /**
+        /**
          * Busca os estados brasileiros
          * @return mixed (array ou boolean)