Commit Graph
275 Commits
Author SHA1 Message Date
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
CelineDknp 1f95bb3a87 Element deletion is now safe 2018-12-19 14:23:56 +01:00
Unknown f08340c5dd Visual enhancement and link back-front on elements 2018-12-19 13:19:25 +01:00
CelineDknp 82e919f4a1 Moar little bug fixing 2018-12-18 18:39:33 +01:00
CelineDknp b42a016d95 Fix little bug in ticket 2018-12-18 18:00:37 +01:00
Unknown bae6c69a8e Proper login screen 2018-12-18 13:20:37 +01:00
CelineDknp 398133e3eb Merge branch 'integration' of https://github.com/AdrienHalletUCL/HaitiWater into integration 2018-12-18 10:54:28 +01:00
CelineDknp bfb20294b2 Show ticket 2018-12-18 10:53:16 +01:00
CelineDknp aacad90124 Merge pull request #11 from AdrienHalletUCL/dev-API
Requête pour quand c'est possible (rien ne presse)
2018-12-18 10:13:37 +01:00
Unknown 4c2093ff1d fix - multiple notifications for one add 2018-12-18 10:11:59 +01:00
CelineDknp 58cff56a7a Forgot to add 2018-12-18 10:10:37 +01:00
CelineDknp ba5ea62855 Correct data in report 2018-12-18 10:10:09 +01:00
Unknown eedfeba9ff Add outlet selection in problem report 2018-12-18 10:01:30 +01:00
CelineDknp 94d95f6aa8 water_outlet id 2018-12-18 09:41:37 +01:00
Unknown cacd430d97 Hiding error messages in forms 2018-12-18 09:35:04 +01:00
CelineDknp 2ad8d43331 Images in ticket working 2018-12-18 09:24:39 +01:00
CelineDknp 4c584ccfd5 Merge branch 'integration' into dev-API 2018-12-18 08:44:50 +01:00