Ajout colonne Code RH sur l'entité intervenant et modification du viewhelper en conséquence (60be0511) · Commits · JACQUOT Frederic / OSE

data/ddl/table/INTERVENANT.php

+13 −1

Changes for data/ddl/table/INTERVENANT.php: 13 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -225,6 +225,18 @@ return [
		'position' => 3,
		'commentaire' => NULL,
		],
		'CODE_RH' => [
		'name' => 'CODE_RH',
		'type' => 'string',
		'bdd-type' => 'VARCHAR2',
		'length' => 60,
		'scale' => NULL,
		'precision' => NULL,
		'nullable' => TRUE,
		'default' => NULL,
		'position' => 44,
		'commentaire' => NULL,
		],
		'COMMUNE_NAISSANCE' => [
		'name' => 'COMMUNE_NAISSANCE',
		'type' => 'string',
		@@ -670,7 +682,7 @@ return [
		'commentaire' => NULL,
		],
		],
		'columns-order' => 'ID,ANNEE_ID,CODE,UTILISATEUR_CODE,STRUCTURE_ID,STATUT_ID,GRADE_ID,DISCIPLINE_ID,CIVILITE_ID,NOM_USUEL,PRENOM,DATE_NAISSANCE,NOM_PATRONYMIQUE,COMMUNE_NAISSANCE,PAYS_NAISSANCE_ID,DEPARTEMENT_NAISSANCE_ID,PAYS_NATIONALITE_ID,TEL_PRO,TEL_PERSO,EMAIL_PRO,EMAIL_PERSO,ADDR_PRECISIONS,ADDR_NUMERO,ADDR_NUMERO_COMPL_ID,ADDR_VOIRIE_ID,ADDR_VOIE,ADDR_LIEU_DIT,ADDR_CODE_POSTAL,ADDR_COMMUNE,ADDR_PAYS_ID,NUMERO_INSEE,NUMERO_INSEE_PROVISOIRE,IBAN,BIC,RIB_HORS_SEPA,AUTRE_1,AUTRE_2,AUTRE_3,AUTRE_4,AUTRE_5,EMPLOYEUR_ID,MONTANT_INDEMNITE_FC,CRITERE_RECHERCHE,SOURCE_ID,SOURCE_CODE,SYNC_STATUT,SYNC_STRUCTURE,HISTO_CREATION,HISTO_CREATEUR_ID,HISTO_MODIFICATION,HISTO_MODIFICATEUR_ID,HISTO_DESTRUCTION,HISTO_DESTRUCTEUR_ID',
		'columns-order' => 'ID,ANNEE_ID,CODE,CODE_RH,UTILISATEUR_CODE,STRUCTURE_ID,STATUT_ID,GRADE_ID,DISCIPLINE_ID,CIVILITE_ID,NOM_USUEL,PRENOM,DATE_NAISSANCE,NOM_PATRONYMIQUE,COMMUNE_NAISSANCE,PAYS_NAISSANCE_ID,DEPARTEMENT_NAISSANCE_ID,PAYS_NATIONALITE_ID,TEL_PRO,TEL_PERSO,EMAIL_PRO,EMAIL_PERSO,ADDR_PRECISIONS,ADDR_NUMERO,ADDR_NUMERO_COMPL_ID,ADDR_VOIRIE_ID,ADDR_VOIE,ADDR_LIEU_DIT,ADDR_CODE_POSTAL,ADDR_COMMUNE,ADDR_PAYS_ID,NUMERO_INSEE,NUMERO_INSEE_PROVISOIRE,IBAN,BIC,RIB_HORS_SEPA,AUTRE_1,AUTRE_2,AUTRE_3,AUTRE_4,AUTRE_5,EMPLOYEUR_ID,MONTANT_INDEMNITE_FC,CRITERE_RECHERCHE,SOURCE_ID,SOURCE_CODE,SYNC_STATUT,SYNC_STRUCTURE,HISTO_CREATION,HISTO_CREATEUR_ID,HISTO_MODIFICATION,HISTO_MODIFICATEUR_ID,HISTO_DESTRUCTION,HISTO_DESTRUCTEUR_ID',
		];

		//@formatter:on

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

+29 −0

Changes for module/Application/src/Application/Entity/Db/Intervenant.php: 29 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -48,6 +48,11 @@ class Intervenant implements HistoriqueAwareInterface, ResourceInterface, Import
		*/
		protected $code;

		/**
		* @var string\|null
		*/
		protected $codeRh;

		/**
		* @var string\|null
		*/
		@@ -406,6 +411,30 @@ class Intervenant implements HistoriqueAwareInterface, ResourceInterface, Import



		/**
		* @return string\|null
		*/
		public function getCodeRh(): ?string
		{
		return $this->codeRh;
		}



		/**
		* @param string\|null $codeRh
		*
		* @return Intervenant
		*/
		public function setCodeRh(?string $codeRh): Intervenant
		{
		$this->codeRh = $codeRh;

		return $this;
		}



		/**
		* @return string\|null
		*/

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

+3 −2

Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.Intervenant.dcm.xml: 3 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -9,8 +9,9 @@
		<many-to-one field="annee" target-entity="Application\Entity\Db\Annee">
		<join-column name="ANNEE_ID" referenced-column-name="ID"/>
		</many-to-one>
		<field name="code" type="string" column="CODE" length="60" nullable="false"/>
		<field name="utilisateurCode" type="string" column="UTILISATEUR_CODE" length="60" nullable="false"/>
		<field name="code" type="string" column="CODE" length="60" nullable="true"/>
		<field name="codeRh" type="string" column="CODE_RH" length="60" nullable="false"/>
		="UTILISATEUR_CODE" length="60" nullable="false"/>

		<many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
		<join-column name="STRUCTURE_ID" referenced-column-name="ID"/>

module/Application/src/Application/Processus/Intervenant/RechercheProcessus.php

+2 −1

Changes for module/Application/src/Application/Processus/Intervenant/RechercheProcessus.php: 2 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -79,6 +79,7 @@ class RechercheProcessus
		SELECT
		i.id,
		i.code,
		i.code_rh,
		i.statut_id,
		i.nom_usuel,
		i.nom_patronymique,
		@@ -201,7 +202,7 @@ class RechercheProcessus
		'date-naissance' => new \DateTime($r['DATE_NAISSANCE']),
		'structure' => $r['STRUCTURE'],
		'statut' => $r['STATUT'],
		'numero-personnel' => $r['CODE'],
		'numero-personnel' => $r['CODE_RH'],
		'destruction' => $r['HISTO_DESTRUCTION'],
		];
		} else {

module/Application/src/Application/View/Helper/Intervenant/IntervenantViewHelper.php

+1 −1

Changes for module/Application/src/Application/View/Helper/Intervenant/IntervenantViewHelper.php: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ class IntervenantViewHelper extends AbstractHtmlElement
		'metier' => [
		"Type d'intervenant" => $entity->getStatut()->getTypeIntervenant(),
		"Statut de l'intervenant" => $entity->getStatut(),
		"N° {$entity->getSource()}" => $entity->getCode(),
		"N° RH" => (($entity->getCodeRh()) ? $entity->getCodeRh() : $entity->getCode()) . (($entity->getSource()->getLibelle() == 'Octopus') ? " <i>(N° Octopus " . $entity->getCode() . ")</i>" : ''),
		"Affectation principale" => $entity->getStructure() ?: '<span class="inconnu">(Inconnue)</span>',
		],
		'divers' => [