diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 1dc0216e..ef5aaaa5 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -507,4 +507,6 @@ const Map> localizedValues = { 'medications': {'en': "Medications", 'ar':"الأدوية" }, 'procedures': {'en': "Procedures", 'ar':"الإجراءات" }, 'vitalSignEmptyMsg': {'en': "There is no vital signs for this patient", 'ar':"لا توجد علامات حيوية لهذا المريض" }, + 'referralEmptyMsg': {'en': "There is no referral data", 'ar':"لا توجد بيانات إحالة" }, + 'referralSuccessMsg': {'en': "You make referral successfully", 'ar':"You make referral successfully" }, }; diff --git a/lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart b/lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart index 7fc16bfb..302b77a8 100644 --- a/lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart +++ b/lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart @@ -15,7 +15,7 @@ class UcafDetailScreen extends StatefulWidget { class _UcafDetailScreenState extends State { - int _activeTap = 1; + int _activeTap = 0; @override Widget build(BuildContext context) { @@ -45,6 +45,7 @@ class _UcafDetailScreenState extends State { SizedBox( height: 16, ), + getSelectedTreatmentStepItem(context), ], ), ), @@ -104,4 +105,8 @@ class _UcafDetailScreenState extends State { ); } + Widget getSelectedTreatmentStepItem(BuildContext _context) { + return Container(); + } + } diff --git a/lib/screens/patients/profile/referral/my-referral-patient-screen.dart b/lib/screens/patients/profile/referral/my-referral-patient-screen.dart index 7f11f35f..311e2f12 100644 --- a/lib/screens/patients/profile/referral/my-referral-patient-screen.dart +++ b/lib/screens/patients/profile/referral/my-referral-patient-screen.dart @@ -27,7 +27,7 @@ class MyReferralPatientScreen extends StatelessWidget { model.pendingReferral.length == 0 ? Center( child: AppText( - TranslationBase.of(context).errorNoSchedule, + TranslationBase.of(context).referralEmptyMsg, color: Theme.of(context).errorColor, ), ) diff --git a/lib/screens/patients/profile/referral/refer-patient-screen.dart b/lib/screens/patients/profile/referral/refer-patient-screen.dart index 1ffd7150..69540176 100644 --- a/lib/screens/patients/profile/referral/refer-patient-screen.dart +++ b/lib/screens/patients/profile/referral/refer-patient-screen.dart @@ -339,7 +339,10 @@ class _PatientMakeReferralScreenState extends State { _selectedClinic['ClinicID'], _selectedDoctor['DoctorID'], _remarksController.text) - .then((_) => Navigator.pop(context)); + .then((_) { + DrAppToastMsg.showSuccesToast(TranslationBase.of(context).referralSuccessMsg); + Navigator.pop(context); + }); }, ), ) diff --git a/lib/screens/patients/profile/referral/referred-patient-screen.dart b/lib/screens/patients/profile/referral/referred-patient-screen.dart index 1ba1f572..c1880908 100644 --- a/lib/screens/patients/profile/referral/referred-patient-screen.dart +++ b/lib/screens/patients/profile/referral/referred-patient-screen.dart @@ -19,7 +19,7 @@ class ReferredPatientScreen extends StatelessWidget { model.listMyReferredPatientModel.length == 0 ? Center( child: AppText( - TranslationBase.of(context).errorNoSchedule, + TranslationBase.of(context).referralEmptyMsg, color: Theme.of(context).errorColor, ), ) @@ -27,14 +27,14 @@ class ReferredPatientScreen extends StatelessWidget { child: Container( child: Column( children: [ - Container( + /*Container( height: 75, child: AppText( "This is where upper view for avatar.. etc placed", fontWeight: FontWeight.normal, fontSize: 16, ), - ), + ),*/ const Divider( color: Color(0xffCCCCCC), height: 1, diff --git a/lib/util/translations_delegate_base.dart b/lib/util/translations_delegate_base.dart index 7070d252..5dee728a 100644 --- a/lib/util/translations_delegate_base.dart +++ b/lib/util/translations_delegate_base.dart @@ -533,6 +533,8 @@ class TranslationBase { String get selectSeverity => localizedValues['selectSeverity'][locale.languageCode]; String get vitalSignEmptyMsg => localizedValues['vitalSignEmptyMsg'][locale.languageCode]; + String get referralEmptyMsg => localizedValues['referralEmptyMsg'][locale.languageCode]; + String get referralSuccessMsg => localizedValues['referralSuccessMsg'][locale.languageCode]; } class TranslationBaseDelegate extends LocalizationsDelegate {