Moved ngIF
This commit is contained in:
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+4
-8
@@ -168,9 +168,7 @@ var DetailComponent = (function () {
|
|||||||
this.dataService
|
this.dataService
|
||||||
.get(id)
|
.get(id)
|
||||||
.subscribe(function (res) {
|
.subscribe(function (res) {
|
||||||
//const newDataSet2 = [];
|
_this.label = res.labels;
|
||||||
//newDataSet2.push(res.labels.data.slice());
|
|
||||||
_this.label = res.labels; //newDataSet2;
|
|
||||||
_this.data = res.HOV;
|
_this.data = res.HOV;
|
||||||
_this.data2 = res.TOE1;
|
_this.data2 = res.TOE1;
|
||||||
});
|
});
|
||||||
@@ -478,9 +476,7 @@ var LineChartComponent = (function () {
|
|||||||
this.lineChartType = 'line';
|
this.lineChartType = 'line';
|
||||||
}
|
}
|
||||||
LineChartComponent.prototype.ngOnInit = function () {
|
LineChartComponent.prototype.ngOnInit = function () {
|
||||||
//const newDataSet2 = [];
|
this.lineChartLabels = this.label.data.slice();
|
||||||
//newDataSet2.push(res.labels.data.slice());
|
|
||||||
this.lineChartLabels = this.label.data.slice(); //newDataSet2;
|
|
||||||
console.log("Updated labels array");
|
console.log("Updated labels array");
|
||||||
console.log(this.lineChartLabels);
|
console.log(this.lineChartLabels);
|
||||||
var newDataSet = [];
|
var newDataSet = [];
|
||||||
@@ -578,7 +574,7 @@ module.exports = "<div class=\"container\">\r\n\r\n <nav class=\"navbar navbar-
|
|||||||
/***/ 671:
|
/***/ 671:
|
||||||
/***/ (function(module, exports) {
|
/***/ (function(module, exports) {
|
||||||
|
|
||||||
module.exports = "<div class=\"row\">\r\n <div class=\"col-md-6\">\r\n <div *ngIf=\"data\" style=\"display: block;\">\r\n <canvas baseChart width=\"400\" height=\"400\"\r\n [datasets]=\"lineChartData\"\r\n [labels]=\"lineChartLabels\"\r\n [options]=\"lineChartOptions\"\r\n [colors]=\"lineChartColors\"\r\n [legend]=\"lineChartLegend\"\r\n [chartType]=\"lineChartType\"></canvas>\r\n </div>\r\n </div>\r\n</div>"
|
module.exports = "<div class=\"row\">\r\n <div class=\"col-md-6\">\r\n <div style=\"display: block;\">\r\n <canvas baseChart width=\"400\" height=\"400\"\r\n [datasets]=\"lineChartData\"\r\n [labels]=\"lineChartLabels\"\r\n [options]=\"lineChartOptions\"\r\n [colors]=\"lineChartColors\"\r\n [legend]=\"lineChartLegend\"\r\n [chartType]=\"lineChartType\"></canvas>\r\n </div>\r\n </div>\r\n</div>"
|
||||||
|
|
||||||
/***/ }),
|
/***/ }),
|
||||||
|
|
||||||
@@ -592,7 +588,7 @@ module.exports = "<div>\r\n\t<line-chart></line-chart>\r\n</div>"
|
|||||||
/***/ 673:
|
/***/ 673:
|
||||||
/***/ (function(module, exports) {
|
/***/ (function(module, exports) {
|
||||||
|
|
||||||
module.exports = "<div>\r\n\t<line-chart [label]=\"label\" [data]=\"data\"></line-chart>\r\n\r\n <line-chart [label]=\"label\" [data]=\"data2\"></line-chart>\r\n</div>\r\n"
|
module.exports = "<div *ngIf=\"data\">\r\n\t<line-chart [label]=\"label\" [data]=\"data\"></line-chart>\r\n\r\n <line-chart [label]=\"label\" [data]=\"data2\"></line-chart>\r\n</div>\r\n"
|
||||||
|
|
||||||
/***/ }),
|
/***/ }),
|
||||||
|
|
||||||
|
|||||||
Vendored
+1
-1
File diff suppressed because one or more lines are too long
@@ -1,6 +1,6 @@
|
|||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-6">
|
<div class="col-md-6">
|
||||||
<div *ngIf="data" style="display: block;">
|
<div style="display: block;">
|
||||||
<canvas baseChart width="400" height="400"
|
<canvas baseChart width="400" height="400"
|
||||||
[datasets]="lineChartData"
|
[datasets]="lineChartData"
|
||||||
[labels]="lineChartLabels"
|
[labels]="lineChartLabels"
|
||||||
|
|||||||
@@ -46,9 +46,7 @@ export class LineChartComponent implements OnInit {
|
|||||||
|
|
||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
|
|
||||||
//const newDataSet2 = [];
|
this.lineChartLabels = this.label.data.slice();
|
||||||
//newDataSet2.push(res.labels.data.slice());
|
|
||||||
this.lineChartLabels = this.label.data.slice(); //newDataSet2;
|
|
||||||
|
|
||||||
console.log("Updated labels array");
|
console.log("Updated labels array");
|
||||||
console.log(this.lineChartLabels);
|
console.log(this.lineChartLabels);
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<div>
|
<div *ngIf="data">
|
||||||
<line-chart [label]="label" [data]="data"></line-chart>
|
<line-chart [label]="label" [data]="data"></line-chart>
|
||||||
|
|
||||||
<line-chart [label]="label" [data]="data2"></line-chart>
|
<line-chart [label]="label" [data]="data2"></line-chart>
|
||||||
|
|||||||
@@ -30,9 +30,7 @@ export class DetailComponent implements OnInit {
|
|||||||
.get(id)
|
.get(id)
|
||||||
.subscribe(res => {
|
.subscribe(res => {
|
||||||
|
|
||||||
//const newDataSet2 = [];
|
this.label = res.labels;
|
||||||
//newDataSet2.push(res.labels.data.slice());
|
|
||||||
this.label = res.labels; //newDataSet2;
|
|
||||||
this.data = res.HOV;
|
this.data = res.HOV;
|
||||||
this.data2 = res.TOE1;
|
this.data2 = res.TOE1;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user