From 466bb226549cbc6e36b47fd10c9108b3bf3fcea5 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Mon, 26 Jan 2026 15:30:23 +0300 Subject: [PATCH] implemented services price list page, Update to stores 19.6 --- lib/config/config.dart | 2 +- .../services_price_list.dart | 21 +++++---- lib/uitl/penguin_method_channel.dart | 12 +++--- lib/uitl/utils.dart | 43 ++++++++++--------- lib/widgets/drawer/app_drawer_widget.dart | 1 + 5 files changed, 42 insertions(+), 37 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index dc5b02f9..2a2c9359 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -357,7 +357,7 @@ var CAN_PAY_FOR_FOR_WALKIN_APPOINTMENT = 'Services/Doctors.svc/REST/CanPayForWal var CHANNEL = 3; var GENERAL_ID = 'Cs2020@2016\$2958'; var IP_ADDRESS = '10.20.10.20'; -var VERSION_ID = 19.5; +var VERSION_ID = 19.6; var SETUP_ID = '91877'; var LANGUAGE = 2; // var PATIENT_OUT_SA = 0; diff --git a/lib/pages/servicesPriceList/services_price_list.dart b/lib/pages/servicesPriceList/services_price_list.dart index b6059e0d..dbe5b84e 100644 --- a/lib/pages/servicesPriceList/services_price_list.dart +++ b/lib/pages/servicesPriceList/services_price_list.dart @@ -51,7 +51,7 @@ class ServicesPriceList extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - "Service Name", + TranslationBase.of(context).serviceName, style: TextStyle( color: CustomColors.textDarkColor, fontSize: 16, @@ -60,7 +60,7 @@ class ServicesPriceList extends StatelessWidget { ), ), Text( - "Prices", + TranslationBase.of(context).price, style: TextStyle( color: CustomColors.textDarkColor, fontSize: 16, @@ -337,13 +337,16 @@ class ServicesPriceList extends StatelessWidget { decoration: cardRadius(10), child: Row( children: [ - Text( - TranslationBase.of(context).servicePriceListRights, - style: TextStyle( - color: CustomColors.textColor, - fontSize: 12, - fontWeight: FontWeight.w500, - letterSpacing: -0.64, + Expanded( + child: Text( + TranslationBase.of(context).servicePriceListRights, + maxLines: 2, + style: TextStyle( + color: CustomColors.textColor, + fontSize: 12, + fontWeight: FontWeight.w500, + letterSpacing: -0.64, + ), ), ), ], diff --git a/lib/uitl/penguin_method_channel.dart b/lib/uitl/penguin_method_channel.dart index 0fe81148..3c3402b2 100644 --- a/lib/uitl/penguin_method_channel.dart +++ b/lib/uitl/penguin_method_channel.dart @@ -12,13 +12,13 @@ class PenguinMethodChannel { try { await _channel.invokeMethod('launchPenguin', { "storyboardName": storyboardName, - // "baseURL": "https://prod.hmg.nav.penguinin.com", - // "dataURL": "https://prod.hmg.nav.penguinin.com", - // "positionURL": "https://prod.hmg.nav.penguinin.com", + "baseURL": "https://prod.hmg.nav.penguinin.com", + "dataURL": "https://prod.hmg.nav.penguinin.com", + "positionURL": "https://prod.hmg.nav.penguinin.com", - "baseURL": "https://penguinuat.hmg.com", - "dataURL": "https://penguinuat.hmg.com", - "positionURL": "https://penguinuat.hmg.com", + // "baseURL": "https://penguinuat.hmg.com", + // "dataURL": "https://penguinuat.hmg.com", + // "positionURL": "https://penguinuat.hmg.com", "dataServiceName": "api", "positionServiceName": "pe", "clientID": "HMG", diff --git a/lib/uitl/utils.dart b/lib/uitl/utils.dart index 66ec8df5..f7eea46e 100644 --- a/lib/uitl/utils.dart +++ b/lib/uitl/utils.dart @@ -88,27 +88,28 @@ class Utils { "MainProjectID": 130, "ProjectOutSA": false, "UsingInDoctorApp": false - },{ - "Desciption": "Jeddah Fayhaa Hospital", - "DesciptionN": "مستشفى جدة الفيحاء", - "ID": 3, // Campus ID - "LegalName": "Jeddah Fayhaa Hospital", - "LegalNameN": "مستشفى جدة الفيحاء", - "Name": "Jeddah Fayhaa Hospital", - "NameN": "مستشفى جدة الفيحاء", - "PhoneNumber": "+966115222222", - "SetupID": "013311", - "DistanceInKilometers": 0, - "HasVida3": false, - "IsActive": true, - "IsHmg": true, - "IsVidaPlus": false, - "Latitude": "24.8113774", - "Longitude": "46.6239813", - "MainProjectID": 130, - "ProjectOutSA": false, - "UsingInDoctorApp": false - } + }, + // { + // "Desciption": "Jeddah Fayhaa Hospital", + // "DesciptionN": "مستشفى جدة الفيحاء", + // "ID": 3, // Campus ID + // "LegalName": "Jeddah Fayhaa Hospital", + // "LegalNameN": "مستشفى جدة الفيحاء", + // "Name": "Jeddah Fayhaa Hospital", + // "NameN": "مستشفى جدة الفيحاء", + // "PhoneNumber": "+966115222222", + // "SetupID": "013311", + // "DistanceInKilometers": 0, + // "HasVida3": false, + // "IsActive": true, + // "IsHmg": true, + // "IsVidaPlus": false, + // "Latitude": "24.8113774", + // "Longitude": "46.6239813", + // "MainProjectID": 130, + // "ProjectOutSA": false, + // "UsingInDoctorApp": false + // } ]; ///show custom Error Toast diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart index 6c1d16bb..4c0213f2 100644 --- a/lib/widgets/drawer/app_drawer_widget.dart +++ b/lib/widgets/drawer/app_drawer_widget.dart @@ -471,6 +471,7 @@ class _AppDrawerState extends State { InkWell( child: DrawerItem(TranslationBase.of(context).servicePriceList, Icons.bookmark_added_sharp, letterSpacing: -0.84, fontSize: 14, bottomLine: false), onTap: () { + Navigator.pop(context); Navigator.of(context).push(FadePage(page: ServicesPriceList())); }, ),