Merge pull request #611 from rakesh-wt-egov/patch-3

Fixed PFM-4894
egovernments · Oct 11, 2023 · f17513d · f17513d
2 parents b213ecf + bd55a38
commit f17513d
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 6 deletions.
diff --git a/...i/web/micro-ui-internals/packages/modules/hrms/src/components/Modal/EmployeeActivation.js b/...i/web/micro-ui-internals/packages/modules/hrms/src/components/Modal/EmployeeActivation.js
@@ -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: {
@@ -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",
@@ -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>
@@ -69,4 +81,4 @@ export const configEmployeeActiveApplication = ({ t, action, selectFile, uploade
       },
     ],
   };
-};
+};
diff --git a/.../web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/assignment.js b/.../web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/assignment.js
@@ -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,

diff --git a/.../micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EditEmployee/EditForm.js b/.../micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/EditEmployee/EditForm.js
@@ -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;

diff --git a/frontend/micro-ui/web/public/index.html b/frontend/micro-ui/web/public/index.html
@@ -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>