diff --git a/src/components/Project/Infrastructure/WorkArea.jsx b/src/components/Project/Infrastructure/WorkArea.jsx
index 71e34d0e..2db2fb8b 100644
--- a/src/components/Project/Infrastructure/WorkArea.jsx
+++ b/src/components/Project/Infrastructure/WorkArea.jsx
@@ -108,7 +108,10 @@ const WorkArea = ({ workArea, floor, forBuilding }) => {
diff --git a/src/components/common/ProgressBar.jsx b/src/components/common/ProgressBar.jsx
index 947c6a00..90058584 100644
--- a/src/components/common/ProgressBar.jsx
+++ b/src/components/common/ProgressBar.jsx
@@ -3,35 +3,62 @@ import React from "react";
const ProgressBar = ({
plannedWork = 100,
completedWork = 0,
- height = "8px",
+ height = "6px",
className = "mb-4",
rounded = true,
+ showLabel = true,
}) => {
const getProgress = (planned, completed) => {
- if (!planned || planned === 0) return "0%";
- return `${Math.min((completed / planned) * 100, 100).toFixed(2)}%`;
+ if (!planned || planned === 0) return 0;
+ return Math.min((completed / planned) * 100, 100);
};
- const progressStyle = {
- width: getProgress(plannedWork, completedWork),
+ const percentage = getProgress(plannedWork, completedWork);
+
+ const progressBarStyle = {
+ width: `${percentage.toFixed(2)}%`,
+ transition: "width 0.4s ease",
+ };
+
+ const containerStyle = {
+ height,
+ display: "flex",
+ alignItems: "center",
+ gap: "8px",
};
return (
-
-
+
+
+
+ {showLabel && (
+
+ {percentage.toFixed(2)}%
+
+ )}
);
};
export default ProgressBar;
-