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

merge-update-with-lab-changes
haroon amjad 1 year ago
parent 9909cfaa57
commit d474eb9a24

@ -21,8 +21,8 @@ var PACKAGES_ORDERS = '/api/orders';
var PACKAGES_ORDER_HISTORY = '/api/orders/items'; var PACKAGES_ORDER_HISTORY = '/api/orders/items';
var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara'; var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
// var BASE_URL = 'http://10.50.100.198:2018/'; // 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 = 'https://hmgwebservices.com/';
// var BASE_URL = 'https://orash.cloudsolutions.com.sa/'; // var BASE_URL = 'https://orash.cloudsolutions.com.sa/';
// var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/';
// var BASE_URL = 'https://vidamergeuat.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 CHANNEL = 3;
var GENERAL_ID = 'Cs2020@2016\$2958'; var GENERAL_ID = 'Cs2020@2016\$2958';
var IP_ADDRESS = '10.20.10.20'; var IP_ADDRESS = '10.20.10.20';
var VERSION_ID = 16.9; var VERSION_ID = 17.0;
var SETUP_ID = '91877'; var SETUP_ID = '91877';
var LANGUAGE = 2; var LANGUAGE = 2;
// var PATIENT_OUT_SA = 0; // var PATIENT_OUT_SA = 0;

@ -2121,4 +2121,14 @@ const Map localizedValues = {
"labResultFlag": {"en": "Flag", "ar": "Flag"}, "labResultFlag": {"en": "Flag", "ar": "Flag"},
"selectOccupation": {"en": "Select Occupation", "ar": "اختر المهنة"}, "selectOccupation": {"en": "Select Occupation", "ar": "اختر المهنة"},
"selectOccupationError": {"en": "Please select your 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": "اضغط على زر تسجيل الدخول داخل التطبيق"},
}; };

@ -75,7 +75,7 @@ class RegisterInfoResponse {
int? specialtyCode; int? specialtyCode;
dynamic specialtyNameAr; dynamic specialtyNameAr;
dynamic specialtyNameEn; dynamic specialtyNameEn;
String? occupationID; // String? occupationID;
RegisterInfoResponse( RegisterInfoResponse(
{this.date, {this.date,
@ -154,7 +154,8 @@ class RegisterInfoResponse {
this.specialtyCode, this.specialtyCode,
this.specialtyNameAr, this.specialtyNameAr,
this.specialtyNameEn, this.specialtyNameEn,
this.occupationID}); // this.occupationID
});
RegisterInfoResponse.fromJson(Map<String, dynamic> json) { RegisterInfoResponse.fromJson(Map<String, dynamic> json) {
date = json['Date']; date = json['Date'];
@ -233,7 +234,7 @@ class RegisterInfoResponse {
specialtyCode = json['specialtyCode']; specialtyCode = json['specialtyCode'];
specialtyNameAr = json['specialtyNameAr']; specialtyNameAr = json['specialtyNameAr'];
specialtyNameEn = json['specialtyNameEn']; specialtyNameEn = json['specialtyNameEn'];
occupationID = json['OccupationID']; // occupationID = json['OccupationID'];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
@ -314,7 +315,7 @@ class RegisterInfoResponse {
data['specialtyCode'] = this.specialtyCode; data['specialtyCode'] = this.specialtyCode;
data['specialtyNameAr'] = this.specialtyNameAr; data['specialtyNameAr'] = this.specialtyNameAr;
data['specialtyNameEn'] = this.specialtyNameEn; data['specialtyNameEn'] = this.specialtyNameEn;
data['OccupationID'] = this.occupationID; // data['OccupationID'] = this.occupationID;
return data; return data;
} }
} }

@ -16,7 +16,7 @@ class RegisterUserRequest {
int? isHijri; int? isHijri;
String? healthId; String? healthId;
String? zipCode; String? zipCode;
String? occupationID; // String? occupationID;
RegisterUserRequest( RegisterUserRequest(
{this.patientobject, {this.patientobject,
@ -36,7 +36,8 @@ class RegisterUserRequest {
this.isHijri, this.isHijri,
this.healthId, this.healthId,
this.zipCode, this.zipCode,
this.occupationID}); // this.occupationID
});
RegisterUserRequest.fromJson(Map<String, dynamic> json) { RegisterUserRequest.fromJson(Map<String, dynamic> json) {
patientobject = json['Patientobject'] != null ? new Patientobject.fromJson(json['Patientobject']) : null; patientobject = json['Patientobject'] != null ? new Patientobject.fromJson(json['Patientobject']) : null;
@ -56,7 +57,7 @@ class RegisterUserRequest {
isHijri = json['IsHijri']; isHijri = json['IsHijri'];
healthId = json['HealthId']; healthId = json['HealthId'];
zipCode = json['ZipCode']; zipCode = json['ZipCode'];
occupationID = json['OccupationID']; // occupationID = json['OccupationID'];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
@ -80,7 +81,7 @@ class RegisterUserRequest {
data['IsHijri'] = this.isHijri; data['IsHijri'] = this.isHijri;
data['HealthId'] = this.healthId; data['HealthId'] = this.healthId;
data['ZipCode'] = this.zipCode; data['ZipCode'] = this.zipCode;
data['OccupationID'] = this.occupationID; // data['OccupationID'] = this.occupationID;
return data; return data;
} }
} }
@ -107,7 +108,7 @@ class Patientobject {
String? sourceType; String? sourceType;
String? preferredLanguage; String? preferredLanguage;
String? marital; String? marital;
String? occupationID; // String? occupationID;
Patientobject( Patientobject(
{this.tempValue, {this.tempValue,
@ -131,7 +132,8 @@ class Patientobject {
this.sourceType, this.sourceType,
this.preferredLanguage, this.preferredLanguage,
this.marital, this.marital,
this.occupationID}); // this.occupationID
});
Patientobject.fromJson(Map<String, dynamic> json) { Patientobject.fromJson(Map<String, dynamic> json) {
tempValue = json['TempValue']; tempValue = json['TempValue'];
@ -156,7 +158,7 @@ class Patientobject {
preferredLanguage = json['PreferredLanguage']; preferredLanguage = json['PreferredLanguage'];
marital = json['Marital']; marital = json['Marital'];
occupationID = json['OccupationID'] ?? ""; // occupationID = json['OccupationID'] ?? "";
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
@ -182,7 +184,7 @@ class Patientobject {
data['SourceType'] = this.sourceType; data['SourceType'] = this.sourceType;
data['PreferredLanguage'] = this.preferredLanguage; data['PreferredLanguage'] = this.preferredLanguage;
data['Marital'] = this.marital; data['Marital'] = this.marital;
data['OccupationID'] = this.occupationID; // data['OccupationID'] = this.occupationID;
return data; return data;
} }
} }

@ -93,26 +93,26 @@ class _EROnlineCheckInHomePageState extends State<EROnlineCheckInHomePage> with
), ),
mHeight(6), mHeight(6),
Text( Text(
"What is Online Check-In?", TranslationBase.of(context).whatIsOnlineCheckIn,
maxLines: 1, maxLines: 1,
style: TextStyle( style: TextStyle(
fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
), ),
Text( 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), style: TextStyle(fontSize: 14, color: CustomColors.textDarkColor, letterSpacing: -1.44, height: 35 / 24),
), ),
mHeight(16), mHeight(16),
Text( // Text(
"How can i use Online Check-In?", // TranslationBase.of(context).EROnlineCheckInHow,
maxLines: 1, // maxLines: 1,
style: TextStyle( // style: TextStyle(
fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24), // fontSize: 20, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
), // ),
Text( // Text(
"online check-in lets patients fill out forms, share insurance details, and book appointments online, making their visit smoother and quicker.", // "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), // style: TextStyle(fontSize: 14, color: CustomColors.textDarkColor, letterSpacing: -1.44, height: 35 / 24),
), // ),
], ],
), ),
), ),
@ -164,7 +164,7 @@ class _EROnlineCheckInHomePageState extends State<EROnlineCheckInHomePage> with
Padding( Padding(
padding: const EdgeInsets.only(left: 50, right: 50), padding: const EdgeInsets.only(left: 50, right: 50),
child: Text( child: Text(
"Tap On", TranslationBase.of(context).EROnlineCheckInTapOn,
maxLines: 1, maxLines: 1,
style: TextStyle( style: TextStyle(
fontSize: 20, fontSize: 20,
@ -178,8 +178,8 @@ class _EROnlineCheckInHomePageState extends State<EROnlineCheckInHomePage> with
Padding( Padding(
padding: const EdgeInsets.only(left: 50, right: 50), padding: const EdgeInsets.only(left: 50, right: 50),
child: Text( child: Text(
"Tap on the check-in button within the app", TranslationBase.of(context).EROnlineCheckInTapOnCheckIn,
style: TextStyle(fontSize: 14, color: CustomColors.textDarkColor, letterSpacing: -1.44, height: 35 / 24), style: TextStyle(fontSize: 14, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: CustomColors.textDarkColor, letterSpacing: -1.44, height: 35 / 24),
), ),
), ),
mHeight(16), mHeight(16),
@ -210,7 +210,7 @@ class _EROnlineCheckInHomePageState extends State<EROnlineCheckInHomePage> with
Padding( Padding(
padding: const EdgeInsets.only(left: 50, right: 50), padding: const EdgeInsets.only(left: 50, right: 50),
child: Text( child: Text(
"Hold your phone", TranslationBase.of(context).EROnlineCheckInHoldPhone,
maxLines: 1, maxLines: 1,
style: TextStyle( style: TextStyle(
fontSize: 20, fontSize: 20,
@ -224,8 +224,8 @@ class _EROnlineCheckInHomePageState extends State<EROnlineCheckInHomePage> with
Padding( Padding(
padding: const EdgeInsets.only(left: 50, right: 50), padding: const EdgeInsets.only(left: 50, right: 50),
child: Text( child: Text(
"Hold the phone 1 to 2 cm from the NFC sign displayed on the board", TranslationBase.of(context).EROnlineCheckInHoldPhoneInstruction,
style: TextStyle(fontSize: 14, color: CustomColors.textDarkColor, letterSpacing: -1.44, height: 35 / 24), style: TextStyle(fontSize: 14, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), color: CustomColors.textDarkColor, letterSpacing: -1.44, height: 35 / 24),
), ),
), ),
mHeight(16), mHeight(16),
@ -241,7 +241,7 @@ class _EROnlineCheckInHomePageState extends State<EROnlineCheckInHomePage> with
child: Center( child: Center(
child: Text( child: Text(
"3", "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<EROnlineCheckInHomePage> with
Padding( Padding(
padding: const EdgeInsets.only(left: 50, right: 50), padding: const EdgeInsets.only(left: 50, right: 50),
child: Text( child: Text(
"Wait your turn", TranslationBase.of(context).EROnlineCheckInWaitTurn,
maxLines: 1, maxLines: 1,
style: TextStyle( style: TextStyle(
fontSize: 20, fontSize: 20,
@ -270,8 +270,8 @@ class _EROnlineCheckInHomePageState extends State<EROnlineCheckInHomePage> with
Padding( Padding(
padding: const EdgeInsets.only(left: 50, right: 50), padding: const EdgeInsets.only(left: 50, right: 50),
child: Text( child: Text(
"Please wait in the waiting area until called by the nurse", TranslationBase.of(context).EROnlineCheckInWaitTurnInstruction,
style: TextStyle(fontSize: 14, color: CustomColors.textDarkColor, letterSpacing: -1.44, height: 35 / 24), 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<EROnlineCheckInHomePage> with
child: DefaultButton( child: DefaultButton(
TranslationBase.of(context).arrived, TranslationBase.of(context).arrived,
() { () {
showMyBottomSheet(context, // showMyBottomSheet(context,
callBackFunc: () {}, // callBackFunc: () {},
child: Padding( // child: Padding(
padding: const EdgeInsets.all(21.0), // padding: const EdgeInsets.all(21.0),
child: Column( // child: Column(
children: [ // children: [
Text(TranslationBase.of(context).scanQRHospital, // Text(TranslationBase.of(context).scanQRHospital,
style: TextStyle( // style: TextStyle(
fontSize: 20, // fontSize: 20,
fontWeight: FontWeight.w600, // fontWeight: FontWeight.w600,
letterSpacing: -0.48, // letterSpacing: -0.48,
)), // )),
mHeight(21), // mHeight(21),
GridView( // GridView(
physics: const NeverScrollableScrollPhysics(), // physics: const NeverScrollableScrollPhysics(),
shrinkWrap: true, // shrinkWrap: true,
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( // gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: (MediaQuery.of(context).size.width < 550) ? 3 : 5, childAspectRatio: 1 / 1, crossAxisSpacing: 8, mainAxisSpacing: 12), // crossAxisCount: (MediaQuery.of(context).size.width < 550) ? 3 : 5, childAspectRatio: 1 / 1, crossAxisSpacing: 8, mainAxisSpacing: 12),
children: [ // children: [
attendanceMethod(TranslationBase.of(context).scanNFC, "assets/images/nfc/contactless.svg", true, () { // attendanceMethod(TranslationBase.of(context).scanNFC, "assets/images/nfc/contactless.svg", true, () {
if (_supportsNFC) { // if (_supportsNFC) {
Future.delayed(const Duration(milliseconds: 500), () { // Future.delayed(const Duration(milliseconds: 500), () {
showNfcReader(context, onNcfScan: (String nfcId) { // showNfcReader(context, onNcfScan: (String nfcId) {
Future.delayed(const Duration(milliseconds: 100), () { // Future.delayed(const Duration(milliseconds: 100), () {
print(nfcId); // print(nfcId);
getProjectIDFromNFC(nfcId, true); // getProjectIDFromNFC(nfcId, true);
// Navigator.push(context, FadePage(page: EROnlineCheckInPaymentDetails())); // // Navigator.push(context, FadePage(page: EROnlineCheckInPaymentDetails()));
}); // });
}, onCancel: () { // }, onCancel: () {
Navigator.of(context).pop(); // Navigator.of(context).pop();
}); // });
}); // });
} else { // } else {
//NFCNotSupported // //NFCNotSupported
AppToast.showErrorToast(message: TranslationBase.of(context).NFCNotSupported); // AppToast.showErrorToast(message: TranslationBase.of(context).NFCNotSupported);
} // }
}), // }),
attendanceMethod(TranslationBase.of(context).pharmaLiveCareScanQR, "assets/images/new/services/qr_code.svg", true, () async { // attendanceMethod(TranslationBase.of(context).pharmaLiveCareScanQR, "assets/images/new/services/qr_code.svg", true, () async {
String onlineCheckInQRCode = (await BarcodeScanner.scan().then((value) => value.rawContent)); // String onlineCheckInQRCode = (await BarcodeScanner.scan().then((value) => value.rawContent));
if (onlineCheckInQRCode != "") { // if (onlineCheckInQRCode != "") {
print(onlineCheckInQRCode); // print(onlineCheckInQRCode);
getProjectIDFromNFC(onlineCheckInQRCode, true); // getProjectIDFromNFC(onlineCheckInQRCode, true);
// sendNfcCheckInRequest(onlineCheckInQRCode, 2); // // sendNfcCheckInRequest(onlineCheckInQRCode, 2);
} else {} // } else {}
}), // }),
attendanceMethod(TranslationBase.of(context).checkInViaLocation, "assets/images/new/services/location.svg", true, () {}) // attendanceMethod(TranslationBase.of(context).checkInViaLocation, "assets/images/new/services/location.svg", true, () {})
], // ],
), // ),
], // ],
), // ),
)); // ));
// Navigator.push(context, FadePage(page: EROnlineCheckInNFCQRLocation(projectID: 15))).then((value) {}); // Navigator.push(context, FadePage(page: EROnlineCheckInNFCQRLocation(projectID: 15))).then((value) {});
// if (_supportsNFC) { if (_supportsNFC) {
// Future.delayed(const Duration(milliseconds: 500), () { Future.delayed(const Duration(milliseconds: 500), () {
// showNfcReader(context, onNcfScan: (String nfcId) { showNfcReader(context, onNcfScan: (String nfcId) {
// Future.delayed(const Duration(milliseconds: 100), () { Future.delayed(const Duration(milliseconds: 100), () {
// print(nfcId); print(nfcId);
// getProjectIDFromNFC(nfcId, true); getProjectIDFromNFC(nfcId, true);
// // Navigator.push(context, FadePage(page: EROnlineCheckInPaymentDetails())); // Navigator.push(context, FadePage(page: EROnlineCheckInPaymentDetails()));
// }); });
// }, onCancel: () { }, onCancel: () {
// Navigator.of(context).pop(); Navigator.of(context).pop();
// }); });
// }); });
// } else { } else {
// //NFCNotSupported //NFCNotSupported
// AppToast.showErrorToast(message: TranslationBase.of(context).NFCNotSupported); AppToast.showErrorToast(message: TranslationBase.of(context).NFCNotSupported);
// } }
}, },
color: CustomColors.accentColor, color: CustomColors.accentColor,
), ),

@ -92,10 +92,8 @@ class _RegisterInfo extends State<RegisterInfo> {
String nationality = 'SAU'; String nationality = 'SAU';
String selectedOccupationID = ""; String selectedOccupationID = "";
List<GetPatientOccupationListResponse> patientOccupationList = []; // List<GetPatientOccupationListResponse> patientOccupationList = [];
// GetPatientOccupationListResponse? selectedPatientOccupation;
//
GetPatientOccupationListResponse? selectedPatientOccupation;
final GlobalKey projectDropdownKey = GlobalKey(); final GlobalKey projectDropdownKey = GlobalKey();
@ -273,71 +271,71 @@ class _RegisterInfo extends State<RegisterInfo> {
? Column( ? Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
(!isDubai) // (!isDubai)
? Container( // ? Container(
width: double.infinity, // width: double.infinity,
decoration: containerRadius(Colors.white, 12), // decoration: containerRadius(Colors.white, 12),
padding: EdgeInsets.only(left: 10, right: 10, top: 12, bottom: 12), // padding: EdgeInsets.only(left: 10, right: 10, top: 12, bottom: 12),
child: Row( // child: Row(
children: [ // children: [
Flexible( // Flexible(
child: Column( // child: Column(
crossAxisAlignment: CrossAxisAlignment.start, // crossAxisAlignment: CrossAxisAlignment.start,
children: [ // children: [
Text( // Text(
TranslationBase.of(context).selectOccupation, // TranslationBase.of(context).selectOccupation,
style: TextStyle( // style: TextStyle(
fontSize: 11, // fontSize: 11,
letterSpacing: -0.44, // letterSpacing: -0.44,
fontWeight: FontWeight.w600, // fontWeight: FontWeight.w600,
), // ),
), // ),
Container( // Container(
height: 18, // height: 18,
width: double.infinity, // width: double.infinity,
child: DropdownButtonHideUnderline( // child: DropdownButtonHideUnderline(
child: DropdownButton<GetPatientOccupationListResponse>( // child: DropdownButton<GetPatientOccupationListResponse>(
key: projectDropdownKey, // key: projectDropdownKey,
hint: Text(TranslationBase.of(context).selectOccupation), // hint: Text(TranslationBase.of(context).selectOccupation),
value: selectedPatientOccupation, // value: selectedPatientOccupation,
iconSize: 0, // iconSize: 0,
isExpanded: true, // isExpanded: true,
style: TextStyle(fontSize: 14, letterSpacing: -0.56, color: Colors.black), // style: TextStyle(fontSize: 14, letterSpacing: -0.56, color: Colors.black),
items: patientOccupationList.map((GetPatientOccupationListResponse item) { // items: patientOccupationList.map((GetPatientOccupationListResponse item) {
return DropdownMenuItem<GetPatientOccupationListResponse>( // return DropdownMenuItem<GetPatientOccupationListResponse>(
value: item, // value: item,
child: AutoSizeText( // child: AutoSizeText(
projectViewModel.isArabic ? item.descriptionN! : item.description!, // projectViewModel.isArabic ? item.descriptionN! : item.description!,
maxLines: 1, // maxLines: 1,
minFontSize: 10, // minFontSize: 10,
style: TextStyle( // style: TextStyle(
fontSize: SizeConfig.textMultiplier! * 1.6, // fontSize: SizeConfig.textMultiplier! * 1.6,
fontWeight: FontWeight.w600, // fontWeight: FontWeight.w600,
letterSpacing: -0.39, // letterSpacing: -0.39,
height: 0.8, // height: 0.8,
), // ),
), // ),
// Text('${item.name!}'), // // Text('${item.name!}'),
); // );
}).toList(), // }).toList(),
onChanged: (GetPatientOccupationListResponse? newValue) { // onChanged: (GetPatientOccupationListResponse? newValue) {
setState(() { // setState(() {
selectedPatientOccupation = newValue!; // selectedPatientOccupation = newValue!;
selectedOccupationID = selectedPatientOccupation!.occupationID!; // selectedOccupationID = selectedPatientOccupation!.occupationID!;
registerInfo.occupationID = selectedOccupationID; // registerInfo.occupationID = selectedOccupationID;
}); // });
debugPrint("Selected Occupation ID: ${registerInfo.occupationID}"); // debugPrint("Selected Occupation ID: ${registerInfo.occupationID}");
}, // },
), // ),
), // ),
), // ),
], // ],
), // ),
), // ),
Icon(Icons.keyboard_arrow_down), // Icon(Icons.keyboard_arrow_down),
], // ],
)) // ))
: SizedBox(), // : SizedBox(),
mHeight(20), mHeight(20),
Container( Container(
width: double.infinity, width: double.infinity,
@ -513,15 +511,17 @@ class _RegisterInfo extends State<RegisterInfo> {
widget.changePageViewIndex!(2); widget.changePageViewIndex!(2);
} }
} else { } else {
if (isDubai) { registerNow();
registerNow();
} else { // if (isDubai) {
if (selectedPatientOccupation != null) { // registerNow();
registerNow(); // } else {
} else { // if (selectedPatientOccupation != null) {
AppToast.showErrorToast(message: TranslationBase.of(context).selectOccupationError); // registerNow();
} // } else {
} // AppToast.showErrorToast(message: TranslationBase.of(context).selectOccupationError);
// }
// }
} }
} }
@ -624,15 +624,15 @@ class _RegisterInfo extends State<RegisterInfo> {
}); });
} }
try { // try {
var patientOccupationListVal = json.decode(await sharedPref.getString(PATIENT_OCCUPATION_LIST)); // var patientOccupationListVal = json.decode(await sharedPref.getString(PATIENT_OCCUPATION_LIST));
patientOccupationListVal.forEach((v) { // patientOccupationListVal.forEach((v) {
patientOccupationList.add(new GetPatientOccupationListResponse.fromJson(v)); // patientOccupationList.add(new GetPatientOccupationListResponse.fromJson(v));
}); // });
setState(() {}); // setState(() {});
} catch (ex) { // } catch (ex) {
print(ex.toString()); // print(ex.toString());
} // }
} }
getTempUserRequest() { getTempUserRequest() {
@ -662,7 +662,7 @@ class _RegisterInfo extends State<RegisterInfo> {
"EmailAddress": email, "EmailAddress": email,
"SourceType": location, "SourceType": location,
"PreferredLanguage": registerd_data.languageID.toString(), "PreferredLanguage": registerd_data.languageID.toString(),
"OccupationID": registerInfo.occupationID, // "OccupationID": registerInfo.occupationID,
"Marital": registerInfo.maritalStatusCode == 'U' "Marital": registerInfo.maritalStatusCode == 'U'
? '0' ? '0'
: registerInfo.maritalStatusCode == 'M' : registerInfo.maritalStatusCode == 'M'

@ -3025,6 +3025,17 @@ class TranslationBase {
String get labResultFlag => localizedValues["labResultFlag"][locale.languageCode]; String get labResultFlag => localizedValues["labResultFlag"][locale.languageCode];
String get selectOccupation => localizedValues["selectOccupation"][locale.languageCode]; String get selectOccupation => localizedValues["selectOccupation"][locale.languageCode];
String get selectOccupationError => localizedValues["selectOccupationError"][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<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

@ -161,8 +161,9 @@ class LabResultWidget extends StatelessWidget {
Utils.tableColumnTitle(TranslationBase.of(context).description, showDivider: false), Utils.tableColumnTitle(TranslationBase.of(context).description, showDivider: false),
Utils.tableColumnTitle(TranslationBase.of(context).value, showDivider: false), Utils.tableColumnTitle(TranslationBase.of(context).value, showDivider: false),
// Utils.tableColumnTitle(TranslationBase.of(context).unit, 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(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), padding: EdgeInsets.only(left: projectViewModel.isArabic ? 0 : 12, right: projectViewModel.isArabic ? 12 : 0),
child: Utils.tableColumnValue(labResultList[i].description ?? "", isLast: true, mProjectViewModel: projectViewModel), child: Utils.tableColumnValue(labResultList[i].description ?? "", isLast: true, mProjectViewModel: projectViewModel),
), ),
Utils.tableColumnValue(labResultList[i].resultValue! + " " + labResultList[i].uOM!, 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, isLast: true,
mProjectViewModel: projectViewModel), 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, isLast: true,
isCapitable: false, isCapitable: false,
mProjectViewModel: projectViewModel), mProjectViewModel: projectViewModel),
!checkIfCovidLab(patientLabResultList!) !checkIfCovidLab(patientLabResultList!)
? InkWell( ? InkWell(
onTap: () { onTap: () {
@ -210,7 +221,8 @@ class LabResultWidget extends StatelessWidget {
}, },
child: Padding( child: Padding(
padding: EdgeInsets.only(left: !projectViewModel.isArabic ? 0 : 12, right: !projectViewModel.isArabic ? 12 : 0), 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(), : Container(),

@ -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 LIVE
// static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL UAT // 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 // static String SERVICE_URL = 'https://uat.hmgwebservices.com/payfortforvidaplus/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL UAT VIDA PLUS

Loading…
Cancel
Save