Commit graph

561 commits

Author SHA1 Message Date
Thomas Bloor
8a1e0bc1a7 note even sure why that was there 2019-09-09 21:09:47 +01:00
Thomas Bloor
4304f863ac more CI fixes 2019-09-09 21:08:49 +01:00
Thomas Bloor
248e2f35cb change to use latest node for compilation 2019-09-09 21:00:30 +01:00
Thomas Bloor
732088295e fix CI config 2019-09-09 20:55:21 +01:00
Thomas Bloor
45c534f4a6 remove uneccessary stuff and work on CI 2019-09-09 20:45:24 +01:00
Thomas Bloor
015aff25ad Merge branch 'finn/wards' into development 2019-09-09 19:56:26 +01:00
Thomas Bloor
78021a7fd9 Fix a large amount of things in the ui 2019-09-09 19:52:38 +01:00
Finn
2dc9616075 Added initial working table for transaction types 2019-09-09 16:13:34 +01:00
Finn
1aa6f658c9 ward import fixed 2019-09-05 17:18:52 +01:00
Finn
0644f366a8 BROKEN: Added wards table 2019-09-04 18:21:21 +01:00
Tom Slater
42e310b36a Misc chart work
Search feature on both suppliers and the pagination feature on the spend history still not functional
2019-08-30 16:50:19 +01:00
Tom Slater
d7f9d7e755 chart work 2019-08-28 10:47:44 +01:00
Tom Slater
1708747a03 Merge remote-tracking branch 'origin/tyu-tyu/charts' into tyu-tyu/charts 2019-08-23 11:42:39 +01:00
Tom Slater
249c7ba93b Chart improvements
Minor fixes  + refresh on supplier spend chart
2019-08-22 16:59:51 +01:00
Tom Slater
4130b2fb7d Merge remote-tracking branch 'origin/tyu-tyu/char' into tyu-tyu/charts 2019-08-21 11:53:53 +01:00
Tom Slater
2cb17c12dd Colour fixes 2019-08-21 11:51:10 +01:00
Tom Slater
2e00e87574 Misc chart work 2019-08-20 16:47:20 +01:00
Finn
ed2025b67d properly displaying essential purchases dataset 2019-08-20 16:43:53 +01:00
Finn
81d56f3bc9 removed console logs that show password 2019-08-20 14:33:44 +01:00
Tom Slater
9e156ad57f Merge remote-tracking branch 'origin/felix/customranges' into tyu-tyu/char 2019-08-19 13:48:47 +01:00
Tom Slater
6e0a42dd27 Chart work update
working on essential purchase graph
2019-08-19 12:30:36 +01:00
Tom Slater
1013a403a3 Misc Chart work 2019-08-16 16:58:35 +01:00
Felix
610dc8d9dc removed test graph 2019-08-16 15:55:22 +01:00
Felix
2d79748413 commented out console.logs 2019-08-16 15:24:49 +01:00
Felix
7f3c8bb123 added loading spinner for when graph is loading 2019-08-16 15:23:18 +01:00
Tom Slater
1070c5de3b Merge branch 'tyu-tyu/chart' into felix/customranges 2019-08-16 13:58:13 +01:00
Tom Slater
1299c15f4b Chart work
Misc Chart work
2019-08-16 12:27:05 +01:00
Felix
d13f851350 IT WORKS! (date range picker) 2019-08-16 12:13:43 +01:00
Felix
f395c64599 more debugging 2019-08-16 11:32:45 +01:00
Felix
9408593431 debugging caching 2019-08-16 10:51:47 +01:00
Felix
20fb03d1c9 caching data from server to increase speed 2019-08-16 10:27:49 +01:00
Felix
716bb409b5 turns out the brackets were the wrong way around 2019-08-15 16:51:06 +01:00
Felix
c16817317e date pickers work 2019-08-15 16:34:13 +01:00
Felix
80bc7e8328 forgot to grab important change from dev server 2019-08-15 15:10:48 +01:00
Felix
b8d1c069f6 more debugging 2019-08-15 14:51:10 +01:00
Felix
8d3dec486e fixed incorrect initial value 2019-08-15 14:33:56 +01:00
Felix
f92dd7d55f removed unnecessary console.log() 2019-08-15 14:23:28 +01:00
Felix
7f6030b1e5 bubble chart updates on new dates entered to field
but is slowwwwwwww
2019-08-15 14:22:33 +01:00
Felix
a63c55dd0e custom dateRange code works 2019-08-15 12:37:49 +01:00
Felix
df30b12971 debugging custom range 2019-08-15 12:09:46 +01:00
Felix
444b745ae1 fetching the right data this time at least 2019-08-14 16:36:02 +01:00
Felix
8a6417c920 debugging options 2019-08-14 16:27:28 +01:00
Felix
dfdc3a8816 fetches correct date ranges 2019-08-14 16:06:09 +01:00
Felix
efb5888b43 yeet 2019-08-14 15:43:41 +01:00
Tom Slater
3eb9e92131 WIP event timepicker 2019-08-14 15:34:08 +01:00
Finn
44c80b062f fixed errors with ngModel 2019-08-14 14:18:53 +01:00
Tom Slater
95d68daf93 work on date picker bubble chart 2019-08-14 12:07:05 +01:00
Tom Slater
932ee113c2 Work on date picker function on bubble chart 2019-08-14 09:49:18 +01:00
Tom Slater
dbb885711a Added time filter options + Chart Labels
Cleaned up graphs that aren't relevant to this particular page, added chart labels and a WIP time filter option
2019-08-09 10:21:40 +01:00
Tom Slater
28848b259d Chart Labels and clean up
Added axis labels and cleaned up charts a little.
2019-08-07 16:21:40 +01:00