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.

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

Improve type_menage #695

Merged
merged 1 commit into from
Mar 6, 2017
Merged

Improve type_menage #695

merged 1 commit into from
Mar 6, 2017

Conversation

benjello
Copy link
Member

@benjello benjello commented Mar 2, 2017

No description provided.

@benjello benjello requested a review from fpagnoux March 2, 2017 23:05
@benjello
Copy link
Member Author

benjello commented Mar 3, 2017

@fpagnoux : this PR should be GTM too

Copy link
Member

@fpagnoux fpagnoux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GTM pour le code, 👍 pour les tests, juste quelques améliorations nécessaires sur le changelog.

CHANGELOG.md Outdated
## 13.2.1 - [#695](https://github.com/openfisca/openfisca-france/pull/695)

* Évolution du système socio-fiscal
* Périodes concernées : toutes
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Attention: l'indentation n'est pas cohérente avec les autres blocs du changelog.

CHANGELOG.md Outdated
* Évolution du système socio-fiscal
* Périodes concernées : toutes
* Zones impactées : `mesures`
* Amélioration insuffisante mais substantielle de `type_menage`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤔
De quel type d'amélioration s'agit-il ? Une correction du résultat qui était faux dans certains cas ? Seulement une simplification de la syntaxe ?
En tant qu'utilisateur, le fait que ce soit insuffisant mais substantiel m'intéresse moins que de savoir les impacts du changement :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

C'était complètement inutilisable. C'est mieux maintenant mais pas encore parfait.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dois rajouter en bout de ligne "qui était inutilisable" ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Inutilisable, ça veut dire que ça produisait une erreur quand tu l'appelais, c'est ça ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Que c'était très faux car mal traduit quand le code a évolué et pas utilisé depuis longtemps.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dans ce cas je remplacerais

  • Amélioration insuffisante mais substantielle de type_menage

par

  • Correction du calcul de type_menage
    • Des erreurs peuvent subsister dans certains cas (lesquels ?)

@benjello
Copy link
Member Author

benjello commented Mar 6, 2017

@fpagnoux : changement appliqués ;-)

@fpagnoux
Copy link
Member

fpagnoux commented Mar 6, 2017

Merci, le changelog est beaucoup plus clair !

@benjello
Copy link
Member Author

benjello commented Mar 6, 2017

OK je merge dès que les tests passent !

@fpagnoux
Copy link
Member

fpagnoux commented Mar 6, 2017

Merci de ne pas faire d'upstream merge par contre ;)

@fpagnoux
Copy link
Member

fpagnoux commented Mar 6, 2017

Je m'occupe de faire le rebase

@fpagnoux fpagnoux force-pushed the improve-type-menage branch from 0439553 to 0641a88 Compare March 6, 2017 15:35
@fpagnoux
Copy link
Member

fpagnoux commented Mar 6, 2017

Prêt à merger dès que les tests passent

@benjello
Copy link
Member Author

benjello commented Mar 6, 2017

J'ai pas vraiment compris ce qui a merdé ...

@fpagnoux
Copy link
Member

fpagnoux commented Mar 6, 2017

Tu as juste du appuyer sur "Update branch", non ? Je vais voir si on peut pas configurer un peu mieux l'interface graphique.

@fpagnoux fpagnoux mentioned this pull request Mar 6, 2017
@fpagnoux fpagnoux merged commit 13070ec into master Mar 6, 2017
@fpagnoux fpagnoux deleted the improve-type-menage branch March 6, 2017 16:11
_2_kid = af_nbenf == 2
_3_kid = af_nbenf >= 3

af_nbenf = menage.personne_de_reference.famille('af_nbenf')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Arg, il manquait la période et j'ai rien vu 😭
Il faut vraiment que cet argument devienne obligatoire!

fpagnoux added a commit that referenced this pull request Mar 6, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants