From 62e2d838effa1ee2dc1d6f1034717ad02b569277 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Metivier <jean-philippe.metivier@unicaen.fr>
Date: Tue, 2 Jun 2020 15:10:21 +0200
Subject: [PATCH] Changement octoprod
---
src/Octopus/Entity/Db/IndividuInscription.php | 8 +++++---
.../Mapping/Octopus.Entity.Db.IndividuInscription.dcm.xml | 5 +++--
.../Entity/Db/Mapping/Octopus.Entity.Db.Structure.dcm.xml | 4 ++--
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/Octopus/Entity/Db/IndividuInscription.php b/src/Octopus/Entity/Db/IndividuInscription.php
index 4808082..70d368d 100644
--- a/src/Octopus/Entity/Db/IndividuInscription.php
+++ b/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;
}
diff --git a/src/Octopus/Entity/Db/Mapping/Octopus.Entity.Db.IndividuInscription.dcm.xml b/src/Octopus/Entity/Db/Mapping/Octopus.Entity.Db.IndividuInscription.dcm.xml
index 7c83aa1..c0612b3 100755
--- a/src/Octopus/Entity/Db/Mapping/Octopus.Entity.Db.IndividuInscription.dcm.xml
+++ b/src/Octopus/Entity/Db/Mapping/Octopus.Entity.Db.IndividuInscription.dcm.xml
@@ -1,6 +1,6 @@
<?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>
diff --git a/src/Octopus/Entity/Db/Mapping/Octopus.Entity.Db.Structure.dcm.xml b/src/Octopus/Entity/Db/Mapping/Octopus.Entity.Db.Structure.dcm.xml
index 6e1e6f6..88b2b94 100755
--- a/src/Octopus/Entity/Db/Mapping/Octopus.Entity.Db.Structure.dcm.xml
+++ b/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" />
--
GitLab