diff --git a/src/app/visualize-all/visualize-all.component.css b/src/app/visualize-all/visualize-all.component.css index 85d9c66..3e25b0a 100644 --- a/src/app/visualize-all/visualize-all.component.css +++ b/src/app/visualize-all/visualize-all.component.css @@ -15,4 +15,9 @@ select#data_select { p#visMessage { color: white; +} + +p#graphInfo { + color: grey; + font-size: 12px; } \ No newline at end of file diff --git a/src/app/visualize-all/visualize-all.component.html b/src/app/visualize-all/visualize-all.component.html index 747e208..c238e47 100644 --- a/src/app/visualize-all/visualize-all.component.html +++ b/src/app/visualize-all/visualize-all.component.html @@ -5,7 +5,11 @@

{{laymanDataVal$}} Graph

{{chart}} -

Units: {{unit$}}

+

+ Dates: {{startTime$}} - {{endTime$}}
+ Units: {{unit$}}
+ Function: {{function$}}
+

Invalid Entry

@@ -45,6 +49,7 @@

+

diff --git a/src/app/visualize-all/visualize-all.component.ts b/src/app/visualize-all/visualize-all.component.ts index 126030e..4ff56a9 100644 --- a/src/app/visualize-all/visualize-all.component.ts +++ b/src/app/visualize-all/visualize-all.component.ts @@ -20,6 +20,9 @@ export class VisualizeAllComponent implements OnInit { public generators$: Object; public chart$: Object; public unit$: any = null; + public function$: any = null; + public startTime$: any = null; + public endTime$: any = null; public dataNames$; public laymanDataVal$: any = null; public chart: any = null; @@ -86,8 +89,8 @@ export class VisualizeAllComponent implements OnInit { this.signal = true; } - let startTime = this.startTime.nativeElement.value; - let endTime = this.endTime.nativeElement.value; + const startTime = this.startTime.nativeElement.value; + const endTime = this.endTime.nativeElement.value; let timeStart; let timeEnd; @@ -166,6 +169,9 @@ export class VisualizeAllComponent implements OnInit { this.chart.destroy(); this.chart = this.graphData.createChart(labels, data, genName); this.unit$ = this.data.getUnits(dataVal); + this.startTime$ = startArray[1] + '/' + startArray[2] + '/' + startArray[0]; + this.endTime$ = endArray[1] + '/' + endArray[2] + '/' + endArray[0]; + this.function$ = funcVal; }); } catch (err) { return err; @@ -212,6 +218,9 @@ export class VisualizeAllComponent implements OnInit { this.laymanDataVal$ = 'Example Lube Oil Temperature'; this.chart = this.graphData.createChart(labels, data, ['South Garage Generator']); this.unit$ = this.data.getUnits('oil.temp'); + this.startTime$ = '03/13/2019'; + this.endTime$ = '03/14/2019'; + this.function$ = 'sum'; }); } catch (err) {