From 916c58f4fc20514f9374699f8298cd14f2bb7b3b Mon Sep 17 00:00:00 2001 From: MrWaradana Date: Fri, 17 Jan 2025 14:32:38 +0700 Subject: [PATCH] fix: pagination tree --- src/equipment/service.py | 1 - src/equipment_master/service.py | 1 - src/masterdata/service.py | 1 - src/plant_masterdata/service.py | 1 - src/plant_transaction_data/service.py | 1 - src/yeardata/service.py | 1 - 6 files changed, 6 deletions(-) diff --git a/src/equipment/service.py b/src/equipment/service.py index 7c99057..9218a6e 100644 --- a/src/equipment/service.py +++ b/src/equipment/service.py @@ -75,7 +75,6 @@ async def get_all( cast(Equipment.acquisition_year, String).ilike(f"%{search}%") | cast(Equipment.assetnum, String).ilike(f"%{search}%") ) - common["page"] = 1 common["items_per_page"] = items_per_page diff --git a/src/equipment_master/service.py b/src/equipment_master/service.py index 9765e31..8c50001 100644 --- a/src/equipment_master/service.py +++ b/src/equipment_master/service.py @@ -30,7 +30,6 @@ async def get_all_master( if search: query = query.filter(EquipmentMaster.name.ilike(f"%{search}%")) - common["page"] = 1 query = query.options(recursive_load(5)) diff --git a/src/masterdata/service.py b/src/masterdata/service.py index 74efda0..4f3e9d4 100644 --- a/src/masterdata/service.py +++ b/src/masterdata/service.py @@ -24,7 +24,6 @@ async def get_all( if search: query = query.filter(MasterData.name.ilike(f"%{search}%")) - common["page"] = 1 common["items_per_page"] = items_per_page result = await search_filter_sort_paginate(model=query, **common) diff --git a/src/plant_masterdata/service.py b/src/plant_masterdata/service.py index ba7b671..80d9da8 100644 --- a/src/plant_masterdata/service.py +++ b/src/plant_masterdata/service.py @@ -26,7 +26,6 @@ async def get_all( if search: query = query.filter(PlantMasterData.total_project_cost.ilike(f"%{search}%")) - common["page"] = 1 common["items_per_page"] = items_per_page result = await search_filter_sort_paginate(model=query, **common) diff --git a/src/plant_transaction_data/service.py b/src/plant_transaction_data/service.py index a5c80c2..2faa115 100644 --- a/src/plant_transaction_data/service.py +++ b/src/plant_transaction_data/service.py @@ -30,7 +30,6 @@ async def get_all( query = query.filter( cast(PlantTransactionData.tahun, String).ilike(f"%{search}%") ) - common["page"] = 1 common["items_per_page"] = items_per_page results = await search_filter_sort_paginate(model=query, **common) diff --git a/src/yeardata/service.py b/src/yeardata/service.py index 3a1d79e..84f21ff 100644 --- a/src/yeardata/service.py +++ b/src/yeardata/service.py @@ -26,7 +26,6 @@ async def get_all( query = Select(Yeardata).order_by(Yeardata.year.desc()) if search: query = query.filter(cast(Yeardata.year, String).ilike(f"%{search}%")) - common["page"] = 1 common["items_per_page"] = items_per_page results = await search_filter_sort_paginate(model=query, **common)