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

Usermanagement css and boundaryScreen css #1791

Merged
merged 3 commits into from
Nov 11, 2024
Merged

Usermanagement css and boundaryScreen css #1791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed3d4e9
Changes to userManagement, css for boundary
abishekTa-egov Nov 11, 2024
17055b6
Merge branch 'console' into abi-11-11
abishekTa-egov Nov 11, 2024
c264323
Merge branch 'console' of https://github.com/egovernments/DIGIT-Front…
abishekTa-egov Nov 11, 2024
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
5 changes: 2 additions & 3 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 @@ -256,7 +256,6 @@ const CampaignBoundary = ({ customProps, setupCompleted }) => {
let bH = [];
let top = null;
let dic = {};

for (const ob of boundaryHierarchy) {
let bType = ob["boundaryType"];
let parent = ob["parentBoundaryType"];
Expand Down Expand Up @@ -303,7 +302,7 @@ const CampaignBoundary = ({ customProps, setupCompleted }) => {
<BoundaryKpi data={statusMap} heading={t("CAMPAIGN_BOUNDARY")} />
{bHierarchy.length > 1 ? (
<div className="mp-margin-bottom">
<SubBoundaryView style={{ background: "#fff", gap: "1.5rem" }} title={bHierarchy?.[1]} arr={parent_group?.[bHierarchy?.[1]]} editHandler={editHandler} isEditable={isEditable} />
<SubBoundaryView style={{ background: "#fff", gap: "1.5rem" }} title={bHierarchy?.[1]} arr={parent_group?.[bHierarchy?.[1]]} editHandler={editHandler} isEditable={isEditable} headerStyle={{fontSize:"1.6rem"}} />
</div>
) : null}

Expand All @@ -314,7 +313,7 @@ const CampaignBoundary = ({ customProps, setupCompleted }) => {
<Card className="middle-child">
<div className="mp-header-container" style={{ marginBottom: "0px" }}>
<Header className="summary-sub-heading">
{bHierarchy[ind + 2]}
{t(`MP_${bHierarchy[ind + 2].toUpperCase()}`)}
abishekTa-egov marked this conversation as resolved.
Show resolved Hide resolved
</Header>
{!(setupCompleted === 'true') &&
<Button
Expand Down
4 changes: 2 additions & 2 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 @@ -4,7 +4,7 @@ import { Card, Button, PopUp, Chip, Loader } from '@egovernments/digit-ui-compon
import { ShowMoreWrapper } from './ShowMoreWrapper';
import { useTranslation } from 'react-i18next';

const SubBoundaryView = ({ title, arr, style, editHandler, isEditable }) => {
const SubBoundaryView = ({ title, arr, style, editHandler, isEditable, headerStyle={fontSize:"1rem"} }) => {
abishekTa-egov marked this conversation as resolved.
Show resolved Hide resolved

const [showPopUp, setShowPopUp] = useState(false);
const { t } = useTranslation();
Expand All @@ -20,7 +20,7 @@ const SubBoundaryView = ({ title, arr, style, editHandler, isEditable }) => {
<Card type={"secondary"} style={style}>

<div className="mp-header-container" style={{ marginBottom: "0px" }}>
<Header className="summary-sub-heading subBoundary">
<Header className="summary-sub-heading subBoundary" styles={headerStyle}>
{t(title)}
</Header>
{isEditable && editHandler && <Button
Expand Down
2 changes: 1 addition & 1 deletion ...ui/web/micro-ui-internals/packages/modules/microplan/src/pages/employee/UserManagement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const UserManagement = () => {

return (
<React.Fragment>
<Header styles={{ fontSize: "32px" }}>{t(config?.label)}{<span className="inbox-count">{location?.state?.count ? location?.state?.count : 0}</span>}</Header>
<Header styles={{ fontSize: "32px" }}>{t(config?.label)}</Header>
<div className="inbox-search-wrapper">
<InboxSearchComposer
configs={{ ...config, additionalDetails: { microplanData } }}
Expand Down