frontend

smartuni · Nov 26, 2018 · caa9dac · caa9dac
1 parent 3840040
commit caa9dac
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 54 deletions.
diff --git a/Frontend/dist/Frontend/main.js b/Frontend/dist/Frontend/main.js
diff --git a/Frontend/dist/Frontend/main.js.map b/Frontend/dist/Frontend/main.js.map
diff --git a/Frontend/src/app/modules/home/components/edit/edit.component.html b/Frontend/src/app/modules/home/components/edit/edit.component.html
@@ -14,7 +14,7 @@
                         <select  class="form-control" formControlName="deviceId"
                                 (change)="onChangeSensor($event)">
                             <option *ngFor="let sensor of sensors; let i = index" [value]="sensor.id">
-                                {{sensor.id}}
+                                {{sensor.name ? sensor.name : sensor.id}}
                             </option>
                         </select>
                     </div>

diff --git a/Frontend/src/app/modules/home/components/edit/edit.component.ts b/Frontend/src/app/modules/home/components/edit/edit.component.ts
@@ -33,12 +33,12 @@ export class EditComponent implements OnInit {
         const editedSensor = {
             id: formValue.deviceId,
             period: formValue.period,
-            status: this.selectedSensor.status
+            status: this.selectedSensor.status,
+            name: !formValue.deviceName || (formValue.deviceName && formValue.deviceName.length === 0)
+                ? null
+                : formValue.deviceName
         };
 
-        if (formValue.deviceName) {
-            editedSensor['name'] = formValue.deviceName;
-        }
         this.sensorService.updateSensors(editedSensor).subscribe(res => {
             this.onUpdated.emit(editedSensor);
         });

diff --git a/Frontend/src/app/modules/home/components/filter-bar/filter-bar.component.html b/Frontend/src/app/modules/home/components/filter-bar/filter-bar.component.html
@@ -8,7 +8,7 @@
                                 *ngFor="let device of sensors; let i = index"
                                 [value]="device">
                         <div class="row">
-                            <div class="col-auto">
+                            <div class="COL-9 description">
                                 {{device.name ? device.name : device.id}}
                             </div>
                             <div class="col text-right">

diff --git a/Frontend/src/app/modules/home/components/filter-bar/filter-bar.component.scss b/Frontend/src/app/modules/home/components/filter-bar/filter-bar.component.scss
@@ -76,4 +76,10 @@ input[type="time"]:focus {
   box-shadow: 0px 0px 1px 3px rgba(68,139,252,1);
 }
 
+.description {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
 
diff --git a/Frontend/src/app/modules/home/components/filter-bar/filter-bar.component.ts b/Frontend/src/app/modules/home/components/filter-bar/filter-bar.component.ts
@@ -17,7 +17,7 @@ import {UpdateSensorsSAction} from 'store/actions/sensors';
 })
 export class FilterBarComponent implements OnInit {
     form: FormGroup;
-    sensors: Sensor[];
+    sensors: Sensor[] = [];
     @Output() onChangedValue = new EventEmitter();
     isLoading: boolean;
 

diff --git a/Frontend/src/app/modules/home/pages/home-page.component.ts b/Frontend/src/app/modules/home/pages/home-page.component.ts
@@ -4,6 +4,9 @@ import {SensorService} from '../services/sensor.service';
 import {Store} from '@ngrx/store';
 import * as fromRoot from 'store/reducers';
 import {SensorsLoadedFailAction, SensorsLoadedSuccessAction, SensorsLoadingAction} from 'store/actions/sensors';
+import {interval} from 'rxjs';
+import {flatMap} from 'tslint/lib/utils';
+import {tap} from 'rxjs/internal/operators';
 
 @Component({
     selector: 'app-homepage',
@@ -22,9 +25,16 @@ export class HomePageComponent implements OnInit {
     }
 
     ngOnInit() {
-        setTimeout(() => {
-            this.getAllSensors();
-        }, 500);
+        // interval(60 * 60 * 1000)
+        //     .pipe(
+        //         tap(() => {
+                    setTimeout(() => {
+                        this.getAllSensors();
+                    }, 500);
+                // })
+            // )
+            // .subscribe();
+
 
     }
 
@@ -45,29 +55,11 @@ export class HomePageComponent implements OnInit {
     }
 
     private getAllSensors() {
-        // this.isLoading = true;
         this.store.dispatch(new SensorsLoadingAction());
-        // const testData = [
-        //     {
-        //         id: 'test12',
-        //         name: '345',
-        //         period: 456,
-        //         status: SensorStatus.CONNECTED
-        //     },
-        //     {
-        //         id: 'thahah',
-        //         name: 'hoho',
-        //         period: 456,
-        //         status: SensorStatus.DISCONNECTED
-        //     }];
-        // this.store.dispatch(new SensorsLoadedSuccessAction(testData));
-        // this.isLoading = false;
         this.sensorService.getAllSenors().subscribe(sensorList => {
             this.store.dispatch(new SensorsLoadedSuccessAction(sensorList));
-            // this.isLoading = false;
         }, error1 => {
             this.store.dispatch(new SensorsLoadedFailAction());
-            // this.isLoading = false;
         });
 
     }