diff --git a/frontend/src/components/pages/Home.vue b/frontend/src/components/pages/Home.vue index 48afc0f..ff40426 100644 --- a/frontend/src/components/pages/Home.vue +++ b/frontend/src/components/pages/Home.vue @@ -350,14 +350,14 @@ const chartData = ref({ hydroseed: {labels: ["To-do", "Completed", "Overdue"], data: [0, 0, 0], colors: defaultColors}, permitFinalizations: {labels: ["Todo", "Completed", "Overdue"], data: [0, 0, 0], colors: defaultColors}, warranties: {labels: ["To-do", "Completed", "Overdue"], data: [0, 0, 0], colors: defaultColors}, - bids: {labels: ["To-do", "Completed", "Overdue"], data: [0, 0, 0], colors: defaultColors}, - estimates: {labels: ["To-do", "Completed", "Overdue"], data: [0, 0, 0], colors: defaultColors}, - halfDown: {labels: ["To-do", "Completed", "Overdue"], data: [0, 0, 0], colors: defaultColors}, fifteenDayFollowups: {labels: ["To-do", "Completed", "Overdue"], data: [0, 0, 0], colors: defaultColors}, lateBalances: {labels: ["To-do", "Completed", "Overdue"], data: [0, 0, 0], colors: defaultColors}, backflows: {labels: ["To-do", "Completed", "Overdue"], data: [0, 0, 0], colors: defaultColors}, machines: {labels: ["To-do", "Completed", "Overdue"], data: [0, 0, 0], colors: defaultColors}, deliveries: {labels: ["To-do", "Completed", "Overdue"], data: [0, 0, 0], colors: defaultColors}, + bids: {labels: ["Unscheduled"], data: [0], colors: ['red']}, + estimates: {labels: ["Draft", "Submitted"], data: [0, 0], colors: ['orange', 'blue']}, + halfDown: {labels: ["Unpaid"], data: [0], colors: ['red']}, }); const notifications = useNotificationStore(); @@ -376,11 +376,17 @@ const navigateTo = (path) => { const loadChartData = async() => { chartData.value.locates.data = await Api.getTasksDue("Locate", companyStore.currentCompany); - chartData.value.permits.data = await Api.getTasksDue("Permit", companyStore.currentCompany); + chartData.value.permits.data = await Api.getTasksDue("Permit(s)", companyStore.currentCompany); chartData.value.curbing.data = await Api.getTasksDue("Curbing", companyStore.currentCompany); chartData.value.hydroseed.data = await Api.getTasksDue("Hydroseed", companyStore.currentCompany); + chartData.value.permitFinalizations.data = await Api.getTasksDue("Permit Close-out", companyStore.currentCompany); + chartData.value.warranties.data = await Api.getTasksDue("Warranty", companyStore.currentCompany); + chartData.value.fifteenDayFollowups.data = await Api.getTasksDue("15-Day QA", companyStore.currentCompany); + chartData.value.backflows.data = await Api.getTasksDue("Backflow", companyStore.currentCompany); //Uncomment below when we can check if half-down payments have/can been paid //chartData.value.estimates.data = await Api.getEstimatesHalfDownCount(); + chartData.value.bids.data = await Api.getIncompleteBidsCount(companyStore.currentCompany); + chartData.value.estimates.data = await Api.getUnapprovedEstimatesCount(companyStore.currentCompany); }; onMounted(async() => { @@ -389,7 +395,6 @@ onMounted(async() => { }); watch(() => companyStore.currentCompany, async (newCompany, oldCompany) => { - console.log("Wathcing for new Company"); await loadChartData(); });