diff --git a/lib/pages/BookAppointment/BookingOptions.dart b/lib/pages/BookAppointment/BookingOptions.dart index 791631dc..f65c8605 100644 --- a/lib/pages/BookAppointment/BookingOptions.dart +++ b/lib/pages/BookAppointment/BookingOptions.dart @@ -19,10 +19,10 @@ class _BookingOptionsState extends State { @override void initState() { - locationUtils = - new LocationUtils(isShowConfirmDialog: true, context: context); - WidgetsBinding.instance - .addPostFrameCallback((_) => locationUtils.getCurrentLocation()); + // locationUtils = + // new LocationUtils(isShowConfirmDialog: true, context: context); + // WidgetsBinding.instance + // .addPostFrameCallback((_) => locationUtils.getCurrentLocation()); super.initState(); } diff --git a/lib/pages/BookAppointment/components/SearchByClinic.dart b/lib/pages/BookAppointment/components/SearchByClinic.dart index 53bc10f2..82f12e22 100644 --- a/lib/pages/BookAppointment/components/SearchByClinic.dart +++ b/lib/pages/BookAppointment/components/SearchByClinic.dart @@ -70,7 +70,7 @@ class _SearchByClinicState extends State { @override void initState() { - locationUtils = new LocationUtils(isShowConfirmDialog: true, isShowLocationTimeoutDialog: false, context: context); + // locationUtils = new LocationUtils(isShowConfirmDialog: true, isShowLocationTimeoutDialog: false, context: context); WidgetsBinding.instance.addPostFrameCallback((_) => getClinicsList()); checkPVM(); super.initState(); diff --git a/lib/pages/BookAppointment/components/SearchByDoctor.dart b/lib/pages/BookAppointment/components/SearchByDoctor.dart index 7676b3d4..ae4b2148 100644 --- a/lib/pages/BookAppointment/components/SearchByDoctor.dart +++ b/lib/pages/BookAppointment/components/SearchByDoctor.dart @@ -25,9 +25,9 @@ class _SearchByDoctorState extends State { @override void initState() { super.initState(); - locationUtils = - new LocationUtils(isShowConfirmDialog: true, context: context); - locationUtils.getCurrentLocation(); + // locationUtils = + // new LocationUtils(isShowConfirmDialog: true, context: context); + // locationUtils.getCurrentLocation(); _isButtonDisabled = true; } diff --git a/lib/pages/BookAppointment/components/search_by_hospital_name.dart b/lib/pages/BookAppointment/components/search_by_hospital_name.dart index b6b04e30..747920f3 100644 --- a/lib/pages/BookAppointment/components/search_by_hospital_name.dart +++ b/lib/pages/BookAppointment/components/search_by_hospital_name.dart @@ -51,8 +51,8 @@ class _SearchByHospitalState extends State { @override void initState() { WidgetsBinding.instance.addPostFrameCallback((_) { - locationUtils = new LocationUtils(isShowConfirmDialog: true, context: context); - locationUtils.getCurrentLocation(); + // locationUtils = new LocationUtils(isShowConfirmDialog: true, context: context); + // locationUtils.getCurrentLocation(); getProjectsList(); }); } @@ -303,13 +303,13 @@ class _SearchByHospitalState extends State { GifLoaderDialogUtils.hideDialog(context); } else {} GifLoaderDialogUtils.hideDialog(context); - locationUtils.getCurrentLocation(); + // locationUtils.getCurrentLocation(); }).catchError((err) { GifLoaderDialogUtils.hideDialog(context); - locationUtils.getCurrentLocation(); + // locationUtils.getCurrentLocation(); }).catchError((err) { GifLoaderDialogUtils.hideDialog(context); - locationUtils.getCurrentLocation(); + // locationUtils.getCurrentLocation(); print(err); }); } diff --git a/lib/pages/ToDoList/ToDo.dart b/lib/pages/ToDoList/ToDo.dart index 3681c25a..fa9cf041 100644 --- a/lib/pages/ToDoList/ToDo.dart +++ b/lib/pages/ToDoList/ToDo.dart @@ -631,6 +631,7 @@ class _ToDoState extends State with SingleTickerProviderStateMixin { break; case 20: getPatientShare(context, appo); + // getAppoQR(context, appo); // checkPatientNphiesEligibility(context, appo); break; case 30: diff --git a/lib/pages/landing/fragments/home_page_fragment2.dart b/lib/pages/landing/fragments/home_page_fragment2.dart index b3985744..4550869f 100644 --- a/lib/pages/landing/fragments/home_page_fragment2.dart +++ b/lib/pages/landing/fragments/home_page_fragment2.dart @@ -54,7 +54,7 @@ class _HomePageFragment2State extends State { hmgServices.clear(); hmgServices.add(HmgServices(0, TranslationBase.of(context).book, TranslationBase.of(context).appointmentLabel, "assets/images/new/book appointment.svg", isLogin)); - hmgServices.add(HmgServices(1, TranslationBase.of(context).liveCare, TranslationBase.of(context).onlineConsulting, "assets/images/new/Live_Care.svg", isLogin)); + // hmgServices.add(HmgServices(1, TranslationBase.of(context).liveCare, TranslationBase.of(context).onlineConsulting, "assets/images/new/Live_Care.svg", isLogin)); // projectViewModel.isIndoorNavigationEnabled // ? hmgServices.add(HmgServices(2, TranslationBase.of(context).hospitalNavigationTitle, TranslationBase.of(context).hospitalNavigationSubtitle, "assets/images/new/indoor_nav_home.svg", isLogin, diff --git a/lib/pages/medical/smart_watch_health_data/syncHealthData.dart b/lib/pages/medical/smart_watch_health_data/syncHealthData.dart index 6d6fdf4f..9622654e 100644 --- a/lib/pages/medical/smart_watch_health_data/syncHealthData.dart +++ b/lib/pages/medical/smart_watch_health_data/syncHealthData.dart @@ -11,7 +11,7 @@ import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; import 'package:flutter/material.dart'; -import 'package:health/health.dart'; +// import 'package:health/health.dart'; class syncHealthDataButton extends StatefulWidget { syncHealthDataButton(); @@ -21,7 +21,7 @@ class syncHealthDataButton extends StatefulWidget { } class _syncHealthDataButtonState extends State { - List _healthDataList = []; + // List _healthDataList = []; List Med_InsertTransactionsInputsList = []; List Med_InsertTransactionsInputsList2 = []; @@ -35,7 +35,7 @@ class _syncHealthDataButtonState extends State { int MedCategoryID = 0; // HealthFactory health = HealthFactory(); - List types = [HealthDataType.STEPS, HealthDataType.HEART_RATE, Platform.isAndroid ? HealthDataType.DISTANCE_DELTA : HealthDataType.DISTANCE_WALKING_RUNNING]; + // List types = [HealthDataType.STEPS, HealthDataType.HEART_RATE, Platform.isAndroid ? HealthDataType.DISTANCE_DELTA : HealthDataType.DISTANCE_WALKING_RUNNING]; @override void initState() { @@ -91,32 +91,32 @@ class _syncHealthDataButtonState extends State { // _healthDataList = HealthFactory.removeDuplicates(_healthDataList); - _healthDataList.forEach((x) { - if (x.type == HealthDataType.STEPS) { - Med_InsertTransactionsInputsList.add(healthData( - MedCategoryID: 6, - MedSubCategoryID: MedSubCategoryID, - MachineDate: DateUtil.convertDateToString(x.dateFrom), - Value: double.tryParse(x.value.toString()), - TransactionsListID: TransactionsListID++)); - } - if (x.type == HealthDataType.HEART_RATE) { - Med_InsertTransactionsInputsList.add(healthData( - MedCategoryID: 3, - MedSubCategoryID: MedSubCategoryID, - MachineDate: DateUtil.convertDateToString(x.dateFrom), - Value: double.tryParse(x.value.toString()), - TransactionsListID: TransactionsListID++)); - } - if (x.type == HealthDataType.DISTANCE_DELTA || x.type == HealthDataType.DISTANCE_WALKING_RUNNING) { - Med_InsertTransactionsInputsList.add(healthData( - MedCategoryID: 7, - MedSubCategoryID: MedSubCategoryID, - MachineDate: DateUtil.convertDateToString(x.dateFrom), - Value: double.tryParse(x.value.toString()), - TransactionsListID: TransactionsListID++)); - } - }); + // _healthDataList.forEach((x) { + // if (x.type == HealthDataType.STEPS) { + // Med_InsertTransactionsInputsList.add(healthData( + // MedCategoryID: 6, + // MedSubCategoryID: MedSubCategoryID, + // MachineDate: DateUtil.convertDateToString(x.dateFrom), + // Value: double.tryParse(x.value.toString()), + // TransactionsListID: TransactionsListID++)); + // } + // if (x.type == HealthDataType.HEART_RATE) { + // Med_InsertTransactionsInputsList.add(healthData( + // MedCategoryID: 3, + // MedSubCategoryID: MedSubCategoryID, + // MachineDate: DateUtil.convertDateToString(x.dateFrom), + // Value: double.tryParse(x.value.toString()), + // TransactionsListID: TransactionsListID++)); + // } + // if (x.type == HealthDataType.DISTANCE_DELTA || x.type == HealthDataType.DISTANCE_WALKING_RUNNING) { + // Med_InsertTransactionsInputsList.add(healthData( + // MedCategoryID: 7, + // MedSubCategoryID: MedSubCategoryID, + // MachineDate: DateUtil.convertDateToString(x.dateFrom), + // Value: double.tryParse(x.value.toString()), + // TransactionsListID: TransactionsListID++)); + // } + // }); getAllHealthDataLists(); } diff --git a/lib/services/payfort_services/payfort_service.dart b/lib/services/payfort_services/payfort_service.dart index 9b2c4597..9e0c07c9 100644 --- a/lib/services/payfort_services/payfort_service.dart +++ b/lib/services/payfort_services/payfort_service.dart @@ -173,7 +173,8 @@ class PayfortService extends BaseService { customerName: customerName!, customerEmail: customerEmail!, // orderDescription: orderDescription!, - orderDescription: "Dr. Sulaiman Al Habib Hospital", + // orderDescription: "Dr. Sulaiman Al Habib Hospital", + orderDescription: "Red Sea Health", sdkToken: sdkTokenResponse?.sdkToken ?? '', merchantReference: merchantReference!, currency: currency, diff --git a/lib/services/permission/permission_service.dart b/lib/services/permission/permission_service.dart index 2f6bf490..cdbaf329 100644 --- a/lib/services/permission/permission_service.dart +++ b/lib/services/permission/permission_service.dart @@ -7,11 +7,10 @@ import 'package:permission_handler/permission_handler.dart'; import 'package:geolocator/geolocator.dart' as geo; class PermissionService extends BaseService { + late LocalStorage storage; PermissionService(){ - initLocalStorage(); storage = localStorage; } - LocalStorage? storage; geo.LocationPermission? locationPermission; AppGlobal appGlobal = new AppGlobal();