From 1ce35936e22a8017b3c73cf9997ce39ced7b338a Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Mon, 4 Aug 2025 13:57:03 +0300 Subject: [PATCH] Updates --- lib/core/service/client/base_app_client.dart | 4 +- lib/pages/login/confirm-login.dart | 45 ++++++++++++++++++-- lib/uitl/CalendarUtils.dart | 6 +-- lib/uitl/app_toast.dart | 2 +- 4 files changed, 45 insertions(+), 12 deletions(-) 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 f3340ea4..c54b5443 100644 --- a/lib/uitl/CalendarUtils.dart +++ b/lib/uitl/CalendarUtils.dart @@ -128,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) { @@ -145,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); }); }