diff --git a/src/components/Dashboard/Dashboard.jsx b/src/components/Dashboard/Dashboard.jsx
index ed549913..31f214d7 100644
--- a/src/components/Dashboard/Dashboard.jsx
+++ b/src/components/Dashboard/Dashboard.jsx
@@ -54,6 +54,9 @@ const Dashboard = () => {
+
+
+
);
};
diff --git a/src/components/Dashboard/ExpenseByProject.jsx b/src/components/Dashboard/ExpenseByProject.jsx
index 66cbdd45..bd7e115d 100644
--- a/src/components/Dashboard/ExpenseByProject.jsx
+++ b/src/components/Dashboard/ExpenseByProject.jsx
@@ -3,6 +3,8 @@ import Chart from "react-apexcharts";
import { useExpenseType } from "../../hooks/masterHook/useMaster";
import { useSelector } from "react-redux";
import { useExpenseDataByProject } from "../../hooks/useDashboard_Data";
+import { formatCurrency } from "../../utils/appUtils";
+import { formatDate_DayMonth } from "../../utils/dateUtils";
const ExpenseByProject = () => {
const projectId = useSelector((store) => store.localVariables.projectId);
@@ -22,7 +24,7 @@ const ExpenseByProject = () => {
useEffect(() => {
if (expenseApiData) {
const categories = expenseApiData.map(
- (item) => `${item.monthName} ${item.year}`
+ (item) => formatDate_DayMonth(item.monthName, item.year)
);
const data = expenseApiData.map((item) => item.total);
setChartData({ categories, data });
@@ -40,16 +42,17 @@ const ExpenseByProject = () => {
const options = {
chart: { type: "bar", toolbar: { show: false } },
plotOptions: { bar: { horizontal: false, columnWidth: "55%", borderRadius: 4 } },
- dataLabels: { enabled: true, formatter: (val) => val },
+ dataLabels: { enabled: true, formatter: (val) => formatCurrency(val) },
xaxis: {
categories: chartData.categories,
labels: { style: { fontSize: "12px" }, rotate: -45 },
},
tooltip: {
y: {
- formatter: (val) => `${val.toLocaleString()} (${getSelectedTypeName()})`,
+ formatter: (val) => `${formatCurrency(val)} (${getSelectedTypeName()})`,
},
},
+
annotations: { xaxis: [{ x: 0, strokeDashArray: 0, }] },
fill: { opacity: 1 },
colors: ["#2196f3"],
@@ -131,8 +134,8 @@ const ExpenseByProject = () => {