From 130a29b34d4a0fda18df74d1aec86056d7967ac2 Mon Sep 17 00:00:00 2001 From: Imen Chermiti <127976664+ImenOuidou@users.noreply.github.com> Date: Thu, 30 Nov 2023 10:21:21 +0100 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20change=20apprentissage=20source=20t?= =?UTF-8?q?able=20&=20intervertir=20adresse=20etablis=E2=80=A6=20(#307)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: change apprentissage source table & intervertir adresse etablissement * feat: ameliorate fiche entreprise/etablissement * feat: change apprentissage source table & intervertir adresse etablissement --- .../DataSheets/Sections/Establishment/Header/HeaderInfoBloc.jsx | 2 +- .../Sections/Establishment/Helps/Subcategory/Apprentissage.js | 2 +- src/client/src/components/DataSheets/dataSheets.scss | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/src/components/DataSheets/Sections/Establishment/Header/HeaderInfoBloc.jsx b/src/client/src/components/DataSheets/Sections/Establishment/Header/HeaderInfoBloc.jsx index db96aac6..6148498a 100644 --- a/src/client/src/components/DataSheets/Sections/Establishment/Header/HeaderInfoBloc.jsx +++ b/src/client/src/components/DataSheets/Sections/Establishment/Header/HeaderInfoBloc.jsx @@ -105,8 +105,8 @@ function HeaderInfoBloc({ - {code} {adresse ? adresse : ""} + {code} )} {enterprise && ( diff --git a/src/client/src/components/DataSheets/Sections/Establishment/Helps/Subcategory/Apprentissage.js b/src/client/src/components/DataSheets/Sections/Establishment/Helps/Subcategory/Apprentissage.js index d9fe1f5f..ea13b1aa 100644 --- a/src/client/src/components/DataSheets/Sections/Establishment/Helps/Subcategory/Apprentissage.js +++ b/src/client/src/components/DataSheets/Sections/Establishment/Helps/Subcategory/Apprentissage.js @@ -39,7 +39,7 @@ const Apprentissage = ({ siret }) => { name={`Embauche en contrat d'apprentissage depuis ${minYear}`} value={getSignesTotalFromSignes(apprentissagesSignes)} columnClasses={["is-7", "is-5"]} - sourceSi="Ari@ne" + sourceSi="DECA" className="has-no-border" /> {data?.length > 0 && ( diff --git a/src/client/src/components/DataSheets/dataSheets.scss b/src/client/src/components/DataSheets/dataSheets.scss index 8104230f..d4c3fa06 100644 --- a/src/client/src/components/DataSheets/dataSheets.scss +++ b/src/client/src/components/DataSheets/dataSheets.scss @@ -212,7 +212,6 @@ } &__bloc_section { scroll-margin: $spacing-6; - cursor: pointer; .data { @media print { display: flex !important; @@ -251,6 +250,7 @@ display: flex; align-items: center; justify-content: space-between; + cursor: pointer; .icon { background-color: transparent; border: none; From 07996bad5bd71312019021b25dadd49316bb7b8f Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 30 Nov 2023 09:21:58 +0000 Subject: [PATCH 2/2] chore(release): version 27.88.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # [27.88.0](https://github.com/SocialGouv/fce/compare/v27.87.1...v27.88.0) (2023-11-30) ### Features * change apprentissage source table & intervertir adresse etablis… ([#307](https://github.com/SocialGouv/fce/issues/307)) ([130a29b](https://github.com/SocialGouv/fce/commit/130a29b34d4a0fda18df74d1aec86056d7967ac2)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 021eae8b..1ff38ff7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [27.88.0](https://github.com/SocialGouv/fce/compare/v27.87.1...v27.88.0) (2023-11-30) + + +### Features + +* change apprentissage source table & intervertir adresse etablis… ([#307](https://github.com/SocialGouv/fce/issues/307)) ([130a29b](https://github.com/SocialGouv/fce/commit/130a29b34d4a0fda18df74d1aec86056d7967ac2)) + ## [27.87.1](https://github.com/SocialGouv/fce/compare/v27.87.0...v27.87.1) (2023-11-29) diff --git a/package.json b/package.json index 0227c96b..8df3c897 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fce", - "version": "27.87.1", + "version": "27.88.0", "description": "", "author": "commit42", "private": true,