diff --git a/custom_ui/api/db/clients.py b/custom_ui/api/db/clients.py index 22a352a..4a28f51 100644 --- a/custom_ui/api/db/clients.py +++ b/custom_ui/api/db/clients.py @@ -154,67 +154,71 @@ def get_client(client_name): @frappe.whitelist() def get_clients_table_data(filters={}, sortings=[], page=1, page_size=10): """Get paginated client table data with filtering and sorting support.""" - # try: + try: - # print("DEBUG: Raw client table query received:", { - # "filters": filters, - # "sortings": sortings, - # "page": page, - # "page_size": page_size - # }) + print("DEBUG: Raw client table query received:", { + "filters": filters, + "sortings": sortings, + "page": page, + "page_size": page_size + }) - # processed_filters, processed_sortings, is_or, page, page_size = process_query_conditions(filters, sortings, page, page_size) - # print("DEBUG: Processed filters:", processed_filters) - # print("DEBUG: Processed sortings:", processed_sortings) - # # Handle count with proper OR filter support - # if is_or: - # count = frappe.db.sql(*get_count_or_filters("Address", processed_filters))[0][0] - # else: - # count = frappe.db.count("Address", filters=processed_filters) + processed_filters, processed_sortings, is_or, page, page_size = process_query_conditions(filters, sortings, page, page_size) + print("DEBUG: Processed filters:", processed_filters) + print("DEBUG: Processed sortings:", processed_sortings) + # Handle count with proper OR filter support + if is_or: + count = frappe.db.sql(*get_count_or_filters("Address", processed_filters))[0][0] + else: + count = frappe.db.count("Address", filters=processed_filters) - # print("DEBUG: Count of addresses matching filters:", count) + print("DEBUG: Count of addresses matching filters:", count) - # address_names = frappe.db.get_all( - # "Address", - # fields=["name"], - # filters=processed_filters if not is_or else None, - # or_filters=processed_filters if is_or else None, - # limit=page_size, - # start=(page - 1) * page_size, - # order_by=processed_sortings - # ) + address_names = frappe.db.get_all( + "Address", + fields=["name"], + filters=processed_filters if not is_or else None, + or_filters=processed_filters if is_or else None, + limit=page_size, + start=(page - 1) * page_size, + order_by=processed_sortings + ) - # addresses = [frappe.get_doc("Address", addr["name"]).as_dict() for addr in address_names] - # tableRows = [] - # for address in addresses: - # tableRow = {} - # links = address.links - # customer_links = [link for link in links if link.link_doctype == "Customer"] if links else None - # customer_name = address.get("custom_customer_to_bill") - # if not customer_name and not customer_links: - # print("DEBUG: No customer links found and no customer to bill.") - # customer_name = "N/A" - # elif not customer_name and customer_links: - # print("DEBUG: No customer to bill. Customer links found:", customer_links) - # customer_name = customer_links[0].link_name - # tableRow["id"] = address["name"] - # tableRow["customer_name"] = customer_name - # tableRow["address"] = ( - # f"{address['address_line1']}" - # f"{' ' + address['address_line2'] if address['address_line2'] else ''} " - # f"{address['city']}, {address['state']} {address['pincode']}" - # ) - # tableRow["appointment_scheduled_status"] = address.custom_onsite_meeting_scheduled - # tableRow["estimate_sent_status"] = address.custom_estimate_sent_status - # tableRow["job_status"] = address.custom_job_status - # tableRow["payment_received_status"] = address.custom_payment_received_status - # tableRows.append(tableRow) - # tableDataDict = build_datatable_dict(data=tableRows, count=count, page=page, page_size=page_size) - # return build_success_response(tableDataDict) - # except frappe.ValidationError as ve: - # return build_error_response(str(ve), 400) - # except Exception as e: - # return build_error_response(str(e), 500) + addresses = [frappe.get_doc("Address", addr["name"]).as_dict() for addr in address_names] + tableRows = [] + for address in addresses: + is_lead = False + tableRow = {} + links = address.links + customer_links = [link for link in links if link.link_doctype == "Customer"] if links else None + customer_name = address.get("custom_customer_to_bill", None) + if not customer_links: + customer_links = [link for link in links if link.link_doctype == "Lead"] if links else None + is_lead = True if customer_links else False + if not customer_name and not customer_links: + print("DEBUG: No customer links found and no customer to bill.") + customer_name = "N/A" + elif not customer_name and customer_links: + print("DEBUG: No customer to bill. Customer links found:", customer_links) + customer_name = frappe.get_value("Lead", customer_links[0].link_name, "lead_name") if is_lead else customer_links[0].link_name + tableRow["id"] = address["name"] + tableRow["customer_name"] = customer_name + tableRow["address"] = ( + f"{address['address_line1']}" + f"{' ' + address['address_line2'] if address['address_line2'] else ''} " + f"{address['city']}, {address['state']} {address['pincode']}" + ) + tableRow["appointment_scheduled_status"] = address.custom_onsite_meeting_scheduled + tableRow["estimate_sent_status"] = address.custom_estimate_sent_status + tableRow["job_status"] = address.custom_job_status + tableRow["payment_received_status"] = address.custom_payment_received_status + tableRows.append(tableRow) + tableDataDict = build_datatable_dict(data=tableRows, count=count, page=page, page_size=page_size) + return build_success_response(tableDataDict) + except frappe.ValidationError as ve: + return build_error_response(str(ve), 400) + except Exception as e: + return build_error_response(str(e), 500) @frappe.whitelist() diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 9908ed4..78b3aad 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -19,6 +19,7 @@ const notificationStore = useNotificationStore(); const toast = ref(); const companyStore = useCompanyStore(); const themeStore = useThemeStore(); +const sidebarCollapsed = ref(false); // Connect the toast instance to the store when component mounts onMounted(() => { @@ -46,8 +47,8 @@ watchEffect(() => { }" >
-
- +
+
@@ -82,21 +83,53 @@ watchEffect(() => { width: 100%; margin: 10px auto; height: 90vh; - background: var(--theme-gradient); + background: var(--theme-background-gradient); } .sidebar-column { display: flex; flex-direction: column; gap: 8px; + width: 170px; min-width: 170px; + transition: width 0.3s ease, min-width 0.3s ease; +} + +.sidebar-column.collapsed { + width: 56px; + min-width: 56px; +} + +/* Responsive adjustments */ +@media (max-width: 768px) { + .sidebar-column { + width: 140px; + min-width: 140px; + } + + .sidebar-column.collapsed { + width: 56px; + min-width: 56px; + } +} + +@media (max-width: 480px) { + .sidebar-column { + width: 120px; + min-width: 120px; + } + + .sidebar-column.collapsed { + width: 56px; + min-width: 56px; + } } #display-content { - /* flex-grow: 1; */ + flex-grow: 1; margin-left: auto; margin-right: auto; - max-width: 50vw; + max-width: 100%; min-width: 80%; height: 100%; } diff --git a/frontend/src/components/SideBar.vue b/frontend/src/components/SideBar.vue index 4f5e0d2..6bf38b2 100644 --- a/frontend/src/components/SideBar.vue +++ b/frontend/src/components/SideBar.vue @@ -22,6 +22,8 @@ import { } from "@iconoir/vue"; import SidebarSpeedDial from "./SidebarSpeedDial.vue"; +const emit = defineEmits(['toggle']); + const router = useRouter(); const modalStore = useModalStore(); const notifications = useNotificationStore(); @@ -40,6 +42,7 @@ const focusClientInput = (inputId) => { const toggleSidebar = () => { isCollapsed.value = !isCollapsed.value; + emit('toggle', isCollapsed.value); }; const openSidebarAndDial = (category) => { diff --git a/frontend/src/stores/theme.js b/frontend/src/stores/theme.js index 60aaba0..16ddcc9 100644 --- a/frontend/src/stores/theme.js +++ b/frontend/src/stores/theme.js @@ -12,6 +12,7 @@ const themeMap = { secondaryGradientStart: "#2c9b64", secondaryGradientEnd: "#38c487", secondaryGradient: "linear-gradient(90deg, #2c9b64 0%, #38c487 100%)", + backgroundGradient: "linear-gradient(90deg, #f0f8ff 0%, #e6f3ff 100%)", surface: "#cadcf1ff", surfaceAlt: "#dbfdefff", border: "#cfe5f7", @@ -32,6 +33,7 @@ const themeMap = { secondaryGradientStart: "#d2a106", secondaryGradientEnd: "#f7de6d", secondaryGradient: "linear-gradient(90deg, #d2a106 0%, #f7de6d 100%)", + backgroundGradient: "linear-gradient(90deg, #f8fff0 0%, #f0f8e6 100%)", surface: "#f7fbe9", surfaceAlt: "#f1f4d6", border: "#dfe8b5", @@ -52,6 +54,7 @@ const themeMap = { secondaryGradientStart: "#4f8ee5", secondaryGradientEnd: "#5fa4ff", secondaryGradient: "linear-gradient(90deg, #4f8ee5 0%, #5fa4ff 100%)", + backgroundGradient: "linear-gradient(90deg, #f5f7fb 0%, #e7ecf5 100%)", surface: "#f5f7fb", surfaceAlt: "#e7ecf5", border: "#ced6e5", @@ -72,6 +75,7 @@ const themeMap = { secondaryGradientStart: "#b2a89c", secondaryGradientEnd: "#cfc6b8", secondaryGradient: "linear-gradient(90deg, #b2a89c 0%, #cfc6b8 100%)", + backgroundGradient: "linear-gradient(90deg, #f7f5f2 0%, #ebe6df 100%)", surface: "#f7f5f2", surfaceAlt: "#ebe6df", border: "#d8d0c5", @@ -92,6 +96,7 @@ const themeMap = { secondaryGradientStart: "#f28c28", secondaryGradientEnd: "#ffc174", secondaryGradient: "linear-gradient(90deg, #f28c28 0%, #ffc174 100%)", + backgroundGradient: "linear-gradient(90deg, #f8fbf4 0%, #f2f1e9 100%)", surface: "#f8fbf4", surfaceAlt: "#f2f1e9", border: "#d9e5cc", @@ -105,11 +110,11 @@ const themeMap = { export const useThemeStore = defineStore("theme", { state: () => ({ - currentTheme: themeMap.SprinklersNW, + currentTheme: themeMap["Sprinklers Northwest"], }), actions: { applyTheme(companyName) { - const theme = themeMap[companyName] || themeMap.SprinklersNW; + const theme = themeMap[companyName] || themeMap["Sprinklers Northwest"]; this.currentTheme = theme; if (typeof document === "undefined") return; const root = document.documentElement; @@ -123,6 +128,7 @@ export const useThemeStore = defineStore("theme", { root.style.setProperty("--theme-secondary-gradient-start", theme.secondaryGradientStart); root.style.setProperty("--theme-secondary-gradient-end", theme.secondaryGradientEnd); root.style.setProperty("--theme-secondary-gradient", theme.secondaryGradient); + root.style.setProperty("--theme-background-gradient", theme.backgroundGradient); root.style.setProperty("--theme-surface", theme.surface); root.style.setProperty("--theme-surface-alt", theme.surfaceAlt); root.style.setProperty("--theme-border", theme.border);