Update icons for InvoiceList

beda-software · Oct 11, 2023 · 2278299 · 2278299
1 parent d258794
commit 2278299
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 6 deletions.
diff --git a/src/components/BaseLayout/Sidebar/SidebarTop/index.tsx b/src/components/BaseLayout/Sidebar/SidebarTop/index.tsx
@@ -6,6 +6,7 @@ import { Link, useLocation, useNavigate } from 'react-router-dom';
 import { CompanyName } from 'src/icons/brand/CompanyName';
 import { LogoSmall } from 'src/icons/brand/LogoSmall';
 import { EncountersIcon } from 'src/icons/menu/EncountersIcon';
+import { InvoicesIcon } from 'src/icons/menu/InvoicesIcon';
 import { PatientsIcon } from 'src/icons/menu/PatientsIcon';
 import { PractitionersIcon } from 'src/icons/menu/PractitionersIcon';
 import { QuestionnairesIcon } from 'src/icons/menu/QuestionnairesIcon';
@@ -40,7 +41,7 @@ export function SidebarTop(props: Props) {
     const menuItems: RouteItem[] = !isAnonymousUser
         ? matchCurrentUserRole({
               [Role.Admin]: () => [
-                  { label: t`Invoices`, path: '/invoices', icon: <ServicesIcon /> },
+                  { label: t`Invoices`, path: '/invoices', icon: <InvoicesIcon /> },
                   { label: t`Services`, path: '/healthcare-services', icon: <ServicesIcon /> },
                   { label: t`Encounters`, path: '/encounters', icon: <EncountersIcon /> },
                   { label: t`Patients`, path: '/patients', icon: <PatientsIcon /> },

diff --git a/src/containers/DocumentsList/ChooseDocumentToCreateModal/index.tsx b/src/containers/DocumentsList/ChooseDocumentToCreateModal/index.tsx
@@ -30,6 +30,7 @@ export const ChooseDocumentToCreateModal = (props: Props) => {
         mapSuccess(
             await getFHIRResources<Questionnaire>('Questionnaire', {
                 'subject-type': subjectType ? [subjectType] : [],
+                _sort: 'title',
             }),
             (bundle) => extractBundleResources(bundle).Questionnaire,
         ),

diff --git a/src/containers/InvoiceList/tableUtils.tsx b/src/containers/InvoiceList/tableUtils.tsx
@@ -1,9 +1,9 @@
 import {
     CheckCircleOutlined,
-    IssuesCloseOutlined,
-    InfoCircleOutlined,
     FormOutlined,
     StopOutlined,
+    ClockCircleOutlined,
+    ExclamationCircleOutlined,
 } from '@ant-design/icons';
 import { Tag, Row, Col } from 'antd';
 import { Invoice } from 'fhir/r4b';
@@ -21,12 +21,12 @@ export function InvoiceStatus({ invoice }: { invoice: Invoice }) {
             name: 'Balanced',
         },
         cancelled: {
-            icon: <IssuesCloseOutlined />,
+            icon: <StopOutlined />,
             color: 'warning',
             name: 'Cancelled',
         },
         issued: {
-            icon: <InfoCircleOutlined />,
+            icon: <ClockCircleOutlined />,
             color: 'processing',
             name: 'Issued',
         },
@@ -36,7 +36,7 @@ export function InvoiceStatus({ invoice }: { invoice: Invoice }) {
             name: 'Draft',
         },
         'entered-in-error': {
-            icon: <StopOutlined />,
+            icon: <ExclamationCircleOutlined />,
             color: 'error',
             name: 'Entered in error',
         },

diff --git a/src/icons/menu/InvoicesIcon.tsx b/src/icons/menu/InvoicesIcon.tsx
@@ -0,0 +1,58 @@
+export function InvoicesIcon() {
+    return (
+        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+            <path
+                d="M3 3.5C3 3.22386 3.22386 3 3.5 3H16.5C16.7761 3 17 3.22386 17 3.5V20.5C17 20.7761 16.7761 21 16.5 21H3.5C3.22386 21 3 20.7761 3 20.5V3.5Z"
+                fill="var(--theme-sidebar-background)"
+            />
+            <path
+                fillRule="evenodd"
+                clipRule="evenodd"
+                d="M3 2C2.44772 2 2 2.44771 2 3V21C2 21.5523 2.44771 22 3 22H21.75C21.8881 22 22 21.8881 22 21.75V16.25C22 16.1119 21.8881 16 21.75 16H18V15H20V14.25C20 14.1118 19.8877 14 19.75 14H18V3C18 2.44772 17.5523 2 17 2H3ZM17 14V3.5C17 3.22386 16.7761 3 16.5 3H3.5C3.22386 3 3 3.22386 3 3.5V20.5C3 20.7761 3.22386 21 3.5 21H8V16.25C8 16.1119 8.11193 16 8.25 16H17V15H8C7.44727 15 7 15.4478 7 16V20H6.25C6.1123 20 6 19.8882 6 19.75V14.25C6 14.1118 6.1123 14 6.25 14H17Z"
+                fill="var(--theme-icon-secondary)"
+            />
+            <path
+                d="M10 17.5C10 17.7761 9.77614 18 9.5 18C9.22386 18 9 17.7761 9 17.5C9 17.2239 9.22386 17 9.5 17C9.77614 17 10 17.2239 10 17.5Z"
+                fill="var(--theme-icon-primary)"
+            />
+            <path
+                d="M9.5 21C9.77614 21 10 20.7761 10 20.5C10 20.2239 9.77614 20 9.5 20C9.22386 20 9 20.2239 9 20.5C9 20.7761 9.22386 21 9.5 21Z"
+                fill="var(--theme-icon-primary)"
+            />
+            <path
+                d="M17 19C17 20.1046 16.1046 21 15 21C13.8954 21 13 20.1046 13 19C13 17.8954 13.8954 17 15 17C16.1046 17 17 17.8954 17 19Z"
+                fill="var(--theme-icon-primary)"
+            />
+            <path
+                d="M20.5 18C20.7761 18 21 17.7761 21 17.5C21 17.2239 20.7761 17 20.5 17C20.2239 17 20 17.2239 20 17.5C20 17.7761 20.2239 18 20.5 18Z"
+                fill="var(--theme-icon-primary)"
+            />
+            <path
+                d="M21 20.5C21 20.7761 20.7761 21 20.5 21C20.2239 21 20 20.7761 20 20.5C20 20.2239 20.2239 20 20.5 20C20.7761 20 21 20.2239 21 20.5Z"
+                fill="var(--theme-icon-primary)"
+            />
+            <path
+                d="M5 7.5C5 7.22386 5.22386 7 5.5 7H11.5C11.7761 7 12 7.22386 12 7.5C12 7.77614 11.7761 8 11.5 8H5.5C5.22386 8 5 7.77614 5 7.5Z"
+                fill="var(--theme-icon-primary)"
+            />
+            <path
+                d="M5.5 10C5.22386 10 5 10.2239 5 10.5C5 10.7761 5.22386 11 5.5 11H11.5C11.7761 11 12 10.7761 12 10.5C12 10.2239 11.7761 10 11.5 10H5.5Z"
+                fill="var(--theme-icon-primary)"
+            />
+            <path
+                d="M13 7.5C13 7.22386 13.2239 7 13.5 7H14.5C14.7761 7 15 7.22386 15 7.5C15 7.77614 14.7761 8 14.5 8H13.5C13.2239 8 13 7.77614 13 7.5Z"
+                fill="var(--theme-icon-primary)"
+            />
+            <path
+                d="M13.5 10C13.2239 10 13 10.2239 13 10.5C13 10.7761 13.2239 11 13.5 11H14.5C14.7761 11 15 10.7761 15 10.5C15 10.2239 14.7761 10 14.5 10H13.5Z"
+                fill="var(--theme-icon-primary)"
+            />
+            <path
+                fillRule="evenodd"
+                clipRule="evenodd"
+                d="M3 1H17C18.1046 1 19 1.89543 19 3V13H20C20.5523 13 21 13.4477 21 14V15H22C22.5523 15 23 15.4477 23 16V22C23 22.5523 22.5523 23 22 23H3C1.89543 23 1 22.1046 1 21V3C1 1.89543 1.89543 1 3 1ZM8 21.75C8 21.8881 8.11193 22 8.25 22H21.75C21.8881 22 22 21.8881 22 21.75V16.25C22 16.1119 21.8881 16 21.75 16H8.25C8.11193 16 8 16.1119 8 16.25V21.75ZM18 13H6C5.44772 13 5 13.4477 5 14V20C5 20.5523 5.44772 21 6 21H7V22H3C2.44772 22 2 21.5523 2 21V3C2 2.44772 2.44772 2 3 2H17C17.5523 2 18 2.44772 18 3V13ZM20 14.25C20 14.1119 19.8881 14 19.75 14H6.25C6.11193 14 6 14.1119 6 14.25V19.75C6 19.8881 6.11193 20 6.25 20H7V16C7 15.4477 7.44772 15 8 15H20V14.25Z"
+                fill="var(--theme-icon-primary)"
+            />
+        </svg>
+    );
+}