Merge pull request #137 from casanet/development

Bugs Fixes
casanet · May 22, 2020 · 93b34c8 · 93b34c8
2 parents 7044b43 + 688f384
commit 93b34c8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/frontend/src/app/dashboard-crm/minions/minions.component.html b/frontend/src/app/dashboard-crm/minions/minions.component.html
@@ -97,7 +97,7 @@
                     </button>
                     <button mat-menu-item (click)="editCalibrate(minion)">
                         <mat-icon>slow_motion_video</mat-icon>
-                        <span>{{ 'CALIBRATION' | translate}}</span>
+                        <span>{{ 'CALIBRATION_LOCKS' | translate}}</span>
                     </button>
                     <button mat-menu-item (click)="recordModePressed(minion)" [disabled]="!isMinionRecordble(minion)">
                         <mat-icon>settings_remote</mat-icon>

diff --git a/frontend/src/app/dashboard-crm/timings/timings.component.ts b/frontend/src/app/dashboard-crm/timings/timings.component.ts
@@ -61,7 +61,7 @@ export class TimingsComponent implements OnInit, OnDestroy {
   }
 
   private parseTimings() {
-     this.rawTimings.map((timing): DisplayTiming => {
+     this.rawTimings.forEach((timing): DisplayTiming => {
       const {
         overrideLock,
         lockStatus,
@@ -102,6 +102,8 @@ export class TimingsComponent implements OnInit, OnDestroy {
       // return displayTiming;
     });
 
+    this.timings = this.timings.filter((t) => this.rawTimings.some(rt => rt.timingId === t.timingId));
+
     this.timings.sort((itemA, itemB) => {
       /** If type is the same, sort by display name */
       if (itemA.timingType === itemB.timingType) {

diff --git a/frontend/src/assets/i18n/en.json b/frontend/src/assets/i18n/en.json
@@ -228,6 +228,7 @@
   "OPERATION_ID": "Operation ID",
   "INFO": "Info",
   "CALIBRATION": "Calibration",
+  "CALIBRATION_LOCKS" : "Calibration & Locks",
   "DEFINE_CALIBRATION": "Define minion calibrate activation, to make sure that minion status in the casanet is the same as the real physical device status. also, you can lock minion status from been changed.",
   "MINUTES_CYCLE": "Calibration cycle, in minutes",
   "CALIBRATE_EACH": "Calibrate each",

diff --git a/frontend/src/assets/i18n/he.json b/frontend/src/assets/i18n/he.json
@@ -229,6 +229,7 @@
   "OPERATION_ID": "מזהה פעולה",
   "INFO": "מידע",
   "CALIBRATION": "כיול",
+  "CALIBRATION_LOCKS" : "כיול & נעילות",
   "DEFINE_CALIBRATION": "הגדרת כיול אוטומטי, לווידוא שהסטטוס הידוע בשרת זהה לסטטוס של המכשיר הפיזי. בנוסף ניתן לנעול סטטוס משינויים.",
   "MINUTES_CYCLE": "מחזור כיול, בדקות",
   "CALIBRATE_EACH": "מכייל כל",