Finalisation des champs autres pour les données personnelles (4b8e6a0f) · Commits · open-source / OSE

data/ddl/table/TBL_DOSSIER.php

+5 −40

Changes for data/ddl/table/TBL_DOSSIER.php: 5 added lines, 40 removed lines.
Original line number	Diff line number	Diff line
		@@ -93,8 +93,8 @@ return [
		'position' => 11,
		'commentaire' => NULL,
		],
		'COMPLETUDE_AUTRE_1' => [
		'name' => 'COMPLETUDE_AUTRE_1',
		'COMPLETUDE_AUTRE_AVANT_RECRUTEMENT' => [
		'name' => 'COMPLETUDE_AUTRE_AVANT_RECRUTEMENT',
		'type' => 'int',
		'bdd-type' => 'NUMBER',
		'length' => 0,
		@@ -105,8 +105,8 @@ return [
		'position' => 15,
		'commentaire' => NULL,
		],
		'COMPLETUDE_AUTRE_2' => [
		'name' => 'COMPLETUDE_AUTRE_2',
		'COMPLETUDE_AUTRE_APRES_RECRUTEMENT' => [
		'name' => 'COMPLETUDE_AUTRE_APRES_RECRUTEMENT',
		'type' => 'int',
		'bdd-type' => 'NUMBER',
		'length' => 0,
		@@ -117,42 +117,7 @@ return [
		'position' => 16,
		'commentaire' => NULL,
		],
		'COMPLETUDE_AUTRE_3' => [
		'name' => 'COMPLETUDE_AUTRE_3',
		'type' => 'int',
		'bdd-type' => 'NUMBER',
		'length' => 0,
		'scale' => NULL,
		'precision' => NULL,
		'nullable' => TRUE,
		'default' => '0',
		'position' => 17,
		'commentaire' => NULL,
		],
		'COMPLETUDE_AUTRE_4' => [
		'name' => 'COMPLETUDE_AUTRE_4',
		'type' => 'int',
		'bdd-type' => 'NUMBER',
		'length' => 0,
		'scale' => NULL,
		'precision' => NULL,
		'nullable' => TRUE,
		'default' => '0',
		'position' => 18,
		'commentaire' => NULL,
		],
		'COMPLETUDE_AUTRE_5' => [
		'name' => 'COMPLETUDE_AUTRE_5',
		'type' => 'int',
		'bdd-type' => 'NUMBER',
		'length' => 0,
		'scale' => NULL,
		'precision' => NULL,
		'nullable' => TRUE,
		'default' => '0',
		'position' => 19,
		'commentaire' => NULL,
		],

		'COMPLETUDE_BANQUE' => [
		'name' => 'COMPLETUDE_BANQUE',
		'type' => 'int',

data/ddl/view/V_TBL_DOSSIER.sql

+1 −1

Changes for data/ddl/view/V_TBL_DOSSIER.sql: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ SELECT
		FROM
		intervenant i
		JOIN statut si ON si.id = i.statut_id
		JOIN intervenant_dossier d ON d.intervenant_id = i.id
		LEFT JOIN intervenant_dossier d ON d.intervenant_id = i.id
		AND d.histo_destruction IS NULL
		LEFT JOIN situation_matrimoniale sm ON sm.id = d.situation_matrimoniale_id
		LEFT JOIN pays pn ON pn.id = d.pays_naissance_id

data/ddl_config.php

+5 −2

Changes for data/ddl_config.php: 5 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -43,8 +43,11 @@ return [
		'V_VOL_HORAIRE_ETAT_MULTI',
		'V_VOLUME_HORAIRE_REF_ETAT',
		'V_VOL_HORAIRE_REF_ETAT_MULTI',
		], 'excludes' => [
		'V_TBL_PLAFOND_%', // Les vues plafonds sont générées et non créées à partir de la DDL
		'V_TBL_PIECE_JOINTE',
		],
		'excludes' => [
		'V_TBL_PLAFOND_%',
		// Les vues plafonds sont générées et non créées à partir de la DDL
		],
		],
		'package' => [

front/PieceJointe/ListePiecesJointes.vue

+6 −3

Changes for front/PieceJointe/ListePiecesJointes.vue: 6 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -23,8 +23,8 @@
		<h3>Pièces justificatives</h3>
		</div>
		<div class="card-body">

		<pieceJointe
		v-if="datasPiecesJointes?.privileges"
		v-for="pieceJointe in pieceAvantRecrutement"
		:key="pieceJointe.id"
		:datas="pieceJointe"
		@@ -60,7 +60,8 @@
		<h3>Pièces justificatives complémentaires</h3>
		</div>
		<div class="card-body">
		<pieceJointe

		<PieceJointe
		v-for="pieceJointe in pieceApresRecrutement"
		:key="pieceJointe.id"
		:datas="pieceJointe"
		@@ -78,7 +79,7 @@
		<script setup>

		import {ref, onMounted, computed} from 'vue'
		import pieceJointe from './PieceJointe.vue'
		import PieceJointe from './PieceJointe.vue'

		const props = defineProps(['intervenant']);

		@@ -114,6 +115,8 @@ function getPiecesJointes()

		unicaenVue.axios.get(urlGetPiecesJointes.value).then(response => {
		datasPiecesJointes.value = response.data
		console.log(pieceAvantRecrutement.value);

		}).catch(error => {
		console.error(error)
		})

module/Dossier/src/Assertion/IntervenantDossierAssertion.php

+20 −0

Changes for module/Dossier/src/Assertion/IntervenantDossierAssertion.php: 20 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -226,6 +226,7 @@ class IntervenantDossierAssertion extends AbstractAssertion
		protected function assertEditAutre1(IntervenantDossier $intervenantDossier): bool
		{
		return $this->asserts([
		$this->assertStep($intervenantDossier, 'autre1'),
		$this->authorize->isAllowedPrivilege(Privileges::DOSSIER_CHAMP_AUTRE_1_VISUALISATION),
		$this->authorize->isAllowedPrivilege(Privileges::DOSSIER_CHAMP_AUTRE_1_EDITION),
		]);
		@@ -245,6 +246,7 @@ class IntervenantDossierAssertion extends AbstractAssertion
		protected function assertEditAutre2(IntervenantDossier $intervenantDossier): bool
		{
		return $this->asserts([
		$this->assertStep($intervenantDossier, 'autre2'),
		$this->authorize->isAllowedPrivilege(Privileges::DOSSIER_CHAMP_AUTRE_2_VISUALISATION),
		$this->authorize->isAllowedPrivilege(Privileges::DOSSIER_CHAMP_AUTRE_2_EDITION),
		]);
		@@ -264,6 +266,7 @@ class IntervenantDossierAssertion extends AbstractAssertion
		protected function assertEditAutre3(IntervenantDossier $intervenantDossier): bool
		{
		return $this->asserts([
		$this->assertStep($intervenantDossier, 'autre3'),
		$this->authorize->isAllowedPrivilege(Privileges::DOSSIER_CHAMP_AUTRE_3_VISUALISATION),
		$this->authorize->isAllowedPrivilege(Privileges::DOSSIER_CHAMP_AUTRE_3_EDITION),
		]);
		@@ -283,6 +286,7 @@ class IntervenantDossierAssertion extends AbstractAssertion
		protected function assertEditAutre4(IntervenantDossier $intervenantDossier): bool
		{
		return $this->asserts([
		$this->assertStep($intervenantDossier, 'autre4'),
		$this->authorize->isAllowedPrivilege(Privileges::DOSSIER_CHAMP_AUTRE_4_VISUALISATION),
		$this->authorize->isAllowedPrivilege(Privileges::DOSSIER_CHAMP_AUTRE_4_EDITION),
		]);
		@@ -302,6 +306,7 @@ class IntervenantDossierAssertion extends AbstractAssertion
		protected function assertEditAutre5(IntervenantDossier $intervenantDossier): bool
		{
		return $this->asserts([
		$this->assertStep($intervenantDossier, 'autre5'),
		$this->authorize->isAllowedPrivilege(Privileges::DOSSIER_CHAMP_AUTRE_5_VISUALISATION),
		$this->authorize->isAllowedPrivilege(Privileges::DOSSIER_CHAMP_AUTRE_5_EDITION),
		]);
		@@ -486,6 +491,21 @@ class IntervenantDossierAssertion extends AbstractAssertion
		case 'employeur':
		$step = $statut->getDossierEmployeur();
		break;
		case 'autre1':
		$step = $statut->getDossierAutre1();
		break;
		case 'autre2':
		$step = $statut->getDossierAutre2();
		break;
		case 'autre3':
		$step = $statut->getDossierAutre3();
		break;
		case 'autre4':
		$step = $statut->getDossierAutre4();
		break;
		case 'autre5':
		$step = $statut->getDossierAutre5();
		break;
		}

		if (($step == 1 && !empty($validation)) \|\| ($step == 2 && !empty($validationComplementaire))) {