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

Compare commits

base: bnilsen:410671c3977c00bca26f7c018928c585c2cd5476
Branches Tags
bnilsen:main
bnilsen:test-fixtures
..
compare: bnilsen:c842bcff12304623c8fb0da62c3ed1be0fe4036f
Branches Tags
bnilsen:main
bnilsen:test-fixtures

No commits in common. "410671c3977c00bca26f7c018928c585c2cd5476" and "c842bcff12304623c8fb0da62c3ed1be0fe4036f" have entirely different histories.
410671c397 ... c842bcff12

4 changed files with 24 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
import frappe, json import frappe, json
from custom_ui.db_utils import process_query_conditions, build_datatable_dict, get_count_or_filters, build_success_response from custom_ui.db_utils import process_query_conditions, build_datatable_response, get_count_or_filters
# =============================================================================== # ===============================================================================
# JOB MANAGEMENT API METHODS # JOB MANAGEMENT API METHODS
@ -39,8 +39,7 @@ def get_jobs_table_data(filters={}, sortings=[], page=1, page_size=10):
tableRow["percent_complete"] = project.get("percent_complete", 0) tableRow["percent_complete"] = project.get("percent_complete", 0)
tableRows.append(tableRow) tableRows.append(tableRow)
data_table_dict = build_datatable_dict(data=tableRows, count=count, page=page, page_size=page_size) return build_datatable_response(data=tableRows, count=count, page=page, page_size=page_size)
return build_success_response(data_table_dict)
@frappe.whitelist() @frappe.whitelist()

2
frontend/src/api.js
View file

@ -13,7 +13,7 @@ const FRAPPE_SEND_ESTIMATE_EMAIL_METHOD = "custom_ui.api.db.estimates.send_estim
const FRAPPE_LOCK_ESTIMATE_METHOD = "custom_ui.api.db.estimates.lock_estimate"; const FRAPPE_LOCK_ESTIMATE_METHOD = "custom_ui.api.db.estimates.lock_estimate";
const FRAPPE_ESTIMATE_UPDATE_RESPONSE_METHOD = "custom_ui.api.db.estimates.manual_response"; const FRAPPE_ESTIMATE_UPDATE_RESPONSE_METHOD = "custom_ui.api.db.estimates.manual_response";
// Job methods // Job methods
const FRAPPE_GET_JOBS_METHOD = "custom_ui.api.db.jobs.get_jobs_table_data"; const FRAPPE_GET_JOBS_METHOD = "custom_ui.api.db.get_jobs";
const FRAPPE_UPSERT_JOB_METHOD = "custom_ui.api.db.jobs.upsert_job"; const FRAPPE_UPSERT_JOB_METHOD = "custom_ui.api.db.jobs.upsert_job";
const FRAPPE_GET_JOB_TASK_LIST_METHOD = "custom_ui.api.db.get_job_task_list"; const FRAPPE_GET_JOB_TASK_LIST_METHOD = "custom_ui.api.db.get_job_task_list";
// Invoice methods // Invoice methods

33
frontend/src/components/pages/Jobs.vue
View file

@ -104,7 +104,6 @@
:totalRecords="totalRecords" :totalRecords="totalRecords"
:loading="isLoading" :loading="isLoading"
@lazy-load="handleLazyLoad" @lazy-load="handleLazyLoad"
@row-click="handleRowClick"
/> />
</div> </div>
</template> </template>
@ -255,31 +254,27 @@ const handleLazyLoad = async (event) => {
} }
}; };
const handleRowClick = (event) => {
const rowData = event.data;
router.push(`/job?jobId=${rowData.name}`);
}
// Load initial data // Load initial data
onMounted(async () => { onMounted(async () => {
notifications.addWarning("Jobs page coming soon"); notifications.addWarning("Jobs page coming soon");
// Initialize pagination and filters // Initialize pagination and filters
paginationStore.initializeTablePagination("jobs", { rows: 10 }); // paginationStore.initializeTablePagination("jobs", { rows: 10 });
filtersStore.initializeTableFilters("jobs", columns); // filtersStore.initializeTableFilters("jobs", columns);
filtersStore.initializeTableSorting("jobs"); // filtersStore.initializeTableSorting("jobs");
// // Load first page // // Load first page
const initialPagination = paginationStore.getTablePagination("jobs"); // const initialPagination = paginationStore.getTablePagination("jobs");
const initialFilters = filtersStore.getTableFilters("jobs"); // const initialFilters = filtersStore.getTableFilters("jobs");
const initialSorting = filtersStore.getTableSorting("jobs"); // const initialSorting = filtersStore.getTableSorting("jobs");
await handleLazyLoad({ // await handleLazyLoad({
page: initialPagination.page, // page: initialPagination.page,
rows: initialPagination.rows, // rows: initialPagination.rows,
first: initialPagination.first, // first: initialPagination.first,
sortField: initialSorting.field || initialPagination.sortField, // sortField: initialSorting.field || initialPagination.sortField,
sortOrder: initialSorting.order || initialPagination.sortOrder, // sortOrder: initialSorting.order || initialPagination.sortOrder,
}); // filters: initialFilters,
// });
}); });
</script> </script>
<style lang="css"> <style lang="css">

2
frontend/src/router.js
View file

@ -11,7 +11,6 @@ import Warranties from "./components/pages/Warranties.vue";
import Home from "./components/pages/Home.vue"; import Home from "./components/pages/Home.vue";
import Client from "./components/pages/Client.vue"; import Client from "./components/pages/Client.vue";
import Estimate from "./components/pages/Estimate.vue"; import Estimate from "./components/pages/Estimate.vue";
import Job from "./components/pages/Job.vue";
const routes = [ const routes = [
{ {
@ -22,7 +21,6 @@ const routes = [
{ path: "/clients", component: Clients }, { path: "/clients", component: Clients },
{ path: "/client", component: Client }, { path: "/client", component: Client },
{ path: "/jobs", component: Jobs }, { path: "/jobs", component: Jobs },
{ path: "/job", component: Job },
{ path: "/invoices", component: Invoices }, { path: "/invoices", component: Invoices },
{ path: "/estimates", component: Estimates }, { path: "/estimates", component: Estimates },
{ path: "/estimate", component: Estimate }, { path: "/estimate", component: Estimate },