updare-to-3.32.sultan
haroon amjad 7 months ago
parent fd0635764d
commit 90ec43f8b0

@ -187,8 +187,8 @@ class BaseAppClient {
// body['IdentificationNo'] = 1023854217; // body['IdentificationNo'] = 1023854217;
// body['MobileNo'] = "531940021"; //0560717232 // body['MobileNo'] = "531940021"; //0560717232
// body['PatientID'] = 3628599; //4609100 body['PatientID'] = 2266239; //4609100
// body['TokenID'] = "@dm!n"; body['TokenID'] = "@dm!n";
// Patient ID: 3027574 // Patient ID: 3027574
// Mobile no.: 0502303285 // Mobile no.: 0502303285

@ -369,7 +369,16 @@ class _ConfirmLogin extends State<ConfirmLogin> {
checkUserAuthentication(type) { checkUserAuthentication(type) {
showLoader(true); 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 = ""; req.logInTokenID = "";
var request = CheckPatientAuthenticationReq.fromJson(req.toJson()); var request = CheckPatientAuthenticationReq.fromJson(req.toJson());
@ -400,7 +409,16 @@ class _ConfirmLogin extends State<ConfirmLogin> {
} }
sendActivationCode(type) async { 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(); request.sMSSignature = await SMSOTP.getSignature();
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
if (healthId != null || widget.isDubai) { if (healthId != null || widget.isDubai) {
@ -478,7 +496,16 @@ class _ConfirmLogin extends State<ConfirmLogin> {
// this.checkActivationCode(); // this.checkActivationCode();
// } else { // } 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); this.getMobileInfo(request);
//} //}
} }
@ -595,7 +622,17 @@ class _ConfirmLogin extends State<ConfirmLogin> {
checkActivationCode({value}) async { checkActivationCode({value}) async {
// Navigator.pop(context); // Navigator.pop(context);
GifLoaderDialogUtils.showMyDialog(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; dynamic res;
if (healthId != null || widget.isDubai) { if (healthId != null || widget.isDubai) {
if (!widget.isDubai) { if (!widget.isDubai) {

@ -77,9 +77,10 @@ class CalendarUtils {
scheduleDateTime!.forEach((element) { scheduleDateTime!.forEach((element) {
RecurrenceRule recurrenceRule = RecurrenceRule( RecurrenceRule recurrenceRule = RecurrenceRule(
RecurrenceFrequency.Daily, // RecurrenceFrequency.Daily,
daysOfWeek: daysOfWeek, // daysOfWeek: daysOfWeek,
endDate: element, // endDate: element,
until: element, frequency: Frequency.daily,
); );
//added byAamir Tz Time //added byAamir Tz Time
Event event = Event(writableCalendars!.id, Event event = Event(writableCalendars!.id,
@ -98,9 +99,10 @@ class CalendarUtils {
Future createOrUpdateEvent({required String title, required String description, DateTime? scheduleDateTime, String? eventId}) async { Future createOrUpdateEvent({required String title, required String description, DateTime? scheduleDateTime, String? eventId}) async {
RecurrenceRule recurrenceRule = RecurrenceRule( RecurrenceRule recurrenceRule = RecurrenceRule(
RecurrenceFrequency.Daily, // RecurrenceFrequency.Daily,
// daysOfWeek: daysOfWeek, // daysOfWeek: daysOfWeek,
endDate: scheduleDateTime, // endDate: scheduleDateTime,
until: scheduleDateTime, frequency: Frequency.daily,
); );
Location _currentLocation; Location _currentLocation;
@ -126,7 +128,7 @@ class CalendarUtils {
ios.CalendarEvent iosCalEvent = ios.CalendarEvent iosCalEvent =
ios.CalendarEvent(eventId: eventId, startDate: scheduleDateTimeUTZ, endDate: scheduleDateTimeUTZ.add(Duration(minutes: 30)), title: title, description: description, isAllDay: false); 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<bool> result = await deviceCalendarPlugin.hasPermissions(); Result<bool> result = await deviceCalendarPlugin.hasPermissions();
print(result); print(result);
await deviceCalendarPlugin.createOrUpdateEvent(event).catchError((e) { await deviceCalendarPlugin.createOrUpdateEvent(event).catchError((e) {
@ -143,10 +145,6 @@ class CalendarUtils {
print("whenComplete Calender ID iOS " + eventId!); print("whenComplete Calender ID iOS " + eventId!);
}); });
} }
} }
deleteEvent(Calendar _calendar, Event _event) async { deleteEvent(Calendar _calendar, Event _event) async {

@ -70,7 +70,7 @@ class AppToast {
child: toast, child: toast,
gravity: ToastGravity.TOP, gravity: ToastGravity.TOP,
toastDuration: Duration(seconds: timeInSeconds), toastDuration: Duration(seconds: timeInSeconds),
positionedToastBuilder: (context, child, gravity) { positionedToastBuilder: (context, child) {
return Positioned(top: 50, left: 10, right: 10, child: child); return Positioned(top: 50, left: 10, right: 10, child: child);
}); });
} }

@ -4,7 +4,8 @@ description: A new Flutter application.
version: 4.6.009+1 version: 4.6.009+1
environment: environment:
sdk: ">=3.0.0 <3.13.0" # sdk: ">=3.0.0 <3.13.0"
sdk: ">=3.6.0 <4.0.0"
dependencies: dependencies:
flutter: flutter:
@ -18,7 +19,7 @@ dependencies:
webview_flutter: ^4.8.0 webview_flutter: ^4.8.0
app_links: ^6.4.0 app_links: ^6.4.0
http: ^1.4.0 http: ^1.4.0
connectivity_plus: ^6.1.4 connectivity_plus: 6.1.0
async: ^2.8.1 async: ^2.8.1
audio_wave: ^0.1.4 audio_wave: ^0.1.4
provider: ^6.0.5 provider: ^6.0.5
@ -71,7 +72,7 @@ dependencies:
location: ^8.0.1 location: ^8.0.1
barcode_scan2: ^4.5.1 barcode_scan2: ^4.5.1
flutter_rating_bar: ^4.0.1 flutter_rating_bar: ^4.0.1
syncfusion_flutter_calendar: ^28.1.37 syncfusion_flutter_calendar: ^29.2.11+1
# SVG Images # SVG Images
flutter_svg: ^2.0.8 flutter_svg: ^2.0.8
@ -84,7 +85,8 @@ dependencies:
flutter_datetime_picker_plus: ^2.1.0 flutter_datetime_picker_plus: ^2.1.0
carousel_pro_nullsafety: ^2.0.0 carousel_pro_nullsafety: ^2.0.0
flutter_local_notifications: any flutter_local_notifications: any
device_calendar: ^4.3.3 device_calendar:
git: https://github.com/bardram/device_calendar
geolocator: ^14.0.2 geolocator: ^14.0.2
geolocator_android: ^5.0.2 geolocator_android: ^5.0.2
geocoding: ^4.0.0 geocoding: ^4.0.0
@ -98,7 +100,7 @@ dependencies:
#Dependencies for video call implementation #Dependencies for video call implementation
native_device_orientation: ^2.0.3 native_device_orientation: ^2.0.3
# wakelock: ^0.6.2 # wakelock: ^0.6.2
wakelock_plus: ^1.1.4 wakelock_plus: ^1.3.2
after_layout: ^1.1.0 after_layout: ^1.1.0
cached_network_image: ^3.3.0 cached_network_image: ^3.3.0
flutter_tts: ^4.2.3 flutter_tts: ^4.2.3
@ -120,7 +122,7 @@ dependencies:
wave: ^0.2.0 wave: ^0.2.0
sms_otp_auto_verify: ^2.1.0 sms_otp_auto_verify: ^2.1.0
google_api_availability: ^5.0.1 google_api_availability: ^5.0.1
open_filex: ^4.3.2 open_filex: ^4.7.0
path_provider: ^2.0.8 path_provider: ^2.0.8
amazon_payfort: ^1.1.4 amazon_payfort: ^1.1.4
logger: ^2.0.2+1 logger: ^2.0.2+1

Loading…
Cancel
Save