Merge branch 'main' into O3-3945

openmrs · Sep 9, 2024 · f7cfc6b · f7cfc6b
2 parents 350d8c2 + bac5096
commit f7cfc6b
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 11 deletions.
diff --git a/packages/esm-patient-medications-app/src/active-medications/active-medications.test.tsx b/packages/esm-patient-medications-app/src/active-medications/active-medications.test.tsx
@@ -90,7 +90,7 @@ describe('ActiveMedications', () => {
 
     const expectedTableRows = [
       /14-Aug-2023 Admin User Acetaminophen 325 mg — 325mg — tablet DOSE 2 tablet — oral — twice daily — indefinite duration — take it sometimes INDICATION Bad boo-boo/,
-      /14-Aug-2023 Admin User Acetaminophen 325 mg — 325mg — tablet DOSE 2 tablet — oral — twice daily — indefinite duration INDICATION No good — END DATE 14-Aug-2023/,
+      /14-Aug-2023 Admin User Acetaminophen 325 mg — 325mg — tablet DOSE 2 tablet — oral — twice daily — indefinite duration INDICATION No good — DISCONTINUED DATE 14-Aug-2023/,
       /14-Aug-2023 Admin User Sulfacetamide 0.1 — 10% DOSE 1 application — for {{duration}} weeks — REFILLS 1 — apply it INDICATION Pain — QUANTITY 8 Application/,
       /14-Aug-2023 Admin User Aspirin 162.5mg — 162.5mg — tablet DOSE 1 tablet — oral — once daily — for {{duration}} days INDICATION Heart — QUANTITY 30 Tablet/,
     ];

diff --git a/packages/esm-patient-medications-app/src/components/medications-details-table.component.tsx b/packages/esm-patient-medications-app/src/components/medications-details-table.component.tsx
@@ -142,7 +142,9 @@ const MedicationsDetailsTable: React.FC<ActiveMedicationsProps> = ({
             ) : null}
             {medication.dateStopped ? (
               <span>
-                <span className={styles.label01}> &mdash; {t('endDate', 'End date').toUpperCase()}</span>{' '}
+                <span className={styles.label01}>
+                  &mdash; {t('discontinuedDate', 'Discontinued date').toUpperCase()}
+                </span>
                 {formatDate(new Date(medication.dateStopped))}
               </span>
             ) : null}

diff --git a/packages/esm-patient-medications-app/translations/am.json b/packages/esm-patient-medications-app/translations/am.json
@@ -27,7 +27,6 @@
   "editDoseComboBoxTitle": "Dose",
   "editFrequencyComboBoxTitle": "Frequency",
   "editRouteComboBoxTitle": "Route",
-  "endDate": "End date",
   "error": "Error",
   "errorFetchingDrugOrderTemplates": "Error fetching drug order templates",
   "errorFetchingDrugResults": "Error fetching results for \"{{searchTerm}}\"",

diff --git a/packages/esm-patient-medications-app/translations/ar.json b/packages/esm-patient-medications-app/translations/ar.json
@@ -27,7 +27,6 @@
   "editDoseComboBoxTitle": "الجرعة",
   "editFrequencyComboBoxTitle": "التكرار",
   "editRouteComboBoxTitle": "الطريقة",
-  "endDate": "تاريخ الانتهاء",
   "error": "خطأ",
   "errorFetchingDrugOrderTemplates": "خطأ في جلب قوالب طلب الدواء",
   "errorFetchingDrugResults": "خطأ في جلب النتائج لـ \"{{searchTerm}}\"",

diff --git a/packages/esm-patient-medications-app/translations/en.json b/packages/esm-patient-medications-app/translations/en.json
@@ -11,6 +11,7 @@
   "directlyAddToBasket": "Add to basket",
   "discard": "Discard",
   "discontinue": "Discontinue",
+  "discontinuedDate": "Discontinued date",
   "dispensingInformation": "3. Dispensing instructions",
   "dosageInstructions": "1. Dosage instructions",
   "dosageRequiredErrorMessage": "A dosage is required",
@@ -27,7 +28,6 @@
   "editDoseComboBoxTitle": "Dose",
   "editFrequencyComboBoxTitle": "Frequency",
   "editRouteComboBoxTitle": "Route",
-  "endDate": "End date",
   "error": "Error",
   "errorFetchingDrugOrderTemplates": "Error fetching drug order templates",
   "errorFetchingDrugResults": "Error fetching results for \"{{searchTerm}}\"",

diff --git a/packages/esm-patient-medications-app/translations/es.json b/packages/esm-patient-medications-app/translations/es.json
@@ -27,7 +27,6 @@
   "editDoseComboBoxTitle": "Dosis",
   "editFrequencyComboBoxTitle": "Frecuencia",
   "editRouteComboBoxTitle": "Ruta",
-  "endDate": "Fecha de finalización",
   "error": "Error",
   "errorFetchingDrugOrderTemplates": "Error en la obtención de plantillas de pedidos de medicamentos",
   "errorFetchingDrugResults": "Error al buscar resultados para \"{{searchTerm}}\"",

diff --git a/packages/esm-patient-medications-app/translations/fr.json b/packages/esm-patient-medications-app/translations/fr.json
@@ -27,7 +27,6 @@
   "editDoseComboBoxTitle": "Dose",
   "editFrequencyComboBoxTitle": "Frequency",
   "editRouteComboBoxTitle": "Route",
-  "endDate": "End date",
   "error": "Error",
   "errorFetchingDrugOrderTemplates": "Error fetching drug order templates",
   "errorFetchingDrugResults": "Error fetching results for \"{{searchTerm}}\"",

diff --git a/packages/esm-patient-medications-app/translations/he.json b/packages/esm-patient-medications-app/translations/he.json
@@ -27,7 +27,6 @@
   "editDoseComboBoxTitle": "מינון",
   "editFrequencyComboBoxTitle": "תדירות",
   "editRouteComboBoxTitle": "דרך",
-  "endDate": "תאריך סיום",
   "error": "שגיאה",
   "errorFetchingDrugOrderTemplates": "שגיאה בקבלת תבניות הזמנת תרופות",
   "errorFetchingDrugResults": "שגיאה בקבלת תוצאות עבור \"{{searchTerm}}\"",

diff --git a/packages/esm-patient-medications-app/translations/km.json b/packages/esm-patient-medications-app/translations/km.json
@@ -27,7 +27,6 @@
   "editDoseComboBoxTitle": "បញ្ចូលកំរិតប្រើប្រាស់",
   "editFrequencyComboBoxTitle": "បញ្ចូលភាពញឹកញាប់នៃការមកពិនិត្យជំងឺ",
   "editRouteComboBoxTitle": "បញ្ចូល ផ្លូវបញ្ចូលថ្នាំ",
-  "endDate": "កាលបរិច្ឆេទបញ្ចប់",
   "error": "កំហុស/លំអៀង",
   "errorFetchingDrugOrderTemplates": "មានបញ្ហាក្នុងការទាញយកទម្រង់គំរូវេជ្ជបញ្ជាសម្រាប់ឱសថ",
   "errorFetchingDrugResults": "មានបញ្ហាក្នុងការទាញយកលទ្ធផលសម្រាប់ \"{{searchTerm}}\"",

diff --git a/packages/esm-patient-medications-app/translations/zh.json b/packages/esm-patient-medications-app/translations/zh.json
@@ -27,7 +27,6 @@
   "editDoseComboBoxTitle": "剂量",
   "editFrequencyComboBoxTitle": "频率",
   "editRouteComboBoxTitle": "途径",
-  "endDate": "结束日期",
   "error": "错误",
   "errorFetchingDrugOrderTemplates": "获取药物医嘱模板时出现错误",
   "errorFetchingDrugResults": "获取“{{searchTerm}}”的结果时出现错误",

diff --git a/packages/esm-patient-medications-app/translations/zh_CN.json b/packages/esm-patient-medications-app/translations/zh_CN.json
@@ -27,7 +27,6 @@
   "editDoseComboBoxTitle": "剂量",
   "editFrequencyComboBoxTitle": "频率",
   "editRouteComboBoxTitle": "途径",
-  "endDate": "结束日期",
   "error": "错误",
   "errorFetchingDrugOrderTemplates": "获取药物医嘱模板时出现错误",
   "errorFetchingDrugResults": "获取“{{searchTerm}}”的结果时出现错误",