From 5b257d06b6b66bb402bd6a9e6a6937cf274d2742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20S?= <85285770+FredericNumericite@users.noreply.github.com> Date: Thu, 22 Jun 2023 15:10:25 +0200 Subject: [PATCH 1/5] fix: remove checks for old remunerations (#569) * feat: remove checks for old remunerations * feat: filter rem --- formulaire/src/lib/helpers.ts | 3 --- src/components/Dossier.tsx | 6 ++++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/formulaire/src/lib/helpers.ts b/formulaire/src/lib/helpers.ts index 5c0cb32fc..acfdf294f 100644 --- a/formulaire/src/lib/helpers.ts +++ b/formulaire/src/lib/helpers.ts @@ -81,9 +81,6 @@ const CHECKS = [ {label : 'Nombre de jours de travail', code: 'nombreJours'}, {label : 'Période de travail', code: 'periodeTravail'}, {label : 'Temps et lieu de travail', code: 'contexteTravail'}, - {label : 'Montant du cachet', code: 'montantCachet'}, - {label : 'Nombre de cachets', code: 'nombreCachets'}, - {label : 'Rémunération totale', code: 'remunerationTotale'}, ], mandatory_files: [ {label : 'Livret de famille', code : 'LIVRET_FAMILLE'}, diff --git a/src/components/Dossier.tsx b/src/components/Dossier.tsx index f69c216f4..0b4b576c5 100644 --- a/src/components/Dossier.tsx +++ b/src/components/Dossier.tsx @@ -68,7 +68,6 @@ const Dossier: React.FC = ({ dossierId, dataLinks }) => { enfantIds as string[] ); setRemunerations(resRemuneration); - console.log("Remunerations: ", remunerations); } }; @@ -463,6 +462,9 @@ const Dossier: React.FC = ({ dossierId, dataLinks }) => { enfant.dateNaissance )}) - Personnage: ${enfant.nomPersonnage}`; + const remunerationsEnfant = remunerations.filter( + (rem) => rem.enfantId?.toString() === enfant.externalId + ); return (
= ({ dossierId, dataLinks }) => { dossier={dossier} comments={comments} actionComments={processComment} - remunerations={remunerations} + remunerations={remunerationsEnfant} />
From 1cec3f75a6ca24b6dd79671056c98dcf09e97155 Mon Sep 17 00:00:00 2001 From: Social Groovy Bot <45039513+SocialGroovyBot@users.noreply.github.com> Date: Thu, 22 Jun 2023 13:11:13 +0000 Subject: [PATCH 2/5] chore(release): 1.84.5 --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f187d14f..59d94fc42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.84.5](https://github.com/SocialGouv/enfants-du-spectacle/compare/v1.84.4...v1.84.5) (2023-06-22) + + +### Bug Fixes + +* remove checks for old remunerations ([#569](https://github.com/SocialGouv/enfants-du-spectacle/issues/569)) ([5b257d0](https://github.com/SocialGouv/enfants-du-spectacle/commit/5b257d06b6b66bb402bd6a9e6a6937cf274d2742)) + ## [1.84.4](https://github.com/SocialGouv/enfants-du-spectacle/compare/v1.84.3...v1.84.4) (2023-06-21) diff --git a/package.json b/package.json index 0c7e22d1b..022f7258d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "enfants-du-spectacle", - "version": "1.84.4", + "version": "1.84.5", "private": true, "release": { "branches": [ From 97b3f29800def2928383c9e9b58323fddfa64b75 Mon Sep 17 00:00:00 2001 From: YoannNumericite <85347776+YoannNumericite@users.noreply.github.com> Date: Fri, 30 Jun 2023 12:15:47 +0200 Subject: [PATCH 3/5] fix: change label depot button (#570) --- formulaire/src/components/Dossier/DossierForm.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/formulaire/src/components/Dossier/DossierForm.tsx b/formulaire/src/components/Dossier/DossierForm.tsx index 011112f61..daaf53673 100644 --- a/formulaire/src/components/Dossier/DossierForm.tsx +++ b/formulaire/src/components/Dossier/DossierForm.tsx @@ -309,9 +309,9 @@ const DossierForm: React.FC = ({ dossier, docs, comments }) => {

- Votre dossier est automatiquement enregistré.
- En cliquant sur le bouton Déposer, vous transmettrez le dossier - aux services d'instruction. + Votre dossier est automatiquement enregistré sur votre interface.
+ Le bouton “Déposer” vous permet de transmettre votre dossier aux services d’instruction de la DRIEETS avant la date limite de dépôt et de transmettre toutes les mises à jour que vous seriez amené à faire par la suite.
+ Merci de cliquer sur “Déposer” dès lors que vous souhaitez transmettre des mises à jour de votre dossier aux services d’instruction.

From 48a457d2ef8dc6d2b5d2815f53564862d270bc23 Mon Sep 17 00:00:00 2001 From: Social Groovy Bot <45039513+SocialGroovyBot@users.noreply.github.com> Date: Fri, 30 Jun 2023 10:16:33 +0000 Subject: [PATCH 4/5] chore(release): 1.84.6 --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59d94fc42..39460a8bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.84.6](https://github.com/SocialGouv/enfants-du-spectacle/compare/v1.84.5...v1.84.6) (2023-06-30) + + +### Bug Fixes + +* change label depot button ([#570](https://github.com/SocialGouv/enfants-du-spectacle/issues/570)) ([97b3f29](https://github.com/SocialGouv/enfants-du-spectacle/commit/97b3f29800def2928383c9e9b58323fddfa64b75)) + ## [1.84.5](https://github.com/SocialGouv/enfants-du-spectacle/compare/v1.84.4...v1.84.5) (2023-06-22) diff --git a/package.json b/package.json index 022f7258d..c4df9cd78 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "enfants-du-spectacle", - "version": "1.84.5", + "version": "1.84.6", "private": true, "release": { "branches": [ From 709417c2a1d468ce60c1a5f26bde11daec68a60c Mon Sep 17 00:00:00 2001 From: devthejo Date: Mon, 4 Sep 2023 11:03:31 +0200 Subject: [PATCH 5/5] fix: increase startupProbe failureThreshold --- .kontinuous/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.kontinuous/values.yaml b/.kontinuous/values.yaml index 9b5484627..de86c2fca 100644 --- a/.kontinuous/values.yaml +++ b/.kontinuous/values.yaml @@ -21,6 +21,9 @@ app: name: app-configmap probesPath: /api/healthz replicas: 1 + startupProbe: + failureThreshold: 48 + periodSeconds: 5 form: ~chart: app