Merge branch 'master' of https://git.unicaen.fr/lib/unicaen/octopus into HEAD

src/Octopus/Entity/Db/Individu.php

@@ -20,14 +20,20 @@ class Individu {
     /** @var string */
     private $prenom;
     /** @var string */
+    private $prenom_ow;
+    /** @var string */
     private $prenom2;
     /** @var string */
     private $prenom3;
     /** @var string */
     private $nomFamille;
     /** @var string */
+    private $nomFamille_ow;
+    /** @var string */
     private $nomUsage;
     /** @var string */
+    private $nomUsage_ow;
+    /** @var string */
     private $dateNaissance;
     /** @var string */
     private $villeNaissance;
@@ -106,7 +112,7 @@ class Individu {
      */
     public function getPrenom()
     {
-        return $this->prenom;
+        return $this->prenom_ow??$this->prenom;
     }
 
     /**
@@ -130,7 +136,7 @@ class Individu {
      */
     public function getNomFamille()
     {
-        return $this->nomFamille;
+        return $this->nomFamille_ow??$this->nomFamille;
     }
 
     /**
@@ -138,7 +144,7 @@ class Individu {
      */
     public function getNomUsage()
     {
-        return $this->nomUsage;
+        return $this->nomUsage_ow??$this->nomFamille;
     }
 
     /**

src/Octopus/Entity/Db/Mapping/Octopus.Entity.Db.Individu.dcm.xml

@@ -15,10 +15,13 @@
         <field name="cIne"                 type="string"   length="11"       column="C_INE"                    nullable="false"/>
         <field name="sexe"                 type="string"   length="1"        column="SEXE"                     nullable="false"/>
         <field name="prenom"               type="string"   length="64"       column="PRENOM"                   nullable="false"/>
+        <field name="prenom_ow"            type="string"   length="64"       column="PRENOM_OW"                nullable="false"/>
         <field name="prenom2"              type="string"   length="64"       column="PRENOM2"                  nullable="false"/>
         <field name="prenom3"              type="string"   length="64"       column="PRENOM3"                  nullable="false"/>
         <field name="nomFamille"           type="string"   length="64"       column="NOM_FAMILLE"              nullable="false"/>
+        <field name="nomFamille_ow"        type="string"   length="64"       column="NOM_FAMILLE_OW"           nullable="false"/>
         <field name="nomUsage"             type="string"   length="64"       column="NOM_USAGE"                nullable="false"/>
+        <field name="nomUsage_ow"          type="string"   length="64"       column="NOM_USAGE_OW"             nullable="false"/>
         <field name="dateNaissance"        type="string"   length="64"       column="D_NAISSANCE"              nullable="false"/>
         <field name="villeNaissance"       type="string"   length="64"       column="VILLE_DE_NAISSANCE"       nullable="false"/>
         <field name="cCommuneNaissance"    type="string"   length="5"        column="C_COMMUNE_NAISSANCE"      nullable="false"/>

src/Octopus/Service/Individu/IndividuService.php

@@ -58,7 +58,11 @@ class IndividuService {
         $term = strtolower($term);
         $qb = $this->getEntityManager()->getRepository(Individu::class)->createQueryBuilder('individu')
             ->addSelect('source')->join('individu.cSource', 'source')
-            ->andWhere('LOWER(individu.nomUsage) LIKE :search OR LOWER(individu.nomFamille) LIKE :search')
+            ->andWhere("   concat(concat(LOWER(individu.prenom),' '),LOWER(individu.nomUsage)) LIKE :search 
+                        OR concat(concat(LOWER(individu.nomUsage),' '),LOWER(individu.prenom)) LIKE :search
+                        OR concat(concat(LOWER(individu.prenom),' '),LOWER(individu.nomFamille)) LIKE :search
+                        OR concat(concat(LOWER(individu.nomFamille),' '),LOWER(individu.prenom)) LIKE :search"
+            )
             ->setParameter('search', '%'.$term.'%')
             ->orderBy('individu.nomUsage, individu.prenom')
         ;