- Add shot name in project lobal selection

- Sort jobrole in edit employee
This commit is contained in:
Vikas Nale 2025-06-13 00:56:02 +05:30
parent 70ac3e0344
commit 31a9f55b63
2 changed files with 22 additions and 12 deletions

View File

@ -10,7 +10,11 @@ import { changeMaster } from "../../slices/localVariablesSlice";
import { Link, useNavigate, useParams } from "react-router-dom";
import { formatDate } from "../../utils/dateUtils";
import { useEmployeeProfile } from "../../hooks/useEmployees";
import { cacheData, clearCacheKey, getCachedData } from "../../slices/apiDataManager";
import {
cacheData,
clearCacheKey,
getCachedData,
} from "../../slices/apiDataManager";
import { clearApiCacheKey } from "../../slices/apiCacheSlice";
const mobileNumberRegex = /^[0-9]\d{9}$/;
@ -177,7 +181,6 @@ const ManageEmployee = ({ employeeId, onClosed }) => {
clearCacheKey("allEmployeeList");
clearCacheKey("allInactiveEmployeeList");
clearCacheKey("employeeProfile");
setLoading(false);
reset();
@ -238,10 +241,7 @@ const ManageEmployee = ({ employeeId, onClosed }) => {
{employee ? "Update Employee" : "Create Employee"}
</h6>
<span
className="cursor-pointer fs-6"
onClick={() => onClosed()}
>
<span className="cursor-pointer fs-6" onClick={() => onClosed()}>
<i className="bx bx-x"></i>
</span>
</div>
@ -509,11 +509,13 @@ const ManageEmployee = ({ employeeId, onClosed }) => {
<option disabled value="">
Select Role
</option>
{job_role?.map((item) => (
<option value={item?.id} key={item.id}>
{item?.name}{" "}
</option>
))}
{[...job_role]
.sort((a, b) => a.name.localeCompare(b.name))
.map((item) => (
<option value={item?.id} key={item.id}>
{item?.name}{" "}
</option>
))}
</select>
</div>
{errors.jobRoleId && (

View File

@ -145,7 +145,15 @@ const Header = () => {
dispatch(setProjectId(project?.id))
}
>
{project?.name}
{project?.name}{" "}
{project?.shortName ? (
<span class="text-primary fw-semibold">
{" "}
({project?.shortName})
</span>
) : (
""
)}
</button>
</li>
))}