Commit Graph

528 Commits

Author SHA1 Message Date
Denis Merigoux
1a08207680
Restore tests 2022-07-06 16:52:13 +02:00
Denis Merigoux
5e45940e1b
Merge branch 'master' into allocations_logement 2022-07-06 16:43:14 +02:00
Denis Merigoux
9cdeb907f5
Fix missing age of L841-1 2022-07-06 15:37:23 +02:00
Denis Merigoux
b1dd3a822e
We now compute the split custody! 2022-07-06 15:25:31 +02:00
Denis Merigoux
443a4bbc1d
Restore test 2022-07-06 14:46:25 +02:00
Denis Merigoux
cd6840fdcb
Prepping for split custody 2022-07-06 12:52:03 +02:00
Denis Merigoux
cfe9f0ca28
Added a global "calculette" tested with a dummy example 2022-07-06 12:24:45 +02:00
Denis Merigoux
0ab22dfee8
Fix sign bugs 2022-07-05 16:17:26 +02:00
Denis Merigoux
541f014396
Correct hierarchy in family benefits epilogue 2022-06-23 10:05:24 +02:00
Denis Merigoux
eef14fedad
Better translation of D823-20 2022-06-16 12:08:29 +02:00
Denis Merigoux
b77dc8c9d6
Better translation of D823-20 2022-06-16 12:04:55 +02:00
Denis Merigoux
316f238d66
Restore test 2022-06-07 19:25:45 +02:00
Denis Merigoux
60089bb2b2
Added big allocations logement branching calculator that distributes by sector like the APL one 2022-06-06 18:26:22 +02:00
Denis Merigoux
ff7e94d89a
Nitpicks 2022-06-06 18:11:06 +02:00
Denis Merigoux
fba22ab38d
Added justification for CRDS 2022-06-06 18:03:58 +02:00
Denis Merigoux
d80d4bc129
Removed part of too long name 2022-06-06 17:43:45 +02:00
Denis Merigoux
098621ac19
Remove part of law not necessary for computation 2022-06-06 17:41:03 +02:00
Denis Merigoux
8ddb157bc3
Distinguo entre aides personnelle et aide personnalisée 2022-06-06 17:39:51 +02:00
Denis Merigoux
4ba73a80c9
Rename ParentÀCharge -> AutrePersonneÀCharge 2022-06-06 16:44:15 +02:00
Denis Merigoux
d058936e2f
Fix and tests 2022-06-03 16:49:09 +02:00
Denis Merigoux
7b72a4ca08
A few tests for logement foyer 2022-06-03 16:43:02 +02:00
Lilya Slimani
158feef445 Merge branch 'allocations_logement' of https://github.com/CatalaLang/catala into allocations_logement 2022-06-03 15:58:20 +02:00
Denis Merigoux
a29a8d5df8
Finished last arrêtés with @Lilyaslm! 2022-06-03 15:57:21 +02:00
Lilya Slimani
b4626b8f52 Merge branch 'allocations_logement' of https://github.com/CatalaLang/catala into allocations_logement 2022-06-03 15:56:28 +02:00
Lilya Slimani
8ceb6f0608 Test Logement Foyer 2022-06-03 15:55:17 +02:00
Denis Merigoux
86bdd7dd54
Implemented horrible horrible article 33 with @Lilyslm 2022-06-03 15:19:01 +02:00
Denis Merigoux
c9671611b9
Add TODOs 2022-06-03 14:02:11 +02:00
Denis Merigoux
ab0f4eb28c
Merge branch 'master' into allocations_logement 2022-06-01 17:28:54 +02:00
Denis Merigoux
05a1405c70
Another precision 2022-06-01 17:27:08 +02:00
Denis Merigoux
77baeb7680
DGALN not DGLAN 2022-06-01 17:02:12 +02:00
Denis Merigoux
c93cb10745
Added exceptional values not found in law but confirmed by administration 2022-06-01 16:47:37 +02:00
Denis Merigoux
ae8d59d133
Intégration réponses DGLAN/DHUP/FE4 du 25/05/2022 2022-06-01 12:08:44 +02:00
Denis Merigoux
ff24f7d324
Added missing rent values for foyer housing 2022-06-01 11:22:05 +02:00
Denis Merigoux
7c779a07a8
More SMIC Data + table formatting 2022-05-30 17:36:59 +02:00
Denis Merigoux
ff1b4eb5fd
Merge branch 'allocations_logement' of github.com:CatalaLang/catala into allocations_logement 2022-05-30 14:55:52 +02:00
Louis Gesbert
81fe7eba47 Tutorial: Add section on cumulative exceptions 2022-05-30 14:45:52 +02:00
Denis Merigoux
225bd4aaf7
Fix missing parenthesis 2022-05-26 18:48:05 +02:00
Lilya Slimani
78e215ebef Merge branch 'allocations_logement' of https://github.com/CatalaLang/catala into allocations_logement 2022-05-24 17:11:32 +02:00
Lilya Slimani
65ba54b69d Suite de l'arrêté du 27 / 09 / 2019 2022-05-24 17:11:30 +02:00
Denis Merigoux
2a8e7f5f7e
New questions 2022-05-24 16:25:23 +02:00
Denis Merigoux
e207fac330
Put @Lilyaslm's tests under CI 2022-05-24 15:23:41 +02:00
Denis Merigoux
54a08d4e44
Finished logement foyer réglementaires (minus TODOs) with @Lilyaslm 2022-05-24 15:20:06 +02:00
Lilya Slimani
63b05e35bc Merge branch 'allocations_logement' of https://github.com/CatalaLang/catala into allocations_logement 2022-05-24 14:25:42 +02:00
Lilya Slimani
6f5d924de8 Mise à jour des tests 2022-05-24 14:25:39 +02:00
Denis Merigoux
883375d388
New questions by @Lilyaslm 2022-05-24 10:06:34 +02:00
Denis Merigoux
6638913c03
End of accession-propriété for AL with @Lilyaslm 2022-05-20 16:37:23 +02:00
Denis Merigoux
de2f1790c4
Progress with @Lilyaslm 2022-05-19 16:04:41 +02:00
Louis Gesbert
551c9a6729 Allocation_logement: fix parentheses in formula
Changing the priorities broke the expression!

Here it was caught by the types; I hope there aren't other places where
it just changed the output without being caught by our tests...
2022-05-18 16:47:46 +02:00
Denis Merigoux
38a80d2929
Merge pull request #165 from CatalaLang/allocations_logement
Implementing French housing benefits
2022-05-18 14:39:39 +01:00
Louis Gesbert
569a647f3f Tutorial: a couple typos 2022-05-16 15:21:15 +02:00
Denis Merigoux
8ecf753641
Prettify formula 2022-05-08 16:20:16 +02:00
Denis Merigoux
96f1845afd
Merge branch 'master' into allocations_logement 2022-05-08 15:20:04 +02:00
Lilya Slimani
a4fddad582 Merge branch 'allocations_logement' of https://github.com/CatalaLang/catala into allocations_logement 2022-05-06 16:26:17 +02:00
Lilya Slimani
daa3896b64 Références Légifrance - Code réglementaire 2022-05-06 16:23:36 +02:00
Denis Merigoux
ec7f8a85c3
Progress with @Lilyaslm 2022-05-06 16:22:39 +02:00
Denis Merigoux
d1c9d674ff
Fixed tests 2022-05-06 15:28:59 +02:00
Lilya Slimani
e66df01492 Test exception Logement est chambre 2022-05-06 15:07:28 +02:00
Denis Merigoux
33c21e9a07
Include prestations familiales in allocations logement for L512-3 logic 2022-05-06 12:21:57 +02:00
Lilya Slimani
80f7505166 Vérifications des tests 2022-05-06 12:21:57 +02:00
Denis Merigoux
d478882636
Put tests that pass under CI 2022-05-05 17:21:53 +02:00
Denis Merigoux
080e60c25d
Fixes money cents parsing 2022-05-05 16:50:33 +02:00
Lilya Slimani
33c1906b90 Vérification Exemple 3 (Test Calcul APL secteur locatif) 2022-05-05 16:35:42 +02:00
Denis Merigoux
823c223ea8
Restore debug info 2022-05-05 16:28:17 +02:00
Lilya Slimani
c557eadfce Mise à jour tests et corrections 2022-05-05 15:32:54 +02:00
Denis Merigoux
025382a85d
Restore debug info 2022-05-05 14:34:29 +02:00
Denis Merigoux
a72944a3ec
Merge branch 'master' into allocations_logement 2022-05-05 14:27:48 +02:00
Denis Merigoux
8f1dae73a2
Restore CI 2022-05-05 14:06:56 +02:00
Denis Merigoux
8a0d5d7916
Factoring, nitpicks and updates 2022-05-05 14:01:30 +02:00
Denis Merigoux
d9da198740
Prettify family benefits 2022-05-05 14:00:44 +02:00
Lilya Slimani
288ec2c4f8 Articles Titre IV - Code réglementaire 2022-05-05 13:56:33 +02:00
Denis Merigoux
2074305a98
Added questions list made by @Lilyaslm 2022-05-04 17:33:47 +02:00
Denis Merigoux
33db3fb87a
Progress with @Lilyaslm 2022-05-04 17:17:05 +02:00
Denis Merigoux
49e8644510
Small comments and nitpicks 2022-05-04 14:53:29 +02:00
Denis Merigoux
e3e2e6c4e2
Better PDF 2022-05-04 14:01:24 +02:00
Lilya Slimani
92c9bda10a Correction typo 2022-05-03 15:39:36 +02:00
Denis Merigoux
601028388c
Enlève variables inutiles 2022-05-02 17:03:15 +02:00
Denis Merigoux
1848d6bf88
Format table [skip ci] 2022-05-02 16:20:39 +02:00
Denis Merigoux
5670546cc8
Fix lines too long 2022-05-02 16:20:39 +02:00
Lilya Slimani
28773cc82c Nouveaux tests Calcul APL secteur locatif 2022-05-02 15:47:16 +02:00
Lilya Slimani
cd4e9f48d0 Merge branch 'allocations_logement' of https://github.com/CatalaLang/catala into allocations_logement 2022-05-02 11:42:21 +02:00
Lilya Slimani
bc66bf64ef Nouveau test 2022-05-02 11:42:19 +02:00
Emile Rolley
ce2c7081b0 refactor(latex): print warning for too long lines + add instruction to compilation 2022-05-01 21:02:36 +02:00
Denis Merigoux
ad7fe6a21a
Use pandoc to prettify a lot the LaTeX document with tables 2022-04-29 23:47:02 +02:00
Denis Merigoux
857b2212c1
Implemented rounding where law requires it 2022-04-29 21:52:51 +02:00
Denis Merigoux
1bf4404bb3
Big refactoring of the APL code 2022-04-29 20:18:01 +02:00
Denis Merigoux
2c1d52787d
Group variables by I/O 2022-04-29 16:41:34 +02:00
Denis Merigoux
741d151128
Correct indentation and sectionning + BMAF 2022-2023 [skip ci] 2022-04-29 10:50:46 +02:00
Denis Merigoux
4d6a5a1180
Fix [skip ci] 2022-04-28 13:38:39 +02:00
Denis Merigoux
3f3563cfeb
Print TOC in PDF 2022-04-28 13:32:35 +02:00
Denis Merigoux
a907226185
80-columns formatting + aberrent value in table dealt with 2022-04-28 13:19:26 +02:00
Denis Merigoux
f571ce9979
Rename tests correcly [skip ci] 2022-04-25 14:34:49 +02:00
Lilya Slimani
ab0ba04208 Merge branch 'allocations_logement' of https://github.com/CatalaLang/catala into allocations_logement 2022-04-25 11:16:59 +02:00
Lilya Slimani
44fd9be7f6 Mise en page 2022-04-25 11:16:57 +02:00
Denis Merigoux
8748918bd4
Fix doc and test 2022-04-22 15:23:41 +02:00
Denis Merigoux
d889397425
Write first computation test with @Lilyaslm! 2022-04-21 17:20:40 +02:00
Denis Merigoux
ea1fd2d336
Explanation of hidden invariant 2022-04-21 16:27:19 +02:00
Denis Merigoux
fe66ea44e1
Fix first test for eligibility with @Lilyaslm 2022-04-21 14:17:18 +02:00
Lilya Slimani
4cffff01bc Test Exemple 1 mis à jour 2022-04-21 14:09:34 +02:00
Denis Merigoux
8288537fa9
Merge branch 'allocations_logement' of github.com:CatalaLang/catala into allocations_logement 2022-04-15 17:04:07 +02:00
Denis Merigoux
b3e681f2a1
Logements foyer done with @Lilyaslm [skip ci] 2022-04-15 17:03:10 +02:00
Lilya Slimani
a845572a42 Erreur sur l'article 33 + références 2022-04-15 14:42:20 +02:00
Lilya Slimani
17189d2bd7 Suite Article 18 de l'arrêté du 27 septembre 2019 2022-04-14 14:10:38 +02:00
Denis Merigoux
171c3966f5
Pass some make flags to Clerk 2022-04-14 11:47:18 +02:00
Denis Merigoux
28a70ba6a6
Progress with @Lilyaslm 2022-04-13 15:02:43 +02:00
Denis Merigoux
738817a45d
Wrong sectioning [skip ci] 2022-04-13 12:09:46 +02:00
Denis Merigoux
94b5098262
Progress with @Lilyaslm 2022-04-13 11:56:54 +02:00
Denis Merigoux
89709ce062
Progress with @Lilyaslm [skip ci] 2022-04-08 16:07:19 +02:00
Denis Merigoux
6d05f0ffff
Answers to legal questions by @Lilyaslm 2022-04-08 14:30:35 +02:00
Lilya Slimani
8244f8e0cc Modifications + Ajout d'articles pour la cession de PP 2022-04-08 11:49:49 +02:00
Denis Merigoux
f0cf4f188a
Progress with @Lilyaslm 2022-04-05 12:24:26 +02:00
Lilya Slimani
11a1acf1c0 Préparation Cession pair programming du 05/04 2022-04-04 13:51:12 +02:00
Denis Merigoux
6ca133003e
Remove empty blocks 2022-03-30 16:41:36 +02:00
Denis Merigoux
b3964da288
Refactoring 2022-03-30 16:19:34 +02:00
Denis Merigoux
ff34459a7a
Progress @Lilyaslm 2022-03-29 15:34:58 +02:00
Lilya Slimani
f9ceded93c Merge branch 'allocations_logement' of https://github.com/CatalaLang/catala into allocations_logement 2022-03-29 14:02:08 +02:00
Lilya Slimani
579c1fe735 Article 18 2022-03-29 10:51:04 +02:00
Denis Merigoux
6c6414d84c
Progress with @Lilyaslm 2022-03-23 12:06:20 +01:00
Denis Merigoux
5cf45d529a
More progress with @Lilyaslm 2022-03-23 11:48:13 +01:00
Denis Merigoux
5cc9d2e70e
Progress on arrete with @Lilyaslm 2022-03-23 11:48:07 +01:00
Lilya Slimani
f649cbb03b Nouveaux articles 2022-03-23 11:47:52 +01:00
Lilya Slimani
61b82feee3 Articles supplémentaires 2022-03-23 10:55:32 +01:00
Denis Merigoux
916d43ae74
Refactor impayé code, otherwise some variables are undefined 2022-03-21 11:50:01 +01:00
Denis Merigoux
add0b4e16e
Refactoring and typechecking 2022-03-21 11:19:57 +01:00
lIlIlIlIIIIlIIIllIIlIllIIllIII
6be8d66324
arretés 3 et 4 et 6 et 9 2022-03-18 12:01:31 +01:00
lIlIlIlIIIIlIIIllIIlIllIIllIII
98d82f7a7e
Progress, with definition of tabular form using pattern matching 2022-03-18 11:45:06 +01:00
lIlIlIlIIIIlIIIllIIlIllIIllIII
f178ac5f08
Progress, with definition of tabular form using only exceptions/labels 2022-03-18 11:37:33 +01:00
Lilya Slimani
ccba78744a Articles Arrêté 27 septembre 2012 2022-03-18 11:36:18 +01:00
Lilya Slimani
6c1fb233f0 Article 8 décret 27 septembre 2019 2022-03-18 11:02:19 +01:00
Denis Merigoux
bc8bec7ca7
Remove duplicate code due to Catala code factoring 2022-03-17 14:12:34 +01:00
Denis Merigoux
5ba63d15b1
Correct low and high rounding 2022-03-17 13:31:47 +01:00
Denis Merigoux
e717353ed7
Implement rounding 2022-03-17 13:22:16 +01:00
Denis Merigoux
8f68e2b262
Merge branch 'master' into allocations_logement 2022-03-17 13:15:24 +01:00
Sandy Maguire
8bc3a87376
Fix typos in English tutorial 2022-03-16 18:07:19 -07:00
lIlIlIlIIIIlIIIllIIlIllIIllIII
84d336b49d
repairing tests 2022-03-16 14:54:38 +01:00
lIlIlIlIIIIlIIIllIIlIllIIllIII
fcfe683c50
added two tests with lilya & alain
fixed typechecking
2022-03-16 14:47:05 +01:00
lIlIlIlIIIIlIIIllIIlIllIIllIII
b8d65f9f29
pair programming with alain & lilya 2022-03-16 12:22:32 +01:00
lIlIlIlIIIIlIIIllIIlIllIIllIII
1f0518a241
fixing typos 2022-03-16 10:42:35 +01:00
Denis Merigoux
c936e7b6ed
Reshuffle code, make it work, correct a few yes/no inversion bugs 2022-03-15 19:47:41 +01:00
Lilya Slimani
2de4b7620c Oublie de la date de naissance du demandeur 2022-03-15 14:13:11 +01:00
Denis Merigoux
169432c9f2
Pair programming @Lilyaslm 2022-03-14 11:55:32 +01:00
Lilya Slimani
5712816bdc Premier test !! :) 2022-03-11 16:51:00 +01:00
Lilya Slimani
5e96656eb0 Merge branch 'allocations_logement' of https://github.com/CatalaLang/catala into allocations_logement 2022-03-11 15:14:51 +01:00
Lilya Slimani
f4e85e20d5 Ajout des articles pour la cession de PP + Tentative de programmation d'un exemple. 2022-03-11 11:46:45 +01:00
Denis Merigoux
a5425ec5ee
Pair programming with @Lilyaslm today! 2022-03-09 15:27:38 +01:00
Lilya Slimani
c945198898 Merge branch 'allocations_logement' of https://github.com/CatalaLang/catala into allocations_logement 2022-03-09 14:18:10 +01:00
Lilya Slimani
3206cd4cfb Ajout des articles à coder pour la prochaine cession de pair programming 2022-03-09 14:17:21 +01:00
Denis Merigoux
42cd56eaf1
Use grouped exceptions in allocations familiales code 2022-03-09 11:25:16 +01:00
Denis Merigoux
97ede2cde1
Merge branch 'master' into allocations_logement 2022-03-09 10:47:29 +01:00
Denis Merigoux
8167d7ee00
Simple tests 2022-03-06 17:13:40 +01:00
Lilya
f29dcfe9f2 Update code_construction_reglementaire.catala_fr 2022-03-04 14:11:53 +01:00