Commit graph

409 commits

Author SHA1 Message Date
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
Tom Slater
20fba07a9d 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
8527b8b1ce Various updates 2019-07-15 12:38:06 +01:00
Tom Bloor
5dad9d4648 More graphs with testing data 2019-07-15 01:17:01 +01:00
Finn
a3522bd902 Added meta data to transaction list 2019-07-12 20:47:01 +01:00
Finn
17fc5b006b made fixes to imports and supplier list 2019-07-12 20:18:28 +01:00
Finn
682cebef53 Amended supplier list 2019-07-12 20:05:06 +01:00
Finn
85f91f0d4b Added proper supplier table 2019-07-12 18:50:59 +01:00
Finn
8dbdcbb481 Fixed suppliers 2019-07-12 17:45:43 +01:00
Finn
f668f1f7ae Fixed errors when there is no data available 2019-07-12 17:38:19 +01:00
Finn
05506ed1b6 various fixes to dashboard stuff 2019-07-12 17:12:01 +01:00
Finn
c0570cddf8 fixed bugs 2019-07-12 15:49:06 +01:00
Finn
ee10240169 Adding new chart and fixing stuff 2019-07-12 13:40:21 +01:00
Finn
a4268360f7 FIxing a lot of issues and adding org data 2019-07-11 16:12:46 +01:00
Tom Slater
4350a24132 Unfished Graph sections
Part 2
2019-07-11 15:18:33 +01:00
Tom Slater
c13acc6ce3 Unfinished Company Component 2019-07-11 15:17:50 +01:00
Felix
4ec29531d5 Real bubble chart works, just need data now! 2019-07-10 13:04:07 +01:00
Felix
38536ab097 Added sample bubble chart 2019-07-10 12:49:36 +01:00
Felix
ccf6adad4b Updating/removing some old files, preparing to add bubble chart 2019-07-10 12:22:26 +01:00
Felix
43a6b5b4cd added a necessary import 2019-07-09 14:24:59 +01:00
Felix
885925ab77 added renaming instructions..? 2019-07-09 14:24:23 +01:00
Felix
a7a150e07c Made a new section as per TomS's request :-) 2019-07-09 14:22:19 +01:00
Felix
0e49e947a1 Corrected grammar lol 2019-07-09 12:59:56 +01:00
Tom Slater
984d1a987a Minor changes for Felix 2019-07-09 12:41:17 +01:00
Felix
faeac6b360 Changed name of new-section to suppliers 2019-07-04 16:36:06 +01:00
Felix
db5d9495e2 Real table added to new section with sample data, dashboard 'total spend' is still broken - I can't figure out how I broke it in the first place :( 2019-07-04 16:10:50 +01:00
Felix
085667c74a Removed 'stacked-bar' reference from Dashboard, added table to New Section 2019-07-04 15:49:14 +01:00
Felix
471b56f2a8 New graph types added (not all working unfortunately), new section added for table views and probably a lot of messy code too! 2019-07-04 15:34:42 +01:00
Finn
6376d570af Properly fixed categories showing 2019-07-03 15:11:02 +01:00
Finn
c6fc58ed1f fixed showTotalCategoryList 2019-07-03 15:04:03 +01:00
Finn
c3e260c43e updated modules to work properly locally 2019-07-03 13:46:28 +01:00
Finn
05c209e2c5 Updated versions 2019-07-02 16:46:20 +01:00
piratefinn
6a82c1fe62 fixed icon colours and icons 2018-06-18 12:08:50 +01:00
piratefinn
ab043586c9 fixed pasta'd app-root 2018-06-06 14:23:38 +01:00
piratefinn
aa2d2537cc cleaned up code
keep eye on ngx-bootstrap for when it removes rxjs-compat requirement
2018-06-05 12:25:18 +01:00
piratefinn
b38b3dc150 Merge remote-tracking branch 'origin/development' into finn/angular-6 2018-06-04 15:50:07 +01:00
piratefinn
838c1a1821 fixed icon errors 2018-06-04 15:26:46 +01:00
piratefinn
fa7108bcdf removed icon list for sectors 2018-06-04 15:26:41 +01:00
piratefinn
9b56cf77f9 Removed sector stuff on dashboard
To be moved to organisation dashboard at later time
2018-06-04 15:26:36 +01:00
piratefinn
4d56dcb233 Added category all time purchase list 2018-06-04 15:26:31 +01:00
piratefinn
543bd120fd layout fixes 2018-06-04 15:26:10 +01:00
piratefinn
05c4d2284e made submit message on add more logical 2018-06-04 15:25:54 +01:00
piratefinn
718b5bc8b0 extraneous console logs removed 2018-06-04 15:25:24 +01:00
piratefinn
47524ef91f extraneous login console logs removed 2018-06-04 15:24:59 +01:00
piratefinn
d0625eb557 moved to angular 6 2018-06-04 15:23:16 +01:00
Tom Bloor
543520c5f5 Merge pull request #76 from Pear-Trading/THelsby/Analytics
Analytics
2018-05-24 12:35:36 +01:00
Thomas Bloor
dd01de142c Fix missing commas in environments files 2018-05-24 12:27:06 +01:00
Thomas Bloor
304647daac Update environment files 2018-05-24 12:15:39 +01:00
Thomas Bloor
f2d767d29d Fix http -> https error 2018-05-24 12:14:26 +01:00
Unknown
5bf608585e Analytics 2018-05-24 12:08:27 +01:00
piratefinn
cad75f122a added yearly submit 2018-05-15 16:48:51 +01:00
piratefinn
2ee930f69f made fixes 2018-04-17 14:17:57 +01:00
piratefinn
4f1bd1c495 fixed layout on dashboard 2018-04-17 12:16:22 +01:00
piratefinn
ff9079e331 Amended for possible undefined error 2018-04-16 15:41:45 +01:00
piratefinn
2ca7fd458a Fixed instruction for close menu button 2018-04-16 15:08:23 +01:00
piratefinn
5f49a738b1 Added hint for closing menu 2018-04-16 14:52:19 +01:00
piratefinn
80fc9f330f various fixes 2018-04-13 16:37:26 +01:00
piratefinn
66ed89ffc5 transferred stuff from pie panel to dashboard 2018-04-13 16:07:26 +01:00
piratefinn
a50cb1bac0 fixed view of charts to show currency where relevant 2018-04-12 14:12:34 +01:00
piratefinn
823a1d398f fixed bar chart 2018-04-11 19:19:34 +01:00
piratefinn
96b4e0f382 weekly view fixed, broken category bar chart
Chart needs fixing and currencies should pipe to show currency
2018-04-11 19:10:03 +01:00
piratefinn
80daa2d771 working essential bar chart 2018-04-09 19:19:06 +01:00