From 6e4c86eec9cb2c5981359beb285d8119896756d9 Mon Sep 17 00:00:00 2001 From: Imen Chermiti <127976664+ImenOuidou@users.noreply.github.com> Date: Thu, 8 Aug 2024 15:55:23 +0200 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20Ajout=20des=20dates=20de=20contr?= =?UTF-8?q?=C3=B4les=20du=20p=C3=B4le=20C=20au=20niveau=20de=20la=20fiche?= =?UTF-8?q?=20=C3=A9tablissement=20(#342)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: add pgadmin * chore: fix key * chore: missing keys * chore: typo * chore: numeric user * chore: secret * chore: containerPort * chore: auth * chore: probespath * feat: add pole-c data --------- Co-authored-by: Gary van Woerkens Co-authored-by: Matéo Mévollon --- .../Enterprise/Direccte/Interactions.gql.js | 8 +++---- .../Establishment/Dashboard/Dashboard.gql.js | 6 ++--- .../Establishment/Direccte/Controles.gql.js | 22 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/client/src/components/DataSheets/Sections/Enterprise/Direccte/Interactions.gql.js b/src/client/src/components/DataSheets/Sections/Enterprise/Direccte/Interactions.gql.js index be30d166c..f1ce86295 100644 --- a/src/client/src/components/DataSheets/Sections/Enterprise/Direccte/Interactions.gql.js +++ b/src/client/src/components/DataSheets/Sections/Enterprise/Direccte/Interactions.gql.js @@ -36,10 +36,10 @@ const interactionsQuery = gql` libellecommune2etablissement } } - interactions_C: fce_interactions_pole_c(where: { siren: { _eq: $siren } }) { - siret - date - unite + interactions_C: fce_interactions_pole_c(where: { SIRNE: { _eq: $siren } }) { + siret: SIRET + date: DATE_DERNIER_CONTROLE + unite: LIB_UC etablissement: interactions_pole_c_siret { etatadministratifetablissement siret diff --git a/src/client/src/components/DataSheets/Sections/Establishment/Dashboard/Dashboard.gql.js b/src/client/src/components/DataSheets/Sections/Establishment/Dashboard/Dashboard.gql.js index 290f3bb4c..059dbe761 100644 --- a/src/client/src/components/DataSheets/Sections/Establishment/Dashboard/Dashboard.gql.js +++ b/src/client/src/components/DataSheets/Sections/Establishment/Dashboard/Dashboard.gql.js @@ -43,11 +43,11 @@ const dashboardQuery = gql` siret } fce_interactions_pole_c( - where: { siret: { _eq: $siret } } - order_by: { mois: desc } + where: { SIRET: { _eq: $siret } } + order_by: { DATE_DERNIER_CONTROLE: desc } limit: 1 ) { - date + date: DATE_DERNIER_CONTROLE } fce_interactions_pole_t( where: { siret: { _eq: $siret } } diff --git a/src/client/src/components/DataSheets/Sections/Establishment/Direccte/Controles.gql.js b/src/client/src/components/DataSheets/Sections/Establishment/Direccte/Controles.gql.js index 59c974c73..107dec426 100644 --- a/src/client/src/components/DataSheets/Sections/Establishment/Direccte/Controles.gql.js +++ b/src/client/src/components/DataSheets/Sections/Establishment/Direccte/Controles.gql.js @@ -6,20 +6,20 @@ import { mapQueryResult } from "../../../../../utils/graphql/graphql"; import { // normalizeInteractions3E, // normalizeInteractions3ESRC, - // normalizeInteractionsC, + normalizeInteractionsC, normalizeInteractionsT, } from "../../../../../utils/interactions/interactions"; const controlesQuery = gql` query getControles($siret: String!) { - # fce_interactions_pole_c(where: { siret: { _eq: $siret } }) { - # unite - # siret - # date - # interactions_pole_c_siret { - # denominationusuelleetablissement - # } - # } + fce_interactions_pole_c(where: { SIRET: { _eq: $siret } }) { + siret: SIRET + date: DATE_DERNIER_CONTROLE + unite: LIB_UC + interactions_pole_c_siret { + denominationusuelleetablissement + } + } fce_interactions_pole_t(where: { siret: { _eq: $siret } }) { date intervenant @@ -49,14 +49,14 @@ const controlesQuery = gql` const normalizeResponsesToInteraction = ({ // fce_interactions_pole_3e, // fce_interactions_pole_3e_src, - // fce_interactions_pole_c, + fce_interactions_pole_c, fce_interactions_pole_t, }) => ({ // interactions_pole_3e: normalizeInteractions3E(fce_interactions_pole_3e), // interactions_pole_3e_src: normalizeInteractions3ESRC( // fce_interactions_pole_3e_src // ), - // interactions_pole_c: normalizeInteractionsC(fce_interactions_pole_c), + interactions_pole_c: normalizeInteractionsC(fce_interactions_pole_c), interactions_pole_t: normalizeInteractionsT(fce_interactions_pole_t), }); From 490fe7b6f171f1fbd39259df85002593dd062bdc Mon Sep 17 00:00:00 2001 From: Social Groovy Bot <45039513+SocialGroovyBot@users.noreply.github.com> Date: Thu, 8 Aug 2024 13:55:50 +0000 Subject: [PATCH 2/5] chore(release): version 27.102.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # [27.102.0](https://github.com/SocialGouv/fce/compare/v27.101.7...v27.102.0) (2024-08-08) ### Features * Ajout des dates de contrôles du pôle C au niveau de la fiche établissement ([#342](https://github.com/SocialGouv/fce/issues/342)) ([6e4c86e](https://github.com/SocialGouv/fce/commit/6e4c86eec9cb2c5981359beb285d8119896756d9)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85a306bd4..b9415498e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [27.102.0](https://github.com/SocialGouv/fce/compare/v27.101.7...v27.102.0) (2024-08-08) + + +### Features + +* Ajout des dates de contrôles du pôle C au niveau de la fiche établissement ([#342](https://github.com/SocialGouv/fce/issues/342)) ([6e4c86e](https://github.com/SocialGouv/fce/commit/6e4c86eec9cb2c5981359beb285d8119896756d9)) + ## [27.101.7](https://github.com/SocialGouv/fce/compare/v27.101.6...v27.101.7) (2024-07-04) diff --git a/package.json b/package.json index ffe92fec1..2d04bf0c1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fce", - "version": "27.101.7", + "version": "27.102.0", "description": "", "author": "commit42", "private": true, From c97e94702c04e6dd23d8dd91cd54a5ef990fe06c Mon Sep 17 00:00:00 2001 From: Imen Chermiti <127976664+ImenOuidou@users.noreply.github.com> Date: Fri, 9 Aug 2024 16:30:07 +0200 Subject: [PATCH 3/5] feat: add DDPP for home page (#352) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: add pgadmin * chore: fix key * chore: missing keys * chore: typo * chore: numeric user * chore: secret * chore: containerPort * chore: auth * chore: probespath * feat: add DDPP to home page --------- Co-authored-by: Gary van Woerkens Co-authored-by: Matéo Mévollon --- src/client/src/components/HomePage/homePage.scss | 2 +- src/client/src/components/HomePage/sections.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/src/components/HomePage/homePage.scss b/src/client/src/components/HomePage/homePage.scss index 1ca8cf9bc..8eca913d3 100644 --- a/src/client/src/components/HomePage/homePage.scss +++ b/src/client/src/components/HomePage/homePage.scss @@ -78,7 +78,7 @@ &__action-links-container { flex-wrap: wrap; background-color: transparent; - padding: $spacing-2 $spacing-6; + padding: $spacing-2 $spacing-4; font-family: $marianne; @media (max-width: 600px) { padding: $spacing-2 !important; diff --git a/src/client/src/components/HomePage/sections.js b/src/client/src/components/HomePage/sections.js index 205d82b14..7d3345c2a 100644 --- a/src/client/src/components/HomePage/sections.js +++ b/src/client/src/components/HomePage/sections.js @@ -99,7 +99,7 @@ export const Summary = () => (
- Je suis un agent en DREETS ou en DDETS ​ + Je suis un agent en DREETS, en DDETS ou en DDPP{" "}
@@ -120,7 +120,7 @@ export const Summary = () => (
- Je suis en agent en DDETS, nouvel utilisateur de FCE​ + Je suis en agent en DDETS ou en DDPP, nouvel utilisateur de FCE
From 8a722e25fdf68c7fce898d608ecbfa0825d1826b Mon Sep 17 00:00:00 2001 From: Social Groovy Bot <45039513+SocialGroovyBot@users.noreply.github.com> Date: Fri, 9 Aug 2024 14:30:34 +0000 Subject: [PATCH 4/5] chore(release): version 27.103.0 # [27.103.0](https://github.com/SocialGouv/fce/compare/v27.102.0...v27.103.0) (2024-08-09) ### Features * add DDPP for home page ([#352](https://github.com/SocialGouv/fce/issues/352)) ([c97e947](https://github.com/SocialGouv/fce/commit/c97e94702c04e6dd23d8dd91cd54a5ef990fe06c)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9415498e..b29e2922c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [27.103.0](https://github.com/SocialGouv/fce/compare/v27.102.0...v27.103.0) (2024-08-09) + + +### Features + +* add DDPP for home page ([#352](https://github.com/SocialGouv/fce/issues/352)) ([c97e947](https://github.com/SocialGouv/fce/commit/c97e94702c04e6dd23d8dd91cd54a5ef990fe06c)) + # [27.102.0](https://github.com/SocialGouv/fce/compare/v27.101.7...v27.102.0) (2024-08-08) diff --git a/package.json b/package.json index 2d04bf0c1..32b577a2a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fce", - "version": "27.102.0", + "version": "27.103.0", "description": "", "author": "commit42", "private": true, From b0d69784ae71f3b0b8bdad8dc9d8330784595af0 Mon Sep 17 00:00:00 2001 From: Imen Chermiti <127976664+ImenOuidou@users.noreply.github.com> Date: Tue, 20 Aug 2024 15:31:01 +0200 Subject: [PATCH 5/5] feat : fix pole c source (#353) --- src/client/src/utils/interactions/interactions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/src/utils/interactions/interactions.js b/src/client/src/utils/interactions/interactions.js index ac525483f..ce2bd2d4b 100644 --- a/src/client/src/utils/interactions/interactions.js +++ b/src/client/src/utils/interactions/interactions.js @@ -12,7 +12,7 @@ const interactionsSources = { interactions_pole_3e: "EOS", interactions_pole_3e_src: "MDF", interactions_pole_c: "SORA", - interactions_pole_t: "Wiki'T", + interactions_pole_t: "interactions_pole_t", }; export const getInteractionSource = (pole) => {