diff --git a/lib/config/config.dart b/lib/config/config.dart index f9fbebe5..70915eb7 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -21,13 +21,15 @@ var PACKAGES_ORDERS = '/api/orders'; var PACKAGES_ORDER_HISTORY = '/api/orders/items'; var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara'; // var BASE_URL = 'http://10.50.100.198:2018/'; - var BASE_URL = 'https://uat.hmgwebservices.com/'; + // var BASE_URL = 'https://uat.hmgwebservices.com/'; // var BASE_URL = 'https://hmgwebservices.com/'; // var BASE_URL = 'http://10.201.204.103/'; // var BASE_URL = 'https://orash.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidamergeuat.cloudsolutions.com.sa/'; +var BASE_URL = 'https://rsgwebservices.hmg.com/'; + // var BASE_URL = 'https://webservices.hmg.com/'; // var BASE_URL = 'http://10.50.100.198:4422/'; @@ -51,12 +53,14 @@ var PHARMACY_REDIRECT_URL = 'https://bit.ly/AlhabibPharmacy'; // var PHARMACY_BASE_URL = 'https://mdlaboratories.com/exacartapitest/api/'; // RC API URL -var RC_BASE_URL = 'https://rc.hmg.com/'; +// var RC_BASE_URL = 'https://rc.hmg.com/'; // var RC_BASE_URL = 'https://rc.hmg.com/test/'; // var RC_BASE_URL = 'https://ms.hmg.com/rc/'; +var RC_BASE_URL = 'https://rsgrequestcenter.hmg.com/'; // RSG REQUEST CENTER + var PING_SERVICE = 'Services/Weather.svc/REST/CheckConnectivity'; var GET_PROJECT = 'Services/Lists.svc/REST/GetProject'; diff --git a/lib/pages/landing/fragments/home_page_fragment2.dart b/lib/pages/landing/fragments/home_page_fragment2.dart index 23c845b3..b3985744 100644 --- a/lib/pages/landing/fragments/home_page_fragment2.dart +++ b/lib/pages/landing/fragments/home_page_fragment2.dart @@ -56,10 +56,10 @@ class _HomePageFragment2State extends State { 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)); - projectViewModel.isIndoorNavigationEnabled - ? hmgServices.add(HmgServices(2, TranslationBase.of(context).hospitalNavigationTitle, TranslationBase.of(context).hospitalNavigationSubtitle, "assets/images/new/indoor_nav_home.svg", isLogin, - isLocked: !projectViewModel.havePrivilege(107))) - : hmgServices.add(HmgServices(2, TranslationBase.of(context).emergencyTitle, TranslationBase.of(context).emergencySubtitle, "assets/images/new/emergency.svg", isLogin)); + // projectViewModel.isIndoorNavigationEnabled + // ? hmgServices.add(HmgServices(2, TranslationBase.of(context).hospitalNavigationTitle, TranslationBase.of(context).hospitalNavigationSubtitle, "assets/images/new/indoor_nav_home.svg", isLogin, + // isLocked: !projectViewModel.havePrivilege(107))) + // : hmgServices.add(HmgServices(2, TranslationBase.of(context).emergencyTitle, TranslationBase.of(context).emergencySubtitle, "assets/images/new/emergency.svg", isLogin)); // hmgServices.add( // HmgServices(9, TranslationBase.of(context).emergency, TranslationBase.of(context).checkinOptions, "assets/images/new/emergency.svg", isLogin, isLocked: !projectViewModel.havePrivilege(108))); diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index ffc9fec5..d99eea90 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -315,7 +315,7 @@ class _LandingPageState extends State with WidgetsBindingObserver { }).catchError((err) { print(err); }); - startZoom(); + // startZoom(); // HMG_Geofencing(context).loadZones().then((instance) => instance.init()); } diff --git a/lib/pages/medical/radiology/radiology_details_page.dart b/lib/pages/medical/radiology/radiology_details_page.dart index 4d127148..cacdfb0a 100644 --- a/lib/pages/medical/radiology/radiology_details_page.dart +++ b/lib/pages/medical/radiology/radiology_details_page.dart @@ -34,7 +34,7 @@ class RadiologyDetailsPage extends StatelessWidget { lineItem: finalRadiology!.invoiceLineItemNo!, invoiceNo: Utils.isVidaPlusProject(projectViewModel, finalRadiology!.projectID!) ? finalRadiology!.invoiceNo_VP : finalRadiology!.invoiceNo, isVidaPlus: Utils.isVidaPlusProject(projectViewModel, finalRadiology!.projectID!), - examId: finalRadiology!.exam_Id!), + examId: finalRadiology!.exam_Id ?? ""), builder: (_, model, widget) => AppScaffold( appBarTitle: TranslationBase.of(context).report, isShowAppBar: true, diff --git a/lib/splashPage.dart b/lib/splashPage.dart index e7be1dd4..34f7d27f 100644 --- a/lib/splashPage.dart +++ b/lib/splashPage.dart @@ -64,7 +64,7 @@ class _SplashScreenState extends State { domain: "zoom.us", enableLog: true, ); - zoom.initSdk(initConfig); + // zoom.initSdk(initConfig); // AppSharedPreferences().getAll().then((value) { // debugPrint("ALL SHARED PREFERENCES!!!!!");