Skip to content

Commit

Permalink
fixup! Fiabilise l'éligibilité aux BCS
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Guillet committed Apr 6, 2021
1 parent cb7c50d commit 0650c71
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions openfisca_france/model/prestations/bourses_superieur.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from openfisca_core.model_api import not_, select
from openfisca_france.model.base import Famille, Individu, Variable, MONTH, TypesStatutMarital
from openfisca_france.model.prestations.education import TypesScolarite, TypesEtablissementScolaire
from openfisca_france.model.prestations.education import TypesScolarite, StatutsEtablissementScolaire


class echelon_bourse(Variable):
Expand Down Expand Up @@ -53,8 +53,8 @@ class bourse_criteres_sociaux_eligibilite_etude(Variable):
def formula(individu, period):
enseignement_superieur = individu('scolarite', period) == TypesScolarite.enseignement_superieur

etablissement = individu('etablissement_scolaire', period)
etablissement_eligible = (etablissement == TypesEtablissementScolaire.public) + (etablissement == TypesEtablissementScolaire.prive_sous_contrat)
etablissement = individu('statuts_etablissement_scolaire', period)
etablissement_eligible = (etablissement == StatutsEtablissementScolaire.public) + (etablissement == StatutsEtablissementScolaire.prive_sous_contrat)

return enseignement_superieur * etablissement_eligible

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
- period: 2021-03
input:
scolarite: [enseignement_superieur, enseignement_superieur, enseignement_superieur]
etablissement_scolaire: [public, prive_sous_contrat, prive_hors_contrat]
statuts_etablissement_scolaire: [public, prive_sous_contrat, prive_hors_contrat]
output:
bourse_criteres_sociaux_eligibilite_etude: [true, true, false]

Expand Down

0 comments on commit 0650c71

Please sign in to comment.