From d474eb9a24e0c33342515e3b1f4287ab885af893 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 22 Dec 2024 13:47:05 +0300 Subject: [PATCH] Code commented for Lab result widget, ER Online CheckIn QR & location check-in & Patient occupation selection to publish laser clinic changes to store - VersionID 17.0 --- lib/config/config.dart | 6 +- lib/config/localized_values.dart | 10 + .../register_info_response.dart | 9 +- .../Authentication/register_user_requet.dart | 18 +- .../EROnlineCheckIn/EROnlineCheckInHome.dart | 178 +++++++++--------- lib/pages/login/register-info.dart | 176 ++++++++--------- lib/uitl/translations_delegate_base.dart | 11 ++ .../medical/LabResult/LabResultWidget.dart | 22 ++- lib/widgets/in_app_browser/InAppBrowser.dart | 4 +- 9 files changed, 235 insertions(+), 199 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 9f093c9d..be94c94c 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -21,8 +21,8 @@ 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://hmgwebservices.com/'; + // var BASE_URL = 'https://uat.hmgwebservices.com/'; +var BASE_URL = 'https://hmgwebservices.com/'; // var BASE_URL = 'https://orash.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidamergeuat.cloudsolutions.com.sa/'; @@ -352,7 +352,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 = 16.9; +var VERSION_ID = 17.0; var SETUP_ID = '91877'; var LANGUAGE = 2; // var PATIENT_OUT_SA = 0; diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index a2c9d445..e15d97af 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -2121,4 +2121,14 @@ const Map localizedValues = { "labResultFlag": {"en": "Flag", "ar": "Flag"}, "selectOccupation": {"en": "Select Occupation", "ar": "اختر المهنة"}, "selectOccupationError": {"en": "Please select your occupation.", "ar": "الرجاء تحديد مهنتك."}, + + "whatIsOnlineCheckIn": {"en": "What is Online Check-In?", "ar": "ما هو تسجيل الوصول عبر الإنترنت؟"}, + "EROnlineCheckInDesc1": {"en": "Online check-in lets patients fill out forms, share insurance details, and book appointments online, making their visit smoother and quicker.", "ar": "يتيح تسجيل الوصول عبر الإنترنت للمرضى ملء النماذج ومشاركة تفاصيل التأمين وحجز المواعيد عبر الإنترنت، مما يجعل زيارتهم أكثر سلاسة وسرعة."}, + "EROnlineCheckInHow": {"en": "How can i use Online Check-In?", "ar": "كيف يمكنني استخدام تسجيل الوصول عبر الإنترنت؟"}, + "EROnlineCheckInTapOn": {"en": "Tap On", "ar": "اضغط على"}, + "EROnlineCheckInHoldPhone": {"en": "Hold your phone", "ar": "أمسك هاتفك"}, + "EROnlineCheckInWaitTurn": {"en": "Wait your turn", "ar": "انتظر دورك"}, + "EROnlineCheckInWaitTurnInstruction": {"en": "Please wait in the waiting area until called by the nurse.", "ar": "يرجى الانتظار في منطقة الانتظار حتى يتم استدعاؤك من قبل الممرضة."}, + "EROnlineCheckInHoldPhoneInstruction": {"en": "Hold the phone 1 to 2 cm from the NFC sign displayed on the board", "ar": "امسك الهاتف على مسافة 1 إلى 2 سم من علامة NFC المعروضة على اللوحة"}, + "EROnlineCheckInTapOnCheckIn": {"en": "Tap on the check-in button within the app", "ar": "اضغط على زر تسجيل الدخول داخل التطبيق"}, }; diff --git a/lib/models/Authentication/register_info_response.dart b/lib/models/Authentication/register_info_response.dart index 8a19e97b..1c8973d6 100644 --- a/lib/models/Authentication/register_info_response.dart +++ b/lib/models/Authentication/register_info_response.dart @@ -75,7 +75,7 @@ class RegisterInfoResponse { int? specialtyCode; dynamic specialtyNameAr; dynamic specialtyNameEn; - String? occupationID; + // String? occupationID; RegisterInfoResponse( {this.date, @@ -154,7 +154,8 @@ class RegisterInfoResponse { this.specialtyCode, this.specialtyNameAr, this.specialtyNameEn, - this.occupationID}); + // this.occupationID + }); RegisterInfoResponse.fromJson(Map json) { date = json['Date']; @@ -233,7 +234,7 @@ class RegisterInfoResponse { specialtyCode = json['specialtyCode']; specialtyNameAr = json['specialtyNameAr']; specialtyNameEn = json['specialtyNameEn']; - occupationID = json['OccupationID']; + // occupationID = json['OccupationID']; } Map toJson() { @@ -314,7 +315,7 @@ class RegisterInfoResponse { data['specialtyCode'] = this.specialtyCode; data['specialtyNameAr'] = this.specialtyNameAr; data['specialtyNameEn'] = this.specialtyNameEn; - data['OccupationID'] = this.occupationID; + // data['OccupationID'] = this.occupationID; return data; } } diff --git a/lib/models/Authentication/register_user_requet.dart b/lib/models/Authentication/register_user_requet.dart index ba362995..e436d6ef 100644 --- a/lib/models/Authentication/register_user_requet.dart +++ b/lib/models/Authentication/register_user_requet.dart @@ -16,7 +16,7 @@ class RegisterUserRequest { int? isHijri; String? healthId; String? zipCode; - String? occupationID; + // String? occupationID; RegisterUserRequest( {this.patientobject, @@ -36,7 +36,8 @@ class RegisterUserRequest { this.isHijri, this.healthId, this.zipCode, - this.occupationID}); + // this.occupationID + }); RegisterUserRequest.fromJson(Map json) { patientobject = json['Patientobject'] != null ? new Patientobject.fromJson(json['Patientobject']) : null; @@ -56,7 +57,7 @@ class RegisterUserRequest { isHijri = json['IsHijri']; healthId = json['HealthId']; zipCode = json['ZipCode']; - occupationID = json['OccupationID']; + // occupationID = json['OccupationID']; } Map toJson() { @@ -80,7 +81,7 @@ class RegisterUserRequest { data['IsHijri'] = this.isHijri; data['HealthId'] = this.healthId; data['ZipCode'] = this.zipCode; - data['OccupationID'] = this.occupationID; + // data['OccupationID'] = this.occupationID; return data; } } @@ -107,7 +108,7 @@ class Patientobject { String? sourceType; String? preferredLanguage; String? marital; - String? occupationID; + // String? occupationID; Patientobject( {this.tempValue, @@ -131,7 +132,8 @@ class Patientobject { this.sourceType, this.preferredLanguage, this.marital, - this.occupationID}); + // this.occupationID + }); Patientobject.fromJson(Map json) { tempValue = json['TempValue']; @@ -156,7 +158,7 @@ class Patientobject { preferredLanguage = json['PreferredLanguage']; marital = json['Marital']; - occupationID = json['OccupationID'] ?? ""; + // occupationID = json['OccupationID'] ?? ""; } Map toJson() { @@ -182,7 +184,7 @@ class Patientobject { data['SourceType'] = this.sourceType; data['PreferredLanguage'] = this.preferredLanguage; data['Marital'] = this.marital; - data['OccupationID'] = this.occupationID; + // data['OccupationID'] = this.occupationID; return data; } } diff --git a/lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInHome.dart b/lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInHome.dart index f56e8a29..2109c92e 100644 --- a/lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInHome.dart +++ b/lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInHome.dart @@ -93,26 +93,26 @@ class _EROnlineCheckInHomePageState extends State with ), mHeight(6), Text( - "What is Online Check-In?", + TranslationBase.of(context).whatIsOnlineCheckIn, maxLines: 1, style: TextStyle( fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), ), Text( - "online check-in lets patients fill out forms, share insurance details, and book appointments online, making their visit smoother and quicker.", + TranslationBase.of(context).EROnlineCheckInDesc1, style: TextStyle(fontSize: 14, color: CustomColors.textDarkColor, letterSpacing: -1.44, height: 35 / 24), ), mHeight(16), - Text( - "How can i use Online Check-In?", - maxLines: 1, - style: TextStyle( - fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), - ), - Text( - "online check-in lets patients fill out forms, share insurance details, and book appointments online, making their visit smoother and quicker.", - style: TextStyle(fontSize: 14, color: CustomColors.textDarkColor, letterSpacing: -1.44, height: 35 / 24), - ), + // Text( + // TranslationBase.of(context).EROnlineCheckInHow, + // maxLines: 1, + // style: TextStyle( + // fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), + // ), + // Text( + // "Online check-in lets patients fill out forms, share insurance details, and book appointments online, making their visit smoother and quicker.", + // style: TextStyle(fontSize: 14, color: CustomColors.textDarkColor, letterSpacing: -1.44, height: 35 / 24), + // ), ], ), ), @@ -164,7 +164,7 @@ class _EROnlineCheckInHomePageState extends State with Padding( padding: const EdgeInsets.only(left: 50, right: 50), child: Text( - "Tap On", + TranslationBase.of(context).EROnlineCheckInTapOn, maxLines: 1, style: TextStyle( fontSize: 20, @@ -178,8 +178,8 @@ class _EROnlineCheckInHomePageState extends State with Padding( padding: const EdgeInsets.only(left: 50, right: 50), child: Text( - "Tap on the check-in button within the app", - style: TextStyle(fontSize: 14, color: CustomColors.textDarkColor, letterSpacing: -1.44, height: 35 / 24), + TranslationBase.of(context).EROnlineCheckInTapOnCheckIn, + style: TextStyle(fontSize: 14, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: CustomColors.textDarkColor, letterSpacing: -1.44, height: 35 / 24), ), ), mHeight(16), @@ -210,7 +210,7 @@ class _EROnlineCheckInHomePageState extends State with Padding( padding: const EdgeInsets.only(left: 50, right: 50), child: Text( - "Hold your phone", + TranslationBase.of(context).EROnlineCheckInHoldPhone, maxLines: 1, style: TextStyle( fontSize: 20, @@ -224,8 +224,8 @@ class _EROnlineCheckInHomePageState extends State with Padding( padding: const EdgeInsets.only(left: 50, right: 50), child: Text( - "Hold the phone 1 to 2 cm from the NFC sign displayed on the board", - style: TextStyle(fontSize: 14, color: CustomColors.textDarkColor, letterSpacing: -1.44, height: 35 / 24), + TranslationBase.of(context).EROnlineCheckInHoldPhoneInstruction, + style: TextStyle(fontSize: 14, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: CustomColors.textDarkColor, letterSpacing: -1.44, height: 35 / 24), ), ), mHeight(16), @@ -241,7 +241,7 @@ class _EROnlineCheckInHomePageState extends State with child: Center( child: Text( "3", - style: TextStyle(fontSize: 22, fontWeight: FontWeight.w700, color: CustomColors.white, letterSpacing: -1.44, height: 35 / 24), + style: TextStyle(fontSize: 22, fontWeight: FontWeight.w700, color: CustomColors.white, letterSpacing: -1.44, height: 35 / 24), ), ), ), @@ -256,7 +256,7 @@ class _EROnlineCheckInHomePageState extends State with Padding( padding: const EdgeInsets.only(left: 50, right: 50), child: Text( - "Wait your turn", + TranslationBase.of(context).EROnlineCheckInWaitTurn, maxLines: 1, style: TextStyle( fontSize: 20, @@ -270,8 +270,8 @@ class _EROnlineCheckInHomePageState extends State with Padding( padding: const EdgeInsets.only(left: 50, right: 50), child: Text( - "Please wait in the waiting area until called by the nurse", - style: TextStyle(fontSize: 14, color: CustomColors.textDarkColor, letterSpacing: -1.44, height: 35 / 24), + TranslationBase.of(context).EROnlineCheckInWaitTurnInstruction, + style: TextStyle(fontSize: 14, color: CustomColors.textDarkColor, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), letterSpacing: -1.44, height: 35 / 24), ), ), ], @@ -291,76 +291,76 @@ class _EROnlineCheckInHomePageState extends State with child: DefaultButton( TranslationBase.of(context).arrived, () { - showMyBottomSheet(context, - callBackFunc: () {}, - child: Padding( - padding: const EdgeInsets.all(21.0), - child: Column( - children: [ - Text(TranslationBase.of(context).scanQRHospital, - style: TextStyle( - fontSize: 20, - fontWeight: FontWeight.w600, - letterSpacing: -0.48, - )), - mHeight(21), - GridView( - physics: const NeverScrollableScrollPhysics(), - shrinkWrap: true, - gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( - crossAxisCount: (MediaQuery.of(context).size.width < 550) ? 3 : 5, childAspectRatio: 1 / 1, crossAxisSpacing: 8, mainAxisSpacing: 12), - children: [ - attendanceMethod(TranslationBase.of(context).scanNFC, "assets/images/nfc/contactless.svg", true, () { - if (_supportsNFC) { - Future.delayed(const Duration(milliseconds: 500), () { - showNfcReader(context, onNcfScan: (String nfcId) { - Future.delayed(const Duration(milliseconds: 100), () { - print(nfcId); - getProjectIDFromNFC(nfcId, true); - // Navigator.push(context, FadePage(page: EROnlineCheckInPaymentDetails())); - }); - }, onCancel: () { - Navigator.of(context).pop(); - }); - }); - } else { - //NFCNotSupported - AppToast.showErrorToast(message: TranslationBase.of(context).NFCNotSupported); - } - }), - attendanceMethod(TranslationBase.of(context).pharmaLiveCareScanQR, "assets/images/new/services/qr_code.svg", true, () async { - String onlineCheckInQRCode = (await BarcodeScanner.scan().then((value) => value.rawContent)); - if (onlineCheckInQRCode != "") { - print(onlineCheckInQRCode); - getProjectIDFromNFC(onlineCheckInQRCode, true); - // sendNfcCheckInRequest(onlineCheckInQRCode, 2); - } else {} - }), - attendanceMethod(TranslationBase.of(context).checkInViaLocation, "assets/images/new/services/location.svg", true, () {}) - ], - ), - ], - ), - )); + // showMyBottomSheet(context, + // callBackFunc: () {}, + // child: Padding( + // padding: const EdgeInsets.all(21.0), + // child: Column( + // children: [ + // Text(TranslationBase.of(context).scanQRHospital, + // style: TextStyle( + // fontSize: 20, + // fontWeight: FontWeight.w600, + // letterSpacing: -0.48, + // )), + // mHeight(21), + // GridView( + // physics: const NeverScrollableScrollPhysics(), + // shrinkWrap: true, + // gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( + // crossAxisCount: (MediaQuery.of(context).size.width < 550) ? 3 : 5, childAspectRatio: 1 / 1, crossAxisSpacing: 8, mainAxisSpacing: 12), + // children: [ + // attendanceMethod(TranslationBase.of(context).scanNFC, "assets/images/nfc/contactless.svg", true, () { + // if (_supportsNFC) { + // Future.delayed(const Duration(milliseconds: 500), () { + // showNfcReader(context, onNcfScan: (String nfcId) { + // Future.delayed(const Duration(milliseconds: 100), () { + // print(nfcId); + // getProjectIDFromNFC(nfcId, true); + // // Navigator.push(context, FadePage(page: EROnlineCheckInPaymentDetails())); + // }); + // }, onCancel: () { + // Navigator.of(context).pop(); + // }); + // }); + // } else { + // //NFCNotSupported + // AppToast.showErrorToast(message: TranslationBase.of(context).NFCNotSupported); + // } + // }), + // attendanceMethod(TranslationBase.of(context).pharmaLiveCareScanQR, "assets/images/new/services/qr_code.svg", true, () async { + // String onlineCheckInQRCode = (await BarcodeScanner.scan().then((value) => value.rawContent)); + // if (onlineCheckInQRCode != "") { + // print(onlineCheckInQRCode); + // getProjectIDFromNFC(onlineCheckInQRCode, true); + // // sendNfcCheckInRequest(onlineCheckInQRCode, 2); + // } else {} + // }), + // attendanceMethod(TranslationBase.of(context).checkInViaLocation, "assets/images/new/services/location.svg", true, () {}) + // ], + // ), + // ], + // ), + // )); // Navigator.push(context, FadePage(page: EROnlineCheckInNFCQRLocation(projectID: 15))).then((value) {}); - // if (_supportsNFC) { - // Future.delayed(const Duration(milliseconds: 500), () { - // showNfcReader(context, onNcfScan: (String nfcId) { - // Future.delayed(const Duration(milliseconds: 100), () { - // print(nfcId); - // getProjectIDFromNFC(nfcId, true); - // // Navigator.push(context, FadePage(page: EROnlineCheckInPaymentDetails())); - // }); - // }, onCancel: () { - // Navigator.of(context).pop(); - // }); - // }); - // } else { - // //NFCNotSupported - // AppToast.showErrorToast(message: TranslationBase.of(context).NFCNotSupported); - // } + if (_supportsNFC) { + Future.delayed(const Duration(milliseconds: 500), () { + showNfcReader(context, onNcfScan: (String nfcId) { + Future.delayed(const Duration(milliseconds: 100), () { + print(nfcId); + getProjectIDFromNFC(nfcId, true); + // Navigator.push(context, FadePage(page: EROnlineCheckInPaymentDetails())); + }); + }, onCancel: () { + Navigator.of(context).pop(); + }); + }); + } else { + //NFCNotSupported + AppToast.showErrorToast(message: TranslationBase.of(context).NFCNotSupported); + } }, color: CustomColors.accentColor, ), diff --git a/lib/pages/login/register-info.dart b/lib/pages/login/register-info.dart index 2c6cb4b0..c2c78182 100644 --- a/lib/pages/login/register-info.dart +++ b/lib/pages/login/register-info.dart @@ -92,10 +92,8 @@ class _RegisterInfo extends State { String nationality = 'SAU'; String selectedOccupationID = ""; - List patientOccupationList = []; - - // - GetPatientOccupationListResponse? selectedPatientOccupation; + // List patientOccupationList = []; + // GetPatientOccupationListResponse? selectedPatientOccupation; final GlobalKey projectDropdownKey = GlobalKey(); @@ -273,71 +271,71 @@ class _RegisterInfo extends State { ? Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - (!isDubai) - ? Container( - width: double.infinity, - decoration: containerRadius(Colors.white, 12), - padding: EdgeInsets.only(left: 10, right: 10, top: 12, bottom: 12), - child: Row( - children: [ - Flexible( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - TranslationBase.of(context).selectOccupation, - style: TextStyle( - fontSize: 11, - letterSpacing: -0.44, - fontWeight: FontWeight.w600, - ), - ), - Container( - height: 18, - width: double.infinity, - child: DropdownButtonHideUnderline( - child: DropdownButton( - key: projectDropdownKey, - hint: Text(TranslationBase.of(context).selectOccupation), - value: selectedPatientOccupation, - iconSize: 0, - isExpanded: true, - style: TextStyle(fontSize: 14, letterSpacing: -0.56, color: Colors.black), - items: patientOccupationList.map((GetPatientOccupationListResponse item) { - return DropdownMenuItem( - value: item, - child: AutoSizeText( - projectViewModel.isArabic ? item.descriptionN! : item.description!, - maxLines: 1, - minFontSize: 10, - style: TextStyle( - fontSize: SizeConfig.textMultiplier! * 1.6, - fontWeight: FontWeight.w600, - letterSpacing: -0.39, - height: 0.8, - ), - ), - // Text('${item.name!}'), - ); - }).toList(), - onChanged: (GetPatientOccupationListResponse? newValue) { - setState(() { - selectedPatientOccupation = newValue!; - selectedOccupationID = selectedPatientOccupation!.occupationID!; - registerInfo.occupationID = selectedOccupationID; - }); - debugPrint("Selected Occupation ID: ${registerInfo.occupationID}"); - }, - ), - ), - ), - ], - ), - ), - Icon(Icons.keyboard_arrow_down), - ], - )) - : SizedBox(), + // (!isDubai) + // ? Container( + // width: double.infinity, + // decoration: containerRadius(Colors.white, 12), + // padding: EdgeInsets.only(left: 10, right: 10, top: 12, bottom: 12), + // child: Row( + // children: [ + // Flexible( + // child: Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Text( + // TranslationBase.of(context).selectOccupation, + // style: TextStyle( + // fontSize: 11, + // letterSpacing: -0.44, + // fontWeight: FontWeight.w600, + // ), + // ), + // Container( + // height: 18, + // width: double.infinity, + // child: DropdownButtonHideUnderline( + // child: DropdownButton( + // key: projectDropdownKey, + // hint: Text(TranslationBase.of(context).selectOccupation), + // value: selectedPatientOccupation, + // iconSize: 0, + // isExpanded: true, + // style: TextStyle(fontSize: 14, letterSpacing: -0.56, color: Colors.black), + // items: patientOccupationList.map((GetPatientOccupationListResponse item) { + // return DropdownMenuItem( + // value: item, + // child: AutoSizeText( + // projectViewModel.isArabic ? item.descriptionN! : item.description!, + // maxLines: 1, + // minFontSize: 10, + // style: TextStyle( + // fontSize: SizeConfig.textMultiplier! * 1.6, + // fontWeight: FontWeight.w600, + // letterSpacing: -0.39, + // height: 0.8, + // ), + // ), + // // Text('${item.name!}'), + // ); + // }).toList(), + // onChanged: (GetPatientOccupationListResponse? newValue) { + // setState(() { + // selectedPatientOccupation = newValue!; + // selectedOccupationID = selectedPatientOccupation!.occupationID!; + // registerInfo.occupationID = selectedOccupationID; + // }); + // debugPrint("Selected Occupation ID: ${registerInfo.occupationID}"); + // }, + // ), + // ), + // ), + // ], + // ), + // ), + // Icon(Icons.keyboard_arrow_down), + // ], + // )) + // : SizedBox(), mHeight(20), Container( width: double.infinity, @@ -513,15 +511,17 @@ class _RegisterInfo extends State { widget.changePageViewIndex!(2); } } else { - if (isDubai) { - registerNow(); - } else { - if (selectedPatientOccupation != null) { - registerNow(); - } else { - AppToast.showErrorToast(message: TranslationBase.of(context).selectOccupationError); - } - } + registerNow(); + + // if (isDubai) { + // registerNow(); + // } else { + // if (selectedPatientOccupation != null) { + // registerNow(); + // } else { + // AppToast.showErrorToast(message: TranslationBase.of(context).selectOccupationError); + // } + // } } } @@ -624,15 +624,15 @@ class _RegisterInfo extends State { }); } - try { - var patientOccupationListVal = json.decode(await sharedPref.getString(PATIENT_OCCUPATION_LIST)); - patientOccupationListVal.forEach((v) { - patientOccupationList.add(new GetPatientOccupationListResponse.fromJson(v)); - }); - setState(() {}); - } catch (ex) { - print(ex.toString()); - } + // try { + // var patientOccupationListVal = json.decode(await sharedPref.getString(PATIENT_OCCUPATION_LIST)); + // patientOccupationListVal.forEach((v) { + // patientOccupationList.add(new GetPatientOccupationListResponse.fromJson(v)); + // }); + // setState(() {}); + // } catch (ex) { + // print(ex.toString()); + // } } getTempUserRequest() { @@ -662,7 +662,7 @@ class _RegisterInfo extends State { "EmailAddress": email, "SourceType": location, "PreferredLanguage": registerd_data.languageID.toString(), - "OccupationID": registerInfo.occupationID, + // "OccupationID": registerInfo.occupationID, "Marital": registerInfo.maritalStatusCode == 'U' ? '0' : registerInfo.maritalStatusCode == 'M' diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index 4f2fbce0..f3ed60f6 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -3025,6 +3025,17 @@ class TranslationBase { String get labResultFlag => localizedValues["labResultFlag"][locale.languageCode]; String get selectOccupation => localizedValues["selectOccupation"][locale.languageCode]; String get selectOccupationError => localizedValues["selectOccupationError"][locale.languageCode]; + + String get whatIsOnlineCheckIn => localizedValues["whatIsOnlineCheckIn"][locale.languageCode]; + String get EROnlineCheckInDesc1 => localizedValues["EROnlineCheckInDesc1"][locale.languageCode]; + String get EROnlineCheckInHow => localizedValues["EROnlineCheckInHow"][locale.languageCode]; + String get EROnlineCheckInTapOn => localizedValues["EROnlineCheckInTapOn"][locale.languageCode]; + String get EROnlineCheckInTapOnCheckIn => localizedValues["EROnlineCheckInTapOnCheckIn"][locale.languageCode]; + String get EROnlineCheckInHoldPhone => localizedValues["EROnlineCheckInHoldPhone"][locale.languageCode]; + String get EROnlineCheckInHoldPhoneInstruction => localizedValues["EROnlineCheckInHoldPhoneInstruction"][locale.languageCode]; + String get EROnlineCheckInWaitTurn => localizedValues["EROnlineCheckInWaitTurn"][locale.languageCode]; + String get EROnlineCheckInWaitTurnInstruction => localizedValues["EROnlineCheckInWaitTurnInstruction"][locale.languageCode]; + } class TranslationBaseDelegate extends LocalizationsDelegate { diff --git a/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart b/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart index 3eb9b86a..db908230 100644 --- a/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart +++ b/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart @@ -161,8 +161,9 @@ class LabResultWidget extends StatelessWidget { Utils.tableColumnTitle(TranslationBase.of(context).description, showDivider: false), Utils.tableColumnTitle(TranslationBase.of(context).value, showDivider: false), // Utils.tableColumnTitle(TranslationBase.of(context).unit, showDivider: false), - Utils.tableColumnTitle(TranslationBase.of(context).labResultFlag, showDivider: false), + // Utils.tableColumnTitle(TranslationBase.of(context).labResultFlag, showDivider: false), Utils.tableColumnTitle(TranslationBase.of(context).range, showDivider: false), + Utils.tableColumnTitle("", showDivider: false), ], ), ); @@ -186,15 +187,25 @@ class LabResultWidget extends StatelessWidget { padding: EdgeInsets.only(left: projectViewModel.isArabic ? 0 : 12, right: projectViewModel.isArabic ? 12 : 0), child: Utils.tableColumnValue(labResultList[i].description ?? "", isLast: true, mProjectViewModel: projectViewModel), ), + Utils.tableColumnValue(labResultList[i].resultValue! + " " + labResultList[i].uOM!, - isHighLow: ((labResultList[i].resultValueFlag ?? "").toLowerCase() == "h" || (labResultList[i].resultValueFlag ?? "").toLowerCase() == "l"), + // isHighLow: ((labResultList[i].resultValueFlag ?? "").toLowerCase() == "h" || (labResultList[i].resultValueFlag ?? "").toLowerCase() == "l"), isLast: true, mProjectViewModel: projectViewModel), - Utils.tableColumnValue((labResultList[i].resultValueFlag ?? ""), - isHighLow: ((labResultList[i].resultValueFlag ?? "").toLowerCase() == "h" || (labResultList[i].resultValueFlag ?? "").toLowerCase() == "l"), + + + // Utils.tableColumnValue((labResultList[i].resultValueFlag ?? ""), + // isHighLow: ((labResultList[i].resultValueFlag ?? "").toLowerCase() == "h" || (labResultList[i].resultValueFlag ?? "").toLowerCase() == "l"), + // isLast: true, + // isCapitable: false, + // mProjectViewModel: projectViewModel), + + Utils.tableColumnValue((labResultList[i].referanceRange! ?? ""), + // isHighLow: ((labResultList[i].resultValueFlag ?? "").toLowerCase() == "h" || (labResultList[i].resultValueFlag ?? "").toLowerCase() == "l"), isLast: true, isCapitable: false, mProjectViewModel: projectViewModel), + !checkIfCovidLab(patientLabResultList!) ? InkWell( onTap: () { @@ -210,7 +221,8 @@ class LabResultWidget extends StatelessWidget { }, child: Padding( padding: EdgeInsets.only(left: !projectViewModel.isArabic ? 0 : 12, right: !projectViewModel.isArabic ? 12 : 0), - child: Utils.tableColumnValueWithFlowChart(labResultList[i].referanceRange!, TranslationBase.of(context).viewFlowChart, isLast: true, isCapitable: false), + // child: Utils.tableColumnValueWithFlowChart(labResultList[i].referanceRange!, TranslationBase.of(context).viewFlowChart, isLast: true, isCapitable: false), + child: Utils.tableColumnValueWithUnderLine(TranslationBase.of(context).viewFlowChart, isLast: true, isCapitable: false), ), ) : Container(), diff --git a/lib/widgets/in_app_browser/InAppBrowser.dart b/lib/widgets/in_app_browser/InAppBrowser.dart index 6f61ac8a..ee68f743 100644 --- a/lib/widgets/in_app_browser/InAppBrowser.dart +++ b/lib/widgets/in_app_browser/InAppBrowser.dart @@ -38,9 +38,9 @@ class MyInAppBrowser extends InAppBrowser { static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL LIVE // static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL UAT - static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT + // static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT - // static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE + static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE // static String SERVICE_URL = 'https://uat.hmgwebservices.com/payfortforvidaplus/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL UAT VIDA PLUS