Skip to content

Commit 4ffbeb7

Browse files
committed
feat(api): ajouter la gestion du paramètre structureid pour les filtres de requête
1 parent a17ef62 commit 4ffbeb7

4 files changed

Lines changed: 24 additions & 2 deletions

File tree

  • client/src/boards/european-projects/pages/overview/charts
  • server/src/routes/boards/european-projects/routes

client/src/boards/european-projects/pages/overview/charts/pillars-funding-proportion/utils.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ export function useGetParams() {
1919
params.push(`pillars=${pillarId}`);
2020
}
2121

22+
// Récupérer le paramètre structureid s'il existe
23+
const structureId = searchParams.get("structureid");
24+
if (structureId) {
25+
params.push(`structureid=${structureId}`);
26+
}
2227
return params.join("&");
2328
}
2429

client/src/boards/european-projects/pages/overview/charts/pillars-funding-success-rates/utils.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ export function useGetParams() {
1919
params.push(`pillars=${pillarId}`);
2020
}
2121

22+
// Récupérer le paramètre structureid s'il existe
23+
const structureId = searchParams.get("structureid");
24+
if (structureId) {
25+
params.push(`structureid=${structureId}`);
26+
}
27+
2228
return params.join("&");
2329
}
2430

client/src/boards/european-projects/pages/overview/charts/pillars-funding/utils.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ export function useGetParams() {
1919
params.push(`pillars=${pillarId}`);
2020
}
2121

22+
// Récupérer le paramètre structureid s'il existe
23+
const structureId = searchParams.get("structureid");
24+
if (structureId) {
25+
params.push(`structureid=${structureId}`);
26+
}
27+
2228
return params.join("&");
2329
}
2430

server/src/routes/boards/european-projects/routes/overview.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,12 +224,17 @@ router.route("/european-projects/overview/pillars-funding").get(async (req, res)
224224
const pillars = req.query.pillars.split("|");
225225
filters.pilier_code = { $in: pillars };
226226
}
227+
console.log(req.query);
228+
if (req.query.structureid) {
229+
filters.entities_id = req.query.structureid;
230+
delete filters.structureid;
231+
}
227232
delete filters.programs;
228233
delete filters.thematics;
229234
delete filters.destinations;
230235

231236
const data = await db
232-
.collection(collection_projects_synthese)
237+
.collection(collection_projects_entities)
233238
.aggregate([
234239
{ $match: { $and: [filters] } },
235240
{
@@ -240,7 +245,7 @@ router.route("/european-projects/overview/pillars-funding").get(async (req, res)
240245
pilier_name_fr: "$pilier_name_fr",
241246
pilier_name_en: "$pilier_name_en",
242247
},
243-
total_fund_eur: { $sum: "$fund_eur" },
248+
total_fund_eur: { $sum: "$calculated_fund" },
244249
count: { $sum: 1 },
245250
},
246251
},

0 commit comments

Comments
 (0)