Intégration du MASTER (3f48d5f3) · Commits · JACQUOT Frederic / OSE

data/ddl.php

+58 −68

Original line number	Diff line number	Diff line
		@@ -1403,17 +1403,6 @@
		'default' => NULL,
		'commentaire' => NULL,
		),
		'CODE_INTERVENANT' =>
		array (
		'name' => 'CODE_INTERVENANT',
		'type' => 'VARCHAR2',
		'length' => 255,
		'scale' => NULL,
		'precision' => NULL,
		'nullable' => true,
		'default' => NULL,
		'commentaire' => NULL,
		),
		),
		),
		'ANNEE' =>
		@@ -13426,17 +13415,6 @@
		'default' => NULL,
		'commentaire' => NULL,
		),
		'ANNEE_AGREMENT' =>
		array (
		'name' => 'ANNEE_AGREMENT',
		'type' => 'NUMBER',
		'length' => 0,
		'scale' => NULL,
		'precision' => NULL,
		'nullable' => true,
		'default' => NULL,
		'commentaire' => NULL,
		),
		),
		),
		'TBL_CHARGENS' =>
		@@ -28757,7 +28735,6 @@ END OSE_WORKFLOW;',
		WHERE tas.histo_destruction IS NULL
		AND ta.code = e.code
		AND tas.statut_intervenant_id = si.id
		-- AND (tas.premier_recrutement IS NULL OR NVL(i.premier_recrutement,0) = tas.premier_recrutement)
		) THEN 1 ELSE 0 END

		WHEN e.code = \'\'CONTRAT\'\' THEN
		@@ -35915,40 +35892,54 @@ FROM
		JOIN categorie_privilege cp ON cp.id = p.categorie_id
		LEFT JOIN statuts_roles sr ON sr.privilege_id = p.id',
		),
		'V_RECONDUCTION_CC_MODULATEUR' =>
		'V_RECONDUCTION_CENTRE_COUT' =>
		array (
		'name' => 'V_RECONDUCTION_CC_MODULATEUR',
		'definition' => 'CREATE OR REPLACE FORCE VIEW V_RECONDUCTION_CC_MODULATEUR AS
		WITH t AS (
		'name' => 'V_RECONDUCTION_CENTRE_COUT',
		'definition' => 'CREATE OR REPLACE FORCE VIEW V_RECONDUCTION_CENTRE_COUT AS
		SELECT
		e.annee_id annee_id,
		e.structure_id structure_id,
		e.id etape_id,
		e.libelle etape_libelle,
		e.code etape_code,
		ep.id element_pedagogique_id,
		ccep.centre_cout_id centre_cout_id,
		em.MODULATEUR_ID modulateur_id,
		ccep.type_heures_id type_heures_id,
		ep.annee_id annee_id,
		ep.code code
		e.libelle etape_libelle,
		cc1.id centre_cout_id,
		ccep1.type_heures_id type_heures_id,
		ep1.code ep_code,
		ep2.id new_ep_id
		FROM
		etape e
		JOIN source s ON s.importable = 0
		JOIN element_pedagogique ep ON ep.etape_id = e.id AND ep.histo_destruction IS NULL
		LEFT JOIN centre_cout_ep ccep ON ccep.element_pedagogique_id = ep.id AND ccep.histo_destruction IS NULL AND ccep.source_id = s.id
		LEFT JOIN ELEMENT_MODULATEUR em ON em.ELEMENT_ID = ep.ID
		JOIN element_pedagogique ep1 ON ep1.etape_id = e.id AND ep1.HISTO_DESTRUCTION IS NULL
		JOIN centre_cout_ep ccep1 ON ccep1.element_pedagogique_id = ep1.id AND ccep1.HISTO_DESTRUCTION IS NULL
		JOIN centre_cout cc1 ON ccep1.centre_cout_id = cc1.id AND cc1.HISTO_DESTRUCTION IS NULL
		JOIN source s ON s.id = ccep1.source_id AND s.importable = 0
		JOIN element_pedagogique ep2 ON ep2.annee_id = ep1.annee_id+1 AND ep1.code = ep2.code AND ep2.HISTO_DESTRUCTION IS NULL
		LEFT JOIN centre_cout_ep ccep2 ON ccep2.element_pedagogique_id = ep2.id AND ccep2.histo_destruction IS NULL AND ccep2.type_heures_id = ccep1.TYPE_HEURES_ID
		WHERE
		e.histo_destruction IS NULL
		)
		AND ccep2.id IS NULL',
		),
		'V_RECONDUCTION_MODULATEUR' =>
		array (
		'name' => 'V_RECONDUCTION_MODULATEUR',
		'definition' => 'CREATE OR REPLACE FORCE VIEW V_RECONDUCTION_MODULATEUR AS
		SELECT
		t."ETAPE_ID",t."ETAPE_LIBELLE", t."ETAPE_CODE", t."ELEMENT_PEDAGOGIQUE_ID",t."CENTRE_COUT_ID", t.modulateur_id, t."TYPE_HEURES_ID",t."ANNEE_ID",t."CODE",
		ep.id new_element_pedagogique_id,
		ccep.id new_centre_cout_ep_id,
		em.id new_element_modulateur_id
		e.annee_id annee_id,
		e.structure_id structure_id,
		e.id etape_id,
		e.code etape_code,
		e.libelle etape_libelle,
		em1.modulateur_id modulateur_id,
		ep1.code ep_code,
		ep2.id new_ep_id
		FROM
		t
		LEFT JOIN element_pedagogique ep ON ep.annee_id = t.annee_id + 1 AND ep.code = t.code AND ep.histo_destruction IS NULL
		LEFT JOIN centre_cout_ep ccep ON ccep.element_pedagogique_id = ep.id AND ccep.centre_cout_id = t.centre_cout_id AND ccep.type_heures_id = t.type_heures_id
		LEFT JOIN ELEMENT_MODULATEUR em ON em.ELEMENT_ID = ep.ID',
		etape e
		JOIN element_pedagogique ep1 ON ep1.etape_id = e.id AND ep1.HISTO_DESTRUCTION IS NULL
		JOIN element_modulateur em1 ON em1.element_id = ep1.id AND em1.histo_destruction IS NULL
		JOIN element_pedagogique ep2 ON ep2.annee_id = ep1.annee_id+1 AND ep1.code = ep2.code AND ep2.HISTO_DESTRUCTION IS NULL
		LEFT JOIN element_modulateur em2 ON em2.element_id=ep2.id AND em2.histo_destruction IS NULL
		WHERE
		e.histo_destruction IS NULL
		AND em2.id IS NULL',
		),
		'V_REF_INTERVENANT' =>
		array (
		@@ -44604,7 +44595,7 @@ WHERE
		array (
		'name' => 'TBL_AGREMENT__UN',
		'table' => 'TBL_AGREMENT',
		'index' => 'TBL_AGREMENT__UN',
		'index' => 'TBL_AGREMENT__UN_IDX',
		'columns' =>
		array (
		0 => 'TYPE_AGREMENT_ID',
		@@ -51383,20 +51374,6 @@ END;',
		0 => 'ID',
		),
		),
		'TBL_AGREMENT__UN' =>
		array (
		'name' => 'TBL_AGREMENT__UN',
		'unique' => true,
		'table' => 'TBL_AGREMENT',
		'columns' =>
		array (
		0 => 'TYPE_AGREMENT_ID',
		1 => 'INTERVENANT_ID',
		2 => 'STRUCTURE_ID',
		3 => 'TO_DELETE',
		4 => 'ANNEE_AGREMENT',
		),
		),
		'TBL_AGREMENT__UN_IDX' =>
		array (
		'name' => 'TBL_AGREMENT__UN_IDX',
		@@ -51408,6 +51385,7 @@ END;',
		1 => 'INTERVENANT_ID',
		2 => 'STRUCTURE_ID',
		3 => 'TO_DELETE',
		4 => 'ANNEE_AGREMENT',
		),
		),
		'TBL_AGR_AGREMENT_FK_IDX' =>
		@@ -52961,6 +52939,18 @@ END;',
		0 => 'ID',
		),
		),
		'TYPE_AGREMENT_STATUT__UN' =>
		array (
		'name' => 'TYPE_AGREMENT_STATUT__UN',
		'unique' => true,
		'table' => 'TYPE_AGREMENT_STATUT',
		'columns' =>
		array (
		0 => 'TYPE_AGREMENT_ID',
		1 => 'STATUT_INTERVENANT_ID',
		2 => 'PREMIER_RECRUTEMENT',
		),
		),
		'TYPE_AGREMENT_STATUT__UN1' =>
		array (
		'name' => 'TYPE_AGREMENT_STATUT__UN1',

module/Application/src/Application/Controller/AgrementController.php

+4 −6

Original line number	Diff line number	Diff line
		@@ -151,7 +151,6 @@ class AgrementController extends AbstractController
		$agrement->setType($this->getEvent()->getParam('typeAgrement'));
		$agrement->setIntervenant($this->getEvent()->getParam('intervenant'));
		$agrement->setStructure($this->getEvent()->getParam('structure'));
		$agrement->setCodeIntervenant($this->getEvent()->getParam('intervenant')->getCode());
		}

		$form = $this->getFormAgrementSaisie();
		@@ -306,8 +305,7 @@ class AgrementController extends AbstractController
		//plusieurs années pour plusieurs intervenants avec un même code

		$listeIntervenants = $this->getServiceIntervenant()->getByCodeIntervenant($intervenant->getCode());
		if(empty($listeIntervenants))
		{
		if (empty($listeIntervenants)) {
		$listeIntervenants[] = $intervenant;
		}
		$this->getServiceWorkflow()->calculerTableauxBord([

module/Application/src/Application/Controller/OffreFormationController.php

+12 −25

Original line number	Diff line number	Diff line
		@@ -18,8 +18,6 @@ use Application\Service\Traits\OffreFormationServiceAwareTrait;
		use Application\Service\Traits\StructureServiceAwareTrait;
		use UnicaenApp\View\Model\CsvModel;
		use Zend\Session\Container;
		use Zend\View\Model\ViewModel;
		use Zend\View\Renderer\PhpRenderer;


		/**
		@@ -39,11 +37,6 @@ class OffreFormationController extends AbstractController
		use ReconductionProcessusAwareTrait;
		use OffreFormationServiceAwareTrait;

		/**
		* @var Container
		*/
		protected $sessionContainer;



		public function indexAction()
		@@ -228,7 +221,7 @@ class OffreFormationController extends AbstractController
		$datas = $request->getPost();
		//Reconduire les centres de coût des EP de l'étape.
		try {
		$etapesReconduites = $this->getServiceEtape()->getEtapeReconduit($structure);
		$etapesReconduites = $this->getServiceEtape()->getEtapeCentreCoutReconductible($structure);
		$etapesReconduitesCc = [];
		if (isset($datas['etapes'])) {
		foreach ($datas['etapes'] as $code) {
		@@ -238,27 +231,23 @@ class OffreFormationController extends AbstractController
		}
		}
		$result = $this->getProcessusReconduction()->reconduireCCFormation($etapesReconduitesCc);
		$etapesReconduites = $this->getServiceEtape()->getEtapeReconduit($structure);
		$etapesReconduites = $this->getServiceEtape()->getEtapeCentreCoutReconductible($structure);

		$this->flashMessenger()->addSuccessMessage("$result centre(s) de coût(s) ont été reconduit pour l'année prochaine. ");


		} catch (\Exception $e) {
		$this->flashMessenger()->addErrorMessage($e->getMessage());
		}

		}

		if(empty($etapesReconduites) && !empty($structure))
		{
		$etapesReconduites = $this->getServiceEtape()->getEtapeReconduit($structure);
		if (empty($etapesReconduites) && !empty($structure)) {
		$etapesReconduites = $this->getServiceEtape()->getEtapeCentreCoutReconductible($structure);
		}


		return [
		'structures' => $structures,
		'structure' => $structure,
		'etapesReconduites' => $etapesReconduites
		'etapesReconduites' => $etapesReconduites,
		];
		}

		@@ -281,7 +270,7 @@ class OffreFormationController extends AbstractController
		$request = $this->getRequest();
		if ($request->isPost()) {
		$datas = $request->getPost();
		$etapesReconduites = $this->getServiceEtape()->getEtapeReconduit($structure);
		$etapesReconduites = $this->getServiceEtape()->getEtapeModulateurReconductible($structure);
		try {
		$etapesReconduitesCc = [];
		if (isset($datas['etapes'])) {
		@@ -296,9 +285,7 @@ class OffreFormationController extends AbstractController

		$this->flashMessenger()->addSuccessMessage("$result modulateur(s) ont été reconduit pour l'année prochaine. ");

		$etapesReconduites = $this->getServiceEtape()->getEtapeReconduit($structure);


		$etapesReconduites = $this->getServiceEtape()->getEtapeModulateurReconductible($structure);
		} catch (\Exception $e) {
		$this->flashMessenger()->addErrorMessage($e->getMessage());
		}
		@@ -306,7 +293,7 @@ class OffreFormationController extends AbstractController

		//Récupération de toutes les étapes éligibles à la reconduction des coûts
		if (empty($etapesReconduites) && !empty($structure)) {
		$etapesReconduites = $this->getServiceEtape()->getEtapeReconduit($structure);
		$etapesReconduites = $this->getServiceEtape()->getEtapeModulateurReconductible($structure);
		}

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

+4 −27

Original line number	Diff line number	Diff line
		@@ -24,12 +24,6 @@ class Agrement implements HistoriqueAwareInterface, ResourceInterface
		*/
		private $dateDecision;

		/**
		* @var integer
		*/
		private $codeIntervenant;


		/**
		* @var integer
		*/
		@@ -79,6 +73,7 @@ class Agrement implements HistoriqueAwareInterface, ResourceInterface
		}



		/**
		* Set dateDecision
		*
		@@ -93,6 +88,8 @@ class Agrement implements HistoriqueAwareInterface, ResourceInterface
		return $this;
		}



		/**
		* Get dateDecision
		*
		@@ -104,6 +101,7 @@ class Agrement implements HistoriqueAwareInterface, ResourceInterface
		}



		/**
		* Get id
		*
		@@ -171,27 +169,6 @@ class Agrement implements HistoriqueAwareInterface, ResourceInterface
		}


		/**
		* @return string
		*/
		public function getCodeIntervenant(): string
		{
		return $this->codeIntervenant;
		}



		/**
		* @param int $codeIntervenant
		*/
		public function setCodeIntervenant(string $codeIntervenant)
		{
		$this->codeIntervenant = $codeIntervenant;

		return $this;
		}



		/**
		* Set structure

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,6 @@
		<field name="histoDestruction" type="datetime" column="HISTO_DESTRUCTION" nullable="true"/>
		<field name="histoModification" type="datetime" column="HISTO_MODIFICATION" nullable="false"/>
		<field name="dateDecision" type="datetime" column="DATE_DECISION" nullable="false"/>
		<field name="codeIntervenant" type="string" column="CODE_INTERVENANT" nullable="true" />
		<many-to-one field="type" target-entity="Application\Entity\Db\TypeAgrement">
		<join-columns>
		<join-column name="TYPE_AGREMENT_ID" referenced-column-name="ID"/>