Skip to content

Commit

Permalink
Merge pull request #173 from egovernments/ISNE-604-V2
Browse files Browse the repository at this point in the history 
Isne 604 v2
  • Loading branch information
@vinothrallapalli-eGov
vinothrallapalli-eGov authored Feb 6, 2025
2 parents 2b890eb + efa1332 commit 4e62208
Show file tree
Hide file tree
Showing 13 changed files with 84 additions and 32 deletions.
6 changes: 3 additions & 3 deletions frontend/micro-ui/web/micro-ui-internals/example/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
"@egovernments/digit-ui-module-engagement": "1.7.0-beta.6",
"@egovernments/digit-ui-module-fsm": "1.7.0-beta.6",
"@egovernments/digit-ui-module-mcollect": "1.7.0-beta.3",
"@egovernments/digit-ui-module-noc": "1.7.0-beta.2",
"@egovernments/digit-ui-module-noc": "1.7.0-beta.2",
"@egovernments/digit-ui-module-obps": "1.7.0-beta.11",
"@egovernments/digit-ui-module-pgr": "1.7.0-beta.2",
"@egovernments/digit-ui-module-pt": "1.7.0-beta.4",
"@egovernments/digit-ui-module-pgr": "1.7.0-beta.4",
"@egovernments/digit-ui-module-pt": "1.7.0-beta.5",
"@egovernments/digit-ui-module-receipts": "1.7.0-beta.2",
"@egovernments/digit-ui-module-tl": "1.7.0-beta.9",
"@egovernments/digit-ui-module-ws": "1.7.0-beta.4",
Expand Down
3 changes: 1 addition & 2 deletions ...icro-ui-internals/packages/modules/engagement/src/pages/employee/Documents/Inbox/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,7 @@ const Inbox = ({ tenants }) => {
pageSizeLimit={searchParams?.limit}
totalRecords={response?.totalCount}
title={"DOCUMENTS_DOCUMENT_HEADER"}
iconName={"document"}
links={links}
iconName={"document"}
currentPage={parseInt(searchParams.offset / searchParams.limit)}
onNextPage={fetchNextPage}
onPrevPage={fetchPrevPage}
Expand Down
3 changes: 1 addition & 2 deletions ...b/micro-ui-internals/packages/modules/engagement/src/pages/employee/Events/Inbox/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,7 @@ const Inbox = ({ tenants, parentRoute }) => {
pageSizeLimit={pageSize}
totalRecords={data?.totalCount}
title={"EVENTS_EVENTS_HEADER"}
iconName={"calender"}
links={links}
iconName={"calender"}
currentPage={parseInt(pageOffset / pageSize)}
onNextPage={fetchNextPage}
onPrevPage={fetchPrevPage}
Expand Down
1 change: 0 additions & 1 deletion ...i/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/Messages/Inbox.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ const Inbox = ({ tenants, parentRoute }) => {
onPrevPage={fetchPrevPage}
onPageSizeChange={handlePageSizeChange}
title={"EVENTS_PUBLIC_MESSAGE_NOTICE_HEADER"}
links={links}
isLoading={isLoading}
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-pgr",
"version": "1.7.0-beta.3",
"version": "1.7.0-beta.4",
"license": "MIT",
"main": "dist/index.js",
"module": "dist/index.modern.js",
Expand Down
53 changes: 40 additions & 13 deletions frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/Module.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,16 @@ import PGRCard from "./components/PGRCard";

import getRootReducer from "./redux/reducers";
import CitizenApp from "./pages/citizen";

import EmployeeApp from "./EmployeeApp";
import { ComplaintIcon, CitizenHomeCard, Loader } from "@egovernments/digit-ui-react-components";
import { ComplaintIcon, CitizenHomeCard, Loader, BreadCrumb } from "@egovernments/digit-ui-react-components";
import { PGR_CITIZEN_CREATE_COMPLAINT } from "./constants/Citizen";
import { useTranslation } from "react-i18next";
import { LOCALE } from "./constants/Localization";
import { ComplaintDetails } from "./pages/employee/ComplaintDetails";
import { CreateComplaint as CreateComplaintEmp } from "./pages/employee/CreateComplaint";
import Inbox from "./pages/employee/Inbox";
import ResponseEmp from "./pages/employee/Response";

import { Switch, useLocation, useRouteMatch, Route } from "react-router-dom";
import { CreateComplaint as CreateComplaintCitizen } from "./pages/citizen/Create";
import { ComplaintsList } from "./pages/citizen/ComplaintsList";
import ComplaintDetailsPage from "./pages/citizen/ComplaintDetails";
Expand All @@ -23,7 +22,31 @@ import ResponseCitizen from "./pages/citizen/Response";

export const PGRReducers = getRootReducer;

const PGRBreadCrumb = ({ location }) => {
const { t } = useTranslation();
const crumbs = [
{
path: "/digit-ui/employee",
content: t("ES_COMMON_HOME"),
show: true,
},
{
path: "/digit-ui/employee/pgr/inbox",
content: t("ES_EVENT_INBOX"),
show: location.pathname.includes("pgr/inbox") ? true : false,
},
{
path: "/digit-ui/employee/pgr/complaint/create",
content: t("ES_COMPLIENT_CREATE"),
show: location.pathname.includes("complaint/create") ? true : false,
},
];

return <BreadCrumb crumbs={crumbs} />;
};

const PGRModule = ({ stateCode, userType, tenants }) => {
const location = useLocation();
const moduleCode = "PGR";
const language = Digit.StoreData.getCurrentLanguage();
const { isLoading, data: store } = Digit.Services.useStore({ stateCode, moduleCode, language });
Expand All @@ -37,7 +60,11 @@ const PGRModule = ({ stateCode, userType, tenants }) => {
if (userType === "citizen") {
return <CitizenApp />;
} else {
return <EmployeeApp />;
return <div>
<PGRBreadCrumb
location={location} />
<EmployeeApp />
</div>;
}
};

Expand Down Expand Up @@ -67,15 +94,15 @@ const componentsToRegister = {
PGRModule,
PGRLinks,
PGRCard,
PGRComplaintDetails : ComplaintDetails,
PGRCreateComplaintEmp : CreateComplaintEmp,
PGRInbox : Inbox,
PGRResponseEmp : ResponseEmp,
PGRCreateComplaintCitizen : CreateComplaintCitizen,
PGRComplaintsList : ComplaintsList,
PGRComplaintDetailsPage : ComplaintDetailsPage,
PGRSelectRating : SelectRating,
PGRResponseCitzen : ResponseCitizen
PGRComplaintDetails: ComplaintDetails,
PGRCreateComplaintEmp: CreateComplaintEmp,
PGRInbox: Inbox,
PGRResponseEmp: ResponseEmp,
PGRCreateComplaintCitizen: CreateComplaintCitizen,
PGRComplaintsList: ComplaintsList,
PGRComplaintDetailsPage: ComplaintDetailsPage,
PGRSelectRating: SelectRating,
PGRResponseCitzen: ResponseCitizen
};

export const initPGRComponents = () => {
Expand Down
2 changes: 1 addition & 1 deletion frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/DesktopInbox.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ const DesktopInbox = ({
onNextPage={onNextPage}
onPrevPage={onPrevPage}
totalRecords={totalRecords}
onPageSizeChagne={onPageSizeChange}
onPageSizeChange={onPageSizeChange}
currentPage={currentPage}
pageSizeLimit={pageSizeLimit}
/>
Expand Down
18 changes: 17 additions & 1 deletion frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ import { EmployeeModuleCard } from "@egovernments/digit-ui-react-components";

const PGRCard = () => {
const { t } = useTranslation();

const [count, setCount] = useState(0);
const tenantId = Digit.ULBService.getCurrentTenantId();

const allLinks = [
{ text: t("ES_PGR_INBOX"), link: "/digit-ui/employee/pgr/inbox" },
{ text: t("ES_PGR_NEW_COMPLAINT"), link: "/digit-ui/employee/pgr/complaint/create", accessTo: ["CSR"] },
Expand All @@ -29,13 +31,27 @@ const PGRCard = () => {
}
]

// let response = await Digit.PGRService.count(tenantId, applicationStatus?.length > 0 ? {applicationStatus} : {} );4

useEffect(() => {
(async () => {
let response = await Digit.PGRService.count(tenantId, {} );
if (response?.count) {
setCount(response.count);
}
})();
});


propsForCSR = propsForCSR.filter(link => link.role && Digit.Utils.didEmployeeHasRole(link.role) );


const propsForModuleCard = {
Icon: <Icon />,
moduleName: t("ES_PGR_HEADER_COMPLAINT"),
kpis: [
{
count: count && count,
label: t("TOTAL_PGR"),
link: `/digit-ui/employee/pgr/inbox`
},
Expand Down
6 changes: 4 additions & 2 deletions frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/Inbox.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ const Inbox = () => {
setPageOffset((prevState) => prevState - 10);
};



const handlePageSizeChange = (e) => {
setPageSize(Number(e.target.value));
setPageSize((prevPageSize) => (e.target.value));
};

const handleFilterChange = (filterParam) => {
Expand Down Expand Up @@ -67,7 +69,7 @@ const Inbox = () => {
onNextPage={fetchNextPage}
onPrevPage={fetchPrevPage}
onPageSizeChange={handlePageSizeChange}
currentPage={Math.floor(pageOffset / pageSize)}
currentPage={parseInt(pageOffset / pageSize)}
totalRecords={totalRecords}
pageSizeLimit={pageSize}
/>
Expand Down
2 changes: 1 addition & 1 deletion frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-pt",
"version": "1.7.0-beta.4",
"version": "1.7.0-beta.5",
"license": "MIT",
"main": "dist/index.js",
"module": "dist/index.modern.js",
Expand Down
2 changes: 1 addition & 1 deletion ...o-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/PTApplicationDetails.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const PTApplicationDetails = () => {
sessionStorage.setItem("pt-property", JSON.stringify(application));

useMemo(() => {
if(data?.Properties?.[0]?.status === "ACTIVE" && popup == false && servicedata?.Service?.length == 0)
if(data?.Properties?.[0]?.status === "ACTIVE" && popup == false && (Array.isArray(servicedata?.Services) && servicedata?.Services?.length === 0))
setpopup(true);
},[data,servicedata])

Expand Down
14 changes: 12 additions & 2 deletions ...end/micro-ui/web/micro-ui-internals/packages/react-components/src/molecules/RatingCard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,16 @@ const RatingCard = ({ config, onSelect, t }) => {
setRating(index);
};

const stateId = Digit.ULBService.getStateId();

//uncomment this once mdms updated in QA
const { data: RatingAndFeedBack, isLoading: RatingAndFeedBackLoading } = Digit.Hooks.pt.useRatingAndFeedbackMDMS.RatingAndFeedBack(stateId);


const getCommentHeader = () => {
return RatingAndFeedBack?.headerByRating?.filter((ob) => rating >= ob?.minvalue && rating <= ob?.maxvalue)?.[0]?.code || t("CS_WHAT_WENT_WRONG");
}

const segments = config.inputs?.map((input, index) => {
if (input.type === "rate") {
return (
Expand All @@ -39,8 +49,8 @@ const RatingCard = ({ config, onSelect, t }) => {

if (input.type === "checkbox") {
return (
<React.Fragment key={index}>
<CardLabel>{t(input.label)}</CardLabel>
<React.Fragment key={index}>
<CardLabel>{t(getCommentHeader())}</CardLabel>
{input?.error}
{input.checkLabels &&
input.checkLabels.map((label, index) => <CheckBox style={{ marginBottom: "16px", paddingTop:"10px" }} key={index} name={input.label} label={t(label)} value={label} inputRef={register} />)}
Expand Down
4 changes: 2 additions & 2 deletions frontend/micro-ui/web/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"@egovernments/digit-ui-module-mcollect": "1.7.0-beta.3",
"@egovernments/digit-ui-module-noc": "1.7.0-beta.2",
"@egovernments/digit-ui-module-obps": "1.7.0-beta.11",
"@egovernments/digit-ui-module-pgr": "1.7.0-beta.2",
"@egovernments/digit-ui-module-pt": "1.7.0-beta.4",
"@egovernments/digit-ui-module-pgr": "1.7.0-beta.4",
"@egovernments/digit-ui-module-pt": "1.7.0-beta.5",
"@egovernments/digit-ui-module-receipts": "1.7.0-beta.2",
"@egovernments/digit-ui-module-tl": "1.7.0-beta.9",
"@egovernments/digit-ui-module-ws": "1.7.0-beta.4",
Expand Down

0 comments on commit 4e62208

Please sign in to comment.