Skip to main content
Sign in
Snippets Groups Projects
Commit 8070a9ca authored by Toufic Batache's avatar Toufic Batache
Browse files

Fix of fix for filters :')

parent d70419b3
Branches
Tags
No related merge requests found
Pipeline #14773 passed
...@@ -97,8 +97,8 @@ ...@@ -97,8 +97,8 @@
value: false, value: false,
}, },
{ {
name: "salarie_public", name: "agent_public",
label: "Salarié du public", label: "Agent public",
value: false, value: false,
}, },
{ {
...@@ -248,61 +248,70 @@ ...@@ -248,61 +248,70 @@
if (filters.find((filter) => filter.value)) { if (filters.find((filter) => filter.value)) {
if (filterValueByName["celibataire"] || filterValueByName["couple"]) { if (filterValueByName["celibataire"] || filterValueByName["couple"]) {
if (filterValueByName["celibataire"] === false) { let show = false
if (filterValueByName["celibataire"]) {
if ( if (
Object.keys(familySituation).every( Object.keys(familySituation).some(
(populationId) => (populationId) =>
`${getVariableValue(situation, "en_couple", populationId)}` === `${getVariableValue(situation, "en_couple", populationId)}` ===
"false", "false",
) )
) { ) {
continue show = true
} }
} }
if (filterValueByName["couple"] === false) { if (filterValueByName["couple"]) {
if ( if (
Object.keys(familySituation).every( Object.keys(familySituation).some(
(populationId) => (populationId) =>
`${getVariableValue(situation, "en_couple", populationId)}` === `${getVariableValue(situation, "en_couple", populationId)}` ===
"true", "true",
) )
) { ) {
continue show = true
}
} }
if (!show) {
continue
} }
} }
if ( if (
filterValueByName["sans_enfant"] || filterValueByName["sans_enfant"] ||
filterValueByName["avec_enfant"] filterValueByName["avec_enfant"]
) { ) {
if (filterValueByName["sans_enfant"] === false) { let show = false
if (filterValueByName["sans_enfant"]) {
if ( if (
Object.values(familySituation).every( Object.values(familySituation).some(
({ enfants }) => (enfants ?? []).length === 0, ({ enfants }) => (enfants ?? []).length === 0,
) )
) { ) {
continue show = true
} }
} }
if (filterValueByName["avec_enfant"] === false) { if (filterValueByName["avec_enfant"]) {
if ( if (
Object.values(familySituation).every( Object.values(familySituation).some(
({ enfants }) => (enfants ?? []).length > 0, ({ enfants }) => (enfants ?? []).length > 0,
) )
) { ) {
continue show = true
} }
} }
if (!show) {
continue
}
} }
if ( if (
filterValueByName["salarie_prive"] || filterValueByName["salarie_prive"] ||
filterValueByName["salarie_public"] || filterValueByName["agent_public"] ||
filterValueByName["retraite"] || filterValueByName["retraite"] ||
filterValueByName["chomeur_inactif"] filterValueByName["chomeur_inactif"]
) { ) {
if (filterValueByName["salarie_prive"] === false) { let show = false
if (filterValueByName["salarie_prive"]) {
if ( if (
adultsPopulationIds.every( adultsPopulationIds.some(
(populationId) => (populationId) =>
getVariableValue(situation, "activite", populationId) === getVariableValue(situation, "activite", populationId) ===
"actif" && "actif" &&
...@@ -311,12 +320,12 @@ ...@@ -311,12 +320,12 @@
), ),
) )
) { ) {
continue show = true
} }
} }
if (filterValueByName["salarie_public"] === false) { if (filterValueByName["agent_public"]) {
if ( if (
adultsPopulationIds.every( adultsPopulationIds.some(
(populationId) => (populationId) =>
getVariableValue(situation, "activite", populationId) === getVariableValue(situation, "activite", populationId) ===
"actif" && "actif" &&
...@@ -325,39 +334,43 @@ ...@@ -325,39 +334,43 @@
), ),
) )
) { ) {
continue show = true
} }
} }
if (filterValueByName["retraite"] === false) { if (filterValueByName["retraite"]) {
if ( if (
adultsPopulationIds.every( adultsPopulationIds.some(
(populationId) => (populationId) =>
getVariableValue(situation, "activite", populationId) === getVariableValue(situation, "activite", populationId) ===
"retraite", "retraite",
) )
) { ) {
continue show = true
} }
} }
if (filterValueByName["chomeur_inactif"] === false) { if (filterValueByName["chomeur_inactif"]) {
if ( if (
adultsPopulationIds.every((populationId) => adultsPopulationIds.some((populationId) =>
["chomeur", "inactif"].includes( ["chomeur", "inactif"].includes(
getVariableValue(situation, "activite", populationId), getVariableValue(situation, "activite", populationId),
), ),
) )
) { ) {
continue show = true
} }
} }
if (!show) {
continue
}
} }
if ( if (
filterValueByName["locataire"] || filterValueByName["locataire"] ||
filterValueByName["proprietaire"] filterValueByName["proprietaire"]
) { ) {
if (filterValueByName["locataire"] === false) { let show = false
if (filterValueByName["locataire"]) {
if ( if (
Object.keys(householdSituation).every( Object.keys(householdSituation).some(
(populationId) => (populationId) =>
getVariableValue( getVariableValue(
situation, situation,
...@@ -366,46 +379,59 @@ ...@@ -366,46 +379,59 @@
) !== "proprietaire", ) !== "proprietaire",
) )
) { ) {
continue show = true
} }
} }
if (filterValueByName["proprietaire"] === false) { if (filterValueByName["proprietaire"]) {
if ( if (
Object.keys(householdSituation).every( Object.keys(householdSituation).some(
(populationId) => (populationId) =>
!/^locataire_/.test( !/^locataire_/.test(
`${getVariableValue(situation, "statut_occupation_logement", populationId)}`, `${getVariableValue(situation, "statut_occupation_logement", populationId)}`,
), ),
) )
) { ) {
continue show = true
}
} }
if (!show) {
continue
} }
} }
if (filterValueByName["dispositif"] && variableSummary !== undefined) { if (filterValueByName["dispositif"] && variableSummary !== undefined) {
let show = false
const latestCalculationValue = getLatestCalculation( const latestCalculationValue = getLatestCalculation(
$evaluationByNameArray[index][variableName] $evaluationByNameArray[index][variableName]
?.calculationEvaluationByName, ?.calculationEvaluationByName,
)?.deltaAtVectorIndex )?.deltaAtVectorIndex
if ( if (
latestCalculationValue !== undefined && latestCalculationValue !== undefined &&
latestCalculationValue === 0 latestCalculationValue !== 0
) { ) {
show = true
}
if (!show) {
continue continue
} }
} }
} }
if (!showOnlyDeciles) { if (showOnlyDeciles) {
filterNiveauDeVieValue = undefined if (filterNiveauDeVie !== undefined) {
} else if (filterNiveauDeVie !== undefined) { let show = false
if (filterNiveauDeVie === "tous") { if (filterNiveauDeVie === "tous") {
if (situation.dixieme === undefined) { if (situation.dixieme !== undefined) {
continue show = true
} }
} else if (`${situation.dixieme}` !== filterNiveauDeVie) { } else if (`${situation.dixieme}` === filterNiveauDeVie) {
show = true
}
if (!show) {
continue continue
} }
} }
} else {
filterNiveauDeVieValue = undefined
}
filtered.push([situation, index]) filtered.push([situation, index])
} }
return filtered return filtered
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment