Merge branch 'feature-ucaf' into 'development'

Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!222
merge-requests/223/merge
Mohammad Aljammal 5 years ago
commit cd23186f7b

@ -507,4 +507,6 @@ const Map<String, Map<String, String>> localizedValues = {
'medications': {'en': "Medications", 'ar':"الأدوية" }, 'medications': {'en': "Medications", 'ar':"الأدوية" },
'procedures': {'en': "Procedures", 'ar':"الإجراءات" }, 'procedures': {'en': "Procedures", 'ar':"الإجراءات" },
'vitalSignEmptyMsg': {'en': "There is no vital signs for this patient", '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" },
}; };

@ -15,7 +15,7 @@ class UcafDetailScreen extends StatefulWidget {
class _UcafDetailScreenState extends State<UcafDetailScreen> { class _UcafDetailScreenState extends State<UcafDetailScreen> {
int _activeTap = 1; int _activeTap = 0;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -45,6 +45,7 @@ class _UcafDetailScreenState extends State<UcafDetailScreen> {
SizedBox( SizedBox(
height: 16, height: 16,
), ),
getSelectedTreatmentStepItem(context),
], ],
), ),
), ),
@ -104,4 +105,8 @@ class _UcafDetailScreenState extends State<UcafDetailScreen> {
); );
} }
Widget getSelectedTreatmentStepItem(BuildContext _context) {
return Container();
}
} }

@ -27,7 +27,7 @@ class MyReferralPatientScreen extends StatelessWidget {
model.pendingReferral.length == 0 model.pendingReferral.length == 0
? Center( ? Center(
child: AppText( child: AppText(
TranslationBase.of(context).errorNoSchedule, TranslationBase.of(context).referralEmptyMsg,
color: Theme.of(context).errorColor, color: Theme.of(context).errorColor,
), ),
) )

@ -339,7 +339,10 @@ class _PatientMakeReferralScreenState extends State<PatientMakeReferralScreen> {
_selectedClinic['ClinicID'], _selectedClinic['ClinicID'],
_selectedDoctor['DoctorID'], _selectedDoctor['DoctorID'],
_remarksController.text) _remarksController.text)
.then((_) => Navigator.pop(context)); .then((_) {
DrAppToastMsg.showSuccesToast(TranslationBase.of(context).referralSuccessMsg);
Navigator.pop(context);
});
}, },
), ),
) )

@ -19,7 +19,7 @@ class ReferredPatientScreen extends StatelessWidget {
model.listMyReferredPatientModel.length == 0 model.listMyReferredPatientModel.length == 0
? Center( ? Center(
child: AppText( child: AppText(
TranslationBase.of(context).errorNoSchedule, TranslationBase.of(context).referralEmptyMsg,
color: Theme.of(context).errorColor, color: Theme.of(context).errorColor,
), ),
) )
@ -27,14 +27,14 @@ class ReferredPatientScreen extends StatelessWidget {
child: Container( child: Container(
child: Column( child: Column(
children: [ children: [
Container( /*Container(
height: 75, height: 75,
child: AppText( child: AppText(
"This is where upper view for avatar.. etc placed", "This is where upper view for avatar.. etc placed",
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
fontSize: 16, fontSize: 16,
), ),
), ),*/
const Divider( const Divider(
color: Color(0xffCCCCCC), color: Color(0xffCCCCCC),
height: 1, height: 1,

@ -533,6 +533,8 @@ class TranslationBase {
String get selectSeverity => String get selectSeverity =>
localizedValues['selectSeverity'][locale.languageCode]; localizedValues['selectSeverity'][locale.languageCode];
String get vitalSignEmptyMsg => localizedValues['vitalSignEmptyMsg'][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<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

Loading…
Cancel
Save