added connection to visualize-one page for all metrics on statistics …

…page
SeniorDesignGroup5 · Apr 8, 2019 · 7b6b4ea · 7b6b4ea
1 parent f1cb1d7
commit 7b6b4ea
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/src/app/statistics/statistics.component.html b/src/app/statistics/statistics.component.html
@@ -27,72 +27,72 @@
     <div class="row mt-3 text-center " *ngIf = "isRecent">
 
       <div class="col-md-4 p-4">
-        <div (click)= "goToGraphSpec('')">
+        <div (click)= "goToGraphSpec('l1.current')">
           <radial-gauge  width="200" units="Amps" title="Phase A Current" height="200" major-ticks="0,60,120,180,240,300" [value]="pACurrent" >
           </radial-gauge>
         </div>
         <div *ngIf="pACurrent; else loggedOut">          
           </div>
       </div>
       <div class="col-md-4 p-4">
-        <div (click)= "goToGraphSpec('')">
+        <div (click)= "goToGraphSpec('l2.current')">
           <radial-gauge width="200" units="°C" title="Phase B Current" height="200" major-ticks="0,60,120,180,240,300" [value]="pBCurrent">
           </radial-gauge>
         </div>
         <div *ngIf="pBCurrent; else loggedOut">          
           </div>
       </div>
       <div class="col-md-4 p-4">
-        <div (click)= "goToGraphSpec('')">
+        <div (click)= "goToGraphSpec('l3.current')">
           <radial-gauge width="200" units="°C" title="Phase C Current" height="200" major-ticks="0,60,120,180,240,300" [value]="pCCurrent">
           </radial-gauge>
         </div>
         <div *ngIf="pCCurrent; else loggedOut">          
           </div>
       </div>
       <div class="col-md-4 p-4">
-        <div (click)= "goToGraphSpec('')">
+        <div (click)= "goToGraphSpec('engine.rpm')">
           <radial-gauge width="200" units="RPM" title="Engine Speed" height="200" major-ticks="0,375,750,1125,1500,1875, 2250, 2625,3000" max-value = "3000" [value]="engineSpeed">
           </radial-gauge>
         </div>
         <div *ngIf="engineSpeed; else loggedOut">          
           </div>
       </div>
       <div class="col-md-4 p-4">
-        <div (click)= "goToGraphSpec('')">
-          <radial-gauge width="200" units="%" title="Fuel Level" height="200" major-ticks="0,12.5,25,37.5,50,62.5,75,87.5,100" max-value = "100" [value]="fuelLevel">
+        <div (click)= "goToGraphSpec('fuel.pressure')">
+          <radial-gauge width="200" units="%" title="Fuel Pressure" height="200" major-ticks="0,12.5,25,37.5,50,62.5,75,87.5,100" max-value = "100" [value]="fuelPressure">
           </radial-gauge>
         </div>
-        <div *ngIf="fuelLevel; else loggedOut">          
+        <div *ngIf="fuelPressure; else loggedOut">          
           </div>
       </div>
       <div class="col-md-4 p-4">
-        <div (click)= "goToGraphSpec('')">
+        <div (click)= "goToGraphSpec('l1.l0.voltage')">
           <radial-gauge width="200" units="Volts" title="Phase A Voltage" height="200" major-ticks="0,60,120,180,240,300" max-value = "300" [value]="pAVoltage">
           </radial-gauge>
         </div>
         <div *ngIf="pAVoltage; else loggedOut">          
           </div>
       </div>
       <div class="col-md-4 p-4">
-        <div (click)= "goToGraphSpec('')">
+        <div (click)= "goToGraphSpec('l2.l0.voltage')">
           <radial-gauge width="200" units="Volts" title="Phase B Voltage" height="200" major-ticks="0,60,120,180,240,300" max-value = "300" [value]="pBVoltage">
           </radial-gauge>
         </div>
         <div *ngIf="pBVoltage; else loggedOut">          
           </div>
       </div>
       <div class="col-md-4 p-4">
-        <div (click)= "goToGraphSpec('')">
+        <div (click)= "goToGraphSpec('l3.l0.voltage')">
           <radial-gauge width="200" units="Volts" title="Phase C Voltage" height="200" major-ticks="0,60,120,180,240,300" max-value = "300" [value]="pCVoltage">
           </radial-gauge>
         </div>
         <div *ngIf="pCVoltage; else loggedOut">          
           </div>
       </div>
       <div class="col-md-4 p-4">
-        <div (click)= "goToGraphSpec('')">
-          <radial-gauge width="200" units="Volts" title="Total Kilowat" height="200" major-ticks="0,125,250,375,500,625,750, 875, 1000" max-value = "1000" [value]="totalKw">
+        <div (click)= "goToGraphSpec('total.kw')">
+          <radial-gauge width="200" units="Volts" title="Total kiloWatt" height="200" major-ticks="0,125,250,375,500,625,750, 875, 1000" max-value = "1000" [value]="totalKw">
           </radial-gauge>
         </div>
         <div *ngIf="totalKw; else loggedOut">          

diff --git a/src/app/statistics/statistics.component.ts b/src/app/statistics/statistics.component.ts
@@ -23,7 +23,7 @@ export class StatisticsComponent implements OnInit {
   public pBCurrent: any;
   public pCCurrent: any;
   public engineSpeed: any;
-  public fuelLevel: any;
+  public fuelPressure: any;
   public pAVoltage: any;
   public pBVoltage: any;
   public pCVoltage: any;
@@ -124,7 +124,7 @@ export class StatisticsComponent implements OnInit {
         this.pBCurrent = this.metric.outputs[3].dps[0][1];
         this.pCCurrent = this.metric.outputs[4].dps[0][1];
         this.engineSpeed = this.metric.outputs[5].dps[0][1];
-        this.fuelLevel = this.metric.outputs[6].dps[0][1];
+        this.fuelPressure = this.metric.outputs[6].dps[0][1];
         this.pAVoltage = this.metric.outputs[7].dps[0][1];
         this.pBVoltage = this.metric.outputs[8].dps[0][1];
         this.pCVoltage = this.metric.outputs[9].dps[0][1];