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

WIP event timepicker

Browse source
This commit is contained in:
Tom Slater 2019-08-14 15:34:08 +01:00
parent 6c807194bc
commit fe6964fb8d
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@
<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">
<input type="date" [(ngModel)]="bubbleChartBegin" (ngModelChange)="bubbleChartUpdate()"> <input type="text" [(ngModel)]="bubbleChartBegin" (ngModelChange)="bubbleChartUpdate()">
<input type="date" [(ngModel)]="bubbleChartEnd" (ngModelChange)="bubbleChartUpdate()"> <input type="date" [(ngModel)]="bubbleChartEnd" (ngModelChange)="bubbleChartUpdate()">
</div> </div>
</div> </div>

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

@ -13,7 +13,7 @@ export class MoreStuffComponent implements OnInit {
@Input() public categories: any; @Input() public categories: any;
bubbleChartBegin: any; bubbleChartBegin: any;
bubbleChartEnd: any; bubbleChartEnd: any;
constructor( constructor(
private api: ApiService, private api: ApiService,
private currencyPipe: CurrencyPipe, private currencyPipe: CurrencyPipe,
@ -59,7 +59,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 > 1000000 ? (item.value / 1000000) + 10 : (item.value / 100000) + 5, r: item.value > 1000000 ? (item.value / 100000) + 5 : (item.value / 100000) + 1,
supplier: item.seller, supplier: item.seller,
y: item.count, y: item.count,
value: item.value, value: item.value,
@ -71,7 +71,9 @@ export class MoreStuffComponent implements OnInit {
} }
) )
} }
private bubbleChartUpdate() {
console.log("test change");
}
public supplierBubbleChartType: ChartType = 'bubble'; public supplierBubbleChartType: ChartType = 'bubble';
public supplierBubbleChartData: any[] = [ public supplierBubbleChartData: any[] = [
{ {