(IOT-1211) Updated description text for data rate

src/app/applications/iot-devices/iot-device-detail/data-package/data-package.component.html

@@ -4,7 +4,7 @@
             <p>
                 <strong>{{'IOTDEVICE.LATEST-DATAPACKAGE' | translate}}</strong>
 
-                {{latestReceivedMessage.sentTime | tableDatePipe}}
+                {{latestReceivedMessage.sentTime | tableDateWithSecondsPipe}}
             </p>
         </mat-panel-title>
     </mat-expansion-panel-header>
@@ -18,4 +18,4 @@
     <p class="my-2 mx-3">
         {{'IOTDEVICE.NO-DATAPACKAGE' | translate}}
     </p>
-</ng-template>
+</ng-template>

src/app/applications/iot-devices/iot-device-detail/data-packages-timestamp/data-packages-timestamp.component.html

@@ -20,7 +20,7 @@
           let metadata of sortedMetadata;
           let i = index
         ">
-        {{ metadata.sentTime | tableDatePipe }}
+        {{ metadata.sentTime | tableDateWithSecondsPipe }}
       </p>
     </div>
   </div>

src/app/profiles/service-profiles/service-profiles-edit/service-profiles-edit.component.html

@@ -85,7 +85,7 @@
                 <input type="number" id="drMin" name="drMin" class="form-control" [(ngModel)]="serviceProfile.drMin" [disabled]="!canEdit"
                     [ngClass]="{'is-invalid' : formFailedSubmit && errorFields.includes('drMin'), 'is-valid' : formFailedSubmit && !errorFields.includes('drMin')}"
                     step="0" min="-180" max="180" maxlength="9" (keyup)="onCoordinateKey($event)" [placeholder]="0" />
-                <label>{{'PROFILES.SERVICE_PROFILE.DRRATEMINEXPLAINED' | translate}}</label>
+                <label class="line-break">{{'PROFILES.SERVICE_PROFILE.DRRATEMINEXPLAINED' | translate}}</label>
             </div>
         </div>
         <div class="col-6">
@@ -94,7 +94,7 @@
                 <input type="number" id="drMax" name="drMax" class="form-control" [(ngModel)]="serviceProfile.drMax" [disabled]="!canEdit"
                     [ngClass]="{'is-invalid' : formFailedSubmit && errorFields.includes('drMax'), 'is-valid' : formFailedSubmit && !errorFields.includes('drMax')}"
                     step="0" min="-180" max="180" maxlength="9" (keyup)="onCoordinateKey($event)" [placeholder]="0" />
-                <Label>{{'PROFILES.SERVICE_PROFILE.DRRATEMAXEXPLAINED' | translate}}</Label>
+                <Label class="line-break">{{'PROFILES.SERVICE_PROFILE.DRRATEMAXEXPLAINED' | translate}}</Label>
             </div>
         </div>
     </div>
@@ -113,4 +113,4 @@
         </div>
     </div>
 
-</form>
+</form>

src/app/shared/pipes/custom-date.pipe.ts

@@ -2,22 +2,31 @@ import { Pipe, PipeTransform } from '@angular/core';
 import { DatePipe } from '@angular/common';
 
 @Pipe({
-    name: 'dkTime'
+  name: 'dkTime',
 })
 export class CustomDatePipe extends DatePipe implements PipeTransform {
-    transform(value: any, args?: any): any {
-        return super.transform(value, ' \'den\' dd-MM-yyyy kl. HH:mm');
-    }
+  transform(value: any, args?: any): any {
+    return super.transform(value, " 'den' dd-MM-yyyy kl. HH:mm");
+  }
 }
 
-
 @Pipe({
-    name: 'tableDatePipe'
+  name: 'tableDatePipe',
 })
 export class CustomTableDatePipe extends DatePipe implements PipeTransform {
-    transform(value: any, args?: any): any {
-        return super.transform(value, 'dd MMM, yyyy - HH:mm');
-    }
+  transform(value: any, args?: any): any {
+    return super.transform(value, 'dd MMM, yyyy - HH:mm');
+  }
+}
+
+@Pipe({
+  name: 'tableDateWithSecondsPipe',
+})
+export class CustomTableDateWithSecondsPipe extends DatePipe
+  implements PipeTransform {
+  transform(value: any, args?: any): any {
+    return super.transform(value, 'dd MMM, yyyy - HH:mm:ss');
+  }
 }
 
 @Pipe({

src/app/shared/pipes/pipes.module.ts

@@ -1,54 +1,59 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { YesNoPipe } from './yesNo.pipe';
-import { ActiveDeactivePipe } from './activeDeactive.pipe';
-import { IsGlobalAdminPipe } from './permission/is-global-admin.pipe';
-import { CreatedUpdatedByPipe } from './created-updated-by.pipe';
-import { CustomDatePipe, CustomTableDatePipe, DateOnlyPipe } from './custom-date.pipe';
-import { FilterDevicesPipe } from './filter-devices.pipe';
-import { TranslatePermissionsPipe } from './permission/translate-permissions.pipe';
-import { SortByPipe } from './sort-by.pipe';
-import { GatewayStatusTooltipPipe } from './gateway/gateway-status-tooltip.pipe';
-import { GatewayStatusClassPipe } from './gateway/gateway-status-class.pipe';
-import { CanEditApplicationPipe } from './permission/can-edit-application.pipe';
-import { SortByTranslationPipe } from './sort-by-translation.pipe';
-
-@NgModule({
-  declarations: [
-    IsGlobalAdminPipe,
-    ActiveDeactivePipe,
-    YesNoPipe,
-    CustomDatePipe,
-    CustomTableDatePipe,
-    DateOnlyPipe,
-    CreatedUpdatedByPipe,
-    FilterDevicesPipe,
-    TranslatePermissionsPipe,
-    SortByPipe,
-    GatewayStatusTooltipPipe,
-    GatewayStatusClassPipe,
-    CanEditApplicationPipe,
-    SortByTranslationPipe,
-  ],
-  imports: [CommonModule],
-  exports: [
-    IsGlobalAdminPipe,
-    ActiveDeactivePipe,
-    YesNoPipe,
-    CustomDatePipe,
-    CustomTableDatePipe,
-    DateOnlyPipe,
-    CreatedUpdatedByPipe,
-    FilterDevicesPipe,
-    TranslatePermissionsPipe,
-    SortByPipe,
-    GatewayStatusTooltipPipe,
-    GatewayStatusClassPipe,
-    CanEditApplicationPipe,
-    SortByTranslationPipe,
-  ],
-  providers: [
-    DateOnlyPipe
-  ]
-})
-export class PipesModule {}
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { YesNoPipe } from './yesNo.pipe';
+import { ActiveDeactivePipe } from './activeDeactive.pipe';
+import { IsGlobalAdminPipe } from './permission/is-global-admin.pipe';
+import { CreatedUpdatedByPipe } from './created-updated-by.pipe';
+import {
+  CustomDatePipe,
+  CustomTableDatePipe,
+  CustomTableDateWithSecondsPipe,
+  DateOnlyPipe,
+} from './custom-date.pipe';
+import { FilterDevicesPipe } from './filter-devices.pipe';
+import { TranslatePermissionsPipe } from './permission/translate-permissions.pipe';
+import { SortByPipe } from './sort-by.pipe';
+import { GatewayStatusTooltipPipe } from './gateway/gateway-status-tooltip.pipe';
+import { GatewayStatusClassPipe } from './gateway/gateway-status-class.pipe';
+import { CanEditApplicationPipe } from './permission/can-edit-application.pipe';
+import { SortByTranslationPipe } from './sort-by-translation.pipe';
+
+@NgModule({
+  declarations: [
+    IsGlobalAdminPipe,
+    ActiveDeactivePipe,
+    YesNoPipe,
+    CustomDatePipe,
+    CustomTableDatePipe,
+    CustomTableDateWithSecondsPipe,
+    DateOnlyPipe,
+    CreatedUpdatedByPipe,
+    FilterDevicesPipe,
+    TranslatePermissionsPipe,
+    SortByPipe,
+    GatewayStatusTooltipPipe,
+    GatewayStatusClassPipe,
+    CanEditApplicationPipe,
+    SortByTranslationPipe,
+  ],
+  imports: [CommonModule],
+  exports: [
+    IsGlobalAdminPipe,
+    ActiveDeactivePipe,
+    YesNoPipe,
+    CustomDatePipe,
+    CustomTableDatePipe,
+    CustomTableDateWithSecondsPipe,
+    DateOnlyPipe,
+    CreatedUpdatedByPipe,
+    FilterDevicesPipe,
+    TranslatePermissionsPipe,
+    SortByPipe,
+    GatewayStatusTooltipPipe,
+    GatewayStatusClassPipe,
+    CanEditApplicationPipe,
+    SortByTranslationPipe,
+  ],
+  providers: [DateOnlyPipe],
+})
+export class PipesModule {}

src/assets/i18n/da.json

@@ -963,9 +963,9 @@
       "REPORTBATTERYSTATUS": "Rapporter enhedens batteriniveau til applikationsserveren",
       "REPORTBATTERYMARGIN": "Rapporter device link margin til applikationsserver",
       "DRRATEMIN": "Min data rate",
-      "DRRATEMINEXPLAINED": "Minimum tilladte data rate. Brugt til ADR",
+      "DRRATEMINEXPLAINED": "Minimum tilladte data rate. Skal være et tal fra 0-7. \nBrugt til ADR",
       "DRRATEMAX": "Max data rate",
-      "DRRATEMAXEXPLAINED": "Maximum tilladte data rate. Brugt til ADR",
+      "DRRATEMAXEXPLAINED": "Maximum tilladte data rate. Skal være et tal fra 0-7. \nBrugt til ADR",
       "SAVE": "Gem",
       "CANCEL": "Annuller",
       "GOBACK": "Gå tilbage",

src/styles.scss

@@ -109,3 +109,7 @@ body {
     border-color: $color-white-001;
   }
 }
+
+.line-break {
+  white-space: pre-line;
+}