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 Audit issues #1918

Merged
merged 1 commit into from
Nov 28, 2024
Merged

Fixed Audit issues #1918

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 @@ -12,7 +12,7 @@
<title>DIGIT</title>
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.3/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.41/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.45/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.46/dist/index.css" />

<!-- 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.45",
"version": "0.1.46",
"license": "MIT",
"main": "dist/index.css",
"author": "Jagankumar <jagan.kumar@egov.org.in>",
Expand Down
14 changes: 10 additions & 4 deletions health/micro-ui/web/micro-ui-internals/packages/css/src/components/microplanning.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2595,25 +2595,31 @@ $border-color: rgba(214, 213, 212, 1);
.kpi-container {
display: flex;
flex-direction: row;
justify-content: space-around;
justify-content: space-between;
gap: 1rem;
overflow-x: auto;
padding: 8px;
width: 100%;
nipunarora-eGov marked this conversation as resolved.
Show resolved Hide resolved
}

.kpi-card {
text-align: center;
width: 120px;
display: grid;
justify-content: center;
flex-shrink: 0;
nipunarora-eGov marked this conversation as resolved.
Show resolved Hide resolved
}

.kpi-card h2 {
@extend .typography.heading-xl;
margin: 0;
color: theme(digitv2.lightTheme.primary-2);
/* Custom color */
color: theme(digitv2.lightTheme.primary-2);
}

.kpi-card p {
margin: 0;
@extend .typography.heading-m;
color: theme(digitv2.lightTheme.text-secondary);
white-space: nowrap; /* Prevent text wrapping inside the card */
}

.assumptionsForm-label-field {
Expand Down
4 changes: 2 additions & 2 deletions ...icro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/AssigneeChips.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const AssigneeChips = ({ assignees = [], assigneeNames, heading }) => {
const [showPopUp, setShowPopUp] = useState(false);

return (
<div className="digit-tag-container" style={{ minWidth: "unset", margin: "0rem", gap: "0rem" }}>
<div className="digit-tag-container" style={{margin: "0rem", gap: "0rem" }}>
{assignees.length > 0 && (
<Chip
key={0}
Expand All @@ -25,7 +25,7 @@ const AssigneeChips = ({ assignees = [], assigneeNames, heading }) => {
/>
)}

{assignees.length > 1 && (
{assignees.length > 1 && (
<Button
label={`+${assignees.length - 1} ${t("ES_MORE")}`}
onClick={() => setShowPopUp(true)}
Expand Down
3 changes: 2 additions & 1 deletion ...ro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/AssumptionsList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const AssumptionsList = ({ customProps, setupCompleted }) => {
const orderedKeys = ["selectedRegistrationProcess", "selectedDistributionProcess", "selectedRegistrationDistributionMode"];

return (
<div style={{ marginBottom: "2.5rem" }}>
<div style={{ marginBottom: "1.5rem" }}>
<Card className="middle-child">
<Header className="summary-main-heading">{t(`MICROPLAN_ESTIMATION_ASSUMPTIONS_HEADING`)} </Header>
{orderedKeys.map((key, index) => {
Expand Down Expand Up @@ -72,6 +72,7 @@ const AssumptionsList = ({ customProps, setupCompleted }) => {
label={t("WBH_EDIT")}
variation="secondary"
icon={"Edit"}
size="medium"
type="button"
onClick={(e) => {
const urlParams = Digit.Hooks.useQueryParams();
Expand Down
1 change: 1 addition & 0 deletions ...o-ui/web/micro-ui-internals/packages/modules/microplan/src/components/CampaignBoundary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,7 @@ const CampaignBoundary = ({ customProps, setupCompleted }) => {
variation="secondary"
icon={"Edit"}
type="button"
size="medium"
onClick={(e) => {
editHandler();
}}
Expand Down
8 changes: 5 additions & 3 deletions ...-ui/web/micro-ui-internals/packages/modules/microplan/src/components/DataMgmtComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ export const DataMgmtComponent = ({ customProps, setupCompleted }) => {
// "templateIdentifier": "Population"
// }
return (
<>
<Card className="middle-child">
<div style={{ marginBottom: "1.5rem" }}>
<Card className="middle-child" >
<Header className="summary-main-heading">{t(`MICROPLAN_DATA_CONFIGURATION_HEADING`)} </Header>
</Card>
<Card className="mp-margin-bottom">
Expand All @@ -36,6 +36,7 @@ export const DataMgmtComponent = ({ customProps, setupCompleted }) => {
label={t("WBH_EDIT")}
variation="secondary"
icon={"Edit"}
size="medium"
nipunarora-eGov marked this conversation as resolved.
Show resolved Hide resolved
type="button"
onClick={(e) => {
const url = Digit.Hooks.useQueryParams();
Expand Down Expand Up @@ -84,6 +85,7 @@ export const DataMgmtComponent = ({ customProps, setupCompleted }) => {
label={t("WBH_EDIT")}
variation="secondary"
icon={"Edit"}
size="medium"
type="button"
onClick={(e) => {
const url = Digit.Hooks.useQueryParams();
Expand Down Expand Up @@ -119,7 +121,7 @@ export const DataMgmtComponent = ({ customProps, setupCompleted }) => {


</Card>
</>
</div>


)
Expand Down
3 changes: 2 additions & 1 deletion ...i/web/micro-ui-internals/packages/modules/microplan/src/components/FormulaConfigScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const FormulaConfigScreen = ({ customProps, setupCompleted }) => {


return (
<div style={{ marginBottom: "2.5rem" }}>
<div style={{ marginBottom: "1.5rem" }}>
<Card className="middle-child">
<Header className="summary-main-heading">{t(`MICROPLAN_FORMULA_CONFIGURATION_HEADING`)} </Header>
</Card>
Expand All @@ -52,6 +52,7 @@ const FormulaConfigScreen = ({ customProps, setupCompleted }) => {
label={t("WBH_EDIT")}
variation="secondary"
icon={"Edit"}
size="medium"
type="button"
onClick={(e) => {
const urlParams = Digit.Hooks.useQueryParams();
Expand Down
1 change: 0 additions & 1 deletion ...icro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/PopInboxTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ const PopInboxTable = ({ ...props }) => {
t("ES_COMMON_NA")
),
sortable: false,
width: "180px",
},
...(props?.censusData?.[0]?.additionalFields || [])
.filter((field) => field.showOnUi)
Expand Down
2 changes: 2 additions & 0 deletions ...-ui/web/micro-ui-internals/packages/modules/microplan/src/components/RoleTableComposer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,8 @@ function RoleTableComposer({ nationalRoles }) {
!rowData?.find((item) => item?.rowIndex === row?.rowIndex)?.selectedBoundaries ||
rowData?.find((item) => item?.rowIndex === row?.rowIndex)?.selectedBoundaries?.length === 0
}
style={{width:"100%"}}
size="medium"
className={"roleTableCell"}
variation={isUserAlreadyAssignedActive ? "secondary" : "primary"}
label={isUserAlreadyAssignedActive ? t(`UNASSIGN`) : t(`ASSIGN`)}
Expand Down
3 changes: 2 additions & 1 deletion ...h/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/UserAccess.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,9 @@ function UserAccess({ category, setData, nationalRoles }) {
className={"roleTableCell"}
variation={"secondary"}
label={t(`UNASSIGN`)}
size="medium"
title={t(`UNASSIGN`)}
style={{ padding: "1rem" }}
style={{ padding: "1rem", width:"100%" }}
icon={"Close"}
isSuffix={false}
onClick={(value) => setUnassignPopup(row)}
Expand Down
1 change: 1 addition & 0 deletions ...ro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/subBoundaryView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const SubBoundaryView = ({ title, arr, style, editHandler, isEditable, headerSty
{isEditable && editHandler && <Button
label={t("WBH_EDIT")}
variation="secondary"
size="medium"
icon={"Edit"}
type="button"
onClick={(e) => {
Expand Down
1 change: 0 additions & 1 deletion ...icro-ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/PlanInbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,6 @@ const PlanInbox = () => {
t("ES_COMMON_NA")
),
sortable: false,
width: "180px",
},
{
name: t(`HCM_MICROPLAN_SERVING_FACILITY`),
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 @@ -10,7 +10,7 @@
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.3/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.41/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.45/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-health-css@0.1.46/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