bnilsen/custom_ui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: bnilsen:f8694cf8d4af22c47eb2ad0b06baea8808340b51
Branches Tags
bnilsen:main
bnilsen:test-fixtures
..
compare: bnilsen:84c7eb0580cf0c874abf77a9c2515b7dbf807423
Branches Tags
bnilsen:main
bnilsen:test-fixtures

No commits in common. "f8694cf8d4af22c47eb2ad0b06baea8808340b51" and "84c7eb0580cf0c874abf77a9c2515b7dbf807423" have entirely different histories.
f8694cf8d4 ... 84c7eb0580

3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
custom_ui/api/db/estimates.py
View file

@ -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 * page_size,
start=(page - 1) * page_size,
order_by=processed_sortings
)

2
custom_ui/api/db/jobs.py
View file

@ -118,7 +118,7 @@ def get_jobs_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 * page_size,
start=(page - 1) * page_size,
order_by=processed_sortings
)

8
frontend/src/api.js
View file

@ -204,9 +204,9 @@ class Api {
for_table: true,
};
console.log("DEBUG: API - Sending estimate options to backend:", page, pageSize, filters, sorting);
console.log("DEBUG: API - Sending estimate options to backend:", options);
const result = await this.request(FRAPPE_GET_ESTIMATES_METHOD, { page, pageSize, filters, sorting});
const result = await this.request(FRAPPE_GET_ESTIMATES_METHOD, { options });
return result;
}
@ -285,9 +285,9 @@ class Api {
for_table: true,
};
console.log("DEBUG: API - Sending job options to backend:", page, pageSize, filters, sorting);
console.log("DEBUG: API - Sending job options to backend:", options);
const result = await this.request(FRAPPE_GET_JOBS_METHOD, { page, pageSize, filters, sorting});
const result = await this.request(FRAPPE_GET_JOBS_METHOD, { options });
return result;
}