Commit Graph
799 Commits
Author SHA1 Message Date
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
Unknown f9fc35278a Add table name in ticket sender 2018-12-18 08:18:46 +01:00
CelineDknp 1eb847573e start of ticket 2018-12-18 00:33:51 +01:00
CelineDknp 572adc9c90 Merge branch 'integration' into dev-API 2018-12-18 00:08:18 +01:00
CelineDknp c591a2e55e False when 500/404 2018-12-17 13:55:27 +01:00
Unknown f733a0f5f9 Ticket submission form 2018-12-17 12:01:13 +01:00
Unknown c9d0428e07 Ticket table initialization 2018-12-17 09:58:29 +01:00
Unknown ac2135c6a9 Individual bill per outlet 2018-12-16 17:07:22 +01:00
CelineDknp 81ed562e9a tiny fix 2018-12-14 20:51:46 +01:00
CelineDknp e16c51f331 refactor + managers (maybe discuss) 2018-12-14 20:33:00 +01:00
CelineDknp 2af383f780 Zones, consummers and outlets are queried by correct zone 2018-12-14 19:15:41 +01:00
CelineDknp c21b71990a Merge branch 'integration' into dev-API 2018-12-14 18:26:47 +01:00
CelineDknp f600b4e4b6 Add users working 2018-12-14 18:26:12 +01:00
adhallet 3c41504fbe fix - do not duplicate elements when reloading modal or option 2018-12-14 18:05:52 +01:00
adhallet f56980a7c8 old manager form cleanup 2018-12-14 17:39:05 +01:00
adhallet 5a4a761b7a Add manager form - now dynamically requesting zones and elements 2018-12-14 17:37:23 +01:00
CelineDknp db6aa5133c Merge branch 'integration' into dev-API 2018-12-14 15:31:29 +01:00
adhallet a64cc3a137 smallfix - correct form name 2018-12-14 15:28:54 +01:00
CelineDknp 436d0334b1 Zone add is working 2018-12-14 15:19:46 +01:00
CelineDknp 05ebdac136 Merge branch 'integration' into dev-API 2018-12-14 15:09:32 +01:00
CelineDknp f09bbaa164 Still work in progress, need to merge again 2018-12-14 15:09:04 +01:00
adhallet f556237d56 Allow add zone 2018-12-14 15:00:51 +01:00
CelineDknp cff03f3d93 Merge branch 'integration' into dev-API 2018-12-14 14:50:57 +01:00
CelineDknp 2169bb3a51 Work in progress but need to merge 2018-12-14 14:50:30 +01:00
adhallet f2c432f62d Allow add manager 2018-12-14 14:46:01 +01:00
CelineDknp 75141f6919 manual merge 2018-12-14 12:01:29 +01:00
CelineDknp dc116ba047 Changed date 2018-12-14 11:59:48 +01:00