OpenSource/HaitiWater
1
0 Fork 0
mirror of https://github.com/AdrienHallet/HaitiWater.git synced 2026-11-04 13:45:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
904 Commits 4 Branches 0 Tags
240d892abc5d261d95318ac94de66b4eee136ebf
Commit Graph
61 Commits
Author SHA1 Message Date
Sébastien Strebelle 240d892abc rest of table tests 2019-05-01 12:49:51 +02:00
Sébastien Strebelle fc6cb415db half table tests 2019-05-01 00:40:49 +02:00
Sébastien Strebelle 9859447306 some lint 2019-04-08 13:00:19 +02:00
CelineDknp 8e56c19b4e Fixed balance. Oops 2019-04-07 16:52:28 +02:00
Sébastien Strebelle ad9dd4f4d2 back ready for consumer zone in datatable 2019-04-06 13:57:47 +02:00
Sébastien Strebelle 3729426ebe clean exports + lint authentication 2019-04-02 15:08:46 +02:00
Sébastien Strebelle 77e54bf779 Graph 2 + some opti 2019-04-01 22:38:44 +02:00
CelineDknp 12ba9c23de First draft phone number for managers 2019-03-28 15:22:10 +01:00
Sébastien Strebelle 8c2fc16b70 fixed payment cache 2019-03-28 13:29:18 +01:00
Sébastien Strebelle bfed9c9963 Lint edit and export + fix consumer phone 2019-03-28 13:14:39 +01:00
CelineDknp 1702d5a7c9 Merge branch 'integration' of https://github.com/AdrienHalletUCL/HaitiWater into integration 2019-03-17 18:25:47 +01:00
CelineDknp 097efcfefd Logs are cleaned 2019-03-17 17:53:21 +01:00
Sébastien Strebelle 55dd46cf93 debugged NaN on tickets table 2019-03-16 13:29:33 +01:00
CelineDknp f8e5c3523f Added query for log history 2019-03-14 18:59:45 +01:00
CelineDknp 6476850fb6 Merge branch 'integration' into DB-log 2019-03-14 18:48:07 +01:00
Sébastien Strebelle 608db8a7d4 debugged merge of details + menstrual report of individual without consumer 2019-03-14 13:56:27 +01:00
CelineDknp cc3ce76c7e Work in progress 2019-03-14 11:49:01 +01:00
CelineDknp e2d23e5ac6 Log of location 2019-03-12 13:50:49 +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 37be3a55ee payment not editabe for fountain managers and filter consumers by zone 2019-03-08 10:02:20 +01:00
Sébastien Strebelle 7bb67e4a6c debugged adding payment 2019-03-06 13:50:06 +01:00
Sébastien Strebelle e6cef295e1 adding and editing payments 2019-03-06 08:15:50 +01:00
Sébastien Strebelle 1f2eb16c74 compiled introduction 2019-03-05 20:14:28 +01:00
CelineDknp 516dcc7737 Caching ! 2019-03-04 17:20:05 +01:00
CelineDknp f3664ca28f Optimization of the water_element queries 2019-03-04 15:11:49 +01:00
CelineDknp dcbf29b2f8 Adding outlets ID to the managers infos for GUI 2019-02-28 15:24:10 +01:00
CelineDknp 445aeb4ccd Fixed bug with periodicity un water elements 2019-02-28 15:21:27 +01:00
CelineDknp 2c4c7e8ae4 Fixed the fix 2019-02-27 21:35:24 +01:00
CelineDknp 085d17a777 Fixed problem when filtering 2019-02-27 21:30:35 +01:00
CelineDknp afd5a6d6c1 Monthly report edit, work in progress 2019-02-27 15:55:24 +01:00
CelineDknp 9afeb5acfe Get specific output for monh 2019-02-25 11:28:48 +01:00
CelineDknp 93f260fdab Fix duplication of fountain manager with multiple fountains 2019-02-25 10:58:59 +01:00
CelineDknp 21fed4c7bc Fix tiny error 2019-02-24 17:18:06 +01:00
CelineDknp 5862d2b46d View of past reports 2019-02-24 16:58:41 +01:00
Unknown b33d3e8f0a Merge branch 'gui-gis' into integration 2019-02-20 19:07:32 +01:00
CelineDknp aaa2120f9e A bit of manual merge 2019-02-20 13:42:02 +01:00
CelineDknp 8c90b2bd5a Fixed zone number problem 2019-02-17 21:53:31 +01:00
CelineDknp f2dde62038 Prettyfication 2019-02-17 17:02:08 +01:00
CelineDknp 1f840f9f43 Re-adding logged item is probably working 2019-02-16 17:33:50 +01:00
CelineDknp 0dcbb29d10 Fixed failure in details 2019-02-11 11:24:55 +01:00
CelineDknp 603ca8df52 Fixes from integration 2019-02-11 11:09:18 +01:00
CelineDknp 757ae3083c Returns the zone for everyone 2019-02-09 17:36:38 +01:00
CelineDknp 89e3ce6b07 Fix consumer not showing for fountain manager 2019-02-09 17:16:41 +01:00
CelineDknp 1c28dcaf32 Return value for detail 2019-02-07 17:24:38 +01:00
CelineDknp 7c2d13eb62 Pretty logs 2019-01-30 15:50:31 +01:00
CelineDknp 0e02ecd026 Small change to log details 2019-01-29 19:11:44 +01:00
CelineDknp e2a132d12d Getting the logs is kinda done 2019-01-27 21:43:31 +01:00
CelineDknp f01efae8f1 Count tickets 2019-01-19 15:34:54 +01:00
CelineDknp 82c99fcb76 Fixed bug with network elem that no one saw 2019-01-09 21:54:10 +01:00
CelineDknp e7abee8762 Add infos to views 2019-01-08 23:11:07 +01:00