Skip to content

Commit 9b96e44

Browse files
AugustHA-IteratorAugustHA-Iterator
committed
Merge branch 'stage' into feature/1508_HeightsMap
# Conflicts: # src/app/gateway/gateway-edit/gateway-edit.component.html # src/assets/i18n/da.json
2 parents 2d4302d + 9c12672 commit 9b96e44

File tree

21 files changed

+447
-458
lines changed

21 files changed

+447
-458
lines changed

‎src/app/applications/application-detail/application-detail.component.html‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
</app-top-bar>
1212
<div class="container-fluid">
1313
<div class="row">
14-
<div class="col-md-8 d-flex align-items-stretch">
15-
<div class="jumbotron jumbotron--m-left jumbotron--full-width">
14+
<div class="col-md-7 d-flex align-items-stretch">
15+
<div class="jumbotron jumbotron--m-left jumbotron--full-width width100percent">
1616
<div *ngIf="errorMessage" class="error-messages p-3 my-3">
1717
{{ errorMessage | translate }}
1818
</div>
@@ -39,10 +39,24 @@ <h3>{{ "APPLICATION.DETAILS" | translate }}</h3>
3939
></app-metadata-details>
4040
</div>
4141
</div>
42-
<div class="col-md-4 d-flex align-items-stretch">
43-
<div class="jumbotron jumbotron--m-left jumbotron--full-width">
42+
<div class="col-md-5 d-flex align-items-stretch">
43+
<div class="jumbotron jumbotron--m-left jumbotron--full-width width100percent">
4444
<div class="thirty-height" *ngIf="devices && gateways">
45-
<app-map [coordinateList]="coordinateList" [isFromApplication]="true"></app-map>
45+
<app-map [coordinateList]="coordinateList" [isFromApplication]="true" [applicationId]="application.id" ></app-map>
46+
</div>
47+
<div class="col d-flex markerDescriptionDiv">
48+
<div class="col d-flex">
49+
<img alt="IoTDeviceMarker" class="marker" src="{{ greyMarker }}" />
50+
<p>: IoT-Enhed</p>
51+
</div>
52+
<div class="col d-flex">
53+
<img alt="InactiveGatewayMarker" class="marker" src="{{ redMarker }}" />
54+
<p>: Inaktiv gateway</p>
55+
</div>
56+
<div class="col d-flex">
57+
<img alt="ActiveGatewayMarker" class="marker" src="{{ greenMarker }}" />
58+
<p>: Aktiv gateway</p>
59+
</div>
4660
</div>
4761
</div>
4862
</div>

‎src/app/applications/application-detail/application-detail.component.scss‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,22 @@
1-
@import 'src/assets/scss/setup/breakpoints';
2-
@import 'src/assets/scss/setup/variables';
1+
@import "src/assets/scss/setup/breakpoints";
2+
@import "src/assets/scss/setup/variables";
33

44
.application-component {
5-
.bottom-separator {
6-
min-height: 60px;
7-
border-bottom: $grey-separator solid 1px;
5+
.bottom-separator {
6+
min-height: 60px;
7+
border-bottom: $grey-separator solid 1px;
88

9-
@include media-breakpoint-up(md) {
10-
min-height: 150px;
9+
@include media-breakpoint-up(md) {
10+
min-height: 150px;
11+
}
1112
}
12-
}
13+
}
14+
15+
.marker {
16+
height: 25px;
17+
width: 20px;
18+
}
19+
20+
.markerDescriptionDiv {
21+
margin-top: 10px;
1322
}

‎src/app/applications/application-detail/application-detail.component.ts‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ export class ApplicationDetailComponent implements OnInit, OnDestroy, AfterViewI
5454
private deviceSubscription: Subscription;
5555
private gatewaysSubscription: Subscription;
5656
public gateways: Gateway[];
57+
public redMarker = "/assets/images/red-marker.png";
58+
public greenMarker = "/assets/images/green-marker.png";
59+
public greyMarker = "/assets/images/grey-marker.png";
5760

5861
constructor(
5962
private applicationService: ApplicationService,
@@ -149,29 +152,29 @@ export class ApplicationDetailComponent implements OnInit, OnDestroy, AfterViewI
149152
}
150153

151154
private mapGatewaysToCoordinateList() {
152-
const tempcoordinateList = [];
153-
this.gateways.map(gateway =>
154-
tempcoordinateList.push({
155-
longitude: gateway.location.longitude,
156-
latitude: gateway.location.latitude,
157-
draggable: false,
158-
editEnabled: false,
159-
useGeolocation: false,
160-
markerInfo: {
161-
name: gateway.name,
162-
active: this.getGatewayStatus(gateway),
163-
id: gateway.gatewayId,
164-
internalOrganizationId: gateway.organizationId,
165-
internalOrganizationName: gateway.organizationName,
166-
},
167-
})
168-
);
169-
this.coordinateList.push.apply(this.coordinateList, tempcoordinateList);
170-
}
155+
const tempcoordinateList = [];
156+
this.gateways.map(gateway =>
157+
tempcoordinateList.push({
158+
longitude: gateway.location.longitude,
159+
latitude: gateway.location.latitude,
160+
draggable: false,
161+
editEnabled: false,
162+
useGeolocation: false,
163+
markerInfo: {
164+
name: gateway.name,
165+
active: this.getGatewayStatus(gateway),
166+
id: gateway.gatewayId,
167+
internalOrganizationId: gateway.organizationId,
168+
internalOrganizationName: gateway.organizationName,
169+
},
170+
})
171+
);
172+
this.coordinateList.push.apply(this.coordinateList, tempcoordinateList);
173+
}
171174

172-
private getGatewayStatus(gateway: Gateway): boolean {
173-
return this.chirpstackGatewayService.isGatewayActive(gateway);
174-
}
175+
private getGatewayStatus(gateway: Gateway): boolean {
176+
return this.chirpstackGatewayService.isGatewayActive(gateway);
177+
}
175178

176179
onDeleteApplication() {
177180
this.deleteDialogService.showApplicationDialog(this.application).subscribe(response => {

‎src/app/applications/datatarget/fiware/fiware-detail/fiware-detail.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="container-fluid">
55
<div class="row">
66
<div class="col-md-6 d-flex align-items-stretch">
7-
<div class="jumbotron jumbotron--m-right jumbotron--full-width">
7+
<div class="jumbotron jumbotron--m-right jumbotron--full-width width100percent">
88
<h3>{{ 'DATATARGET.DETAILS' | translate }}</h3>
99
<app-general-details [data]="datatarget"></app-general-details>
1010
<mat-divider></mat-divider>

‎src/app/applications/datatarget/httppush/httppush-detail/httppush-detail.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="container-fluid">
55
<div class="row">
66
<div class="col-md-6 d-flex align-items-stretch">
7-
<div class="jumbotron jumbotron--m-right jumbotron--full-width">
7+
<div class="jumbotron jumbotron--m-right jumbotron--full-width width100percent">
88
<h3>{{ 'DATATARGET.DETAILS' | translate }}</h3>
99
<app-general-details [data]="datatarget"></app-general-details>
1010
<mat-divider></mat-divider>

‎src/app/applications/datatarget/mqtt-detail/mqtt-detail.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div class="container-fluid">
66
<div class="row">
77
<div class="col-md-6 d-flex align-items-stretch">
8-
<div class="jumbotron jumbotron--m-right jumbotron--full-width">
8+
<div class="jumbotron jumbotron--m-right jumbotron--full-width width100percent">
99
<h3>{{ 'DATATARGET.DETAILS' | translate }}</h3>
1010
<app-general-details [data]="datatarget"></app-general-details>
1111
<mat-divider></mat-divider>

‎src/app/applications/iot-devices/iot-device-detail/iot-device-detail-generic/iot-device-detail-generic.component.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="row">
22
<div class="col-md-6 d-flex align-items-stretch">
3-
<div class="jumbotron jumbotron--m-right jumbotron--full-width">
3+
<div class="jumbotron jumbotron--m-right jumbotron--full-width width100percent">
44
<h3>{{ 'IOTDEVICE.DETAIL' | translate }}</h3>
55
<p class="mr-1"><strong>{{ 'IOT-TABLE.APPLICATION' | translate }}</strong>{{device.application.name}}</p>
66
<app-general-details [data]="device"></app-general-details>
@@ -62,17 +62,17 @@ <h3>{{ 'IOTDEVICE.DETAIL' | translate }}</h3>
6262
</div>
6363
</div>
6464
<div class="col-md-6 d-flex align-items-stretch">
65-
<div class="jumbotron jumbotron--m-left jumbotron--full-width">
65+
<div class="jumbotron jumbotron--m-left jumbotron--full-width width100percent">
6666
<h3>{{ 'IOTDEVICE.LOCATION' | translate }}</h3>
6767
<div *ngIf="device.location; else locationElseBlock">
6868
<div class="thirty-height">
6969
<app-map [coordinates]="getCoordinates()"></app-map>
7070
</div>
7171
<div class="row">
72-
<div class="col-6">
72+
<div class="col-6 latLonWrapWidth">
7373
<p><strong>{{ 'IOTDEVICE.LATITUDE' | translate }}</strong>{{latitude | number:'2.1-9'}}</p>
7474
</div>
75-
<div class="col-6">
75+
<div class="col-6 latLonWrapWidth">
7676
<p><strong>{{ 'IOTDEVICE.LONGITUDE' | translate }}</strong>{{longitude | number:'2.1-9'}}</p>
7777
</div>
7878
</div>

‎src/app/applications/iot-devices/iot-device-detail/iot-device-detail-generic/iot-device-detail-generic.component.scss‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1+
@import 'src/assets/scss/setup/variables';
2+
13
.pre {
2-
white-space: pre-wrap;
3-
white-space: -moz-pre-wrap;
4-
white-space: -o-pre-wrap;
5-
font-family: monospace;
4+
white-space: pre-wrap;
5+
white-space: -moz-pre-wrap;
6+
white-space: -o-pre-wrap;
7+
font-family: monospace;
8+
}
9+
10+
.alarmText {
11+
color: #ff0000;
12+
font-size: 1em;
613
}
714

8-
.alarmText{
9-
color: #ff0000;
10-
font-size: 1em;
15+
.latLonWrapWidth {
16+
@media (max-width: 1250px) {
17+
width: 100%;
18+
}
1119
}

‎src/app/applications/iot-devices/iot-device-detail/iot-device-details-tab/iot-device-details-tab.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
</app-iot-device-detail-generic>
44
<!-- Device model -->
55
<div class="col-md-6 d-flex align-items-stretch">
6-
<div class="jumbotron jumbotron--m-right jumbotron--full-width">
6+
<div class="jumbotron jumbotron--m-right jumbotron--full-width width100percent">
77
<app-device-model [device]="device"></app-device-model>
88
</div>
99
</div>

0 commit comments

Comments
 (0)