Merge branch 'Issues_Sep_1W' into Document_Manag

# Conflicts: # src/pages/Activities/DailyTask.jsx # src/pages/master/MasterPage.jsx
2025-09-10 10:37:38 +05:30 · 2025-09-10 10:37:38 +05:30 · 5ec5218dd6
commit 5ec5218dd6
parent 849709ad05 b02893fd98
8 changed files with 75 additions and 131 deletions
--- a/src/components/Directory/ManageDirectory.jsx
+++ b/src/components/Directory/ManageDirectory.jsx
@ -41,7 +41,7 @@ const ManageDirectory = ({ submitContact, onCLosed }) => {
  const { designationList, loading: designloading } = useDesignation();
  const { contactTags, loading: Tagloading } = useContactTags();
  const [IsSubmitting, setSubmitting] = useState(false);
-  const [showSuggestions,setShowSuggestions] = useState(false);
+  const [showSuggestions, setShowSuggestions] = useState(false);
  const [filteredDesignationList, setFilteredDesignationList] = useState([]);
  const dispatch = useDispatch();

@ -133,6 +133,12 @@ const ManageDirectory = ({ submitContact, onCLosed }) => {
    setValue("designation", val);
  };

+  // Handle phone number input to only allow numbers and max length of 10
+  const handlePhoneInput = (e) => {
+    const value = e.target.value.replace(/[^0-9]/g, "");
+    e.target.value = value.slice(0, 10);
+  };
+

  const toggleBucketId = (id) => {
    const updated = watchBucketIds?.includes(id)
@ -278,23 +284,11 @@ const ManageDirectory = ({ submitContact, onCLosed }) => {
                      placeholder="email@example.com"
                    />
                    {index === emailFields.length - 1 ? (
-                      // <button
-                      //   type="button"
-                      //   className="btn btn-xs btn-primary ms-1"
-                      //   onClick={handleAddEmail}
-                      //   style={{ width: "24px", height: "24px" }}
-                      // >
                      <i
                        className="bx bx-plus-circle bx-xs ms-1 cursor-pointer text-primary"
                        onClick={handleAddEmail}
                      />
                    ) : (
-                      // <button
-                      //   type="button"
-                      //   className="btn btn-xs btn-danger ms-1 p-0"
-                      //   onClick={() => removeEmail(index)}
-                      //   style={{ width: "24px", height: "24px" }}
-                      // >
                      <i
                        className="bx bx-minus-circle bx-xs ms-1 cursor-pointer text-primary"
                        onClick={() => removeEmail(index)}
@ -336,29 +330,19 @@ const ManageDirectory = ({ submitContact, onCLosed }) => {
                  <label className="form-label">Phone</label>
                  <div className="d-flex align-items-center">
                    <input
-                      type="text"
+                      type="tel"
                      className="form-control form-control-sm"
                      {...register(`contactPhones.${index}.phoneNumber`)}
                      placeholder="9876543210"
+                      onInput={handlePhoneInput}
+                      maxLength={10}
                    />
                    {index === phoneFields.length - 1 ? (
-                      // <button
-                      //   type="button"
-                      //   className="btn btn-xs btn-primary ms-1"
-                      //   onClick={handleAddPhone}
-                      //   style={{ width: "24px", height: "24px" }}
-                      // >
                      <i
                        className="bx bx-plus-circle bx-xs ms-1 cursor-pointer text-primary"
                        onClick={handleAddPhone}
                      />
                    ) : (
-                      // <button
-                      //   type="button"
-                      //   className="btn btn-xs btn-danger ms-1"
-                      //   onClick={() => removePhone(index)}
-                      //   style={{ width: "24px", height: "24px" }}
-                      // >
                      <i
                        className="bx bx-minus-circle bx-xs ms-1 cursor-pointer text-danager"
                        onClick={() => removePhone(index)}
--- a/src/components/Directory/UpdateContact.jsx
+++ b/src/components/Directory/UpdateContact.jsx
@ -122,6 +122,11 @@ const UpdateContact = ({ submitContact, existingContact, onCLosed }) => {
    setValue("designation", val);
  };

+  const handlePhoneInput = (e) => {
+    const value = e.target.value.replace(/[^0-9]/g, "");
+    e.target.value = value.slice(0, 10);
+  };
+
  const watchBucketIds = watch("bucketIds");

  const toggleBucketId = (id) => {
@ -378,10 +383,12 @@ const UpdateContact = ({ submitContact, existingContact, onCLosed }) => {
                  <label className="form-label">Phone</label>
                  <div className="d-flex align-items-center">
                    <input
-                      type="text"
+                      type="tel"
                      className="form-control form-control-sm"
                      {...register(`contactPhones.${index}.phoneNumber`)}
                      placeholder="9876543210"
+                      onInput={handlePhoneInput}
+                      maxLength={10}
                    />
                    {index === phoneFields.length - 1 ? (
                      // <button
--- a/src/components/Employee/EmpActivities.jsx
+++ b/src/components/Employee/EmpActivities.jsx
@ -25,7 +25,7 @@ error,
        <div className="card-body">
          <div className="my-0 text-start">
            <DateRangePicker
-              DateDifference="30"
+              DateDifference="7"
              onRangeChange={setDateRange}
              endDateMode="today"
            />
--- a/src/components/Employee/EmpAttendance.jsx
+++ b/src/components/Employee/EmpAttendance.jsx
@ -128,7 +128,7 @@ const EmpAttendance = ({ employee }) => {
        >
          <div className="col-md-4 my-0 ">
            <DateRangePicker
-              DateDifference="30"
+              DateDifference="7"
              onRangeChange={setDateRange}
              endDateMode="today"
            />
--- a/src/components/Employee/EmpOverview.jsx
+++ b/src/components/Employee/EmpOverview.jsx
@ -142,13 +142,14 @@ const EmpOverview = ({ profile }) => {
            </div>

            {/* Address */}
-            <div className="d-flex align-items-start">
-              <span className="d-flex">
+           <div className="d-flex align-items-start">
+              <span className="d-flex align-items-center">
                <i className="bx bx-map bx-xs me-2 mt-1"></i>
-                <span>Address</span>
+                <span className="text-nowrap">Address</span>
              </span>
+
              <span style={{ marginLeft: "86px" }}>:</span>
-              <span className="ms-5">
+              <span className="ms-5" style={{ marginRight: "75px" }}>
                {profile?.currentAddress || <em>NA</em>}
              </span>
            </div>
--- a/src/components/common/FilterIcon.jsx
+++ b/src/components/common/FilterIcon.jsx
@ -30,7 +30,7 @@ const FilterIcon = ({
  }, [currentSelectedBuilding, currentSelectedFloors, currentSelectedActivities, selectedProject]);

  const getUniqueFilterValues = (key, overrideBuilding, overrideFloors) => {
-    if (!taskListData) return [];
+    if (!taskListData || taskListData.length === 0) return [];

    let filteredTasks = [...taskListData];

@ -125,6 +125,11 @@ const FilterIcon = ({
  const appliedFilterCount =
    (appliedBuilding ? 1 : 0) + appliedFloors.length + appliedActivities.length;

+  // ✅ Hide filter if no task data
+  if (!taskListData || taskListData.length === 0) {
+    return null;
+  }
+
  return (
    <div className="dropdown" style={{ marginLeft: "-14px", position: "relative" }}>
      <a
--- a/src/pages/employee/EmployeeList.jsx
+++ b/src/pages/employee/EmployeeList.jsx
@ -612,9 +612,10 @@ useEffect(() => {
                              {item.jobRole || "Not Assign Yet"}
                            </span>
                          </td>
-
                          <td className=" d-none  d-md-table-cell">
-                            {moment(item.joiningDate)?.format("DD-MMM-YYYY")}
+                            {item.joiningDate
+                              ? moment(item.joiningDate).format("DD-MMM-YYYY")
+                              : "NA"}
                          </td>
                          <td>
                            {showInactive ? (
--- a/src/pages/master/MasterPage.jsx
+++ b/src/pages/master/MasterPage.jsx
@ -4,45 +4,43 @@ import MasterModal from "../../components/master/MasterModal";
 import { mastersList } from "../../data/masters";
 import { useDispatch, useSelector } from "react-redux";
 import { changeMaster } from "../../slices/localVariablesSlice";
-import useMaster, {
-  useDeleteMasterItem,
-  useMasterMenu,
-} from "../../hooks/masterHook/useMaster";
+import useMaster, { useMasterMenu } from "../../hooks/masterHook/useMaster"
 import MasterTable from "./MasterTable";
 import { getCachedData } from "../../slices/apiDataManager";
 import { useHasUserPermission } from "../../hooks/useHasUserPermission";
 import { MANAGE_MASTER } from "../../utils/constants";
 import { useQueryClient } from "@tanstack/react-query";
-import GlobalModel from "../../components/common/GlobalModel";
-import ConfirmModal from "../../components/common/ConfirmModal";
+

 const MasterPage = () => {
-  const { data, isLoading, isError, error: menuError } = useMasterMenu();
-  const [modalConfig, setModalConfig] = useState(null);
-  const [searchTerm, setSearchTerm] = useState("");
+  const {data,isLoading,isError,error:menuError} = useMasterMenu()
+  const [modalConfig, setModalConfig] = useState({ modalType: "", item: null, masterType: null });
+  const [searchTerm, setSearchTerm] = useState('');
  const [filteredResults, setFilteredResults] = useState([]);
  const [isCreateModalOpen, setIsCreateModalOpen] = useState(false);

  const hasMasterPermission = useHasUserPermission(MANAGE_MASTER);
  const dispatch = useDispatch();
-  const selectedMaster = useSelector(
-    (store) => store.localVariables.selectedMaster
-  );
+  const selectedMaster = useSelector((store) => store.localVariables.selectedMaster);
  const queryClient = useQueryClient();

-  const {
-    data: masterData = [],
-    loading,
-    error,
-    RecallApi,
-    isError: isMasterError,
-  } = useMaster();
-  const { mutate: deleteMasterItem, isPending } = useDeleteMasterItem();
+  const { data: masterData = [], loading, error, RecallApi,isError:isMasterError } = useMaster();
+
  const openModal = () => setIsCreateModalOpen(true);

  const closeModal = () => {
    setIsCreateModalOpen(false);
    setModalConfig(null);
+
+    // Clean up Bootstrap modal manually
+    const modalEl = document.getElementById('master-modal');
+    modalEl?.classList.remove('show');
+    if (modalEl) modalEl.style.display = 'none';
+
+    document.body.classList.remove('modal-open');
+    document.body.style.overflow = 'auto';
+
+    document.querySelectorAll('.modal-backdrop').forEach((el) => el.remove());
  };

  const handleModalData = (modalType, item, masterType = selectedMaster) => {
@ -56,17 +54,15 @@ const MasterPage = () => {
    if (!masterData?.length) return;

    const results = masterData.filter((item) =>
-      Object.values(item).some((field) =>
-        field?.toString().toLowerCase().includes(value)
+      Object.values(item).some(
+        (field) => field?.toString().toLowerCase().includes(value)
      )
    );
    setFilteredResults(results);
  };
  const displayData = useMemo(() => {
    if (searchTerm) return filteredResults;
-    return (
-      queryClient.getQueryData(["masterData", selectedMaster]) || masterData
-    );
+    return queryClient.getQueryData(["masterData", selectedMaster]) || masterData;
  }, [searchTerm, filteredResults, selectedMaster, masterData]);

  const columns = useMemo(() => {
@ -77,12 +73,9 @@ const MasterPage = () => {
    }));
  }, [displayData]);

-useEffect(() => {
-  if (modalConfig?.modalType && modalConfig?.modalType !== "delete") {
-    openModal();
-  }
-}, [modalConfig]);
-
+  useEffect(() => {
+    if (modalConfig) openModal();
+  }, [modalConfig]);

  useEffect(() => {
    return () => {
@ -91,46 +84,15 @@ useEffect(() => {
    };
  }, []);

-  if (isError || isMasterError)
-    return (
-      <div className="d-flex flex-column align-items-center justify-content-center py-5">
-        <h4 className=" mb-3">
-          <i className="fa-solid fa-triangle-exclamation fs-5" /> Oops, an error
-          occurred
-        </h4>
-        <p className="text-muted">{error?.message || menuError?.message}</p>
-      </div>
-    );
+  if(isError || isMasterError) return <div className="d-flex flex-column align-items-center justify-content-center py-5">
+      <h4 className=" mb-3"><i className="fa-solid fa-triangle-exclamation fs-5" /> Oops, an error occurred</h4>
+      <p className="text-muted">{error?.message || menuError?.message}</p>
+  </div>
  return (
    <>
-      {modalConfig?.modalType === "delete" && (
-        <ConfirmModal
-          type="delete"
-          header={`Delete ${modalConfig.masterType}`}
-          message="Are you sure you want to delete?"
-          onSubmit={() => {
-            deleteMasterItem(
-              {
-                masterType: modalConfig.masterType,
-                item: modalConfig.item,
-                validateFn: modalConfig.validateFn,
-              },
-              { onSuccess: closeModal }
-            );
-          }}
-          onClose={closeModal}
-          loading={isPending}
-          isOpen={true}
-        />
-      )}
-      {isCreateModalOpen && modalConfig?.modalType !== "delete" && (
-        <GlobalModel
-          isOpen={isCreateModalOpen}
-          closeModal={closeModal}
-          size={modalConfig?.masterType === "Application Role" ? "lg" : "md"}
-        >
-          <MasterModal modaldata={modalConfig} closeModal={closeModal} />
-        </GlobalModel>
+      {isCreateModalOpen && (
+        <MasterModal modaldata={modalConfig} closeModal={closeModal} />
+
      )}

      <div className="container-fluid">
@ -157,20 +119,15 @@ useEffect(() => {
                      >
                        <label>
                          <select
-                            onChange={(e) =>
-                              dispatch(changeMaster(e.target.value))
-                            }
+                            onChange={(e) => dispatch(changeMaster(e.target.value))}
                            name="DataTables_Table_0_length"
                            aria-controls="DataTables_Table_0"
                            className="form-select py-1 px-2"
-                            style={{ fontSize: "0.875rem", height: "32px", width: "170px" }}
+                            style={{ fontSize: "0.875rem", height: "32px", width: "190px" }}
                            value={selectedMaster}
                          >
-                            {isLoading && (
-                              <option value={null}>Loading...</option>
-                            )}
+                            {isLoading && <option value="">Loading...</option>}
                            {!isLoading &&
-                              data &&
                              data?.map((item) => (
                                <option key={item.id} value={item.name}>
                                  {item.name}
@ -198,13 +155,10 @@ useEffect(() => {
                          ></input>
                        </label>
                      </div>
-                      <div
-                        className={`dt-buttons btn-group flex-wrap ${
-                          !hasMasterPermission && "d-none"
-                        }`}
-                      >
+                      <div className={`dt-buttons btn-group flex-wrap ${!hasMasterPermission && 'd-none'}`}>
                        {" "}
                        <div className="input-group">
+
                          <button
                            className={`btn btn-sm  add-new btn-primary `}
                            tabIndex="0"
@ -213,17 +167,13 @@ useEffect(() => {
                            data-bs-toggle="modal"
                            data-bs-target="#master-modal"
                            onClick={() => {
-                              handleModalData(
-                                selectedMaster,
-                                null,
-                                selectedMaster
-                              );
+                              handleModalData(selectedMaster, "null", selectedMaster)
                            }}
                          >
                            <span>
                              <i className="bx bx-plus-circle me-2"></i>
                              <span className=" d-sm-inline-block">
-                                Add {selectedMaster}
+                                Add  {selectedMaster}
                              </span>
                            </span>
                          </button>{" "}
@ -233,17 +183,13 @@ useEffect(() => {
                  </div>
                </div>

-                <MasterTable
-                  data={displayData}
-                  columns={columns}
-                  loading={loading}
-                  handleModalData={handleModalData}
-                />
+                <MasterTable data={displayData} columns={columns} loading={loading} handleModalData={handleModalData} />
                <div style={{ width: "1%" }}></div>
              </div>
            </div>
          </div>
        </div>
+
      </div>
    </>
  );