Commit Graph
291 Commits
Author SHA1 Message Date
CelineDknp 8b99264aef Working on the change of password 2019-01-09 21:12:13 +01:00
AdrienUCL 71776d8047 Add names to form inputs 2019-01-09 17:37:20 +01:00
AdrienUCL f4dae8625f Profile edition forms 2019-01-09 03:11:30 +01:00
AdrienUCL dcb5d2f5ad rules for profile edition urls 2019-01-09 00:24:49 +01:00
AdrienUCL 9c124480d4 fix - Hide edit column properly when edit set to false 2019-01-09 00:01:48 +01:00
AdrienUCL 1a5c65a07d Merge branch 'integration' of https://www.github.com/AdrienHalletUCL/HaitiWater into integration 2019-01-08 23:52:21 +01:00
CelineDknp 1a0e21c37f merge and data 2019-01-08 23:49:39 +01:00
CelineDknp 147d0f2816 Month in fr 2019-01-08 23:44:23 +01:00
AdrienUCL 126b6460b7 Reverting unnecessary restriction on water_element page 2019-01-08 23:40:31 +01:00
AdrienUCL a17dad0154 Ready to receive back-end data on "consumers" page 2019-01-08 23:33:50 +01:00
AdrienUCL 05ad1fcf06 Correct month in water_network stat 2019-01-08 23:22:41 +01:00
CelineDknp 6268118385 manual merge 2019-01-08 23:19:18 +01:00
CelineDknp e7abee8762 Add infos to views 2019-01-08 23:11:07 +01:00
CelineDknp 7bc28931c6 Not allowing wrong users to access wrong data 2019-01-08 22:36:50 +01:00
CelineDknp 454dc2daa5 Mail sent trough Gmail account 2019-01-08 22:08:16 +01:00
AdrienUCL 97926a47c4 Smoothing up some GUI parts + Hide non-allowed page for fountain manager 2019-01-08 17:37:50 +01:00
AdrienUCL 842f1ae54e Merge branch 'integration' of https://www.github.com/AdrienHalletUCL/HaitiWater into integration 2019-01-07 19:00:47 +01:00
AdrienUCL e8c7160ec3 Dynamic filtering of zone management v1 (only filtering managers from zones) 2019-01-07 19:00:27 +01:00
CelineDknp 8d1f38c129 Months are done 2019-01-07 17:40:49 +01:00
CelineDknp b9a2d2d625 Merge branch 'integration' of https://github.com/AdrienHalletUCL/HaitiWater into integration 2019-01-07 17:24:05 +01:00
CelineDknp ea6d435a76 Correct language for tickets. You need to supress previous tickets and makemigrations/migrate 2019-01-07 17:23:51 +01:00
AdrienUCL bf5290d6f1 Merge branch 'integration' of https://www.github.com/AdrienHalletUCL/HaitiWater into integration 2019-01-07 17:08:18 +01:00
AdrienUCL 7c4bbda00b Update ticket table when sending a ticket 2019-01-07 17:08:05 +01:00
CelineDknp 3f08353c09 Fixed weird datatable error 2019-01-07 17:07:35 +01:00
CelineDknp 5725a9cedf Merge branch 'integration' of https://github.com/AdrienHalletUCL/HaitiWater into integration 2019-01-07 16:49:00 +01:00
AdrienUCL 6e7e47f521 Split context for water elements report and ticket 2019-01-07 16:47:47 +01:00
AdrienUCL 4bf97ab1ad smallfix - get zones on manager add 2019-01-07 16:44:23 +01:00
CelineDknp 230af112f7 Code for two contexts created 2019-01-07 16:44:11 +01:00
CelineDknp 5425214952 Integer is not a good type choice for quantity or price. Need to makemigrations/migrate after this 2019-01-07 16:20:48 +01:00
AdrienUCL 0fd7dbaa1f Singular table name 2018-12-27 13:57:22 +01:00
AdrienUCL 5b0780c82b Merge branch 'dev-API' into dev-gui-split 2018-12-27 13:53:54 +01:00
CelineDknp f285b91b19 Bug of zone suppression is fixed 2018-12-27 13:51:55 +01:00
AdrienUCL cea6d88343 Merge branch 'integration' into dev-gui-split 2018-12-27 13:37:10 +01:00
CelineDknp 6aedaa2cfc Should fix bug 2018-12-27 13:02:47 +01:00
AdrienUCL 56e7ba1474 Notification fixtures. Now just missing the back load 2018-12-26 15:59:07 +01:00
AdrienUCL 3729b673f0 UX improvements on ticket table 2018-12-26 15:54:04 +01:00
AdrienUCL 3f23c19b78 Dismiss modals with data wiping and disable modification of personal fields for the manager 2018-12-26 15:10:28 +01:00
AdrienUCL 5642d753a9 Merge branch 'dev-API' into dev-gui-split 2018-12-26 14:48:05 +01:00
AdrienUCL 4844b7ef74 All-singular table names for consistency 2018-12-26 14:46:20 +01:00
CelineDknp f15f33984d Finished refactor 2018-12-22 20:03:00 +01:00
CelineDknp 700362df80 refactor of edit done 2018-12-22 19:59:09 +01:00
CelineDknp 991c4dab31 Refactor add elements 2018-12-22 12:49:16 +01:00
CelineDknp 2b644d14c0 Fixed first page, now points to login 2018-12-22 11:16:08 +01:00
CelineDknp df5f04be7f Manager edition is done (only possible to edit zone/outlets) 2018-12-20 16:02:24 +01:00
CelineDknp 93d21da7d1 Zone edition is done 2018-12-20 15:50:53 +01:00
Unknown cc619ba39d Edit multimodal (still not 100% usable but works) 2018-12-19 15:21:02 +01:00
CelineDknp 764c84b664 Merge branch 'dev-API' into integration 2018-12-19 14:45:35 +01:00
CelineDknp a289baa4e8 Merge branch 'integration' of https://github.com/AdrienHalletUCL/HaitiWater into integration 2018-12-19 14:45:29 +01:00
CelineDknp fa79cb062d Return user identifiant 2018-12-19 14:44:57 +01:00
CelineDknp 66ac57f269 safe delete zone 2018-12-19 14:40:52 +01:00