Skip to content

Commit e63155e

Browse files
(IOT-1495) Added new time format pipe with seconds (#141)
1 parent 6e0823d commit e63155e

File tree

4 files changed

+80
-66
lines changed

4 files changed

+80
-66
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<p>
55
<strong>{{'IOTDEVICE.LATEST-DATAPACKAGE' | translate}}</strong>
66

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
let metadata of sortedMetadata;
2121
let i = index
2222
">
23-
{{ metadata.sentTime | tableDatePipe }}
23+
{{ metadata.sentTime | tableDateWithSecondsPipe }}
2424
</p>
2525
</div>
2626
</div>

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

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,31 @@ import { Pipe, PipeTransform } from '@angular/core';
22
import { DatePipe } from '@angular/common';
33

44
@Pipe({
5-
name: 'dkTime'
5+
name: 'dkTime',
66
})
77
export class CustomDatePipe extends DatePipe implements PipeTransform {
8-
transform(value: any, args?: any): any {
9-
return super.transform(value, ' \'den\' dd-MM-yyyy kl. HH:mm');
10-
}
8+
transform(value: any, args?: any): any {
9+
return super.transform(value, " 'den' dd-MM-yyyy kl. HH:mm");
10+
}
1111
}
1212

13-
1413
@Pipe({
15-
name: 'tableDatePipe'
14+
name: 'tableDatePipe',
1615
})
1716
export class CustomTableDatePipe extends DatePipe implements PipeTransform {
18-
transform(value: any, args?: any): any {
19-
return super.transform(value, 'dd MMM, yyyy - HH:mm');
20-
}
17+
transform(value: any, args?: any): any {
18+
return super.transform(value, 'dd MMM, yyyy - HH:mm');
19+
}
20+
}
21+
22+
@Pipe({
23+
name: 'tableDateWithSecondsPipe',
24+
})
25+
export class CustomTableDateWithSecondsPipe extends DatePipe
26+
implements PipeTransform {
27+
transform(value: any, args?: any): any {
28+
return super.transform(value, 'dd MMM, yyyy - HH:mm:ss');
29+
}
2130
}
2231

2332
@Pipe({
Lines changed: 59 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,59 @@
1-
import { NgModule } from '@angular/core';
2-
import { CommonModule } from '@angular/common';
3-
import { YesNoPipe } from './yesNo.pipe';
4-
import { ActiveDeactivePipe } from './activeDeactive.pipe';
5-
import { IsGlobalAdminPipe } from './permission/is-global-admin.pipe';
6-
import { CreatedUpdatedByPipe } from './created-updated-by.pipe';
7-
import { CustomDatePipe, CustomTableDatePipe, DateOnlyPipe } from './custom-date.pipe';
8-
import { FilterDevicesPipe } from './filter-devices.pipe';
9-
import { TranslatePermissionsPipe } from './permission/translate-permissions.pipe';
10-
import { SortByPipe } from './sort-by.pipe';
11-
import { GatewayStatusTooltipPipe } from './gateway/gateway-status-tooltip.pipe';
12-
import { GatewayStatusClassPipe } from './gateway/gateway-status-class.pipe';
13-
import { CanEditApplicationPipe } from './permission/can-edit-application.pipe';
14-
import { SortByTranslationPipe } from './sort-by-translation.pipe';
15-
16-
@NgModule({
17-
declarations: [
18-
IsGlobalAdminPipe,
19-
ActiveDeactivePipe,
20-
YesNoPipe,
21-
CustomDatePipe,
22-
CustomTableDatePipe,
23-
DateOnlyPipe,
24-
CreatedUpdatedByPipe,
25-
FilterDevicesPipe,
26-
TranslatePermissionsPipe,
27-
SortByPipe,
28-
GatewayStatusTooltipPipe,
29-
GatewayStatusClassPipe,
30-
CanEditApplicationPipe,
31-
SortByTranslationPipe,
32-
],
33-
imports: [CommonModule],
34-
exports: [
35-
IsGlobalAdminPipe,
36-
ActiveDeactivePipe,
37-
YesNoPipe,
38-
CustomDatePipe,
39-
CustomTableDatePipe,
40-
DateOnlyPipe,
41-
CreatedUpdatedByPipe,
42-
FilterDevicesPipe,
43-
TranslatePermissionsPipe,
44-
SortByPipe,
45-
GatewayStatusTooltipPipe,
46-
GatewayStatusClassPipe,
47-
CanEditApplicationPipe,
48-
SortByTranslationPipe,
49-
],
50-
providers: [
51-
DateOnlyPipe
52-
]
53-
})
54-
export class PipesModule {}
1+
import { NgModule } from '@angular/core';
2+
import { CommonModule } from '@angular/common';
3+
import { YesNoPipe } from './yesNo.pipe';
4+
import { ActiveDeactivePipe } from './activeDeactive.pipe';
5+
import { IsGlobalAdminPipe } from './permission/is-global-admin.pipe';
6+
import { CreatedUpdatedByPipe } from './created-updated-by.pipe';
7+
import {
8+
CustomDatePipe,
9+
CustomTableDatePipe,
10+
CustomTableDateWithSecondsPipe,
11+
DateOnlyPipe,
12+
} from './custom-date.pipe';
13+
import { FilterDevicesPipe } from './filter-devices.pipe';
14+
import { TranslatePermissionsPipe } from './permission/translate-permissions.pipe';
15+
import { SortByPipe } from './sort-by.pipe';
16+
import { GatewayStatusTooltipPipe } from './gateway/gateway-status-tooltip.pipe';
17+
import { GatewayStatusClassPipe } from './gateway/gateway-status-class.pipe';
18+
import { CanEditApplicationPipe } from './permission/can-edit-application.pipe';
19+
import { SortByTranslationPipe } from './sort-by-translation.pipe';
20+
21+
@NgModule({
22+
declarations: [
23+
IsGlobalAdminPipe,
24+
ActiveDeactivePipe,
25+
YesNoPipe,
26+
CustomDatePipe,
27+
CustomTableDatePipe,
28+
CustomTableDateWithSecondsPipe,
29+
DateOnlyPipe,
30+
CreatedUpdatedByPipe,
31+
FilterDevicesPipe,
32+
TranslatePermissionsPipe,
33+
SortByPipe,
34+
GatewayStatusTooltipPipe,
35+
GatewayStatusClassPipe,
36+
CanEditApplicationPipe,
37+
SortByTranslationPipe,
38+
],
39+
imports: [CommonModule],
40+
exports: [
41+
IsGlobalAdminPipe,
42+
ActiveDeactivePipe,
43+
YesNoPipe,
44+
CustomDatePipe,
45+
CustomTableDatePipe,
46+
CustomTableDateWithSecondsPipe,
47+
DateOnlyPipe,
48+
CreatedUpdatedByPipe,
49+
FilterDevicesPipe,
50+
TranslatePermissionsPipe,
51+
SortByPipe,
52+
GatewayStatusTooltipPipe,
53+
GatewayStatusClassPipe,
54+
CanEditApplicationPipe,
55+
SortByTranslationPipe,
56+
],
57+
providers: [DateOnlyPipe],
58+
})
59+
export class PipesModule {}

0 commit comments

Comments
 (0)