@openmrs/esm-generic-patient-widgets-app 11.3.1-pre.9054 → 11.3.1-pre.9066

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2"},"extensions":[{"name":"obs-by-encounter-widget","component":"switchableObs","online":true,"offline":true,"meta":{"fullWidth":false}},{"name":"obs-table-horizontal-widget-small","component":"obsTableHorizontal","online":true,"offline":true,"meta":{"fullWidth":false}},{"name":"obs-table-horizontal-widget","component":"obsTableHorizontal","online":true,"offline":true,"meta":{"fullWidth":true}}],"version":"11.3.1-pre.9054"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2"},"extensions":[{"name":"obs-by-encounter-widget","component":"switchableObs","online":true,"offline":true,"meta":{"fullWidth":false}},{"name":"obs-table-horizontal-widget-small","component":"obsTableHorizontal","online":true,"offline":true,"meta":{"fullWidth":false}},{"name":"obs-table-horizontal-widget","component":"obsTableHorizontal","online":true,"offline":true,"meta":{"fullWidth":true}}],"version":"11.3.1-pre.9066"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-generic-patient-widgets-app",
-  "version": "11.3.1-pre.9054",
+  "version": "11.3.1-pre.9066",
   "license": "MPL-2.0",
   "description": "Generic widgets for the patient chart",
   "browser": "dist/openmrs-esm-generic-patient-widgets-app.js",
@@ -52,7 +52,7 @@
     "swr": "2.x"
   },
   "devDependencies": {
-    "@openmrs/esm-patient-common-lib": "11.3.1-pre.9054",
+    "@openmrs/esm-patient-common-lib": "11.3.1-pre.9066",
     "webpack": "^5.99.9"
   },
   "stableVersion": "11.3.0"

package/src/obs-graph/obs-graph.component.tsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useMemo, useState } from 'react';
 import classNames from 'classnames';
 import { Tab, TabListVertical, TabPanel, TabPanels, TabsVertical } from '@carbon/react';
-import { LineChart, ScaleTypes } from '@carbon/charts-react';
+import { LineChart, type LineChartOptions, ScaleTypes } from '@carbon/charts-react';
 import { ExtensionSlot, formatDate, useConfig } from '@openmrs/esm-framework';
 import { type ConfigObjectSwitchable } from '../config-schema-obs-switchable';
 import { useObs } from '../resources/useObs';
@@ -73,7 +73,7 @@ const ObsGraph: React.FC<ObsGraphProps> = ({ patientUuid }) => {
           group: conceptForObs[obs.conceptUuid].label
             ? t(conceptForObs[obs.conceptUuid].label, conceptForObs[obs.conceptUuid].label)
             : obs.code.text,
-          key: formatDate(new Date(obs.effectiveDateTime), { year: true, time: false }),
+          key: new Date(obs.effectiveDateTime),
           value: obs.valueQuantity.value,
         }));
 
@@ -88,12 +88,15 @@ const ObsGraph: React.FC<ObsGraphProps> = ({ patientUuid }) => {
 
   const chartColors = Object.fromEntries(selectedMenuItem.concepts.map((d) => [d.label, d.color]));
 
-  const chartOptions = {
+  const chartOptions: LineChartOptions = {
     axes: {
       bottom: {
-        title: 'Date',
+        title: t('date', 'Date'),
         mapsTo: 'key',
-        scaleType: ScaleTypes.LABELS,
+        scaleType: ScaleTypes.TIME,
+        ticks: {
+          formatter: (value: Date) => formatDate(value, { year: true, time: false }),
+        },
       },
       left: {
         mapsTo: 'value',
@@ -108,6 +111,15 @@ const ObsGraph: React.FC<ObsGraphProps> = ({ patientUuid }) => {
     color: {
       scale: chartColors,
     },
+    tooltip: {
+      alwaysShowRulerTooltip: true,
+      showTotal: false,
+      valueFormatter: (value: any, label: string) =>
+        label == t('date', 'Date') ? formatDate(value, { year: true, time: true }) : value.toString(),
+      truncation: {
+        numCharacter: 40,
+      },
+    },
     height: '400px',
   };
 

package/src/obs-switchable/obs-switchable.test.tsx

@@ -127,8 +127,8 @@ describe('ObsSwitchable', () => {
       1,
       expect.objectContaining({
         data: [
-          { group: 'Tallitude', key: '01-Jan-2021', value: 180 },
-          { group: 'Tallitude', key: '01-Feb-2021', value: 182 },
+          { group: 'Tallitude', key: new Date('2021-01-01T00:00:00.000Z'), value: 180 },
+          { group: 'Tallitude', key: new Date('2021-02-01T00:00:00.000Z'), value: 182 },
         ],
         options: expect.any(Object),
       }),
@@ -139,8 +139,8 @@ describe('ObsSwitchable', () => {
       2,
       expect.objectContaining({
         data: [
-          { group: 'Weight', key: '01-Jan-2021', value: 70 },
-          { group: 'Weight', key: '01-Feb-2021', value: 72 },
+          { group: 'Weight', key: new Date('2021-01-01T00:00:00.000Z'), value: 70 },
+          { group: 'Weight', key: new Date('2021-02-01T00:00:00.000Z'), value: 72 },
         ],
         options: expect.any(Object),
       }),
@@ -158,7 +158,7 @@ describe('ObsSwitchable', () => {
     expect(mockLineChart).toHaveBeenNthCalledWith(
       3,
       expect.objectContaining({
-        data: [{ group: 'Power Level', key: '01-Jan-2021', value: 9001 }],
+        data: [{ group: 'Power Level', key: new Date('2021-01-01T00:00:00.000Z'), value: 9001 }],
         options: expect.any(Object),
       }),
       {},
@@ -189,8 +189,8 @@ describe('ObsSwitchable', () => {
       1,
       expect.objectContaining({
         data: [
-          { group: 'Height', key: '01-Jan-2021', value: 180 },
-          { group: 'Height', key: '01-Feb-2021', value: 182 },
+          { group: 'Height', key: new Date('2021-01-01T00:00:00.000Z'), value: 180 },
+          { group: 'Height', key: new Date('2021-02-01T00:00:00.000Z'), value: 182 },
         ],
         options: expect.any(Object),
       }),
@@ -225,7 +225,7 @@ describe('ObsSwitchable', () => {
     expect(mockLineChart).toHaveBeenNthCalledWith(
       1,
       expect.objectContaining({
-        data: [{ group: 'Power Level', key: '01-Jan-2021', value: 9001 }],
+        data: [{ group: 'Power Level', key: new Date('2021-01-01T00:00:00.000Z'), value: 9001 }],
         options: expect.any(Object),
       }),
       {},
@@ -235,10 +235,10 @@ describe('ObsSwitchable', () => {
       2,
       expect.objectContaining({
         data: [
-          { group: 'Height', key: '01-Jan-2021', value: 180 },
-          { group: 'Height', key: '01-Feb-2021', value: 182 },
-          { group: 'Weight', key: '01-Jan-2021', value: 70 },
-          { group: 'Weight', key: '01-Feb-2021', value: 72 },
+          { group: 'Height', key: new Date('2021-01-01T00:00:00.000Z'), value: 180 },
+          { group: 'Height', key: new Date('2021-02-01T00:00:00.000Z'), value: 182 },
+          { group: 'Weight', key: new Date('2021-01-01T00:00:00.000Z'), value: 70 },
+          { group: 'Weight', key: new Date('2021-02-01T00:00:00.000Z'), value: 72 },
         ],
         options: expect.any(Object),
       }),
@@ -266,7 +266,7 @@ describe('ObsSwitchable', () => {
 
     expect(mockLineChart).toHaveBeenCalledWith(
       expect.objectContaining({
-        data: [{ group: 'Power Level', key: '01-Jan-2021', value: 9001 }],
+        data: [{ group: 'Power Level', key: new Date('2021-01-01T00:00:00.000Z'), value: 9001 }],
         options: expect.any(Object),
       }),
       {},

package/translations/am.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/ar.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "التاريخ والوقت",
   "encounterType": "نوع اللقاء"
 }

package/translations/ar_SY.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/bn.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/de.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/en.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/en_US.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/es.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Fecha y hora",
   "encounterType": "Tipo de encuentro"
 }

package/translations/es_MX.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/fr.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date et heure",
   "encounterType": "Type de consultation"
 }

package/translations/he.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "תאריך ושעה",
   "encounterType": "סוג הביקור"
 }

package/translations/hi.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/hi_IN.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/id.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Tanggal dan waktu",
   "encounterType": "Jenis pertemuan"
 }

package/translations/it.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Data e ora",
   "encounterType": "Tipo di incontro"
 }

package/translations/ka.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "თარიღი და დრო",
   "encounterType": "კონსულტაციის ტიპი"
 }

package/translations/km.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "កាលបរិច្ឆេទ និងម៉ោង",
   "encounterType": "ប្រភេទនៃការជួបប្រទះ"
 }

package/translations/ku.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/ky.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/lg.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/ne.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/pl.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/pt.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Data e hora",
   "encounterType": "Tipo de consulta"
 }

package/translations/pt_BR.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Data e hora",
   "encounterType": "Tipo de encontro"
 }

package/translations/qu.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/ro_RO.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Data si ora",
   "encounterType": "Tip intalnire"
 }

package/translations/ru_RU.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/si.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/sw.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/sw_KE.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/tr.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/tr_TR.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/uk.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/uz.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/uz@Latn.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/uz_UZ.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Date and time",
   "encounterType": "Encounter type"
 }

package/translations/vi.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "Ngày và giờ",
   "encounterType": "Loại gặp gỡ"
 }

package/translations/zh.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "日期&时间",
   "encounterType": "问诊类型"
 }

package/translations/zh_CN.json

@@ -1,4 +1,5 @@
 {
+  "date": "Date",
   "dateAndTime": "日期&时间",
   "encounterType": "问诊类型"
 }