From e0ee31204dbb8e43870716190e4549257416fcb8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Jacob?= <jacou@melix.net>
Date: Fri, 10 Apr 2009 01:18:00 +0200
Subject: [PATCH] Adds address edition in entreprise validation.

---
 include/validations/entreprises.inc.php           | 24 ++++++++++++++---------
 templates/include/form.valid.edit-entreprises.tpl |  2 ++
 templates/include/form.valid.entreprises.tpl      |  4 ++++
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/include/validations/entreprises.inc.php b/include/validations/entreprises.inc.php
index 8853164..bceacbd 100644
--- a/include/validations/entreprises.inc.php
+++ b/include/validations/entreprises.inc.php
@@ -68,10 +68,9 @@ class EntrReq extends Validate
                 $where .= "name LIKE '%" . $name_array[$i] . "%'";
             }
         }
-        $res = XDB::iterator("SELECT  name
-                             FROM  profile_job_enum
-                            WHERE  "
-                          . $where);
+        $res = XDB::iterator('SELECT  name
+                                FROM  profile_job_enum
+                               WHERE  ' . $where);
         $this->suggestions = "| ";
         while ($sug = $res->next()) {
             $this->suggestions .= $sug['name'] . " | ";
@@ -159,15 +158,22 @@ class EntrReq extends Validate
                                VALUES  ({?}, {?}, {?}, {?}, {?}, {?}, {?})',
                          $this->name, $this->acronym, $this->url, $this->email,
                          $this->holdingid, $this->NAF_code, $this->AX_code);
+
             $jobid = XDB::insertId();
             $display_tel = format_display_number($this->tel, $error_tel);
             $display_fax = format_display_number($this->fax, $error_fax);
-            XDB::execute('INSERT INTO  profile_phones (uid, link_type, link_id, tel_id, tel_type,
+            XDB::execute("INSERT INTO  profile_phones (uid, link_type, link_id, tel_id, tel_type,
                                        search_tel, display_tel, pub)
-                               VALUES  ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}),
-                                       ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
-                         $jobid, 'hq', $this->id, 0, 'fixed', format_phone_number($this->tel), $display_tel, 'public', 
-                         $jobid, 'hq', $this->id, 1, 'fax', format_phone_number($this->fax), $display_fax, 'public');
+                               VALUES  ({?}, 'hq', 0, 0, 'fixed', {?}, {?}, 'public'),
+                                       ({?}, 'hq', 0, 1, 'fax', {?}, {?}, 'public')",
+                         $jobid, format_phone_number($this->tel), $display_tel,
+                         $jobid, format_phone_number($this->fax), $display_fax);
+
+            $gmapsGeocoder = new GMapsGeocoder();
+            $address = $gmapsGeocoder->getGeocodedAddress($this->address);
+            Geocoder::getAreaId($address, 'administrativeArea');
+            Geocoder::getAreaId($address, 'subAdministrativeArea');
+            Geocoder::getAreaId($address, 'locality');
             XDB::execute("INSERT INTO  profile_addresses (jobid, type, id, accuracy,
                                                           text, postalText, postalCode, localityId,
                                                           subAdministrativeAreaId, administrativeAreaId,
diff --git a/templates/include/form.valid.edit-entreprises.tpl b/templates/include/form.valid.edit-entreprises.tpl
index 09457df..16308bf 100644
--- a/templates/include/form.valid.edit-entreprises.tpl
+++ b/templates/include/form.valid.edit-entreprises.tpl
@@ -34,6 +34,8 @@
 <input type="text" name="NAF_code" size="25" maxlength="200" value="{$valid->NAF_code}" /><br />
 <strong>Code AX&nbsp;:</strong>
 <input type="text" name="AX_code" size="25" maxlength="200" value="{$valid->AX_code}" /><br />
+<strong>Adresse&nbsp;:</strong>
+<textarea cols="30" rows="4" name="address">{$valid->address}</textarea><br />
 <strong>Téléphone&nbsp;:</strong>
 <input type="text" name="tel" size="25" maxlength="200" value="{$valid->tel}" /><br />
 <strong>Fax&nbsp;:</strong>
diff --git a/templates/include/form.valid.entreprises.tpl b/templates/include/form.valid.entreprises.tpl
index 6ed7534..5396880 100644
--- a/templates/include/form.valid.entreprises.tpl
+++ b/templates/include/form.valid.entreprises.tpl
@@ -54,6 +54,10 @@
   <td>{$valid->AX_code}</td>
 </tr>
 <tr class="pair">
+  <td class="titre">Adresse&nbsp;:</td>
+  <td>{$valid->address}</td>
+</tr>
+<tr class="pair">
   <td class="titre">Téléphone&nbsp;:</td>
   <td>{$valid->tel}</td>
 </tr>
-- 
2.1.4