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

lib/config/localized_values.dart

@@ -20,6 +20,7 @@ const Map<String, Map<String, String>> localizedValues = {
     "ar": "ليس لديك أي جدول"
   },
   "verify": {"en": "VERIFY", "ar": "تحقق"},
+  "pharmacy-intervention": {"en": "Pharmacy Intervention", "ar": "التدخل الصيدلاني"},
   "referralDoctor": {"en": "Referral Doctor", "ar": "الطبيب المُحول إليه"},
   "referringClinic": {"en": "Referring Clinic", "ar": "العيادة المُحول إليها"},
   "frequency": {"en": "Frequency", "ar": "تكرر"},
@@ -537,6 +538,10 @@ const Map<String, Map<String, String>> localizedValues = {
   "selectSeverity": {"en": "Select Severity", "ar": "حدد الخطورة"},
   "leaveCreated": {"en": "Leave has been created", "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": "الإجراءات"},
   "vitalSignEmptyMsg": {
     "en": "There is no vital signs for this patient",

lib/screens/patients/profile/pharmacy-intervention/intervention_medication.dart

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

lib/screens/patients/profile/pharmacy-intervention/intervention_medication_history_screen.dart

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

lib/screens/patients/profile/pharmacy-intervention/pharmacy_intervention_screen.dart

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

lib/util/translations_delegate_base.dart

@@ -580,6 +580,9 @@ class TranslationBase {
   String get addSickLeave =>
       localizedValues['add-sickleave'][locale.languageCode];
 
+  String get pharmacyIntervention =>
+      localizedValues['pharmacy-intervention'][locale.languageCode];
+
   String get add => localizedValues['add'][locale.languageCode];
 
   String get addSickLeaverequest =>
@@ -906,6 +909,14 @@ class TranslationBase {
 
   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 chiefComplaints =>