The Jobs page now reads data from Projects List, click on a row and go to a detail page.
This commit is contained in:
parent
b8c264f779
commit
3b2c78e4d4
4 changed files with 32 additions and 24 deletions
|
|
@ -1,5 +1,5 @@
|
|||
import frappe, json
|
||||
from custom_ui.db_utils import process_query_conditions, build_datatable_response, get_count_or_filters
|
||||
from custom_ui.db_utils import process_query_conditions, build_datatable_dict, get_count_or_filters, build_success_response
|
||||
|
||||
# ===============================================================================
|
||||
# JOB MANAGEMENT API METHODS
|
||||
|
|
@ -9,15 +9,15 @@ from custom_ui.db_utils import process_query_conditions, build_datatable_respons
|
|||
def get_jobs_table_data(filters={}, sortings=[], page=1, page_size=10):
|
||||
"""Get paginated job table data with filtering and sorting support."""
|
||||
print("DEBUG: Raw job options received:", filters, sortings, page, page_size)
|
||||
|
||||
|
||||
processed_filters, processed_sortings, is_or, page, page_size = process_query_conditions(filters, sortings, page, page_size)
|
||||
|
||||
|
||||
# Handle count with proper OR filter support
|
||||
if is_or:
|
||||
count = frappe.db.sql(*get_count_or_filters("Project", processed_filters))[0][0]
|
||||
else:
|
||||
count = frappe.db.count("Project", filters=processed_filters)
|
||||
|
||||
|
||||
projects = frappe.db.get_all(
|
||||
"Project",
|
||||
fields=["*"],
|
||||
|
|
@ -27,7 +27,7 @@ def get_jobs_table_data(filters={}, sortings=[], page=1, page_size=10):
|
|||
start=(page - 1) * page_size,
|
||||
order_by=processed_sortings
|
||||
)
|
||||
|
||||
|
||||
tableRows = []
|
||||
for project in projects:
|
||||
tableRow = {}
|
||||
|
|
@ -37,13 +37,14 @@ def get_jobs_table_data(filters={}, sortings=[], page=1, page_size=10):
|
|||
tableRow["customer"] = project.get("customer", "")
|
||||
tableRow["status"] = project.get("status", "")
|
||||
tableRow["percent_complete"] = project.get("percent_complete", 0)
|
||||
tableRows.append(tableRow)
|
||||
|
||||
return build_datatable_response(data=tableRows, count=count, page=page, page_size=page_size)
|
||||
tableRows.append(tableRow)
|
||||
|
||||
data_table_dict = build_datatable_dict(data=tableRows, count=count, page=page, page_size=page_size)
|
||||
return build_success_response(data_table_dict)
|
||||
|
||||
|
||||
@frappe.whitelist()
|
||||
def upsert_job(data):
|
||||
"""Create or update a job (project)."""
|
||||
# TODO: Implement job creation/update logic
|
||||
pass
|
||||
pass
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue