diff --git a/app.log.1 b/app.log.1 index 9d60fb31..d9877d3f 100644 --- a/app.log.1 +++ b/app.log.1 @@ -1,13 +1,99 @@ -Server Error: 'order' is undefined -Request: 127.0.0.1 GET http /store/manufacturing_purchase_orders?active=true&date_from=&date_to= Host: 127.0.0.1:5000 -User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:131.0) Gecko/20100101 Firefox/131.0 -Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/png,image/svg+xml,*/*;q=0.8 +Traceback: Traceback (most recent call last): + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\engine\base.py", line 1967, in _exec_single_context + self.dialect.do_execute( + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\engine\default.py", line 924, in do_execute + cursor.execute(statement, parameters) + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\MySQLdb\cursors.py", line 179, in execute + res = self._query(mogrified_query) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\MySQLdb\cursors.py", line 330, in _query + db.query(q) + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\MySQLdb\connections.py", line 261, in query + _mysql.connection.query(self, query) +MySQLdb.OperationalError: (1054, "Unknown column 'v_id_permission_manufacturing' in 'where clause'") + +The above exception was the direct cause of the following exception: + +Traceback (most recent call last): + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 880, in full_dispatch_request + rv = self.dispatch_request() + ^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 865, in dispatch_request + return self.ensure_sync(self.view_functions[rule.endpoint])(**view_args) # type: ignore[no-any-return] + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\controllers\store\manufacturing_purchase_order.py", line 40, in manufacturing_purchase_orders + model = Model_View_Store_Manufacturing_Purchase_Order(form_filters) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\models\model_view_store_manufacturing_purchase_order.py", line 50, in __init__ + self.manufacturing_purchase_orders, errors = datastore_manufacturing_purchase_order.get_many_manufacturing_purchase_order(parameters_manufacturing_purchase_order) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\datastores\datastore_store_manufacturing_purchase_order.py", line 51, in get_many_manufacturing_purchase_order + result = self.db_procedure_execute('p_shop_get_many_manufacturing_purchase_order', argument_dict) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\datastores\datastore_base.py", line 95, in db_procedure_execute + result = db.session.execute(proc_string, argument_dict_list) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\orm\scoping.py", line 778, in execute + return self._proxied.execute( + ^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\orm\session.py", line 2351, in execute + return self._execute_internal( + ^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\orm\session.py", line 2245, in _execute_internal + result = conn.execute( + ^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\engine\base.py", line 1418, in execute + return meth( + ^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\sql\elements.py", line 515, in _execute_on_connection + return connection._execute_clauseelement( + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\engine\base.py", line 1640, in _execute_clauseelement + ret = self._execute_context( + ^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\engine\base.py", line 1846, in _execute_context + return self._exec_single_context( + ^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\engine\base.py", line 1986, in _exec_single_context + self._handle_dbapi_exception( + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\engine\base.py", line 2353, in _handle_dbapi_exception + raise sqlalchemy_exception.with_traceback(exc_info[2]) from e + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\engine\base.py", line 1967, in _exec_single_context + self.dialect.do_execute( + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\engine\default.py", line 924, in do_execute + cursor.execute(statement, parameters) + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\MySQLdb\cursors.py", line 179, in execute + res = self._query(mogrified_query) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\MySQLdb\cursors.py", line 330, in _query + db.query(q) + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\MySQLdb\connections.py", line 261, in query + _mysql.connection.query(self, query) +sqlalchemy.exc.OperationalError: (MySQLdb.OperationalError) (1054, "Unknown column 'v_id_permission_manufacturing' in 'where clause'") +[SQL: CALL p_shop_get_many_manufacturing_purchase_order(%s, %s, %s, %s, %s, %s, %s, %s)] +[parameters: (0, True, True, '', '', None, None, 0)] +(Background on this error at: https://sqlalche.me/e/20/e3q8) + +config_env: production +config_env: production +config_env: production +config_env: production +config_env: production +config_env: development +config_env: development +Server Error: 1 validation error for Model_View_Store_Product_Category +form_filters + Field required [type=missing, input_value={'hash_page_current': '/s...pty=False, active=True)}, input_type=dict] + For further information visit https://errors.pydantic.dev/2.8/v/missing +Request: 127.0.0.1 GET http /store/categories? Host: 127.0.0.1:5000 +User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:132.0) Gecko/20100101 Firefox/132.0 +Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8 Accept-Language: en-GB,en;q=0.5 Accept-Encoding: gzip, deflate, br, zstd -Referer: http://127.0.0.1:5000/store/manufacturing_purchase_orders Dnt: 1 Connection: keep-alive -Cookie: session=.eJytVlnzokgS_yoTRsw8tTY3-I_omPUCRUFB5HohCgqkuOUQcba_-xba090PM3tErKFYVZlk_rLy_GMCujYua9SE8NKE9eTjj0kACg_AHBVe05Z1OPlo6y789NNx92J8n4Y5QNnkYxLCHtRwliMIs7AtiyZHbfyP60idBWU--TSJUN20BcixwIkRQjjgMwS9oKvrsAgGD4YR6LJ28lF0WfYi1eEVlcVfEN4AyO9rbzSCwHJf___kWIHy52wgzFlIzAFP-IAkojAaFTbeC7F3D2sUoRBOPiKQNeGLgoog62AIPXNh_ND6thOTm67Cqn42vunqbwYpf9o9PY-GT77i-2rqyGvLNCwwXRB4GvoszUOf8Sma4aM5iCDPBYAGfsBAjgwYBkQjxO6bG0AQhE3zXUI4yLEvBeiI5BTYO3RYyZmfK-N-qSQXSidUdYd6BGz1uUtKBLY6EWwV7jDMU9d2Wr-AMXjuejVxMzdxy6OUMT5iyWBgY2jrpbJiE58i7ruCmM2yYR07BymE20hQltPHzAY9BQ5hOOzkRxAuTpDfXPcBf1k5WqwkR7Pzbmia7hQa3oZpxisnehCEqiwqLNObAzdvJG9nZ-fl9rjyjuyFcKfF5tjXTqG5BwJJ0cUs_eXtcSMYLQMFeZUOmmYe2cUmhsxG7rWkCfa5LW7OMbewDZgF5Wmf7kuFAVAMH1YfXwGFhFt89_VrMqUV0hC0Y5prvM3Ep6FYnWMPLabZahk3tkPvXdJJ85vqhY7DlGtIOf0wn9bLpa4_uav0kM3W8LeOH9JFGCy1WFRvuju9IQSyA9_4oi2ea49doPVD3YBeXhUaH2e6mapphD8VEDtVX9erjXNMTnpJ80fBuSnlNmF4Mr1uzQXTi8fDvCr4mamrZsoB1ScEw7rtnXK7aOMrDoPwUaE6bDyAQ5DkaYKlBZ4hfpwjHBQCxxDEKwv-IkrOl-eOVNGu2RU6G6x23C6tbHOF93lbueO-MO-h7V70lGH8RL672ytppuJBEWNSH-T5DAvrgKXWfi627hm_kJsppMTBXbEtsPTUl0zCp9inb2UEeAlmY9-6jMozdwvjINc6TEtd6ZFBad4FFFlBKV64FBkDq-8cat6OIRtIWQK35vDWERNwu3wekXDHoVkEuUg5th4H6B2eju3GUBKHw_PydNdqriQaoaxhqhrYWMphVMkZVEqNlXXAqE8duWuHONHKXF1fe7nYzQMpyN01WcKt3gfD5amdL4OO8C9XU5wOP6dCpqRYVy4Sji0_ZUOWXEvrAoktRszQXqYYV-aK8xiOl5nseoylVYxNq6zFi7JOOcXYcUqy6NRkR1ijI3KzdaysGdPTtXQay00POVm5kt64tn73C7UFWL8mwRffIVfv_vnHezbtZkGe5cAy011S5Y71eLrn_0PKY3sce5SJcRHwFtr6w0hJW6NiA9jxw3jim8pEzkxjW7PE7JxW3CVPxxJUObaGjsmGVp4LAvvgqa43I15mDDjFCJ7KWmOOa4VQMM6ANtGoA-siwHopqMmFUfIdq1oKczTMVFlnsfpcIsfY9G5u5q_YoLIXLjiQB42a67CQGWDLJyeraJcUKD3TCTNnVZDN-3Mi5gYOfoyrw3GZvOIpc4twuzyqWUUGhTzArfwEKXwopk6PpY5Y0ftSbp4N78ie3YpSRjuNtKF2REzu-ao-S_paR5vBH7RtqnJSdMYu4pfirlxCkzUXIHxKp1ogqelq6kVRcjuTlFzsiUQPs3XkWNJpfbBbfi8AckvkLmE0XlFFmtXpzVEn6bO5BzVdbC3y0TgU0THzm8F14uZeMqIBVHqeeO5GmhtHK6UYQyCHRcI30y6trekuue0HizkfdG5FMEkxZzyRmMY6cuim5S7DihrurFwXSb8ZiL1U-CIuyYfFpRZYjznQvtCtuRNvIunsOewRy3oKnV4fUL9cZXsqOxfafNke79Hl_mgAjFJyoWngXq7tYR-ZnPpQROoiOMF0X516m1tSJojP7F0HvGSO9asJymrsjPhZIPhLVZcRysJf3vPCp8mrYHnt8OJZhqDGTe_d-1ARla_-1-HmPLlKydDeVMVaxWf0uB15Stee5tbCFy_LOL8n_8sI8jetH5fUd41lBIFmxrHiz6LLsNT7oGmwgrhtq-bj82cY3qdFD1KK4Lgw4mIBPYpZ18xe08eo6jPW9W0w-M-gChSk_455ZCmLYKSb10elci6emOq2bhLpRho9JlcoaLtxUPuOsJlda3AHLahfcN7LzywN6YhiGIKHLMXykcBEFB8AgsedxYcc83vzhRGI3-ov1fU3-OUl61d68Ssl4m8Aix_24f1bZINXIZxVxcvjaHRYP92vSu1eP1B99N3-6nGi0ZqFkniVTEaHF2Pn_zezWldB0OJpbHTGhCIoZkqSU4I0iPkHSX1QxIyjGHfy9evXfwErYp4O.ZySbdA.IOzQ4B0k8HNh-01pbYKqF3sN8jI +Referer: http://127.0.0.1:5000/store/categories +Cookie: session=.eJytVtmuo0gS_ZWWpe6ntovdcKXSjDcw2GCbHV4sIBOzg1kNPfXvk_hWd_VDzyaNZExmRhDnRGZkRPy28Lo2Kuu4gcBoYL34-G0ReMXdA3lc3Ju2rOHio607-Ouflru34ucqzL04W3wsIBi8GqzyGIAMtmXR5HEb_f0xS1dBmS9-XYRx3bSFlyODCx0CMKK1GNyDrq5hEYx3AEOvy9rFR9Fl2VtUw0dcFn8h-CSA_zG-z05gyO77_Q-GZgmfowOWowHGeWvM93AshOEM2NzfjO89rOMwhmDxEXpZA9-SuAiyDkBwNzf6D9RPP5G46SoE9Wfnm67-7pD8u99LbXZ88Q3tV1OH97ZMYYHkHAkgZABYhxgGOQwyGEOGuB_iBLEOfRKHGOkTJPQRxe77MXhBAJvmDwtwlCJfCOJLLKWeLcbnnZT5uTzPt3JiECqmKGI8xJ6tTGJSxt5RxYKjzJxHLnVtp_ULEHmTOCiJm7mJW16EjPJjGg9GOgK2Wso7OvEJrBcLbLW6iUk2Euo6LDXq0qyj1TVjFW4k61ZVlVpa5mvCyXbDpDzymuW2e-i47ZGEpHDjRHc3WaxVT9YxIa5w3Mk1TqX9wXc7mx4HLhx8Q6rK_u44uJIEl_P6TCeitDk9_fHwZLT71VwK-tnahtmrXV71UDWXm3GIBTnYBcKraNIrhh8mvHhururUAOLC2kWvbF5Dz-V8tma5Xto7EX9eDu6Bpuond7Lud04cz2JGdPU9lLh92A5PrSCO2gR7iYnau33zHjYeWoGD19ugv7O82WTV3iyLWO2Rq5S8vOVxryxrSfM2uYl8XPtBrarkmc6ZLHMCVhYxEI0J8uFVtpubQone0Cj86YJ1CaHjWNKEjZOqxfpwyjcEzh-koTeeq21zEkbtXqhn_GAS1WvfP0L4QGEAX1Vcw-buoRDE1yTOrDGWwH6sxygoWIbCsPct-Iso0YxJxJVYbMRCpYOdyIhpZZs7NM_byp3nhdlD2zXUlKL8ROrd4wM3U_4s8xGujhK3QsY6z1JqP-dbV0Mf5GYKCH50d3TrWWrqCybmE_TkWxnmvQ3TkW8ZM3jmHkEU5LcOyVJXeGVA4LqAwCsgRBuXwCPPGjqH4No5ZAMhS8DRHD8xIgwct9MlZnsUmkWQ84Rjq1EQf4anY7sREPjxPBmTu1dyOblh8h6kio6cJRxKEZxRIZRI3geUMqmxu3ewKylzyv4xSIXIBUKQu3u8BEd1CEZjumnGqMboyZUUXYc_X4VMThFWzmOOLU2SLgmudesCgS5mzsDepohX5vJcBObNTMQBcWll_YAe1UBvRtlvGFl_dJd9SlrzQeRm61hZM19P11JJZDc953jlCmrj2mrvF0rrIfybAN5651zpfe3HdzbpZkGe5Z5lpmJS5Y71mlzt_3DlkT-OPdtEvDDwhLb60lPcvhGR7tnRS5_QTmU8Y6aRfbP4TEsrxsjTOQVVjn2LL8mBlKcDftmjs9DTmS81B5ysB5OsO6O8v70uiGdAmvGMgbAwb79llcSg5FykFUumLrqZyvssUqZt7OiHwc3N_B0bRPbm5U_RybcjwyZArwvSDh6U0800Ws1S8dtkEJ4QuYoAJE93Zl4disvkHU-Fospon12BfpmHSrkclcrlgavzyjCnukf25IrMnfirbXoF5mZUGOX0FehnfGlh5335wg6u5jbeIPOSREVdewvuvrK8X4xLbyyJrjxZfUCF62UymvKZO2q167L2dHXChML8wn4R1fIGTuvjtHTLV8JIhr0BjrJN3YErqpMBG7avByBPPQ-PGZMfgLvnzjlIz9qV6-s2pCe473zeHjLSk5-0aoRFLRNbO7zZxXVoeEnjDcffOQ912Fy14zCCyjR0domBWwAAt2zynvYEGTNkcmDkgGf8lr1chdPJ1LbQxvu41bL9QV13yZRjvo2zu4x6DuwZXiHHV-JlxDvPIBNafty8Q7pzbHLzDM4nvSEFOe_Kboux-0TzAXHs-43GCkzsDih_NUFZzZUR_Rcx-KmqyzDO4E-f_cKvi3fCurfjW2cLvRoVvc_aFxdh-a5_HSrOi4eQjO1Tka1dpMWv52VNqLfJPFobD0oSut-L_6UF-RelH6XU7zmWwCicQwn196RLs9TnQtMggKhtq-bjyxcA-2UxeCmBMQwMmYiNX8Wqa1bv7mOG-oKwvjcG_5lUEQfpv1OeVcoimOXNDa8BKJ66JLNNDCznrFVIXMVB282N2h8Mm9Wj9nqv9eo3nc_hF5oEZEhQFLYGNEGvQ5YKiXXgYWt2TfmAof7WfKVY7Jf6a_X4BXx92_qZ3PxM8OgXgOKHf2j-abJBIwhWVTFXLMRoPm9Wyl_6_VGe_e1rJ22MpQi6Hc1EkUM9xJiZFTv_v-nVugp4LerG5sNYEBhBLXF8iVM6jn9Q2AfOrlhu7S6-ffv2T-GRoaE.ZzXhpA.6IaVZ-sABN4LB476tj7c1hUx5F8 Upgrade-Insecure-Requests: 1 Sec-Fetch-Dest: document Sec-Fetch-Mode: navigate @@ -17,77 +103,4 @@ Sec-Gpc: 1 Priority: u=0, i -Request data: b'' -Traceback: Traceback (most recent call last): - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 880, in full_dispatch_request - rv = self.dispatch_request() - ^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 865, in dispatch_request - return self.ensure_sync(self.view_functions[rule.endpoint])(**view_args) # type: ignore[no-any-return] - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\controllers\store\manufacturing_purchase_order.py", line 43, in manufacturing_purchase_orders - return render_template('pages/store/_manufacturing_purchase_orders.html', model = model, datetime = datetime) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\templating.py", line 150, in render_template - return _render(app, template, context) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\templating.py", line 131, in _render - rv = template.render(context) - ^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\jinja2\environment.py", line 1304, in render - self.environment.handle_exception() - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\jinja2\environment.py", line 939, in handle_exception - raise rewrite_traceback_stack(source=source) - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\templates\pages\store\_manufacturing_purchase_orders.html", line 1, in top-level template code - {% extends 'layouts/layout.html' %} - ^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\templates\layouts\layout.html", line 354, in top-level template code - {% block page_body %}{% endblock %} - ^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\templates\pages\store\_manufacturing_purchase_orders.html", line 62, in block 'page_body' - {% include 'components/store/_row_manufacturing_purchase_order.html' %} - ^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\templates\components\store\_row_manufacturing_purchase_order.html", line 40, in top-level template code - - ^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\jinja2\environment.py", line 487, in getattr - return getattr(obj, attribute) - ^^^^^^^^^^^^^^^^^^^^^^^ -jinja2.exceptions.UndefinedError: 'order' is undefined - -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: production -config_env: production -Server Error: (MySQLdb.OperationalError) (1054, "Unknown column 'v_id_permission_manufacturing' in 'where clause'") -[SQL: CALL p_shop_get_many_manufacturing_purchase_order(%s, %s, %s, %s, %s, %s, %s, %s)] -[parameters: (0, True, True, '', '', None, None, 0)] -(Background on this error at: https://sqlalche.me/e/20/e3q8) -Request: 127.0.0.1 GET http /store/manufacturing_purchase_orders?active=true&date_from=&date_to= Host: 127.0.0.1:5000 -User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:132.0) Gecko/20100101 Firefox/132.0 -Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8 -Accept-Language: en-GB,en;q=0.5 -Accept-Encoding: gzip, deflate, br, zstd -Referer: http://127.0.0.1:5000/store/manufacturing_purchase_orders?active=true&date_from=&date_to= -Dnt: 1 -Connection: keep-alive -Upgrade-Insecure-Requests: 1 -Sec-Fetch-Dest: document -Sec-Fetch-Mode: navigate -Sec-Fetch-Site: same-origin -Sec-Gpc: 1 -Priority: u=0, i - - Request data: b'' diff --git a/app.log.2 b/app.log.2 index 7d33755e..9d60fb31 100644 --- a/app.log.2 +++ b/app.log.2 @@ -1,9 +1,10 @@ -Request: 127.0.0.1 GET http /store/stock_items? Host: 127.0.0.1:5000 +Server Error: 'order' is undefined +Request: 127.0.0.1 GET http /store/manufacturing_purchase_orders?active=true&date_from=&date_to= Host: 127.0.0.1:5000 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:131.0) Gecko/20100101 Firefox/131.0 Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/png,image/svg+xml,*/*;q=0.8 Accept-Language: en-GB,en;q=0.5 Accept-Encoding: gzip, deflate, br, zstd -Referer: http://127.0.0.1:5000/store/stock_items +Referer: http://127.0.0.1:5000/store/manufacturing_purchase_orders Dnt: 1 Connection: keep-alive Cookie: session=.eJytVlnzokgS_yoTRsw8tTY3-I_omPUCRUFB5HohCgqkuOUQcba_-xba090PM3tErKFYVZlk_rLy_GMCujYua9SE8NKE9eTjj0kACg_AHBVe05Z1OPlo6y789NNx92J8n4Y5QNnkYxLCHtRwliMIs7AtiyZHbfyP60idBWU--TSJUN20BcixwIkRQjjgMwS9oKvrsAgGD4YR6LJ28lF0WfYi1eEVlcVfEN4AyO9rbzSCwHJf___kWIHy52wgzFlIzAFP-IAkojAaFTbeC7F3D2sUoRBOPiKQNeGLgoog62AIPXNh_ND6thOTm67Cqn42vunqbwYpf9o9PY-GT77i-2rqyGvLNCwwXRB4GvoszUOf8Sma4aM5iCDPBYAGfsBAjgwYBkQjxO6bG0AQhE3zXUI4yLEvBeiI5BTYO3RYyZmfK-N-qSQXSidUdYd6BGz1uUtKBLY6EWwV7jDMU9d2Wr-AMXjuejVxMzdxy6OUMT5iyWBgY2jrpbJiE58i7ruCmM2yYR07BymE20hQltPHzAY9BQ5hOOzkRxAuTpDfXPcBf1k5WqwkR7Pzbmia7hQa3oZpxisnehCEqiwqLNObAzdvJG9nZ-fl9rjyjuyFcKfF5tjXTqG5BwJJ0cUs_eXtcSMYLQMFeZUOmmYe2cUmhsxG7rWkCfa5LW7OMbewDZgF5Wmf7kuFAVAMH1YfXwGFhFt89_VrMqUV0hC0Y5prvM3Ep6FYnWMPLabZahk3tkPvXdJJ85vqhY7DlGtIOf0wn9bLpa4_uav0kM3W8LeOH9JFGCy1WFRvuju9IQSyA9_4oi2ea49doPVD3YBeXhUaH2e6mapphD8VEDtVX9erjXNMTnpJ80fBuSnlNmF4Mr1uzQXTi8fDvCr4mamrZsoB1ScEw7rtnXK7aOMrDoPwUaE6bDyAQ5DkaYKlBZ4hfpwjHBQCxxDEKwv-IkrOl-eOVNGu2RU6G6x23C6tbHOF93lbueO-MO-h7V70lGH8RL672ytppuJBEWNSH-T5DAvrgKXWfi627hm_kJsppMTBXbEtsPTUl0zCp9inb2UEeAlmY9-6jMozdwvjINc6TEtd6ZFBad4FFFlBKV64FBkDq-8cat6OIRtIWQK35vDWERNwu3wekXDHoVkEuUg5th4H6B2eju3GUBKHw_PydNdqriQaoaxhqhrYWMphVMkZVEqNlXXAqE8duWuHONHKXF1fe7nYzQMpyN01WcKt3gfD5amdL4OO8C9XU5wOP6dCpqRYVy4Sji0_ZUOWXEvrAoktRszQXqYYV-aK8xiOl5nseoylVYxNq6zFi7JOOcXYcUqy6NRkR1ijI3KzdaysGdPTtXQay00POVm5kt64tn73C7UFWL8mwRffIVfv_vnHezbtZkGe5cAy011S5Y71eLrn_0PKY3sce5SJcRHwFtr6w0hJW6NiA9jxw3jim8pEzkxjW7PE7JxW3CVPxxJUObaGjsmGVp4LAvvgqa43I15mDDjFCJ7KWmOOa4VQMM6ANtGoA-siwHopqMmFUfIdq1oKczTMVFlnsfpcIsfY9G5u5q_YoLIXLjiQB42a67CQGWDLJyeraJcUKD3TCTNnVZDN-3Mi5gYOfoyrw3GZvOIpc4twuzyqWUUGhTzArfwEKXwopk6PpY5Y0ftSbp4N78ie3YpSRjuNtKF2REzu-ao-S_paR5vBH7RtqnJSdMYu4pfirlxCkzUXIHxKp1ogqelq6kVRcjuTlFzsiUQPs3XkWNJpfbBbfi8AckvkLmE0XlFFmtXpzVEn6bO5BzVdbC3y0TgU0THzm8F14uZeMqIBVHqeeO5GmhtHK6UYQyCHRcI30y6trekuue0HizkfdG5FMEkxZzyRmMY6cuim5S7DihrurFwXSb8ZiL1U-CIuyYfFpRZYjznQvtCtuRNvIunsOewRy3oKnV4fUL9cZXsqOxfafNke79Hl_mgAjFJyoWngXq7tYR-ZnPpQROoiOMF0X516m1tSJojP7F0HvGSO9asJymrsjPhZIPhLVZcRysJf3vPCp8mrYHnt8OJZhqDGTe_d-1ARla_-1-HmPLlKydDeVMVaxWf0uB15Stee5tbCFy_LOL8n_8sI8jetH5fUd41lBIFmxrHiz6LLsNT7oGmwgrhtq-bj82cY3qdFD1KK4Lgw4mIBPYpZ18xe08eo6jPW9W0w-M-gChSk_455ZCmLYKSb10elci6emOq2bhLpRho9JlcoaLtxUPuOsJlda3AHLahfcN7LzywN6YhiGIKHLMXykcBEFB8AgsedxYcc83vzhRGI3-ov1fU3-OUl61d68Ssl4m8Aix_24f1bZINXIZxVxcvjaHRYP92vSu1eP1B99N3-6nGi0ZqFkniVTEaHF2Pn_zezWldB0OJpbHTGhCIoZkqSU4I0iPkHSX1QxIyjGHfy9evXfwErYp4O.ZySbdA.IOzQ4B0k8HNh-01pbYKqF3sN8jI @@ -18,83 +19,41 @@ Priority: u=0, i Request data: b'' Traceback: Traceback (most recent call last): - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\engine\base.py", line 1967, in _exec_single_context - self.dialect.do_execute( - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\engine\default.py", line 924, in do_execute - cursor.execute(statement, parameters) - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\MySQLdb\cursors.py", line 179, in execute - res = self._query(mogrified_query) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\MySQLdb\cursors.py", line 330, in _query - db.query(q) - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\MySQLdb\connections.py", line 261, in query - _mysql.connection.query(self, query) -MySQLdb.OperationalError: (1054, "Unknown column 'SL.id_storage_location' in 'field list'") - -The above exception was the direct cause of the following exception: - -Traceback (most recent call last): File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 880, in full_dispatch_request rv = self.dispatch_request() ^^^^^^^^^^^^^^^^^^^^^^^ File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 865, in dispatch_request return self.ensure_sync(self.view_functions[rule.endpoint])(**view_args) # type: ignore[no-any-return] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\controllers\store\stock_item.py", line 40, in stock_items - model = Model_View_Store_Stock_Item(form_filters) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\models\model_view_store_stock_item.py", line 93, in __init__ - self.storage_locations = self.get_many_storage_location(False) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\models\model_view_store.py", line 499, in get_many_storage_location - storage_locations = DataStore_Store_Base().get_many_storage_location(get_inactive) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\datastores\datastore_store_base.py", line 236, in get_many_storage_location - result = self.db_procedure_execute(_m_db_storage_location, argument_dict_list_storage_location) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\datastores\datastore_base.py", line 95, in db_procedure_execute - result = db.session.execute(proc_string, argument_dict_list) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\orm\scoping.py", line 778, in execute - return self._proxied.execute( - ^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\orm\session.py", line 2351, in execute - return self._execute_internal( + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\controllers\store\manufacturing_purchase_order.py", line 43, in manufacturing_purchase_orders + return render_template('pages/store/_manufacturing_purchase_orders.html', model = model, datetime = datetime) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\templating.py", line 150, in render_template + return _render(app, template, context) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\templating.py", line 131, in _render + rv = template.render(context) + ^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\jinja2\environment.py", line 1304, in render + self.environment.handle_exception() + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\jinja2\environment.py", line 939, in handle_exception + raise rewrite_traceback_stack(source=source) + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\templates\pages\store\_manufacturing_purchase_orders.html", line 1, in top-level template code + {% extends 'layouts/layout.html' %} + ^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\templates\layouts\layout.html", line 354, in top-level template code + {% block page_body %}{% endblock %} + ^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\templates\pages\store\_manufacturing_purchase_orders.html", line 62, in block 'page_body' + {% include 'components/store/_row_manufacturing_purchase_order.html' %} + ^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\templates\components\store\_row_manufacturing_purchase_order.html", line 40, in top-level template code + + ^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\jinja2\environment.py", line 487, in getattr + return getattr(obj, attribute) ^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\orm\session.py", line 2245, in _execute_internal - result = conn.execute( - ^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\engine\base.py", line 1418, in execute - return meth( - ^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\sql\elements.py", line 515, in _execute_on_connection - return connection._execute_clauseelement( - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\engine\base.py", line 1640, in _execute_clauseelement - ret = self._execute_context( - ^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\engine\base.py", line 1846, in _execute_context - return self._exec_single_context( - ^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\engine\base.py", line 1986, in _exec_single_context - self._handle_dbapi_exception( - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\engine\base.py", line 2353, in _handle_dbapi_exception - raise sqlalchemy_exception.with_traceback(exc_info[2]) from e - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\engine\base.py", line 1967, in _exec_single_context - self.dialect.do_execute( - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\sqlalchemy\engine\default.py", line 924, in do_execute - cursor.execute(statement, parameters) - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\MySQLdb\cursors.py", line 179, in execute - res = self._query(mogrified_query) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\MySQLdb\cursors.py", line 330, in _query - db.query(q) - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\MySQLdb\connections.py", line 261, in query - _mysql.connection.query(self, query) -sqlalchemy.exc.OperationalError: (MySQLdb.OperationalError) (1054, "Unknown column 'SL.id_storage_location' in 'field list'") -[SQL: CALL p_shop_get_many_storage_location(%s)] -[parameters: (0,)] -(Background on this error at: https://sqlalche.me/e/20/e3q8) +jinja2.exceptions.UndefinedError: 'order' is undefined config_env: development config_env: development @@ -109,68 +68,26 @@ config_env: development config_env: development config_env: development config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development -config_env: development +config_env: production +config_env: production +Server Error: (MySQLdb.OperationalError) (1054, "Unknown column 'v_id_permission_manufacturing' in 'where clause'") +[SQL: CALL p_shop_get_many_manufacturing_purchase_order(%s, %s, %s, %s, %s, %s, %s, %s)] +[parameters: (0, True, True, '', '', None, None, 0)] +(Background on this error at: https://sqlalche.me/e/20/e3q8) +Request: 127.0.0.1 GET http /store/manufacturing_purchase_orders?active=true&date_from=&date_to= Host: 127.0.0.1:5000 +User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:132.0) Gecko/20100101 Firefox/132.0 +Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8 +Accept-Language: en-GB,en;q=0.5 +Accept-Encoding: gzip, deflate, br, zstd +Referer: http://127.0.0.1:5000/store/manufacturing_purchase_orders?active=true&date_from=&date_to= +Dnt: 1 +Connection: keep-alive +Upgrade-Insecure-Requests: 1 +Sec-Fetch-Dest: document +Sec-Fetch-Mode: navigate +Sec-Fetch-Site: same-origin +Sec-Gpc: 1 +Priority: u=0, i + + +Request data: b'' diff --git a/app.log.3 b/app.log.3 index c8827163..7d33755e 100644 --- a/app.log.3 +++ b/app.log.3 @@ -97,7 +97,80 @@ sqlalchemy.exc.OperationalError: (MySQLdb.OperationalError) (1054, "Unknown colu (Background on this error at: https://sqlalche.me/e/20/e3q8) config_env: development -Server Error: (MySQLdb.OperationalError) (1054, "Unknown column 'SL.id_storage_location' in 'field list'") -[SQL: CALL p_shop_get_many_storage_location(%s)] -[parameters: (0,)] -(Background on this error at: https://sqlalche.me/e/20/e3q8) +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development +config_env: development diff --git a/models/__pycache__/model_view_store_product.cpython-312.pyc b/models/__pycache__/model_view_store_product.cpython-312.pyc index 168e8132..8c84bd54 100644 Binary files a/models/__pycache__/model_view_store_product.cpython-312.pyc and b/models/__pycache__/model_view_store_product.cpython-312.pyc differ diff --git a/models/__pycache__/model_view_store_product_category.cpython-312.pyc b/models/__pycache__/model_view_store_product_category.cpython-312.pyc index d4ae81d7..8e5e5887 100644 Binary files a/models/__pycache__/model_view_store_product_category.cpython-312.pyc and b/models/__pycache__/model_view_store_product_category.cpython-312.pyc differ diff --git a/models/__pycache__/model_view_store_product_permutation.cpython-312.pyc b/models/__pycache__/model_view_store_product_permutation.cpython-312.pyc index 75588924..8660e797 100644 Binary files a/models/__pycache__/model_view_store_product_permutation.cpython-312.pyc and b/models/__pycache__/model_view_store_product_permutation.cpython-312.pyc differ diff --git a/models/__pycache__/model_view_store_stock_item.cpython-312.pyc b/models/__pycache__/model_view_store_stock_item.cpython-312.pyc index 4e4b47d6..36a1eedb 100644 Binary files a/models/__pycache__/model_view_store_stock_item.cpython-312.pyc and b/models/__pycache__/model_view_store_stock_item.cpython-312.pyc differ diff --git a/models/model_view_store_product.py b/models/model_view_store_product.py index 4a0d37df..948b254f 100644 --- a/models/model_view_store_product.py +++ b/models/model_view_store_product.py @@ -10,11 +10,6 @@ Description: Data model for store product view """ -# IMPORTS -# VARIABLE INSTANTIATION -# METHODS - -# IMPORTS # internal from business_objects.store.product import Product, Parameters_Product from business_objects.store.product_category import Product_Category_Container @@ -28,53 +23,14 @@ import lib.argument_validation as av # external from typing import ClassVar -""" -class Model_View_Store_Product(Model_View_Store): - # categories: list # (str) - # category_products: dict { category_enum_id: List[Product] } - - # Attributes - @property - def title(self): - return 'Store Product' - - def __init__(self, id_permutation, id_currency, id_region_delivery, is_included_VAT, hash_page_current=Model_View_Store.HASH_PAGE_STORE_PRODUCTS): - # Constructor - _m = 'Model_View_Store_Product.__init__' - Helper_App.console_log(f'{_m}\nstarting...') - super().__init__(hash_page_current=hash_page_current, id_currency=id_currency, id_region_delivery=id_region_delivery, is_included_VAT=is_included_VAT) - Helper_App.console_log('supered') - - category_list = DataStore_Store_Base().get_many_product(Parameters_Product( - self.info_user['sub'], - True, '', False, - True, '', False, False, - False, str(id_permutation), False, - True, '', False, False, - False, str(id_region_delivery), False, - False, str(id_currency), False, - True, '', False - )) # product_ids=str(id_product), permutation_ids=str(id_permutation)) - Helper_App.console_log('connection to db successful') - # self.categories = categories - # self.category_index = category_index - "" - if (category_list.get_category_count() > 0): - self.product = category_list.get_permutation_first() - else: - self.product = None - Helper_App.console_log('selected permutation selected') - "" -""" - - class Model_View_Store_Product(Model_View_Store): + access_levels: list = None category_list: Product_Category_Container = None category_list_filters: Product_Category_Container = None currencies: list = None currency_options: list = None - filters_product: Parameters_Product = None - form_filters: Filters_Product + form_filters: Filters_Product = None + form_filters_old: Filters_Product list_options_product: list = None # product_blank: Product = None units_measurement: list = None @@ -86,10 +42,11 @@ class Model_View_Store_Product(Model_View_Store): def title(self): return 'Products' - def __init__(self, form_filters, hash_page_current=Model_View_Store.HASH_PAGE_STORE_PRODUCTS): + def __init__(self, form_filters_old, hash_page_current=Model_View_Store.HASH_PAGE_STORE_PRODUCTS): _m = 'Model_View_Store_Product.__init__' Helper_App.console_log(f'{_m}\nstarting...') - super().__init__(hash_page_current=hash_page_current, form_filters=form_filters) + super().__init__(hash_page_current=hash_page_current, form_filters_old=form_filters_old) + self.form_filters = form_filters_old self.access_levels = self.get_many_access_level(Filters_Access_Level()) parameters_product = Parameters_Product.from_form_filters_product(self.form_filters) datastore_store = DataStore_Store_Product() diff --git a/models/model_view_store_product_category.py b/models/model_view_store_product_category.py index 74af47ef..f8bafd86 100644 --- a/models/model_view_store_product_category.py +++ b/models/model_view_store_product_category.py @@ -30,18 +30,21 @@ from typing import ClassVar class Model_View_Store_Product_Category(Model_View_Store): # KEY_CATEGORIES: ClassVar[str] = 'categories' + access_levels: list = None category_list: Product_Category_Container = None # (str) # filters_category: Filters_Product_Category form_filters: Filters_Product_Category = None + form_filters_old: Filters_Product_Category @property def title(self): return 'Product Category' - def __init__(self, form_filters, hash_page_current=Model_View_Store.HASH_PAGE_STORE_PRODUCT_CATEGORIES): + def __init__(self, form_filters_old, hash_page_current=Model_View_Store.HASH_PAGE_STORE_PRODUCT_CATEGORIES): _m = 'Model_View_Store_Product_Category.__init__' Helper_App.console_log(f'{_m}\nstarting...') - super().__init__(hash_page_current=hash_page_current, form_filters=form_filters) # filters_category=filters_category) + super().__init__(hash_page_current=hash_page_current, form_filters_old=form_filters_old) # filters_category=filters_category) + self.form_filters = form_filters_old # BaseModel.__init__(self, app=app, filters_product=filters_product, **kwargs) self.access_levels = self.get_many_access_level(Filters_Access_Level()) datastore_store = DataStore_Store_Product_Category() diff --git a/models/model_view_store_product_permutation.py b/models/model_view_store_product_permutation.py index 979fc5fe..24e5fe2e 100644 --- a/models/model_view_store_product_permutation.py +++ b/models/model_view_store_product_permutation.py @@ -29,8 +29,9 @@ class Model_View_Store_Product_Permutation(Model_View_Store): category_list_filters: Product_Category_Container = None currencies: list = None currency_options: list = None - filters_product: Parameters_Product = None - form_filters: Filters_Product_Permutation + # filters_product: Parameters_Product = None + form_filters: Filters_Product_Permutation = None + form_filters_old: Filters_Product_Permutation list_options_product: list = None units_measurement: list = None units_measurement_time: list = None @@ -41,10 +42,11 @@ class Model_View_Store_Product_Permutation(Model_View_Store): def title(self): return 'Product Permutations' - def __init__(self, form_filters, hash_page_current=Model_View_Store.HASH_PAGE_STORE_PRODUCT_PERMUTATIONS): + def __init__(self, form_filters_old, hash_page_current=Model_View_Store.HASH_PAGE_STORE_PRODUCT_PERMUTATIONS): _m = 'Model_View_Store_Permutation.__init__' Helper_App.console_log(f'{_m}\nstarting...') - super().__init__(hash_page_current=hash_page_current, form_filters=form_filters) + super().__init__(hash_page_current=hash_page_current, form_filters_old=form_filters_old) + self.form_filters = form_filters_old # self.form_filters = Filters_Product_Permutation() filters_product = Parameters_Product.from_form_filters_product_permutation(self.form_filters) datastore_store = DataStore_Store_Product_Permutation() diff --git a/models/model_view_store_stock_item.py b/models/model_view_store_stock_item.py index e79f38ec..0976295b 100644 --- a/models/model_view_store_stock_item.py +++ b/models/model_view_store_stock_item.py @@ -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] diff --git a/static/dist/js/main.bundle.js b/static/dist/js/main.bundle.js index 251cce80..2b8ea09c 100644 --- a/static/dist/js/main.bundle.js +++ b/static/dist/js/main.bundle.js @@ -668,66 +668,73 @@ var api_API = /*#__PURE__*/function () { }() // store // product categories }, { - key: "getCategories", + key: "saveCategories", value: function () { - var _getCategories = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() { + var _saveCategories = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(categories, formFilters, comment) { + var dataRequest; return _regeneratorRuntime().wrap(function _callee3$(_context3) { while (1) switch (_context3.prev = _context3.next) { case 0: - _context3.next = 2; - return API.request(hashGetStoreProductCategory); - case 2: + dataRequest = {}; + dataRequest[flagFormFilters] = DOM.convertForm2JSON(formFilters); + dataRequest[flagProductCategory] = categories; + dataRequest[flagComment] = comment; + _context3.next = 6; + return API.request(hashSaveStoreProductCategory, 'POST', dataRequest); + case 6: return _context3.abrupt("return", _context3.sent); - case 3: + case 7: case "end": return _context3.stop(); } }, _callee3); })); - function getCategories() { - return _getCategories.apply(this, arguments); + function saveCategories(_x2, _x3, _x4) { + return _saveCategories.apply(this, arguments); } - return getCategories; - }() + return saveCategories; + }() // products }, { - key: "getCategoriesByFilters", + key: "saveProducts", value: function () { - var _getCategoriesByFilters = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(filtersJson) { + var _saveProducts = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(products, formFilters, comment) { + var dataRequest; return _regeneratorRuntime().wrap(function _callee4$(_context4) { while (1) switch (_context4.prev = _context4.next) { case 0: - /* - let dataRequest = {}; - dataRequest[flagForm] = filtersJson; - return await API.request(hashGetStoreProductCategory, 'POST', dataRequest); - */ - // return await API.request(hashPageStoreProductCategories, 'GET', filtersJson); - API.goToHash(hashPageStoreProductCategories, filtersJson); - case 1: + dataRequest = {}; + dataRequest[flagFormFilters] = DOM.convertForm2JSON(formFilters); + dataRequest[flagProduct] = products; + dataRequest[flagComment] = comment; + _context4.next = 6; + return API.request(hashSaveStoreProduct, 'POST', dataRequest); + case 6: + return _context4.abrupt("return", _context4.sent); + case 7: case "end": return _context4.stop(); } }, _callee4); })); - function getCategoriesByFilters(_x2) { - return _getCategoriesByFilters.apply(this, arguments); + function saveProducts(_x5, _x6, _x7) { + return _saveProducts.apply(this, arguments); } - return getCategoriesByFilters; - }() + return saveProducts; + }() // product permutations }, { - key: "saveCategories", + key: "saveProductPermutations", value: function () { - var _saveCategories = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(categories, formFilters, comment) { + var _saveProductPermutations = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(permutations, formFilters, comment) { var dataRequest; return _regeneratorRuntime().wrap(function _callee5$(_context5) { while (1) switch (_context5.prev = _context5.next) { case 0: dataRequest = {}; dataRequest[flagFormFilters] = DOM.convertForm2JSON(formFilters); - dataRequest[flagProductCategory] = categories; + dataRequest[flagProductPermutation] = permutations; dataRequest[flagComment] = comment; _context5.next = 6; - return API.request(hashSaveStoreProductCategory, 'POST', dataRequest); + return API.request(hashSaveStoreProductPermutation, 'POST', dataRequest); case 6: return _context5.abrupt("return", _context5.sent); case 7: @@ -736,66 +743,79 @@ var api_API = /*#__PURE__*/function () { } }, _callee5); })); - function saveCategories(_x3, _x4, _x5) { - return _saveCategories.apply(this, arguments); + function saveProductPermutations(_x8, _x9, _x10) { + return _saveProductPermutations.apply(this, arguments); } - return saveCategories; - }() // products + return saveProductPermutations; + }() // product variations }, { - key: "getProducts", + key: "saveProductVariations", value: function () { - var _getProducts = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6() { + var _saveProductVariations = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(variationTypes, formFilters, comment) { + var dataRequest; return _regeneratorRuntime().wrap(function _callee6$(_context6) { while (1) switch (_context6.prev = _context6.next) { case 0: - _context6.next = 2; - return API.request(hashGetStoreProduct); - case 2: + dataRequest = {}; + dataRequest[flagFormFilters] = DOM.convertForm2JSON(formFilters); + dataRequest[flagProductVariationType] = variationTypes; + dataRequest[flagComment] = comment; + _context6.next = 6; + return API.request(hashSaveStoreProductVariation, 'POST', dataRequest); + case 6: return _context6.abrupt("return", _context6.sent); - case 3: + case 7: case "end": return _context6.stop(); } }, _callee6); })); - function getProducts() { - return _getProducts.apply(this, arguments); + function saveProductVariations(_x11, _x12, _x13) { + return _saveProductVariations.apply(this, arguments); } - return getProducts; - }() + return saveProductVariations; + }() // stock items }, { - key: "getProductsByFilters", + key: "saveStockItems", value: function () { - var _getProductsByFilters = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(filtersJson) { + var _saveStockItems = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(stockItems, formFilters, comment) { + var dataRequest; return _regeneratorRuntime().wrap(function _callee7$(_context7) { while (1) switch (_context7.prev = _context7.next) { case 0: - API.goToHash(hashPageStoreProducts, filtersJson); - case 1: + dataRequest = {}; + dataRequest[flagFormFilters] = DOM.convertForm2JSON(formFilters); + dataRequest[flagStockItem] = stockItems; + dataRequest[flagComment] = comment; + _context7.next = 6; + return API.request(hashSaveStoreStockItem, 'POST', dataRequest); + case 6: + return _context7.abrupt("return", _context7.sent); + case 7: case "end": return _context7.stop(); } }, _callee7); })); - function getProductsByFilters(_x6) { - return _getProductsByFilters.apply(this, arguments); + function saveStockItems(_x14, _x15, _x16) { + return _saveStockItems.apply(this, arguments); } - return getProductsByFilters; - }() + return saveStockItems; + }() // suppliers }, { - key: "saveProducts", + key: "saveSuppliers", value: function () { - var _saveProducts = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(products, formFilters, comment) { + var _saveSuppliers = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(suppliers, formFilters, comment) { var dataRequest; return _regeneratorRuntime().wrap(function _callee8$(_context8) { while (1) switch (_context8.prev = _context8.next) { case 0: dataRequest = {}; dataRequest[flagFormFilters] = DOM.convertForm2JSON(formFilters); - dataRequest[flagProduct] = products; + dataRequest[flagSupplier] = suppliers; dataRequest[flagComment] = comment; _context8.next = 6; - return API.request(hashSaveStoreProduct, 'POST', dataRequest); + return API.request(hashSaveStoreSupplier, 'POST', dataRequest); case 6: return _context8.abrupt("return", _context8.sent); case 7: @@ -804,415 +824,61 @@ var api_API = /*#__PURE__*/function () { } }, _callee8); })); - function saveProducts(_x7, _x8, _x9) { - return _saveProducts.apply(this, arguments); - } - return saveProducts; - }() // product permutations - }, { - key: "getProductPermutations", - value: function () { - var _getProductPermutations = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9() { - return _regeneratorRuntime().wrap(function _callee9$(_context9) { - while (1) switch (_context9.prev = _context9.next) { - case 0: - _context9.next = 2; - return API.request(hashGetStoreProductPermutation); - case 2: - return _context9.abrupt("return", _context9.sent); - case 3: - case "end": - return _context9.stop(); - } - }, _callee9); - })); - function getProductPermutations() { - return _getProductPermutations.apply(this, arguments); - } - return getProductPermutations; - }() - }, { - key: "getProductPermutationsByFilters", - value: function () { - var _getProductPermutationsByFilters = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(filtersJson) { - return _regeneratorRuntime().wrap(function _callee10$(_context10) { - while (1) switch (_context10.prev = _context10.next) { - case 0: - API.goToHash(hashPageStoreProductPermutations, filtersJson); - case 1: - case "end": - return _context10.stop(); - } - }, _callee10); - })); - function getProductPermutationsByFilters(_x10) { - return _getProductPermutationsByFilters.apply(this, arguments); - } - return getProductPermutationsByFilters; - }() - }, { - key: "saveProductPermutations", - value: function () { - var _saveProductPermutations = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(permutations, formFilters, comment) { - var dataRequest; - return _regeneratorRuntime().wrap(function _callee11$(_context11) { - while (1) switch (_context11.prev = _context11.next) { - case 0: - dataRequest = {}; - dataRequest[flagFormFilters] = DOM.convertForm2JSON(formFilters); - dataRequest[flagProductPermutation] = permutations; - dataRequest[flagComment] = comment; - _context11.next = 6; - return API.request(hashSaveStoreProductPermutation, 'POST', dataRequest); - case 6: - return _context11.abrupt("return", _context11.sent); - case 7: - case "end": - return _context11.stop(); - } - }, _callee11); - })); - function saveProductPermutations(_x11, _x12, _x13) { - return _saveProductPermutations.apply(this, arguments); - } - return saveProductPermutations; - }() // product variations - }, { - key: "getProductVariations", - value: function () { - var _getProductVariations = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12() { - return _regeneratorRuntime().wrap(function _callee12$(_context12) { - while (1) switch (_context12.prev = _context12.next) { - case 0: - _context12.next = 2; - return API.request(hashGetStoreProductVariation); - case 2: - return _context12.abrupt("return", _context12.sent); - case 3: - case "end": - return _context12.stop(); - } - }, _callee12); - })); - function getProductVariations() { - return _getProductVariations.apply(this, arguments); - } - return getProductVariations; - }() - }, { - key: "getProductVariationsByFilters", - value: function () { - var _getProductVariationsByFilters = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13(filtersJson) { - return _regeneratorRuntime().wrap(function _callee13$(_context13) { - while (1) switch (_context13.prev = _context13.next) { - case 0: - API.goToHash(hashPageStoreProductVariations, filtersJson); - case 1: - case "end": - return _context13.stop(); - } - }, _callee13); - })); - function getProductVariationsByFilters(_x14) { - return _getProductVariationsByFilters.apply(this, arguments); - } - return getProductVariationsByFilters; - }() - }, { - key: "saveProductVariations", - value: function () { - var _saveProductVariations = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee14(variationTypes, formFilters, comment) { - var dataRequest; - return _regeneratorRuntime().wrap(function _callee14$(_context14) { - while (1) switch (_context14.prev = _context14.next) { - case 0: - dataRequest = {}; - dataRequest[flagFormFilters] = DOM.convertForm2JSON(formFilters); - dataRequest[flagProductVariationType] = variationTypes; - dataRequest[flagComment] = comment; - _context14.next = 6; - return API.request(hashSaveStoreProductVariation, 'POST', dataRequest); - case 6: - return _context14.abrupt("return", _context14.sent); - case 7: - case "end": - return _context14.stop(); - } - }, _callee14); - })); - function saveProductVariations(_x15, _x16, _x17) { - return _saveProductVariations.apply(this, arguments); - } - return saveProductVariations; - }() // stock items - }, { - key: "getStockItems", - value: function () { - var _getStockItems = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee15() { - return _regeneratorRuntime().wrap(function _callee15$(_context15) { - while (1) switch (_context15.prev = _context15.next) { - case 0: - _context15.next = 2; - return API.request(hashGetStoreStockItem); - case 2: - return _context15.abrupt("return", _context15.sent); - case 3: - case "end": - return _context15.stop(); - } - }, _callee15); - })); - function getStockItems() { - return _getStockItems.apply(this, arguments); - } - return getStockItems; - }() - }, { - key: "getStockItemsByFilters", - value: function () { - var _getStockItemsByFilters = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee16(filtersJson) { - return _regeneratorRuntime().wrap(function _callee16$(_context16) { - while (1) switch (_context16.prev = _context16.next) { - case 0: - API.goToHash(hashPageStoreStockItems, filtersJson); - case 1: - case "end": - return _context16.stop(); - } - }, _callee16); - })); - function getStockItemsByFilters(_x18) { - return _getStockItemsByFilters.apply(this, arguments); - } - return getStockItemsByFilters; - }() - }, { - key: "saveStockItems", - value: function () { - var _saveStockItems = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee17(stockItems, formFilters, comment) { - var dataRequest; - return _regeneratorRuntime().wrap(function _callee17$(_context17) { - while (1) switch (_context17.prev = _context17.next) { - case 0: - dataRequest = {}; - dataRequest[flagFormFilters] = DOM.convertForm2JSON(formFilters); - dataRequest[flagStockItem] = stockItems; - dataRequest[flagComment] = comment; - _context17.next = 6; - return API.request(hashSaveStoreStockItem, 'POST', dataRequest); - case 6: - return _context17.abrupt("return", _context17.sent); - case 7: - case "end": - return _context17.stop(); - } - }, _callee17); - })); - function saveStockItems(_x19, _x20, _x21) { - return _saveStockItems.apply(this, arguments); - } - return saveStockItems; - }() // suppliers - }, { - key: "getSuppliers", - value: function () { - var _getSuppliers = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee18() { - return _regeneratorRuntime().wrap(function _callee18$(_context18) { - while (1) switch (_context18.prev = _context18.next) { - case 0: - _context18.next = 2; - return API.request(hashGetStoreSupplier); - case 2: - return _context18.abrupt("return", _context18.sent); - case 3: - case "end": - return _context18.stop(); - } - }, _callee18); - })); - function getSuppliers() { - return _getSuppliers.apply(this, arguments); - } - return getSuppliers; - }() - }, { - key: "getSuppliersByFilters", - value: function () { - var _getSuppliersByFilters = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee19(filtersJson) { - return _regeneratorRuntime().wrap(function _callee19$(_context19) { - while (1) switch (_context19.prev = _context19.next) { - case 0: - API.goToHash(hashPageStoreSuppliers, filtersJson); - case 1: - case "end": - return _context19.stop(); - } - }, _callee19); - })); - function getSuppliersByFilters(_x22) { - return _getSuppliersByFilters.apply(this, arguments); - } - return getSuppliersByFilters; - }() - }, { - key: "saveSuppliers", - value: function () { - var _saveSuppliers = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee20(suppliers, formFilters, comment) { - var dataRequest; - return _regeneratorRuntime().wrap(function _callee20$(_context20) { - while (1) switch (_context20.prev = _context20.next) { - case 0: - dataRequest = {}; - dataRequest[flagFormFilters] = DOM.convertForm2JSON(formFilters); - dataRequest[flagSupplier] = suppliers; - dataRequest[flagComment] = comment; - _context20.next = 6; - return API.request(hashSaveStoreSupplier, 'POST', dataRequest); - case 6: - return _context20.abrupt("return", _context20.sent); - case 7: - case "end": - return _context20.stop(); - } - }, _callee20); - })); - function saveSuppliers(_x23, _x24, _x25) { + function saveSuppliers(_x17, _x18, _x19) { return _saveSuppliers.apply(this, arguments); } return saveSuppliers; }() // supplier purchase orders - }, { - key: "getSupplierPurchaseOrders", - value: function () { - var _getSupplierPurchaseOrders = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee21() { - return _regeneratorRuntime().wrap(function _callee21$(_context21) { - while (1) switch (_context21.prev = _context21.next) { - case 0: - _context21.next = 2; - return API.request(hashGetStoreSupplierPurchaseOrder); - case 2: - return _context21.abrupt("return", _context21.sent); - case 3: - case "end": - return _context21.stop(); - } - }, _callee21); - })); - function getSupplierPurchaseOrders() { - return _getSupplierPurchaseOrders.apply(this, arguments); - } - return getSupplierPurchaseOrders; - }() - }, { - key: "getSupplierPurchaseOrdersByFilters", - value: function () { - var _getSupplierPurchaseOrdersByFilters = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee22(filtersJson) { - return _regeneratorRuntime().wrap(function _callee22$(_context22) { - while (1) switch (_context22.prev = _context22.next) { - case 0: - API.goToHash(hashPageStoreSupplierPurchaseOrders, filtersJson); - case 1: - case "end": - return _context22.stop(); - } - }, _callee22); - })); - function getSupplierPurchaseOrdersByFilters(_x26) { - return _getSupplierPurchaseOrdersByFilters.apply(this, arguments); - } - return getSupplierPurchaseOrdersByFilters; - }() }, { key: "saveSupplierPurchaseOrders", value: function () { - var _saveSupplierPurchaseOrders = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee23(supplierPurchaseOrders, formFilters, comment) { + var _saveSupplierPurchaseOrders = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(supplierPurchaseOrders, formFilters, comment) { var dataRequest; - return _regeneratorRuntime().wrap(function _callee23$(_context23) { - while (1) switch (_context23.prev = _context23.next) { + return _regeneratorRuntime().wrap(function _callee9$(_context9) { + while (1) switch (_context9.prev = _context9.next) { case 0: dataRequest = {}; dataRequest[flagFormFilters] = DOM.convertForm2JSON(formFilters); dataRequest[flagSupplierPurchaseOrder] = supplierPurchaseOrders; dataRequest[flagComment] = comment; - _context23.next = 6; + _context9.next = 6; return API.request(hashSaveStoreSupplierPurchaseOrder, 'POST', dataRequest); case 6: - return _context23.abrupt("return", _context23.sent); + return _context9.abrupt("return", _context9.sent); case 7: case "end": - return _context23.stop(); + return _context9.stop(); } - }, _callee23); + }, _callee9); })); - function saveSupplierPurchaseOrders(_x27, _x28, _x29) { + function saveSupplierPurchaseOrders(_x20, _x21, _x22) { return _saveSupplierPurchaseOrders.apply(this, arguments); } return saveSupplierPurchaseOrders; }() // manufacturing purchase orders - }, { - key: "getManufacturingPurchaseOrders", - value: function () { - var _getManufacturingPurchaseOrders = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee24() { - return _regeneratorRuntime().wrap(function _callee24$(_context24) { - while (1) switch (_context24.prev = _context24.next) { - case 0: - _context24.next = 2; - return API.request(hashGetStoreManufacturingPurchaseOrder); - case 2: - return _context24.abrupt("return", _context24.sent); - case 3: - case "end": - return _context24.stop(); - } - }, _callee24); - })); - function getManufacturingPurchaseOrders() { - return _getManufacturingPurchaseOrders.apply(this, arguments); - } - return getManufacturingPurchaseOrders; - }() - }, { - key: "getManufacturingPurchaseOrdersByFilters", - value: function () { - var _getManufacturingPurchaseOrdersByFilters = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee25(filtersJson) { - return _regeneratorRuntime().wrap(function _callee25$(_context25) { - while (1) switch (_context25.prev = _context25.next) { - case 0: - API.goToHash(hashPageStoreManufacturingPurchaseOrders, filtersJson); - case 1: - case "end": - return _context25.stop(); - } - }, _callee25); - })); - function getManufacturingPurchaseOrdersByFilters(_x30) { - return _getManufacturingPurchaseOrdersByFilters.apply(this, arguments); - } - return getManufacturingPurchaseOrdersByFilters; - }() }, { key: "saveManufacturingPurchaseOrders", value: function () { - var _saveManufacturingPurchaseOrders = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee26(manufacturingPurchaseOrders, formFilters, comment) { + var _saveManufacturingPurchaseOrders = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(manufacturingPurchaseOrders, formFilters, comment) { var dataRequest; - return _regeneratorRuntime().wrap(function _callee26$(_context26) { - while (1) switch (_context26.prev = _context26.next) { + return _regeneratorRuntime().wrap(function _callee10$(_context10) { + while (1) switch (_context10.prev = _context10.next) { case 0: dataRequest = {}; dataRequest[flagFormFilters] = DOM.convertForm2JSON(formFilters); dataRequest[flagManufacturingPurchaseOrder] = manufacturingPurchaseOrders; dataRequest[flagComment] = comment; - _context26.next = 6; + _context10.next = 6; return API.request(hashSaveStoreManufacturingPurchaseOrder, 'POST', dataRequest); case 6: - return _context26.abrupt("return", _context26.sent); + return _context10.abrupt("return", _context10.sent); case 7: case "end": - return _context26.stop(); + return _context10.stop(); } - }, _callee26); + }, _callee10); })); - function saveManufacturingPurchaseOrders(_x31, _x32, _x33) { + function saveManufacturingPurchaseOrders(_x23, _x24, _x25) { return _saveManufacturingPurchaseOrders.apply(this, arguments); } return saveManufacturingPurchaseOrders; @@ -2375,29 +2041,12 @@ function base_table_setPrototypeOf(t, e) { return base_table_setPrototypeOf = Ob var TableBasePage = /*#__PURE__*/function (_BasePage) { // static hash // static attrIdRowObject - // callFilterTableContent // callSaveTableContent function TableBasePage(router) { var _this; base_table_classCallCheck(this, TableBasePage); _this = base_table_callSuper(this, TableBasePage, [router]); - /* - if (!this.constructor.callFilterTableContent) { - throw new Error(`Class ${this.constructor.name} must have a static callFilterTableContent method attribute that takes a single argument - the filters as json.`); - } - if (!this.constructor.callSaveTableContent) { - throw new Error(`Class ${this.constructor.name} must have a static callSaveTableContent method attribute that takes 3 arguments - a list of records, the filters as json, and a comment for saving.`); - } - this.initialize(); - // this.hookupFilters(); - this.loadRowTable(null); - this.getJsonRow(null); - // this.hookupTableMain(); - this.getTableRecords(); - this.leave(); - */ - // this.cursorXInitial = null; _this.cursorYInitial = null; _this.rowInitial = null; _this.placeholder = null; @@ -2437,7 +2086,7 @@ var TableBasePage = /*#__PURE__*/function (_BasePage) { var formFilters = this.getFormFilters(); var filtersDefault = DOM.convertForm2JSON(formFilters); if (!validation_Validation.areEqualDicts(filters, filtersDefault)) { - this.callFilterTableContent(filters); + this.callFilterTableContent(); } } } @@ -2484,10 +2133,7 @@ var TableBasePage = /*#__PURE__*/function (_BasePage) { }, { key: "getAndLoadFilteredTableContent", value: function getAndLoadFilteredTableContent() { - var formFilters = this.getFormFilters(); - var filtersJson = DOM.convertForm2JSON(formFilters); - this.leave(); - this.callFilterTableContent(filtersJson)["catch"](function (error) { + this.callFilterTableContent()["catch"](function (error) { return console.error('Error:', error); }); } @@ -2496,6 +2142,14 @@ var TableBasePage = /*#__PURE__*/function (_BasePage) { value: function getFormFilters() { return document.querySelector(idFormFilters); } + }, { + key: "callFilterTableContent", + value: function callFilterTableContent() { + var formFilters = this.getFormFilters(); + var filtersJson = DOM.convertForm2JSON(formFilters); + this.leave(); + api_API.goToHash(this.constructor.hash, filtersJson); + } }, { key: "callbackLoadTableContent", value: function callbackLoadTableContent(response) { @@ -2524,9 +2178,7 @@ var TableBasePage = /*#__PURE__*/function (_BasePage) { key: "getAndLoadFilteredTableContentSinglePageApp", value: function getAndLoadFilteredTableContentSinglePageApp() { var _this4 = this; - var formFilters = this.getFormFilters(); - var filtersJson = DOM.convertForm2JSON(formFilters); - this.callFilterTableContent(filtersJson).then(function (data) { + this.callFilterTableContent().then(function (data) { if (_verbose) { console.log('Table data received:', data); } @@ -3531,7 +3183,6 @@ import DOM from "../dom.js"; export class PageStoreProductCategories extends TableBasePage { static hash = hashPageStoreProductCategories; static attrIdRowObject = attrIdProductCategory; - callFilterTableContent = API.getCategoriesByFilters; callSaveTableContent = API.saveCategories; constructor() {} @@ -4154,7 +3805,6 @@ var PageStoreManufacturingPurchaseOrders = /*#__PURE__*/function (_TableBasePage var _this; manufacturing_purchase_orders_classCallCheck(this, PageStoreManufacturingPurchaseOrders); _this = manufacturing_purchase_orders_callSuper(this, PageStoreManufacturingPurchaseOrders, [router]); - manufacturing_purchase_orders_defineProperty(_this, "callFilterTableContent", api_API.getManufacturingPurchaseOrdersByFilters); manufacturing_purchase_orders_defineProperty(_this, "callSaveTableContent", api_API.saveManufacturingPurchaseOrders); _this.storeMixin = new StoreTableMixinPage(_this); return _this; @@ -4215,7 +3865,6 @@ var PageStoreManufacturingPurchaseOrders = /*#__PURE__*/function (_TableBasePage var inputQuantityProduced = tr.querySelector('td.' + flagQuantityProduced + ' input'); var tdUnitMeasurementLatencyManufacture = tr.querySelector('td.' + flagUnitMeasurementLatencyManufacture); var inputLatencyManufacture = tr.querySelector('td.' + flagLatencyManufacture + ' input'); - debugger; var buttonActive = tr.querySelector(':scope > td.' + flagActive + ' button'); var jsonRow = {}; jsonRow[attrIdManufacturingPurchaseOrder] = tr.getAttribute(attrIdManufacturingPurchaseOrder); @@ -4289,7 +3938,6 @@ var PageStoreManufacturingPurchaseOrders = /*#__PURE__*/function (_TableBasePage } this.toggleColumnHeaderCollapsed(flagOrderItems, false); element.classList.remove(flagCollapsed); - debugger; var row = DOM.getRowFromElement(element); var idManufacturingPurchaseOrder = row.getAttribute(attrIdManufacturingPurchaseOrder); var manufacturingPurchaseOrder = idManufacturingPurchaseOrder > 0 ? manufacturingPurchaseOrders[idManufacturingPurchaseOrder] : manufacturing_purchase_orders_defineProperty({}, flagOrderItems, []); @@ -4388,7 +4036,6 @@ var PageStoreManufacturingPurchaseOrders = /*#__PURE__*/function (_TableBasePage if (_verbose) { console.log("addRowManufacturingPurchaseOrderItem: ", orderItem); } - debugger; var tdDisplayOrder = document.createElement("td"); tdDisplayOrder.classList.add(flagDisplayOrder); var inputDisplayOrder = document.createElement("input"); @@ -4703,7 +4350,6 @@ var PageStoreProductCategories = /*#__PURE__*/function (_TableBasePage) { var _this; product_categories_classCallCheck(this, PageStoreProductCategories); _this = product_categories_callSuper(this, PageStoreProductCategories, [router]); - product_categories_defineProperty(_this, "callFilterTableContent", api_API.getCategoriesByFilters); product_categories_defineProperty(_this, "callSaveTableContent", api_API.saveCategories); _this.storeMixin = new StoreTableMixinPage(_this); return _this; @@ -4869,7 +4515,6 @@ var PageStoreProductPermutations = /*#__PURE__*/function (_TableBasePage) { var _this; product_permutations_classCallCheck(this, PageStoreProductPermutations); _this = product_permutations_callSuper(this, PageStoreProductPermutations, [router]); - product_permutations_defineProperty(_this, "callFilterTableContent", api_API.getProductPermutationsByFilters); product_permutations_defineProperty(_this, "callSaveTableContent", api_API.saveProductPermutations); _this.storeMixin = new StoreTableMixinPage(_this); return _this; @@ -5305,7 +4950,6 @@ var PageStoreProducts = /*#__PURE__*/function (_TableBasePage) { var _this; products_classCallCheck(this, PageStoreProducts); _this = products_callSuper(this, PageStoreProducts, [router]); - products_defineProperty(_this, "callFilterTableContent", api_API.getProductsByFilters); products_defineProperty(_this, "callSaveTableContent", api_API.saveProducts); _this.storeMixin = new StoreTableMixinPage(_this); return _this; @@ -5483,7 +5127,6 @@ var PageStoreProductVariations = /*#__PURE__*/function (_TableBasePage) { var _this; product_variations_classCallCheck(this, PageStoreProductVariations); _this = product_variations_callSuper(this, PageStoreProductVariations, [router]); - product_variations_defineProperty(_this, "callFilterTableContent", api_API.getProductVariationsByFilters); product_variations_defineProperty(_this, "callSaveTableContent", api_API.saveProductVariations); _this.storeMixin = new StoreTableMixinPage(_this); return _this; @@ -5763,7 +5406,6 @@ var PageStoreStockItems = /*#__PURE__*/function (_TableBasePage) { var _this; stock_items_classCallCheck(this, PageStoreStockItems); _this = stock_items_callSuper(this, PageStoreStockItems, [router]); - stock_items_defineProperty(_this, "callFilterTableContent", api_API.getStockItemsByFilters); stock_items_defineProperty(_this, "callSaveTableContent", api_API.saveStockItems); _this.storeMixin = new StoreTableMixinPage(_this); return _this; @@ -6191,7 +5833,6 @@ var PageStoreSuppliers = /*#__PURE__*/function (_TableBasePage) { var _this; suppliers_classCallCheck(this, PageStoreSuppliers); _this = suppliers_callSuper(this, PageStoreSuppliers, [router]); - suppliers_defineProperty(_this, "callFilterTableContent", api_API.getSuppliersByFilters); suppliers_defineProperty(_this, "callSaveTableContent", api_API.saveSuppliers); _this.storeMixin = new StoreTableMixinPage(_this); return _this; @@ -6624,7 +6265,6 @@ var PageStoreSupplierPurchaseOrders = /*#__PURE__*/function (_TableBasePage) { var _this; supplier_purchase_orders_classCallCheck(this, PageStoreSupplierPurchaseOrders); _this = supplier_purchase_orders_callSuper(this, PageStoreSupplierPurchaseOrders, [router]); - supplier_purchase_orders_defineProperty(_this, "callFilterTableContent", api_API.getSupplierPurchaseOrdersByFilters); supplier_purchase_orders_defineProperty(_this, "callSaveTableContent", api_API.saveSupplierPurchaseOrders); _this.storeMixin = new StoreTableMixinPage(_this); return _this; diff --git a/static/js/api.js b/static/js/api.js index d0103433..6b281dbc 100644 --- a/static/js/api.js +++ b/static/js/api.js @@ -70,18 +70,6 @@ export default class API { // store // product categories - static async getCategories() { - return await API.request(hashGetStoreProductCategory); - } - static async getCategoriesByFilters(filtersJson) { - /* - let dataRequest = {}; - dataRequest[flagForm] = filtersJson; - return await API.request(hashGetStoreProductCategory, 'POST', dataRequest); - */ - // return await API.request(hashPageStoreProductCategories, 'GET', filtersJson); - API.goToHash(hashPageStoreProductCategories, filtersJson); - } static async saveCategories(categories, formFilters, comment) { let dataRequest = {}; dataRequest[flagFormFilters] = DOM.convertForm2JSON(formFilters); @@ -91,12 +79,6 @@ export default class API { } // products - static async getProducts() { - return await API.request(hashGetStoreProduct); - } - static async getProductsByFilters(filtersJson) { - API.goToHash(hashPageStoreProducts, filtersJson); - } static async saveProducts(products, formFilters, comment) { let dataRequest = {}; dataRequest[flagFormFilters] = DOM.convertForm2JSON(formFilters); @@ -106,12 +88,6 @@ export default class API { } // product permutations - static async getProductPermutations() { - return await API.request(hashGetStoreProductPermutation); - } - static async getProductPermutationsByFilters(filtersJson) { - API.goToHash(hashPageStoreProductPermutations, filtersJson); - } static async saveProductPermutations(permutations, formFilters, comment) { let dataRequest = {}; dataRequest[flagFormFilters] = DOM.convertForm2JSON(formFilters); @@ -121,12 +97,6 @@ export default class API { } // product variations - static async getProductVariations() { - return await API.request(hashGetStoreProductVariation); - } - static async getProductVariationsByFilters(filtersJson) { - API.goToHash(hashPageStoreProductVariations, filtersJson); - } static async saveProductVariations(variationTypes, formFilters, comment) { let dataRequest = {}; dataRequest[flagFormFilters] = DOM.convertForm2JSON(formFilters); @@ -136,12 +106,6 @@ export default class API { } // stock items - static async getStockItems() { - return await API.request(hashGetStoreStockItem); - } - static async getStockItemsByFilters(filtersJson) { - API.goToHash(hashPageStoreStockItems, filtersJson); - } static async saveStockItems(stockItems, formFilters, comment) { let dataRequest = {}; dataRequest[flagFormFilters] = DOM.convertForm2JSON(formFilters); @@ -151,12 +115,6 @@ export default class API { } // suppliers - static async getSuppliers() { - return await API.request(hashGetStoreSupplier); - } - static async getSuppliersByFilters(filtersJson) { - API.goToHash(hashPageStoreSuppliers, filtersJson); - } static async saveSuppliers(suppliers, formFilters, comment) { let dataRequest = {}; dataRequest[flagFormFilters] = DOM.convertForm2JSON(formFilters); @@ -166,12 +124,6 @@ export default class API { } // supplier purchase orders - static async getSupplierPurchaseOrders() { - return await API.request(hashGetStoreSupplierPurchaseOrder); - } - static async getSupplierPurchaseOrdersByFilters(filtersJson) { - API.goToHash(hashPageStoreSupplierPurchaseOrders, filtersJson); - } static async saveSupplierPurchaseOrders(supplierPurchaseOrders, formFilters, comment) { let dataRequest = {}; dataRequest[flagFormFilters] = DOM.convertForm2JSON(formFilters); @@ -181,12 +133,6 @@ export default class API { } // manufacturing purchase orders - static async getManufacturingPurchaseOrders() { - return await API.request(hashGetStoreManufacturingPurchaseOrder); - } - static async getManufacturingPurchaseOrdersByFilters(filtersJson) { - API.goToHash(hashPageStoreManufacturingPurchaseOrders, filtersJson); - } static async saveManufacturingPurchaseOrders(manufacturingPurchaseOrders, formFilters, comment) { let dataRequest = {}; dataRequest[flagFormFilters] = DOM.convertForm2JSON(formFilters); diff --git a/static/js/pages/base_table.js b/static/js/pages/base_table.js index cf7cf1c5..fcdd49cd 100644 --- a/static/js/pages/base_table.js +++ b/static/js/pages/base_table.js @@ -14,27 +14,10 @@ import OverlayError from "../components/common/temporary/overlay_error.js"; export default class TableBasePage extends BasePage { // static hash // static attrIdRowObject - // callFilterTableContent // callSaveTableContent constructor(router) { super(router); - /* - if (!this.constructor.callFilterTableContent) { - throw new Error(`Class ${this.constructor.name} must have a static callFilterTableContent method attribute that takes a single argument - the filters as json.`); - } - if (!this.constructor.callSaveTableContent) { - throw new Error(`Class ${this.constructor.name} must have a static callSaveTableContent method attribute that takes 3 arguments - a list of records, the filters as json, and a comment for saving.`); - } - this.initialize(); - // this.hookupFilters(); - this.loadRowTable(null); - this.getJsonRow(null); - // this.hookupTableMain(); - this.getTableRecords(); - this.leave(); - */ - // this.cursorXInitial = null; this.cursorYInitial = null; this.rowInitial = null; this.placeholder = null; @@ -67,7 +50,7 @@ export default class TableBasePage extends BasePage { let formFilters = this.getFormFilters(); let filtersDefault = DOM.convertForm2JSON(formFilters); if (!Validation.areEqualDicts(filters, filtersDefault)) { - this.callFilterTableContent(filters); + this.callFilterTableContent(); } } } @@ -105,15 +88,18 @@ export default class TableBasePage extends BasePage { }); } getAndLoadFilteredTableContent() { - let formFilters = this.getFormFilters(); - let filtersJson = DOM.convertForm2JSON(formFilters); - this.leave(); - this.callFilterTableContent(filtersJson) + this.callFilterTableContent() .catch(error => console.error('Error:', error)); } getFormFilters() { return document.querySelector(idFormFilters); } + callFilterTableContent() { + let formFilters = this.getFormFilters(); + let filtersJson = DOM.convertForm2JSON(formFilters); + this.leave(); + API.goToHash(this.constructor.hash, filtersJson); + } callbackLoadTableContent(response) { let table = TableBasePage.getTableMain(); let bodyTable = table.querySelector('tbody'); @@ -132,9 +118,7 @@ export default class TableBasePage extends BasePage { throw new Error("Subclass of TableBasePage must implement method loadRowTable()."); } getAndLoadFilteredTableContentSinglePageApp() { - let formFilters = this.getFormFilters(); - let filtersJson = DOM.convertForm2JSON(formFilters); - this.callFilterTableContent(filtersJson) + this.callFilterTableContent() .then(data => { if (_verbose) { console.log('Table data received:', data); } this.callbackLoadTableContent(data); @@ -979,7 +963,6 @@ import DOM from "../dom.js"; export class PageStoreProductCategories extends TableBasePage { static hash = hashPageStoreProductCategories; static attrIdRowObject = attrIdProductCategory; - callFilterTableContent = API.getCategoriesByFilters; callSaveTableContent = API.saveCategories; constructor() {} diff --git a/static/js/pages/store/manufacturing_purchase_orders.js b/static/js/pages/store/manufacturing_purchase_orders.js index d03325a4..09113a9a 100644 --- a/static/js/pages/store/manufacturing_purchase_orders.js +++ b/static/js/pages/store/manufacturing_purchase_orders.js @@ -12,7 +12,6 @@ import StoreTableMixinPage from "./mixin_table.js"; export default class PageStoreManufacturingPurchaseOrders extends TableBasePage { static hash = hashPageStoreManufacturingPurchaseOrders; static attrIdRowObject = attrIdManufacturingPurchaseOrder; - callFilterTableContent = API.getManufacturingPurchaseOrdersByFilters; callSaveTableContent = API.saveManufacturingPurchaseOrders; constructor(router) { diff --git a/static/js/pages/store/product_categories.js b/static/js/pages/store/product_categories.js index 510bae4c..fba6d1d4 100644 --- a/static/js/pages/store/product_categories.js +++ b/static/js/pages/store/product_categories.js @@ -8,7 +8,6 @@ import StoreTableMixinPage from "./mixin_table.js"; export default class PageStoreProductCategories extends TableBasePage { static hash = hashPageStoreProductCategories; static attrIdRowObject = attrIdProductCategory; - callFilterTableContent = API.getCategoriesByFilters; callSaveTableContent = API.saveCategories; constructor(router) { diff --git a/static/js/pages/store/product_permutations.js b/static/js/pages/store/product_permutations.js index 31beebfb..4a653990 100644 --- a/static/js/pages/store/product_permutations.js +++ b/static/js/pages/store/product_permutations.js @@ -11,7 +11,6 @@ import StoreTableMixinPage from "./mixin_table.js"; export default class PageStoreProductPermutations extends TableBasePage { static hash = hashPageStoreProductPermutations; static attrIdRowObject = attrIdProductPermutation; - callFilterTableContent = API.getProductPermutationsByFilters; callSaveTableContent = API.saveProductPermutations; constructor(router) { diff --git a/static/js/pages/store/product_variations.js b/static/js/pages/store/product_variations.js index a94a8c12..27b734f8 100644 --- a/static/js/pages/store/product_variations.js +++ b/static/js/pages/store/product_variations.js @@ -11,7 +11,6 @@ import StoreTableMixinPage from "./mixin_table.js"; export default class PageStoreProductVariations extends TableBasePage { static hash = hashPageStoreProductVariations; static attrIdRowObject = attrIdProductVariationType; - callFilterTableContent = API.getProductVariationsByFilters; callSaveTableContent = API.saveProductVariations; constructor(router) { diff --git a/static/js/pages/store/products.js b/static/js/pages/store/products.js index 736b026f..38087527 100644 --- a/static/js/pages/store/products.js +++ b/static/js/pages/store/products.js @@ -9,7 +9,6 @@ import Utils from "../../lib/utils.js"; export default class PageStoreProducts extends TableBasePage { static hash = hashPageStoreProducts; static attrIdRowObject = attrIdProduct; - callFilterTableContent = API.getProductsByFilters; callSaveTableContent = API.saveProducts; constructor(router) { diff --git a/static/js/pages/store/stock_items.js b/static/js/pages/store/stock_items.js index 673ea379..3555bd9e 100644 --- a/static/js/pages/store/stock_items.js +++ b/static/js/pages/store/stock_items.js @@ -11,7 +11,6 @@ import StoreTableMixinPage from "./mixin_table.js"; export default class PageStoreStockItems extends TableBasePage { static hash = hashPageStoreStockItems; static attrIdRowObject = attrIdStockItem; - callFilterTableContent = API.getStockItemsByFilters; callSaveTableContent = API.saveStockItems; constructor(router) { diff --git a/static/js/pages/store/supplier_purchase_orders.js b/static/js/pages/store/supplier_purchase_orders.js index 5ea1c014..fc8b8575 100644 --- a/static/js/pages/store/supplier_purchase_orders.js +++ b/static/js/pages/store/supplier_purchase_orders.js @@ -12,7 +12,6 @@ import StoreTableMixinPage from "./mixin_table.js"; export default class PageStoreSupplierPurchaseOrders extends TableBasePage { static hash = hashPageStoreSupplierPurchaseOrders; static attrIdRowObject = attrIdSupplierPurchaseOrder; - callFilterTableContent = API.getSupplierPurchaseOrdersByFilters; callSaveTableContent = API.saveSupplierPurchaseOrders; constructor(router) { diff --git a/static/js/pages/store/suppliers.js b/static/js/pages/store/suppliers.js index b7c49ddf..45d0faf5 100644 --- a/static/js/pages/store/suppliers.js +++ b/static/js/pages/store/suppliers.js @@ -11,7 +11,6 @@ import StoreTableMixinPage from "./mixin_table.js"; export default class PageStoreSuppliers extends TableBasePage { static hash = hashPageStoreSuppliers; static attrIdRowObject = attrIdSupplier; - callFilterTableContent = API.getSuppliersByFilters; callSaveTableContent = API.saveSuppliers; constructor(router) { diff --git a/templates/pages/store/_product_permutations.html b/templates/pages/store/_product_permutations.html index 4e25432f..6222222d 100644 --- a/templates/pages/store/_product_permutations.html +++ b/templates/pages/store/_product_permutations.html @@ -58,38 +58,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' %} diff --git a/templates/pages/store/_products.html b/templates/pages/store/_products.html index 9987e357..3f68bbb4 100644 --- a/templates/pages/store/_products.html +++ b/templates/pages/store/_products.html @@ -36,22 +36,8 @@ {% 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' %} -