Fix: Updated removed redundant filtering, and getting for single-page architecture, which this is not on all pages

This commit is contained in:
2024-11-14 12:58:57 +00:00
parent 70de7026d3
commit 8fc3d8a803
21 changed files with 136 additions and 659 deletions

View File

@@ -30,8 +30,8 @@ class Model_View_Store_Stock_Item(Model_View_Store):
category_list_filters: Product_Category_Container = None
currencies: list = None
currency_options: list = None
filters_stock_item: Filters_Stock_Item
form_filters: Filters_Stock_Item = None
form_filters_old: Filters_Stock_Item
list_options_product: list = None
plants: list = None
storage_locations: list = None
@@ -44,15 +44,15 @@ class Model_View_Store_Stock_Item(Model_View_Store):
def title(self):
return 'Store Stock Items'
def __init__(self, filters_stock_item, hash_page_current=Model_View_Store.HASH_PAGE_STORE_STOCK_ITEMS):
def __init__(self, form_filters_old, hash_page_current=Model_View_Store.HASH_PAGE_STORE_STOCK_ITEMS):
_m = 'Model_View_Store_Stock_Item.__init__'
Helper_App.console_log(f'{_m}\nstarting...')
super().__init__(hash_page_current=hash_page_current, filters_stock_item=filters_stock_item)
# BaseModel.__init__(self, app=app, filters_stock_item=filters_stock_item, **kwargs)
self.form_filters = Filters_Stock_Item.from_json(filters_stock_item.to_json()) # .from_form_stock_item(filters_stock_item)
super().__init__(hash_page_current=hash_page_current, form_filters_old=form_filters_old)
# BaseModel.__init__(self, app=app, form_filters_old=form_filters_old, **kwargs)
self.form_filters = form_filters_old # Filters_Stock_Item.from_json(form_filters_old.to_json()) # .from_form_stock_item(form_filters_old)
datastore_store = DataStore_Store_Stock_Item()
tmp_category_list_stock_item, errors = datastore_store.get_many_product(Parameters_Product.from_filters_stock_item(filters_stock_item))
self.category_list, errors = datastore_store.get_many_stock_item(Parameters_Stock_Item.from_form_stock_item(filters_stock_item), tmp_category_list_stock_item)
tmp_category_list_stock_item, errors = datastore_store.get_many_product(Parameters_Product.from_filters_stock_item(self.form_filters))
self.category_list, errors = datastore_store.get_many_stock_item(Parameters_Stock_Item.from_form_stock_item(self.form_filters), tmp_category_list_stock_item)
self.category_list_filters, errors_filters = datastore_store.get_many_product(Parameters_Product.get_default())
"""
Parameters_Stock_Item(
@@ -83,7 +83,7 @@ class Model_View_Store_Stock_Item(Model_View_Store):
filtered_product_list.append(product)
Helper_App.console_log(f'product_list: {product_list}\nfiltered_product_list: {filtered_product_list}')
self.form_filters.id_product.choices += [(str(product['value']), product['text']) for product in filtered_product_list] # [Filters_Stock_Item.get_choice_all()] +
# self.form_filters.import_values(filters_stock_item)
# self.form_filters.import_values(form_filters_old)
self.variation_types, self.variations, errors = self.get_many_product_variation()
self.units_measurement = self.get_many_unit_measurement()
self.units_measurement_time = [unit_measurement for unit_measurement in self.units_measurement if unit_measurement.is_unit_of_time]