Commit Graph
15 Commits
Author SHA1 Message Date
Sébastien Strebelle 1ffe9c90ca New request to get only outlets 2019-03-18 13:01:06 +01:00
Sébastien Strebelle 608db8a7d4 debugged merge of details + menstrual report of individual without consumer 2019-03-14 13:56:27 +01:00
Sébastien Strebelle ccbf93909b start of manual merge, still buggy 2019-03-08 19:01:50 +01:00
Sébastien Strebelle 17e67a0959 Merge branch 'financial' into integration
# Conflicts:
#	code/haitiwater/apps/api/add_table.py
#	code/haitiwater/apps/api/edit_table.py
#	code/haitiwater/apps/api/exports.py
#	code/haitiwater/apps/api/get_table.py
#	code/haitiwater/apps/api/urls.py
#	code/haitiwater/apps/zone_management/static/zoneModalHandler.js
#	code/haitiwater/haitiwater/settings.py
#	code/haitiwater/haitiwater/urls.py
#	code/haitiwater/static-common/javascripts/tables/genericTableHandler.js
2019-03-08 13:51:44 +01:00
Sébastien Strebelle 1f2eb16c74 compiled introduction 2019-03-05 20:14:28 +01:00
Unknown b33d3e8f0a Merge branch 'gui-gis' into integration 2019-02-20 19:07:32 +01:00
CelineDknp c7410ee738 Processing request 2019-02-11 12:56:32 +01:00
CelineDknp d34442bec0 First try detail request 2019-02-07 19:34:24 +01:00
CelineDknp 1c28dcaf32 Return value for detail 2019-02-07 17:24:38 +01:00
CelineDknp e17c6d81fa First draft of report 2018-12-12 21:53:44 +01:00
CelineDknp b3b7950c16 Meh. Urls needed 2018-12-12 09:54:49 +01:00
CelineDknp 8bfd975367 Adding and modifying network element working. Removing not yet 2018-11-21 17:34:22 +01:00
CelineDknp 5e014707a3 Start working on the API, need to talk with back-end 2018-11-21 13:36:33 +01:00
adhallet f42965bd89 Datatable proposition 2018-11-06 00:56:24 +01:00
adhallet 3482454bb9 Init API with dummy graph request 2018-11-04 22:41:31 +01:00