-
-
Location: {{ currentMessage.location.S }}
-
Company: {{ currentMessage.company.S }}
-
Field: {{ currentMessage.field.S }}
-
+
+
Total Flow Rate {{ totalFlowRate }}
+
+
+
+
+
+
+ {{ message.location }}
+
+
+ {{ message.company }}
+
+
+ {{ message.field }}
+
+
+ Flow Rate: {{ message.volume_flow }}
+
+
+
+
+
+ Current
+ A
+
+
+ Intake Pressure
+ PSI
+
+
+
-
-
-
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/src/app/home/home.component.scss b/src/app/home/home.component.scss
index e69de29..440bb57 100644
--- a/src/app/home/home.component.scss
+++ b/src/app/home/home.component.scss
@@ -0,0 +1,6 @@
+.message {
+ width: 250px;
+}
+.container {
+ padding: 10px;
+}
\ No newline at end of file
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
index 72db94b..e28d171 100644
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@@ -1,7 +1,15 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
import { WebSocketSubject } from 'rxjs/webSocket';
import Auth from '@aws-amplify/auth';
+export class MyJSON {
+ location: '';
+ company: '';
+ volume_flow: 0;
+ field: '';
+}
+
+
@Component({
selector: 'app-home',
@@ -9,16 +17,15 @@ import Auth from '@aws-amplify/auth';
styleUrls: ['./home.component.scss']
})
-export class HomeComponent implements OnInit {
-
- public serverMessages = new Array
();
+export class HomeComponent implements OnInit, OnDestroy {
+ public serverMessages = new Array();
private socket$: WebSocketSubject;
- private currentMessage = {location: {S: ''}, company: {S: ''}, volume_flow: {N: ''}, field: {S: ''}};
- private token: string;
+ private currentMessage = {location: '', company: '', volume_flow: '', field: ''};
+ private totalFlowRate = 0;
gaugeType = 'arch';
gaugeCap = 'round';
- gaugeValue = this.currentMessage.volume_flow.N;
+ gaugeValue = this.currentMessage.volume_flow;
gaugeLabel = 'Volume Flow';
gaugeAppendText = 'gpm';
gaugeThick = 10;
@@ -31,29 +38,64 @@ export class HomeComponent implements OnInit {
};
constructor() {
- Auth.currentSession().then(data => {
- console.log(data.getAccessToken().getJwtToken());
- this.token = data.getAccessToken().getJwtToken();
- this.connectWS(this.token);
- // this.subscribeWS();
+ Auth.currentAuthenticatedUser().then(data => {
+ this.connectWS(data.signInUserSession.accessToken.jwtToken, data.signInUserSession.idToken.payload['cognito:preferred_role'] );
+ this.subscribeWS();
+ this.socket$.next({action: 'getDashboardData', policy: data.signInUserSession.idToken.payload['cognito:preferred_role']});
});
}
ngOnInit() {
}
- connectWS(token: string) {
- this.socket$ = new WebSocketSubject('wss://3fseaywb8b.execute-api.us-east-1.amazonaws.com/prototype?token=' + token);
+ ngOnDestroy() {
+ this.socket$.complete();
+ }
+
+ connectWS(token: string, role: string) {
+ this.socket$ = new WebSocketSubject('wss://3fseaywb8b.execute-api.us-east-1.amazonaws.com/prototype?token=' + token +
+ '&role=' + role);
}
subscribeWS() {
this.socket$
.subscribe(
- (message) => {this.currentMessage = message;
- this.gaugeValue = parseFloat(this.currentMessage.volume_flow.N).toFixed(2);
- }, // this.serverMessages.push(message),
+ (message) => {
+ console.log(message);
+ if (message instanceof Array) {
+ message.forEach(element => {
+ this.updateList(element);
+ });
+ } else {
+ this.updateList(message);
+ }
+ this.totalFlowRate = this.totalFlowRates(0);
+ },
(err) => console.error(err),
() => console.warn('Completed!')
);
}
+
+ updateList(obj) {
+ const index = this.serverMessages.findIndex((e) => e.location === obj.location);
+ obj.volume_flow = parseFloat(obj.volume_flow).toFixed(2);
+ obj.current = parseFloat(obj.current).toFixed(2);
+ obj.intake_pressure = parseFloat(obj.intake_pressure).toFixed(2);
+ if (index === -1) {
+ this.serverMessages.push(obj);
+
+ } else {
+ this.serverMessages[index] = obj;
+ }
+ }
+
+ totalFlowRates(temp: number) {
+ temp = 0;
+ this.serverMessages.forEach(element => {
+ temp += Number(element.volume_flow);
+ });
+ return temp;
+ }
}
+
+
diff --git a/src/app/loader/loader.service.ts b/src/app/loader/loader.service.ts
index 9bf2d84..ca5caf6 100644
--- a/src/app/loader/loader.service.ts
+++ b/src/app/loader/loader.service.ts
@@ -16,7 +16,7 @@ export class LoaderService {
this.dialogRef = this.dialog.open(LoaderComponent, {
width: '80%',
data: { message },
- closeOnNavigation: false
+ closeOnNavigation: true
});
});
}
diff --git a/src/app/material/material.module.ts b/src/app/material/material.module.ts
index aac6f42..b34a62b 100644
--- a/src/app/material/material.module.ts
+++ b/src/app/material/material.module.ts
@@ -1,6 +1,7 @@
import { NgModule } from '@angular/core';
import { CdkTableModule } from '@angular/cdk/table';
import { CdkTreeModule } from '@angular/cdk/tree';
+import { DragDropModule } from '@angular/cdk/drag-drop';
import {
MatAutocompleteModule,
MatBadgeModule,
@@ -42,6 +43,7 @@ import {
exports: [
CdkTableModule,
CdkTreeModule,
+ DragDropModule,
MatAutocompleteModule,
MatBadgeModule,
MatBottomSheetModule,