feat(formation): ajout de la page formation #492

gBusato · 2024-11-25T14:09:45Z

No description provided.

LucasDetre · 2024-12-11T13:20:50Z

.vscode/settings.json

+  "compareFolders.respectGitIgnore": true,
+  "[shellscript]": {
+    "editor.defaultFormatter": "foxundermoon.shell-format"
+  },
+  "[dotenv]": {
+    "editor.defaultFormatter": "foxundermoon.shell-format"
+  },
+  "[sql]": {
+    "editor.defaultFormatter": "inferrinizzard.prettier-sql-vscode"
+  }
 }


Peut-être pas nécessaire dans les conf du projet

LucasDetre · 2024-12-11T13:24:23Z

server/src/modules/data/usecases/getDomaineDeFormation/dependencies/getFormations.dep.ts

+        .where((w) =>
+          w.or([
+            w("formationView.dateFermeture", "is", null),
+            w("formationView.dateFermeture", ">", sql<Date>`${getDateRentreeScolaire(CURRENT_RENTREE)}`),
+          ])
+        )


Tu peux ici utiliser notHistoriqueUnlessCoExistant dans utils/notHistorique.ts

LucasDetre · 2024-12-11T13:27:19Z

server/src/modules/data/usecases/getDomaineDeFormation/dependencies/getFormations.dep.ts

+      wb
+        .selectFrom("formations")
+        .leftJoin("formationHistorique", "formationHistorique.cfd", "formations.cfd")
+        .where("formations.dateOuverture", "<=", sql<Date>`${getDateRentreeScolaire(CURRENT_RENTREE)}`)
+        .where("formationHistorique.ancienCFD", "in", (eb) => eb.selectFrom("formationEtablissement").select("cfd"))
+        .select("formationHistorique.cfd")
+        .distinct()


Pareil tu peux retrouver certainement des fonctions utils dans utils/notHistorique.ts

LucasDetre · 2024-12-11T13:30:05Z

server/src/modules/data/usecases/getDomaineDeFormation/getDomaineDeFormation.usecase.ts

+    const [nsf, filters, formations] = await Promise.all([
+      deps.getNsf(codeNsf),
+      deps.getFilters(),
+      deps.getFormations({
+        codeNsf,
+        codeRegion,
+        codeDepartement,
+        codeAcademie,
+      }),
+    ]);
+
+    if (!nsf) {
+      throw Boom.notFound(`Le domaine de formation avec le code ${codeNsf} est inconnue`);
+    }
+
+    return {
+      codeNsf,
+      libelleNsf: nsf.libelleNsf,
+      filters,
+      formations,
+    };


Suggested change

const [nsf, filters, formations] = await Promise.all([

deps.getNsf(codeNsf),

deps.getFilters(),

deps.getFormations({

codeNsf,

codeRegion,

codeDepartement,

codeAcademie,

}),

]);

if (!nsf) {

throw Boom.notFound(`Le domaine de formation avec le code ${codeNsf} est inconnue`);

}

return {

codeNsf,

libelleNsf: nsf.libelleNsf,

filters,

formations,

};

const [{libelleNsf}, filters, formations] = await Promise.all([

deps.getNsf(codeNsf),

deps.getFilters(),

deps.getFormations({

codeNsf,

codeRegion,

codeDepartement,

codeAcademie,

}),

]);

if (!nsf) {

throw Boom.notFound(`Le domaine de formation avec le code ${codeNsf} est inconnue`);

}

return {

codeNsf,

libelleNsf,

filters,

formations,

};

LucasDetre · 2024-12-11T13:37:14Z

server/src/modules/data/usecases/getFormation/dependencies/getFormation.dep.ts

+      getKbdClient()
+        .selectFrom("formationView")
+        .innerJoin("niveauDiplome", "niveauDiplome.codeNiveauDiplome", "formationView.codeNiveauDiplome")
+        .leftJoin("formationRome", "formationRome.cfd", "formationView.cfd")
+        .leftJoin("rome", "rome.codeRome", "formationRome.codeRome")
+        .select((sb) => [
+          sb.ref("formationView.cfd").as("cfd"),
+          sb.ref("niveauDiplome.libelleNiveauDiplome").as("libelleNiveauDiplome"),
+          sb.ref("formationView.libelleFormation").as("libelleFormation"),
+          sql<number>`count(distinct ${sb.ref("formationRome.codeRome")})`.as("nb romes total"),
+          sql<number>`count(distinct case when ${sb.ref(
+            `rome.${transitionType}`
+          )} then ${sb.ref("formationRome.codeRome")} end)`.as(`nb romes ${transitionType}`),
+        ])
+        .groupBy(["formationView.cfd", "niveauDiplome.libelleNiveauDiplome", "formationView.libelleFormation"])
+        .as("sous_requete")
+    )
+    .select((sb) => [sb.ref("sous_requete.cfd").as("cfd")])
+    .where("sous_requete.cfd", "=", cfd)
+    .where("nb romes total", ">", 0)
+    .whereRef("nb romes total", "=", `nb romes ${transitionType}`);


pourquoi whereRef ?

pour pouvoir utiliser le "nb romes ${}"

LucasDetre · 2024-12-11T15:31:37Z

...]/components/FormationSection/Tabs/EtablissementsTab/components/EtablissementItemContent.tsx

+const formatDispositifs = (dispositifs: string[]) => {
+  return dispositifs
+    .filter((libelle) => libelle !== "")
+    .map((d) => {
+      return d.replace(/\sen\s/i, " ").replace(/professionnel/i, "PRO");
+    });
+};
+const formatSecteur = (secteur: string) => {
+  switch (secteur) {
+    case "PU":
+      return "Public";
+    case "PR":
+      return "Privé";
+    default:
+      return "";
+  }
+};
+
+const formatDepartement = (departement: string) => {
+  if (departement.length === 3 && departement.startsWith("0")) {
+    return departement.substring(1);
+  }
+
+  return departement;
+};


Utilise peut-être les fonctions utiles de formatage ?

ui/app/(wrapped)/domaine-de-formation/[codeNsf]/components/FiltersSection/FiltersSection.tsx

LucasDetre · 2024-12-11T15:56:35Z

shared/routes/schemas/get.formation.cfd.map.schema.ts

+  includeAll: z
+    .enum(["true", "false"])
+    .transform((val) => val === "true")
+    .optional()
+    .default("false"),


Eh beh, qu'est ce qu'il faut pas faire pour passer un boolean dans une requête....

FaXaq · 2024-12-16T15:07:44Z

server/src/modules/data/usecases/getDomainesDeFormation/dependencies/getNsfsAndFormations.ts

+            sb.ref("nsf.codeNsf").as("nsf"),
+            sb.val("formation").as("type"),
+          ])
+          .where((w) =>


On devrait se faire un petit utils de search vu qu'on utilise ce style de requête un peu partout

FaXaq · 2024-12-16T15:08:37Z

server/src/modules/data/usecases/getFormation/__tests__/getFormation.test.ts

@@ -0,0 +1,78 @@
+import { usePg } from "@tests/pg.test.utils";


FaXaq · 2024-12-16T15:09:25Z

server/src/modules/data/usecases/getFormation/dependencies/getFormation.dep.ts

+          sb.ref("formationView.cfd").as("cfd"),
+          sb.ref("niveauDiplome.libelleNiveauDiplome").as("libelleNiveauDiplome"),
+          sb.ref("formationView.libelleFormation").as("libelleFormation"),
+          sql<number>`count(distinct ${sb.ref("formationRome.codeRome")})`.as("nb romes total"),


Peut-être les nommer en camelCase pour rester consistant dans la nomenclature ?

FaXaq · 2024-12-16T15:10:07Z

server/src/modules/data/usecases/getFormation/dependencies/getFormation.dep.ts

+          )} then ${sb.ref("formationRome.codeRome")} end)`.as(`nb romes ${transitionType}`),
+        ])
+        .groupBy(["formationView.cfd", "niveauDiplome.libelleNiveauDiplome", "formationView.libelleFormation"])
+        .as("sous_requete")


Peu-être être plus précis sur le nommage de cette requête ? Elle ramène quoi ?

FaXaq · 2024-12-16T15:11:38Z

.../src/modules/data/usecases/getFormationCarteEtablissements/dependencies/getBoundaries.dep.ts

+    ])
+    .$call((qb) => {
+      if (!codeRegion && !codeDepartement && !codeAcademie) {
+        qb = qb.where((wb) => wb.and([wb("codeRegion", ">=", "11"), wb("codeRegion", "<=", "93")]));


Hmmm je veux bien un commentaire ou un utils qui explicite ce que cette condition fait. Ça garde uniquement les régions IJ ? Ou autre chose ?

FaXaq · 2024-12-16T15:14:46Z

server/src/modules/data/usecases/getFormationIndicateurs/dependencies/getTauxRemplissage.dep.ts

+        .selectFrom("maille_etab")
+        .innerJoin("indicateurEntree", "indicateurEntree.formationEtablissementId", "maille_etab.id")
+        .where("cfd", "=", cfd)
+        .where("rentreeScolaire", ">", "2020")


Pourquoi 2020 en dur ?

FaXaq · 2024-12-16T15:17:22Z

shared/routes/schemas/get.domaine-de-formation.code-nsf.schema.ts

@@ -0,0 +1,55 @@
+import { z } from "zod";


Si on suit la logique de nomanclature, le fichier devrait être nommé : get.domaine-de-formation.codeNsf.schema.ts

FaXaq · 2024-12-16T15:18:58Z

...on/[codeNsf]/components/FormationSection/Tabs/EtablissementsTab/ExportListEtablissements.tsx

+  const onExportExcel = async () => {
+    if (!etablissements.length) return;
+
+    trackEvent("domaine-de-formation-etablissements:export-excel");


T'as bien activé les events sur plausible ?

FaXaq · 2024-12-16T15:26:43Z

...ormation/[codeNsf]/components/FormationSection/Tabs/IndicateursTab/ExportListIndicateurs.tsx

@@ -0,0 +1,192 @@
+import { usePlausible } from "next-plausible";


Hmm il me semble qu'on fait différemment avec les exports normalement, il y a un fichier type séparé avec les énums et les colonnes qu'on veut sortir. Peut-être garder cette manière de faire ?

FaXaq · 2024-12-16T15:27:34Z

...n/[codeNsf]/components/FormationSection/Tabs/IndicateursTab/TauxPressionRemplissageGraph.tsx

+    }
+    chartRef.current.setOption(option, true);
+    chartRef.current.on("legendselectchanged", (params) => {
+      //@ts-ignore


github-actions · 2024-12-17T09:04:14Z

🎉 This PR is included in version 0.8.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

gBusato changed the base branch from develop to next November 25, 2024 14:10

gBusato force-pushed the feat/page-formation-next branch 4 times, most recently from 9050764 to 89efafc Compare November 26, 2024 09:21

Base automatically changed from next to develop November 26, 2024 17:05

gBusato force-pushed the feat/page-formation-next branch 6 times, most recently from d321c47 to 070b585 Compare December 3, 2024 09:34

gBusato force-pushed the feat/page-formation-next branch 6 times, most recently from 4aef47b to d3e9bbe Compare December 10, 2024 15:09

LucasDetre reviewed Dec 11, 2024

View reviewed changes

gBusato force-pushed the feat/page-formation-next branch 3 times, most recently from 4bfec82 to c284e59 Compare December 16, 2024 14:33

FaXaq reviewed Dec 16, 2024

View reviewed changes

gBusato force-pushed the feat/page-formation-next branch from c284e59 to 4242441 Compare December 17, 2024 08:44

feat(panorama-formations): ajout des pages d'un domaine de formation

b551bbb

gBusato force-pushed the feat/page-formation-next branch from 4242441 to b551bbb Compare December 17, 2024 08:45

gBusato merged commit 9c8a03e into develop Dec 17, 2024
4 checks passed

gBusato deleted the feat/page-formation-next branch December 17, 2024 08:55

github-actions bot added the released label Dec 17, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(formation): ajout de la page formation #492

feat(formation): ajout de la page formation #492

gBusato commented Nov 25, 2024

LucasDetre Dec 11, 2024

LucasDetre Dec 11, 2024

LucasDetre Dec 11, 2024

LucasDetre Dec 11, 2024

LucasDetre Dec 11, 2024

gBusato Dec 11, 2024

LucasDetre Dec 11, 2024

LucasDetre Dec 11, 2024

FaXaq Dec 16, 2024

FaXaq Dec 16, 2024

FaXaq Dec 16, 2024

FaXaq Dec 16, 2024

FaXaq Dec 16, 2024

FaXaq Dec 16, 2024

FaXaq Dec 16, 2024

FaXaq Dec 16, 2024

FaXaq Dec 16, 2024

FaXaq Dec 16, 2024

github-actions bot commented Dec 17, 2024

		@@ -0,0 +1,78 @@
		import { usePg } from "@tests/pg.test.utils";

		@@ -0,0 +1,192 @@
		import { usePlausible } from "next-plausible";

feat(formation): ajout de la page formation #492

feat(formation): ajout de la page formation #492

Conversation

gBusato commented Nov 25, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Dec 17, 2024