diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index 53071bc8..a10c3033 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -187,8 +187,8 @@ class BaseAppClient { // body['IdentificationNo'] = 1023854217; // body['MobileNo'] = "531940021"; //0560717232 - // body['PatientID'] = 3628599; //4609100 - // body['TokenID'] = "@dm!n"; + body['PatientID'] = 2266239; //4609100 + body['TokenID'] = "@dm!n"; // Patient ID: 3027574 // Mobile no.: 0502303285 diff --git a/lib/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart index 422955ba..95971d0b 100644 --- a/lib/pages/login/confirm-login.dart +++ b/lib/pages/login/confirm-login.dart @@ -369,7 +369,16 @@ class _ConfirmLogin extends State { checkUserAuthentication(type) { showLoader(true); - var req = authService.getCommonRequest(type: type, registerd_data: this.registerd_data, deviceToken: this.deviceToken, mobileNumber: this.mobileNumber, zipCode: this.zipCode, patientOutSA: this.patientOutSA, loginTokenID: this.loginTokenID, selectedOption: this.selectedOption, user: this.user!); + var req = authService.getCommonRequest( + type: type, + registerd_data: this.registerd_data, + deviceToken: this.deviceToken, + mobileNumber: this.mobileNumber, + zipCode: this.zipCode, + patientOutSA: this.patientOutSA, + loginTokenID: this.loginTokenID, + selectedOption: this.selectedOption, + user: this.user!); req.logInTokenID = ""; var request = CheckPatientAuthenticationReq.fromJson(req.toJson()); @@ -400,7 +409,16 @@ class _ConfirmLogin extends State { } sendActivationCode(type) async { - var request = this.authService.getCommonRequest(type: type, registerd_data: this.registerd_data, deviceToken: this.deviceToken, mobileNumber: this.mobileNumber, zipCode: this.zipCode, patientOutSA: this.patientOutSA, loginTokenID: this.loginTokenID, selectedOption: this.selectedOption, user: this.user!); + var request = this.authService.getCommonRequest( + type: type, + registerd_data: this.registerd_data, + deviceToken: this.deviceToken, + mobileNumber: this.mobileNumber, + zipCode: this.zipCode, + patientOutSA: this.patientOutSA, + loginTokenID: this.loginTokenID, + selectedOption: this.selectedOption, + user: this.user!); request.sMSSignature = await SMSOTP.getSignature(); GifLoaderDialogUtils.showMyDialog(context); if (healthId != null || widget.isDubai) { @@ -478,7 +496,16 @@ class _ConfirmLogin extends State { // this.checkActivationCode(); // } else { - var request = this.authService.getCommonRequest(type: type, registerd_data: this.registerd_data, deviceToken: this.deviceToken, mobileNumber: this.mobileNumber, zipCode: this.zipCode, patientOutSA: this.patientOutSA, loginTokenID: this.loginTokenID, selectedOption: this.selectedOption, user: this.user!); + var request = this.authService.getCommonRequest( + type: type, + registerd_data: this.registerd_data, + deviceToken: this.deviceToken, + mobileNumber: this.mobileNumber, + zipCode: this.zipCode, + patientOutSA: this.patientOutSA, + loginTokenID: this.loginTokenID, + selectedOption: this.selectedOption, + user: this.user!); this.getMobileInfo(request); //} } @@ -595,7 +622,17 @@ class _ConfirmLogin extends State { checkActivationCode({value}) async { // Navigator.pop(context); GifLoaderDialogUtils.showMyDialog(context); - var request = authService.getCommonRequest(registerd_data: this.registerd_data, deviceToken: this.deviceToken, mobileNumber: this.mobileNumber, zipCode: this.zipCode, patientOutSA: this.patientOutSA, loginTokenID: this.loginTokenID, selectedOption: this.selectedOption, user: this.user! ).toJson(); + var request = authService + .getCommonRequest( + registerd_data: this.registerd_data, + deviceToken: this.deviceToken, + mobileNumber: this.mobileNumber, + zipCode: this.zipCode, + patientOutSA: this.patientOutSA, + loginTokenID: this.loginTokenID, + selectedOption: this.selectedOption, + user: this.user!) + .toJson(); dynamic res; if (healthId != null || widget.isDubai) { if (!widget.isDubai) { diff --git a/lib/uitl/CalendarUtils.dart b/lib/uitl/CalendarUtils.dart index f7fdda41..c54b5443 100644 --- a/lib/uitl/CalendarUtils.dart +++ b/lib/uitl/CalendarUtils.dart @@ -77,9 +77,10 @@ class CalendarUtils { scheduleDateTime!.forEach((element) { RecurrenceRule recurrenceRule = RecurrenceRule( - RecurrenceFrequency.Daily, - daysOfWeek: daysOfWeek, - endDate: element, + // RecurrenceFrequency.Daily, + // daysOfWeek: daysOfWeek, + // endDate: element, + until: element, frequency: Frequency.daily, ); //added byAamir Tz Time Event event = Event(writableCalendars!.id, @@ -98,9 +99,10 @@ class CalendarUtils { Future createOrUpdateEvent({required String title, required String description, DateTime? scheduleDateTime, String? eventId}) async { RecurrenceRule recurrenceRule = RecurrenceRule( - RecurrenceFrequency.Daily, + // RecurrenceFrequency.Daily, // daysOfWeek: daysOfWeek, - endDate: scheduleDateTime, + // endDate: scheduleDateTime, + until: scheduleDateTime, frequency: Frequency.daily, ); Location _currentLocation; @@ -126,7 +128,7 @@ class CalendarUtils { ios.CalendarEvent iosCalEvent = ios.CalendarEvent(eventId: eventId, startDate: scheduleDateTimeUTZ, endDate: scheduleDateTimeUTZ.add(Duration(minutes: 30)), title: title, description: description, isAllDay: false); - if(Platform.isAndroid) { + if (Platform.isAndroid) { Result result = await deviceCalendarPlugin.hasPermissions(); print(result); await deviceCalendarPlugin.createOrUpdateEvent(event).catchError((e) { @@ -143,10 +145,6 @@ class CalendarUtils { print("whenComplete Calender ID iOS " + eventId!); }); } - - - - } deleteEvent(Calendar _calendar, Event _event) async { diff --git a/lib/uitl/app_toast.dart b/lib/uitl/app_toast.dart index 8eb68f54..c2fd98f4 100644 --- a/lib/uitl/app_toast.dart +++ b/lib/uitl/app_toast.dart @@ -70,7 +70,7 @@ class AppToast { child: toast, gravity: ToastGravity.TOP, toastDuration: Duration(seconds: timeInSeconds), - positionedToastBuilder: (context, child, gravity) { + positionedToastBuilder: (context, child) { return Positioned(top: 50, left: 10, right: 10, child: child); }); } diff --git a/pubspec.yaml b/pubspec.yaml index 94981682..d1c4547f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,8 @@ description: A new Flutter application. version: 4.6.009+1 environment: - sdk: ">=3.0.0 <3.13.0" +# sdk: ">=3.0.0 <3.13.0" + sdk: ">=3.6.0 <4.0.0" dependencies: flutter: @@ -18,7 +19,7 @@ dependencies: webview_flutter: ^4.8.0 app_links: ^6.4.0 http: ^1.4.0 - connectivity_plus: ^6.1.4 + connectivity_plus: 6.1.0 async: ^2.8.1 audio_wave: ^0.1.4 provider: ^6.0.5 @@ -71,7 +72,7 @@ dependencies: location: ^8.0.1 barcode_scan2: ^4.5.1 flutter_rating_bar: ^4.0.1 - syncfusion_flutter_calendar: ^28.1.37 + syncfusion_flutter_calendar: ^29.2.11+1 # SVG Images flutter_svg: ^2.0.8 @@ -84,7 +85,8 @@ dependencies: flutter_datetime_picker_plus: ^2.1.0 carousel_pro_nullsafety: ^2.0.0 flutter_local_notifications: any - device_calendar: ^4.3.3 + device_calendar: + git: https://github.com/bardram/device_calendar geolocator: ^14.0.2 geolocator_android: ^5.0.2 geocoding: ^4.0.0 @@ -98,7 +100,7 @@ dependencies: #Dependencies for video call implementation native_device_orientation: ^2.0.3 # wakelock: ^0.6.2 - wakelock_plus: ^1.1.4 + wakelock_plus: ^1.3.2 after_layout: ^1.1.0 cached_network_image: ^3.3.0 flutter_tts: ^4.2.3 @@ -120,7 +122,7 @@ dependencies: wave: ^0.2.0 sms_otp_auto_verify: ^2.1.0 google_api_availability: ^5.0.1 - open_filex: ^4.3.2 + open_filex: ^4.7.0 path_provider: ^2.0.8 amazon_payfort: ^1.1.4 logger: ^2.0.2+1