Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/feedback changes #160

Merged
merged 11 commits into from
May 1, 2024
Merged

Feature/feedback changes #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8c33c20
added markers description
Apr 19, 2024
37173b4
Feedback changes.
Apr 19, 2024
a116868
fixed routing bug
Apr 25, 2024
828bf7c
Merge branch 'feature/IOT-1559_FixRouting' into feature/FeedbackChanges
Apr 25, 2024
2b0d306
filtered out gateways from clustering
Apr 25, 2024
eaccd74
Merge branch 'feature/filterOutGateways' into feature/FeedbackChanges
Apr 25, 2024
c9c1560
wrap lat lon on device if width is under 1250px
Apr 25, 2024
0034097
fixed no error message on lorawan device.
Apr 25, 2024
443bd73
removed console.log that showed access token
Apr 25, 2024
dfaa307
feedback changes for metadata on gateways.
Apr 25, 2024
ba6bb65
added alt to img
May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 19 additions & 5 deletions src/app/applications/application-detail/application-detail.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
</app-top-bar>
<div class="container-fluid">
<div class="row">
<div class="col-md-8 d-flex align-items-stretch">
<div class="jumbotron jumbotron--m-left jumbotron--full-width">
<div class="col-md-7 d-flex align-items-stretch">
<div class="jumbotron jumbotron--m-left jumbotron--full-width width100percent">
<div *ngIf="errorMessage" class="error-messages p-3 my-3">
{{ errorMessage | translate }}
</div>
Expand All @@ -39,10 +39,24 @@ <h3>{{ "APPLICATION.DETAILS" | translate }}</h3>
></app-metadata-details>
</div>
</div>
<div class="col-md-4 d-flex align-items-stretch">
<div class="jumbotron jumbotron--m-left jumbotron--full-width">
<div class="col-md-5 d-flex align-items-stretch">
<div class="jumbotron jumbotron--m-left jumbotron--full-width width100percent">
<div class="thirty-height" *ngIf="devices && gateways">
<app-map [coordinateList]="coordinateList" [isFromApplication]="true"></app-map>
<app-map [coordinateList]="coordinateList" [isFromApplication]="true" [applicationId]="application.id" ></app-map>
</div>
<div class="col d-flex markerDescriptionDiv">
<div class="col d-flex">
<img alt="IoTDeviceMarker" class="marker" src="{{ greyMarker }}" />
<p>: IoT-Enhed</p>
</div>
<div class="col d-flex">
<img alt="InactiveGatewayMarker" class="marker" src="{{ redMarker }}" />
<p>: Inaktiv gateway</p>
</div>
<div class="col d-flex">
<img alt="ActiveGatewayMarker" class="marker" src="{{ greenMarker }}" />
<p>: Aktiv gateway</p>
</div>
</div>
</div>
</div>
Expand Down
25 changes: 17 additions & 8 deletions src/app/applications/application-detail/application-detail.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,22 @@
@import 'src/assets/scss/setup/breakpoints';
@import 'src/assets/scss/setup/variables';
@import "src/assets/scss/setup/breakpoints";
@import "src/assets/scss/setup/variables";

.application-component {
.bottom-separator {
min-height: 60px;
border-bottom: $grey-separator solid 1px;
.bottom-separator {
min-height: 60px;
border-bottom: $grey-separator solid 1px;

@include media-breakpoint-up(md) {
min-height: 150px;
@include media-breakpoint-up(md) {
min-height: 150px;
}
}
}
}

.marker {
height: 25px;
width: 20px;
}

.markerDescriptionDiv {
margin-top: 10px;
}
47 changes: 25 additions & 22 deletions src/app/applications/application-detail/application-detail.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ export class ApplicationDetailComponent implements OnInit, OnDestroy, AfterViewI
private deviceSubscription: Subscription;
private gatewaysSubscription: Subscription;
public gateways: Gateway[];
public redMarker = "/assets/images/red-marker.png";
public greenMarker = "/assets/images/green-marker.png";
public greyMarker = "/assets/images/grey-marker.png";

constructor(
private applicationService: ApplicationService,
Expand Down Expand Up @@ -149,29 +152,29 @@ export class ApplicationDetailComponent implements OnInit, OnDestroy, AfterViewI
}

private mapGatewaysToCoordinateList() {
const tempcoordinateList = [];
this.gateways.map(gateway =>
tempcoordinateList.push({
longitude: gateway.location.longitude,
latitude: gateway.location.latitude,
draggable: false,
editEnabled: false,
useGeolocation: false,
markerInfo: {
name: gateway.name,
active: this.getGatewayStatus(gateway),
id: gateway.gatewayId,
internalOrganizationId: gateway.organizationId,
internalOrganizationName: gateway.organizationName,
},
})
);
this.coordinateList.push.apply(this.coordinateList, tempcoordinateList);
}
const tempcoordinateList = [];
this.gateways.map(gateway =>
tempcoordinateList.push({
longitude: gateway.location.longitude,
latitude: gateway.location.latitude,
draggable: false,
editEnabled: false,
useGeolocation: false,
markerInfo: {
name: gateway.name,
active: this.getGatewayStatus(gateway),
id: gateway.gatewayId,
internalOrganizationId: gateway.organizationId,
internalOrganizationName: gateway.organizationName,
},
})
);
this.coordinateList.push.apply(this.coordinateList, tempcoordinateList);
}

private getGatewayStatus(gateway: Gateway): boolean {
return this.chirpstackGatewayService.isGatewayActive(gateway);
}
private getGatewayStatus(gateway: Gateway): boolean {
return this.chirpstackGatewayService.isGatewayActive(gateway);
}

onDeleteApplication() {
this.deleteDialogService.showApplicationDialog(this.application).subscribe(response => {
Expand Down
2 changes: 1 addition & 1 deletion src/app/applications/datatarget/fiware/fiware-detail/fiware-detail.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="container-fluid">
<div class="row">
<div class="col-md-6 d-flex align-items-stretch">
<div class="jumbotron jumbotron--m-right jumbotron--full-width">
<div class="jumbotron jumbotron--m-right jumbotron--full-width width100percent">
<h3>{{ 'DATATARGET.DETAILS' | translate }}</h3>
<app-general-details [data]="datatarget"></app-general-details>
<mat-divider></mat-divider>
Expand Down
2 changes: 1 addition & 1 deletion src/app/applications/datatarget/httppush/httppush-detail/httppush-detail.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="container-fluid">
<div class="row">
<div class="col-md-6 d-flex align-items-stretch">
<div class="jumbotron jumbotron--m-right jumbotron--full-width">
<div class="jumbotron jumbotron--m-right jumbotron--full-width width100percent">
<h3>{{ 'DATATARGET.DETAILS' | translate }}</h3>
<app-general-details [data]="datatarget"></app-general-details>
<mat-divider></mat-divider>
Expand Down
2 changes: 1 addition & 1 deletion src/app/applications/datatarget/mqtt-detail/mqtt-detail.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="container-fluid">
<div class="row">
<div class="col-md-6 d-flex align-items-stretch">
<div class="jumbotron jumbotron--m-right jumbotron--full-width">
<div class="jumbotron jumbotron--m-right jumbotron--full-width width100percent">
<h3>{{ 'DATATARGET.DETAILS' | translate }}</h3>
<app-general-details [data]="datatarget"></app-general-details>
<mat-divider></mat-divider>
Expand Down
8 changes: 4 additions & 4 deletions ...ices/iot-device-detail/iot-device-detail-generic/iot-device-detail-generic.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="row">
<div class="col-md-6 d-flex align-items-stretch">
<div class="jumbotron jumbotron--m-right jumbotron--full-width">
<div class="jumbotron jumbotron--m-right jumbotron--full-width width100percent">
<h3>{{ 'IOTDEVICE.DETAIL' | translate }}</h3>
<p class="mr-1"><strong>{{ 'IOT-TABLE.APPLICATION' | translate }}</strong>{{device.application.name}}</p>
<app-general-details [data]="device"></app-general-details>
Expand Down Expand Up @@ -62,17 +62,17 @@ <h3>{{ 'IOTDEVICE.DETAIL' | translate }}</h3>
</div>
</div>
<div class="col-md-6 d-flex align-items-stretch">
<div class="jumbotron jumbotron--m-left jumbotron--full-width">
<div class="jumbotron jumbotron--m-left jumbotron--full-width width100percent">
<h3>{{ 'IOTDEVICE.LOCATION' | translate }}</h3>
<div *ngIf="device.location; else locationElseBlock">
<div class="thirty-height">
<app-map [coordinates]="getCoordinates()"></app-map>
</div>
<div class="row">
<div class="col-6">
<div class="col-6 latLonWrapWidth">
<p><strong>{{ 'IOTDEVICE.LATITUDE' | translate }}</strong>{{latitude | number:'2.1-9'}}</p>
</div>
<div class="col-6">
<div class="col-6 latLonWrapWidth">
<p><strong>{{ 'IOTDEVICE.LONGITUDE' | translate }}</strong>{{longitude | number:'2.1-9'}}</p>
</div>
</div>
Expand Down
22 changes: 15 additions & 7 deletions ...ices/iot-device-detail/iot-device-detail-generic/iot-device-detail-generic.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
@import 'src/assets/scss/setup/variables';

.pre {
white-space: pre-wrap;
white-space: -moz-pre-wrap;
white-space: -o-pre-wrap;
font-family: monospace;
white-space: pre-wrap;
white-space: -moz-pre-wrap;
white-space: -o-pre-wrap;
font-family: monospace;
}

.alarmText {
color: #ff0000;
font-size: 1em;
}

.alarmText{
color: #ff0000;
font-size: 1em;
.latLonWrapWidth {
@media (max-width: 1250px) {
width: 100%;
}
}
2 changes: 1 addition & 1 deletion ...ot-devices/iot-device-detail/iot-device-details-tab/iot-device-details-tab.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
</app-iot-device-detail-generic>
<!-- Device model -->
<div class="col-md-6 d-flex align-items-stretch">
<div class="jumbotron jumbotron--m-right jumbotron--full-width">
<div class="jumbotron jumbotron--m-right jumbotron--full-width width100percent">
<app-device-model [device]="device"></app-device-model>
</div>
</div>
Expand Down