From 2d52058a943f153a546ebd39f9d3f974e3571b73 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Fri, 23 Apr 2021 23:51:58 +0300 Subject: [PATCH] done replay onReferral Patient --- .../referral/AddReplayOnReferralPatient.dart | 5 +- .../referred_patient_detail_in-paint.dart | 47 +++++++++---------- 2 files changed, 23 insertions(+), 29 deletions(-) diff --git a/lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart b/lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart index 1a90b708..fd5ec6bb 100644 --- a/lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart +++ b/lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart @@ -131,9 +131,8 @@ class _AddReplayOnReferralPatientState extends State Navigator.of(context).pop(); Navigator.of(context).pop(); } - } - { - Helpers.showErrorToast("You cant add only spaces"); + }else { + Helpers.showErrorToast("You can't add empty replay"); setState(() { isSubmitted = false; }); diff --git a/lib/screens/patients/profile/referral/referred_patient_detail_in-paint.dart b/lib/screens/patients/profile/referral/referred_patient_detail_in-paint.dart index ce1c8bdd..de13d096 100644 --- a/lib/screens/patients/profile/referral/referred_patient_detail_in-paint.dart +++ b/lib/screens/patients/profile/referral/referred_patient_detail_in-paint.dart @@ -148,16 +148,14 @@ class ReferredPatientDetailScreen extends StatelessWidget { .fileNumber, fontFamily: 'Poppins', fontWeight: FontWeight.w600, - fontSize: - 1.7 * SizeConfig.textMultiplier, + fontSize: 1.7 * SizeConfig.textMultiplier, color: Color(0XFF575757), ), AppText( "${referredPatient.patientID}", fontFamily: 'Poppins', fontWeight: FontWeight.w700, - fontSize: - 1.8 * SizeConfig.textMultiplier, + fontSize:14, color: Color(0XFF2E303A), ), ], @@ -193,14 +191,15 @@ class ReferredPatientDetailScreen extends StatelessWidget { SizeConfig.textMultiplier, color: Color(0XFF575757), ), - AppText( - referredPatient - .referralClinicDescription, - fontFamily: 'Poppins', - fontWeight: FontWeight.w700, - fontSize: 1.8 * - SizeConfig.textMultiplier, - color: Color(0XFF2E303A), + Expanded( + child: AppText( + referredPatient + .referralClinicDescription, + fontFamily: 'Poppins', + fontWeight: FontWeight.w700, + fontSize: 13, + color: Color(0XFF2E303A), + ), ), ], ), @@ -226,8 +225,7 @@ class ReferredPatientDetailScreen extends StatelessWidget { .frequencyDescription, fontFamily: 'Poppins', fontWeight: FontWeight.w700, - fontSize: 1.8 * - SizeConfig.textMultiplier, + fontSize: 14, color: Color(0XFF2E303A), ), ), @@ -282,15 +280,12 @@ class ReferredPatientDetailScreen extends StatelessWidget { fontSize: 1.7 * SizeConfig.textMultiplier, color: Color(0XFF575757), ), - Expanded( - child: AppText( - referredPatient.priorityDescription, - fontFamily: 'Poppins', - fontWeight: FontWeight.w700, - fontSize: - 1.8 * SizeConfig.textMultiplier, - color: Color(0XFF2E303A), - ), + AppText( + referredPatient.priorityDescription, + fontFamily: 'Poppins', + fontWeight: FontWeight.w700, + fontSize:14, + color: Color(0XFF2E303A), ), ], ), @@ -387,8 +382,7 @@ class ReferredPatientDetailScreen extends StatelessWidget { color: Colors.black, ), AppText( - referredPatient - .referralClinicDescription, + referredPatient.referralClinicDescription, fontFamily: 'Poppins', fontWeight: FontWeight.w700, fontSize: 1.3 * @@ -486,7 +480,7 @@ class ReferredPatientDetailScreen extends StatelessWidget { color: Color(0XFF2E303A), ), AppText( - referredPatient.referredDoctorRemarks, + referredPatient.referredDoctorRemarks.isNotEmpty? referredPatient.referredDoctorRemarks:" Not Replied yet", fontFamily: 'Poppins', fontWeight: FontWeight.w600, fontSize: 1.6 * SizeConfig.textMultiplier, @@ -502,6 +496,7 @@ class ReferredPatientDetailScreen extends StatelessWidget { ), ), ), + if(referredPatient.referralStatus ==1) Container( margin: EdgeInsets.symmetric(horizontal: 16, vertical: 16), child: AppButton(