enfance-libre
/
statistiques
mirror of https://framagit.org/enfance-libre/statistiques
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: ajoute Nb familles résistantes ou ex-résistantes sur la période

wip-related-pages
sebastien.arod@gmail.com 2024-06-04 21:59:45 +02:00
parent 5aa6974685
commit af0fba621a
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/statistiques/ELStats.ts
View File

@ -6,7 +6,6 @@ export type ELStats = {
}; };
export type ELStatsActuelles = { export type ELStatsActuelles = {
nbFamilleResistantes: number; nbFamilleResistantes: number;
/** Includes Ancient resistants */
nbFamilleResistantesOrEx: number; nbFamilleResistantesOrEx: number;
dureeResistanceMoyenne: number; dureeResistanceMoyenne: number;
dureeResistanceMediane: number; dureeResistanceMediane: number;
@ -19,6 +18,7 @@ export type ELPeriodStats = {
periodId: string; periodId: string;
stats: { stats: {
nbFamilleResistantes: ValueWithEvol; nbFamilleResistantes: ValueWithEvol;
nbFamilleResistantesOrEx: ValueWithEvol;
dureeResistanceMoyenne: ValueWithEvol; dureeResistanceMoyenne: ValueWithEvol;
dureeResistanceMediane: ValueWithEvol; dureeResistanceMediane: ValueWithEvol;
nbFamillesMisesEnDemeure: ValueWithEvol; nbFamillesMisesEnDemeure: ValueWithEvol;

9
src/statistiques/computeELPeriodStats.ts
View File

@ -24,6 +24,11 @@ export function computeELPeriodStats(
isResistantOverPeriod(famille, period) isResistantOverPeriod(famille, period)
).length; ).length;
const nbFamilleResistantesOrEx = familles.filter((famille) => {
const por = periodOfResistance(famille, periodEndOrNow);
return por !== null && por.start < periodEndOrNow;
}).length;
const dureesResistances = familles const dureesResistances = familles
.map((famille) => dureeResistanceInDays(famille, periodEndOrNow)) .map((famille) => dureeResistanceInDays(famille, periodEndOrNow))
.filter(notNull); .filter(notNull);
@ -58,6 +63,10 @@ export function computeELPeriodStats(
nbFamilleResistantes, nbFamilleResistantes,
previousELPeriodStats?.nbFamilleResistantes.value previousELPeriodStats?.nbFamilleResistantes.value
), ),
nbFamilleResistantesOrEx: valueWithEvol(
nbFamilleResistantesOrEx,
previousELPeriodStats?.nbFamilleResistantesOrEx.value
),
dureeResistanceMediane: valueWithEvol( dureeResistanceMediane: valueWithEvol(
dureeResistanceMediane, dureeResistanceMediane,
previousELPeriodStats?.dureeResistanceMediane.value previousELPeriodStats?.dureeResistanceMediane.value