Skip to content

Commit 690611a

Browse files
oburdasovoburdasov
oburdasov
and
oburdasov
authored
feat(formatter): add seconds and milliseconds options (#UIM-781) (#793)
* feat(formatter): add seconds and milliseconds options (#UIM-781) * feat(formatter): add seconds and milliseconds options [2] (#UIM-781) * feat(formatter): add seconds and milliseconds options [3] (#UIM-781) * feat(formatter): add examples with seconds & milliseconds (#UIM-781) * feat(formatter): add tests (#UIM-781) Co-authored-by: oburdasov <[email protected]>
1 parent d1b5d43 commit 690611a

File tree

13 files changed

+1863
-280
lines changed

13 files changed

+1863
-280
lines changed

‎packages/mosaic-dev/date-formatter/module.ts‎

Lines changed: 341 additions & 114 deletions
Large diffs are not rendered by default.

‎packages/mosaic-dev/date-formatter/template.html‎

Lines changed: 362 additions & 7 deletions
Large diffs are not rendered by default.

‎packages/mosaic-examples/mosaic/date-formatter/absolute-date-formatter/absolute-date-formatter-example.html‎

Lines changed: 44 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,39 @@ <h3>Long format</h3>
1717
<div class="flex">{{ formats.ru.absolute.long.date.notCurrentYear }}</div>
1818
<div class="flex">{{ formats.en.absolute.long.date.notCurrentYear }}</div>
1919
</div>
20+
<div class="row-border"></div>
21+
2022
<div class="layout-row row-border">
2123
<div class="flex">absoluteLongDateTime (current year)</div>
2224
<div class="flex">{{ formats.ru.absolute.long.dateTime.currentYear }}</div>
2325
<div class="flex">{{ formats.en.absolute.long.dateTime.currentYear }}</div>
2426
</div>
27+
<div class="layout-row row-border">
28+
<div class="flex">absoluteLongDateTime (current year) (with seconds)</div>
29+
<div class="flex">{{ formats.ru.absolute.long.dateTime.currentYearSeconds }}</div>
30+
<div class="flex">{{ formats.en.absolute.long.dateTime.currentYearSeconds }}</div>
31+
</div>
32+
<div class="layout-row row-border">
33+
<div class="flex">absoluteLongDateTime (current year) (with milliseconds)</div>
34+
<div class="flex">{{ formats.ru.absolute.long.dateTime.currentYearMilliseconds }}</div>
35+
<div class="flex">{{ formats.en.absolute.long.dateTime.currentYearMilliseconds }}</div>
36+
</div>
37+
<div class="row-border"></div>
38+
2539
<div class="layout-row row-border">
2640
<div class="flex">absoluteLongDateTime (not current year)</div>
2741
<div class="flex">{{ formats.ru.absolute.long.dateTime.notCurrentYear }}</div>
2842
<div class="flex">{{ formats.en.absolute.long.dateTime.notCurrentYear }}</div>
2943
</div>
3044
<div class="layout-row row-border">
31-
<div class="flex">absoluteLongDateTime (with milliseconds)</div>
32-
<div class="flex">{{ formats.ru.absolute.long.dateTime.milliseconds }}</div>
33-
<div class="flex">{{ formats.en.absolute.long.dateTime.milliseconds }}</div>
45+
<div class="flex">absoluteLongDateTime (not current year) (with seconds)</div>
46+
<div class="flex">{{ formats.ru.absolute.long.dateTime.notCurrentYearSeconds }}</div>
47+
<div class="flex">{{ formats.en.absolute.long.dateTime.notCurrentYearSeconds }}</div>
48+
</div>
49+
<div class="layout-row row-border">
50+
<div class="flex">absoluteLongDateTime (not current year) (with milliseconds)</div>
51+
<div class="flex">{{ formats.ru.absolute.long.dateTime.notCurrentYearMilliseconds }}</div>
52+
<div class="flex">{{ formats.en.absolute.long.dateTime.notCurrentYearMilliseconds }}</div>
3453
</div>
3554
</div>
3655
</div>
@@ -52,20 +71,39 @@ <h3>Short format</h3>
5271
<div class="flex">{{ formats.ru.absolute.short.date.notCurrentYear }}</div>
5372
<div class="flex">{{ formats.en.absolute.short.date.notCurrentYear }}</div>
5473
</div>
74+
<div class="row-border"></div>
75+
5576
<div class="layout-row row-border">
5677
<div class="flex">absoluteShortDateTime (current year)</div>
5778
<div class="flex">{{ formats.ru.absolute.short.dateTime.currentYear }}</div>
5879
<div class="flex">{{ formats.en.absolute.short.dateTime.currentYear }}</div>
5980
</div>
81+
<div class="layout-row row-border">
82+
<div class="flex">absoluteShortDateTime (current year) (with seconds)</div>
83+
<div class="flex">{{ formats.ru.absolute.short.dateTime.currentYearSeconds }}</div>
84+
<div class="flex">{{ formats.en.absolute.short.dateTime.currentYearSeconds }}</div>
85+
</div>
86+
<div class="layout-row row-border">
87+
<div class="flex">absoluteShortDateTime (current year) (with milliseconds)</div>
88+
<div class="flex">{{ formats.ru.absolute.short.dateTime.currentYearMilliseconds }}</div>
89+
<div class="flex">{{ formats.en.absolute.short.dateTime.currentYearMilliseconds }}</div>
90+
</div>
91+
<div class="row-border"></div>
92+
6093
<div class="layout-row row-border">
6194
<div class="flex">absoluteShortDateTime (not current year)</div>
6295
<div class="flex">{{ formats.ru.absolute.short.dateTime.notCurrentYear }}</div>
6396
<div class="flex">{{ formats.en.absolute.short.dateTime.notCurrentYear }}</div>
6497
</div>
6598
<div class="layout-row row-border">
66-
<div class="flex">absoluteShortDateTime (with milliseconds)</div>
67-
<div class="flex">{{ formats.ru.absolute.short.dateTime.milliseconds }}</div>
68-
<div class="flex">{{ formats.en.absolute.short.dateTime.milliseconds }}</div>
99+
<div class="flex">absoluteShortDateTime (not current year) (with seconds)</div>
100+
<div class="flex">{{ formats.ru.absolute.short.dateTime.notCurrentYearSeconds }}</div>
101+
<div class="flex">{{ formats.en.absolute.short.dateTime.notCurrentYearSeconds }}</div>
102+
</div>
103+
<div class="layout-row row-border">
104+
<div class="flex">absoluteShortDateTime (not current year) (with milliseconds)</div>
105+
<div class="flex">{{ formats.ru.absolute.short.dateTime.notCurrentYearMilliseconds }}</div>
106+
<div class="flex">{{ formats.en.absolute.short.dateTime.notCurrentYearMilliseconds }}</div>
69107
</div>
70108
</div>
71109
</div>

‎packages/mosaic-examples/mosaic/date-formatter/absolute-date-formatter/absolute-date-formatter-example.ts‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,12 @@ export class AbsoluteDateFormatterExample {
2929
},
3030
dateTime: {
3131
currentYear: '',
32+
currentYearSeconds: '',
33+
currentYearMilliseconds: '',
34+
3235
notCurrentYear: '',
33-
milliseconds: ''
36+
notCurrentYearSeconds: '',
37+
notCurrentYearMilliseconds: ''
3438
}
3539
},
3640
short: {
@@ -40,8 +44,12 @@ export class AbsoluteDateFormatterExample {
4044
},
4145
dateTime: {
4246
currentYear: '',
47+
currentYearSeconds: '',
48+
currentYearMilliseconds: '',
49+
4350
notCurrentYear: '',
44-
milliseconds: ''
51+
notCurrentYearSeconds: '',
52+
notCurrentYearMilliseconds: ''
4553
}
4654
}
4755
}
@@ -55,8 +63,12 @@ export class AbsoluteDateFormatterExample {
5563
},
5664
dateTime: {
5765
currentYear: '',
66+
currentYearSeconds: '',
67+
currentYearMilliseconds: '',
68+
5869
notCurrentYear: '',
59-
milliseconds: ''
70+
notCurrentYearSeconds: '',
71+
notCurrentYearMilliseconds: ''
6072
}
6173
},
6274
short: {
@@ -66,8 +78,12 @@ export class AbsoluteDateFormatterExample {
6678
},
6779
dateTime: {
6880
currentYear: '',
81+
currentYearSeconds: '',
82+
currentYearMilliseconds: '',
83+
6984
notCurrentYear: '',
70-
milliseconds: ''
85+
notCurrentYearSeconds: '',
86+
notCurrentYearMilliseconds: ''
7187
}
7288
}
7389
}
@@ -92,9 +108,16 @@ export class AbsoluteDateFormatterExample {
92108

93109
absoluteShort.date.currentYear = this.dateFormatter.absoluteShortDate(now);
94110
absoluteShort.date.notCurrentYear = this.dateFormatter.absoluteShortDate(now.minus({ years: 1 }));
111+
95112
absoluteShort.dateTime.currentYear = this.dateFormatter.absoluteShortDateTime(now);
113+
absoluteShort.dateTime.currentYearSeconds = this.dateFormatter.absoluteShortDateTime(now, {seconds: true});
114+
absoluteShort.dateTime.currentYearMilliseconds = this.dateFormatter.absoluteShortDateTime(now, {milliseconds: true});
115+
96116
absoluteShort.dateTime.notCurrentYear = this.dateFormatter.absoluteShortDateTime(now.minus({ years: 1 }));
97-
absoluteShort.dateTime.milliseconds = this.dateFormatter.absoluteShortDateTime(now, { milliseconds: true });
117+
absoluteShort.dateTime.notCurrentYearSeconds = this.dateFormatter.absoluteShortDateTime(now.minus({ years: 1 }), {seconds: true});
118+
absoluteShort.dateTime.notCurrentYearMilliseconds = this.dateFormatter.absoluteShortDateTime(
119+
now.minus({ years: 1 }), {milliseconds: true}
120+
);
98121
}
99122

100123
private populateAbsoluteLong(locale: string) {
@@ -107,8 +130,15 @@ export class AbsoluteDateFormatterExample {
107130

108131
absoluteLong.date.currentYear = this.dateFormatter.absoluteLongDate(now);
109132
absoluteLong.date.notCurrentYear = this.dateFormatter.absoluteLongDate(now.minus({ years: 1 }));
133+
110134
absoluteLong.dateTime.currentYear = this.dateFormatter.absoluteLongDateTime(now);
135+
absoluteLong.dateTime.currentYearSeconds = this.dateFormatter.absoluteLongDateTime(now, {seconds: true});
136+
absoluteLong.dateTime.currentYearMilliseconds = this.dateFormatter.absoluteLongDateTime(now, {milliseconds: true});
137+
111138
absoluteLong.dateTime.notCurrentYear = this.dateFormatter.absoluteLongDateTime(now.minus({ years: 1 }));
112-
absoluteLong.dateTime.milliseconds = this.dateFormatter.absoluteLongDateTime(now, { milliseconds: true });
139+
absoluteLong.dateTime.notCurrentYearSeconds = this.dateFormatter.absoluteLongDateTime(now.minus({ years: 1 }), {seconds: true});
140+
absoluteLong.dateTime.notCurrentYearMilliseconds = this.dateFormatter.absoluteLongDateTime(
141+
now.minus({ years: 1 }), {milliseconds: true}
142+
);
113143
}
114144
}

0 commit comments

Comments
 (0)