removed scrollbar on dashbord graph

This commit is contained in:
pramod mahajan 2025-07-15 17:52:56 +05:30
parent 47e458fe7c
commit 0126d38b57
5 changed files with 14 additions and 9 deletions

View File

@ -117,7 +117,7 @@ const LineChart = ({
return (
<div className="w-full overflow-x-auto">
<div className="w-full overflow-x-false">
<ReactApexChart
options={chartOptions}
series={seriesData}

View File

@ -31,7 +31,9 @@ const WorkItem = ({
forWorkArea,
deleteHandleTask,
}) => {
const { projectId } = useParams();
// const { projectId } = useParams();
const isTaskPlanning = /^\/activities\/task$/.test(location.pathname);
const [itemName, setItemName] = useState("");
const [NewWorkItem, setNewWorkItem] = useState();
const [isModalOpen, setIsModalOpen] = useState(false);
@ -244,7 +246,7 @@ const WorkItem = ({
<td className="text-end align-items-middle border-top">
{/* Desktop (md and up): inline icons */}
<div className="d-none d-md-flex justify-content-end gap-1 px-2">
{!projectId &&
{isTaskPlanning &&
ManageAndAssignTak &&
PlannedWork !== CompletedWork && (
<i
@ -284,7 +286,7 @@ const WorkItem = ({
></i>
<ul className="dropdown-menu dropdown-menu-start">
{!projectId &&
{isTaskPlanning &&
ManageAndAssignTak &&
PlannedWork !== CompletedWork && (
<li>

View File

@ -26,7 +26,7 @@ const ProjectNav = ({ onPillClick, activePill }) => {
</li>
<li className="nav-item">
<a
className={`nav-link ${activePill === "teams" ? "active" : ""}fs-6`}
className={`nav-link ${activePill === "teams" ? "active" : ""} fs-6`}
href="#"
onClick={(e) => {
e.preventDefault();
@ -53,7 +53,7 @@ const ProjectNav = ({ onPillClick, activePill }) => {
<a
className={`nav-link ${
activePill === "imagegallary" ? "active" : ""
}fs-6`}
} fs-6`}
href="#"
onClick={(e) => {
e.preventDefault(); // Prevent page reload

View File

@ -7,7 +7,7 @@ import Avatar from "../common/Avatar";
import moment from "moment";
import ProjectRepository from "../../repositories/ProjectRepository";
import { useDispatch } from "react-redux";
import { useDispatch, useSelector } from "react-redux";
import { changeMaster } from "../../slices/localVariablesSlice";
import useMaster from "../../hooks/masterHook/useMaster";
import { useHasUserPermission } from "../../hooks/useHasUserPermission";
@ -18,7 +18,8 @@ import {useEmployeesByProjectAllocated, useManageProjectAllocation} from "../../
const Teams = () =>
{
const {projectId} = useParams()
// const {projectId} = useParams()
const projectId = useSelector((store)=>store.localVariables.projectId)
const dispatch = useDispatch();
const { data, loading } = useMaster();

View File

@ -266,7 +266,8 @@ const AttendancePage = () => {
<div className="tab-content attedanceTabs py-0 px-1 px-sm-3">
{activeTab === "all" && (
<>
<div className="tab-pane fade show active py-0">
{!attLoading && (
<div className="tab-pane fade show active py-0">
<Attendance
attendance={filteredAttendance}
handleModalData={handleModalData}
@ -275,6 +276,7 @@ const AttendancePage = () => {
showOnlyCheckout={ShowPending}
/>
</div>
)}
{!attLoading && filteredAttendance?.length === 0 && (
<p>
{" "}