Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed facilitysearch issue #1697

Merged
merged 1 commit into from
Oct 28, 2024
Merged

fixed facilitysearch issue #1697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion health/micro-ui/web/micro-ui-internals/example/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/> -->
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.2-beta.34/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.39/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.11/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.12/dist/index.css" />
Swathi-eGov marked this conversation as resolved.
Show resolved Hide resolved

<!-- added below css for hcm-workbench module inclusion-->
<!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.5.41/dist/index.css" /> -->
Expand Down
2 changes: 1 addition & 1 deletion health/micro-ui/web/micro-ui-internals/packages/css/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-health-css",
"version": "0.1.11",
"version": "0.1.12",
"license": "MIT",
"main": "dist/index.css",
"author": "Jagankumar <jagan.kumar@egov.org.in>",
Expand Down
4 changes: 4 additions & 0 deletions health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/facility.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,8 @@
display: flex;
flex-direction: column;
justify-content: flex-start;
}

.searchjurisdiction-multiselectdropdown{
margin-bottom: 0rem;
}
3 changes: 2 additions & 1 deletion ...ui/web/micro-ui-internals/packages/modules/microplan/src/components/SearchJurisdiction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const SearchJurisdiction = ({ boundaries, jurisdiction, onSubmit = () => { }, on
}}
/>
</LabelFieldPair>
<LabelFieldPair style={{ flexDirection: "column", gap: "0rem",marginBottom: 0 }}>
<LabelFieldPair style={{ flexDirection: "column", gap: "0rem" }}>
<CardLabel style={{width:"100%"}}>{t("SELECT_BOUNDARIES")}</CardLabel>
<div style={{width: "100%" }}>
<MultiSelectDropdown
Expand All @@ -75,6 +75,7 @@ const SearchJurisdiction = ({ boundaries, jurisdiction, onSubmit = () => { }, on
onSelect={(e) => {
handleBoundarySelect(e)
}}
props={{className:"searchjurisdiction-multiselectdropdown"}}
Swathi-eGov marked this conversation as resolved.
Show resolved Hide resolved
isSearchable={true}
t={t}
addCategorySelectAllCheck={true}
Expand Down
2 changes: 1 addition & 1 deletion ...eb/micro-ui-internals/packages/modules/microplan/src/hooks/useFacilityCatchmentMapping.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const useFcilityCatchmentMapping = (props) => {
enabled: !!planEmployee,
select: (data) => data,
},
changeQueryName: `${facilityName}${facilityType}${residingVillage}${status}${props?.state?.tableForm?.limit}${props?.state?.tableForm?.offset}`,
changeQueryName: `${facilityName}${facilityType?.name}${residingVillage}${status?.name}${props?.state?.tableForm?.limit}${props?.state?.tableForm?.offset}`,
Swathi-eGov marked this conversation as resolved.
Show resolved Hide resolved
};
const { isLoading, data, isFetching, refetch, revalidate } = Digit.Hooks.useCustomAPIHook(reqCriteria);
return {
Expand Down
2 changes: 1 addition & 1 deletion health/micro-ui/web/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.39/dist/index.css" />
<!-- added below css for hcm-workbench module inclusion-->

<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.11/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.12/dist/index.css" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#00bcd1" />
<title>DIGIT HCM</title>
Expand Down