Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into 1101-factorisation
Browse files Browse the repository at this point in the history
# Conflicts:
#	app/(header-default)/documents/[slug]/_components/actes/actes-association.tsx
#	app/(header-default)/documents/[slug]/_components/actes/actes-rne.tsx
#	app/(header-default)/documents/[slug]/_components/actes/index.tsx
#	app/(header-default)/documents/[slug]/page.tsx
#	app/(header-default)/donnees-financieres/[slug]/page.tsx
#	components/finances-section/association/index.tsx
  • Loading branch information
johangirod committed Jun 24, 2024
2 parents 5c02e62 + 2eaf425 commit a37d007
Show file tree
Hide file tree
Showing 39 changed files with 3,661 additions and 2,301 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// import { DataSectionClient } from '#components/section/data-section';
// import { EAdministration } from '#models/administrations/EAdministration';
// import { IUniteLegale } from '#models/core/types';
// import { useAPIRouteData } from 'hooks/fetch/use-API-route-data';

// const NoDocument = () => (
// <>Aucun document n’a été retrouvé pour cette association.</>
Expand All @@ -12,7 +11,7 @@
// export const AgentDocumentsAssociation: React.FC<{
// uniteLegale: IUniteLegale;
// }> = ({ uniteLegale }) => {
// const documents = useAPIRouteData('espace-agent/rne/documents', uniteLegale.siren, session);
// const documents = useFetchRNEDocuments(uniteLegale);

// return (
// <DataSectionClient
Expand All @@ -32,7 +31,7 @@
// Cette entreprise possède {documents.actes.length} document(s) au
// RNE. Chaque document peut contenir un ou plusieurs actes :
// </p>
// {documents.actes.length >= 5 ? (
// {/* {documents.actes.length >= 5 ? (
// <ShowMore
// label={`Voir les ${
// documents.actes.length - 5
Expand All @@ -42,7 +41,7 @@
// </ShowMore>
// ) : (
// <DocumentsTable actes={documents.actes} />
// )}
// )} */}
// </>
// )
// }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ import { ISession } from '#models/user/session';
import { formatDateLong } from '#utils/helpers';
import { useAPIRouteData } from 'hooks/fetch/use-API-route-data';

const NoDocument = () => (
<>Aucun document n’a été retrouvé dans le RNE pour cette entreprise.</>
);

export const AgentActesRNE: React.FC<{
uniteLegale: IUniteLegale;
session: ISession | null;
Expand Down
3 changes: 1 addition & 2 deletions app/(header-default)/donnees-financieres/[slug]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,10 @@ const FinancePage = async (props: AppRouterProps) => {
uniteLegale={uniteLegale}
session={session}
/>
{/* We use to have finances for association but data disappeared from open data API. Code still exists in <FinancesAssociationSection /> */}
{isAssociation(uniteLegale) ? (
<FinancesAssociationSection
uniteLegale={uniteLegale}
session={session}
uniteLegale={uniteLegale}
/>
) : (
<>
Expand Down
2 changes: 1 addition & 1 deletion app/(header-without-search)/lp/agent-public/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ const LandingPageAgent = (props: AppRouterProps) => {
)}
</div>
<p>
<a href="/administrations">
<a href="/administration">
→ Voir la liste complète des administrations partenaires
</a>
</p>
Expand Down
17 changes: 17 additions & 0 deletions app/not-found.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { ErrorNotFoundExplanations } from '#components/error-explanations';
import Footer from '#components/footer';
import { HeaderServer } from '#components/header/header-server';
import QuestionOrFeedback from './_component/question-or-feedback';

export default function NotFound() {
return (
<>
<HeaderServer useSearchBar={true} useAgentCTA={true} />
<main className="fr-container">
<ErrorNotFoundExplanations />
</main>
<QuestionOrFeedback session={null} />
<Footer />
</>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"denomination": "",
"nic": "00015",
"dateCreation": "2018-05-06",
"dateDerniereMiseAJour": "2022-10-31T09:00:33",
"dateDerniereMiseAJour": "2024-06-19T09:16:18.688Z",
"dateMiseAJourInsee": "2024-03-30T08:06:53.621",
"dateDebutActivite": "",
"dateFermeture": "2020-09-01",
"adresse": "RED NEEDLES, 17 RUE DE FRANCEVILLE, 93220 GAGNY",
Expand Down Expand Up @@ -56,7 +57,8 @@
"denomination": "",
"nic": "00015",
"dateCreation": "2018-05-06",
"dateDerniereMiseAJour": "2022-10-31T09:00:33",
"dateDerniereMiseAJour": "2024-06-19T09:16:18.688Z",
"dateMiseAJourInsee": "2024-03-30T08:06:53.621",
"dateDebutActivite": "",
"dateFermeture": "2020-09-01",
"adresse": "RED NEEDLES, 17 RUE DE FRANCEVILLE, 93220 GAGNY",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@
"denomination": "",
"nic": "00010",
"dateCreation": "2022-01-01",
"dateDerniereMiseAJour": "2022-07-13T10:40:59",
"dateDerniereMiseAJour": "2024-06-19T09:16:18.650Z",
"dateMiseAJourInsee": "2024-03-29T23:18:52.426",
"dateDebutActivite": "",
"dateFermeture": null,
"adresse": "10 RUE DE PENTHIEVRE, 75008 PARIS 8",
"adressePostale": "10 RUE DE PENTHIEVRE, 75008 PARIS 8",
"adresse": "10 RUE DE PENTHIEVRE, 75008 PARIS",
"adressePostale": "10 RUE DE PENTHIEVRE, 75008 PARIS",
"codePostal": "75008",
"commune": "PARIS 8",
"commune": "PARIS",
"activitePrincipale": "70.21Z",
"libelleActivitePrincipale": "Conseil en relations publiques et communication",
"trancheEffectif": null,
Expand Down Expand Up @@ -54,13 +55,14 @@
"denomination": "",
"nic": "00010",
"dateCreation": "2022-01-01",
"dateDerniereMiseAJour": "2022-07-13T10:40:59",
"dateDerniereMiseAJour": "2024-06-19T09:16:18.650Z",
"dateMiseAJourInsee": "2024-03-29T23:18:52.426",
"dateDebutActivite": "",
"dateFermeture": null,
"adresse": "10 RUE DE PENTHIEVRE, 75008 PARIS 8",
"adressePostale": "10 RUE DE PENTHIEVRE, 75008 PARIS 8",
"adresse": "10 RUE DE PENTHIEVRE, 75008 PARIS",
"adressePostale": "10 RUE DE PENTHIEVRE, 75008 PARIS",
"codePostal": "75008",
"commune": "PARIS 8",
"commune": "PARIS",
"activitePrincipale": "70.21Z",
"libelleActivitePrincipale": "Conseil en relations publiques et communication",
"trancheEffectif": null,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"args": ["DIRECTION INTERMINISTERIELLE DU NUMERIQUE (DINUM)"],
"args": [
"DIRECTION INTERMINISTERIELLE DU NUMERIQUE (DINUM)"
],
"result": {
"affectationPersonne": [
{
Expand Down Expand Up @@ -79,8 +81,16 @@
"mission": "La Direction interministérielle du numérique (DINUM) accompagne les ministères dans leur transformation numérique, conseille le gouvernement et développe des services et ressources partagées comme le réseau interministériel de l’État, FranceConnect, data.gouv.fr ou api.gouv.fr. Elle pilote, avec l’appui des ministères, le programme Tech.gouv d’accélération de la transformation numérique du service public. Créée par le décret du 25 octobre 2019, la DINUM a pris la suite de la Direction interministérielle du numérique et du système d’information et de communication de l’État (DINSIC).",
"formulaireContact": "https://www.numerique.gouv.fr/contact/",
"adressePostale": "75334 Paris Cedex 07",
"typeOrganisme": "Administration centrale (ou ministère)",
"typeOrganisme": "Administration centrale (ou Ministère)",
"nom": "Direction interministérielle du numérique (DINUM)",
"subServicesId": [
"da23723e-a4aa-4fad-8619-2e16d5e41b90",
"c21fa08e-f09e-4312-a6d8-400e812454c4",
"db2b74d4-4dbc-4d7d-ba1b-5762e2cb06b8",
"b81d5686-a935-4964-b9b0-735c1222b63a",
"e5299ba4-7aa4-4f95-aa82-7e765d5648fe",
"a28dd434-aeb9-4ea6-9fad-b515b1493844"
],
"lastModified": "2023-10-18T23:19:19.590091+00:00"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"nda": "11755565775",
"exNda": "11755565775",
"region": "Île-de-France",
"dateDeclaration": "23/05/2023",
"dateDeclaration": "23/05/2024",
"specialite": "Développement des capacités comportementales et relationnelles",
"stagiaires": 88546,
"stagiaires": 111172,
"formateurs": 400,
"certifications": [
"Actions de formations"
Expand All @@ -20,15 +20,16 @@
"nda": "11755762075",
"exNda": "11755762075",
"region": "Île-de-France",
"dateDeclaration": "31/05/2023",
"specialite": "Transport, manutention, magasinage",
"stagiaires": 94,
"formateurs": 76,
"dateDeclaration": "31/05/2024",
"specialite": "Transport, manutention, magasinage/Commerce, vente",
"stagiaires": 309,
"formateurs": 77,
"certifications": [
"Actions de formations"
]
}
],
"qualiopiCertified": true,
"lastModified": "2023-10-18T23:19:19.590091+00:00"
}
}
4 changes: 0 additions & 4 deletions clients/_test/clientRGE/_snapshots/qualibat-rge.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@
"Isolation par l'intérieur des murs ou rampants de toitures ou plafonds",
"Isolation des toitures terrasses ou des toitures par l'extérieur",
"Isolation des combles perdus",
"Isolation par l'intérieur des murs ou rampants de toitures ou plafonds",
"Isolation des combles perdus",
"Isolation par l'intérieur des murs ou rampants de toitures ou plafonds",
"Isolation des combles perdus",
"Isolation des planchers bas",
"Isolation des murs par l'extérieur"
],
Expand Down
Loading

0 comments on commit a37d007

Please sign in to comment.