Merged GSM

zarubto4 · Nov 14, 2018 · ab6d203 · ab6d203
1 parent 134cbbd
commit ab6d203
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/src/app/helpers/StaticTranslation.ts b/src/app/helpers/StaticTranslation.ts
@@ -1537,6 +1537,7 @@ export class StaticTranslation {
                 'label_no_running_update_on_hardware_comment': 'There is no update for this device yet. Create new <strong class="font-color-code">Code</strong> program or set new release',
                 'label_main_server': '<strong class="font-color-cloud">CLOUD</strong> Server',
                 'label_instance': '<strong class="font-color-instance">INSTANCE</strong> Name',
+                'label_cellular': '<strong class="font-color-hardware">CELLULAR</strong> integration',
                 'label_instance_description': 'Description',
                 'label_main_server_not_found': 'Device is not connected to Server yet',
                 'label_not_in_instance': 'Device is not connected to an instance',

diff --git a/src/app/views/_BaseMainComponent.ts b/src/app/views/_BaseMainComponent.ts
@@ -215,6 +215,10 @@ export abstract class _BaseMainComponent {
         this.navigate(['/projects', this.currentParamsService.get('project'), 'instances', instance_id]);
     }
 
+    public onCellularClick(cellular_id: string) {
+        this.navigate(['/projects', this.currentParamsService.get('project'), 'gsm', cellular_id]);
+    }
+
     public onGridProjectClick(grid_project_id: string) {
         this.navigate(['/projects', this.currentParamsService.get('project'), 'grid', grid_project_id]);
     }

diff --git a/src/app/views/projects-project-hardware-hardware.html b/src/app/views/projects-project-hardware-hardware.html
@@ -450,8 +450,15 @@ <h5 class="font-red-flamingo">
                                     </div>
                                 </div>
 
-                                <div *ngIf="!hardware.actual_instance">
-                                    <span [innerHTML]="'label_not_in_instance'|bkTranslate:this"></span>
+                                <hr>
+
+                                <div *ngIf="hardware.cellular">
+
+                                    <div>
+                                        <span [innerHTML]="'label_cellular'|bkTranslate:this"></span>:
+                                        <a *ngIf="hardware.cellular.id" (click)="onCellularClick(hardware.cellular.id)" class="bold">{{hardware.cellular.name}}</a>
+                                    </div>
+
                                 </div>
 
                             </div>

diff --git a/version.json b/version.json
@@ -1 +1 @@
-{"id":500,"date":"2018-11-14 15:09:03"}
+{"id":501,"date":"2018-11-14 15:15:46"}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"id":500,"date":"2018-11-14 15:09:03"}
		{"id":501,"date":"2018-11-14 15:15:46"}