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

Fixed PFM-4894 #611

Merged
merged 1 commit into from
Oct 11, 2023
Merged

Fixed PFM-4894 #611

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
18 changes: 15 additions & 3 deletions ...i/web/micro-ui-internals/packages/modules/hrms/src/components/Modal/EmployeeActivation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,17 @@ import { Dropdown, UploadFile } from "@egovernments/digit-ui-react-components";
import React from "react";
import { convertEpochToDate } from "../Utils/index";

export const configEmployeeActiveApplication = ({ t, action, selectFile, uploadedFile, setUploadedFile, selectedReason, Reasons, selectReason, employees = { } }) => {
export const configEmployeeActiveApplication = ({
t,
action,
selectFile,
uploadedFile,
setUploadedFile,
selectedReason,
Reasons,
selectReason,
employees = {},
}) => {
employees.deactivationDetails = employees?.deactivationDetails?.sort((y, x) => x?.auditDetails?.createdDate - y?.auditDetails?.createdDate);
return {
label: {
Expand Down Expand Up @@ -31,7 +41,7 @@ export const configEmployeeActiveApplication = ({ t, action, selectFile, uploade
label: t("HR_EFFECTIVE_DATE"),
type: "date",
isMandatory: true,
disable: true, /* Disabled date and set defaultvalue */
disable: true /* Disabled date and set defaultvalue */,
populators: {
error: t("HR_EFFECTIVE_DATE_INVALID"),
name: "effectiveFrom",
Expand All @@ -52,6 +62,8 @@ export const configEmployeeActiveApplication = ({ t, action, selectFile, uploade
onDelete={() => {
setUploadedFile(null);
}}
enableButton={true}
uploadedFiles={[]}
message={uploadedFile ? `1 ${t(`HR_ACTION_FILEUPLOADED`)}` : t(`HR_ACTION_NO_FILEUPLOADED`)}
/>
</div>
Expand All @@ -69,4 +81,4 @@ export const configEmployeeActiveApplication = ({ t, action, selectFile, uploade
},
],
};
};
};
3 changes: 1 addition & 2 deletions .../web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/assignment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,10 @@ const Assignments = ({ t, config, onSelect, userType, formData }) => {
toDate: assignment?.toDate ? new Date(assignment?.toDate).getTime() : undefined,
isCurrentAssignment: assignment?.isCurrentAssignment,
department: assignment?.department?.code,
designation: assignment?.designation?.code,
designation: STATE_ADMIN ? getdesignationdata()?.length > 0 && getdesignationdata()[0]?.code : assignment?.designation?.code,
})
: [];
});

Promise.all(promises).then(function (results) {
onSelect(
config.key,
Expand Down
16 changes: 16 additions & 0 deletions .../micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EditEmployee/EditForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,22 @@ const EditForm = ({ tenantId, data }) => {
});
jurisdictions = mappedData;
} else {
input.Jurisdictions.map((items) => {
let obj = {
hierarchy: items?.hierarchy,
boundaryType: items?.boundaryType,
boundary: items?.boundary,
tenantId: items?.tenantId,
roles: items?.roles,
};
data?.jurisdictions?.map((jurisdition) => {
if (jurisdition?.boundary === items?.boundary) {
obj["id"] = jurisdition.id;
obj["auditDetails"] = jurisdition.auditDetails;
}
});
jurisdictions.push(obj);
});
roles = input?.Jurisdictions?.map((ele) => {
return ele.roles?.map((item) => {
item["tenantId"] = ele.boundary;
Expand Down
2 changes: 1 addition & 1 deletion frontend/micro-ui/web/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link
href="https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400;500;700&family=Roboto:wght@400;500;700&display=swap"
rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.0-beta.5/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.5.29/dist/index.css" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#00bcd1" />
<title>mSeva</title>
Expand Down