Feat : add establishment section Appels d'offres (#340)

* chore: add pgadmin * chore: numeric user * chore: secret * chore: auth * feat: add establishment section Appels d'offres * feat: Ajout du nom et du departement de l acheteur * feat: add marche public * fix: export xlsx --------- Co-authored-by: Gary van Woerkens <[email protected]> Co-authored-by: Matéo Mévollon <[email protected]>
SocialGouv · Oct 17, 2024 · 6fb2557 · 6fb2557
1 parent c07dd9f
commit 6fb2557
Show file tree

Hide file tree

Showing 28 changed files with 1,030 additions and 47 deletions.
diff --git a/src/client/package.json b/src/client/package.json
@@ -48,6 +48,7 @@
     "react-scrollspy": "^3.4.2",
     "react-select": "^5.8.0",
     "react-toggle": "^4.1.1",
+    "react-top-loading-bar": "^2.3.1",
     "react-transition-group": "^4.4.1",
     "redux": "^4.0.5",
     "redux-persist": "^6.0.0",
@@ -56,6 +57,7 @@
     "sass": "^1.79.1",
     "smoothscroll-polyfill": "^0.4.3",
     "ua-parser-js": "^0.7.21",
+    "xlsx": "^0.18.5",
     "zod": "^3.13.4"
   },
   "scripts": {

diff --git a/src/client/src/components/App/App.js b/src/client/src/components/App/App.js
@@ -26,6 +26,7 @@ import Search from "../../containers/Search";
 import SetMatomo from "../../helpers/Matomo/SetMatomo.js";
 import Auth from "../../services/Auth/Auth.js";
 import Config from "../../services/Config";
+import { useIsNotFound } from "../../services/Elastic/elastic.js";
 import { apolloClient } from "../../services/GraphQL/GraphQL";
 import CustomLayout from "../../services/PrivateRoute/CustomLayout.jsx";
 import configureStore from "../../services/Store";
@@ -259,10 +260,18 @@ const App = () => {
 const EnterpriseWrapper = () => {
   const { siren } = useParams();
   const siret = getSirenFromSiret(siren);
+  const { isNotFound, loading } = useIsNotFound(siret, siren);
+
   return (
     <IEChecker>
       <Layout>
-        <CustomLayout isEntrepriseDisplayed siren={siren} siret={siret}>
+        <CustomLayout
+          isNotFound={isNotFound}
+          isEntrepriseDisplayed
+          siren={siren}
+          siret={siret}
+          loading={loading}
+        >
           <Enterprise siren={siren} />
         </CustomLayout>
       </Layout>
@@ -273,10 +282,18 @@ const EnterpriseWrapper = () => {
 const EstablishmentWrapper = () => {
   const { siret } = useParams();
   const siren = getSirenFromSiret(siret);
+  const { isNotFound, loading } = useIsNotFound(siret, siren);
+
   return (
     <IEChecker>
       <Layout>
-        <CustomLayout isEstablishmentDisplayed siren={siren} siret={siret}>
+        <CustomLayout
+          isNotFound={isNotFound}
+          isEstablishmentDisplayed
+          siren={siren}
+          siret={siret}
+          loading={loading}
+        >
           <LegacyEtablissement siret={siret} />
         </CustomLayout>
       </Layout>
@@ -286,10 +303,17 @@ const EstablishmentWrapper = () => {
 
 const ListEstablishmentsWrapper = () => {
   const { siren } = useParams();
+  const { isNotFound, loading } = useIsNotFound("", siren);
+
   return (
     <IEChecker>
       <Layout>
-        <CustomLayout isEstablishmentsDisplayed siren={siren}>
+        <CustomLayout
+          isNotFound={isNotFound}
+          isEstablishmentsDisplayed
+          siren={siren}
+          loading={loading}
+        >
           <ListEtablissements siren={siren} />
         </CustomLayout>
       </Layout>

diff --git a/src/client/src/components/App/Layout.js b/src/client/src/components/App/Layout.js
@@ -13,12 +13,12 @@ const Layout = ({
   hasSharedButton = false,
   children,
   displayMessage = false,
+  isNotFound = false,
 }) => {
   const isActiveMaintenanceMode = Config.get("maintenanceMode");
-
   return (
     <>
-      {hasLandingHeader ? (
+      {!isNotFound && hasLandingHeader ? (
         <Header hasSharedButton={hasSharedButton} />
       ) : (
         <>
@@ -42,6 +42,7 @@ Layout.propTypes = {
   displayMessage: PropTypes.bool,
   hasLandingHeader: PropTypes.bool,
   hasSharedButton: PropTypes.bool,
+  isNotFound: PropTypes.bool,
 };
 
 export default Layout;
diff --git a/src/client/src/components/App/app.scss b/src/client/src/components/App/app.scss
@@ -67,6 +67,10 @@ a {
         &--nowrap a {
             white-space: nowrap;
         }
+        &--sm-cell {
+            font-size: 0.5rem !important;
+            align-items: center !important;
+        }
     }
 }
 

diff --git a/src/client/src/components/DataSheets/NotFound/NotFound.jsx b/src/client/src/components/DataSheets/NotFound/NotFound.jsx
@@ -0,0 +1,17 @@
+import "./notFound.scss";
+
+import React from "react";
+
+const NotFound = () => {
+  return (
+    <section className="data-sheet container is-fluid">
+      <div className="">
+        <div className="notFound">
+          <div>0 entreprise correspond à votre requête</div>
+        </div>
+      </div>
+    </section>
+  );
+};
+
+export default NotFound;
diff --git a/src/client/src/components/DataSheets/NotFound/notFound.scss b/src/client/src/components/DataSheets/NotFound/notFound.scss
@@ -0,0 +1,7 @@
+.notFound {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 22px;
+    font-weight: bold;
+}
diff --git a/src/client/src/components/DataSheets/Sections/Establishment/Establishment.js b/src/client/src/components/DataSheets/Sections/Establishment/Establishment.js
@@ -14,6 +14,7 @@ import Controles from "./Direccte/Controles";
 import Header from "./Header";
 import Helps from "./Helps";
 import ListEstablishment from "./ListEtablishments/ListEstablishment.jsx";
+import MarchesPublic from "./MarchesPublic/MarchesPublic.jsx";
 import Muteco from "./Muteco";
 import Relationship from "./Relationship";
 
@@ -37,9 +38,8 @@ const Establishment = ({ siret }) => {
         <Muteco siret={siret} />
         <Helps siret={siret} />
         <Agrements siret={siret} />
-        {siren && (
-          <ListEstablishment siren={siren} isEstablishmentDisplayed={true} />
-        )}{" "}
+        <MarchesPublic siret={siret} />
+        <ListEstablishment siren={siren} isEstablishmentDisplayed={true} />
       </div>
       <ScrollToTopButton />
     </div>