diff --git a/business_objects/store/__pycache__/product.cpython-312.pyc b/business_objects/store/__pycache__/product.cpython-312.pyc index bb53bb78..1cc13db5 100644 Binary files a/business_objects/store/__pycache__/product.cpython-312.pyc and b/business_objects/store/__pycache__/product.cpython-312.pyc differ diff --git a/business_objects/store/__pycache__/product_category.cpython-312.pyc b/business_objects/store/__pycache__/product_category.cpython-312.pyc index b0ba31d7..aeefa5fa 100644 Binary files a/business_objects/store/__pycache__/product_category.cpython-312.pyc and b/business_objects/store/__pycache__/product_category.cpython-312.pyc differ diff --git a/business_objects/store/__pycache__/product_permutation.cpython-312.pyc b/business_objects/store/__pycache__/product_permutation.cpython-312.pyc index cf3c42de..f6e02b54 100644 Binary files a/business_objects/store/__pycache__/product_permutation.cpython-312.pyc and b/business_objects/store/__pycache__/product_permutation.cpython-312.pyc differ diff --git a/business_objects/store/__pycache__/product_variation_tree.cpython-312.pyc b/business_objects/store/__pycache__/product_variation_tree.cpython-312.pyc index 9181d1ab..caf47456 100644 Binary files a/business_objects/store/__pycache__/product_variation_tree.cpython-312.pyc and b/business_objects/store/__pycache__/product_variation_tree.cpython-312.pyc differ diff --git a/business_objects/store/__pycache__/product_variation_type.cpython-312.pyc b/business_objects/store/__pycache__/product_variation_type.cpython-312.pyc index 9826dda2..e41f32dd 100644 Binary files a/business_objects/store/__pycache__/product_variation_type.cpython-312.pyc and b/business_objects/store/__pycache__/product_variation_type.cpython-312.pyc differ diff --git a/business_objects/store/product.py b/business_objects/store/product.py index 63dffd15..6ec5aa30 100644 --- a/business_objects/store/product.py +++ b/business_objects/store/product.py @@ -272,11 +272,17 @@ class Product(SQLAlchemy_ABC, Store_Base): return index_permutation raise ValueError(f"{av.error_msg_str(id_permutation, 'id_permutation', 'Product.get_index_permutation_from_id', int)}\nPermutation ID not found.") """ + """ def add_product_variation(self, variation): av.val_instance(variation, 'variation', 'Product.add_product_variation', Product_Variation) # Helper_App.console_log(f'variation: {variation}') index_permutation = self.permutation_index[variation.id_permutation] # self.get_index_permutation_from_id(variation.id_permutation) self.permutations[index_permutation].add_product_variation(variation) + """ + def add_product_variation_type(self, variation_type): + variation = variation_type.variations[0] + index_permutation = self.permutation_index[variation.id_permutation] + self.permutations[index_permutation].add_product_variation_type(variation_type) def add_product_price(self, price): av.val_instance(price, 'price', 'Product.add_product_price', Product_Price) index_permutation = self.permutation_index[price.id_permutation] # self.get_index_permutation_from_id(price.id_permutation) diff --git a/business_objects/store/product_category.py b/business_objects/store/product_category.py index 61fc908a..d7e1baa4 100644 --- a/business_objects/store/product_category.py +++ b/business_objects/store/product_category.py @@ -14,7 +14,8 @@ Business object for product category import lib.argument_validation as av from business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base from business_objects.store.product import Product, Product_Permutation, Product_Price -from business_objects.store.product_variation import Product_Variation +# from business_objects.store.product_variation import Product_Variation +from business_objects.store.product_variation_type import Product_Variation_Type from business_objects.store.image import Image from business_objects.store.delivery_option import Delivery_Option from business_objects.store.discount import Discount @@ -115,10 +116,17 @@ class Product_Category(SQLAlchemy_ABC, Store_Base): index_product = self.get_index_product_from_id(permutation.id_product) # index_product = self.product_index[permutation.id_product] self.products[index_product].add_product_permutation(permutation) + """ def add_product_variation(self, variation): av.val_instance(variation, 'variation', 'Category.add_product_variation', Product_Variation) index_product = self.get_index_product_from_id(variation.id_product) self.products[index_product].add_product_variation(variation) + """ + def add_product_variation_type(self, variation_type): + av.val_instance(variation_type, 'variation_type', 'Category.add_product_variation_type', Product_Variation_Type) + variation = variation_type.variations[0] + index_product = self.get_index_product_from_id(variation.id_product) + self.products[index_product].add_product_variation_type(variation_type) def add_product_price(self, price): av.val_instance(price, 'price', 'Category.add_product_price', Product_Price) index_product = self.get_index_product_from_id(price.id_product) @@ -352,10 +360,17 @@ class Product_Category_Container(Store_Base): av.val_instance(permutation, 'permutation', 'Container_Product_Categories.add_product_permutation', Product_Permutation) index_category = self.get_index_category_from_id(permutation.id_category) self.categories[index_category].add_product_permutation(permutation) + """ def add_product_variation(self, variation): av.val_instance(variation, 'variation', 'Container_Product_Categories.add_product_variation', Product_Variation) index_category = self.get_index_category_from_id(variation.id_category) self.categories[index_category].add_product_variation(variation) + """ + def add_product_variation_type(self, variation_type): + av.val_instance(variation_type, 'variation_type', 'Container_Product_Categories.add_product_variation_type', Product_Variation_Type) + variation = variation_type.variations[0] + index_category = self.get_index_category_from_id(variation.id_category) + self.categories[index_category].add_product_variation_type(variation_type) def add_product_price(self, price): av.val_instance(price, 'price', 'Container_Product_Categories.add_product_price', Product_Price) index_category = self.get_index_category_from_id(price.id_category) diff --git a/business_objects/store/product_permutation.py b/business_objects/store/product_permutation.py index b0ad66fe..dbf71e81 100644 --- a/business_objects/store/product_permutation.py +++ b/business_objects/store/product_permutation.py @@ -302,7 +302,7 @@ class Product_Permutation(db.Model, Store_Base): self.FLAG_CAN_VIEW: self.can_view, self.FLAG_CAN_EDIT: self.can_edit, self.FLAG_CAN_ADMIN: self.can_admin, - self.FLAG_PRODUCT_VARIATIONS: [variation_type.to_json() for variation_type in self.variation_tree.get_product_variation_types()], + self.FLAG_PRODUCT_VARIATIONS: [] if self.variation_tree is None else [variation_type.to_json() for variation_type in self.variation_tree.get_product_variation_types()], self.FLAG_PRODUCT_IMAGE: [image.to_json() for image in self.images], self.FLAG_DELIVERY_OPTION: [option.to_json() for option in self.delivery_options], self.FLAG_PRODUCT_PRICE: [price.to_json() for price in self.prices], @@ -395,10 +395,10 @@ class Product_Permutation(db.Model, Store_Base): price_GBP_full: {self.price_GBP_full} price_GBP_min: {self.price_GBP_min} """ - + """ def add_product_variation(self, variation): _m = 'Product_Permutation.add_product_variation' - """ + "" av.val_instance(variation, 'variation', _m, Product_Variation) try: self.variation_index[variation.id_variation] @@ -406,11 +406,18 @@ class Product_Permutation(db.Model, Store_Base): except KeyError: self.variation_index[variation.id_variation] = len(self.variations) self.variations.append(variation) - """ + "" if self.variation_tree is None: self.variation_tree = Product_Variation_Tree.from_product_variation(variation) else: self.variation_tree.add_product_variation(variation) + """ + def add_product_variation_type(self, variation_type): + _m = 'Product_Permutation.add_product_variation_type' + if self.variation_tree is None: + self.variation_tree = Product_Variation_Tree.from_product_variation_type(variation_type) + else: + self.variation_tree.add_product_variation_type(variation_type) def add_product_price(self, price): _m = 'Product_Permutation.add_product_price' av.val_instance(price, 'price', _m, Product_Price) diff --git a/business_objects/store/product_variation_tree.py b/business_objects/store/product_variation_tree.py index 3f18a3a1..00a3647e 100644 --- a/business_objects/store/product_variation_tree.py +++ b/business_objects/store/product_variation_tree.py @@ -11,6 +11,7 @@ Business object for product """ # internal +from business_objects.store.product_variation import Product_Variation from business_objects.store.product_variation_type import Product_Variation_Type from extensions import db from helpers.helper_app import Helper_App @@ -49,9 +50,9 @@ class Product_Variation_Tree(): node_root = Product_Variation_Tree_Node.from_variation_type_and_node_parent(variation_type_root, None) return cls.from_node_root(node_root) def is_equal(self, tree): - my_type_list = self.get_product_variations() + my_type_list = self.get_product_variation_types() sz_me = len(my_type_list) - other_type_list = tree.get_product_variations() + other_type_list = tree.get_product_variation_types() sz_other = len(other_type_list) is_equal = (sz_me == sz_other) if is_equal: @@ -120,6 +121,7 @@ class Product_Variation_Tree(): types.append(node.variation_type) node = node.nodes_child[0] at_leaf_node = node.is_leaf() + types.append(node.variation_type) return types """ def get_product_variations(self): @@ -140,7 +142,7 @@ class Product_Variation_Tree(): preview_str = '' for variation_type in variation_types: is_first = (preview_str == '') - preview_str += f'{variation_type.name}: {variation_type.variations[0].name}' + preview_str += f'{variation_type.name_singular}: {variation_type.variations[0].name}' if is_first: preview_str += '\n' Helper_App.console_log(f'preview_str: {preview_str}') diff --git a/business_objects/store/product_variation_type.py b/business_objects/store/product_variation_type.py index d07a6199..7e799893 100644 --- a/business_objects/store/product_variation_type.py +++ b/business_objects/store/product_variation_type.py @@ -30,7 +30,7 @@ from operator import attrgetter class Product_Variation_Type(db.Model, Store_Base): NAME_ATTR_OPTION_VALUE: ClassVar[str] = Store_Base.ATTR_ID_PRODUCT_VARIATION_TYPE - NAME_ATTR_OPTION_TEXT = Store_Base.FLAG_NAME_SINGULAR + NAME_ATTR_OPTION_TEXT = Store_Base.FLAG_NAME id_type = db.Column(db.Integer, primary_key=True) code = db.Column(db.String(50)) diff --git a/datastores/__pycache__/datastore_store_base.cpython-312.pyc b/datastores/__pycache__/datastore_store_base.cpython-312.pyc index 00118c7b..dad97b7c 100644 Binary files a/datastores/__pycache__/datastore_store_base.cpython-312.pyc and b/datastores/__pycache__/datastore_store_base.cpython-312.pyc differ diff --git a/datastores/datastore_store_base.py b/datastores/datastore_store_base.py index 576d2975..30a1da23 100644 --- a/datastores/datastore_store_base.py +++ b/datastores/datastore_store_base.py @@ -119,9 +119,9 @@ class DataStore_Store_Base(DataStore_Base): cursor.nextset() result_set_4 = cursor.fetchall() for row in result_set_4: - new_variation = Product_Variation.from_DB_get_many_product_catalogue(row) + new_variation_type = Product_Variation_Type.from_DB_get_many_product_catalogue(row) try: - category_list.add_product_variation(new_variation) + category_list.add_product_variation_type(new_variation_type) except Exception as e: Helper_App.console_log(f'Error adding variation: {e}') diff --git a/static/css/pages/store/product_categories.css b/static/css/pages/store/product_categories.css index 6d2d635e..7d80d358 100644 --- a/static/css/pages/store/product_categories.css +++ b/static/css/pages/store/product_categories.css @@ -50,47 +50,13 @@ width: 5vh; min-width: 5vh; } -/* -nips -*/ - -/* -.row-new { - visibility: hidden; -} -*/ - -textarea { - width: 95%; -} - -select { - width: 100%; -} - -input { - width: 90%; -} td > input, td > select, td > textarea, .container-input > input, .container-input > select, .container-input > textarea { border: 2px solid var(--c_purple); border-radius: 0.5vh; } -#tableMain tbody tr td button { - padding: 0; - border: 0; - margin: 0; - text-decoration: none; -} - #tableMain tbody tr td table thead tr th.id_variation_type, #tableMain tbody tr td table tbody tr td.id_variation_type, #tableMain tbody tr td table thead tr th.id_variation, #tableMain tbody tr td table tbody tr td.id_variation { width: 47.5%; } - -/* -select.id_variation, select.id_variation_type { - max-width: 40% !important; -} -*/ diff --git a/static/css/pages/store/product_permutations.css b/static/css/pages/store/product_permutations.css index ed9fcd28..2be740e6 100644 --- a/static/css/pages/store/product_permutations.css +++ b/static/css/pages/store/product_permutations.css @@ -114,13 +114,6 @@ td > input, td > select, td > textarea, .container-input > input, .container-inp border-radius: 0.5vh; } -#tableMain tbody tr td button { - padding: 0; - border: 0; - margin: 0; - text-decoration: none; -} - #tableMain tbody tr td table thead tr th.id_variation_type, #tableMain tbody tr td table tbody tr td.id_variation_type, #tableMain tbody tr td table thead tr th.id_variation, #tableMain tbody tr td table tbody tr td.id_variation { width: 47.5%; } diff --git a/static/css/pages/store/products.css b/static/css/pages/store/products.css index fcdadac8..2a0c688e 100644 --- a/static/css/pages/store/products.css +++ b/static/css/pages/store/products.css @@ -46,30 +46,11 @@ min-width: 5vh; } -textarea { - width: 95%; -} - -select { - width: 100%; -} - -input { - width: 90%; -} - td > input, td > select, td > textarea, .container-input > input, .container-input > select, .container-input > textarea { border: 2px solid var(--c_purple); border-radius: 0.5vh; } -#tableMain tbody tr td button { - padding: 0; - border: 0; - margin: 0; - text-decoration: none; -} - #tableMain tbody tr td table thead tr th.id_variation_type, #tableMain tbody tr td table tbody tr td.id_variation_type, #tableMain tbody tr td table thead tr th.id_variation, #tableMain tbody tr td table tbody tr td.id_variation { width: 47.5%; } diff --git a/static/dist/css/store_product_categories.bundle.css b/static/dist/css/store_product_categories.bundle.css index de1b2157..4ace60b7 100644 --- a/static/dist/css/store_product_categories.bundle.css +++ b/static/dist/css/store_product_categories.bundle.css @@ -107,50 +107,16 @@ width: 5vh; min-width: 5vh; } -/* -nips -*/ - -/* -.row-new { - visibility: hidden; -} -*/ - -textarea { - width: 95%; -} - -select { - width: 100%; -} - -input { - width: 90%; -} td > input, td > select, td > textarea, .container-input > input, .container-input > select, .container-input > textarea { border: 2px solid var(--c_purple); border-radius: 0.5vh; } -#tableMain tbody tr td button { - padding: 0; - border: 0; - margin: 0; - text-decoration: none; -} - #tableMain tbody tr td table thead tr th.id_variation_type, #tableMain tbody tr td table tbody tr td.id_variation_type, #tableMain tbody tr td table thead tr th.id_variation, #tableMain tbody tr td table tbody tr td.id_variation { width: 47.5%; } -/* -select.id_variation, select.id_variation_type { - max-width: 40% !important; -} -*/ - /*# sourceMappingURL=store_product_categories.bundle.css.map*/ \ No newline at end of file diff --git a/static/dist/css/store_product_permutations.bundle.css b/static/dist/css/store_product_permutations.bundle.css index 6eeae342..3aa1b12e 100644 --- a/static/dist/css/store_product_permutations.bundle.css +++ b/static/dist/css/store_product_permutations.bundle.css @@ -171,13 +171,6 @@ td > input, td > select, td > textarea, .container-input > input, .container-inp border-radius: 0.5vh; } -#tableMain tbody tr td button { - padding: 0; - border: 0; - margin: 0; - text-decoration: none; -} - #tableMain tbody tr td table thead tr th.id_variation_type, #tableMain tbody tr td table tbody tr td.id_variation_type, #tableMain tbody tr td table thead tr th.id_variation, #tableMain tbody tr td table tbody tr td.id_variation { width: 47.5%; } diff --git a/static/dist/js/main.bundle.js b/static/dist/js/main.bundle.js index 62315d28..53962296 100644 --- a/static/dist/js/main.bundle.js +++ b/static/dist/js/main.bundle.js @@ -2463,7 +2463,6 @@ var TableBasePage = /*#__PURE__*/function (_BasePage) { }, { key: "hookupButtonsAddSaveCancel", value: function hookupButtonsAddSaveCancel() { - this.hookupButtonAddRowTable(); this.hookupButtonSave(); this.hookupButtonCancel(); this.toggleShowButtonsSaveCancel(false); @@ -2555,14 +2554,6 @@ var TableBasePage = /*#__PURE__*/function (_BasePage) { button.classList.add(flagCollapsed); }); } - }, { - key: "hookupButtonAddRowTable", - value: function hookupButtonAddRowTable() { - var _this8 = this; - this.hookupEventHandler("click", idFormFilters + ' button.' + flagAdd, function (event, button) { - _this8.handleClickAddRowTable(event, button); - }); - } }, { key: "handleClickAddRowTable", value: function handleClickAddRowTable(event, button) { @@ -2591,14 +2582,14 @@ var TableBasePage = /*#__PURE__*/function (_BasePage) { }, { key: "hookupTableMain", value: function hookupTableMain() { - var _this9 = this; + var _this8 = this; if (this.constructor === TableBasePage) { throw new Error("Must implement hookupTableMain() method."); } if (true) { // _rowBlank == null) { Events.initialiseEventHandler(idTableMain, flagInitialised, function (table) { - _this9.cacheRowBlank(); + _this8.cacheRowBlank(); }); } } @@ -2643,9 +2634,9 @@ var TableBasePage = /*#__PURE__*/function (_BasePage) { }, { key: "hookupChangeHandlerTableCells", value: function hookupChangeHandlerTableCells(inputSelector) { - var _this10 = this; + var _this9 = this; var handler = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : function (event, element) { - _this10.handleChangeNestedElementCellTable(event, element); + _this9.handleChangeNestedElementCellTable(event, element); }; Events.initialiseEventHandler(inputSelector, flagInitialised, function (input) { input.addEventListener("change", function (event) { @@ -2789,9 +2780,9 @@ var TableBasePage = /*#__PURE__*/function (_BasePage) { }, { key: "hookupChangeHandlerTableCellsWhenNotCollapsed", value: function hookupChangeHandlerTableCellsWhenNotCollapsed(inputSelector) { - var _this11 = this; + var _this10 = this; var handler = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : function (event, element) { - if (!element.classList.contains(flagCollapsed)) _this11.handleChangeNestedElementCellTable(event, element); + if (!element.classList.contains(flagCollapsed)) _this10.handleChangeNestedElementCellTable(event, element); }; this.hookupEventHandler("change", inputSelector, handler); } @@ -2871,10 +2862,10 @@ var TableBasePage = /*#__PURE__*/function (_BasePage) { }, { key: "hookupFieldsActive", value: function hookupFieldsActive() { - var _this12 = this; + var _this11 = this; var flagTable = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : ''; var handleClickRowNew = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : function (event, element) { - _this12.handleClickAddRowTable(event, element); + _this11.handleClickAddRowTable(event, element); }; var selectorButton = 'table' + (Validation.isEmpty(flagTable) ? '' : '.' + flagTable) + ' > tbody > tr > td.' + flagActive + ' button'; var selectorButtonDelete = selectorButton + '.' + flagDelete; @@ -2889,16 +2880,19 @@ var TableBasePage = /*#__PURE__*/function (_BasePage) { }, { key: "hookupButtonsRowDelete", value: function hookupButtonsRowDelete(selectorButtonDelete, selectorButtonUndelete) { - var _this13 = this; + var _this12 = this; this.hookupEventHandler("click", selectorButtonDelete, function (event, element) { - _this13.handleClickButtonRowDelete(event, element, selectorButtonDelete, selectorButtonUndelete); + _this12.handleClickButtonRowDelete(event, element, selectorButtonDelete, selectorButtonUndelete); }); } }, { key: "handleClickButtonRowDelete", value: function handleClickButtonRowDelete(event, element, selectorButtonDelete, selectorButtonUndelete) { - // let row = DOM.getRowFromElement(element); + var row = DOM.getRowFromElement(element); // row.classList.add(flagDelete); + if (row.classList.contains(flagRowNew) && !DOM.hasDirtyChildrenContainer(row)) { + row.parentNode.removeChild(row); + } var buttonAdd = element.cloneNode(false); // document.createElement("button"); buttonAdd.classList.remove(flagInitialised); buttonAdd.classList.remove(flagDelete); @@ -2913,9 +2907,9 @@ var TableBasePage = /*#__PURE__*/function (_BasePage) { }, { key: "hookupButtonsRowUndelete", value: function hookupButtonsRowUndelete(selectorButtonDelete, selectorButtonUndelete) { - var _this14 = this; + var _this13 = this; this.hookupEventHandler("click", selectorButtonUndelete, function (event, element) { - _this14.handleClickButtonRowUndelete(event, element, selectorButtonDelete, selectorButtonUndelete); + _this13.handleClickButtonRowUndelete(event, element, selectorButtonDelete, selectorButtonUndelete); }); } }, { @@ -2943,15 +2937,15 @@ var TableBasePage = /*#__PURE__*/function (_BasePage) { }, { key: "hookupTableCellDdlPreviews", value: function hookupTableCellDdlPreviews(cellSelector, optionList) { - var _this15 = this; + var _this14 = this; var ddlHookup = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : function (cellSelector) { - _this15.hookupTableCellDdls(cellSelector); + _this14.hookupTableCellDdls(cellSelector); }; var changeHandler = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : function (event, element) { - _this15.handleChangeNestedElementCellTable(event, element); + _this14.handleChangeNestedElementCellTable(event, element); }; this.hookupEventHandler("click", cellSelector, function (event, td) { - _this15.handleClickTableCellDdlPreview(event, td, optionList, cellSelector, function (cellSelector) { + _this14.handleClickTableCellDdlPreview(event, td, optionList, cellSelector, function (cellSelector) { ddlHookup(cellSelector, function (event, element) { changeHandler(event, element); }); @@ -2962,9 +2956,9 @@ var TableBasePage = /*#__PURE__*/function (_BasePage) { }, { key: "hookupTableCellDdls", value: function hookupTableCellDdls(ddlSelector) { - var _this16 = this; + var _this15 = this; var changeHandler = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : function (event, element) { - _this16.handleChangeNestedElementCellTable(event, element); + _this15.handleChangeNestedElementCellTable(event, element); }; this.hookupEventHandler("change", ddlSelector, function (event, element) { changeHandler(event, element); @@ -2973,9 +2967,9 @@ var TableBasePage = /*#__PURE__*/function (_BasePage) { }, { key: "handleClickTableCellDdlPreview", value: function handleClickTableCellDdlPreview(event, td, optionObjectList, cellSelector) { - var _this17 = this; + var _this16 = this; var ddlHookup = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : function (cellSelector) { - _this17.hookupTableCellDdls(cellSelector); + _this16.hookupTableCellDdls(cellSelector); }; if (td.querySelector('select')) return; // td.removeEventListener("click", ddlHookup); @@ -3036,14 +3030,14 @@ var TableBasePage = /*#__PURE__*/function (_BasePage) { }, { key: "hookupTableCellDDlPreviewsWhenNotCollapsed", value: function hookupTableCellDDlPreviewsWhenNotCollapsed(cellSelector, optionList) { - var _this18 = this; + var _this17 = this; var ddlHookup = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : function (event, element) { - _this18.hookupTableCellDdls(event, element); + _this17.hookupTableCellDdls(event, element); }; this.hookupEventHandler("click", cellSelector, function (event, td) { var div = td.querySelector('div'); if (!div || div.classList.contains(flagCollapsed)) return; - _this18.handleClickTableCellDdlPreview(event, td, optionList, cellSelector, function (event, element) { + _this17.handleClickTableCellDdlPreview(event, td, optionList, cellSelector, function (event, element) { ddlHookup(event, element); }); }); @@ -3051,9 +3045,9 @@ var TableBasePage = /*#__PURE__*/function (_BasePage) { }, { key: "hookupProductCategoryDdls", value: function hookupProductCategoryDdls(ddlSelector) { - var _this19 = this; + var _this18 = this; this.hookupChangeHandlerTableCells(ddlSelector, function (event, element) { - _this19.handleChangeProductCategoryDdl(event, element); + _this18.handleChangeProductCategoryDdl(event, element); }); } }, { @@ -3087,15 +3081,15 @@ var TableBasePage = /*#__PURE__*/function (_BasePage) { }, { key: "hookupPreviewsProductPermutationVariation", value: function hookupPreviewsProductPermutationVariation() { - var _this20 = this; + var _this19 = this; this.hookupEventHandler("click", idTableMain + ' td.' + flagProductVariations, function (event, element) { - return _this20.handleClickProductPermutationVariationsPreview(event, element); + return _this19.handleClickProductPermutationVariationsPreview(event, element); }); } }, { key: "handleClickProductPermutationVariationsPreview", value: function handleClickProductPermutationVariationsPreview(event, element) { - var _this21 = this; + var _this20 = this; var tblVariations = element.querySelector('table.' + flagProductVariations); if (!Validation.isEmpty(tblVariations)) return; this.toggleColumnCollapsed(flagProductVariations, false); @@ -3124,7 +3118,7 @@ var TableBasePage = /*#__PURE__*/function (_BasePage) { var tbody = document.createElement("tbody"); if (!Validation.isEmpty(permutationVariations)) { permutationVariations.forEach(function (permutationVariation, index) { - _this21.addProductPermutationVariationRow(tbody, permutationVariation); + _this20.addProductPermutationVariationRow(tbody, permutationVariation); }); } tblVariations.appendChild(tbody); @@ -3280,13 +3274,13 @@ var TableBasePage = /*#__PURE__*/function (_BasePage) { }, { key: "hookupButtonsProductPermutationVariationAddDelete", value: function hookupButtonsProductPermutationVariationAddDelete() { - var _this22 = this; + var _this21 = this; var selectorButton = idTableMain + ' td.' + flagProductVariations + ' tr.' + flagProductVariation + ' button'; var selectorButtonDelete = selectorButton + '.' + flagDelete; var selectorButtonUndelete = selectorButton + '.' + flagAdd; this.hookupButtonsRowDelete(selectorButtonDelete, selectorButtonUndelete, function (event, element) { - _this22.handleClickButtonRowDelete(event, element); - _this22.updateProductPermutationVariations(element); + _this21.handleClickButtonRowDelete(event, element); + _this21.updateProductPermutationVariations(element); }); this.hookupButtonsRowUndelete(selectorButtonDelete, selectorButtonUndelete); this.hookupButtonsProductPermutationVariationAdd(); @@ -3294,9 +3288,9 @@ var TableBasePage = /*#__PURE__*/function (_BasePage) { }, { key: "hookupButtonsProductPermutationVariationAdd", value: function hookupButtonsProductPermutationVariationAdd() { - var _this23 = this; + var _this22 = this; this.hookupEventHandler("click", idTableMain + ' td.' + flagProductVariations + ' button.' + flagAdd, function (event, element) { - _this23.handleClickButtonProductPermutationVariationAdd(event, element); + _this22.handleClickButtonProductPermutationVariationAdd(event, element); }); } }, { diff --git a/static/js/pages/base_table.js b/static/js/pages/base_table.js index 01f89518..3cbcfacd 100644 --- a/static/js/pages/base_table.js +++ b/static/js/pages/base_table.js @@ -140,7 +140,6 @@ export default class TableBasePage extends BasePage { .catch(error => console.error('Error:', error)); } hookupButtonsAddSaveCancel() { - this.hookupButtonAddRowTable(); this.hookupButtonSave(); this.hookupButtonCancel(); this.toggleShowButtonsSaveCancel(false); @@ -216,9 +215,6 @@ export default class TableBasePage extends BasePage { button.classList.add(flagCollapsed); }); } - hookupButtonAddRowTable() { - this.hookupEventHandler("click", idFormFilters + ' button.' + flagAdd, (event, button) => { this.handleClickAddRowTable(event, button); }); - } handleClickAddRowTable(event, button) { event.stopPropagation(); _rowBlank.setAttribute(this.constructor.attrIdRowObject, -1 - _rowBlank.getAttribute(this.constructor.attrIdRowObject)); @@ -496,8 +492,11 @@ export default class TableBasePage extends BasePage { }); } handleClickButtonRowDelete(event, element, selectorButtonDelete, selectorButtonUndelete) { - // let row = DOM.getRowFromElement(element); + let row = DOM.getRowFromElement(element); // row.classList.add(flagDelete); + if (row.classList.contains(flagRowNew) && !DOM.hasDirtyChildrenContainer(row)) { + row.parentNode.removeChild(row); + } let buttonAdd = element.cloneNode(false); // document.createElement("button"); buttonAdd.classList.remove(flagInitialised); buttonAdd.classList.remove(flagDelete); diff --git a/templates/components/common/buttons/_buttons_save_cancel.html b/templates/components/common/buttons/_buttons_save_cancel.html index aa1383ab..512d65bb 100644 --- a/templates/components/common/buttons/_buttons_save_cancel.html +++ b/templates/components/common/buttons/_buttons_save_cancel.html @@ -3,7 +3,7 @@ {% elif block_id == 'button_cancel' %} {% elif block_id == 'button_add' %} - + {% elif block_id == 'button_confirm' %} {% elif block_id == 'button_get_in_touch' %} @@ -18,10 +18,12 @@ {% set block_id = 'button_apply_filters' %} {% include 'components/common/buttons/_buttons_save_cancel.html' %} -
- {% set block_id = 'button_add' %} - {% include 'components/common/buttons/_buttons_save_cancel.html' %} -
+ {# +
+ {% set block_id = 'button_add' %} + {% include 'components/common/buttons/_buttons_save_cancel.html' %} +
+ #}
{% set block_id = 'button_save' %} diff --git a/templates/components/store/_row_manufacturing_purchase_order.html b/templates/components/store/_row_manufacturing_purchase_order.html index 85c72e21..15dfdf19 100644 --- a/templates/components/store/_row_manufacturing_purchase_order.html +++ b/templates/components/store/_row_manufacturing_purchase_order.html @@ -33,9 +33,8 @@ {{ model.ATTR_VALUE_CURRENT }}="" {{ model.ATTR_VALUE_PREVIOUS }}="" >
- - - + {% set active = true %} + {% include 'components/store/_td_active.html' %} {% else %} @@ -79,8 +78,7 @@ {{ model.ATTR_VALUE_PREVIOUS }}="{{ order.price_total_local_VAT_incl }}" >
- - - + {% set active = order.active %} + {% include 'components/store/_td_active.html' %} {% endif %} \ No newline at end of file diff --git a/templates/components/store/_row_product.html b/templates/components/store/_row_product.html index 5778b449..12baad08 100644 --- a/templates/components/store/_row_product.html +++ b/templates/components/store/_row_product.html @@ -23,9 +23,8 @@ >
View
- - - + {% set active = true %} + {% include 'components/store/_td_active.html' %} {% else %} @@ -55,8 +54,7 @@ >
{{ product.name_access_level_required }}
- - - + {% set active = product.active %} + {% include 'components/store/_td_active.html' %} {% endif %} diff --git a/templates/components/store/_row_product_category.html b/templates/components/store/_row_product_category.html index fe3782f5..2ca036d5 100644 --- a/templates/components/store/_row_product_category.html +++ b/templates/components/store/_row_product_category.html @@ -15,9 +15,8 @@
View
- - - + {% set active = true %} + {% include 'components/store/_td_active.html' %} {% else %} @@ -37,8 +36,7 @@
{{ category.name_access_level_required }}
- - - + {% set active = category.active %} + {% include 'components/store/_td_active.html' %} {% endif %} \ No newline at end of file diff --git a/templates/components/store/_row_product_permutation.html b/templates/components/store/_row_product_permutation.html index 04697f09..a24619dd 100644 --- a/templates/components/store/_row_product_permutation.html +++ b/templates/components/store/_row_product_permutation.html @@ -75,9 +75,8 @@ - - - + {% set active = true %} + {% include 'components/store/_td_active.html' %} {% else %} @@ -166,8 +165,7 @@ - - - + {% set active = permutation.active %} + {% include 'components/store/_td_active.html' %} {% endif %} diff --git a/templates/components/store/_row_product_variation_type.html b/templates/components/store/_row_product_variation_type.html index e946844b..9017e0cb 100644 --- a/templates/components/store/_row_product_variation_type.html +++ b/templates/components/store/_row_product_variation_type.html @@ -15,15 +15,8 @@ {% include 'components/store/_preview_product_variation_type_variations.html' %} - - {# - - #} - - + {% set active = true %} + {% include 'components/store/_td_active.html' %} {% else %} @@ -52,14 +45,7 @@ {% include 'components/store/_preview_product_variation_type_variations.html' %} - - {# - - #} - - + {% set active = variation_type.active %} + {% include 'components/store/_td_active.html' %} {% endif %} diff --git a/templates/components/store/_row_stock_item.html b/templates/components/store/_row_stock_item.html index 56314b21..80eab421 100644 --- a/templates/components/store/_row_stock_item.html +++ b/templates/components/store/_row_stock_item.html @@ -54,9 +54,8 @@ {{ model.ATTR_VALUE_PREVIOUS }} /> - - - + {% set active = true %} + {% include 'components/store/_td_active.html' %} {% else %} @@ -142,8 +141,7 @@ {{ model.ATTR_VALUE_PREVIOUS }}="{{ model.format_datetime(stock_item.date_consumed) }}" /> - - - + {% set active = stock_item.active %} + {% include 'components/store/_td_active.html' %} {% endif %} \ No newline at end of file diff --git a/templates/components/store/_row_supplier.html b/templates/components/store/_row_supplier.html index 540106d8..0653c8fb 100644 --- a/templates/components/store/_row_supplier.html +++ b/templates/components/store/_row_supplier.html @@ -27,9 +27,8 @@ {% include 'components/store/_preview_DDL_currency.html' %} - - - + {% set active = true %} + {% include 'components/store/_td_active.html' %} {% else %} @@ -62,8 +61,7 @@ {% include 'components/store/_preview_DDL_currency.html' %} - - - + {% set active = supplier.active %} + {% include 'components/store/_td_active.html' %} {% endif %} \ No newline at end of file diff --git a/templates/components/store/_row_supplier_purchase_order.html b/templates/components/store/_row_supplier_purchase_order.html index 62bb729a..f540fa20 100644 --- a/templates/components/store/_row_supplier_purchase_order.html +++ b/templates/components/store/_row_supplier_purchase_order.html @@ -22,9 +22,8 @@ {{ model.ATTR_VALUE_CURRENT }}="" {{ model.ATTR_VALUE_PREVIOUS }}="" > - - - + {% set active = true %} + {% include 'components/store/_td_active.html' %} {% else %} @@ -61,8 +60,7 @@ {{ model.ATTR_VALUE_PREVIOUS }}="{{ order.cost_total_local_VAT_incl }}" > - - - + {% set active = order.active %} + {% include 'components/store/_td_active.html' %} {% endif %} \ No newline at end of file diff --git a/templates/components/store/_td_active.html b/templates/components/store/_td_active.html new file mode 100644 index 00000000..9f72e3e2 --- /dev/null +++ b/templates/components/store/_td_active.html @@ -0,0 +1,13 @@ + + +{% with _active = (active is not defined or active or active is none) %} + + {# + + #} + + +{% endwith %} \ No newline at end of file diff --git a/templates/pages/store/_manufacturing_purchase_orders.html b/templates/pages/store/_manufacturing_purchase_orders.html index bac476e7..3282634a 100644 --- a/templates/pages/store/_manufacturing_purchase_orders.html +++ b/templates/pages/store/_manufacturing_purchase_orders.html @@ -50,7 +50,10 @@ Cost Total VAT Incl. Price Total VAT Excl. Price Total VAT Incl. - Active + + {% set block_id = 'button_add' %} + {% include 'components/common/buttons/_buttons_save_cancel.html' %} + diff --git a/templates/pages/store/_product_categories.html b/templates/pages/store/_product_categories.html index 450c8b4c..81aa4c17 100644 --- a/templates/pages/store/_product_categories.html +++ b/templates/pages/store/_product_categories.html @@ -27,40 +27,6 @@ {% endfor %} - {# -
-
- {% set block_id = 'button_apply_filters' %} - {% include 'components/common/buttons/_buttons_save_cancel.html' %} -
-
- -
-
- {% set block_id = 'button_add' %} - {% include 'components/common/buttons/_buttons_save_cancel.html' %} -
-
-
-
- {% set block_id = 'button_save' %} - {% include 'components/common/buttons/_buttons_save_cancel.html' %} -
-
-
-
- {% set block_id = 'button_cancel' %} - {% include 'components/common/buttons/_buttons_save_cancel.html' %} -
-
- - #} {% set block_id = 'buttons_table_default' %} {% include 'components/common/buttons/_buttons_save_cancel.html' %} @@ -74,7 +40,10 @@ Name Description Access Level Required - Active + + {% set block_id = 'button_add' %} + {% include 'components/common/buttons/_buttons_save_cancel.html' %} + diff --git a/templates/pages/store/_product_permutations.html b/templates/pages/store/_product_permutations.html index 83beaa54..4e25432f 100644 --- a/templates/pages/store/_product_permutations.html +++ b/templates/pages/store/_product_permutations.html @@ -117,7 +117,10 @@ Cost Currency Profit Local Min Manufacturing Latency - Active + + {% set block_id = 'button_add' %} + {% include 'components/common/buttons/_buttons_save_cancel.html' %} + diff --git a/templates/pages/store/_product_variations.html b/templates/pages/store/_product_variations.html index 40c1df15..8f725446 100644 --- a/templates/pages/store/_product_variations.html +++ b/templates/pages/store/_product_variations.html @@ -23,12 +23,6 @@ {% endfor %} -
-
- {% set block_id = 'button_apply_filters' %} - {% include 'components/common/buttons/_buttons_save_cancel.html' %} -
-
{% set block_id = 'buttons_table_default' %} {% include 'components/common/buttons/_buttons_save_cancel.html' %} @@ -43,7 +37,8 @@ Name Plural Variations - + {% set block_id = 'button_add' %} + {% include 'components/common/buttons/_buttons_save_cancel.html' %} diff --git a/templates/pages/store/_products.html b/templates/pages/store/_products.html index c61ede1d..9987e357 100644 --- a/templates/pages/store/_products.html +++ b/templates/pages/store/_products.html @@ -63,7 +63,10 @@ Name Has Variations? Access Level Required - Active + + {% set block_id = 'button_add' %} + {% include 'components/common/buttons/_buttons_save_cancel.html' %} + diff --git a/templates/pages/store/_stock_items.html b/templates/pages/store/_stock_items.html index 017fbb9f..7ff12aa4 100644 --- a/templates/pages/store/_stock_items.html +++ b/templates/pages/store/_stock_items.html @@ -76,7 +76,10 @@ Date Expiration Is Consumed Date Consumed - Active + + {% set block_id = 'button_add' %} + {% include 'components/common/buttons/_buttons_save_cancel.html' %} + diff --git a/templates/pages/store/_supplier_purchase_orders.html b/templates/pages/store/_supplier_purchase_orders.html index c85a3e3f..962279f4 100644 --- a/templates/pages/store/_supplier_purchase_orders.html +++ b/templates/pages/store/_supplier_purchase_orders.html @@ -46,7 +46,10 @@ Currency Cost Total VAT Excl. Cost Total VAT Incl. - Active + + {% set block_id = 'button_add' %} + {% include 'components/common/buttons/_buttons_save_cancel.html' %} + diff --git a/templates/pages/store/_suppliers.html b/templates/pages/store/_suppliers.html index 984fe58b..16fd0ffd 100644 --- a/templates/pages/store/_suppliers.html +++ b/templates/pages/store/_suppliers.html @@ -32,7 +32,10 @@ Email Website Currency - Active + + {% set block_id = 'button_add' %} + {% include 'components/common/buttons/_buttons_save_cancel.html' %} +