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

handle merge issues in chart and build error

Browse Source
This commit is contained in:
Vikas Nale 2025-05-05 17:47:02 +05:30
parent 56c8b31938
commit e0264030f5
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@ const HorizontalBarChart = ({
// Replace 0 with 1 for visual purposes, but display "0%" in labels // Replace 0 with 1 for visual purposes, but display "0%" in labels
const adjustedSeriesData = sortedSeriesData.map((val) => const adjustedSeriesData = sortedSeriesData.map((val) =>
val === 0 ? 0.1 : val val === 0 ? 0.5 : val
); );
// Dynamically adjust chart height if only one data point // Dynamically adjust chart height if only one data point

5
src/components/Project/Infrastructure/EditActivityModal.jsx
View File

@ -5,7 +5,6 @@ import { z } from "zod";
import { useActivitiesMaster } from "../../../hooks/masterHook/useMaster"; import { useActivitiesMaster } from "../../../hooks/masterHook/useMaster";
import { useProjectDetails } from "../../../hooks/useProjects"; import { useProjectDetails } from "../../../hooks/useProjects";
import useSelect from "../../common/useSelect";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import ProjectRepository from "../../../repositories/ProjectRepository"; import ProjectRepository from "../../../repositories/ProjectRepository";
import { import {
@ -85,7 +84,7 @@ const EditActivityModal = ({
floorId: floor?.id, floorId: floor?.id,
workAreaId: workArea?.id, workAreaId: workArea?.id,
}; };
console.log(finalData) console.log(finalData);
ProjectRepository.manageProjectTasks([finalData]) ProjectRepository.manageProjectTasks([finalData])
.then((response) => { .then((response) => {
@ -140,7 +139,7 @@ const EditActivityModal = ({
cacheData("projectInfo", { cacheData("projectInfo", {
projectId: newProject.id, projectId: newProject.id,
data: newProject, data: newProject,
} ); });
resetForm(); resetForm();
dispatch(refreshData(true)); dispatch(refreshData(true));
onClose(); onClose();