Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
added No Data messages and established connection backend data endpoints
  • Loading branch information
@ema14006
ema14006 committed Apr 6, 2019
1 parent 500414c commit 41ddfe5
Show file tree
Hide file tree
Showing 3 changed files with 165 additions and 145 deletions.
7 changes: 4 additions & 3 deletions src/app/services/metrics.service.ts
View file
Expand Up @@ -16,7 +16,7 @@ export class MetricsService {
getRecentMetrics(token) {

let gen_id = localStorage.getItem('gen_id');
return this.http.get('http://sd5-backend.engr.uconn.edu/data/query/exp/year/' + gen_id, {
return this.http.get('http://sd5-backend.engr.uconn.edu/data/query/exp/recent/' + gen_id, {
headers: {
Authorization: 'Bearer ' + token
}
Expand Down Expand Up @@ -75,10 +75,11 @@ export class MetricsService {
getDevMetrics(token) {

let gen_id = localStorage.getItem('gen_id');
return this.http.get('http://localhost:3000/data/query/exp/dev/' + gen_id, {
return this.http.get('http://sd5-backend.engr.uconn.edu/data/query/exp/dev/' + gen_id, {
headers: {
Authorization: 'Bearer ' + 'eyJhbGciOiJSUzI1NiJ9.eyJpZCI6MywiZW1haWwiOiJ0ZXN0LmFjY291bnRAdWNvbm4uZWR1Iiwib3JnX2lkIjoxLCJmaXJzdF9uYW1lIjoiVGVzdCIsImxhc3RfbmFtZSI6IkFjY291bnQiLCJwZXJtaXNzaW9ucyI6eyIxIjp7ImlkIjo0LCJuYW1lIjoiQ2xpZW50IiwicGVybWlzc2lvbnMiOnsiZ2VuX3JlYWQiOjEsImdlbl9leGVjdXRlIjowLCJkYXRhX3JlYWQiOjEsImRhdGFfZXhwb3J0IjowLCJvcmdfbWFuYWdlIjowfX19fQ.CPMhtApFtRzyPjkRrt5NSVeqWvrn57UI0ifb2QB9rkRE97WvNdCp8h8cAdR-X5Ft5K6jMjXbEsgsmBxEvc6z7Q'
Authorization: 'Bearer ' + token
}

});
}

Expand Down
128 changes: 92 additions & 36 deletions src/app/statistics/statistics.component.html
View file
Expand Up @@ -24,43 +24,79 @@
<button class="btn btn-primary btn-block m-1" (click) = "goToGraphGen()">Graph</button>

</div>
<div class="row mt-3 text-center" *ngIf = "isRecent">
<div class="row mt-3 text-center " *ngIf = "isRecent">

<div class="col-md-4">
<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 class="col-md-4 p-4">
<div (click)= "goToGraphSpec('')">
<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">
<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 class="col-md-4 p-4">
<div (click)= "goToGraphSpec('')">
<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">
<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 class="col-md-4 p-4">
<div (click)= "goToGraphSpec('')">
<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">
<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 class="col-md-4 p-4">
<div (click)= "goToGraphSpec('')">
<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">
<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">
</radial-gauge>
<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">
</radial-gauge>
</div>
<div *ngIf="fuelLevel; else loggedOut">
</div>
</div>
<div class="col-md-4">
<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 class="col-md-4 p-4">
<div (click)= "goToGraphSpec('')">
<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">
<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 class="col-md-4 p-4">
<div (click)= "goToGraphSpec('')">
<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">
<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 class="col-md-4 p-4">
<div (click)= "goToGraphSpec('')">
<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">
<radial-gauge width="200" units="Volts" title="Average Current" height="200" major-ticks="0,125,250,375,500,625,750, 875, 1000" max-value = "1000" [value]="">
</radial-gauge>
<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">
</radial-gauge>
</div>
<div *ngIf="totalKw; else loggedOut">
</div>
</div>
<!--<div class="col-md-4">
<div class = "fusioncharts">
Expand All @@ -78,29 +114,49 @@
</div> -->
</div>
<div class="row mt-3 text-center" *ngIf = "isRecent">
<div class="col-md-3">
<linear-gauge width="150" title = "Coolant Temperature" major-ticks = "0,30,60,90,120" max-value = "120" height="350" [value] = "coolantTemp"></linear-gauge>
<div class="col-md-3 p-4">
<div (click)= "goToGraphSpec('coolant.temp')">
<linear-gauge width="150" title = "Coolant Temperature" major-ticks = "0,30,60,90,120" max-value = "120" height="350" [value] = "coolantTemp">

</linear-gauge>
</div>
<div *ngIf="oilPressure; else loggedOut">
</div>
<!--<radial-gauge width="200" units="°C" title="Oil Temperature" height="200" max-value = "220" major-ticks="0,20,40,60,80,100,120,140,160,180,200,220" highlights='[{"from": 160, "to": 220, "color": "rgba(200, 50, 50, .75)"}
]' [value]="oilTemp">
</radial-gauge> -->
</div>
<div class="col-md-3">
<div class="col-md-3 p-4">
<!--<radial-gauge width="200" units="°C" title="Fuel Temperature" height="200" [value]="fuelTemp"></radial-gauge> -->
<linear-gauge width="150" title = "Oil Pressure" major-ticks = "0,50,100,150,200" max-value = "120" height="350" [value] = "oilPressure"></linear-gauge>
<div (click)= "goToGraphSpec('oil.pressure')">
<linear-gauge width="150" title = "Oil Pressure" major-ticks = "0,50,100,150,200" max-value = "120" height="350" [value] = "oilPressure">
</linear-gauge>
</div>
<div *ngIf="oilPressure; else loggedOut">
</div>
</div>
<div class="col-md-3">
<div class="col-md-3 p-4">
<!--<radial-gauge width="200" units="°C" title="Fuel Temperature" height="200" [value]="fuelTemp"></radial-gauge> -->
<div (click)= "goToGraphSpec('oil.temp')">
<linear-gauge width="150" title = "Oil Temperature" major-ticks = "0,50,100,150,200" max-value = "200" height="350" [value]="oilTemp"></linear-gauge>
</div>
<div *ngIf="oilTemp; else loggedOut">
</div>
</div>
<div class="col-md-3">
<div class="col-md-3 p-4">
<!--<radial-gauge width="200" units="°C" title="Fuel Temperature" height="200" [value]="fuelTemp"></radial-gauge> -->
<div (click)= "goToGraphSpec('fuel.temp')">
<linear-gauge width="150" title = "Fuel Temperature" major-ticks = "0,50,100,150,200" max-value = "200" height="350" [value]="fuelTemp"></linear-gauge>
<div (click)= "goToGraphSpec('fuel.temp')">
<linear-gauge width="150" title = "Fuel Temperature" major-ticks = "0,50,100,150,200" max-value = "200" height="350" [value]= "fuelTemp" >

</linear-gauge>
</div>
<div *ngIf="fuelTemp; else loggedOut">
</div>
</div>
</div>
<ng-template #loggedOut>
Data is not available within the last 24 hours
</ng-template>
<!--
<div class="row mt-3 text-center" *ngIf = "isHour">
<div class="col-md-4">
Expand Down

0 comments on commit 41ddfe5

Please sign in to comment.