diff --git a/lib/screens/patients/profile/referral/referred-patient-screen.dart b/lib/screens/patients/profile/referral/referred-patient-screen.dart index fe40a7e6..e6719052 100644 --- a/lib/screens/patients/profile/referral/referred-patient-screen.dart +++ b/lib/screens/patients/profile/referral/referred-patient-screen.dart @@ -12,6 +12,7 @@ import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import '../../../../util/helpers.dart'; import '../../../../widgets/shared/errors/error_message.dart'; class ReferredPatientScreen extends StatefulWidget { @@ -87,22 +88,27 @@ class _ReferredPatientScreenState extends State { .getReferredPatientItem(index) .referralStatus, patientName: - "${model.getReferredPatientItem(index).firstName} ${model.getReferredPatientItem(index).middleName} ${model.getReferredPatientItem(index).lastName}", + Helpers.convertToTitleCase( + "${model.getReferredPatientItem(index).firstName} ${model.getReferredPatientItem(index).middleName} ${model.getReferredPatientItem(index).lastName}", + ), patientGender: model .getReferredPatientItem(index) .gender, - referredDate: AppDateUtils - .convertDateFromServerFormat( + referredDate: AppDateUtils.getDayMonthYearDateFormatted( + AppDateUtils.convertStringToDate( model .getReferredPatientItem(index) .referralDate, - "dd/MM/yyyy"), - referredTime: AppDateUtils + ), + isMonthShort: true + ), + referredTime: + AppDateUtils .convertDateFromServerFormat( model .getReferredPatientItem(index) .referralDate, - "hh:mm a"), + " hh:mm a"), patientID: "${model.getReferredPatientItem(index).patientID}", isSameBranch: model @@ -122,7 +128,9 @@ class _ReferredPatientScreenState extends State { .getReferredPatientItem(index) .doctorImageURL, referralDoctorName: - "${TranslationBase.of(context).dr} ${model.getReferredPatientItem(index).referralDoctorName}", + Helpers.convertToTitleCase( + "${TranslationBase.of(context).dr} ${model.getReferredPatientItem(index).referralDoctorName}", + ), clinicDescription: model .getReferredPatientItem(index) .referralClinicDescription, diff --git a/lib/widgets/patients/patient-referral-item-widget.dart b/lib/widgets/patients/patient-referral-item-widget.dart index 3935bb6b..ee0d0ffb 100644 --- a/lib/widgets/patients/patient-referral-item-widget.dart +++ b/lib/widgets/patients/patient-referral-item-widget.dart @@ -9,6 +9,9 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; +import '../../config/size_config.dart'; +import '../../util/helpers.dart'; + class PatientReferralItemWidget extends StatelessWidget { final String referralStatus; final int referralStatusCode; @@ -58,6 +61,7 @@ class PatientReferralItemWidget extends StatelessWidget { child: Column( children: [ Container( + height: MediaQuery.of(context).size.height * 0.33, child: CardWithBgWidget( bgColor: referralStatusCode == 1 ? Color(0xffc4aa54) @@ -81,8 +85,8 @@ class PatientReferralItemWidget extends StatelessWidget { AppText( referralStatus != null ? referralStatus : "", fontFamily: 'Poppins', - fontSize: 10.0, - letterSpacing: -0.4, + fontSize: 12.0, + letterSpacing: -0.48, fontWeight: FontWeight.w600, color: referralStatusCode == 1 ? Color(0xffc4aa54) @@ -104,6 +108,9 @@ class PatientReferralItemWidget extends StatelessWidget { ) ], ), + SizedBox( + height: 7, + ), Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -126,7 +133,7 @@ class PatientReferralItemWidget extends StatelessWidget { : Icon(DoctorApp.female_1, color: Color(0xffF0448D)), SizedBox( - width: 4, + width: 18, ), AppText( referredTime ?? "", @@ -134,7 +141,7 @@ class PatientReferralItemWidget extends StatelessWidget { fontWeight: FontWeight.w600, fontSize: 12.0, color: Color(0XFF575757), - letterSpacing: 0.48, + letterSpacing: -0.48, ) ], ), @@ -163,30 +170,34 @@ class PatientReferralItemWidget extends StatelessWidget { ], ), ), - Row( - children: [ - AppText( - nationality != null ? nationality : "", - fontWeight: FontWeight.w600, - color: Color(0xFF2E303A), - fontSize: 10.0, - letterSpacing: -0.4, - ), - nationalityFlag != null - ? ClipRRect( - borderRadius: BorderRadius.circular(20.0), - child: Image.network( - nationalityFlag, - height: 25, - width: 30, - errorBuilder: (BuildContext context, - Object exception, - StackTrace stackTrace) { - return Text(''); - }, - )) - : SizedBox() - ], + Padding( + padding: const EdgeInsets.only(right: 0.1), + child: Row( + children: [ + AppText( + nationality != null ? nationality : "", + fontWeight: FontWeight.w600, + color: Color(0xFF2E303A), + fontSize: 10.0, + letterSpacing: -0.4, + ), + nationalityFlag != null + ? ClipRRect( + borderRadius: BorderRadius.circular(20.0), + child: Image.network( + nationalityFlag, + height: 25, + width: 30, + errorBuilder: (BuildContext context, + Object exception, + StackTrace stackTrace) { + return Text(''); + }, + ) + ) + : SizedBox() + ], + ), ) ], ), @@ -198,7 +209,7 @@ class PatientReferralItemWidget extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - margin: EdgeInsets.only(left: 10, right: 0), + margin: EdgeInsets.only(left: 3, right: 0, top: 0.1), child: Image.asset( isReferral ? 'assets/images/patient/ic_ref_arrow_up.png' @@ -209,8 +220,8 @@ class PatientReferralItemWidget extends StatelessWidget { ), Container( margin: EdgeInsets.only( - left: 0, top: 25, right: 0, bottom: 0), - padding: EdgeInsets.only(left: 4.0, right: 4.0), + left: 0, top: 18, right: 0, bottom: 0), + padding: EdgeInsets.only(left: 4.0, right: 1.0), child: Container( width: 40, height: 40, @@ -219,8 +230,8 @@ class PatientReferralItemWidget extends StatelessWidget { borderRadius: BorderRadius.circular(20.0), child: Image.network( doctorAvatar, - height: 25, - width: 30, + height: 28, + width: 28, errorBuilder: (BuildContext context, Object exception, StackTrace stackTrace) { @@ -241,7 +252,7 @@ class PatientReferralItemWidget extends StatelessWidget { flex: 4, child: Container( margin: EdgeInsets.only( - left: 10, top: 25, right: 10, bottom: 0), + left: 10, top: 17, bottom: 0), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [