Commit graph

389 commits

Author SHA1 Message Date
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
piratefinn
d485001fb3 added preliminary pie dashboard 2018-03-26 15:47:21 +01:00
piratefinn
3b2009186a changed category view method 2018-03-26 14:47:20 +01:00
piratefinn
87d6e51842 hotfix and version fixes 2018-03-21 17:41:07 +00:00
piratefinn
4fadf5297b fixed errors 2018-03-20 19:04:05 +00:00
piratefinn
7a432b4983 removed console logs 2018-03-20 17:41:35 +00:00
piratefinn
11f42d08e4 fixed recurring transaction editing 2018-03-20 17:41:03 +00:00
piratefinn
390b670be5 fully working transaction edit and delete 2018-03-20 17:29:00 +00:00
piratefinn
df6c469965 added updating transaction 2018-03-20 16:53:29 +00:00
piratefinn
2eddb4dd9c fixed httpclient error logging 2018-03-20 16:53:14 +00:00
piratefinn
e7c718250f fixed category viewing and editing on several pages 2018-03-19 17:52:54 +00:00
piratefinn
cd2a47bfdd fixed add data submission and removed unnecessary console logs 2018-03-19 16:28:46 +00:00
piratefinn
bad59b5e33 Added initial recurring variable viewing 2018-03-14 20:06:21 +00:00
piratefinn
3119feabcc fixed upload submissions 2018-03-14 20:05:46 +00:00
piratefinn
470daa306c removed unnecessary console logs 2018-03-14 16:49:01 +00:00
piratefinn
065aa80e98 Amended purchase validation and submission 2018-03-13 12:49:30 +00:00
piratefinn
977cee339d applied new category style to fixed category view 2018-03-12 17:43:15 +00:00
piratefinn
736df71fde Placeholder recurring transaction box 2018-03-12 17:41:01 +00:00
piratefinn
180a854c60 emergency fix for category viewing on purchase 2018-03-12 17:35:18 +00:00
piratefinn
85a429c4f2 emergency fix to upload for category 2018-03-08 15:09:35 +00:00
piratefinn
ce9abe14df added fixes to category viewing 2018-03-07 12:58:01 +00:00
piratefinn
9b37fbbe26 added fixes for input 2018-03-06 15:19:35 +00:00
piratefinn
ddd0011ea2 amended upload for recurring 2018-03-05 15:35:26 +00:00
piratefinn
1cbfb334de amended if code and validation 2018-03-05 13:42:28 +00:00
piratefinn
0a7b49a387 added recurring purchase inputs 2018-03-05 13:33:26 +00:00
piratefinn
db2aa19801 fixed display with essential and categories 2018-03-02 16:31:14 +00:00
piratefinn
96cbe87013 removed unnecessary console logs and cleaned essential input 2018-03-01 17:07:25 +00:00
piratefinn
eb560a6c18 added initial essential branch checkbox 2018-02-28 12:02:01 +00:00
piratefinn
24b39c06af made input two columns if wide enough 2018-01-25 16:19:02 +00:00
piratefinn
6dd8aeaad9 removed unnecessary console logging 2018-01-25 15:56:23 +00:00
piratefinn
182679e9ac Changed percentages on budget view screen 2018-01-25 11:18:31 +00:00
piratefinn
d1d47785e5 Changed to radio buttons on transaction category input 2018-01-25 11:18:13 +00:00
piratefinn
4d2ca8be74 list fully finished 2018-01-24 13:18:51 +00:00
piratefinn
1fee46a086 No longer throwing errors and proper limit & slice 2018-01-24 12:51:03 +00:00
piratefinn
2976166371 properly viewing category list 2018-01-24 12:38:58 +00:00
piratefinn
b33000edc5 Placeholder and date math 2018-01-22 17:23:56 +00:00
piratefinn
929b9417d1 changed category list size 2018-01-19 13:22:18 +00:00
piratefinn
4f29307fdb Changed transaction category input 2018-01-18 12:16:37 +00:00
piratefinn
b7c73d5e48 added new category transaction listing page 2018-01-17 17:36:28 +00:00
piratefinn
5185cb8b44 removed unused button on pie 2018-01-17 15:02:32 +00:00
piratefinn
5fe91a536d Fixed app, added ability for non category transaction changed reset form 2018-01-16 15:57:38 +00:00
piratefinn
30e236f387 functional receiving, choosing and upload of transaction category 2018-01-15 16:20:51 +00:00
piratefinn
83c2fdd4dd Retrieving categories from API 2018-01-15 15:33:38 +00:00
piratefinn
3da4c4164d added category list endpoint 2018-01-15 14:19:16 +00:00
piratefinn
ac2ab1d551 updated pie css 2017-12-21 17:20:56 +00:00
piratefinn
52d322416d snippet circles fixed 2017-12-20 16:46:25 +00:00
piratefinn
a1b27f2f26 added varying colors based on sector 2017-12-20 13:41:13 +00:00
piratefinn
f974ff6692 clarified a TODO in css 2017-12-20 12:33:04 +00:00
piratefinn
88a2a46191 added circles to snippets
WARNING: They are a fixed size, therefore will spill content on larger numbers
2017-12-20 12:32:23 +00:00
piratefinn
32f677c94e frontpage sectors and week stats amended 2017-12-19 18:01:29 +00:00
piratefinn
b2d2d5dbfa added initial looping 2017-12-18 17:20:38 +00:00
piratefinn
56c4c67d9e added new sector 2017-12-18 16:20:31 +00:00
piratefinn
afa316097c changed customer dashboard endpoint 2017-12-18 12:57:40 +00:00
piratefinn
9e5be8bdac fixed variable definition 2017-12-15 17:44:50 +00:00
piratefinn
49ec42349e fixed es5 compatibility 2017-12-15 17:38:59 +00:00
piratefinn
009fa20b4a sector list code fully working 2017-12-15 17:20:18 +00:00
piratefinn
3504716508 percent per week data viewing done 2017-12-14 20:14:47 +00:00
piratefinn
387d3fe4b3 improved doughnut header layout 2017-12-14 17:51:00 +00:00
piratefinn
df9ea2436c working graph widgets and local doughnut chart 2017-12-14 16:44:23 +00:00
piratefinn
846c21f967 Added working snippets and placeholder pie chart 2017-12-13 12:37:11 +00:00
piratefinn
a2ad5dc1a0 More placeholder code for customer dashboard 2017-12-12 15:10:44 +00:00
piratefinn
155a32a9ad Changed from dropdown to modal 2017-12-08 20:34:58 +00:00
piratefinn
82761bbc27 changelog, esta pin and naming updated 2017-12-08 15:30:16 +00:00
piratefinn
9e77bd072a image url naming sanitised 2017-12-08 14:13:47 +00:00
piratefinn
88d4c52915 renamed LIS to trail and added esta logo 2017-12-08 14:01:46 +00:00
piratefinn
e3db378396 changed code for trail map 2017-12-08 13:26:18 +00:00
piratefinn
da39e228da Merge branch 'development' into finn/alignmentfix 2017-11-29 18:10:39 +00:00
piratefinn
abc72ec950 fixed navbar alignment 2017-11-29 18:07:37 +00:00
Thomas Bloor
beebc1399d Travis can only manage one file for decryption it seems 2017-11-29 17:24:16 +00:00
Thomas Bloor
08503f15d7 Setup Travis to auto build releases when a tag is created 2017-11-29 17:12:18 +00:00
piratefinn
aef35b24b4 fixed typo 2017-11-29 16:19:38 +00:00
Tom Bloor
c150e36a74 Merge pull request #35 from Pear-Trading/master
Master merge for v0.0.4
2017-11-29 15:32:14 +00:00
piratefinn
6bdd880156 Renamed some text for Lancaster Independent Story 2017-11-29 15:23:03 +00:00
Thomas Bloor
281404b946 Fixed error on building 2017-11-28 18:14:15 +00:00
piratefinn
f9f6f52405 fixed logo on main map 2017-11-28 12:44:53 +00:00
piratefinn
84b128c7ed fix made to modaldirective import 2017-11-27 17:20:22 +00:00
piratefinn
7b897640b5 Fixes made and info window usage revamped with modals 2017-11-27 16:56:09 +00:00
piratefinn
fdd14c2fae fixed modals to use new endpoint and scrapped old pages 2017-11-23 17:16:46 +00:00
piratefinn
f261fce7f5 working modals added 2017-11-15 15:36:45 +00:00
piratefinn
98d683612c fixed HTTP posts 2017-11-15 14:46:04 +00:00
piratefinn
5be33896b2 fixed packaging and rewrote http 2017-11-15 14:16:05 +00:00
piratefinn
738b77ff1a removed unused imports and packages 2017-11-15 14:12:28 +00:00
piratefinn
65f149c0f8 currencyPipe fixed 2017-11-15 13:46:34 +00:00
piratefinn
5d48bd1539 got clicks logging 2017-11-14 18:31:05 +00:00
piratefinn
bad44f7d06 map page html layout fix 2017-11-14 17:13:34 +00:00
piratefinn
70ec99690f test page added 2017-11-14 17:12:19 +00:00
piratefinn
8ede382799 snazzy info added, logo added 2017-11-14 17:12:07 +00:00
piratefinn
f6a6e4c964 Initial commit with modules and routing 2017-11-14 12:47:28 +00:00
piratefinn
7a73cb3e3e Fixed and working zoom level change 2017-11-14 11:03:19 +00:00
Finn
12889fd687 Initial agmcluster commit with broken maxZoom 2017-11-13 22:21:59 +00:00
piratefinn
1739e998a5 changed login username input to email and changed test 2017-11-13 15:49:17 +00:00
piratefinn
e1230c770a Transaction fix added 2017-11-13 13:05:42 +00:00
piratefinn
49be482299 Map changed and made available to customers 2017-11-13 12:39:31 +00:00
piratefinn
306821b09f Fixed authguard 2017-11-13 12:26:24 +00:00
piratefinn
c4a9790eb8 Web app leaderboard done 2017-11-10 18:41:35 +00:00
piratefinn
faea82d2cc route fix 2017-11-10 17:17:04 +00:00
piratefinn
8a5236ad3a Leaderboard pages added and routing sorted 2017-11-10 17:15:11 +00:00
piratefinn
f5239a3822 Added password reset placeholder 2017-11-10 15:20:48 +00:00
piratefinn
0b2c9c20f8 Unusable password reset button disabled 2017-11-10 14:14:11 +00:00
piratefinn
0a54cdc091 fixed register name in place 2017-11-10 14:13:28 +00:00
piratefinn
0a9e80fc97 Fixed transaction submission 2017-10-20 13:21:49 +01:00
Tom Bloor
cea000b90c Added ci specific e2e and test scripts 2017-09-28 14:12:25 +01:00
Tom Bloor
ed738b287a Added placeholder for mapApiKey 2017-09-28 13:28:57 +01:00
Tom Bloor
1eb8d71b4a Removed prod environment file from repo 2017-09-28 13:21:28 +01:00
Tom Bloor
2ffe32c6f5 Change to a map icon for the Supplier Map 2017-09-28 12:55:48 +01:00
Tom Bloor
a622b0d871 Fix issue with supplier location api url 2017-09-28 12:47:09 +01:00
piratefinn
f402d46db8 Added API changes 2017-09-27 17:46:25 +01:00
piratefinn
b59351addf made looping markers 2017-09-27 14:34:46 +01:00
piratefinn
1eb79aa047 Added API and fixes 2017-09-27 13:54:10 +01:00
piratefinn
64e028f0c5 Added default zoom 2017-09-27 12:02:46 +01:00
piratefinn
5d3283171c styling improved 2017-09-26 17:51:14 +01:00
piratefinn
40bd7459b5 Map page added with map 2017-09-26 17:31:40 +01:00
piratefinn
089e7f7a97 Functionality fully added 2017-09-19 17:22:19 +01:00
piratefinn
7b03f6adff Initial addition of API for payroll log 2017-09-19 15:38:35 +01:00
Tom Bloor
e62a46c312 Ignore linter error in transaction-result component 2017-09-19 15:21:03 +01:00
Tom Bloor
8f164ca94a ignore linter errors in org-result items 2017-09-19 15:19:50 +01:00
Tom Bloor
a5b786a749 Linter errors in dashboard-customer component 2017-09-19 15:04:49 +01:00
Tom Bloor
0907134ff7 Fix linter errors for transaction-log component 2017-09-19 15:02:48 +01:00
Tom Bloor
662d6be5c9 Linter error fixes for feedback component 2017-09-19 14:59:19 +01:00
Tom Bloor
921b25718d Linter error fixes for account-edit component 2017-09-19 14:56:07 +01:00
Tom Bloor
f6c0583481 Fix linter errors in add-data component 2017-09-19 14:53:25 +01:00