Commit graph

606 commits

Author SHA1 Message Date
Thomas Bloor
bab670f60b
Merge branch 'finn/wards' into development 2019-09-09 19:56:26 +01:00
Thomas Bloor
7883dbb169
Fix a large amount of things in the ui 2019-09-09 19:52:38 +01:00
Finn
52bce4dd0a Added initial working table for transaction types 2019-09-09 16:13:34 +01:00
Finn
5c85d5aae9 ward import fixed 2019-09-05 17:18:52 +01:00
Finn
db5f982ed3 BROKEN: Added wards table 2019-09-04 18:21:21 +01:00
Tom Slater
1dc46a55e0 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
420174e953 chart work 2019-08-28 10:47:44 +01:00
Tom Slater
5e91665e0b Merge remote-tracking branch 'origin/tyu-tyu/charts' into tyu-tyu/charts 2019-08-23 11:42:39 +01:00
Tom Slater
301f706365 Chart improvements
Minor fixes  + refresh on supplier spend chart
2019-08-22 16:59:51 +01:00
Tom Slater
ade578d78b Merge remote-tracking branch 'origin/tyu-tyu/char' into tyu-tyu/charts 2019-08-21 11:53:53 +01:00
Tom Slater
8859c6977c Colour fixes 2019-08-21 11:51:10 +01:00
Tom Slater
9fbe36e401 Misc chart work 2019-08-20 16:47:20 +01:00
Finn
55e62a6b87
properly displaying essential purchases dataset 2019-08-20 16:43:53 +01:00
Finn
03e9e365fc
removed console logs that show password 2019-08-20 14:33:44 +01:00
Tom Slater
4181a09b96 Merge remote-tracking branch 'origin/felix/customranges' into tyu-tyu/char 2019-08-19 13:48:47 +01:00
Tom Slater
4b42a08af1 Chart work update
working on essential purchase graph
2019-08-19 12:30:36 +01:00
Tom Slater
156a2f3764 Misc Chart work 2019-08-16 16:58:35 +01:00
Felix
7c5eedaa87 removed test graph 2019-08-16 15:55:22 +01:00
Felix
301a6e619a commented out console.logs 2019-08-16 15:24:49 +01:00
Felix
12a72c00eb added loading spinner for when graph is loading 2019-08-16 15:23:18 +01:00
Tom Slater
e9334cec6d Merge branch 'tyu-tyu/chart' into felix/customranges 2019-08-16 13:58:13 +01:00
Tom Slater
1dd17e7a7a Chart work
Misc Chart work
2019-08-16 12:27:05 +01:00
Felix
ab72264521 IT WORKS! (date range picker) 2019-08-16 12:13:43 +01:00
Felix
6f801d20de more debugging 2019-08-16 11:32:45 +01:00
Felix
93b21d2547 debugging caching 2019-08-16 10:51:47 +01:00
Felix
277c058450 caching data from server to increase speed 2019-08-16 10:27:49 +01:00
Felix
ce64a9140e turns out the brackets were the wrong way around 2019-08-15 16:51:06 +01:00
Felix
5ffffbfe08 date pickers work 2019-08-15 16:34:13 +01:00
Felix
a5b32936bd forgot to grab important change from dev server 2019-08-15 15:10:48 +01:00
Felix
5b50803a25 more debugging 2019-08-15 14:51:10 +01:00
Felix
88bd12157b fixed incorrect initial value 2019-08-15 14:33:56 +01:00
Felix
6a338d41a4 removed unnecessary console.log() 2019-08-15 14:23:28 +01:00
Felix
a8cd23cf5c bubble chart updates on new dates entered to field
but is slowwwwwwww
2019-08-15 14:22:33 +01:00
Felix
a2f8f90513 custom dateRange code works 2019-08-15 12:37:49 +01:00
Felix
6e21cf8746 debugging custom range 2019-08-15 12:09:46 +01:00
Felix
e2960a3fcf fetching the right data this time at least 2019-08-14 16:36:02 +01:00
Felix
b6c0e1b6dd debugging options 2019-08-14 16:27:28 +01:00
Felix
00889b2104 fetches correct date ranges 2019-08-14 16:06:09 +01:00
Felix
263d3d15ab yeet 2019-08-14 15:43:41 +01:00
Tom Slater
fe6964fb8d WIP event timepicker 2019-08-14 15:34:08 +01:00
Finn
6c807194bc
fixed errors with ngModel 2019-08-14 14:18:53 +01:00
Tom Slater
a605d66d37 work on date picker bubble chart 2019-08-14 12:07:05 +01:00
Tom Slater
d550bf5e12 Work on date picker function on bubble chart 2019-08-14 09:49:18 +01:00
Tom Slater
c206a394d2 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
7ee0b64351 Chart Labels and clean up
Added axis labels and cleaned up charts a little.
2019-08-07 16:21:40 +01:00
Tom Slater
3248caed07 Misc Chart Improvements
Fixed doughnut chart colour loading issues, added WIP dashboard charts, few other misc changes
2019-08-06 16:51:44 +01:00
Tom Bloor
0dcf98fed3
Various updates 2019-07-15 12:38:06 +01:00
Tom Bloor
5cd0db3faf
More graphs with testing data 2019-07-15 01:17:01 +01:00
Finn
b1790a2fe9
Added meta data to transaction list 2019-07-12 20:47:01 +01:00
Finn
75ba91379d
made fixes to imports and supplier list 2019-07-12 20:18:28 +01:00