TF-2773 Fix printing no year on the email date
This commit is contained in:
@@ -1,4 +1,6 @@
|
|||||||
|
|
||||||
|
import 'dart:ui';
|
||||||
|
|
||||||
extension DateTimeExtension on DateTime {
|
extension DateTimeExtension on DateTime {
|
||||||
|
|
||||||
bool isToday() {
|
bool isToday() {
|
||||||
@@ -54,4 +56,12 @@ extension DateTimeNullableExtension on DateTime? {
|
|||||||
return 'dd.MM.yyyy, HH:mm';
|
return 'dd.MM.yyyy, HH:mm';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String toPatternForPrinting(String locale) {
|
||||||
|
if (locale == const Locale('en', 'US').toLanguageTag()) {
|
||||||
|
return 'MMM dd y, HH:mm';
|
||||||
|
} else {
|
||||||
|
return 'dd MMM y, HH:mm';
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ class PrintFileDataSourceImpl extends PrintFileDataSource {
|
|||||||
: null;
|
: null;
|
||||||
final receiveTime = emailPrint.emailInformation.getReceivedAt(
|
final receiveTime = emailPrint.emailInformation.getReceivedAt(
|
||||||
newLocale: emailPrint.locale,
|
newLocale: emailPrint.locale,
|
||||||
pattern: emailPrint.emailInformation.receivedAt?.value.toLocal().toPatternForEmailView()
|
pattern: emailPrint.emailInformation.receivedAt?.value.toLocal().toPatternForPrinting(emailPrint.locale)
|
||||||
);
|
);
|
||||||
|
|
||||||
final List<PrintAttachment> listPrintAttachment = [];
|
final List<PrintAttachment> listPrintAttachment = [];
|
||||||
|
|||||||
@@ -46,7 +46,6 @@ extension EmailExtension on Email {
|
|||||||
}
|
}
|
||||||
|
|
||||||
String getReceivedAt({required String newLocale, String? pattern}) {
|
String getReceivedAt({required String newLocale, String? pattern}) {
|
||||||
log('EmailExtension::getReceivedAt: newLocale = $newLocale | pattern = $pattern');
|
|
||||||
if (receivedAt != null) {
|
if (receivedAt != null) {
|
||||||
return receivedAt!.formatDateToLocal(
|
return receivedAt!.formatDateToLocal(
|
||||||
pattern: pattern ?? receivedAt!.value.toLocal().toPattern(),
|
pattern: pattern ?? receivedAt!.value.toLocal().toPattern(),
|
||||||
|
|||||||
Reference in New Issue
Block a user