update with main
This commit is contained in:
parent
5e192a61e1
commit
ba3e2a4d8e
29 changed files with 51749 additions and 139 deletions
|
|
@ -26,6 +26,18 @@ def get_week_bid_meetings(week_start, week_end, company):
|
|||
except Exception as e:
|
||||
frappe.log_error(message=str(e), title="Get Week On-Site Meetings Failed")
|
||||
return build_error_response(str(e), 500)
|
||||
|
||||
@frappe.whitelist()
|
||||
def get_bid_meeting_note_form(project_template):
|
||||
bid_meeting_note_form_name = frappe.db.get_value("Project Template", project_template, "bid_meeting_note_form")
|
||||
if not bid_meeting_note_form_name:
|
||||
return build_error_response(f"No Bid Meeting Note Form configured for Project Template '{project_template}'", 404)
|
||||
try:
|
||||
note_form = frappe.get_doc("Bid Meeting Note Form", bid_meeting_note_form_name)
|
||||
return build_success_response(note_form.as_dict())
|
||||
except Exception as e:
|
||||
frappe.log_error(message=str(e), title="Get Bid Meeting Note Form Failed")
|
||||
return build_error_response(str(e), 500)
|
||||
|
||||
@frappe.whitelist()
|
||||
def get_bid_meetings(fields=["*"], filters={}, company=None):
|
||||
|
|
@ -75,6 +87,61 @@ def get_unscheduled_bid_meetings(company):
|
|||
frappe.log_error(message=str(e), title="Get Unscheduled On-Site Meetings Failed")
|
||||
return build_error_response(str(e), 500)
|
||||
|
||||
@frappe.whitelist()
|
||||
def submit_bid_meeting_note_form(bid_meeting, project_template, fields, form_template):
|
||||
"""Submit Bid Meeting Note Form data for a specific On-Site Meeting."""
|
||||
if isinstance(fields, str):
|
||||
fields = json.loads(fields)
|
||||
try:
|
||||
print(f"DEBUG: Submitting Bid Meeting Note Form for meeting='{bid_meeting}' from template='{form_template}' with fields='{fields}'")
|
||||
|
||||
meeting = DbService.get_or_throw("On-Site Meeting", bid_meeting)
|
||||
|
||||
# Update fields on the meeting
|
||||
meeting_note_field_docs = [{
|
||||
"label": field.get("label"),
|
||||
"type": field.get("type"),
|
||||
"value": json.dumps(field.get("value")) if isinstance(field.get("value"), (list, dict)) else field.get("value"),
|
||||
"row": field.get("row"),
|
||||
"column": field.get("column"),
|
||||
"value_doctype": field.get("doctype_for_select"),
|
||||
"available_options": field.get("options"),
|
||||
"include_available_options": field.get("include_available_options", False),
|
||||
"conditional_on_field": field.get("conditional_on_field"),
|
||||
"conditional_on_value": field.get("conditional_on_value"),
|
||||
"doctype_label_field": field.get("doctype_label_field")
|
||||
} for field in fields]
|
||||
new_bid_meeting_note_doc = frappe.get_doc({
|
||||
"doctype": "Bid Meeting Note",
|
||||
"bid_meeting": bid_meeting,
|
||||
"project_template": project_template,
|
||||
"form_template": form_template,
|
||||
"fields": meeting_note_field_docs
|
||||
})
|
||||
new_bid_meeting_note_doc.insert(ignore_permissions=True)
|
||||
for field_row, field in zip(new_bid_meeting_note_doc.fields, fields):
|
||||
if not isinstance(field.get("value"), list):
|
||||
continue
|
||||
for item in field["value"]:
|
||||
if not isinstance(item, dict):
|
||||
continue
|
||||
new_bid_meeting_note_doc.append("quantities", {
|
||||
"meeting_note_field": field_row.name,
|
||||
"item": item.get("item"),
|
||||
"quantity": item.get("quantity")
|
||||
})
|
||||
new_bid_meeting_note_doc.save(ignore_permissions=True)
|
||||
meeting.bid_notes = new_bid_meeting_note_doc.name
|
||||
meeting.status = "Completed"
|
||||
meeting.save()
|
||||
frappe.db.commit()
|
||||
|
||||
return build_success_response(meeting.as_dict())
|
||||
except frappe.DoesNotExistError:
|
||||
return build_error_response(f"On-Site Meeting '{bid_meeting}' does not exist.", 404)
|
||||
except Exception as e:
|
||||
frappe.log_error(message=str(e), title="Submit Bid Meeting Note Form Failed")
|
||||
return build_error_response(str(e), 500)
|
||||
|
||||
@frappe.whitelist()
|
||||
def get_bid_meeting(name):
|
||||
|
|
|
|||
|
|
@ -14,8 +14,34 @@ from custom_ui.services import DbService, ClientService, AddressService, Contact
|
|||
def get_estimate_table_data_v2(filters={}, sortings=[], page=1, page_size=10):
|
||||
"""Get paginated estimate table data with filtering and sorting."""
|
||||
print("DEBUG: Raw estimate options received:", filters, sortings, page, page_size)
|
||||
filters, sortings, page, page_size = DbUtils.process_query_conditions(filters, sortings, page, page_size)
|
||||
|
||||
filters, sortings, page, page_size = DbUtils.process_datatable_request(filters, sortings, page, page_size)
|
||||
sortings = "modified desc" if not sortings else sortings
|
||||
count = frappe.db.count("Quotation", filters=filters)
|
||||
print(f"DEBUG: Number of estimates returned: {count}")
|
||||
estimate_names = frappe.db.get_all(
|
||||
"Quotation",
|
||||
filters=filters,
|
||||
pluck="name",
|
||||
limit=page_size,
|
||||
start=(page) * page_size,
|
||||
order_by=sortings
|
||||
)
|
||||
|
||||
estimates = [frappe.get_doc("Quotation", name).as_dict() for name in estimate_names]
|
||||
tableRows = []
|
||||
for estimate in estimates:
|
||||
tableRow = {
|
||||
"id": estimate["name"],
|
||||
"address": frappe.db.get_value("Address", estimate.get("custom_job_address"), "full_address"),
|
||||
# strip "-#-" from actual_customer_name and anything that comes after it
|
||||
"customer": estimate.get("actual_customer_name").split("-#-")[0] if estimate.get("actual_customer_name") else estimate.get("customer_name") if estimate.get("customer_name") else "",
|
||||
"status": estimate.get("custom_current_status", ""),
|
||||
"order_type": estimate.get("order_type", ""),
|
||||
}
|
||||
tableRows.append(tableRow)
|
||||
table_data_dict = build_datatable_dict(data=tableRows, count=count, page=page, page_size=page_size)
|
||||
return build_success_response(table_data_dict)
|
||||
|
||||
|
||||
@frappe.whitelist()
|
||||
def get_estimate_table_data(filters={}, sortings=[], page=1, page_size=10):
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
import frappe
|
||||
from custom_ui.db_utils import build_history_entries, build_success_response, build_error_response
|
||||
from datetime import datetime, timedelta
|
||||
import json
|
||||
|
||||
def get_doc_history(doctype, docname):
|
||||
"""Get the history of changes for a specific document."""
|
||||
|
|
@ -76,4 +77,24 @@ def get_week_holidays(week_start_date: str):
|
|||
)
|
||||
|
||||
print(f"DEBUG: Retrieved holidays from {start_date} to {end_date}: {holidays}")
|
||||
return build_success_response(holidays)
|
||||
return build_success_response(holidays)
|
||||
|
||||
@frappe.whitelist()
|
||||
def get_doc_list(doctype, fields=["*"], filters={}, pluck=None):
|
||||
"""Get list of documents for a given doctype with specified fields and filters."""
|
||||
if isinstance(fields, str):
|
||||
fields = json.loads(fields)
|
||||
if isinstance(filters, str):
|
||||
filters = json.loads(filters)
|
||||
try:
|
||||
docs = frappe.get_all(
|
||||
doctype,
|
||||
fields=fields,
|
||||
filters=filters,
|
||||
order_by="creation desc",
|
||||
pluck=pluck
|
||||
)
|
||||
print(f"DEBUG: Retrieved documents for {doctype} with filters {filters}: {docs}")
|
||||
return build_success_response(docs)
|
||||
except Exception as e:
|
||||
return build_error_response(str(e), 500)
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
import frappe, json
|
||||
from custom_ui.db_utils import process_query_conditions, build_datatable_dict, get_count_or_filters, build_success_response, build_error_response
|
||||
from custom_ui.services import AddressService, ClientService
|
||||
from custom_ui.services import AddressService, ClientService, ServiceAppointmentService
|
||||
from frappe.utils import getdate
|
||||
|
||||
# ===============================================================================
|
||||
|
|
|
|||
40
custom_ui/api/db/service_appointments.py
Normal file
40
custom_ui/api/db/service_appointments.py
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
import frappe, json
|
||||
from custom_ui.db_utils import build_success_response, build_error_response
|
||||
from custom_ui.services import ServiceAppointmentService
|
||||
|
||||
@frappe.whitelist()
|
||||
def get_service_appointments(companies, filters={}):
|
||||
"""Get Service Appointments for given companies."""
|
||||
try:
|
||||
if isinstance(companies, str):
|
||||
companies = json.loads(companies)
|
||||
if isinstance(filters, str):
|
||||
filters = json.loads(filters)
|
||||
filters["company"] = ["in", companies]
|
||||
service_appointment_names = frappe.get_all(
|
||||
"Service Appointment",
|
||||
filters=filters,
|
||||
pluck="name"
|
||||
)
|
||||
service_appointments = [
|
||||
ServiceAppointmentService.get_full_dict(name)
|
||||
for name in service_appointment_names
|
||||
]
|
||||
return build_success_response(service_appointments)
|
||||
except Exception as e:
|
||||
return build_error_response(str(e), 500)
|
||||
|
||||
@frappe.whitelist()
|
||||
def update_service_appointment_scheduled_dates(service_appointment_name: str, start_date, end_date, crew_lead_name, start_time=None, end_time=None):
|
||||
"""Update scheduled dates for a Service Appointment."""
|
||||
try:
|
||||
updated_service_appointment = ServiceAppointmentService.update_scheduled_dates(
|
||||
service_appointment_name,
|
||||
start_date,
|
||||
end_date,
|
||||
start_time,
|
||||
end_time
|
||||
)
|
||||
return build_success_response(updated_service_appointment.as_dict())
|
||||
except Exception as e:
|
||||
return build_error_response(str(e), 500)
|
||||
Loading…
Add table
Add a link
Reference in a new issue