Added Company filter for chart data on Home page.

custom_ui/api/db/jobs.py

@@ -25,7 +25,7 @@ def create_job_from_sales_order(sales_order_name):
     try:
         sales_order = frappe.get_doc("Sales Order", sales_order_name)
         project_template = frappe.get_doc("Project Template", "SNW Install")
-        new_job = frappe.get_doc({
+        new_project = frappe.get_doc({
             "doctype": "Project",
             "custom_address": sales_order.custom_job_address,
             # "custom_installation_address": sales_order.custom_installation_address,
@@ -35,13 +35,22 @@ def create_job_from_sales_order(sales_order_name):
             "sales_order": sales_order,
             "custom_company": sales_order.company
         })
-        new_job.insert()
+        new_project.insert()
+        for sales_order_item in sales_order.items:
+            new_task = frappe.get_doc({
+                "doctype": "Task",
+                "project": new_project.name,
+                "company": sales_order.company,
+                "custom_property": sales_order.custom_job_address,
+                "subject": sales_order_item.description,
+            })
+            new_task.insert()
         # Iterate through new tasks (if any) and set customer, address
         # job_tasks = frappe.get_all("Task", filters={"Project": new_job.name})
         # for task in job_tasks:
         #     task.custom_property = new_job.job_address
         #     task.save()
-        return build_success_response(new_job.as_dict())
+        return build_success_response(new_project.as_dict())
     except Exception as e:
         return build_error_response(str(e), 500)
 

custom_ui/api/db/tasks.py

@@ -43,33 +43,32 @@ def get_task_status_options():
 
 
 @frappe.whitelist()
-def get_tasks_due(subject_filter):
+def get_tasks_due(subject_filter, current_company):
     """Return the number of items due today of the type of subject_filter"""
     try:
-        filters = {
-            'subject': ['like', f'%{subject_filter}%'],
-            'status': ['not in', ["Template", "Completed", "Cancelled"]]
-        }
-        count = frappe.db.count("Task", filters=filters)
-        return build_success_response(count)
-    except frappe.ValidationError as ve:
-        return build_error_response(str(ve), 400)
-    except Exception as e:
-        return build_error_response(str(e), 500)
 
-
+        due_filters = {
-@frappe.whitelist()
-def get_tasks_completed(subject_filter):
-    """Return the number of items due today marked complete of the type of subject_filter"""
-    try:
-        filters = {
             'subject': ['like', f'%{subject_filter}%'],
-            'status': ['not in', ["Template", "Cancelled"]]
+            'status': ['not in', ["Template", "Completed", "Cancelled"]],
+            'company': current_company,
+            # Add due date filter here
         }
-        print("Completed Task filter", filters)
+        completed_filters = {
-        count = frappe.db.count("Task", filters=filters)
+            'subject': ['like', f'%{subject_filter}%'],
-        print("Matching Records:", count)
+            'status': ['not in', ["Template", "Cancelled"]],
-        return build_success_response(count)
+            'company': current_company,
+            # Add due date filter here
+        }
+        overdue_filters = {
+            'subject': ['like', f'%{subject_filter}%'],
+            'status': ['not in', ["Template", "Completed", "Cancelled"]],
+            'company': current_company,
+            # Add overdue date filtering here
+        }
+        due_count = frappe.db.count("Task", filters=due_filters)
+        completed_count = frappe.db.count("Task", filters=completed_filters)
+        overdue_count = frappe.db.count("Task", filters=overdue_filters)
+        return build_success_response([due_count, completed_count, overdue_count])
     except frappe.ValidationError as ve:
         return build_error_response(str(ve), 400)
     except Exception as e:

frontend/src/api.js

@@ -14,6 +14,8 @@ const FRAPPE_LOCK_ESTIMATE_METHOD = "custom_ui.api.db.estimates.lock_estimate";
 const FRAPPE_ESTIMATE_UPDATE_RESPONSE_METHOD = "custom_ui.api.db.estimates.manual_response";
 const FRAPPE_GET_ESTIMATE_TEMPLATES_METHOD = "custom_ui.api.db.estimates.get_estimate_templates";
 const FRAPPE_CREATE_ESTIMATE_TEMPLATE_METHOD = "custom_ui.api.db.estimates.create_estimate_template";
+const FRAPPE_GET_UNAPPROVED_ESTIMATES_COUNT_METHOD = "custom_ui.api.db.estimates.get_unnaproved_estimates_count";
+const FRAPPE_GET_ESTIMATES_HALF_DOWN_COUNT_METHOD = "custom_ui.api.db.estimates.get_estimates_half_down_count";
 // Job methods
 const FRAPPE_GET_JOB_METHOD = "custom_ui.api.db.jobs.get_job";
 const FRAPPE_GET_JOBS_METHOD = "custom_ui.api.db.jobs.get_jobs_table_data";
@@ -29,7 +31,6 @@ const FRAPPE_GET_TASKS_METHOD = "custom_ui.api.db.tasks.get_tasks_table_data";
 const FRAPPE_GET_TASKS_STATUS_OPTIONS = "custom_ui.api.db.tasks.get_task_status_options";
 const FRAPPE_SET_TASK_STATUS_METHOD = "custom_ui.api.db.tasks.set_task_status";
 const FRAPPE_GET_TASKS_DUE_METHOD = "custom_ui.api.db.tasks.get_tasks_due";
-const FRAPPE_GET_TASKS_COMPLETED_METHOD = "custom_ui.api.db.tasks.get_tasks_completed";
 // Invoice methods
 const FRAPPE_GET_INVOICES_METHOD = "custom_ui.api.db.invoices.get_invoice_table_data";
 const FRAPPE_UPSERT_INVOICE_METHOD = "custom_ui.api.db.invoices.upsert_invoice";
@@ -264,6 +265,14 @@ class Api {
 		return await this.request(FRAPPE_CREATE_ESTIMATE_TEMPLATE_METHOD, { data });
 	}
 
+	static async getUnapprovedEstimatesCount() {
+		return await this.request(FRAPPE_GET_UNAPPROVED_ESTIMATES_COUNT_METHOD, {});
+	}
+
+	static async getEstimatesHalfDownCount() {
+		return await this.request(FRAPPE_GET_ESTIMATES_HALF_DOWN_COUNT_METHOD, {});
+	}
+
 	// ============================================================================
 	// JOB / PROJECT METHODS
 	// ============================================================================
@@ -436,8 +445,8 @@ class Api {
 		return await this.request(FRAPPE_SET_TASK_STATUS_METHOD, { taskName, newStatus });
 	}
 
-	static async getTasksDue(subjectFilter) {
+	static async getTasksDue(subjectFilter, currentCompany) {
-		const result = await this.request(FRAPPE_GET_TASKS_DUE_METHOD, {subjectFilter});
+		const result = await this.request(FRAPPE_GET_TASKS_DUE_METHOD, {subjectFilter, currentCompany});
 		return result;
 	}
 

frontend/src/components/common/TodoChart.vue

@@ -21,7 +21,7 @@
 </template>
 
 <script setup>
-import { ref, onMounted, watch, nextTick, computed, onUnmounted} from "vue";
+import { ref, onMounted, watch, nextTick, computed, onUnmounted, toRaw} from "vue";
 import { Chart, registerables } from "chart.js";
 
 // Register Chart.js components
@@ -29,8 +29,7 @@ Chart.register(...registerables);
 
 const props = defineProps({
 	title: String,
-	todoNumber: Number,
+	categories: Object,
-	completedNumber: Number,
 	loading: {
 		type: Boolean,
 		default: false,
@@ -38,7 +37,7 @@ const props = defineProps({
 });
 
 //Constants
-const categories = ["To-do", "Completed"];
+//const categories = ["To-do", "Completed"];
 
 //Reactive data
 const centerData = ref(null);
@@ -56,21 +55,19 @@ const getHoveredCategoryIndex = () => {
 }
 
 const getCategoryValue = (categoryIndex) => {
-	if (categoryIndex === 0) {
+	return props.categories.data[categoryIndex];
-		return props.todoNumber
-	} else {
-		return props.completedNumber
-	}
 }
 
 const getChartData = () => {
+	const categoryData = props.categories.data;
+	const categoryColors = props.categories.colors;
 	const chartData = {
 		name: props.title,
 		datasets: [
 			{
 				label: "",
-				data: [props.todoNumber, props.completedNumber],
+				data: categoryData,
-				backgroundColor: ["#b22222", "#4caf50"]
+				backgroundColor: categoryColors
 			},
 		]
 	};
@@ -79,8 +76,11 @@ const getChartData = () => {
 
 
 const updateCenterData = () => {
-	const total = props.todoNumber + props.completedNumber;
+	let total = 0;
-	const todos = props.todoNumber;
+	for (let i=0; i<props.categories.data.length; i++) {
+		total += props.categories.data[i];
+	}
+	const todos = props.categories.data[0];
 
 	if (todos === 0 && total > 0) {
 		centerData.value = {
@@ -107,14 +107,14 @@ const updateCenterData = () => {
 		const percentage = total > 0 ? ((value / total) * 100).toFixed(1) + "%" : "0%";
 
 		centerData.value = {
-			label: categories[hoveredCategoryIndex],
+			label: props.categories.labels[hoveredCategoryIndex],
 			value: value,
 			percentage: percentage,
 		};
 	} else {
 		centerData.value = {
 			label: "To-do",
-			value: props.todoNumber,
+			value: todos,
 			percentage: null,
 		};
 	}
@@ -180,8 +180,6 @@ const getChartOptions = () => {
 const createChart = () => {
 	if (!chartCanvas.value || props.loading) return;
 
-	console.log(`DEBUG: Creating chart for ${props.title}`);
-	console.log(props);
 
 	const ctx = chartCanvas.value.getContext("2d");
 	if (chartInstance.value) {
@@ -214,9 +212,9 @@ onMounted(() => {
 	createChart();
 });
 
-watch(() => props.completedNumber, (newValue) => {
+watch(() => props.categories, (newValue) => {
 	updateChart();
-});
+}, {deep: true});
 
 </script>
 

frontend/src/components/pages/Home.vue

@@ -15,8 +15,7 @@
 					<div class="widget-content">
 						<TodoChart
 								title="Locates"
-								:todoNumber="chartData.locates.todo"
+								:categories="chartData.locates"
-								:completedNumber="chartData.locates.done"
 								>
 						</TodoChart>
 						<button class="sidebar-button" @click="navigateTo('/tasks?subject=Locate')">
@@ -37,8 +36,7 @@
 					<div class="widget-content">
 						<TodoChart
 								title="Permits"
-								:todoNumber="chartData.permits.todo"
+								:categories="chartData.permits"
-								:completedNumber="chartData.permits.done"
 								>
 						</TodoChart>
 						<button class="sidebar-button" @click="navigateTo('/tasks?subject=Permit')">
@@ -59,8 +57,7 @@
 					<div class="widget-content">
 						<TodoChart
 								title="Permit Finalization"
-								:todoNumber="permitFinalizationsTodoNumber"
+								:categories="chartData.permitFinalizations"
-								:completedNumber="permitFinalizationsCompletedNumber"
 								>
 						</TodoChart>
 						<button class="sidebar-button" @click="navigateTo('/jobs')">
@@ -81,8 +78,7 @@
 					<div class="widget-content">
 						<TodoChart
 								title="Warranty Claims"
-								:todoNumber="warrantyTodoNumber"
+								:categories="chartData.warranties"
-								:completedNumber="warrantyCompletedNumber"
 								>
 						</TodoChart>
 						<button class="sidebar-button" @click="navigateTo('/jobs')">
@@ -103,8 +99,7 @@
 					<div class="widget-content">
 						<TodoChart
 								title="Incomplete Bids"
-								:todoNumber="bidsTodoNumber"
+								:categories="chartData.bids"
-								:completedNumber="bidsCompletedNumber"
 								>
 						</TodoChart>
 						<button class="sidebar-button"
@@ -126,8 +121,7 @@
 					<div class="widget-content">
 						<TodoChart
 								title="Unapproved Estimates"
-								:todoNumber="estimatesTodoNumber"
+								:categories="chartData.estimates"
-								:completedNumber="estimatesCompletedNumber"
 								>
 						</TodoChart>
 						<button class="sidebar-button"
@@ -149,8 +143,7 @@
 					<div class="widget-content">
 						<TodoChart
 								title="Half Down Payments"
-								:todoNumber="halfDownTodoNumber"
+								:categories="chartData.halfDown"
-								:completedNumber="halfDownCompletedNumber"
 								>
 						</TodoChart>
 						<button class="sidebar-button"
@@ -172,8 +165,7 @@
 					<div class="widget-content">
 						<TodoChart
 								title="15 Day Follow Ups"
-								:todoNumber="fifteenDayTodoNumber"
+								:categories="chartData.fifteenDayFollowups"
-								:completedNumber="fifteenDayCompletedNumber"
 								>
 						</TodoChart>
 						<button class="sidebar-button"
@@ -195,8 +187,7 @@
 					<div class="widget-content">
 						<TodoChart
 								title="Late Balances"
-								:todoNumber="balancesTodoNumber"
+								:categories="chartData.lateBalances"
-								:completedNumber="balancesCompletedNumber"
 								>
 						</TodoChart>
 						<button class="sidebar-button"
@@ -218,8 +209,7 @@
 					<div class="widget-content">
 						<TodoChart
 								title="Backflow Tests"
-								:todoNumber="backflowsTodoNumber"
+								:categories="chartData.backflows"
-								:completedNumber="backflowsCompletedNumber"
 								>
 						</TodoChart>
 						<button class="sidebar-button"
@@ -241,8 +231,7 @@
 					<div class="widget-content">
 						<TodoChart
 								title="Curbing"
-								:todoNumber="chartData.curbing.todo"
+								:categories="chartData.curbing"
-								:completedNumber="chartData.curbing.done"
 								>
 						</TodoChart>
 						<button class="sidebar-button"
@@ -264,8 +253,7 @@
 					<div class="widget-content">
 						<TodoChart
 								title="Hydroseeding"
-								:todoNumber="chartData.hydroseed.todo"
+								:categories="chartData.hydroseed"
-								:completedNumber="chartData.hydroseed.done"
 								>
 						</TodoChart>
 						<button class="sidebar-button"
@@ -287,8 +275,7 @@
 					<div class="widget-content">
 						<TodoChart
 								title="Machines"
-								:todoNumber="machinesTodoNumber"
+								:categories="chartData.machines"
-								:completedNumber="machinesCompletedNumber"
 								>
 						</TodoChart>
 						<button class="sidebar-button"
@@ -310,8 +297,7 @@
 					<div class="widget-content">
 						<TodoChart
 								title="Deliveries"
-								:todoNumber="deliveriesTodoNumber"
+								:categories="chartData.deliveries"
-								:completedNumber="delivieriesCompletedNumber"
 								>
 						</TodoChart>
 						<button class="sidebar-button"
@@ -326,7 +312,7 @@
 </template>
 
 <script setup>
-import { ref, computed, onMounted } from "vue";
+import { ref, computed, onMounted, watch } from "vue";
 import { useRouter } from "vue-router";
 //import Card from "primevue/card";
 import Card from "../common/Card.vue";
@@ -337,11 +323,14 @@ WateringSoil, Soil, Truck, SoilAlt } from "@iconoir/vue";
 import Api from "../../api.js";
 import DataUtils from "../../utils.js";
 import { useNotificationStore } from "../../stores/notifications-primevue";
+import { useCompanyStore } from "../../stores/company.js";
 //import SimpleChart from "../common/SimpleChart.vue";
 import TodoChart from "../common/TodoChart.vue";
 
 const router = useRouter();
 
+const defaultColors = ['blue', 'green', 'red'];
+
 // Dummy data from utils
 const clientData = ref(DataUtils.dummyClientData);
 const jobData = ref(DataUtils.dummyJobData);
@@ -355,13 +344,24 @@ const warrantyTodoNumber = ref(0);
 const warrantyCompletedNumber = ref(10);
 
 const chartData = ref({
-	locates: {todo: 0, done: 0},
+	locates: {labels: ["To-do", "Completed", "Overdue"], data: [0, 0, 0], colors: defaultColors},
-	permits: {todo: 0, done: 0},
+	permits: {labels: ["To-do", "Completed", "Overdue"], data: [0, 0, 0], colors: defaultColors},
-	curbing: {todo: 0, done: 0},
+	curbing: {labels: ["To-do", "Completed", "Overdue"], data: [0, 0, 0], colors: defaultColors},
-	hydroseed: {todo: 0, done: 0},
+	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},
 });
 
 const notifications = useNotificationStore();
+const companyStore = useCompanyStore();
 
 // Computed values for dashboard metrics
 const totalRevenue = computed(() => "$47,250");
@@ -373,17 +373,26 @@ const avgResponseTime = computed(() => 2.3);
 const navigateTo = (path) => {
 	router.push(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.curbing.data = await Api.getTasksDue("Curbing", companyStore.currentCompany);
+	chartData.value.hydroseed.data = await Api.getTasksDue("Hydroseed", companyStore.currentCompany);
+	//Uncomment below when we can check if half-down payments have/can been paid
+	//chartData.value.estimates.data = await Api.getEstimatesHalfDownCount();
+};
+
 onMounted(async() => {
 	notifications.addWarning("Dashboard metrics are based on dummy data for demonstration purposes. UPDATES COMING SOON!");
-	chartData.value.locates.todo = await Api.getTasksDue("Locate");
+	await loadChartData();
-	chartData.value.locates.done = await Api.getTasksCompleted("Locate");
-	chartData.value.permits.todo = await Api.getTasksDue("Permit");
-	chartData.value.permits.done = await Api.getTasksCompleted("Permit");
-	chartData.value.curbing.todo = await Api.getTasksDue("Curbing");
-	chartData.value.curbing.done = await Api.getTasksCompleted("Curbing");
-	chartData.value.hydroseed.todo = await Api.getTasksDue("Hydroseed");
-	chartData.value.hydroseed.done = await Api.getTasksCompleted("Hydroseed");
 });
+
+watch(() => companyStore.currentCompany, async (newCompany, oldCompany) => {
+	console.log("Wathcing for new Company");
+	await loadChartData();
+});
+
 </script>
 
 <style scoped>