 adhallet
|
d40a112fff
|
Always disallow non-numeric input in "number" type inputs
|
2019-03-13 16:01:28 +01:00 |
|
|
adhallet
|
5be32dfdfd
|
Merge branch 'integration' of https://github.com/AdrienHalletUCL/HaitiWater into integration
|
2019-03-13 14:47:32 +01:00 |
|
|
adhallet
|
a6168a23cb
|
Generic Modal handler in report page
|
2019-03-13 14:47:18 +01:00 |
|
|
CelineDknp
|
ae4adb9816
|
Fixed month name in report
|
2019-03-13 13:10:35 +01:00 |
|
|
adhallet
|
f6cb99e69a
|
Merge branch 'integration' of https://github.com/AdrienHalletUCL/HaitiWater into integration
|
2019-03-12 11:51:15 +01:00 |
|
|
adhallet
|
5fcb81612e
|
Help page quick help
|
2019-03-12 11:51:04 +01:00 |
|
|
adhallet
|
2776ce154a
|
Financial page quick help and imports
|
2019-03-12 11:48:17 +01:00 |
|
|
adhallet
|
0eb7011bcc
|
Consumer page import
|
2019-03-12 11:40:09 +01:00 |
|
|
adhallet
|
2480908402
|
Consumer page quick help
|
2019-03-12 11:35:32 +01:00 |
|
|
CelineDknp
|
a6221b6f1d
|
Merge
|
2019-03-12 11:05:40 +01:00 |
|
|
adhallet
|
e682e903c9
|
Report page quick help
|
2019-03-11 20:45:44 +01:00 |
|
|
adhallet
|
889890bc99
|
Log page quick help
|
2019-03-11 20:38:01 +01:00 |
|
|
CelineDknp
|
782a8bf477
|
Re-put the details
|
2019-03-11 20:23:41 +01:00 |
|
|
adhallet
|
3360e35f1b
|
Water network quick help
|
2019-03-11 20:22:09 +01:00 |
|
|
CelineDknp
|
2c4ef620e1
|
Fixed the view
|
2019-03-11 19:36:45 +01:00 |
|
|
CelineDknp
|
9ae574c022
|
Added zone view to speed up
|
2019-03-11 19:17:32 +01:00 |
|
|
adhallet
|
fc4e2c0779
|
(finally) fix misalignment of header/columns in water_element
|
2019-03-11 18:44:36 +01:00 |
|
|
CelineDknp
|
49280a6f42
|
Removed not-so-useful context infos to speed up
|
2019-03-11 18:29:05 +01:00 |
|
|
adhallet
|
4c02ca252f
|
IntroJS CSS rules to allow nano-menu compatibility
|
2019-03-11 18:27:19 +01:00 |
|
|
adhallet
|
e2eb0f742d
|
Add ID to reference IntroJS
|
2019-03-11 18:26:55 +01:00 |
|
|
adhallet
|
8a2e1f2c38
|
Help page advanced
|
2019-03-11 18:26:37 +01:00 |
|
|
adhallet
|
96eede41ea
|
Help page skeleton
|
2019-03-11 18:26:14 +01:00 |
|
|
adhallet
|
027c37933a
|
Dashboard page tour
|
2019-03-11 18:24:23 +01:00 |
|
|
adhallet
|
dc46f1666a
|
Merge branch 'help' into integration
# Conflicts:
# code/haitiwater/templates/base.html
|
2019-03-11 11:43:45 +01:00 |
|
|
adhallet
|
13d6c29cec
|
Merge branch 'help' of https://github.com/AdrienHalletUCL/HaitiWater into help
|
2019-03-11 11:41:57 +01:00 |
|
|
CelineDknp
|
a0523f098f
|
Merge branch 'opti' of https://github.com/AdrienHalletUCL/HaitiWater into opti
|
2019-03-11 09:34:56 +01:00 |
|
|
CelineDknp
|
f4389620de
|
fixed managers issue
|
2019-03-11 09:34:30 +01:00 |
|
|
sebastien.strebelle@student.uclouvain.be
|
52e9e57834
|
readded cache caus it wasn't the problem
|
2019-03-10 15:32:00 +01:00 |
|
|
CelineDknp
|
9eadb2272c
|
Temporarly removed cache
|
2019-03-10 12:35:44 +01:00 |
|
|
AdrienHalletUCL
|
2cc3ed8748
|
Fix table row selection
|
2019-03-09 18:09:25 +01:00 |
|
|
AdrienHalletUCL
|
e217e1fe14
|
Reorder as to not block request when failing form
|
2019-03-09 18:02:59 +01:00 |
|
|
AdrienHalletUCL
|
fe01129b0f
|
Merge branch 'integration' of https://github.com/AdrienHalletUCL/HaitiWater into integration
|
2019-03-09 17:39:37 +01:00 |
|
|
AdrienHalletUCL
|
e0acaf5a04
|
Lock buttons when sending
|
2019-03-09 17:39:34 +01:00 |
|
|
CelineDknp
|
8fcb586d61
|
Fixes after merge
|
2019-03-09 16:47:23 +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 |
|
|
adhallet
|
af35a865f1
|
Reorder imports and change editable condition
|
2019-03-08 11:18:19 +01:00 |
|
|
adhallet
|
eb5fe268b5
|
Merge branch 'financial' of https://github.com/AdrienHalletUCL/HaitiWater into financial
|
2019-03-08 11:17:00 +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 |
|
|
adhallet
|
22775a89d1
|
Fountain Manager view
|
2019-03-07 21:34:07 +01:00 |
|
|
adhallet
|
3862abec29
|
Hide details when they are useless
|
2019-03-07 21:28:28 +01:00 |
|
|
adhallet
|
2f8381df9d
|
Refresh details on modification
|
2019-03-07 21:03:38 +01:00 |
|
|
adhallet
|
ea21df6b43
|
Consumer filter on zone click in financial module and helpers
|
2019-03-07 20:55:45 +01:00 |
|
|
adhallet
|
48770a7e8a
|
Change JS init order
|
2019-03-07 20:24:39 +01:00 |
|
|
CelineDknp
|
dcf3d20e45
|
Re-set the timer to 30 secondes when cache hit
|
2019-03-06 19:53:36 +01:00 |
|
|
Sébastien Strebelle
|
a3d0e3eac3
|
removing payment
|
2019-03-06 19:46:03 +01:00 |
|
|
adhallet
|
7c84004fc5
|
Financial module tables logic polish
|
2019-03-06 18:30:48 +01:00 |
|
|
adhallet
|
53734fb513
|
fix indentation error
|
2019-03-06 18:19:06 +01:00 |
|
|
CelineDknp
|
fb2eba2e7a
|
Deleting cache when edit/add/remove
|
2019-03-06 16:49:40 +01:00 |
|
|
adhallet
|
c63809cca9
|
Payment display (wip)
|
2019-03-06 14:01:56 +01:00 |
|