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 |
|
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 |
|
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 |
|
Tom Slater
|
2998f0b3da
|
Minor changes for Felix
|
2019-07-09 12:41:17 +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
|
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
|
0c43962f47
|
Updated versions
|
2019-07-02 16:46:20 +01:00 |
|
piratefinn
|
090b3a65cb
|
fixed icon colours and icons
|
2018-06-18 12:08:50 +01:00 |
|
piratefinn
|
02be5e78d0
|
fixed pasta'd app-root
|
2018-06-06 14:23:38 +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
|
f7d2faea54
|
Merge remote-tracking branch 'origin/development' into finn/angular-6
|
2018-06-04 15:50:07 +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 |
|
piratefinn
|
e9b659a4bb
|
Removed sector stuff on dashboard
To be moved to organisation dashboard at later time
|
2018-06-04 15:26:36 +01:00 |
|
piratefinn
|
adc0a1a7db
|
Added category all time purchase list
|
2018-06-04 15:26:31 +01:00 |
|
piratefinn
|
ca95f8d10d
|
layout fixes
|
2018-06-04 15:26:10 +01:00 |
|
piratefinn
|
fa2180f603
|
made submit message on add more logical
|
2018-06-04 15:25:54 +01:00 |
|
piratefinn
|
a388e2629d
|
extraneous console logs removed
|
2018-06-04 15:25:24 +01:00 |
|
piratefinn
|
32b6dc810f
|
extraneous login console logs removed
|
2018-06-04 15:24:59 +01:00 |
|
piratefinn
|
6abe0ec6f6
|
moved to angular 6
|
2018-06-04 15:23:16 +01:00 |
|
Tom Bloor
|
334ed6b411
|
Merge pull request #76 from Pear-Trading/THelsby/Analytics
Analytics
|
2018-05-24 12:35:36 +01:00 |
|
Thomas Bloor
|
a6e5412e40
|
Fix missing commas in environments files
|
2018-05-24 12:27:06 +01:00 |
|
Thomas Bloor
|
f05a5816e4
|
Update environment files
|
2018-05-24 12:15:39 +01:00 |
|
Thomas Bloor
|
5ef8f9471c
|
Fix http -> https error
|
2018-05-24 12:14:26 +01:00 |
|
Unknown
|
6bf111a3be
|
Analytics
|
2018-05-24 12:08:27 +01:00 |
|
piratefinn
|
b373d4e63f
|
added yearly submit
|
2018-05-15 16:48:51 +01:00 |
|
piratefinn
|
4867a1ecaa
|
made fixes
|
2018-04-17 14:17:57 +01:00 |
|
piratefinn
|
cc08f622af
|
fixed layout on dashboard
|
2018-04-17 12:16:22 +01:00 |
|
piratefinn
|
4f3e0aa22d
|
Amended for possible undefined error
|
2018-04-16 15:41:45 +01:00 |
|
piratefinn
|
daff33657f
|
Fixed instruction for close menu button
|
2018-04-16 15:08:23 +01:00 |
|
piratefinn
|
3d5d20e419
|
Added hint for closing menu
|
2018-04-16 14:52:19 +01:00 |
|
piratefinn
|
2709a7893d
|
various fixes
|
2018-04-13 16:37:26 +01:00 |
|
piratefinn
|
9d17a331fa
|
transferred stuff from pie panel to dashboard
|
2018-04-13 16:07:26 +01:00 |
|
piratefinn
|
52a2b6716c
|
fixed view of charts to show currency where relevant
|
2018-04-12 14:12:34 +01:00 |
|
piratefinn
|
61cd0905d1
|
fixed bar chart
|
2018-04-11 19:19:34 +01:00 |
|
piratefinn
|
093cdef3cf
|
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
|
511f680800
|
working essential bar chart
|
2018-04-09 19:19:06 +01:00 |
|
piratefinn
|
351aa5b2c1
|
added preliminary pie dashboard
|
2018-03-26 15:47:21 +01:00 |
|
piratefinn
|
6c202fa84a
|
changed category view method
|
2018-03-26 14:47:20 +01:00 |
|
piratefinn
|
1f24095285
|
hotfix and version fixes
|
2018-03-21 17:41:07 +00:00 |
|
piratefinn
|
e8217de9b6
|
fixed errors
|
2018-03-20 19:04:05 +00:00 |
|
piratefinn
|
db1e3efbf5
|
removed console logs
|
2018-03-20 17:41:35 +00:00 |
|
piratefinn
|
40eef44666
|
fixed recurring transaction editing
|
2018-03-20 17:41:03 +00:00 |
|
piratefinn
|
463bbe98a9
|
fully working transaction edit and delete
|
2018-03-20 17:29:00 +00:00 |
|
piratefinn
|
2188c1272f
|
added updating transaction
|
2018-03-20 16:53:29 +00:00 |
|
piratefinn
|
49bd7d2e0c
|
fixed httpclient error logging
|
2018-03-20 16:53:14 +00:00 |
|
piratefinn
|
3e8767e481
|
fixed category viewing and editing on several pages
|
2018-03-19 17:52:54 +00:00 |
|
piratefinn
|
f36ef00478
|
fixed add data submission and removed unnecessary console logs
|
2018-03-19 16:28:46 +00:00 |
|
piratefinn
|
b9578da579
|
Added initial recurring variable viewing
|
2018-03-14 20:06:21 +00:00 |
|
piratefinn
|
c45790c7e9
|
fixed upload submissions
|
2018-03-14 20:05:46 +00:00 |
|