diff --git a/src/components/Charts/HorizontalBarChart.jsx b/src/components/Charts/HorizontalBarChart.jsx
index c28778fc..99a924f0 100644
--- a/src/components/Charts/HorizontalBarChart.jsx
+++ b/src/components/Charts/HorizontalBarChart.jsx
@@ -42,7 +42,12 @@ const HorizontalBarChart = ({
categories.length === seriesData.length;
if (!hasValidData) {
- return
No data to display
;
+ return
+ No data found
+
}
// Combine seriesData and categories, then sort in descending order
const combined = seriesData.map((value, index) => ({
diff --git a/src/components/Dashboard/ProjectCompletionChart.jsx b/src/components/Dashboard/ProjectCompletionChart.jsx
index f1f63936..3b0ac27f 100644
--- a/src/components/Dashboard/ProjectCompletionChart.jsx
+++ b/src/components/Dashboard/ProjectCompletionChart.jsx
@@ -12,14 +12,17 @@ const ProjectCompletionChart = () => {
isError,
error,
} = useProjectCompletionStatus();
- const projectNames = projects?.map((p) => p.name) || [];
- const projectProgress =
- projects?.map((p) => {
- const completed = p.completedWork || 0;
- const planned = p.plannedWork || 1;
- const percent = planned ? (completed / planned) * 100 : 0;
- return Math.min(Math.round(percent), 100);
- }) || [];
+ const filteredProjects = projects?.filter((p) => p.completedWork > 0) || [];
+
+ const projectNames = filteredProjects.map((p) => p.name);
+
+ const projectProgress = filteredProjects.map((p) => {
+ const completed = p.completedWork || 0;
+ const planned = p.plannedWork || 1;
+ const percent = planned ? (completed / planned) * 100 : 0;
+ return Math.min(parseFloat(percent.toFixed(2)), 100); // limit to 2 decimals
+});
+
return (