@@ -40,7 +43,8 @@
End Time:
-
+
+
Invalid Entry
Visualize
diff --git a/src/app/visualize-one/visualize-one.component.ts b/src/app/visualize-one/visualize-one.component.ts
index eeed664..bca293b 100644
--- a/src/app/visualize-one/visualize-one.component.ts
+++ b/src/app/visualize-one/visualize-one.component.ts
@@ -29,7 +29,7 @@ export class VisualizeOneComponent implements OnInit {
public dataNames$;
public laymanDataVal$: any = null;
public chart: any = null;
- public signal = false;
+ public signal$ = false;
events: string[] = [];
@ViewChild('time_span') timeSpan: ElementRef;
@ViewChild('start_time') startTime: ElementRef;
@@ -41,7 +41,7 @@ export class VisualizeOneComponent implements OnInit {
resetAndRemakeChart() {
const genVal = localStorage.getItem('gen_id');
const genCount = 1;
-
+ this.signal$ = false;
const funcVals = Array.prototype.slice.call(document.querySelectorAll('#func_select option:checked'), 0).map(function (v, i, a) {
return v.value;
});
@@ -50,7 +50,7 @@ export class VisualizeOneComponent implements OnInit {
funcVal = funcVals[0] + '';
} else {
funcVal = 'invalid';
- this.signal = true;
+ this.signal$ = true;
}
const dataType = localStorage.getItem('data_type');
@@ -64,7 +64,7 @@ export class VisualizeOneComponent implements OnInit {
dataVal = this.data.convertNames(dataVal, 'metric');
} else {
dataVal = 'invalid';
- this.signal = true;
+ this.signal$ = true;
}
} else {
dataVal = dataType;
@@ -77,10 +77,10 @@ export class VisualizeOneComponent implements OnInit {
let timeEnd;
if (startTime === '') {
timeStart = 'invalid';
- this.signal = true;
+ this.signal$ = true;
} else if (endTime === '') {
timeEnd = 'invalid';
- this.signal = true;
+ this.signal$ = true;
}
const startArray = startTime.split('-');
const endArray = endTime.split('-');
@@ -96,28 +96,28 @@ export class VisualizeOneComponent implements OnInit {
timeEnd = endArray[0] + '/' + endArray[1] + '/' + endArray[2] + '-23:59:59';
} else {
timeStart = 'invalid';
- this.signal = true;
+ this.signal$ = true;
}
} else if (startNumArray[1] < endNumArray[1]) { // if start month is less
timeStart = startArray[0] + '/' + startArray[1] + '/' + startArray[2];
timeEnd = endArray[0] + '/' + endArray[1] + '/' + endArray[2];
} else {
timeStart = 'invalid';
- this.signal = true;
+ this.signal$ = true;
}
} else if (startNumArray[0] < endNumArray[0]) { // if start year is less
timeStart = startArray[0] + '/' + startArray[1] + '/' + startArray[2];
timeEnd = endArray[0] + '/' + endArray[1] + '/' + endArray[2];
} else {
timeStart = 'invalid';
- this.signal = true;
+ this.signal$ = true;
}
} else {
timeStart = 'invalid';
- this.signal = true;
+ this.signal$ = true;
}
- if (this.signal === false) {
+ if (this.signal$ === false) {
const jsonToken = localStorage.getItem('auth_token');
const labels = [];
const data = [];
@@ -157,7 +157,7 @@ export class VisualizeOneComponent implements OnInit {
} catch (err) {
return err;
}
- } else if (this.signal === true) {
+ } else if (this.signal$ === true) {
console.log('invalid entry');
}
}