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

Jump to bottom

Enhance Microplan Assumptions Screen with Validations and UI Improvements #1403

Open
wants to merge 4 commits into
base: console
Choose a base branch
from
Open

Enhance Microplan Assumptions Screen with Validations and UI Improvements #1403

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e00ad40
microplan assumptions screen
Bhargav-egov Sep 13, 2024
83960f8
update microplan assumptions screen with enhanced logics and UI impr…
Bhargav-egov Sep 19, 2024
f803525
resolved some changes
Bhargav-egov Sep 19, 2024
b5ea97b
Merge branch 'console' of https://github.com/egovernments/DIGIT-Front…
Bhargav-egov Sep 19, 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
53 changes: 52 additions & 1 deletion 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 @@ -1313,7 +1313,7 @@ $border-color: rgba(214, 213, 212, 1);
.equal-to-icon {
margin: 0 3%;
font-family: Roboto Condensed;
font-size: 2.5rem;
font-size: 5rem;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Bhargav-egov this might affect others

font-weight: 700;
}

Expand Down Expand Up @@ -2507,3 +2507,54 @@ $border-color: rgba(214, 213, 212, 1);
max-height: 23rem;
overflow: auto;
}




/* MP_HYPOTHESIS_CSS */

.mp-description{
margin-top: 2rem;
margin-bottom: 1rem;
}

.label-field{
display: flex;
gap:10rem;
margin: 1.7rem 0rem;

}


.label-field > div > span {
width: 20rem;
font-size: 1.2rem;
margin-right: 2rem;
font-weight: bold;

}

.delete-button {
display: flex;
cursor: pointer;
margin-left: 1rem;
font-size: 1.2rem;

}


.input-container{
display: flex;
justify-content: center;
width:30rem;

}









20 changes: 8 additions & 12 deletions health/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,16 +553,12 @@ tbody {
.digit-card-component.bannerCard.removeBottomMargin.languageSelection{
width: unset !important;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why changes in this file

}
.parent-group{
border-width: 0.063rem;
background: theme(digitv2.lightTheme.paper-secondary);
border-color: #D4D5D6;
border-radius: 0.5rem;
padding: 1rem;

.label-field-pairr {
display: none !important;
align-items: center;
justify-content: space-around;
margin-bottom: 1rem;

}
.parent{
color: theme(digitv2.lightTheme.header-sidenav);
font-weight: 700;
font-family: theme(digitv2.fontFamily.sans);
padding-bottom: 1rem;
}

3 changes: 2 additions & 1 deletion ...i/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignName.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ const CampaignName = ({ onSelect, formData, control, formState, ...props }) => {
if (props?.props?.isSubmitting && !name) {
setError({ message: "CAMPAIGN_FIELD_ERROR_MANDATORY" });
} else {
setError(null);
setError(null);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

revert any change in campaign manger/ folder

}
}, [props?.props?.isSubmitting]);

useEffect(() => {
if (startValidation && !name) {
setError({ message: "CAMPAIGN_NAME_FIELD_ERROR" });
Expand Down
2 changes: 1 addition & 1 deletion ...i/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignType.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ const CampaignSelection = ({ onSelect, formData, formState, ...props }) => {
<div>{t(`CAMPAIGN_TYPE_${beneficiaryType}`)}</div>
</LabelFieldPair>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

)}
{showPopUp && (
{showPopUp && (
<PopUp
className={"boundaries-pop-module"}
type={"default"}
Expand Down
2 changes: 1 addition & 1 deletion ...-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { downloadExcelWithCustomName } from "../utils";
const UploadData = ({ formData, onSelect, ...props }) => {
const { t } = useTranslation();
const tenantId = Digit.ULBService.getCurrentTenantId();
const [uploadedFile, setUploadedFile] = useState([]);
const [uploadedFile, setUploadedFile] = useState([])
const params = Digit.SessionStorage.get("HCM_CAMPAIGN_MANAGER_UPLOAD_ID");
const [showInfoCard, setShowInfoCard] = useState(false);
const [errorsType, setErrorsType] = useState({});
Expand Down
2 changes: 1 addition & 1 deletion .../micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ const SetupCampaign = ({ hierarchyType ,hierarchyData }) => {
attribute: attribute?.attribute?.code
? attribute?.attribute?.code
: typeof attribute?.attribute === "string"
? attribute?.attribute
? attribute?.attribute
: null,
operator: "GREATER_THAN_EQUAL_TO",
value: attribute.toValue ? Number(attribute.toValue) : null,
Expand Down
5 changes: 5 additions & 0 deletions health/micro-ui/web/micro-ui-internals/packages/modules/microplan/src/Module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ import { overrideHooks, updateCustomConfigs } from "./utils";
import MicroplanDetails from "./components/MicroplanDetails";
import CampaignDetails from "./components/CampaignDetails";
import { ProviderContext } from "./utils/context";
import HypothesisWrapper from "./components/HypothesisWrapper";


export const MicroplanModule = ({ stateCode, userType, tenants }) => {
const { path, url } = useRouteMatch();
const tenantId = Digit.ULBService.getCurrentTenantId();
Expand Down Expand Up @@ -38,6 +41,8 @@ const componentsToRegister = {
MicroplanCard,
CampaignDetails,
MicroplanDetails,
HypothesisWrapper,

};

export const initMicroplanComponents = () => {
Expand Down
2 changes: 1 addition & 1 deletion ...ro-ui/web/micro-ui-internals/packages/modules/microplan/src/components/CampaignDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const CampaignDetails = ({onSelect,props:customProps,...props}) => {
},
{schemaCode:"ProjectType"}
);


useEffect(() => {
onSelect(customProps.name,{
Expand Down
Loading