admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

removed scrollbar on dashbord graph

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Charts/LineChart.jsx
View File

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

8
src/components/Project/Infrastructure/WorkItem.jsx
View File

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

4
src/components/Project/ProjectNav.jsx
View File

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

5
src/components/Project/Teams.jsx
View File

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

4
src/pages/Activities/AttendancePage.jsx
View File

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