diff --git a/src/app/applications/iot-devices/iot-device-detail/downlink/downlink-dialog/downlink-dialog.component.scss b/src/app/applications/iot-devices/iot-device-detail/downlink/downlink-dialog/downlink-dialog.component.scss
index e69de29b..3a030c3f 100644
--- a/src/app/applications/iot-devices/iot-device-detail/downlink/downlink-dialog/downlink-dialog.component.scss
+++ b/src/app/applications/iot-devices/iot-device-detail/downlink/downlink-dialog/downlink-dialog.component.scss
@@ -0,0 +1,13 @@
+.mat-mdc-dialog-title {
+ padding-left: 20px;
+}
+.mat-mdc-dialog-content {
+ padding-left: 20px !important;
+}
+.mat-mdc-dialog-actions {
+ padding-left: 20px !important;
+ gap: 8px;
+}
+.mat-mdc-button {
+ margin-left: 0px !important;
+}
diff --git a/src/app/applications/iot-devices/iot-device-detail/downlink/downlink-tables/downlink-tables.component.html b/src/app/applications/iot-devices/iot-device-detail/downlink/downlink-tables/downlink-tables.component.html
index 05683ce2..13a26f3b 100644
--- a/src/app/applications/iot-devices/iot-device-detail/downlink/downlink-tables/downlink-tables.component.html
+++ b/src/app/applications/iot-devices/iot-device-detail/downlink/downlink-tables/downlink-tables.component.html
@@ -11,7 +11,7 @@
- {{ element.createdAt | dkTimeWithSeconds }}
+ {{ element.createdAt | dkTimeWithSecondsNoPrefix }}
|
@@ -67,7 +67,7 @@
- {{ element.createdAt | dkTimeWithSeconds }}
+ {{ element.createdAt | dkTimeWithSecondsNoPrefix }}
|
@@ -77,7 +77,7 @@
- {{ element.sendAt | dkTimeWithSeconds }}
+ {{ element.sendAt | dkTimeWithSecondsNoPrefix }}
|
@@ -87,7 +87,7 @@
{{
element.acknowledgedAt
- ? (element.acknowledgedAt | dkTimeWithSeconds)
+ ? (element.acknowledgedAt | dkTimeWithSecondsNoPrefix)
: ("IOTDEVICE.DOWNLINK.NOT-RECEIVED" | translate)
}}
diff --git a/src/app/applications/iot-devices/iot-device-detail/downlink/downlink-tables/downlink-tables.component.ts b/src/app/applications/iot-devices/iot-device-detail/downlink/downlink-tables/downlink-tables.component.ts
index 264ef32e..c7849694 100644
--- a/src/app/applications/iot-devices/iot-device-detail/downlink/downlink-tables/downlink-tables.component.ts
+++ b/src/app/applications/iot-devices/iot-device-detail/downlink/downlink-tables/downlink-tables.component.ts
@@ -4,7 +4,6 @@ import { MatDialog } from "@angular/material/dialog";
import { MatSnackBar } from "@angular/material/snack-bar";
import { IotDevice } from "@applications/iot-devices/iot-device.model";
import { TranslateService } from "@ngx-translate/core";
-import { DeviceType } from "@shared/enums/device-type";
import { ErrorMessageService } from "@shared/error-message.service";
import { DownlinkService } from "@shared/services/downlink.service";
import { DownlinkDialogComponent } from "../downlink-dialog/downlink-dialog.component";
@@ -90,7 +89,10 @@ export class DownlinkTablesComponent implements OnInit {
}
openDownlinkDialog() {
- const dialog = this.dialog.open(DownlinkDialogComponent, {});
+ const dialog = this.dialog.open(DownlinkDialogComponent, {
+ width: "300px",
+ height: "200px",
+ });
dialog.afterClosed().subscribe(result => {
if (result === true) {
diff --git a/src/app/applications/iot-devices/iot-device-detail/downlink/downlinks/downlink.component.html b/src/app/applications/iot-devices/iot-device-detail/downlink/downlinks/downlink.component.html
index cd66ac7a..99635c8c 100644
--- a/src/app/applications/iot-devices/iot-device-detail/downlink/downlinks/downlink.component.html
+++ b/src/app/applications/iot-devices/iot-device-detail/downlink/downlinks/downlink.component.html
@@ -1,5 +1,5 @@
-
+
-
diff --git a/src/app/shared/pipes/custom-date.pipe.ts b/src/app/shared/pipes/custom-date.pipe.ts
index ce74324b..fe6fb94b 100644
--- a/src/app/shared/pipes/custom-date.pipe.ts
+++ b/src/app/shared/pipes/custom-date.pipe.ts
@@ -19,6 +19,15 @@ export class CustomDatePipeWithSeconds extends DatePipe implements PipeTransform
}
}
+@Pipe({
+ name: "dkTimeWithSecondsNoPrefix",
+})
+export class CustomDatePipeWithSecondsNoPrefix extends DatePipe implements PipeTransform {
+ transform(value: any, args?: any): any {
+ return super.transform(value, "dd-MM-yyyy kl. HH:mm:ss");
+ }
+}
+
@Pipe({
name: "tableDatePipe",
})
diff --git a/src/app/shared/pipes/pipes.module.ts b/src/app/shared/pipes/pipes.module.ts
index 64a1d15a..5ad4f4e3 100644
--- a/src/app/shared/pipes/pipes.module.ts
+++ b/src/app/shared/pipes/pipes.module.ts
@@ -4,7 +4,7 @@ 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, CustomDatePipeWithSeconds, CustomTableDatePipe, CustomTableDateWithSecondsPipe, DateOnlyPipe } from "./custom-date.pipe";
+import { CustomDatePipe, CustomDatePipeWithSeconds, CustomDatePipeWithSecondsNoPrefix, 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";
@@ -20,6 +20,7 @@ import { SortByTranslationPipe } from "./sort-by-translation.pipe";
YesNoPipe,
CustomDatePipe,
CustomDatePipeWithSeconds,
+ CustomDatePipeWithSecondsNoPrefix,
CustomTableDatePipe,
CustomTableDateWithSecondsPipe,
DateOnlyPipe,
@@ -39,6 +40,7 @@ import { SortByTranslationPipe } from "./sort-by-translation.pipe";
YesNoPipe,
CustomDatePipe,
CustomDatePipeWithSeconds,
+ CustomDatePipeWithSecondsNoPrefix,
CustomTableDatePipe,
CustomTableDateWithSecondsPipe,
DateOnlyPipe,
diff --git a/src/assets/i18n/da.json b/src/assets/i18n/da.json
index 5b71d91a..a194348e 100644
--- a/src/assets/i18n/da.json
+++ b/src/assets/i18n/da.json
@@ -919,7 +919,7 @@
"STARTDOWNLINK": "Start downlink til enhed",
"HISTORICQUEUE": "Historisk kø",
"FRAMECOUNTER": "Frame counter",
- "SENDAT": "Leveret",
+ "SENDAT": "Afsendt",
"RECEIVEDAT": "Modtaget",
"CONFIRMED": "Bekræftet (Ja/nej)",
"NOT-RECEIVED": "Ikke bekræftet modtaget",