Refactored onsite meeting to bids all over the codebase.
This commit is contained in:
parent
6e2535763f
commit
080d9ff1b4
6 changed files with 48 additions and 49 deletions
|
|
@ -3,7 +3,7 @@ import json
|
|||
from custom_ui.db_utils import build_error_response, build_success_response, process_filters, process_sorting
|
||||
|
||||
@frappe.whitelist()
|
||||
def get_week_onsite_meetings(week_start, week_end):
|
||||
def get_week_bid_meetings(week_start, week_end):
|
||||
"""Get On-Site Meetings scheduled within a specific week."""
|
||||
try:
|
||||
meetings = frappe.db.get_all(
|
||||
|
|
@ -24,13 +24,13 @@ def get_week_onsite_meetings(week_start, week_end):
|
|||
return build_error_response(str(e), 500)
|
||||
|
||||
@frappe.whitelist()
|
||||
def get_onsite_meetings(fields=["*"], filters={}):
|
||||
def get_bid_meetings(fields=["*"], filters={}):
|
||||
"""Get paginated On-Site Meetings with filtering and sorting support."""
|
||||
try:
|
||||
print("DEBUG: Raw onsite meeting options received:", filters)
|
||||
|
||||
print("DEBUG: Raw bid meeting options received:", filters)
|
||||
|
||||
processed_filters = process_filters(filters)
|
||||
|
||||
|
||||
meetings = frappe.db.get_all(
|
||||
"On-Site Meeting",
|
||||
fields=fields,
|
||||
|
|
@ -40,17 +40,17 @@ def get_onsite_meetings(fields=["*"], filters={}):
|
|||
for meeting in meetings:
|
||||
address_doc = frappe.get_doc("Address", meeting["address"])
|
||||
meeting["address"] = address_doc.as_dict()
|
||||
|
||||
|
||||
return build_success_response(
|
||||
meetings
|
||||
)
|
||||
except Exception as e:
|
||||
frappe.log_error(message=str(e), title="Get On-Site Meetings Failed")
|
||||
return build_error_response(str(e), 500)
|
||||
|
||||
|
||||
|
||||
@frappe.whitelist()
|
||||
def get_unscheduled_onsite_meetings():
|
||||
def get_unscheduled_bid_meetings():
|
||||
"""Get On-Site Meetings that are unscheduled."""
|
||||
try:
|
||||
meetings = frappe.db.get_all(
|
||||
|
|
@ -63,26 +63,26 @@ def get_unscheduled_onsite_meetings():
|
|||
except Exception as e:
|
||||
frappe.log_error(message=str(e), title="Get Unscheduled On-Site Meetings Failed")
|
||||
return build_error_response(str(e), 500)
|
||||
|
||||
|
||||
|
||||
@frappe.whitelist()
|
||||
def create_onsite_meeting(address, notes=""):
|
||||
def create_bid_meeting(address, notes=""):
|
||||
"""Create a new On-Site Meeting with Unscheduled status."""
|
||||
try:
|
||||
print(f"DEBUG: Creating meeting with address='{address}', notes='{notes}'")
|
||||
|
||||
|
||||
# Validate address parameter
|
||||
if not address or address == "None" or not address.strip():
|
||||
return build_error_response("Address is required and cannot be empty.", 400)
|
||||
|
||||
|
||||
# Get the address document name from the full address string
|
||||
address_name = frappe.db.get_value("Address", filters={"full_address": address}, fieldname="name")
|
||||
|
||||
|
||||
print(f"DEBUG: Address lookup result: address_name='{address_name}'")
|
||||
|
||||
|
||||
if not address_name:
|
||||
return build_error_response(f"Address '{address}' not found in the system.", 404)
|
||||
|
||||
|
||||
# Create the meeting with Unscheduled status
|
||||
meeting = frappe.get_doc({
|
||||
"doctype": "On-Site Meeting",
|
||||
|
|
@ -93,19 +93,19 @@ def create_onsite_meeting(address, notes=""):
|
|||
meeting.flags.ignore_permissions = True
|
||||
meeting.insert(ignore_permissions=True)
|
||||
frappe.db.commit()
|
||||
|
||||
|
||||
# Clear any auto-generated messages from Frappe
|
||||
frappe.local.message_log = []
|
||||
|
||||
|
||||
print(f"DEBUG: Meeting created successfully: {meeting.name}")
|
||||
|
||||
|
||||
return build_success_response(meeting.as_dict())
|
||||
except Exception as e:
|
||||
frappe.log_error(message=str(e), title="Create On-Site Meeting Failed")
|
||||
return build_error_response(str(e), 500)
|
||||
|
||||
|
||||
@frappe.whitelist()
|
||||
def update_onsite_meeting(name, data):
|
||||
def update_bid_meeting(name, data):
|
||||
"""Update an existing On-Site Meeting."""
|
||||
defualts = {
|
||||
"address": None,
|
||||
|
|
@ -141,4 +141,4 @@ def update_onsite_meeting(name, data):
|
|||
return build_error_response(f"On-Site Meeting '{name}' does not exist.", 404)
|
||||
except Exception as e:
|
||||
return build_error_response(str(e), 500)
|
||||
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue