Merge branch 'roaa2.8_addnewmedicationservice' into 'development'

add translations to pharmacy_intervention_screen, intervention_medication and...

See merge request Cloud_Solution/doctor_app_flutter!958
merge-requests/959/merge
Elham Ali 4 years ago
commit e6e5d8e03b

@ -20,6 +20,7 @@ const Map<String, Map<String, String>> localizedValues = {
"ar": "ليس لديك أي جدول" "ar": "ليس لديك أي جدول"
}, },
"verify": {"en": "VERIFY", "ar": "تحقق"}, "verify": {"en": "VERIFY", "ar": "تحقق"},
"pharmacy-intervention": {"en": "Pharmacy Intervention", "ar": "التدخل الصيدلاني"},
"referralDoctor": {"en": "Referral Doctor", "ar": "الطبيب المُحول إليه"}, "referralDoctor": {"en": "Referral Doctor", "ar": "الطبيب المُحول إليه"},
"referringClinic": {"en": "Referring Clinic", "ar": "العيادة المُحول إليها"}, "referringClinic": {"en": "Referring Clinic", "ar": "العيادة المُحول إليها"},
"frequency": {"en": "Frequency", "ar": "تكرر"}, "frequency": {"en": "Frequency", "ar": "تكرر"},
@ -537,6 +538,10 @@ const Map<String, Map<String, String>> localizedValues = {
"selectSeverity": {"en": "Select Severity", "ar": "حدد الخطورة"}, "selectSeverity": {"en": "Select Severity", "ar": "حدد الخطورة"},
"leaveCreated": {"en": "Leave has been created", "ar": "تم إنشاء الإجازة"}, "leaveCreated": {"en": "Leave has been created", "ar": "تم إنشاء الإجازة"},
"medications": {"en": "Medications", "ar": "الأدوية"}, "medications": {"en": "Medications", "ar": "الأدوية"},
"medication": {"en": "Medication", "ar": "الدواء"},
"createdByName": {"en": "Created By Name", "ar": "الدواء"},
"statusDescription": {"en": "Status Description", "ar": "وصف الحالة"},
"doctorComments": {"en": "Doctor Comments", "ar": "تعليقات الطبيب"},
"procedures": {"en": "Procedures", "ar": "الإجراءات"}, "procedures": {"en": "Procedures", "ar": "الإجراءات"},
"vitalSignEmptyMsg": { "vitalSignEmptyMsg": {
"en": "There is no vital signs for this patient", "en": "There is no vital signs for this patient",

@ -146,7 +146,7 @@ class _InterventionMedicationScreenState
CustomRow( CustomRow(
labelSize: 12, labelSize: 12,
valueSize: 12, valueSize: 12,
label: 'Description: ', label: TranslationBase.of(context).description,
value: model.allInterventionList[index].description, value: model.allInterventionList[index].description,
), ),
SizedBox( SizedBox(
@ -155,7 +155,7 @@ class _InterventionMedicationScreenState
CustomRow( CustomRow(
labelSize: 12, labelSize: 12,
valueSize: 12, valueSize: 12,
label: 'Medication: ', label: TranslationBase.of(context).medication,
value: model.allInterventionList[index].medication, value: model.allInterventionList[index].medication,
), ),
SizedBox( SizedBox(
@ -164,7 +164,7 @@ class _InterventionMedicationScreenState
CustomRow( CustomRow(
labelSize: 12, labelSize: 12,
valueSize: 12, valueSize: 12,
label: 'Doctor Comments: ', label: TranslationBase.of(context).doctorComments,
value: model.allInterventionList[index].doctorComments, value: model.allInterventionList[index].doctorComments,
), ),
SizedBox( SizedBox(
@ -173,7 +173,7 @@ class _InterventionMedicationScreenState
CustomRow( CustomRow(
labelSize: 12, labelSize: 12,
valueSize: 12, valueSize: 12,
label: 'Status Description: ', label: TranslationBase.of(context).statusDescription,
value: model.allInterventionList[index].statusDescription, value: model.allInterventionList[index].statusDescription,
), ),
], ],

@ -106,7 +106,7 @@ class _InterventionMedicationHistoryScreenState extends State<InterventionMedica
CustomRow( CustomRow(
labelSize: 12, labelSize: 12,
valueSize: 12, valueSize: 12,
label: 'Created By Name: ', label: TranslationBase.of(context).createdByName,
value: model.allInterventionHistoryList[index].createdByName, value: model.allInterventionHistoryList[index].createdByName,
), ),
], ],
@ -146,7 +146,7 @@ class _InterventionMedicationHistoryScreenState extends State<InterventionMedica
CustomRow( CustomRow(
labelSize: 12, labelSize: 12,
valueSize: 12, valueSize: 12,
label: 'Remark: ', label: TranslationBase.of(context).remarks,
value: model.allInterventionHistoryList[index].remark, value: model.allInterventionHistoryList[index].remark,
), ),
SizedBox( SizedBox(

@ -54,7 +54,7 @@ class _PharmacyInterventionScreenState
title: (OutPatientFilterType.Previous == title: (OutPatientFilterType.Previous ==
widget.outPatientFilterType) widget.outPatientFilterType)
? "" ? ""
: " Pharmacy Intervention", : TranslationBase.of(context).pharmacyIntervention,
), ),
SizedBox( SizedBox(
height: 10.0, height: 10.0,

@ -580,6 +580,9 @@ class TranslationBase {
String get addSickLeave => String get addSickLeave =>
localizedValues['add-sickleave'][locale.languageCode]; localizedValues['add-sickleave'][locale.languageCode];
String get pharmacyIntervention =>
localizedValues['pharmacy-intervention'][locale.languageCode];
String get add => localizedValues['add'][locale.languageCode]; String get add => localizedValues['add'][locale.languageCode];
String get addSickLeaverequest => String get addSickLeaverequest =>
@ -906,6 +909,14 @@ class TranslationBase {
String get medications => localizedValues['medications'][locale.languageCode]; String get medications => localizedValues['medications'][locale.languageCode];
String get medication => localizedValues['medication'][locale.languageCode];
String get doctorComments => localizedValues['doctorComments'][locale.languageCode];
String get statusDescription => localizedValues['statusDescription'][locale.languageCode];
String get createdByName => localizedValues['createdByName'][locale.languageCode];
String get procedures => localizedValues['procedures'][locale.languageCode]; String get procedures => localizedValues['procedures'][locale.languageCode];
String get chiefComplaints => String get chiefComplaints =>

Loading…
Cancel
Save