diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Home.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Home.js index 25bdc1607ca..7c9a6fea210 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Home.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Home.js @@ -11,6 +11,8 @@ import { PTIcon, TLIcon, WSICon, + PTRIcon + } from "@upyog/digit-ui-react-components"; import React from "react"; import { useTranslation } from "react-i18next"; @@ -75,6 +77,8 @@ const iconSelector = (code) => { return ; case "Bills": return ; + case "PTR": + return ; default: return ; } diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/CitizenSubMenuSideBar.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/CitizenSubMenuSideBar.js index 2f4d9b9216a..1c76202ef07 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/CitizenSubMenuSideBar.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/TopBarSideBar/SideBar/CitizenSubMenuSideBar.js @@ -13,6 +13,7 @@ import { BirthIcon, DeathIcon, FirenocIcon, + PTRIcon } from "@upyog/digit-ui-react-components"; import { useTranslation } from "react-i18next"; @@ -36,6 +37,7 @@ const CitizenSubMenuSideBar = ({ item }) => { FirenocIcon: , MCollectIcon: , BillsIcon: , + PTRIcon: }; const leftIconArray = item.icon; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/index.js index a8ac8381e00..7d4889030a7 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/index.js @@ -14,6 +14,7 @@ import { WhatsNewCard, OBPSIcon, WSICon, + PTRIcon } from "@upyog/digit-ui-react-components"; import { useTranslation } from "react-i18next"; import { useHistory } from "react-router-dom"; @@ -82,6 +83,11 @@ const Home = () => { Icon: , onClick: () => history.push(citizenServicesObj?.props?.[2]?.navigationUrl), }, + { + name: t(citizenServicesObj?.props?.[1]?.label), + Icon: , + onClick: () => history.push(citizenServicesObj?.props?.[1]?.navigationUrl), + }, // { // name: t("ACTION_TEST_WATER_AND_SEWERAGE"), // Icon: , diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/Module.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/Module.js index 602280fd4fd..ccb34b6df62 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/Module.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/Module.js @@ -1,4 +1,4 @@ -import { Header, CitizenHomeCard, PTIcon } from "@upyog/digit-ui-react-components"; +import { Header, CitizenHomeCard, PTRIcon } from "@upyog/digit-ui-react-components"; import React, { useEffect } from "react"; import { useTranslation } from "react-i18next"; import { useRouteMatch } from "react-router-dom"; @@ -133,13 +133,13 @@ export const PTRLinks = ({ matchPath, userType }) => { }, ]; - return } />; + return } />; }; export const PTRComponents = { PTRCard, PTRModule, PTRLinks, - PT_INBOX_FILTER: (props) => , + PTR_INBOX_FILTER: (props) => , PTRInboxTableConfig: TableConfig, }; \ No newline at end of file diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/components/PTRCard.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/components/PTRCard.js index 2cd9f8f2b29..be96b4ff82f 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/components/PTRCard.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/components/PTRCard.js @@ -1,7 +1,7 @@ import React, { useEffect, useState } from "react"; import { Link } from "react-router-dom"; import { useTranslation } from "react-i18next"; -import { EmployeeModuleCard, PropertyHouse } from "@upyog/digit-ui-react-components"; +import { EmployeeModuleCard, PTRIcon } from "@upyog/digit-ui-react-components"; const PTRCard = () => { const { t } = useTranslation(); @@ -45,7 +45,7 @@ const PTRCard = () => { ] const PT_CEMP = Digit.UserService.hasAccess(["PT_CEMP"]) || false; const propsForModuleCard = { - Icon: , + Icon: , moduleName: t("PTR_TITLE_PET_REGISTRATION"), kpis: [ { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pages/employee/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pages/employee/index.js index e42d3f3d09e..02719c99c58 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pages/employee/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pages/employee/index.js @@ -80,7 +80,7 @@ const EmployeeApp = ({ path, url, userType }) => { useNewInboxAPI={true} parentRoute={path} businessService="ptr" - filterComponent="PT_INBOX_FILTER" + filterComponent="PTR_INBOX_FILTER" initialStates={inboxInitialState} isInbox={true} /> diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/NavBar.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/NavBar.js index fd68a357385..625be82f5f5 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/NavBar.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/NavBar.js @@ -25,7 +25,8 @@ import { LogoutIcon, EditPencilIcon, LanguageIcon, - LoginIcon + LoginIcon, + PTRIcon } from "./svgindex"; import { BirthIcon, DeathIcon, FirenocIcon } from ".."; @@ -61,7 +62,8 @@ const IconsObject = { LogoutIcon: , Phone: , LanguageIcon: , - LoginIcon: + LoginIcon: , + PTRIcon: }; const NavBar = ({ open, toggleSidebar, profileItem, menuItems, onClose, Footer, isEmployee, search, setSearch,isSideBarScroll }) => { const node = useRef(); diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/SubMenu.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/SubMenu.js index e012ac4fffb..b32adbe29f6 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/SubMenu.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/SubMenu.js @@ -17,6 +17,7 @@ import { DropIcon, CollectionsBookmarIcons, FinanceChartIcon, + PTRIcon, } from "./svgindex"; const IconsObject = { @@ -42,6 +43,7 @@ const IconsObject = { "insert-chart": , edcr: , collections: , + PTRIcon: }; const SubMenu = ({ item, t, isEmployee }) => { const [subnav, setSubnav] = useState(false); diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/svgindex.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/svgindex.js index e6a56e60ccd..ae38dd44181 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/svgindex.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/svgindex.js @@ -1088,6 +1088,14 @@ const InboxIcon = () => ( /> ); +const PTRIcon = ({ className, styles }) => ( + + + +); + export { AnnouncementIcon, @@ -1211,4 +1219,5 @@ export { BirthIcon, DeathIcon, InfoIcon, + PTRIcon, }; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/index.js index 3fb04f03aba..c761c46fd2a 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/index.js @@ -173,6 +173,7 @@ import { FirenocIcon, InfoIcon, LoginIcon, + PTRIcon, } from "./atoms/svgindex"; import Table from "./atoms/Table"; import TelePhone from "./atoms/TelePhone"; @@ -333,6 +334,7 @@ export { MultiSelectDropdown, CaseIcon, PTIcon, + PTRIcon, DocumentIcon, DocumentIconSolid, PMBIconSolid,