Finalisation de la double validation des données personnelles (validation... (75443f3e) · Commits · open-source / OSE

data/ddl/table/TBL_DOSSIER.php

+12 −0

Original line number	Diff line number	Diff line
		@@ -285,6 +285,18 @@ return [
		'position' => 6,
		'commentaire' => NULL,
		],
		'VALIDATION_COMPLEMENTAIRE_ID' => [
		'name' => 'VALIDATION_COMPLEMENTAIRE_ID',
		'type' => 'int',
		'bdd-type' => 'NUMBER',
		'length' => 0,
		'scale' => NULL,
		'precision' => NULL,
		'nullable' => TRUE,
		'default' => NULL,
		'position' => 25,
		'commentaire' => NULL,
		],
		],
		];

data/ddl/table/TYPE_VALIDATION.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@ return [
		'name' => 'CODE',
		'type' => 'string',
		'bdd-type' => 'VARCHAR2',
		'length' => 25,
		'length' => 40,
		'scale' => NULL,
		'precision' => NULL,
		'nullable' => FALSE,

data/ddl/view/V_TBL_DOSSIER.sql

+60 −55

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@ SELECT
		i.id intervenant_id,
		d.id dossier_id,
		v.id validation_id,
		vc.id validation_complementaire_id,
		d.civilite_id civilite_id,
		d.nom_usuel nom_usuel,
		d.prenom prenom,
		@@ -67,6 +68,10 @@ FROM
		LEFT JOIN validation v ON v.intervenant_id = i.id
		AND v.type_validation_id = tv.id
		AND v.histo_destruction IS NULL
		JOIN type_validation tvc ON tvc.code = 'DONNEES_PERSO_COMPLEMENTAIRE_PAR_COMP'
		LEFT JOIN validation vc ON vc.intervenant_id = i.id
		AND vc.type_validation_id = tvc.id
		AND vc.histo_destruction IS NULL
		LEFT JOIN dossier_champ_autre dca1 ON dca1.id = 1
		LEFT JOIN dossier_champ_autre dca2 ON dca2.id = 2
		LEFT JOIN dossier_champ_autre dca3 ON dca3.id = 3

data/ddl/view/V_TBL_INTERVENANT_DOSSIER.sql

deleted100644 → 0

+0 −68

Original line number	Diff line number	Diff line
		CREATE OR REPLACE FORCE VIEW V_TBL_INTERVENANT_DOSSIER AS
		SELECT
		i.annee_id annee_id,
		i.id intervenant_id,
		si.dossier actif,
		si.code statut_code,
		si.dossier_identite_comp dossier_identite_comp,
		si.dossier_contact dossier_contact,
		si.dossier_adresse dossier_adresse,
		si.dossier_banque dossier_banque,
		si.dossier_insee dossier_insee,
		si.dossier_employeur dossier_employeur,
		si.dossier_autre_1 dossier_autre_1,
		si.dossier_autre_2 dossier_autre_2,
		si.dossier_autre_3 dossier_autre_3,
		si.dossier_autre_4 dossier_autre_4,
		si.dossier_autre_5 dossier_autre_5,
		si.dossier_email_perso statut_dossier_email_perso,
		si.dossier_tel_perso statut_dossier_tel_perso,
		d.id dossier_id,
		v.id validation_id,
		d.civilite_id civilite_id,
		d.nom_usuel nom_usuel,
		d.prenom prenom,
		d.date_naissance date_naissance,
		d.situation_matrimoniale_id situation_matrimoniale_id,
		d.departement_naissance_id departement_naissance_id,
		d.pays_naissance_id pays_naissance_id,
		d.pays_nationalite_id pays_nationalite_id,
		d.commune_naissance commune_naissance,
		d.email_perso email_perso,
		d.email_pro email_pro,
		d.tel_perso tel_perso,
		d.tel_pro tel_pro,
		d.adresse_precisions adresse_precisions,
		d.adresse_lieu_dit adresse_lieu_dit,
		d.adresse_voie adresse_voie,
		d.adresse_numero adresse_numero,
		d.adresse_commune adresse_commune,
		d.adresse_code_postal adresse_code_postal,
		d.numero_insee numero_insee,
		d.iban iban,
		d.bic bic,
		d.employeur_id employeur_id,
		d.autre_1 autre_1,
		d.autre_2 autre_2,
		d.autre_3 autre_3,
		d.autre_4 autre_4,
		d.autre_5 autre_5
		FROM
		intervenant i
		JOIN statut si ON si.id = i.statut_id
		LEFT JOIN intervenant_dossier d ON d.intervenant_id = i.id
		AND d.histo_destruction IS NULL
		LEFT JOIN pays pn ON pn.id = d.pays_naissance_id
		JOIN type_validation tv ON tv.code = 'DONNEES_PERSO_PAR_COMP'
		LEFT JOIN validation v ON v.intervenant_id = i.id
		AND v.type_validation_id = tv.id
		AND v.histo_destruction IS NULL
		LEFT JOIN dossier_champ_autre dca1 ON dca1.id = 1 AND si.dossier_autre_1 = 1
		LEFT JOIN dossier_champ_autre dca2 ON dca2.id = 2 AND si.dossier_autre_2 = 1
		LEFT JOIN dossier_champ_autre dca3 ON dca3.id = 3 AND si.dossier_autre_3 = 1
		LEFT JOIN dossier_champ_autre dca4 ON dca4.id = 4 AND si.dossier_autre_4 = 1
		LEFT JOIN dossier_champ_autre dca5 ON dca5.id = 5 AND si.dossier_autre_5 = 1
		WHERE
		i.histo_destruction IS NULL
		/@INTERVENANT_ID=i.id/
		/@ANNEE_ID=i.annee_id/
		No newline at end of file

data/nomenclatures.php

+25 −5

Original line number	Diff line number	Diff line
		@@ -107,11 +107,26 @@ return [
		],

		'DOSSIER_CHAMP_AUTRE' => [
		['ID' => 1, 'LIBELLE' => 'Dossier champ autre 1', 'DOSSIER_CHAMP_AUTRE_TYPE_ID' => 1, 'OBLIGATOIRE' => true],
		['ID' => 2, 'LIBELLE' => 'Dossier champ autre 2', 'DOSSIER_CHAMP_AUTRE_TYPE_ID' => 1, 'OBLIGATOIRE' => true],
		['ID' => 3, 'LIBELLE' => 'Dossier champ autre 3', 'DOSSIER_CHAMP_AUTRE_TYPE_ID' => 1, 'OBLIGATOIRE' => true],
		['ID' => 4, 'LIBELLE' => 'Dossier champ autre 4', 'DOSSIER_CHAMP_AUTRE_TYPE_ID' => 1, 'OBLIGATOIRE' => true],
		['ID' => 5, 'LIBELLE' => 'Dossier champ autre 5', 'DOSSIER_CHAMP_AUTRE_TYPE_ID' => 1, 'OBLIGATOIRE' => true],
		['ID' => 1,
		'LIBELLE' => 'Dossier champ autre 1',
		'DOSSIER_CHAMP_AUTRE_TYPE_ID' => 1,
		'OBLIGATOIRE' => true],
		['ID' => 2,
		'LIBELLE' => 'Dossier champ autre 2',
		'DOSSIER_CHAMP_AUTRE_TYPE_ID' => 1,
		'OBLIGATOIRE' => true],
		['ID' => 3,
		'LIBELLE' => 'Dossier champ autre 3',
		'DOSSIER_CHAMP_AUTRE_TYPE_ID' => 1,
		'OBLIGATOIRE' => true],
		['ID' => 4,
		'LIBELLE' => 'Dossier champ autre 4',
		'DOSSIER_CHAMP_AUTRE_TYPE_ID' => 1,
		'OBLIGATOIRE' => true],
		['ID' => 5,
		'LIBELLE' => 'Dossier champ autre 5',
		'DOSSIER_CHAMP_AUTRE_TYPE_ID' => 1,
		'OBLIGATOIRE' => true],
		],


		@@ -700,6 +715,11 @@ return [
		"CODE" => "DECLARATION_PRIME",
		"LIBELLE" => "Validation d'une déclaration prime",
		],
		[
		'ID' => 13,
		"CODE" => "DONNEES_PERSO_COMPLEMENTAIRE_PAR_COMP",
		"LIBELLE" => "Validation des données personnelles",
		],
		],

		'TYPE_VOLUME_HORAIRE' => [