diff --git a/custom_ui/api/db/estimates.py b/custom_ui/api/db/estimates.py index 27bd1a3..5570f90 100644 --- a/custom_ui/api/db/estimates.py +++ b/custom_ui/api/db/estimates.py @@ -30,7 +30,7 @@ def get_estimate_table_data(filters={}, sortings=[], page=1, page_size=10): 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, + start=page * page_size, order_by=processed_sortings ) diff --git a/frontend/src/api.js b/frontend/src/api.js index 516c2c8..ae29428 100644 --- a/frontend/src/api.js +++ b/frontend/src/api.js @@ -204,9 +204,9 @@ class Api { for_table: true, }; - console.log("DEBUG: API - Sending estimate options to backend:", options); + console.log("DEBUG: API - Sending estimate options to backend:", page, pageSize, filters, sorting); - const result = await this.request(FRAPPE_GET_ESTIMATES_METHOD, { options }); + const result = await this.request(FRAPPE_GET_ESTIMATES_METHOD, { page, pageSize, filters, sorting}); return result; }