Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ajoute variable sous_contrat_engagement_jeune #193

Merged
merged 2 commits into from
Dec 4, 2023
Merged

Ajoute variable sous_contrat_engagement_jeune #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8252a4
Ajoute variable sous_contrat_engagement_jeune
Allan-CodeWorks Nov 28, 2023
7ea8e38
Met à jour le setup et changelog vers la version 6.11.0
Allan-CodeWorks Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
# Changelog
## [6.11.0] - 2023-12-03

_Pour les changements détaillés et les discussions associées, référencez la pull request [#193](https://github.com/openfisca/openfisca-france-local/pull/193)_

### Added

- Ajoute la variable `sous_contrat_engagement_jeune`

### Changed

- Modifie le calcul du dispositif Revenu Solidarite Jeune de la métropole de Lyon pour utiliser la nouvelle variable plutôt que le montant du CEJ

## [6.10.0] - 2023-11-28

_Pour les changements détaillés et les discussions associées, référencez la pull request [#186](https://github.com/openfisca/openfisca-france-local/pull/186)_
Expand Down
11 changes: 9 additions & 2 deletions openfisca_france_local/metropoles/lyon/revenu_solidaire_jeune.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
Variable, Individu, MONTH, TypesActivite)


class sous_contrat_engagement_jeune(Variable):
value_type = bool
entity = Individu
definition_period = MONTH
label = "Est actuellement en Contrat Engagement Jeune"


class revenu_solidaire_jeune(Variable):
value_type = float
entity = Individu
Expand All @@ -20,8 +27,8 @@ def formula(individu, period, parameter):
rsa = individu.famille('rsa', period)
aah = individu('aah', period)
aeeh = individu.famille('aeeh', period)
contrat_engagement_jeune = individu('contrat_engagement_jeune', period)
prestations_incompatibles = rsa + aah + aeeh + contrat_engagement_jeune
sous_contrat_engagement_jeune = individu('sous_contrat_engagement_jeune', period)
prestations_incompatibles = rsa + aah + aeeh + sous_contrat_engagement_jeune
eligibilite_prestations = prestations_incompatibles == 0

pas_en_etude = individu('activite', period) != TypesActivite.etudiant
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

setup(
name='OpenFisca-France-Local',
version='6.10.0',
version='6.11.0',
author='OpenFisca Team',
author_email='[email protected]',
classifiers=[
Expand Down
4 changes: 2 additions & 2 deletions tests/metropoles/lyon/revenu_solidaire_jeune.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
rsa: [0, 0, 0, 0, 0, 1, 0, 0, 0, 0]
aah: [0, 0, 0, 0, 0, 0, 1, 0, 0, 0]
aeeh: [0, 0, 0, 0, 0, 0, 0, 1, 0, 0]
contrat_engagement_jeune: [0, 0, 0, 0, 0, 0, 0, 0, 1, 0]
sous_contrat_engagement_jeune: [False, False, False, False, False, False, False, False, True, False]
activite: ['inactif', 'inactif', 'inactif', 'inactif', 'inactif', 'inactif', 'inactif', 'inactif', 'inactif', 'etudiant']
output:
revenu_solidaire_jeune: [420, 0, 0, 0, 420, 0, 0, 0, 0, 0]
Expand All @@ -20,7 +20,7 @@
input:
age: [18, 18, 18, 18]
depcom: [69003, 69003, 69003, 69003]
contrat_engagement_jeune: [0, 0, 0, 0]
sous_contrat_engagement_jeune: [False, False, False, False]
salaire_net: [1, 400, 401, 101]
indemnites_stage: [0, 0, 0, 101]
ppa: [0, 0, 0, 101]
Expand Down