From 9683b3f42fbc6679a9e89a663a608e699855ed25 Mon Sep 17 00:00:00 2001 From: Sultan khan <> Date: Wed, 18 Jan 2023 10:05:22 +0300 Subject: [PATCH] Dubai Reminder fixed. --- .../xcshareddata/xcschemes/Runner.xcscheme | 97 ------------------- .../widgets/AppointmentActions.dart | 9 +- lib/uitl/CalendarUtils.dart | 8 +- 3 files changed, 11 insertions(+), 103 deletions(-) delete mode 100644 ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme deleted file mode 100644 index ea96fe5f..00000000 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/pages/MyAppointments/widgets/AppointmentActions.dart b/lib/pages/MyAppointments/widgets/AppointmentActions.dart index 35f88bed..e7e82fc6 100644 --- a/lib/pages/MyAppointments/widgets/AppointmentActions.dart +++ b/lib/pages/MyAppointments/widgets/AppointmentActions.dart @@ -33,6 +33,7 @@ import 'package:diplomaticquarterapp/widgets/data_display/medical/medical_profil import 'package:diplomaticquarterapp/widgets/in_app_browser/InAppBrowser.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; +import 'package:intl/intl.dart'; import 'package:map_launcher/map_launcher.dart'; import 'package:maps_launcher/maps_launcher.dart'; import 'package:provider/provider.dart'; @@ -108,11 +109,15 @@ class _AppointmentActionsState extends State { case "addReminder": showReminderDialog( context, - DateUtil.convertStringToDate(widget.appo.appointmentDate), + new DateFormat("dd MMM yyyy hh:mm") + .parse(DateUtil.formatDateToDate(DateUtil.convertStringToDate(widget.appo.appointmentDate), widget.projectViewModel.isArabic) + " " + widget.appo.startTime), + //DateUtil.convertStringToDate(widget.appo.appointmentDate), widget.appo.doctorNameObj, "", + DateUtil.formatDateToDate(DateUtil.convertStringToDate(widget.appo.appointmentDate), widget.projectViewModel.isArabic), - DateUtil.formatDateToTime(DateUtil.convertStringToDate(widget.appo.appointmentDate)), + // DateUtil.formatDateToTime(DateUtil.convertStringToDate(widget.appo.appointmentDate)), + widget.appo.startTime, onSuccess: () { AppToast.showSuccessToast(message: TranslationBase.of(context).reminderSuccess); }, diff --git a/lib/uitl/CalendarUtils.dart b/lib/uitl/CalendarUtils.dart index b79ea3ef..75af015c 100644 --- a/lib/uitl/CalendarUtils.dart +++ b/lib/uitl/CalendarUtils.dart @@ -62,10 +62,10 @@ class CalendarUtils { TZDateTime scheduleDateTimeUTZ = TZDateTime.from(scheduleDateTime, _currentLocation); - print("eventId: " + eventId); - print("writableCalendars-name: " + writableCalendars.name); - print("writableCalendars-Id: " + writableCalendars.id); - print("writableCalendarsToString: " + writableCalendars.toString()); + // print("eventId: " + eventId); + // print("writableCalendars-name: " + writableCalendars.name); + // print("writableCalendars-Id: " + writableCalendars.id); + // print("writableCalendarsToString: " + writableCalendars.toString()); Event event = Event(writableCalendars.id, start: scheduleDateTimeUTZ, end: scheduleDateTimeUTZ.add(Duration(minutes: 30)), title: title, description: description); deviceCalendarPlugin.createOrUpdateEvent(event).catchError((e) { print("catchError " + e.toString());