From a76bd2a4169208df3e897e9803f92969525390b7 Mon Sep 17 00:00:00 2001
From: A511701 <vincent.michel@atos.net>
Date: Wed, 7 Jun 2017 21:58:35 +0200
Subject: [PATCH 1/2] =?UTF-8?q?*=20Correction=20des=20pr=C3=A9ventionniste?=
 =?UTF-8?q?s=20non=20propos=C3=A9s=20=C3=A0=20l'ajout=20pour=20les=20genre?=
 =?UTF-8?q?s=20Camping,=20Manifestation=20Temporaire,=20IOP,=20Zone?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/services/Etablissement.php | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/application/services/Etablissement.php b/application/services/Etablissement.php
index e3009c09..dfc10823 100755
--- a/application/services/Etablissement.php
+++ b/application/services/Etablissement.php
@@ -991,14 +991,6 @@ public function getDefaultValues($genre, $numinsee = null, $type = null, $catego
                 }
                 break;
 
-            // Habitation
-            case 4:
-                // Préventionnistes du site ou des groupements de communes
-                if($numinsee !== null || ($id_etablissement_pere !== null  && $id_etablissement_pere != '')) {
-                    $results['preventionnistes'] = $model_prev->getPrev($numinsee === null ? '' : $numinsee, $id_etablissement_pere === null ? '' : $id_etablissement_pere);
-                }
-                break;
-
             // IGH
             case 5:
                 // Périodicité en fonction de la classe
@@ -1027,8 +1019,8 @@ public function getDefaultValues($genre, $numinsee = null, $type = null, $catego
                 }
                 break;
 
-            // EIC
-            case 6:
+            // Autres genres
+            default:
                 // Préventionnistes du site ou des groupements de communes
                 if($numinsee !== null || $id_etablissement_pere !== null) {
                     $results['preventionnistes'] = $model_prev->getPrev($numinsee === null ? '' : $numinsee, $id_etablissement_pere === null ? '' : $id_etablissement_pere);

From 0977442671eaa8403a9590fc3a4386bbd6401dbf Mon Sep 17 00:00:00 2001
From: A511701 <vincent.michel@atos.net>
Date: Wed, 7 Jun 2017 22:12:49 +0200
Subject: [PATCH 2/2] =?UTF-8?q?*=20Correction=20de=20la=20proposition=20de?=
 =?UTF-8?q?s=20pr=C3=A9ventionniste=20si=20l'ordre=20alphab=C3=A9tique=20n?=
 =?UTF-8?q?'est=20pas=20le=20meme?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/models/DbTable/Search.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/models/DbTable/Search.php b/application/models/DbTable/Search.php
index fc65a9b3..05cd21cc 100755
--- a/application/models/DbTable/Search.php
+++ b/application/models/DbTable/Search.php
@@ -145,6 +145,7 @@ public function setItem( $item )
                          ->joinLeft("etablissementinformations", "etablissementinformations.ID_ETABLISSEMENTINFORMATIONS = etablissementinformationspreventionniste.ID_ETABLISSEMENTINFORMATIONS")
                          ->where("etablissementinformations.DATE_ETABLISSEMENTINFORMATIONS = ( SELECT MAX(infos.DATE_ETABLISSEMENTINFORMATIONS) FROM etablissementinformations as infos WHERE etablissementinformations.ID_ETABLISSEMENT = infos.ID_ETABLISSEMENT ) OR etablissementinformations.DATE_ETABLISSEMENTINFORMATIONS IS NULL")
                          ->where("u.ACTIF_UTILISATEUR = 1")
+                         ->order(array("utilisateurinformations.NOM_UTILISATEURINFORMATIONS", "utilisateurinformations.PRENOM_UTILISATEURINFORMATIONS"))
                          ->group("u.ID_UTILISATEUR");
 
                     break;