Pear-Trading/FoodLoop-Web
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Work on date picker function on bubble chart

Browse source
This commit is contained in:
Tom Slater 2019-08-14 09:49:18 +01:00
parent c206a394d2
commit d550bf5e12
11 changed files with 139 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
package-lock.json generated
View file

@ -7136,6 +7136,14 @@
"resolved": "https://registry.npmjs.org/ngx-bootstrap/-/ngx-bootstrap-5.0.0.tgz", "resolved": "https://registry.npmjs.org/ngx-bootstrap/-/ngx-bootstrap-5.0.0.tgz",
"integrity": "sha512-5TTFP9s3wfiRychGcdyvpCvvxtxW1Nf2Dqmk2YBzuIhHHLT6gRq1Fsic4lYrtAUwmy0PSLhOY/XW/saYKlrSJw==" "integrity": "sha512-5TTFP9s3wfiRychGcdyvpCvvxtxW1Nf2Dqmk2YBzuIhHHLT6gRq1Fsic4lYrtAUwmy0PSLhOY/XW/saYKlrSJw=="
}, },
"ngx-daterangepicker-material": {
"version": "2.1.8",
"resolved": "https://registry.npmjs.org/ngx-daterangepicker-material/-/ngx-daterangepicker-material-2.1.8.tgz",
"integrity": "sha512-nSS/M2CQnUSfzZwy+V5mcnE+tjqwmr+HusIDYmiE1zNARG7gkEzYWBmXIOxsC1Dx9snA3NMpqqXj2NitIhyHig==",
"requires": {
"tslib": "^1.9.0"
}
},
"ngx-pagination": { "ngx-pagination": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/ngx-pagination/-/ngx-pagination-4.0.0.tgz", "resolved": "https://registry.npmjs.org/ngx-pagination/-/ngx-pagination-4.0.0.tgz",

1
package.json
View file

@ -47,6 +47,7 @@
"ng2-charts": "^2.3.0", "ng2-charts": "^2.3.0",
"ng2-validation-manager": "0.5.3", "ng2-validation-manager": "0.5.3",
"ngx-bootstrap": "^5.0.0", "ngx-bootstrap": "^5.0.0",
"ngx-daterangepicker-material": "^2.1.8",
"ngx-pagination": "^4.0.0", "ngx-pagination": "^4.0.0",
"popper.js": "^1.15.0", "popper.js": "^1.15.0",
"rxjs": "6.5.2", "rxjs": "6.5.2",

47
src/app/dashboard/dashboard-customer.component.html
View file

@ -22,8 +22,21 @@
<!-- <body style="background-color:rgb(0,0,0);"> --> <!-- <body style="background-color:rgb(0,0,0);"> -->
<div class="card-block"> <div class="card-block">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-7">
<h4 class="card-title mb-0">Weekly Spending by Category</h4> <h4 class="card-title mb-0">Spending by Category</h4>
</div>
<div class="col-sm-5 hidden-sm-down">
<div class="btn-toolbar float-right" role="toolbar" aria-label="Toolbar with button groups">
<div class="btn-group mr-3" data-toggle="buttons" aria-label="First group">
<select>
<option value="Day">Day</option>
<option value="Week">Week</option>
<option value="Month">Month</option>
<option value="Year">Year</option>
<option value="All Time">All Time</option>
</select>
</div>
</div>
</div> </div>
</div> </div>
<div class="chart-wrapper"> <div class="chart-wrapper">
@ -44,9 +57,22 @@
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-block">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-7">
<h4 class="card-title mb-0">No. of Essential Purchases</h4> <h4 class="card-title mb-0">No. of Essential Purchases</h4>
</div> </div>
<div class="col-sm-5 hidden-sm-down">
<div class="btn-toolbar float-right" role="toolbar" aria-label="Toolbar with button groups">
<div class="btn-group mr-3" data-toggle="buttons" aria-label="First group">
<select>
<option value="Day">Day</option>
<option value="Week">Week</option>
<option value="Month">Month</option>
<option value="Year">Year</option>
<option value="All Time">All Time</option>
</select>
</div>
</div>
</div>
</div> </div>
<div class="chart-wrapper"> <div class="chart-wrapper">
<canvas baseChart class="chart" <canvas baseChart class="chart"
@ -64,9 +90,22 @@
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-block">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-8">
<h4 class="card-title float-left mb-0">Your Purchases by Category</h4> <h4 class="card-title float-left mb-0">Your Purchases by Category</h4>
</div><!--/.col--> </div><!--/.col-->
<div class="col-sm-4 hidden-sm-down">
<div class="btn-toolbar float-right" role="toolbar" aria-label="Toolbar with button groups">
<div class="btn-group mr-3" data-toggle="buttons" aria-label="First group">
<select>
<option value="Day">Day</option>
<option value="Week">Week</option>
<option value="Month">Month</option>
<option value="Year">Year</option>
<option value="All Time">All Time</option>
</select>
</div>
</div>
</div>
</div><!--/.row--> </div><!--/.row-->
<div class="chart-wrapper"> <div class="chart-wrapper">
<canvas baseChart class="chart" <canvas baseChart class="chart"

48
src/app/dashboard/dashboard.component.html
View file

@ -1,3 +1,4 @@
<div class="animated fadeIn"> <div class="animated fadeIn">
<snippet-bar-org></snippet-bar-org> <snippet-bar-org></snippet-bar-org>
<div class="row"> <div class="row">
@ -16,9 +17,22 @@
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-block">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-7">
<h4 class="card-title mb-0">No. of Essential Purchases</h4> <h4 class="card-title mb-0">No. of Essential Purchases</h4>
</div> </div>
<div class="col-sm-5 hidden-sm-down">
<div class="btn-toolbar float-right" role="toolbar" aria-label="Toolbar with button groups">
<div class="btn-group mr-3" data-toggle="buttons" aria-label="First group">
<select>
<option value="Day">Day</option>
<option value="Week">Week</option>
<option value="Month">Month</option>
<option value="Year">Year</option>
<option value="All Time">All Time</option>
</select>
</div>
</div>
</div>
</div> </div>
<div class="chart-wrapper"> <div class="chart-wrapper">
<canvas baseChart class="chart" <canvas baseChart class="chart"
@ -36,9 +50,22 @@
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-block">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-7">
<h4 class="card-title float-left mb-0">All Organisation Purchases by Category</h4> <h4 class="card-title float-left mb-0">All Organisation Purchases by Category</h4>
</div><!--/.col--> </div><!--/.col-->
<div class="col-sm-5 hidden-sm-down">
<div class="btn-toolbar float-right" role="toolbar" aria-label="Toolbar with button groups">
<div class="btn-group mr-3" data-toggle="buttons" aria-label="First group">
<select>
<option value="Day">Day</option>
<option value="Week">Week</option>
<option value="Month">Month</option>
<option value="Year">Year</option>
<option value="All Time">All Time</option>
</select>
</div>
</div>
</div>
</div><!--/.row--> </div><!--/.row-->
<div class="chart-wrapper"> <div class="chart-wrapper">
<canvas baseChart class="chart" <canvas baseChart class="chart"
@ -58,8 +85,21 @@
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-block">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-7">
<h4 class="card-title mb-0">Weekly Spending by Category</h4> <h4 class="card-title mb-0">Spending by Category</h4>
</div>
<div class="col-sm-5 hidden-sm-down">
<div class="btn-toolbar float-right" role="toolbar" aria-label="Toolbar with button groups">
<div class="btn-group mr-3" data-toggle="buttons" aria-label="First group">
<select>
<option value="Day">Day</option>
<option value="Week">Week</option>
<option value="Month">Month</option>
<option value="Year">Year</option>
<option value="All Time">All Time</option>
</select>
</div>
</div>
</div> </div>
</div> </div>
<div class="chart-wrapper"> <div class="chart-wrapper">

2
src/app/dashboard/dashboard.component.ts
View file

@ -76,7 +76,7 @@ export class DashboardComponent {
public bootstrapColours: string[] = ['bg-primary', 'bg-secondary', 'bg-success', public bootstrapColours: string[] = ['bg-primary', 'bg-secondary', 'bg-success',
'bg-danger', 'bg-warning', 'bg-info']; 'bg-danger', 'bg-warning', 'bg-info'];
public chartType = 'pie'; public chartType = 'doughnut';
public chartLegend = true; public chartLegend = true;
public doughnutChartDataCategory: any[] = []; public doughnutChartDataCategory: any[] = [];
public doughnutChartLabelsCategory: string[] = []; public doughnutChartLabelsCategory: string[] = [];

26
src/app/dashboard/more-graphs-and-tables.component.html
View file

@ -6,17 +6,8 @@
<h4 class="card-title mb-0">Spend amount and number of purchases by supplier name</h4> <h4 class="card-title mb-0">Spend amount and number of purchases by supplier name</h4>
</div> </div>
<div class="col-sm-5 hidden-sm-down"> <div class="col-sm-5 hidden-sm-down">
<div class="btn-toolbar float-right" role="toolbar" aria-label="Toolbar with button groups"> <input type="date" id="bubbleChartBegin" name="bubbleChartBegin" [(ngModel="bubbleChartBegin")] (ngModelChange)="bubbleChartUpdate">
<div class="btn-group mr-3" data-toggle="buttons" aria-label="First group"> <input type="date" id="bubbleChartEnd" name="bubbleChartEnd" [(ngModel="bubbleChartEnd")] (ngModelChange)="bubbleChartUpdate">
<select>
<option value="Day">Day</option>
<option value="Week">Week</option>
<option value="Month">Month</option>
<option value="Year">Year</option>
<option value="All Time">All Time</option>
</select>
</div>
</div>
</div> </div>
</div> </div>
<div> <div>
@ -37,17 +28,8 @@
<h4 class="card-title mb-0">Spend amount and number of organisations</h4> <h4 class="card-title mb-0">Spend amount and number of organisations</h4>
</div> </div>
<div class="col-sm-5 hidden-sm-down"> <div class="col-sm-5 hidden-sm-down">
<div class="btn-toolbar float-right" role="toolbar" aria-label="Toolbar with button groups"> <input type="date" id="yearSpendChartBegin" name="yearSpendChartBegin" ng-model="yearSpendChartBegin" ng-change="yearSpendChartBegin">
<div class="btn-group mr-3" data-toggle="buttons" aria-label="First group"> <input type="date" id="yearSpendChartEnd" name="yearSpendChartEnd" ng-model="yearSpendChartEnd" ng-change="yearSpendChartEnd">
<select>
<option value="Day">Day</option>
<option value="Week">Week</option>
<option value="Month">Month</option>
<option value="Year">Year</option>
<option value="All Time">All Time</option>
</select>
</div>
</div>
</div> </div>
</div> </div>
<div> <div>

3
src/app/dashboard/more-graphs-and-tables.component.ts
View file

@ -54,7 +54,7 @@ export class MoreStuffComponent implements OnInit {
result.data.map(item => { result.data.map(item => {
graph_data.push({ graph_data.push({
t: item.date, t: item.date,
r: (item.value / 100000) + 5, r: (item.value / 100000) + 4,
supplier: item.seller, supplier: item.seller,
y: item.count, y: item.count,
value: item.value, value: item.value,
@ -75,6 +75,7 @@ export class MoreStuffComponent implements OnInit {
borderColor: 'blue', borderColor: 'blue',
hoverBackgroundColor: 'blue', hoverBackgroundColor: 'blue',
hoverBorderColor: 'blue', hoverBorderColor: 'blue',
radius: 5,
}, },
]; ];
public supplierBubbleChartLabels: string[] = []; public supplierBubbleChartLabels: string[] = [];

15
src/app/panels/org-pie-panel.component.html
View file

@ -1,9 +1,22 @@
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-block">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-7">
<h4 class="card-title mb-0">All Purchases by Type</h4> <h4 class="card-title mb-0">All Purchases by Type</h4>
</div> </div>
<div class="col-sm-5 hidden-sm-down">
<div class="btn-toolbar float-right" role="toolbar" aria-label="Toolbar with button groups">
<div class="btn-group mr-3" data-toggle="buttons" aria-label="First group">
<select>
<option value="Day">Day</option>
<option value="Week">Week</option>
<option value="Month">Month</option>
<option value="Year">Year</option>
<option value="All Time">All Time</option>
</select>
</div>
</div>
</div>
</div> </div>
<div class="chart-wrapper"> <div class="chart-wrapper">
<canvas baseChart class="chart" <canvas baseChart class="chart"

2
src/app/panels/org-pie-panel.component.ts
View file

@ -43,6 +43,8 @@ export class OrgPiePanel implements OnInit {
'orange', 'orange',
'blue' 'blue'
] ]
},
{ borderWidth: [10]
} }
]; ];

15
src/app/panels/pie-panel.component.html
View file

@ -1,9 +1,22 @@
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-block">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-7">
<h4 class="card-title mb-0">All Purchases by Category</h4> <h4 class="card-title mb-0">All Purchases by Category</h4>
</div> </div>
<div class="col-sm-5 hidden-sm-down">
<div class="btn-toolbar float-right" role="toolbar" aria-label="Toolbar with button groups">
<div class="btn-group mr-3" data-toggle="buttons" aria-label="First group">
<select>
<option value="Day">Day</option>
<option value="Week">Week</option>
<option value="Month">Month</option>
<option value="Year">Year</option>
<option value="All Time">All Time</option>
</select>
</div>
</div>
</div>
</div> </div>
<div class="chart-wrapper"> <div class="chart-wrapper">
<canvas baseChart class="chart" <canvas baseChart class="chart"

6
src/app/panels/pie-panel.component.ts
View file

@ -18,9 +18,9 @@ export class PiePanel implements OnInit {
public doughnutChartLabelsLocal: string[] = []; public doughnutChartLabelsLocal: string[] = [];
public doughnutChartColors: any[] = [ public doughnutChartColors: any[] = [
{ backgroundColor: [ { backgroundColor: [
'red', '#ffa1b5',
'green', 'green',
'blue', '#52afed',
'purple', 'purple',
'yellow', 'yellow',
'brown', 'brown',
@ -42,6 +42,8 @@ export class PiePanel implements OnInit {
'orange', 'orange',
'pink' 'pink'
] ]
},
{ borderWidth: [10]
} }
]; ];