Merge remote-tracking branch 'origin/b20' into b20 (64ebee87) · Commits · JACQUOT Frederic / OSE

data/ddl/table/STATUT.php

+48 −0

Changes for data/ddl/table/STATUT.php: 48 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -669,6 +669,54 @@ return [
		'position' => 3,
		'commentaire' => NULL,
		],
		'MODE_REFERENTIEL_PREVISIONNEL' => [
		'name' => 'MODE_REFERENTIEL_PREVISIONNEL',
		'type' => 'string',
		'bdd-type' => 'VARCHAR2',
		'length' => 50,
		'scale' => NULL,
		'precision' => NULL,
		'nullable' => TRUE,
		'default' => NULL,
		'position' => 85,
		'commentaire' => NULL,
		],
		'MODE_REFERENTIEL_REALISE' => [
		'name' => 'MODE_REFERENTIEL_REALISE',
		'type' => 'string',
		'bdd-type' => 'VARCHAR2',
		'length' => 50,
		'scale' => NULL,
		'precision' => NULL,
		'nullable' => TRUE,
		'default' => NULL,
		'position' => 86,
		'commentaire' => NULL,
		],
		'MODE_SERVICE_PREVISIONNEL' => [
		'name' => 'MODE_SERVICE_PREVISIONNEL',
		'type' => 'string',
		'bdd-type' => 'VARCHAR2',
		'length' => 50,
		'scale' => NULL,
		'precision' => NULL,
		'nullable' => TRUE,
		'default' => NULL,
		'position' => 83,
		'commentaire' => NULL,
		],
		'MODE_SERVICE_REALISE' => [
		'name' => 'MODE_SERVICE_REALISE',
		'type' => 'string',
		'bdd-type' => 'VARCHAR2',
		'length' => 50,
		'scale' => NULL,
		'precision' => NULL,
		'nullable' => TRUE,
		'default' => NULL,
		'position' => 84,
		'commentaire' => NULL,
		],
		'MODIF_SERVICE_DU' => [
		'name' => 'MODIF_SERVICE_DU',
		'type' => 'bool',

data/ddl/view/V_INTERVENANT_HISTORIQUE.sql

+27 −3

Changes for data/ddl/view/V_INTERVENANT_HISTORIQUE.sql: 27 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		CREATE OR REPLACE FORCE VIEW V_INTERVENANT_HISTORIQUE AS
		-- OSE.V_INTERVENANT_HISTORIQUE source

		WITH historique AS (
		--Initialisation des données personnelles
		SELECT d.intervenant_id intervenant_id,
		@@ -358,17 +360,39 @@ FROM validation v
		WHERE v.histo_destruction IS null
		GROUP BY i.id

		UNION ALL
		--Demande de mise en paiement
		SELECT
		s.intervenant_id intervenant_id,
		'7 - Demande de mise en paiement' categorie,
		mep.heures \|\| 'h ' \|\| th.libelle_court label,
		mep.histo_modification histo_date,
		mep.histo_modificateur_id histo_createur_id,
		u.display_name histo_user,
		'glyphicon glyphicon-ok' icon,
		7 ordre
		FROM
		mise_en_paiement mep
		JOIN formule_resultat_service frs ON frs.id = mep.formule_res_service_id
		JOIN service s ON s.id = frs.service_id
		JOIN type_heures th ON th.id = mep.type_heures_id
		JOIN utilisateur u ON u.id = mep.histo_modificateur_id
		LEFT JOIN periode p ON p.id = mep.periode_paiement_id
		WHERE
		mep.histo_destruction IS NULL AND mep.date_mise_en_paiement IS NULL


		UNION ALL
		--Mise en paiement
		SELECT
		s.intervenant_id intervenant_id,
		'7 - Mise en paiement' categorie,
		'8 - Mise en paiement' categorie,
		mep.heures \|\| 'h ' \|\| th.libelle_court \|\| CASE WHEN p.id IS NULL THEN '' ELSE ' (paiement en ' \|\| p.libelle_court \|\| ')' END label,
		mep.histo_modification histo_date,
		mep.histo_modificateur_id histo_createur_id,
		u.display_name histo_user,
		'glyphicon glyphicon-ok' icon,
		6 ordre
		8 ordre
		FROM
		mise_en_paiement mep
		JOIN formule_resultat_service frs ON frs.id = mep.formule_res_service_id
		@@ -377,7 +401,7 @@ FROM
		JOIN utilisateur u ON u.id = mep.histo_modificateur_id
		LEFT JOIN periode p ON p.id = mep.periode_paiement_id
		WHERE
		mep.histo_destruction IS NULL
		mep.histo_destruction IS NULL AND mep.date_mise_en_paiement IS NOT NULL

data/ddl_columns_pos.php

+4 −0

Changes for data/ddl_columns_pos.php: 4 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -1305,6 +1305,10 @@ return [
		'CONTRAT_ETAT_SORTIE_ID',
		'TAUX_CHARGES_TTC',
		'CONTRAT_GENERATION',
		'MODE_SERVICE_PREVISIONNEL',
		'MODE_SERVICE_REALISE',
		'MODE_REFERENTIEL_PREVISIONNEL',
		'MODE_REFERENTIEL_REALISE',
		],
		'STRUCTURE' => [
		'ID',

module/Application/src/Controller/ContratController.php

+5 −0

Changes for module/Application/src/Controller/ContratController.php: 5 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -150,8 +150,13 @@ class ContratController extends AbstractController
		];

		foreach ($contrats as $contrat) {
		if($avenantResult < 0){
		$services['contractualises'][$contrat->getId()] = $this->getProcessusContrat()->getServices($intervenant, $contrat, null);

		}else{
		$services['contractualises'][$contrat->getId()] = $this->getProcessusContrat()->getServices($intervenant, $contrat, $role->getStructure());
		}
		}

		$nc = $this->getProcessusContrat()->getServices($intervenant, null, $role->getStructure());
		foreach ($nc as $service) {

module/Application/src/Form/Intervenant/Dossier/DossierIdentiteComplementaireFieldset.php

+2 −1

Changes for module/Application/src/Form/Intervenant/Dossier/DossierIdentiteComplementaireFieldset.php: 2 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -171,7 +171,8 @@ class DossierIdentiteComplementaireFieldset extends AbstractFieldset
		'allow_empty' => true,
		],
		'departementNaissance' => [
		'required' => false,//$departementRequired,
		'required' => false,
		'allow_empty' => true,
		'validators' => [
		new DepartementNaissanceValidator(),
		],