Changement octoprod

src/Octopus/Entity/Db/IndividuInscription.php

@@ -17,7 +17,9 @@ class IndividuInscription {
     /** @var string */
     private $regimeSISE;
     /** @var string */
-    private $obtenu;
+    private $obtenuDip;
+    /** @var string */
+    private $obtenuVet;
     /** @var string */
     private $aDistance;
 
@@ -74,8 +76,8 @@ class IndividuInscription {
      */
     public function isObtenu()
     {
-        if ($this->obtenu === 'O') return true;
-        if ($this->obtenu === 'N') return false;
+        if ($this->obtenuDip === 'O' OR $this->obtenuVet === 'O') return true;
+        if ($this->obtenu === 'N' AND $this->obtenuVet === 'N') return false;
         return null;
     }
 

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

 <?xml version="1.0" encoding="utf-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <entity name="Octopus\Entity\Db\IndividuInscription" table="INDIVIDU_INSCRIPTION">
+    <entity name="Octopus\Entity\Db\IndividuInscription" table="INDIVIDU_INSC_ADMIN">
 
         <id name="individu" association-key="true" />
         <id name="diplome"  association-key="true" />
@@ -21,7 +21,8 @@
 
         <field name="etatInscription"       column="ETAT_INSCRIPTION"       type="string" length="4"            nullable="true" />
         <field name="regimeSISE"            column="REGIME_SISE"            type="string" length="2"            nullable="true" />
-        <field name="obtenu"                column="T_OBTENU"               type="string" length="1"            nullable="true" />
+        <field name="obtenuDip"             column="T_OBTENU_DIP"           type="string" length="1"            nullable="true" />
+        <field name="obtenuVet"             column="T_OBTENU_VET"           type="string" length="1"            nullable="true" />
         <field name="aDistance"             column="T_A_DISTANCE"           type="string" length="1"            nullable="true" />
 
     </entity>

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

@@ -10,8 +10,8 @@
         <field name="sigle"             type="string"   length="30"       column="SIGLE"                nullable="true"/>
         <field name="libelleCourt"      type="string"   length="50"       column="LIBELLE_COURT"        nullable="false"/>
         <field name="libelleLong"       type="string"   length="1024"     column="LIBELLE_LONG"         nullable="false"/>
-        <field name="telephone"         type="string"   length="20"       column="TELEPHONE"            nullable="true"/>
-        <field name="fax"               type="string"   length="20"       column="FAX"                  nullable="true"/>
+<!--        <field name="telephone"         type="string"   length="20"       column="TELEPHONE"            nullable="true"/>-->
+<!--        <field name="fax"               type="string"   length="20"       column="FAX"                  nullable="true"/>-->
 
         <many-to-one target-entity="Octopus\Entity\Db\StructureType" field="type">
             <join-column name="TYPE_ID" referenced-column-name="ID" />