Merge branch 'master' into FJ_Contrat_Sans_Avenant (630f822e) · Commits · open-source / OSE

data/ddl/table/PAYS.php

+12 −0

Changes for data/ddl/table/PAYS.php: 12 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -21,6 +21,18 @@ return [
		'position' => 14,
		'commentaire' => NULL,
		],
		'CODE_ISO3' => [
		'name' => 'CODE_ISO3',
		'type' => 'string',
		'bdd-type' => 'VARCHAR2',
		'length' => 15,
		'scale' => NULL,
		'precision' => NULL,
		'nullable' => TRUE,
		'default' => NULL,
		'position' => 15,
		'commentaire' => NULL,
		],
		'HISTO_CREATEUR_ID' => [
		'name' => 'HISTO_CREATEUR_ID',
		'type' => 'int',

data/ddl_columns_pos.php

+1 −0

Changes for data/ddl_columns_pos.php: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -1052,6 +1052,7 @@ return [
		'HISTO_DESTRUCTION',
		'HISTO_DESTRUCTEUR_ID',
		'CODE',
		'CODE_ISO3',
		],
		'PERIMETRE' => [
		'ID',

doc/Connecteurs-Import/Octopus/SRC_PAYS.sql

+2 −1

Changes for doc/Connecteurs-Import/Octopus/SRC_PAYS.sql: 2 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		CREATE
		OR REPLACE FORCE VIEW SRC_PAYS AS
		SELECT code_pays code,
		code_iso3 code_iso3,
		libelle_long libelle,
		coalesce(date_ouverture, TO_DATE('1900/01/01', 'YYYY/MM/DD')) validite_debut,
		COALESCE(date_ouverture, to_date('1900/01/01', 'YYYY/MM/DD')) validite_debut,
		date_fermeture validite_fin,
		0 temoin_ue,
		s.id source_id,

module/Application/src/Entity/Db/Mapping/Application.Entity.Db.Pays.dcm.xml

+4 −1

Changes for module/Application/src/Entity/Db/Mapping/Application.Entity.Db.Pays.dcm.xml: 4 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		<?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">
		<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="Application\Entity\Db\Pays" table="PAYS">
		<id name="id" type="integer" column="ID">
		<generator strategy="SEQUENCE"/>
		</id>

		<field name="code" type="string" column="CODE" length="20" nullable="false"/>
		<field name="codeIso3" type="string" column="CODE_ISO3" length="20" nullable="false"/>
		<field name="libelle" type="string" column="LIBELLE" length="60" nullable="false"/>
		<field name="temoinUe" type="boolean" column="TEMOIN_UE" nullable="false"/>
		<field name="validiteDebut" type="datetime" column="VALIDITE_DEBUT" nullable="false"/>

module/Application/src/Entity/Db/Pays.php

+27 −13

Changes for module/Application/src/Entity/Db/Pays.php: 27 added lines, 13 removed lines.
Original line number	Diff line number	Diff line
		@@ -28,6 +28,12 @@ class Pays implements HistoriqueAwareInterface, ImportAwareInterface
		*/
		protected ?string $code = null;

		/**
		* @var string
		*/
		protected ?string $codeIso3 = null;


		/**
		* @var string\|null
		*/
		@@ -49,7 +55,6 @@ class Pays implements HistoriqueAwareInterface, ImportAwareInterface
		protected ?DateTime $validiteFin = null;



		/**
		* @return int\|null
		*/
		@@ -59,7 +64,6 @@ class Pays implements HistoriqueAwareInterface, ImportAwareInterface
		}



		/**
		* @param int\|null $id
		*
		@@ -73,7 +77,6 @@ class Pays implements HistoriqueAwareInterface, ImportAwareInterface
		}



		/**
		* @return string
		*/
		@@ -83,7 +86,6 @@ class Pays implements HistoriqueAwareInterface, ImportAwareInterface
		}



		/**
		* @param string $code
		*
		@@ -97,6 +99,27 @@ class Pays implements HistoriqueAwareInterface, ImportAwareInterface
		}


		/**
		* @return string
		*/
		public function getCodeIso3(): ?string
		{
		return $this->codeIso3;
		}


		/**
		* @param string $codeIso3
		*
		* @return Pays
		*/
		public function setCodeIso3(?string $codeIso3): Pays
		{
		$this->codeIso3 = $codeIso3;

		return $this;
		}


		/**
		* @return string\|null
		@@ -107,7 +130,6 @@ class Pays implements HistoriqueAwareInterface, ImportAwareInterface
		}



		/**
		* @param string\|null $libelle
		*
		@@ -121,7 +143,6 @@ class Pays implements HistoriqueAwareInterface, ImportAwareInterface
		}



		/**
		* @return bool\|null
		*/
		@@ -131,7 +152,6 @@ class Pays implements HistoriqueAwareInterface, ImportAwareInterface
		}



		/**
		* @param bool\|null $temoinUe
		*
		@@ -145,7 +165,6 @@ class Pays implements HistoriqueAwareInterface, ImportAwareInterface
		}



		/**
		* @return DateTime\|null
		*/
		@@ -155,7 +174,6 @@ class Pays implements HistoriqueAwareInterface, ImportAwareInterface
		}



		/**
		* @param DateTime\|null $validiteDebut
		*
		@@ -169,7 +187,6 @@ class Pays implements HistoriqueAwareInterface, ImportAwareInterface
		}



		/**
		* @return DateTime\|null
		*/
		@@ -179,7 +196,6 @@ class Pays implements HistoriqueAwareInterface, ImportAwareInterface
		}



		/**
		* @param DateTime\|null $validiteFin
		*
		@@ -193,7 +209,6 @@ class Pays implements HistoriqueAwareInterface, ImportAwareInterface
		}



		/**
		* Retourne la représentation littérale de cet objet.
		*
		@@ -205,7 +220,6 @@ class Pays implements HistoriqueAwareInterface, ImportAwareInterface
		}



		public function isFrance(): bool
		{
		return \UnicaenApp\Util::reduce($this->getLibelle()) == self::FRANCE;