Denis Merigoux
5bddde1c68
Fix documentation and test invocation
2022-08-30 13:48:20 +02:00
Hugo Gimbert
9a17205a2a
merged with master
2022-08-30 10:00:14 +02:00
Hugo Gimbert
799b16975d
Merge remote-tracking branch 'origin/master' into cgr_example
2022-08-30 09:37:50 +02:00
Hugo Gimbert
a859eeb947
NSW tests ok
2022-08-30 09:16:03 +02:00
Denis Merigoux
1c3d5b9a75
Fix all lines too long problems & update assets
2022-08-29 15:46:06 +02:00
Denis Merigoux
538cca3f0e
Fix table
2022-08-26 12:05:22 +02:00
Denis Merigoux
e41e0f9dcc
Fix line length and display lines of code
2022-08-26 12:05:22 +02:00
Denis Merigoux
062fea89d7
No RLS for logement-foyers
2022-08-19 11:54:15 +02:00
Denis Merigoux
d6ad4604ce
Only social conventions for logement-foyers
2022-08-19 11:39:04 +02:00
Denis Merigoux
1553f88cf5
Remove unnecessary input
2022-08-18 18:53:30 +02:00
Denis Merigoux
2bc1b7d7f7
RLS only for social housing
2022-08-18 16:00:52 +02:00
Denis Merigoux
62ff234319
Shuffle data around
2022-08-18 15:27:01 +02:00
Denis Merigoux
1d63c48b9c
Fix test
2022-08-18 11:55:19 +02:00
Denis Merigoux
331789bfee
Remove input data duplicate
2022-08-16 17:39:18 +02:00
Denis Merigoux
82940b63e3
Remove mode_occupation from AL/APL logement-foyer's input
...
In favor of a more restricted input
2022-08-16 17:01:53 +02:00
Denis Merigoux
54e08585c6
Put sectorial information where it belongs
2022-08-16 16:22:51 +02:00
Denis Merigoux
92189e6439
Fix bug introduced by a1ebb67
2022-08-16 14:40:12 +02:00
Denis Merigoux
a1ebb6715c
Remove age prompts, deduct from birth date correctly
2022-08-16 11:08:13 +02:00
Denis Merigoux
d93e00c7bc
Some factorization
2022-08-15 18:33:09 +02:00
Denis Merigoux
1fdb21326b
Fix logement meublé thing
2022-08-15 17:43:29 +02:00
Denis Merigoux
489d2f9506
Fixed bugs in allocation logement eligibility
2022-08-15 17:16:23 +02:00
Denis Merigoux
c71b8e28c6
Moving parameters into property-section of data
2022-08-12 11:16:52 +02:00
Denis Merigoux
ef269df553
Restore tests
2022-08-12 09:51:35 +02:00
Denis Merigoux
c062ac2924
Added a new test
2022-08-11 18:18:04 +02:00
Denis Merigoux
9184b1e265
Further use let-in
2022-08-11 18:17:53 +02:00
Denis Merigoux
35a893920b
Précision chambre CROUS
2022-08-11 18:17:33 +02:00
Denis Merigoux
9eef072cdd
Logement à usage locatif s'applique aussi aux logements-foyers
2022-08-11 18:17:00 +02:00
Denis Merigoux
7b7d31d0a5
Fix non-negative value bug in housing benefits
2022-08-11 16:16:00 +02:00
Denis Merigoux
a48e90150c
Use let-bindings to refactor code
2022-08-11 14:12:11 +02:00
Denis Merigoux
038e6068e6
Small improvements to housing benefits
2022-08-10 18:13:07 +02:00
Denis Merigoux
e5d6c26eb4
Merge pull request #303 from CatalaLang/feat-add-details-to-html
...
Feat: improve the HTML generation with ToC and details tags
2022-08-05 20:42:36 +02:00
Denis Merigoux
d75d86d321
Merge pull request #305 from CatalaLang/aides_logement
...
Mise à jour du calcul des aides au logement suite à revalorisation
2022-08-05 20:28:13 +02:00
Emile Rolley
03aebf7f1c
feat(backends/html): improve the code generation with ToC and details tags
2022-08-05 10:55:45 +02:00
Denis Merigoux
0e2bc96789
Mise à jour du calcul des aides au logement avec https://www.legifrance.gouv.fr/jorf/id/JORFSCTA000046114996
2022-08-04 18:07:29 +02:00
Louis Gesbert
e50b567000
Fix relative dir in french_law artifacts ; add a note in examples/README.md
2022-08-04 17:36:50 +02:00
Louis Gesbert
289975ebe8
Generate french law python artifacts through dune
...
(they're no longer reformatted, at the moment, though)
2022-08-03 19:04:14 +02:00
Louis Gesbert
9db038812c
Include generation of json_schema artifacts
...
(plus other small Makefile improvements)
2022-08-03 18:55:42 +02:00
Louis Gesbert
0600501ec6
Generate french_law artifacts through dune
...
The files where manually generated through Makefile rules, and
versionned (with an outdated version).
The issue was that we had:
- `dune` building Catala
- Makefiles calling `catala` to build and copy the `french_law/ocaml/law_source`
files
- then `dune` again to build `french_law`
The result was that `dune build` (without running `make` first) would
return a weird error.
The proposed solution adds ad-hoc dune rules to call the catala
binary, so that it can handle the whole pipeline correctly. If OCaml
is purely a backend, though, a simpler solution that makes us less
dependent on dune would be to handle the compilation of `french_law`
manually.
The dune rules are set to 'promote' the files so that it preserves the
fact that they are versionned (but with no confusion of the build system
about where they should come from anymore)
2022-08-03 18:55:42 +02:00
Emile Rolley
1a6934b538
feat(build): add the generation of json schemas to the build workflow
2022-07-29 18:47:42 +02:00
Emile Rolley
32ec53d918
refactor(plugins): jsoo -> web
2022-07-29 18:42:41 +02:00
Denis Merigoux
27560b0ab8
Fix conflict
2022-07-28 17:18:41 +02:00
Denis Merigoux
97b6e14740
Removed useless variable
2022-07-28 15:02:43 +02:00
Denis Merigoux
d91ed27e28
The JS version of the housing benefits computation is working!
2022-07-28 15:02:43 +02:00
Denis Merigoux
fa55a83fb4
Merge branch 'master' into 290-jsoo-wrapper-plugin
2022-07-22 17:54:51 +02:00
Denis Merigoux
aa3820c2a7
Nitpicks
2022-07-22 17:42:24 +02:00
Denis Merigoux
4002c22570
Contre-ordre: DGLAN admet l'arrondi par défaut
2022-07-22 17:05:09 +02:00
Emile Rolley
d9045499c0
refactor(french_law/ocaml): refactor the api_web.ml
2022-07-22 17:01:33 +02:00
Denis Merigoux
dc00ce8957
Merge branch 'master' into aides_logement
2022-07-22 16:49:01 +02:00
Denis Merigoux
ad0f02837c
Fix some TODOs
2022-07-21 14:54:05 +02:00
Emile Rolley
61899cd698
fix(examples): assets are now generated from the repo root
2022-07-20 18:29:01 +02:00
Denis Merigoux
5bcee7ceba
Correctly generate HTML output
2022-07-20 15:35:26 +02:00
Denis Merigoux
58cb48fb28
Merge remote-tracking branch 'origin/master' into aides_logement
2022-07-20 11:20:00 +02:00
Denis Merigoux
59bdd2a3a0
Do not round for mensualite_minimale [skip ci]
2022-07-19 18:14:22 +02:00
Denis Merigoux
47f3632b5a
Don't round as much according to DGALN
2022-07-19 16:29:26 +02:00
Denis Merigoux
793efb4682
In the process of switching some money types to decimal [skip ci]
2022-07-19 13:53:12 +02:00
Denis Merigoux
c134dc4b45
Fix tests with new info from DGALN
2022-07-19 10:53:28 +02:00
Denis Merigoux
f5c3910e74
Formatting [skip ci]
2022-07-16 18:36:26 +02:00
Denis Merigoux
bd6218fe94
Include some tests given by DGALN/DHUP/FE4
2022-07-16 14:36:56 +02:00
Denis Merigoux
5e0b20ca63
Invert hierarchy for old articles [skip ci]
2022-07-14 18:54:44 +02:00
Denis Merigoux
94a1d9bf21
Fix subtle bug. Might be worth it to ask to DGALN! [skip ci]
2022-07-14 18:11:31 +02:00
Denis Merigoux
edbb862709
Factorize equivalence minimal loyer and nombre parts into their own scopes
2022-07-14 18:10:45 +02:00
Denis Merigoux
29f9dfe055
More testing and code fixing
2022-07-14 15:11:28 +02:00
Denis Merigoux
0d21884f26
In the process of debugging AccessionPropriété
2022-07-13 18:40:27 +02:00
Denis Merigoux
80843ccefb
More testing
2022-07-13 17:27:29 +02:00
Denis Merigoux
e0ad15b21f
Fix test format
2022-07-13 16:18:56 +02:00
Denis Merigoux
71b03d85ef
Modified tests because of change to participation minimale formula
2022-07-11 23:10:24 +02:00
Denis Merigoux
4498ee7c6a
Ajout test gouvernemental
2022-07-11 22:52:28 +02:00
Denis Merigoux
ec6e186ab2
Ajout archives arrêtés pour anciens paramètres de calcul
2022-07-11 22:52:02 +02:00
Louis Gesbert
4726d00df8
Adjust test results
...
Nothing shocking here:
- division by zero now reported on the application rather than the
operator
- renumbering of printed bindlib variables
- some whitespace changes
2022-07-11 17:43:59 +02:00
Louis Gesbert
1d268a940b
Add tests for the examples as well
2022-07-08 17:18:58 +02:00
Denis Merigoux
81fe7db311
Implemented better split custody handling that applies correct post-processing steps to the
...
corrected amount
2022-07-07 15:19:32 +02:00
Denis Merigoux
6987719f3b
Prepping for correct split custody sharing
2022-07-07 15:03:03 +02:00
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
