eduvia/workavia-mail-front
11
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

TF-2068 Display organizer address when organizer name

Browse Source 
(cherry picked from commit f0e0670b798e3d751ced6ce5040b458b1ad10f04)
This commit is contained in:
dab246
2023-08-03 12:07:46 +07:00
committed by Dat Vu
parent d38bd99c83
commit 157fbe347a
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/email/presentation/extensions/calendar_event_extension.dart
+6 -4
View File
@@ -121,18 +121,20 @@ extension CalendarEventExtension on CalendarEvent {
case EventMethod.refresh: case EventMethod.refresh:
case EventMethod.cancel: case EventMethod.cancel:
case EventMethod.declineCounter: case EventMethod.declineCounter:
return getOrganizerName(context); return getOrganizerNameEvent(context);
case EventMethod.reply: case EventMethod.reply:
case EventMethod.counter: case EventMethod.counter:
return getAttendeeName(context, listEmailAddressSender); return getAttendeeNameEvent(context, listEmailAddressSender);
default: default:
return ''; return '';
} }
} }
String getOrganizerName(BuildContext context) => organizer?.name ?? AppLocalizations.of(context).you; String getOrganizerNameEvent(BuildContext context) => organizer?.name ?? AppLocalizations.of(context).you;
String getAttendeeName(BuildContext context, List<String> listEmailAddressSender) { String get organizerName => organizer?.name ?? organizer?.mailto?.value ?? '';
String getAttendeeNameEvent(BuildContext context, List<String> listEmailAddressSender) {
final matchedAttendee = findAttendeeHasUpdatedStatus(listEmailAddressSender); final matchedAttendee = findAttendeeHasUpdatedStatus(listEmailAddressSender);
if (matchedAttendee != null) { if (matchedAttendee != null) {
return matchedAttendee.name?.name ?? AppLocalizations.of(context).anAttendee; return matchedAttendee.name?.name ?? AppLocalizations.of(context).anAttendee;
lib/features/email/presentation/widgets/calendar_event/calendar_event_information_widget.dart
+2 -2
View File
@@ -71,7 +71,7 @@ class CalendarEventInformationWidget extends StatelessWidget {
), ),
children: [ children: [
TextSpan( TextSpan(
text: calendarEvent.organizer?.name, text: calendarEvent.organizerName,
style: const TextStyle( style: const TextStyle(
color: CalendarEventInformationWidgetStyles.invitationMessageColor, color: CalendarEventInformationWidgetStyles.invitationMessageColor,
fontSize: CalendarEventInformationWidgetStyles.invitationMessageTextSize, fontSize: CalendarEventInformationWidgetStyles.invitationMessageTextSize,
@@ -136,7 +136,7 @@ class CalendarEventInformationWidget extends StatelessWidget {
), ),
children: [ children: [
TextSpan( TextSpan(
text: calendarEvent.organizer?.name, text: calendarEvent.organizerName,
style: const TextStyle( style: const TextStyle(
color: CalendarEventInformationWidgetStyles.invitationMessageColor, color: CalendarEventInformationWidgetStyles.invitationMessageColor,
fontSize: CalendarEventInformationWidgetStyles.invitationMessageTextSize, fontSize: CalendarEventInformationWidgetStyles.invitationMessageTextSize,