diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index d60de738..030f42cc 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -541,9 +541,9 @@ const Map> localizedValues = { 'physicalSystemExamination': {'en': "Physical/System Examination", 'ar':" الفحص البدني / النظام" }, 'searchExamination': {'en': "Search Examination", 'ar':"فحص البحث" }, 'addExamination': {'en': "Add Examination", 'ar':"اضافه" }, + 'doc': {'en': "Doc :", 'ar':" د: " }, 'patientNoDetailErrMsg': { 'en': "There is no detail for this patient", 'ar': "لا توجد تفاصيل لهذا المريض" }, - 'doc': {'en': "Doc :", 'ar':" د: " }, }; diff --git a/lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart b/lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart index 0a655231..83f2d68b 100644 --- a/lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart +++ b/lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart @@ -72,11 +72,11 @@ class _UcafDetailScreenState extends State { ), Container( margin: - EdgeInsets.symmetric(vertical: 16, horizontal: 16), + EdgeInsets.symmetric(vertical: 8, horizontal: 16), child: BorderedButton( TranslationBase.of(context).save, hasBorder: true, - vPadding: 16, + vPadding: 8, hPadding: 8, borderColor: HexColor("#B8382B"), backgroundColor: HexColor("#B8382B"), @@ -87,11 +87,11 @@ class _UcafDetailScreenState extends State { ), Container( margin: - EdgeInsets.only(left: 16, right: 16, top: 0, bottom: 16), + EdgeInsets.only(left: 16, right: 16, top: 0.0, bottom: 8), child: BorderedButton( TranslationBase.of(context).cancel, hasBorder: true, - vPadding: 16, + vPadding: 8, hPadding: 8, borderColor: Colors.white, backgroundColor: Colors.white, diff --git a/lib/screens/patients/profile/referral/refer-patient-screen.dart b/lib/screens/patients/profile/referral/refer-patient-screen.dart index e46ab6d5..62952108 100644 --- a/lib/screens/patients/profile/referral/refer-patient-screen.dart +++ b/lib/screens/patients/profile/referral/refer-patient-screen.dart @@ -40,11 +40,7 @@ class _PatientMakeReferralScreenState extends State { @override void initState() { super.initState(); - referToList = List(); - dynamic sameBranch = {"id": 1, "name": "Same Branch"}; - dynamic otherBranch = {"id": 2, "name": "Other Branch"}; - referToList.add(sameBranch); - referToList.add(otherBranch); + appointmentDate = DateTime.now(); } @@ -53,6 +49,12 @@ class _PatientMakeReferralScreenState extends State { final routeArgs = ModalRoute.of(context).settings.arguments as Map; patient = routeArgs['patient']; + referToList = List(); + dynamic sameBranch = {"id": 1, "name": TranslationBase.of(context).sameBranch}; + dynamic otherBranch = {"id": 2, "name": TranslationBase.of(context).otherBranch}; + referToList.add(sameBranch); + referToList.add(otherBranch); + final screenSize = MediaQuery.of(context).size; return BaseView( diff --git a/lib/util/translations_delegate_base.dart b/lib/util/translations_delegate_base.dart index 74b13864..c5723402 100644 --- a/lib/util/translations_delegate_base.dart +++ b/lib/util/translations_delegate_base.dart @@ -558,9 +558,8 @@ class TranslationBase { String get physicalSystemExamination => localizedValues['physicalSystemExamination'][locale.languageCode]; String get searchExamination => localizedValues['searchExamination'][locale.languageCode]; String get addExamination => localizedValues['addExamination'][locale.languageCode]; - String get patientNoDetailErrMsg => localizedValues['patientNoDetailErrMsg'][locale.languageCode]; String get doc => localizedValues['doc'][locale.languageCode]; - + String get patientNoDetailErrMsg => localizedValues['patientNoDetailErrMsg'][locale.languageCode]; } class TranslationBaseDelegate extends LocalizationsDelegate {