diff --git a/lib/widgets/patients/profile/patient-profile-app-bar.dart b/lib/widgets/patients/profile/patient-profile-app-bar.dart index d25b007f..2c7ee7ad 100644 --- a/lib/widgets/patients/profile/patient-profile-app-bar.dart +++ b/lib/widgets/patients/profile/patient-profile-app-bar.dart @@ -16,46 +16,10 @@ import 'large_avatar.dart'; class PatientProfileAppBar extends StatelessWidget with PreferredSizeWidget { final PatiantInformtion? patient; final PatientProfileAppBarModel? patientProfileAppBarModel; - final double? height; - final bool isInpatient; - final bool isDischargedPatient; - final bool isFromLiveCare; - - final String? doctorName; - final String? branch; - final DateTime? appointmentDate; - final String? profileUrl; - final String? invoiceNO; - final String? orderNo; - final bool? isPrescriptions; - final bool? isMedicalFile; - final String? episode; - final String? visitDate; - final String? clinic; - final bool? isAppointmentHeader; - final bool? isFromLabResult; - // final VoidCallback? onPressed; PatientProfileAppBar(this.patient, { this.patientProfileAppBarModel, - this.isFromLabResult = false, - // this.onPressed, - this.height=0, - this.isInpatient = false, - this.isDischargedPatient = false, - this.isFromLiveCare = false, - this.doctorName, - this.branch, - this.appointmentDate, - this.profileUrl, - this.invoiceNO, - this.orderNo, - this.isPrescriptions=false, - this.isMedicalFile =false, - this.episode, - this.visitDate, - this.clinic, - this.isAppointmentHeader= false}); + }); PatiantInformtion? localPatient; @override @@ -284,11 +248,11 @@ class PatientProfileAppBar extends StatelessWidget with PreferredSizeWidget { HeaderRow( label: TranslationBase.of(context).age! + " : ", value: - "${AppDateUtils.getAgeByBirthday(localPatient!.patientDetails != null ? localPatient!.patientDetails!.dateofBirth ?? "" : localPatient!.dateofBirth ?? "", context, isServerFormat: !isFromLiveCare)}", + "${AppDateUtils.getAgeByBirthday(localPatient!.patientDetails != null ? localPatient!.patientDetails!.dateofBirth ?? "" : localPatient!.dateofBirth ?? "", context, isServerFormat: !patientProfileAppBarModel!.isFromLiveCare!)}", ), if (localPatient!.appointmentDate != null && localPatient!.appointmentDate!.isNotEmpty && - !isFromLabResult!) + !patientProfileAppBarModel!.isFromLabResult!) HeaderRow( label: TranslationBase.of(context).appointmentDate! + " : ", @@ -320,7 +284,7 @@ class PatientProfileAppBar extends StatelessWidget with PreferredSizeWidget { if (localPatient!.admissionDate != null) HeaderRow( label: "${TranslationBase.of(context).numOfDays}: ", - value: isDischargedPatient && + value: patientProfileAppBarModel!.isDischargedPatient! && localPatient!.dischargeDate != null ? "${AppDateUtils.getDateTimeFromServerFormat(localPatient!.dischargeDate!).difference(AppDateUtils.getDateTimeFromServerFormat(localPatient!.admissionDate!)).inDays + 1}" : "${DateTime.now().difference(AppDateUtils.getDateTimeFromServerFormat(localPatient!.admissionDate!)).inDays + 1}", @@ -374,7 +338,7 @@ class PatientProfileAppBar extends StatelessWidget with PreferredSizeWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ AppText( - '${TranslationBase.of(context).dr}$doctorName', + '${TranslationBase.of(context).dr}${patientProfileAppBarModel!.doctorName}', color: Color(0xFF2E303A), fontWeight: FontWeight.w700, fontSize: SizeConfig @@ -382,39 +346,39 @@ class PatientProfileAppBar extends StatelessWidget with PreferredSizeWidget { 3.5, isCopyable: true, ), - if (orderNo != null && !isPrescriptions!) + if (patientProfileAppBarModel!.orderNo != null && !(patientProfileAppBarModel!.isPrescriptions!)) HeaderRow( label: 'Order No: ', - value: orderNo ?? '', + value: patientProfileAppBarModel!.orderNo ?? '', ), - if (invoiceNO != null && !isPrescriptions!) + if (patientProfileAppBarModel!.invoiceNO != null && !(patientProfileAppBarModel!.isPrescriptions!)) HeaderRow( label: 'Invoice: ', - value: invoiceNO ?? "", + value: patientProfileAppBarModel!.invoiceNO ?? "", ), - if (branch != null) + if (patientProfileAppBarModel!.branch != null) HeaderRow( label: 'Branch: ', - value: branch ?? '', + value: patientProfileAppBarModel!.branch ?? '', ), - if (clinic != null) + if (patientProfileAppBarModel!.clinic != null) HeaderRow( label: 'Clinic: ', - value: clinic ?? '', + value: patientProfileAppBarModel!.clinic ?? '', ), - if (isMedicalFile! && episode != null) + if (patientProfileAppBarModel!.isMedicalFile! && patientProfileAppBarModel!.episode != null) HeaderRow( label: 'Episode: ', - value: episode ?? '', + value: patientProfileAppBarModel!.episode ?? '', ), - if (isMedicalFile! && visitDate != null) + if (patientProfileAppBarModel!.isMedicalFile! && patientProfileAppBarModel!.visitDate != null) HeaderRow( label: 'Visit Date: ', - value: visitDate ?? '', + value: patientProfileAppBarModel!.visitDate ?? '', ), - if (!isMedicalFile!) + if (!(patientProfileAppBarModel!.isMedicalFile!)) HeaderRow( - label: !isPrescriptions! + label: !(patientProfileAppBarModel!.isPrescriptions!) ? 'Result Date:' : 'Prescriptions Date ', value: AppDateUtils.getDayMonthYearDateFormatted( @@ -460,8 +424,8 @@ class PatientProfileAppBar extends StatelessWidget with PreferredSizeWidget { : 200 : patientProfileAppBarModel!.patient!.admissionDate != null ? patientProfileAppBarModel!.isFromLabResult! - ? 190 - : 170 + ? 210 + : 200 : patientProfileAppBarModel!.isDischargedPatient! ? 240 : 130)