diff --git a/lib/client/base_app_client.dart b/lib/client/base_app_client.dart index 31f3be0d..2a89b765 100644 --- a/lib/client/base_app_client.dart +++ b/lib/client/base_app_client.dart @@ -152,7 +152,7 @@ class BaseAppClient { : SETUP_ID; } - body['VersionID'] = VERSION_ID; + body['VersionID'] = 6.3; body['Channel'] = CHANNEL; body['LanguageID'] = languageID == 'ar' ? 1 : 2; diff --git a/lib/core/service/InsuranceCardService.dart b/lib/core/service/InsuranceCardService.dart index 43c0e811..de7ee433 100644 --- a/lib/core/service/InsuranceCardService.dart +++ b/lib/core/service/InsuranceCardService.dart @@ -15,18 +15,18 @@ class InsuranceCardService extends BaseService { List get insuranceApproval => _insuranceApproval; - Future getInsuranceApproval(PatiantInformtion patient,{int appointmentNo}) async { + Future getInsuranceApproval(PatiantInformtion patient,{int appointmentNo , int projectId}) async { hasError = false; // _cardList.clear(); - if (appointmentNo != null) { - _insuranceApprovalModel.appointmentNo = appointmentNo; - _insuranceApprovalModel.eXuldAPPNO = null; - _insuranceApprovalModel.projectID = null; - } else { + // if (appointmentNo != null) { + // _insuranceApprovalModel.appointmentNo = appointmentNo; + // _insuranceApprovalModel.eXuldAPPNO = null; + // _insuranceApprovalModel.projectID = projectId; + // } else { _insuranceApprovalModel.appointmentNo = null; _insuranceApprovalModel.eXuldAPPNO = 0; _insuranceApprovalModel.projectID = 0; - } + // } await baseAppClient.postPatient(GET_PAtIENTS_INSURANCE_APPROVALS, patient: patient, diff --git a/lib/core/viewModel/InsuranceViewModel.dart b/lib/core/viewModel/InsuranceViewModel.dart index b08469ef..a0b51d20 100644 --- a/lib/core/viewModel/InsuranceViewModel.dart +++ b/lib/core/viewModel/InsuranceViewModel.dart @@ -14,12 +14,12 @@ class InsuranceViewModel extends BaseViewModel{ List get insuranceApproval => _insuranceCardService.insuranceApproval; - Future getInsuranceApproval(PatiantInformtion patient,{int appointmentNo}) async { + Future getInsuranceApproval(PatiantInformtion patient,{int appointmentNo, int projectId}) async { error = ""; setState(ViewState.Busy); if (appointmentNo != null) await _insuranceCardService.getInsuranceApproval(patient, - appointmentNo: appointmentNo); + appointmentNo: appointmentNo,projectId: projectId); else await _insuranceCardService.getInsuranceApproval(patient); if (_insuranceCardService.hasError) { diff --git a/lib/screens/doctor/doctor_reply_screen.dart b/lib/screens/doctor/doctor_reply_screen.dart index 62d46d5e..2f5549fb 100644 --- a/lib/screens/doctor/doctor_reply_screen.dart +++ b/lib/screens/doctor/doctor_reply_screen.dart @@ -39,14 +39,15 @@ class DoctorReplyScreen extends StatelessWidget { children: model.listDoctorWorkingHoursTable.map((reply) { return InkWell( - onTap: () { - Navigator.push( - context, - MaterialPageRoute( - builder: (BuildContext context) => - DoctorReplayChat(reply: reply))); - }, - child: DoctorReplyWidget(reply: reply)); + onTap: () { + // Navigator.push( + // context, + // MaterialPageRoute( + // builder: (BuildContext context) => + // DoctorReplayChat(reply: reply))); + }, + child: DoctorReplyWidget(reply: reply), + ); }).toList(), ) ], diff --git a/lib/screens/patients/insurance_approval_screen_patient.dart b/lib/screens/patients/insurance_approval_screen_patient.dart index cb0be61c..3f0bfedf 100644 --- a/lib/screens/patients/insurance_approval_screen_patient.dart +++ b/lib/screens/patients/insurance_approval_screen_patient.dart @@ -42,7 +42,7 @@ class _InsuranceApprovalScreenNewState return BaseView( onModelReady: patient.appointmentNo != null ? (model) => model.getInsuranceApproval(patient, - appointmentNo: patient.appointmentNo) + appointmentNo: patient.appointmentNo,projectId: patient.projectId) : (model) => model.getInsuranceApproval(patient), builder: (BuildContext context, InsuranceViewModel model, Widget child) => AppScaffold( diff --git a/lib/screens/patients/insurance_approvals_details.dart b/lib/screens/patients/insurance_approvals_details.dart index 98daef73..8903b704 100644 --- a/lib/screens/patients/insurance_approvals_details.dart +++ b/lib/screens/patients/insurance_approvals_details.dart @@ -37,7 +37,7 @@ class _InsuranceApprovalsDetailsState extends State { return BaseView( onModelReady: patient.appointmentNo != null ? (model) => model.getInsuranceApproval(patient, - appointmentNo: patient.appointmentNo) + appointmentNo: patient.appointmentNo,projectId: patient.projectId) : (model) => model.getInsuranceApproval(patient), builder: (BuildContext context, InsuranceViewModel model, Widget child) => AppScaffold( @@ -93,14 +93,12 @@ class _InsuranceApprovalsDetailsState extends State { Row( children: [ Texts( - model.insuranceApproval[indexInsurance] - .approvalDetails.status, + model.insuranceApproval[indexInsurance].approvalDetails!=null? + model.insuranceApproval[indexInsurance].approvalDetails.status ??"":"", color: - model.insuranceApproval[indexInsurance] - .approvalDetails.status == - "Approved" - ? Color(0xff359846) - : Color(0xffD02127), + model.insuranceApproval[indexInsurance].approvalDetails!=null? + "${model.insuranceApproval[indexInsurance].approvalDetails.status}" + == "Approved" ? Color(0xff359846) : Color(0xffD02127): Color(0xffD02127), ), ], ), @@ -210,9 +208,7 @@ class _InsuranceApprovalsDetailsState extends State { Texts('Sample') ], ), - SizedBox( - height: 25.0, - ), + Row( children: [ Texts( @@ -315,8 +311,8 @@ class _InsuranceApprovalsDetailsState extends State { child: Texts(model .insuranceApproval[ indexInsurance] - .approvalDetails - .procedureName), + ?.approvalDetails + ?.procedureName??""), ), Container( height: MediaQuery.of(context) @@ -330,8 +326,8 @@ class _InsuranceApprovalsDetailsState extends State { child: Texts(model .insuranceApproval[ indexInsurance] - .approvalDetails - .status), + ?.approvalDetails + ?.status??""), ), Container( height: MediaQuery.of(context) @@ -345,8 +341,8 @@ class _InsuranceApprovalsDetailsState extends State { child: Texts(model .insuranceApproval[ indexInsurance] - .approvalDetails - .isInvoicedDesc), + ?.approvalDetails + ?.isInvoicedDesc??""), ), ], ), diff --git a/lib/screens/patients/patients_screen.dart b/lib/screens/patients/patients_screen.dart index 286f206d..28e4434f 100644 --- a/lib/screens/patients/patients_screen.dart +++ b/lib/screens/patients/patients_screen.dart @@ -167,15 +167,23 @@ class _PatientsScreenState extends State { var strExist = str.length > 0 ? true : false; if (true) { List filterDate = []; - + String patiantAppointment = ""; for (var i = 0; i < responseModelList2.length; i++) { - String patiantAppointment = - convertDateFormat(responseModelList[i].appointmentDate); + try { + if (responseModelList[i].appointmentDate == "") { + patiantAppointment = responseModelList[i].arrivedOn; + } else { + patiantAppointment = + convertDateFormat(responseModelList[i].appointmentDate); + } - String dateAppointment = checkDate(patiantAppointment); + String dateAppointment = checkDate(patiantAppointment); - if (dateAppointment.contains(str)) { - filterDate.add(responseModelList[i]); + if (dateAppointment.contains(str) || str == 'All') { + filterDate.add(responseModelList[i]); + } + } catch (e) { + print(e); } } @@ -441,17 +449,18 @@ class _PatientsScreenState extends State { }, )), Padding( - padding: EdgeInsets.only( - top: MediaQuery.of(context) - .size - .height * - 0.03), - child: SERVICES_PATIANT2[ - int.parse(patientType)] == - "List_MyOutPatient" - ? _locationBar(context) - : Container(), - ), + padding: EdgeInsets.only( + top: MediaQuery.of(context) + .size + .height * + 0.03), + child: _locationBar(context) + // child: SERVICES_PATIANT2[ + // int.parse(patientType)] == + // "List_MyOutPatient" + // ? _locationBar(context) + // : Container(), + ), // Row( // mainAxisAlignment: // MainAxisAlignment.spaceEvenly, diff --git a/lib/screens/patients/profile/radiology/radiology_details_page.dart b/lib/screens/patients/profile/radiology/radiology_details_page.dart index 6b54dec7..308f8536 100644 --- a/lib/screens/patients/profile/radiology/radiology_details_page.dart +++ b/lib/screens/patients/profile/radiology/radiology_details_page.dart @@ -19,7 +19,13 @@ class RadiologyDetailsPage extends StatelessWidget { final PatiantInformtion patient; final String patientType; final String arrivalType; - RadiologyDetailsPage({Key key, this.finalRadiology, this.patient, this.patientType, this.arrivalType}); + + RadiologyDetailsPage( + {Key key, + this.finalRadiology, + this.patient, + this.patientType, + this.arrivalType}); @override Widget build(BuildContext context) { @@ -30,66 +36,72 @@ class RadiologyDetailsPage extends StatelessWidget { lineItem: finalRadiology.invoiceLineItemNo, invoiceNo: finalRadiology.invoiceNo), builder: (_, model, widget) => AppScaffold( - appBar: PatientProfileHeaderWhitAppointmentAppBar( - patient: patient, - patientType: patientType??"0", - arrivalType: arrivalType??"0", - orderNo: finalRadiology.orderNo.toString(), - appointmentDate:finalRadiology.orderDate, - doctorName: finalRadiology.doctorName, - profileUrl: finalRadiology.doctorImageURL, - invoiceNO: finalRadiology.invoiceNo.toString(), - ), - isShowAppBar: true, - baseViewModel: model, - body: SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.max, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Container( - margin: EdgeInsets.all(8), - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(12), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - SizedBox(height: 5,), - Texts(TranslationBase.of(context).generalResult), - SizedBox(height: 5,), - Padding( - padding: const EdgeInsets.all(8.0), - child: Texts( - '${finalRadiology.reportData.trim()}', - textAlign: TextAlign.start, - fontSize: 17, - color: Colors.grey, - ), + appBar: PatientProfileHeaderWhitAppointmentAppBar( + patient: patient, + patientType: patientType ?? "0", + arrivalType: arrivalType ?? "0", + appointmentDate: finalRadiology.orderDate, + doctorName: finalRadiology.doctorName, + profileUrl: finalRadiology.doctorImageURL, + invoiceNO: finalRadiology.invoiceNo.toString(), + ), + isShowAppBar: true, + baseViewModel: model, + body: SingleChildScrollView( + child: Column( + mainAxisSize: MainAxisSize.max, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + margin: EdgeInsets.all(8), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(12), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + height: 5, + ), + Texts(TranslationBase.of(context).generalResult), + SizedBox( + height: 5, + ), + Padding( + padding: const EdgeInsets.all(8.0), + child: Texts( + '${finalRadiology.reportData.trim()}', + textAlign: TextAlign.start, + fontSize: 17, + color: Colors.grey, ), - SizedBox(height: 25,), - if(model.radImageURL.isNotEmpty) - Center( - child: Container( - width: MediaQuery.of(context).size.width * 0.8, - child: Button( + ), + SizedBox( + height: 100, + ), - color: Colors.red, - onTap: () { - launch(model.radImageURL); - }, - title: TranslationBase.of(context).openRad, - ), - ), - ), - ], - ), + ], ), - ], - ), + ), + ], ), + ), + bottomSheet: model.radImageURL.isNotEmpty ?Container( + width: double.maxFinite, + height: 100, + child: Container( + margin: EdgeInsets.only(left: 35,right: 35,top: 12,bottom: 12), + child: Button( + color: Colors.red, + onTap: () { + launch(model.radImageURL); + }, + title: TranslationBase.of(context).openRad, + ), ), + ):null, + ), ); } } diff --git a/lib/screens/patients/profile/radiology/radiology_home_page.dart b/lib/screens/patients/profile/radiology/radiology_home_page.dart index 27c58e99..5cb14b8a 100644 --- a/lib/screens/patients/profile/radiology/radiology_home_page.dart +++ b/lib/screens/patients/profile/radiology/radiology_home_page.dart @@ -124,7 +124,6 @@ class RadiologyHomePage extends StatelessWidget { invoiceNO: '${model.radiologyList[index].invoiceNo}', branch: '${model.radiologyList[index].projectName}', appointmentDate: model.radiologyList[index].orderDate, - orderNo: model.radiologyList[index].orderNo.toString(), ), )), diff --git a/lib/screens/prescription/prescription_items_page.dart b/lib/screens/prescription/prescription_items_page.dart index fa665aff..4197b5b6 100644 --- a/lib/screens/prescription/prescription_items_page.dart +++ b/lib/screens/prescription/prescription_items_page.dart @@ -100,13 +100,25 @@ class PrescriptionItemsPage extends StatelessWidget { Row( children: [ Texts(TranslationBase.of(context).route,color: Colors.grey,), - Expanded(child: Texts(model.prescriptionReportList[index].routeN)), + Expanded(child: Texts(" "+model.prescriptionReportList[index].routeN)), ], ), Row( children: [ Texts(TranslationBase.of(context).frequency,color: Colors.grey,), - Texts(model.prescriptionReportList[index].frequencyN ?? ''), + Texts(" "+model.prescriptionReportList[index].frequencyN ?? ''), + ], + ), + Row( + children: [ + Texts(TranslationBase.of(context).dailyDoses,color: Colors.grey,), + Texts(" "+model.prescriptionReportList[index].doseDailyQuantity ?? ''), + ], + ), + Row( + children: [ + Texts(TranslationBase.of(context).duration,color: Colors.grey,), + Texts(" "+model.prescriptionReportList[index].days.toString() ?? ''), ], ), SizedBox(height: 12,), @@ -178,13 +190,25 @@ class PrescriptionItemsPage extends StatelessWidget { Row( children: [ Texts(TranslationBase.of(context).route,color: Colors.grey,), - Expanded(child: Texts(model.prescriptionReportEnhList[index].route??'')), + Expanded(child: Texts(" "+model.prescriptionReportEnhList[index].route??'')), ], ), Row( children: [ Texts(TranslationBase.of(context).frequency,color: Colors.grey,), - Texts(model.prescriptionReportEnhList[index].frequency ?? ''), + Texts(" "+model.prescriptionReportEnhList[index].frequency ?? ''), + ], + ), + Row( + children: [ + Texts(TranslationBase.of(context).dailyDoses,color: Colors.grey,), + Texts(" "+model.prescriptionReportEnhList[index].doseDailyQuantity.toString() ?? ''), + ], + ), + Row( + children: [ + Texts(TranslationBase.of(context).duration,color: Colors.grey,), + Texts(" "+model.prescriptionReportList[index].days.toString() ?? ''), ], ), SizedBox(height: 12,), diff --git a/lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart b/lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart index 74bb1be7..5a284435 100644 --- a/lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart +++ b/lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart @@ -20,6 +20,12 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget with Preferred @override Widget build(BuildContext context) { + int gender = 1; + if (patient.patientDetails != null) { + gender = patient.patientDetails.gender; + } else { + gender = patient.gender; + } return Container( padding: EdgeInsets.only( left: 0, right: 5, bottom: 5,), @@ -48,13 +54,13 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget with Preferred " " + Helpers.capitalize( patient.lastName)) : Helpers.capitalize(patient.patientDetails.fullName), - fontSize: SizeConfig.textMultiplier *2.5, + fontSize: SizeConfig.textMultiplier *2.2, fontWeight: FontWeight.bold, backGroundcolor: Colors.white, fontFamily: 'Poppins', ), ), - patient.patientDetails != null ? patient.patientDetails.gender == 1 : patient.gender == 1 + gender == 1 ? Icon( DoctorApp.male_2, color: Colors.blue, @@ -72,72 +78,71 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget with Preferred width: 60, height: 60, child: Image.asset( - patient.patientDetails != null ? patient.patientDetails.gender == 1 : patient.gender == 1 - ? 'assets/images/male_avatar.png' - : 'assets/images/female_avatar.png', - fit: BoxFit.cover, + gender == 1 + ? 'assets/images/male_avatar.png' + : 'assets/images/female_avatar.png', + fit: BoxFit.cover, + ), ), ), - ), - SizedBox( - width: 10, - ), - Expanded( - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - SERVICES_PATIANT2[ - int.parse(patientType)] == - "patientArrivalList" - ? Container( - child: Row( - mainAxisAlignment: - MainAxisAlignment - .spaceBetween, - children: [ - patient.patientStatusType == - 43 - ? AppText( - TranslationBase.of( - context) - .arrivedP, - color: Colors.green, - fontWeight: - FontWeight.bold, - fontFamily: - 'Poppins', - fontSize: 12, - ) - : AppText( - TranslationBase.of( - context) - .notArrived, - color: - Colors.red[800], - fontWeight: - FontWeight.bold, - fontFamily: - 'Poppins', - fontSize: 12, - ), - arrivalType == '1' - ? AppText( - patient.startTime != - null - ? patient - .startTime - : '', - fontFamily: - 'Poppins', - fontWeight: - FontWeight.w600, - ) - : AppText( - DateUtils.convertStringToDateFormat( - patient - .arrivedOn, - 'MM-dd-yyyy HH:mm'), + SizedBox( + width: 10, + ), + Expanded( + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + SERVICES_PATIANT2[ + int.parse(patientType)] == + "patientArrivalList" + ? Container( + child: Row( + mainAxisAlignment: + MainAxisAlignment + .spaceBetween, + children: [ + patient.patientStatusType == + 43 + ? AppText( + TranslationBase.of( + context) + .arrivedP, + color: Colors.green, + fontWeight: + FontWeight.bold, + fontFamily: + 'Poppins', + fontSize: 12, + ) + : AppText( + TranslationBase.of( + context) + .notArrived, + color: + Colors.red[800], + fontWeight: + FontWeight.bold, + fontFamily: + 'Poppins', + fontSize: 12, + ), + arrivalType == '1' + ? AppText( + patient.startTime != + null + ? patient + .startTime + : '', + fontFamily: + 'Poppins', + fontWeight: + FontWeight.w600, + ) + : AppText( + patient.arrivedOn!=null? DateUtils.convertStringToDateFormat( + patient.arrivedOn, + 'MM-dd-yyyy HH:mm'):'', fontFamily: 'Poppins', fontWeight: diff --git a/lib/widgets/patients/profile/patient-profile-header-new-design.dart b/lib/widgets/patients/profile/patient-profile-header-new-design.dart index 8f8e47a0..4f96ac67 100644 --- a/lib/widgets/patients/profile/patient-profile-header-new-design.dart +++ b/lib/widgets/patients/profile/patient-profile-header-new-design.dart @@ -11,25 +11,34 @@ import 'package:hexcolor/hexcolor.dart'; import 'package:intl/intl.dart'; class PatientProfileHeaderNewDesign extends StatelessWidget { - final PatiantInformtion patient; final String patientType; final String arrivalType; - PatientProfileHeaderNewDesign(this.patient, this.patientType, this.arrivalType); + PatientProfileHeaderNewDesign( + this.patient, this.patientType, this.arrivalType); @override Widget build(BuildContext context) { + int gender = 1; + if (patient.patientDetails != null) { + gender = patient.patientDetails.gender; + } else { + gender = patient.gender; + } + return Container( padding: EdgeInsets.only( - left: 0, right: 5, bottom: 5,), + left: 0, + right: 5, + bottom: 5, + ), decoration: BoxDecoration( color: Colors.white, ), height: 200, child: Container( - padding: EdgeInsets.only( - left: 10, right: 10, bottom: 10), + padding: EdgeInsets.only(left: 10, right: 10, bottom: 10), margin: EdgeInsets.only(top: 50), child: Column( children: [ @@ -43,26 +52,26 @@ class PatientProfileHeaderNewDesign extends StatelessWidget { ), Expanded( child: AppText( - patient.firstName != null ? - (Helpers.capitalize(patient.firstName) + - " " + - Helpers.capitalize( - patient.lastName)) : Helpers.capitalize(patient.patientDetails.fullName), - fontSize: SizeConfig.textMultiplier *2.5, + patient.firstName != null + ? (Helpers.capitalize(patient.firstName) + + " " + + Helpers.capitalize(patient.lastName)) + : Helpers.capitalize(patient.patientDetails.fullName), + fontSize: SizeConfig.textMultiplier * 2.2, fontWeight: FontWeight.bold, backGroundcolor: Colors.white, fontFamily: 'Poppins', ), ), - patient.patientDetails != null ? patient.patientDetails.gender == 1 : patient.gender == 1 + gender == 1 ? Icon( - DoctorApp.male_2, - color: Colors.blue, - ) + DoctorApp.male_2, + color: Colors.blue, + ) : Icon( - DoctorApp.female_1, - color: Colors.pink, - ), + DoctorApp.female_1, + color: Colors.pink, + ), ]), ), Row(children: [ @@ -72,7 +81,7 @@ class PatientProfileHeaderNewDesign extends StatelessWidget { width: 60, height: 60, child: Image.asset( - patient.patientDetails != null ? patient.patientDetails.gender == 1 : patient.gender == 1 + gender == 1 ? 'assets/images/male_avatar.png' : 'assets/images/female_avatar.png', fit: BoxFit.cover, @@ -84,119 +93,84 @@ class PatientProfileHeaderNewDesign extends StatelessWidget { ), Expanded( child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, children: [ - SERVICES_PATIANT2[ - int.parse(patientType)] == - "patientArrivalList" + SERVICES_PATIANT2[int.parse(patientType)] == + "patientArrivalList" ? Container( - child: Row( - mainAxisAlignment: - MainAxisAlignment - .spaceBetween, - children: [ - patient.patientStatusType == - 43 - ? AppText( - TranslationBase.of( - context) - .arrivedP, - color: Colors.green, - fontWeight: - FontWeight.bold, - fontFamily: - 'Poppins', - fontSize: 12, - ) - : AppText( - TranslationBase.of( - context) - .notArrived, - color: - Colors.red[800], - fontWeight: - FontWeight.bold, - fontFamily: - 'Poppins', - fontSize: 12, - ), - arrivalType == '1' - ? AppText( - patient.startTime != - null - ? patient - .startTime - : '', - fontFamily: - 'Poppins', - fontWeight: - FontWeight.w600, - ) - : AppText( - DateUtils.convertStringToDateFormat( - patient - .arrivedOn, - 'MM-dd-yyyy HH:mm'), - fontFamily: - 'Poppins', - fontWeight: - FontWeight.w600, - ) - ], - )) + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + patient.patientStatusType == 43 + ? AppText( + TranslationBase.of(context).arrivedP, + color: Colors.green, + fontWeight: FontWeight.bold, + fontFamily: 'Poppins', + fontSize: 12, + ) + : AppText( + TranslationBase.of(context).notArrived, + color: Colors.red[800], + fontWeight: FontWeight.bold, + fontFamily: 'Poppins', + fontSize: 12, + ), + arrivalType == '1' + ? AppText( + patient.startTime != null + ? patient.startTime + : '', + fontFamily: 'Poppins', + fontWeight: FontWeight.w600, + ) + : AppText( + DateUtils.convertStringToDateFormat( + patient.arrivedOn, + 'MM-dd-yyyy HH:mm'), + fontFamily: 'Poppins', + fontWeight: FontWeight.w600, + ) + ], + )) : SizedBox(), - if (SERVICES_PATIANT2[ - int.parse(patientType)] == + if (SERVICES_PATIANT2[int.parse(patientType)] == "List_MyOutPatient") Container( child: Row( - mainAxisAlignment: - MainAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.start, children: [ AppText( - TranslationBase.of(context) - .appointmentDate + + TranslationBase.of(context).appointmentDate + " : ", fontSize: 14, ), patient.startTime != null ? Container( - height: 15, - width: 60, - decoration: - BoxDecoration( - borderRadius: - BorderRadius - .circular( - 25), - color: HexColor( - "#20A169"), - ), - child: AppText( - patient.startTime, - color: Colors.white, - fontSize: 1.5 * - SizeConfig - .textMultiplier, - textAlign: TextAlign - .center, - fontWeight: - FontWeight.bold, - ), - ) + height: 15, + width: 60, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(25), + color: HexColor("#20A169"), + ), + child: AppText( + patient.startTime, + color: Colors.white, + fontSize: 1.5 * SizeConfig.textMultiplier, + textAlign: TextAlign.center, + fontWeight: FontWeight.bold, + ), + ) : SizedBox(), SizedBox( width: 3.5, ), Container( child: AppText( - convertDateFormat2(patient.appointmentDate.toString()?? ''), - fontSize: 1.5 * - SizeConfig - .textMultiplier, - fontWeight: - FontWeight.bold, + convertDateFormat2( + patient.appointmentDate.toString() ?? ''), + fontSize: 1.5 * SizeConfig.textMultiplier, + fontWeight: FontWeight.bold, ), ), SizedBox( @@ -209,34 +183,23 @@ class PatientProfileHeaderNewDesign extends StatelessWidget { ), ), Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, + mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ RichText( text: TextSpan( style: TextStyle( - fontSize: 1.6 * - SizeConfig - .textMultiplier, + fontSize: 1.6 * SizeConfig.textMultiplier, color: Colors.black), children: [ new TextSpan( - text: - TranslationBase.of( - context) - .fileNumber, + text: TranslationBase.of(context).fileNumber, style: TextStyle( - fontSize: 12, - fontFamily: - 'Poppins')), + fontSize: 12, fontFamily: 'Poppins')), new TextSpan( - text: patient.patientId - .toString(), + text: patient.patientId.toString(), style: TextStyle( - fontWeight: - FontWeight.w700, - fontFamily: - 'Poppins', + fontWeight: FontWeight.w700, + fontFamily: 'Poppins', fontSize: 14)), ], ), @@ -244,32 +207,23 @@ class PatientProfileHeaderNewDesign extends StatelessWidget { Row( children: [ AppText( - patient.nationalityName ?? - patient.nationality, + patient.nationalityName ?? patient.nationality, fontWeight: FontWeight.bold, fontSize: 12, ), patient.nationality != null ? ClipRRect( - borderRadius: - BorderRadius - .circular( - 20.0), - child: Image.network( - patient.nationalityFlagURL, - height: 25, - width: 30, - errorBuilder: - (BuildContext - context, - Object - exception, - StackTrace - stackTrace) { - return Text( - 'No Image'); - }, - )) + borderRadius: BorderRadius.circular(20.0), + child: Image.network( + patient.nationalityFlagURL, + height: 25, + width: 30, + errorBuilder: (BuildContext context, + Object exception, + StackTrace stackTrace) { + return Text('No Image'); + }, + )) : SizedBox() ], ) @@ -279,26 +233,19 @@ class PatientProfileHeaderNewDesign extends StatelessWidget { child: RichText( text: new TextSpan( style: new TextStyle( - fontSize: 1.6 * - SizeConfig.textMultiplier, + fontSize: 1.6 * SizeConfig.textMultiplier, color: Colors.black, fontFamily: 'Poppins', ), children: [ new TextSpan( - text: TranslationBase.of( - context) - .age + - " : ", - style: TextStyle( - fontSize: 14)), + text: TranslationBase.of(context).age + " : ", + style: TextStyle(fontSize: 14)), new TextSpan( text: - "${DateUtils.getAgeByBirthday(patient.patientDetails != null ? patient.patientDetails.dateofBirth : patient.dateofBirth, context)}", + "${DateUtils.getAgeByBirthday(patient.patientDetails != null ? patient.patientDetails.dateofBirth : patient.dateofBirth, context)}", style: TextStyle( - fontWeight: - FontWeight.w700, - fontSize: 14)), + fontWeight: FontWeight.w700, fontSize: 14)), ], ), ), @@ -325,10 +272,10 @@ class PatientProfileHeaderNewDesign extends StatelessWidget { var date = new DateTime.fromMillisecondsSinceEpoch( int.parse(str.substring(startIndex + start.length, endIndex))); newDate = date.year.toString() + - "/" + - date.month.toString().padLeft(2, '0') + - "/" + - date.day.toString().padLeft(2, '0'); + "/" + + date.month.toString().padLeft(2, '0') + + "/" + + date.day.toString().padLeft(2, '0'); } return newDate.toString(); diff --git a/lib/widgets/patients/profile/patient_profile_header_with_appointment_card.dart b/lib/widgets/patients/profile/patient_profile_header_with_appointment_card.dart index 6f806c91..61cb7b52 100644 --- a/lib/widgets/patients/profile/patient_profile_header_with_appointment_card.dart +++ b/lib/widgets/patients/profile/patient_profile_header_with_appointment_card.dart @@ -41,6 +41,13 @@ class PatientProfileHeaderWhitAppointment extends StatelessWidget { @override Widget build(BuildContext context) { + int gender = 1; + if (patient.patientDetails != null) { + gender = patient.patientDetails.gender; + } else { + gender = patient.gender; + } + ProjectViewModel projectViewModel = Provider.of(context); return Container( padding: EdgeInsets.only( @@ -70,13 +77,13 @@ class PatientProfileHeaderWhitAppointment extends StatelessWidget { " " + Helpers.capitalize( patient.lastName)) : Helpers.capitalize(patient.patientDetails.fullName), - fontSize: SizeConfig.textMultiplier *2.5, + fontSize: SizeConfig.textMultiplier *2.2, fontWeight: FontWeight.bold, backGroundcolor: Colors.white, fontFamily: 'Poppins', ), ), - patient.patientDetails != null ? patient.patientDetails.gender == 1 : patient.gender == 1 + gender == 1 ? Icon( DoctorApp.male_2, color: Colors.blue, @@ -94,7 +101,7 @@ class PatientProfileHeaderWhitAppointment extends StatelessWidget { width: 60, height: 60, child: Image.asset( - patient.patientDetails != null ? patient.patientDetails.gender == 1 : patient.gender == 1 + gender == 1 ? 'assets/images/male_avatar.png' : 'assets/images/female_avatar.png', fit: BoxFit.cover, diff --git a/lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart b/lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart index e93ba37b..d63754df 100644 --- a/lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart +++ b/lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart @@ -42,6 +42,13 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre @override Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); + int gender = 1; + if (patient.patientDetails != null) { + gender = patient.patientDetails.gender; + } else { + gender = patient.gender; + } + return Container( padding: EdgeInsets.only( left: 0, right: 5, bottom: 5, top: 5), @@ -70,13 +77,13 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre " " + Helpers.capitalize( patient.lastName)) : Helpers.capitalize(patient.patientDetails.fullName), - fontSize: SizeConfig.textMultiplier *2.5, + fontSize: SizeConfig.textMultiplier *2.2, fontWeight: FontWeight.bold, backGroundcolor: Colors.white, fontFamily: 'Poppins', ), ), - patient.patientDetails != null ? patient.patientDetails.gender == 1 : patient.gender == 1 + gender == 1 ? Icon( DoctorApp.male_2, color: Colors.blue, @@ -94,7 +101,7 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre width: 60, height: 60, child: Image.asset( - patient.patientDetails != null ? patient.patientDetails.gender == 1 : patient.gender == 1 + gender == 1 ? 'assets/images/male_avatar.png' : 'assets/images/female_avatar.png', fit: BoxFit.cover,