From 1f51f2eb43957d7a1c7e8606dcfb8bdf838e7584 Mon Sep 17 00:00:00 2001 From: Donald Kibet Date: Wed, 12 Jun 2024 19:21:55 +0300 Subject: [PATCH] (feat) KHP3-5430: Update the icons used for procedure --- .../add-radiology-order.workspace.tsx | 6 +-- .../radiology-order-form.component.tsx | 3 +- .../radiology-type-search.tsx | 2 +- .../radiology-icon.component.tsx | 42 ++++++++++++++----- ...radiology-order-basket-panel.extension.tsx | 4 +- .../radiology-order-basket-panel.scss | 8 ++-- yarn.lock | 10 ++--- 7 files changed, 46 insertions(+), 29 deletions(-) diff --git a/src/form/radiology-orders/add-radiology-order/add-radiology-order.workspace.tsx b/src/form/radiology-orders/add-radiology-order/add-radiology-order.workspace.tsx index 863f53b..d9c1d20 100644 --- a/src/form/radiology-orders/add-radiology-order/add-radiology-order.workspace.tsx +++ b/src/form/radiology-orders/add-radiology-order/add-radiology-order.workspace.tsx @@ -5,16 +5,14 @@ import { useTranslation } from "react-i18next"; import { Button } from "@carbon/react"; import { ArrowLeft } from "@carbon/react/icons"; import { + DefaultWorkspaceProps, age, formatDate, parseDate, useLayoutType, usePatient, } from "@openmrs/esm-framework"; -import { - type DefaultWorkspaceProps, - launchPatientWorkspace, -} from "@openmrs/esm-patient-common-lib"; +import { launchPatientWorkspace } from "@openmrs/esm-patient-common-lib"; import { TestTypeSearch } from "./radiology-type-search"; import { RadiologyOrderForm } from "./radiology-order-form.component"; import styles from "./add-radiology-order.scss"; diff --git a/src/form/radiology-orders/add-radiology-order/radiology-order-form.component.tsx b/src/form/radiology-orders/add-radiology-order/radiology-order-form.component.tsx index 9de1a22..37eb2d4 100644 --- a/src/form/radiology-orders/add-radiology-order/radiology-order-form.component.tsx +++ b/src/form/radiology-orders/add-radiology-order/radiology-order-form.component.tsx @@ -1,7 +1,6 @@ import React, { useCallback, useEffect, useState } from "react"; import classNames from "classnames"; import { - type DefaultWorkspaceProps, launchPatientWorkspace, useOrderBasket, } from "@openmrs/esm-patient-common-lib"; @@ -10,11 +9,11 @@ import { useLayoutType, useSession, useConfig, + DefaultWorkspaceProps, } from "@openmrs/esm-framework"; import { careSettingUuid, prepRadiologyOrderPostData, - useOrderReasons, useConceptById, } from "../api"; import { diff --git a/src/form/radiology-orders/add-radiology-order/radiology-type-search.tsx b/src/form/radiology-orders/add-radiology-order/radiology-type-search.tsx index 372cc50..039b168 100644 --- a/src/form/radiology-orders/add-radiology-order/radiology-type-search.tsx +++ b/src/form/radiology-orders/add-radiology-order/radiology-type-search.tsx @@ -18,9 +18,9 @@ import { useLayoutType, useSession, ResponsiveWrapper, + closeWorkspace, } from "@openmrs/esm-framework"; import { - closeWorkspace, launchPatientWorkspace, useOrderBasket, } from "@openmrs/esm-patient-common-lib"; diff --git a/src/form/radiology-orders/radiology-order-basket-panel/radiology-icon.component.tsx b/src/form/radiology-orders/radiology-order-basket-panel/radiology-icon.component.tsx index b1bf184..a36b3fa 100644 --- a/src/form/radiology-orders/radiology-order-basket-panel/radiology-icon.component.tsx +++ b/src/form/radiology-orders/radiology-order-basket-panel/radiology-icon.component.tsx @@ -1,10 +1,10 @@ import React from "react"; -interface LabIconProps { +interface ImagingProps { isTablet: boolean; } -export default function LabIcon({ isTablet }: LabIconProps) { +export default function ImagingIcon({ isTablet }: ImagingProps) { const size = isTablet ? 40 : 24; return ( - - - + + + + + + + + + + + + - + diff --git a/src/form/radiology-orders/radiology-order-basket-panel/radiology-order-basket-panel.extension.tsx b/src/form/radiology-orders/radiology-order-basket-panel/radiology-order-basket-panel.extension.tsx index ab18c35..ca2e46a 100644 --- a/src/form/radiology-orders/radiology-order-basket-panel/radiology-order-basket-panel.extension.tsx +++ b/src/form/radiology-orders/radiology-order-basket-panel/radiology-order-basket-panel.extension.tsx @@ -11,7 +11,7 @@ import { } from "@openmrs/esm-patient-common-lib"; import { RadiologyOrderBasketItemTile } from "./radiology-order-basket-item-tile.component"; import { prepRadiologyOrderPostData } from "../api"; -import LabIcon from "./radiology-icon.component"; +import ImagingIcon from "./radiology-icon.component"; import styles from "./radiology-order-basket-panel.scss"; import { type RadiologyOrderBasketItem } from "../../../types"; @@ -98,7 +98,7 @@ export default function RadiologyOrderBasketPanelExtension() { >
- +

{`${t( "radiologyOrders", "Radiology orders" diff --git a/src/form/radiology-orders/radiology-order-basket-panel/radiology-order-basket-panel.scss b/src/form/radiology-orders/radiology-order-basket-panel/radiology-order-basket-panel.scss index 11dc7c7..25e090a 100644 --- a/src/form/radiology-orders/radiology-order-basket-panel/radiology-order-basket-panel.scss +++ b/src/form/radiology-orders/radiology-order-basket-panel/radiology-order-basket-panel.scss @@ -3,16 +3,16 @@ @import '@openmrs/esm-styleguide/src/vars'; .desktopTile { - border-left: 4px solid #6929c4; + border-left: 4px solid #18cd69; background-color: $ui-02; - border-top: 1px solid #e8daff; + border-top: 1px solid #8ecdaa; border-right: none; padding: 0; } .tabletTile { @extend .desktopTile; - border-top: 1px solid #612EBD; + border-top: 1px solid #0ec862; } .collapsedTile { @@ -71,4 +71,4 @@ svg { fill: black; } -} +} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index a94f1e5..db8431d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4173,9 +4173,9 @@ __metadata: languageName: node linkType: hard -"@openmrs/esm-patient-common-lib@npm:^7.1.0": - version: 7.1.0 - resolution: "@openmrs/esm-patient-common-lib@npm:7.1.0" +"@openmrs/esm-patient-common-lib@npm:next": + version: 8.0.2-pre.4670 + resolution: "@openmrs/esm-patient-common-lib@npm:8.0.2-pre.4670" dependencies: "@carbon/react": ^1.12.0 lodash-es: ^4.17.21 @@ -4184,7 +4184,7 @@ __metadata: "@openmrs/esm-framework": 5.x react: 18.x single-spa: 6.x - checksum: ba8b5194a7aeb9a1f3ecbb441e64c6843e991a52a208f2c57a1d015df1d090c34362afe8c7323072894ebec7d7ae584962f10f59c2c0dc24c68dc95b40935029 + checksum: 5fa6cd535a2d5612fe24d6ac20a8eef12c5db0b98cc151f6cb20994c22b15ba3b994ce87290d5a479bdf8841bd028ab46d81006df19e2ff77fb0990e26cd73d8 languageName: node linkType: hard @@ -4195,7 +4195,7 @@ __metadata: "@carbon/react": ^1.33.1 "@hookform/resolvers": ^3.3.4 "@openmrs/esm-framework": next - "@openmrs/esm-patient-common-lib": ^7.1.0 + "@openmrs/esm-patient-common-lib": next "@openmrs/esm-styleguide": next "@playwright/test": ^1.30.0 "@swc/cli": ^0.1.62