Ajout d'un champs code rh dans le statut de l'intervenant pour paramétrage export rh par statut. (bf01f752) · Commits · open-source / OSE

data/ddl/table/STATUT_INTERVENANT.php

+12 −0

Changes for data/ddl/table/STATUT_INTERVENANT.php: 12 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -33,6 +33,18 @@ return [
		'position' => 8,
		'commentaire' => NULL,
		],
		'CODE_RH' => [
		'name' => 'CODE_RH',
		'type' => 'string',
		'bdd-type' => 'VARCHAR2',
		'length' => 50,
		'scale' => NULL,
		'precision' => NULL,
		'nullable' => TRUE,
		'default' => NULL,
		'position' => 44,
		'commentaire' => 'Code de correspondance avec le SI RH',
		],
		'DEPASSEMENT' => [
		'name' => 'DEPASSEMENT',
		'type' => 'bool',

+1 −0

Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.StatutIntervenant.dcm.xml: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@
		<field name="maximumHETD" type="float" column="MAXIMUM_HETD" precision="126" scale="0" nullable="false"/>
		<field name="chargesPatronales" type="float" column="CHARGES_PATRONALES" precision="126" scale="0" nullable="false"/>
		<field name="code" type="string" column="CODE" length="50" nullable="false"/>
		<field name="codeRh" type="string" column="CODE_RH" length="50" nullable="false"/>
		<field name="nonAutorise" type="boolean" column="NON_AUTORISE" nullable="false"/>
		<field name="ordre" type="integer" column="ORDRE" nullable="false"/>
		<field name="peutSaisirService" type="boolean" column="PEUT_SAISIR_SERVICE" nullable="false"/>

+27 −0

Changes for module/Application/src/Application/Entity/Db/StatutIntervenant.php: 27 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -211,6 +211,11 @@ class StatutIntervenant implements HistoriqueAwareInterface, RoleInterface
		*/
		protected $dossierTelPerso;

		/**
		* @var string
		*/
		protected $codeRh;



		/**
		@@ -1266,6 +1271,28 @@ class StatutIntervenant implements HistoriqueAwareInterface, RoleInterface



		/**
		* @return string
		*/
		public function getCodeRh()
		{
		return $this->codeRh;
		}



		/**
		* @param string $codeRh
		*/
		public function setCodeRh($codeRh): string
		{
		$this->codeRh = $codeRh;

		return $this;
		}



		/**
		* Indique si ce statut correspond à un intervenant permanent.
		*

+14 −0

Changes for module/Application/src/Application/Form/StatutIntervenant/StatutIntervenantSaisieForm.php: 14 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -174,6 +174,17 @@ class StatutIntervenantSaisieForm extends AbstractForm
		'type' => 'Text',
		]);

		$this->add([
		'name' => 'code_rh',
		'options' => [
		'label' => "Code RH",

		],
		'attributes' => [
		],
		'type' => 'Text',
		]);

		//Gestion des agréments de façon dynamique par rapport au contenu de la table type_agrement
		$qb = $this->getServiceTypeAgrement()->finderByHistorique();
		$typesAgrement = $this->getServiceTypeAgrement()->getList($qb);
		@@ -367,6 +378,9 @@ class StatutIntervenantSaisieForm extends AbstractForm
		'code' => [
		'required' => true,
		],
		'code_rh' => [
		'required' => false,
		],
		'plafond-h-c' => [
		'required' => true,
		'validators' => [

+2 −0

Changes for module/Application/src/Application/Hydrator/StatutIntervenantHydrator.php: 2 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ class StatutIntervenantHydrator implements HydratorInterface
		$object->setTemAtv($data['TEM-ATV']);
		$object->setTemBiatss($data['TEM-BIATSS']);
		$object->setCode($data['code']);
		$object->setCodeRh($data['code_rh']);
		$object->setPlafondHcHorsRemuFc(FloatFromString::run($data['plafond-h-h-c']));
		$object->setPlafondHcRemuFc(FloatFromString::run($data['plafond-h-c']));
		$object->setPlafondHcFiHorsEad(FloatFromString::run($data['plafond-hc-fi-hors-ead']));
		@@ -163,6 +164,7 @@ class StatutIntervenantHydrator implements HydratorInterface
		'TEM-BIATSS' => $object->getTemBiatss(),
		'type-intervenant' => ($s = $object->getTypeIntervenant()) ? $s->getId() : null,
		'code' => $object->getCode(),
		'code_rh' => $object->getCodeRh(),
		'plafond-h-h-c' => StringFromFloat::run($object->getPlafondHcHorsRemuFc()),
		'plafond-h-c' => StringFromFloat::run($object->getPlafondHcRemuFc()),
		'plafond-hc-fi-hors-ead' => StringFromFloat::run($object->getPlafondHcFiHorsEad()),