Merge pull request #162 from OS2iot/feature/feedbackRettelser

Feature/feedback rettelser
OS2iot · May 13, 2024 · 7d1972f · 7d1972f
2 parents 3c90deb + 8751e34
commit 7d1972f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/src/app/applications/application-detail/application-detail.component.html b/src/app/applications/application-detail/application-detail.component.html
@@ -42,20 +42,24 @@ <h3>{{ "APPLICATION.DETAILS" | translate }}</h3>
             <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" [applicationId]="application.id" ></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>
+                            <p>&nbsp; IoT-Enhed</p>
                         </div>
                         <div class="col d-flex">
                             <img alt="InactiveGatewayMarker" class="marker" src="{{ redMarker }}" />
-                            <p>: Inaktiv gateway</p>
+                            <p>&nbsp; Inaktiv gateway</p>
                         </div>
                         <div class="col d-flex">
                             <img alt="ActiveGatewayMarker" class="marker" src="{{ greenMarker }}" />
-                            <p>: Aktiv gateway</p>
+                            <p>&nbsp; Aktiv gateway</p>
                         </div>
                     </div>
                 </div>

diff --git a/src/app/gateway/gateway-edit/gateway-edit.component.html b/src/app/gateway/gateway-edit/gateway-edit.component.html
@@ -77,46 +77,46 @@
             <p class="label">{{ "HEIGHTCURVESINFO" | translate }}</p>
         </div>
 
-    <div class="row mb-5">
-      <div class="form-group mt-3 col-6">
-                <label class="form-label" for="longitude">{{ "GATEWAY.LONGITUDE" | translate }}</label>
+        <div class="row mb-5">
+            <div class="form-group mt-3 col-6">
+                <label class="form-label" for="location.latitude">{{ "GATEWAY.LATITUDE" | translate }}</label>
                 <input
                     type="number"
                     class="form-control"
-                    id="longitude"
-                    name="longitude"
+                    id="location.latitude"
+                    name="location.latitude"
                     [placeholder]="'00'"
                     required
-                    [(ngModel)]="gateway.location.longitude"
+                    [(ngModel)]="gateway.location.latitude"
                     step=".000001"
                     min="-180"
                     max="180"
                     maxlength="12"
                     (keyup)="onCoordinateKey($event)"
                     [ngClass]="{
-                        'is-invalid': formFailedSubmit && errorFields.includes('longitude'),
-                        'is-valid': formFailedSubmit && !errorFields.includes('longitude')
+                        'is-invalid': formFailedSubmit && errorFields.includes('latitude'),
+                        'is-valid': formFailedSubmit && !errorFields.includes('latitude')
                     }"
                 />
             </div>
             <div class="form-group mt-3 col-6">
-                <label class="form-label" for="location.latitude">{{ "GATEWAY.LATITUDE" | translate }}</label>
+                <label class="form-label" for="longitude">{{ "GATEWAY.LONGITUDE" | translate }}</label>
                 <input
                     type="number"
                     class="form-control"
-                    id="location.latitude"
-                    name="location.latitude"
+                    id="longitude"
+                    name="longitude"
                     [placeholder]="'00'"
                     required
-                    [(ngModel)]="gateway.location.latitude"
+                    [(ngModel)]="gateway.location.longitude"
                     step=".000001"
                     min="-180"
                     max="180"
                     maxlength="12"
                     (keyup)="onCoordinateKey($event)"
                     [ngClass]="{
-                        'is-invalid': formFailedSubmit && errorFields.includes('latitude'),
-                        'is-valid': formFailedSubmit && !errorFields.includes('latitude')
+                        'is-invalid': formFailedSubmit && errorFields.includes('longitude'),
+                        'is-valid': formFailedSubmit && !errorFields.includes('longitude')
                     }"
                 />
             </div>