Compare commits

..

No commits in common. "195ebd4f9b3e8210af3eeed9f7211675c1ccf158" and "18d6916fb8f99830b90a99bae8a5ecfeb8c50aa0" have entirely different histories.

View File

@ -8,21 +8,16 @@ import { useProfile } from "../../hooks/useProfile";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import Avatar from "../../components/common/Avatar"; import Avatar from "../../components/common/Avatar";
import { useChangePassword } from "../Context/ChangePasswordContext"; import { useChangePassword } from "../Context/ChangePasswordContext";
import { useProjects } from "../../hooks/useProjects"; import {useProjects} from "../../hooks/useProjects";
import {useEffect, useState} from "react"; import {useEffect, useState} from "react";
const Header = () => { const Header = () => {
const {profile} = useProfile(); const {profile} = useProfile();
// const { projects, loading: projectLoading } = useProjects(); const [selectedProjectId, setSelectedProjectId] = useState("all");
// const selectedProject = useSelector(
// (store) => store.localVariables.projectId
// );
// const [selectedProjectId, setSelectedProjectId] = useState("all");
const dispatch = useDispatch(changeMaster("Job Role")); const dispatch = useDispatch(changeMaster("Job Role"));
const { data, loading } = useMaster(); const { data, loading } = useMaster();
const navigate = useNavigate(); const navigate = useNavigate();
const {projects, loading:projectLoading} = useProjects()
const selectedProject = useSelector((store)=>store. localVariables.projectId)
const getRole = (roles, joRoleId) => { const getRole = (roles, joRoleId) => {
if (!Array.isArray(roles)) return "User"; if (!Array.isArray(roles)) return "User";
@ -68,33 +63,17 @@ const Header = () => {
const handleProfilePage = () => { const handleProfilePage = () => {
navigate(`/employee/${profile?.employeeInfo?.id}?for=attendance`); navigate(`/employee/${profile?.employeeInfo?.id}?for=attendance`);
}; };
const { projects, loading: projectLoading } = useProjects(); const handleProjectselection = (project) =>
const selectedProject = useSelector(
(store) => store.localVariables.projectId
);
const selectedProjectName = projects?.find(
(p) => p?.id === selectedProject
)?.name;
let displayText = "";
if (selectedProjectName) {
displayText = selectedProjectName;
} else if (projectLoading && selectedProject) {
displayText = selectedProject;
} else if (projectLoading) {
displayText = "Loading...";
}
const { openChangePassword } = useChangePassword();
useEffect( () =>
{ {
if ( projects && selectedProject !== ' ') useDispatch(setProjectId(project.id))
{ setProject(project)
dispatch(setProjectId(projects[0]?.id))
} }
},[projects])
const {openChangePassword} = useChangePassword();
return ( return (
<nav <nav
className="layout-navbar container-xxl navbar navbar-expand-xl navbar-detached align-items-center bg-navbar-theme" className="layout-navbar container-xxl navbar navbar-expand-xl navbar-detached align-items-center bg-navbar-theme"
@ -112,8 +91,9 @@ if (selectedProjectName) {
className="navbar-nav-right d-flex align-items-center justify-content-between" className="navbar-nav-right d-flex align-items-center justify-content-between"
id="navbar-collapse" id="navbar-collapse"
> >
{/* Search */}
<div className=" align-items-center"> <div className=" align-items-center">
{/* {/*
<li className="nav-item "> <li className="nav-item ">
<label> <label>
<select <select
@ -139,17 +119,21 @@ if (selectedProjectName) {
</label> </label>
</li> */} </li> */}
<div className="btn-group"> <div className="btn-group">
<button <button
className="btn btn-sm-sm btn-xl dropdown-toggle" className="btn btn-outline-primary btn-sm dropdown-toggle"
type="button" type="button"
data-bs-toggle="dropdown" data-bs-toggle="dropdown"
aria-expanded="false" aria-expanded="false"
> >
{displayText} {selectedProject === " "
? "All Projects"
: projects?.find((p) => p?.id === selectedProject)?.name || "Select Project"}
</button> </button>
<ul className="dropdown-menu"> <ul className="dropdown-menu">
{projects?.map((project) => ( {projects?.map((project) => (
<li key={project?.id}> <li key={project?.id}>
<button <button
@ -194,7 +178,10 @@ if (selectedProjectName) {
</div> */} </div> */}
</div> </div>
{/* icon list */}
<ul className="navbar-nav flex-row align-items-center ms-md-auto"> <ul className="navbar-nav flex-row align-items-center ms-md-auto">
<li className="nav-item dropdown-shortcuts navbar-dropdown dropdown me-2 me-xl-0"> <li className="nav-item dropdown-shortcuts navbar-dropdown dropdown me-2 me-xl-0">
<a <a
className="nav-link dropdown-toggle hide-arrow" className="nav-link dropdown-toggle hide-arrow"
@ -701,9 +688,7 @@ if (selectedProjectName) {
</span> </span>
</a> </a>
</li> </li>
<li onClick={openChangePassword}> <li onClick={openChangePassword}> {/* Use the function from the context */}
{" "}
{/* Use the function from the context */}
<a <a
aria-label="go to profile" aria-label="go to profile"
className="dropdown-item cusor-pointer" className="dropdown-item cusor-pointer"