Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: only rely on DGEFP for qualiopi certification #1082

Merged
merged 4 commits into from
May 29, 2024
Merged

fix: only rely on DGEFP for qualiopi certification #1082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f2dc37
fix: only rely on DGEFP for qualiopi certification
XavierJp May 29, 2024
12100ec
refactor: use different variable for DGEFP response and recherche
XavierJp May 29, 2024
8508f40
fix: build
XavierJp May 29, 2024
9e32d75
fix: test e2e
XavierJp May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/(header-default)/labels-certificats/[slug]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ const LabelsAndCertificatsPage = async (props: AppRouterProps) => {
{estOrganismeFormation && (
<OrganismeDeFormationSection
organismesDeFormation={organismesDeFormation}
uniteLegale={uniteLegale}
/>
)}
{egaproRenseignee && <EgaproSection egapro={egapro} />}
Expand Down
3 changes: 3 additions & 0 deletions clients/open-data-soft/clients/qualiopi/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ const clientOrganismeFormation = async (
const fields = response.records as IOrganismesFormationRecord[];
return {
records: fields.map(mapToDomainObject),
qualiopiCertified: !!fields.find(
(f) => (f?.certifications || []).length > 0
),
lastModified: response.lastModified,
};
};
Expand Down
132 changes: 66 additions & 66 deletions components/labels-and-certificates/organismes-de-formation/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,84 +6,84 @@ import { FullTable } from '#components/table/full';
import { EAdministration } from '#models/administrations/EAdministration';
import { IAPINotRespondingError } from '#models/api-not-responding';
import { IOrganismeFormation } from '#models/certifications/organismes-de-formation';
import { IUniteLegale } from '#models/core/types';

type OrganismeDeFormationSectionProps = {
organismesDeFormation: IOrganismeFormation | IAPINotRespondingError;
uniteLegale: IUniteLegale;
};

export const OrganismeDeFormationSection = ({
organismesDeFormation,
uniteLegale,
}: OrganismeDeFormationSectionProps) => {
const estQualiopi = uniteLegale.complements.estQualiopi;

const head = [
'Numéro Déclaration Activité (NDA)',
'Détails',
...(estQualiopi ? ['Certification(s) Qualiopi'] : []),
];

const title = `Organisme de formation${
estQualiopi ? ' certifié Qualiopi' : ''
}`;

return (
<DataSection
title={title}
title="Organisme de formation"
sources={[EAdministration.MTPEI]}
id="organisme-de-formation"
data={organismesDeFormation}
notFoundInfo={<OrganismeFormationLabel estQualiopi={estQualiopi} />}
// if 404 from DGEFP we can assume this organism is NOT qualiopi
notFoundInfo={<OrganismeFormationLabel qualiopiCertified={false} />}
>
{(organismesDeFormation) => (
<>
<OrganismeFormationLabel estQualiopi={estQualiopi} />
<FullTable
head={head}
body={organismesDeFormation.records.map((fields) => [
<Tag>{fields.nda ? fields.nda : 'Inconnu'}</Tag>,
<>
{fields.specialite && (
<>
<strong>Spécialité :</strong> {fields.specialite}
<br />
</>
)}
{fields.formateurs && (
<>
<strong>Effectifs formateurs :</strong> {fields.formateurs}
<br />
</>
)}
{fields.stagiaires && (
<>
<strong>Effectifs stagiaires :</strong> {fields.stagiaires}
<br />
</>
)}
{fields.dateDeclaration && (
<>
<strong>Déclaration : </strong> le {fields.dateDeclaration}
{fields.region && <>, en région {fields.region}</>}
<br />
</>
)}
</>,
...(estQualiopi
? [
fields.certifications.map((certification) => (
<Tag color="info" key={certification}>
{certification}
</Tag>
)),
]
: []),
])}
/>{' '}
</>
)}
{(organismesDeFormation) => {
// we use definition from DGEFP rather than recherche entreprise which can be outdated
const qualiopiCertified = organismesDeFormation.qualiopiCertified;

const head = [
'Numéro Déclaration Activité (NDA)',
'Détails',
...(qualiopiCertified ? ['Certification(s) Qualiopi'] : []),
];

return (
<>
<OrganismeFormationLabel qualiopiCertified={qualiopiCertified} />
<FullTable
head={head}
body={organismesDeFormation.records.map((fields) => [
<Tag>{fields.nda ? fields.nda : 'Inconnu'}</Tag>,
<>
{fields.specialite && (
<>
<strong>Spécialité :</strong> {fields.specialite}
<br />
</>
)}
{fields.formateurs && (
<>
<strong>Effectifs formateurs :</strong>{' '}
{fields.formateurs}
<br />
</>
)}
{fields.stagiaires && (
<>
<strong>Effectifs stagiaires :</strong>{' '}
{fields.stagiaires}
<br />
</>
)}
{fields.dateDeclaration && (
<>
<strong>Déclaration : </strong> le{' '}
{fields.dateDeclaration}
{fields.region && <>, en région {fields.region}</>}
<br />
</>
)}
</>,
...(qualiopiCertified
? [
fields.certifications.map((certification) => (
<Tag color="info" key={certification}>
{certification}
</Tag>
)),
]
: []),
])}
/>{' '}
</>
);
}}
</DataSection>
);
};
Expand All @@ -98,7 +98,7 @@ const FAQQaliopi = () => (
</FAQLink>
);

const OrganismeFormationLabel = ({ estQualiopi = false }) => (
const OrganismeFormationLabel = ({ qualiopiCertified = false }) => (
<>
Cette structure est un organisme de formation,{' '}
<FAQLink tooltipLabel="à jour de ses obligations">
Expand All @@ -107,7 +107,7 @@ const OrganismeFormationLabel = ({ estQualiopi = false }) => (
Pédagogique et Financier.
</FAQLink>
.
{estQualiopi ? (
{qualiopiCertified ? (
<>
<br />
<br />
Expand Down
3 changes: 2 additions & 1 deletion cypress/e2e/certifications.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ describe('Certifications', () => {
describe('Qualiopi', () => {
it('Should display Qualiopi', () => {
cy.visit(`/labels-certificats/356000000`);
cy.contains('Organisme de formation certifié Qualiopi');
cy.contains('Organisme de formation');
cy.contains('certifiée Qualiopi');
cy.contains('Numéro Déclaration Activité');
cy.contains('11755565775');
});
Expand Down
1 change: 1 addition & 0 deletions models/certifications/organismes-de-formation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export type IOrganismeFormation = {
dateDeclaration: string | null;
region: string | null;
}[];
qualiopiCertified: boolean;
lastModified: string | null;
};

Expand Down
Loading