diff --git a/lib/screens/patients/profile/referral/referred-patient-screen.dart b/lib/screens/patients/profile/referral/referred-patient-screen.dart index c88a7699..84b0d4ca 100644 --- a/lib/screens/patients/profile/referral/referred-patient-screen.dart +++ b/lib/screens/patients/profile/referral/referred-patient-screen.dart @@ -1,4 +1,5 @@ import 'package:doctor_app_flutter/core/enum/PatientType.dart'; +import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/referral/referred_patient_detail_in-paint.dart'; @@ -48,16 +49,15 @@ class _ReferredPatientScreenState extends State { }, ), ), - model.listMyReferredPatientModel == null || - model.listMyReferredPatientModel.length == 0 - ? Center( + if (model.listMyReferredPatientModel == null || + model.listMyReferredPatientModel.length == 0) Center( child: ErrorMessage( error: TranslationBase.of(context).referralEmptyMsg, - )) - : Expanded( + )) else Expanded( child: SingleChildScrollView( // DoctorApplication.svc/REST/GtMyReferredPatient child: Container( + child: Column( children: [ ListView.builder( @@ -90,21 +90,25 @@ class _ReferredPatientScreenState extends State { patientGender: model .getReferredPatientItem(index) .gender, - referredDate: AppDateUtils.getDayMonthYearDateFormatted( - AppDateUtils.convertStringToDate( - model - .getReferredPatientItem(index) - .referralDate, + referredDate: model.state == ViewState.BusyLocal ?"": + AppDateUtils.getDayMonthYearDateFormatted( + patientType == PatientType.IN_PATIENT? + AppDateUtils.getDateTimeFromServerFormat( + model.getReferredPatientItem(index).referralDate, + ):AppDateUtils.getDateTimeFromString( + model.getReferredPatientItem(index).referralDate, ), isMonthShort: true ), - referredTime: - AppDateUtils - .convertDateFromServerFormat( - model - .getReferredPatientItem(index) - .referralDate, - "hh:mm a"), + referredTime:AppDateUtils.getHour( + patientType == PatientType.IN_PATIENT? + AppDateUtils.getDateTimeFromServerFormat( + model.getReferredPatientItem(index).referralDate, + ):AppDateUtils.getDateTimeFromString( + model.getReferredPatientItem(index).referralDate, + ), + // isMonthShort: true + ), patientID: "${model.getReferredPatientItem(index).patientID}", isSameBranch: model diff --git a/lib/widgets/patients/patient-referral-item-widget.dart b/lib/widgets/patients/patient-referral-item-widget.dart index 6641c253..a4649c72 100644 --- a/lib/widgets/patients/patient-referral-item-widget.dart +++ b/lib/widgets/patients/patient-referral-item-widget.dart @@ -92,13 +92,26 @@ class PatientReferralItemWidget extends StatelessWidget { ? Colors.red[700] : Colors.red[900], ), - AppText( - referredDate ?? "", - fontFamily: 'Poppins', - fontWeight: FontWeight.w600, - letterSpacing: -0.48, - fontSize: 12.0, - color: Color(0XFF28353E), + Column( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + AppText( + referredDate ?? "", + fontFamily: 'Poppins', + fontWeight: FontWeight.w600, + letterSpacing: -0.48, + fontSize: 12.0, + color: Color(0XFF28353E), + ), + AppText( + referredTime ?? "", + fontFamily: 'Poppins', + fontWeight: FontWeight.w600, + fontSize: 12.0, + color: Color(0XFF575757), + letterSpacing: -0.48, + ), + ], ) ], ), @@ -126,17 +139,6 @@ class PatientReferralItemWidget extends StatelessWidget { ) : Icon(DoctorApp.female_1, color: Color(0xffF0448D)), - SizedBox( - width: 50, - ), - AppText( - referredTime ?? "", - fontFamily: 'Poppins', - fontWeight: FontWeight.w600, - fontSize: 12.0, - color: Color(0XFF575757), - letterSpacing: -0.48, - ), ], ), Row(