Merge branch 'master' of github.com:SocialGouv/fce into feat-n8n-mapp…

…ing-file
SocialGouv · Nov 30, 2023 · febb787 · febb787
2 parents ad723d4 + 07996ba
commit febb787
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git 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
@@ -1,6 +1,6 @@
 {
   "name": "fce",
-  "version": "27.87.1",
+  "version": "27.88.0",
   "description": "",
   "author": "commit42",
   "private": true,

diff --git 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({
             <span className="data-sheet-header-address-icon">
               <BuildingIcon />
             </span>
-            <span className="is-bold"> {code}</span>
             <span className=" has-list-style">{adresse ? adresse : ""}</span>
+            <span className="is-bold"> {code}</span>
           </div>
         )}
         {enterprise && (

diff --git a/...lient/src/components/DataSheets/Sections/Establishment/Helps/Subcategory/Apprentissage.js b/...lient/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
@@ -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;