enfance-libre/statistiques
enfance-libre/statistiques
1
0
Fork 0
mirror of https://framagit.org/enfance-libre/statistiques synced 2025-12-07 07:23:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: l'evenement admin adhoc est avant l'évènement tribunal

Browse source
This commit is contained in:
Sébastien Arod 2025-05-26 19:24:54 +02:00
parent 9b724d3789
commit 4fb83b8217
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/statistiques/v2/penales/computeStatsPenales.ts
View file

@ -305,10 +305,19 @@ function buildInfoTribunaux(f: Famille): InfoTribunalCorrectionnel[] {
const evtTribunaux = f.EvenementsEL.filter(isTribunalCorrectionnel);
return evtTribunaux.map((evtTribunal, index) => {
const prevEvtTrib = ( index - 1 >= 0) ? evtTribunaux[index - 1] : null;
const nextEvtTrib =
index + 1 < evtTribunaux.length ? evtTribunaux[index + 1] : null;
const eventsBetweenTribAndNextTrib = f.EvenementsEL.filter(
const eventsBetweenPreviousTribAndCurrentTrib = f.EvenementsEL.filter(
(e) =>
evtTribunal.Date != null &&
e.Date != null &&
e.Date <= evtTribunal.Date &&
(prevEvtTrib?.Date == null || e.Date > prevEvtTrib.Date)
);
const eventsBetweenCurrentTribAndNextTrib = f.EvenementsEL.filter(
(e) =>
evtTribunal.Date != null &&
e.Date != null &&
@ -318,18 +327,18 @@ function buildInfoTribunaux(f: Famille): InfoTribunalCorrectionnel[] {
return {
evtTribunal: evtTribunal,
evtAdminAdhoc: eventsBetweenTribAndNextTrib.find(
evtAdminAdhoc: eventsBetweenPreviousTribAndCurrentTrib.find(
(e) => e.Type === "Administrateur AD'HOC"
),
evtAppel: f.Evenements.find(
evtAppel: eventsBetweenCurrentTribAndNextTrib.find(
(e) =>
(index === 0 && e.Type === "Appel jugement Tribunal Correctionnel") ||
(index === 1 && e.Type == "Appel du 2ème jugement TC")
),
evtViceDeProcedure: eventsBetweenTribAndNextTrib.find(
evtViceDeProcedure: eventsBetweenCurrentTribAndNextTrib.find(
(e) => e.Type === "Vice de procédure tribunal correctionnel"
),
evtRelaxe: eventsBetweenTribAndNextTrib.find(
evtRelaxe: eventsBetweenCurrentTribAndNextTrib.find(
(e) => e.Type === "Relaxe Tribunal correctionnel"
),