Commit graph

606 commits

Author SHA1 Message Date
Finn
8202cdfdb1
Amended supplier list 2019-07-12 20:05:06 +01:00
Finn
40462b7d8f
Added proper supplier table 2019-07-12 18:50:59 +01:00
Finn
6b1e474916
Fixed suppliers 2019-07-12 17:45:43 +01:00
Finn
af04adeb31
Fixed errors when there is no data available 2019-07-12 17:38:19 +01:00
Finn
df631ad793
various fixes to dashboard stuff 2019-07-12 17:12:01 +01:00
Finn
7a6f40e300
fixed bugs 2019-07-12 15:49:06 +01:00
Finn
4b7ffd91b3
Adding new chart and fixing stuff 2019-07-12 13:40:21 +01:00
Finn
c5f6cb2750
FIxing a lot of issues and adding org data 2019-07-11 16:12:46 +01:00
Tom Slater
bd33f79067 Unfished Graph sections
Part 2
2019-07-11 15:18:33 +01:00
Tom Slater
630beeb5d0 Unfinished Company Component 2019-07-11 15:17:50 +01:00
Tom Slater
71162bcce7 Merge remote-tracking branch 'origin/felix/newSection-testing' into tom/minorfixes 2019-07-10 14:00:25 +01:00
Felix
45d52c9cdb Real bubble chart works, just need data now! 2019-07-10 13:04:07 +01:00
Felix
1c11f8e936 Added sample bubble chart 2019-07-10 12:49:36 +01:00
Felix
9f50b3c2ce Updating/removing some old files, preparing to add bubble chart 2019-07-10 12:22:26 +01:00
Felix
45e700675a added a necessary import 2019-07-09 14:24:59 +01:00
Felix
9dcc22bc3c added renaming instructions..? 2019-07-09 14:24:23 +01:00
Felix
46d2ed7ad8 Made a new section as per TomS's request :-) 2019-07-09 14:22:19 +01:00
Felix
c98a098ae9 Corrected grammar lol 2019-07-09 12:59:56 +01:00
Felix
2ded74f63c Merge commit '2998f0b3da1a7189fcd35b5b76bbeb42e7ed41e9' into felix/newSection-testing 2019-07-09 12:50:45 +01:00
Tom Slater
2998f0b3da Minor changes for Felix 2019-07-09 12:41:17 +01:00
Felix
d150441aa1 required packages updated 2019-07-09 12:22:03 +01:00
Felix
ee636b87fa Changed name of new-section to suppliers 2019-07-04 16:36:06 +01:00
Felix
1b56d6e95c 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
55f3f50576 Removed 'stacked-bar' reference from Dashboard, added table to New Section 2019-07-04 15:49:14 +01:00
Felix
ec1655a5ca package-lock.json and package.json added 2019-07-04 15:37:13 +01:00
Felix
68cf9ee049 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
6649888876
Properly fixed categories showing 2019-07-03 15:11:02 +01:00
Finn
bc8f024d41
fixed showTotalCategoryList 2019-07-03 15:04:03 +01:00
Finn
700287fc32
updated modules to work properly locally 2019-07-03 13:46:28 +01:00
Finn
5bb0669204
updated dependencies 2019-07-03 13:04:17 +01:00
Finn
0c43962f47
Updated versions 2019-07-02 16:46:20 +01:00
Finn
e7d2038041
Merge pull request #84 from Pear-Trading/hotfix-index
Icons and colours properly added for category list
2018-06-18 12:15:38 +01:00
piratefinn
090b3a65cb fixed icon colours and icons 2018-06-18 12:08:50 +01:00
piratefinn
54f2ad832d removed production overrides on local 2018-06-18 12:08:12 +01:00
Finn
f018e72e3a
Merge pull request #83 from Pear-Trading/master
Master
2018-06-06 14:35:12 +01:00
piratefinn
a751cf393e Merge branch 'hotfix-index' 2018-06-06 14:25:11 +01:00
piratefinn
63475b45b4 updated changelog 2018-06-06 14:24:47 +01:00
piratefinn
02be5e78d0 fixed pasta'd app-root 2018-06-06 14:23:38 +01:00
Finn
8510c539f7
Merge pull request #82 from Pear-Trading/v0.1.11
v0.1.11 release
2018-06-06 14:15:53 +01:00
piratefinn
18340a61f9 updated changelog 2018-06-05 14:11:56 +01:00
piratefinn
df30ab88c4 version bumps and proper naming 2018-06-05 14:08:27 +01:00
Finn
fb606016ee
Merge pull request #81 from Pear-Trading/finn/angular-6
Move to Angular 6
2018-06-05 13:58:50 +01:00
piratefinn
ee0daa2d57 removed unused config in ng test and cleaned angular.json 2018-06-05 13:47:02 +01:00
piratefinn
4d34e5c0f2 added local and ci configuration to e2e 2018-06-05 12:51:05 +01:00
piratefinn
478429b3c9 cleaned up code
keep eye on ngx-bootstrap for when it removes rxjs-compat requirement
2018-06-05 12:25:18 +01:00
piratefinn
21e163fda2 package updates 2018-06-04 18:05:59 +01:00
piratefinn
f7d2faea54 Merge remote-tracking branch 'origin/development' into finn/angular-6 2018-06-04 15:50:07 +01:00
Finn
e7e3f90739
Merge pull request #80 from Pear-Trading/finn/dashboard-fixes
Added fixes to dashboard
2018-06-04 15:49:33 +01:00
piratefinn
10622204b7 fixed icon errors 2018-06-04 15:26:46 +01:00
piratefinn
c9f786eaee removed icon list for sectors 2018-06-04 15:26:41 +01:00