feat(UI): Stock Items page added with getting, filtering, and saving data.

controllers/core.py

@@ -88,6 +88,11 @@ def services():
 def admin_home():
     try:
         model = Model_View_Admin_Home()
+        if not model.is_user_logged_in:
+            # return redirect(url_for('routes_user.login', callback = Model_View_Admin_Home.HASH_PAGE_ADMIN_HOME))
+            return redirect(url_for('routes_core.home'))
+        if not (model.user.can_admin_store or model.user.can_admin_user):
+            return redirect(url_for('routes_core.home'))
         html_body =  render_template('pages/core/_admin_home.html', model = model)
     except Exception as e:
         return jsonify(error=str(e)), 403

controllers/store/product.py

@@ -111,6 +111,9 @@ def products():
         form_filters = Filters_Product()
     print(f'form_filters={form_filters}')
     model = Model_View_Store_Product(form_filters)
+    if not model.is_user_logged_in:
+        # return redirect(url_for('routes_user.login', data = jsonify({ Model_View_Store_Product.KEY_CALLBACK: Model_View_Store_Product.HASH_PAGE_STORE_PRODUCTS })))
+        return redirect(url_for('routes_core.home'))
     return render_template('pages/store/_products.html', model = model)
 
 @routes_store_product.route(Model_View_Store_Product.HASH_GET_STORE_PRODUCT, methods=['POST'])
@@ -124,6 +127,8 @@ def filter_product():
                 Model_View_Store_Product.FLAG_MESSAGE: f'Form invalid.\n{form_filters.errors}'
             })
         model = Model_View_Store_Product(form_filters = form_filters)
+        if not model.is_user_logged_in:
+            raise Exception('User not logged in')
         return jsonify({
             Model_View_Store_Product.FLAG_STATUS: Model_View_Store_Product.FLAG_SUCCESS, 
             Model_View_Store_Product.KEY_DATA: model.category_list.to_json()
@@ -161,6 +166,8 @@ def save_product():
         save_errors = Model_View_Store_Product.save_products(data.get('comment', 'No comment'), objsProduct)
 
         model_return = Model_View_Store_Product(form_filters=form_filters)
+        if not model_return.is_user_logged_in:
+            raise Exception('User not logged in')
         print('nips')
         return jsonify({
             Model_View_Store_Product.FLAG_STATUS: Model_View_Store_Product.FLAG_SUCCESS, 

controllers/store/product_category.py

@@ -54,6 +54,9 @@ def categories():
         return redirect(url_for('routes_store_product_category.categories', **filters.to_json()))
     """
     model = Model_View_Store_Product_Category(form_filters)
+    if not model.is_user_logged_in:
+        # return redirect(url_for('routes_user.login', data = jsonify({ Model_View_Store_Product_Category.KEY_CALLBACK: Model_View_Store_Product_Category.HASH_PAGE_STORE_PRODUCT_CATEGORIES })))
+        return redirect(url_for('routes_core.home'))
     return render_template('pages/store/_product_categories.html', model = model)
 
 @routes_store_product_category.route(Model_View_Store_Product_Category.HASH_GET_STORE_PRODUCT_CATEGORY, methods=['POST'])
@@ -70,6 +73,8 @@ def filter_category():
         # ToDo: manually validate category, product
         # filters_form = Filters_Product_Category.from_form(form_filters)
         model = Model_View_Store_Product_Category(form_filters = form_filters)
+        if not model.is_user_logged_in:
+            raise Exception('User not logged in')
         return jsonify({
             Model_View_Store_Product_Category.FLAG_STATUS: Model_View_Store_Product_Category.FLAG_SUCCESS, 
             Model_View_Store_Product_Category.KEY_DATA: model.category_list.to_json()
@@ -106,7 +111,8 @@ def save_category():
         Model_View_Store_Product_Category.save_categories(data.get('comment', 'No comment'), objsCategory)
 
         model_return = Model_View_Store_Product_Category(form_filters=form_filters)
-        print('nips')
+        if not model_return.is_user_logged_in:
+            raise Exception('User not logged in')
         return jsonify({
             Model_View_Store_Product_Category.FLAG_STATUS: Model_View_Store_Product_Category.FLAG_SUCCESS, 
             Model_View_Store_Product_Category.KEY_DATA: model_return.category_list.to_json()

controllers/store/product_permutation.py

@@ -96,6 +96,9 @@ def permutations():
         form_filters = Filters_Product_Permutation()
     print(f'form_filters={form_filters}')
     model = Model_View_Store_Product_Permutation(form_filters)
+    if not model.is_user_logged_in:
+        # return redirect(url_for('routes_user.login', data = jsonify({ Model_View_Store_Product_Permutation.KEY_CALLBACK: Model_View_Store_Product_Permutation.HASH_PAGE_STORE_PRODUCT_PERMUTATIONS })))
+        return redirect(url_for('routes_core.home'))
     return render_template('pages/store/_product_permutations.html', model = model)
 
 @routes_store_product_permutation.route(Model_View_Store_Product_Permutation.HASH_GET_STORE_PRODUCT_PERMUTATION, methods=['POST'])
@@ -109,6 +112,8 @@ def filter_permutation():
                 Model_View_Store_Product_Permutation.FLAG_MESSAGE: f'Form invalid.\n{form_filters.errors}'
             })
         model = Model_View_Store_Product_Permutation(form_filters = form_filters)
+        if not model.is_user_logged_in:
+            raise Exception('User not logged in')
         return jsonify({
             Model_View_Store_Product_Permutation.FLAG_STATUS: Model_View_Store_Product_Permutation.FLAG_SUCCESS, 
             Model_View_Store_Product_Permutation.KEY_DATA: model.category_list.to_json()
@@ -146,6 +151,8 @@ def save_permutation():
         Model_View_Store_Product_Permutation.save_permutations(data.get('comment', 'No comment'), objsPermutation)
 
         model_return = Model_View_Store_Product_Permutation(form_filters=form_filters)
+        if not model_return.is_user_logged_in:
+            raise Exception('User not logged in')
         print('nips')
         return jsonify({
             Model_View_Store_Product_Permutation.FLAG_STATUS: Model_View_Store_Product_Permutation.FLAG_SUCCESS, 

controllers/store/stock_item.py

@@ -11,91 +11,26 @@ Initializes the Flask application, sets the configuration based on the environme
 """
 
 # internal
-from business_objects.store.product import Product, Parameters_Product, Product_Permutation
 from business_objects.store.stock_item import Stock_Item
 from forms.store.stock_item import Filters_Stock_Item
-from models.model_view_base import Model_View_Base
-from models.model_view_store import Model_View_Store
-from models.model_view_store_supplier import Model_View_Store_Supplier
-from models.model_view_store_product_category import Model_View_Store_Product_Category
-from models.model_view_store_product_permutation import Model_View_Store_Product_Permutation
 from models.model_view_store_stock_item import Model_View_Store_Stock_Item
 from helpers.helper_app import Helper_App
 import lib.argument_validation as av
 # external
+from datetime import datetime
 from flask import Flask, render_template, jsonify, request,  render_template_string, send_from_directory, redirect, url_for, session, Blueprint, current_app
 from extensions import db, oauth
 from urllib.parse import quote_plus, urlencode
 from authlib.integrations.flask_client import OAuth
 from authlib.integrations.base_client import OAuthError
 from urllib.parse import quote, urlparse, parse_qs
-
+import requests
 
 routes_store_stock_item = Blueprint('routes_store_stock_item', __name__)
 
-"""
-@routes_store_stock_item.route('/store/stock_items', methods=['GET'])
-def stock():
-    filters = Filters_Stock_Item.get_default()
-    model = Model_View_Store_Stock_Item(filters_stock_item=filters)
-    return render_template('pages/store/_stock_items.html', model = model)
-
-@routes_store_stock_item.route('/store/stock_item_filter', methods=['POST'])
-def stock_filter():
-    data = Helper_App.get_request_data(request)
-    form_filters = None
-    try:
-        form_filters = get_Filters_Stock_Items(data)
-        if not form_filters.validate_on_submit():
-            return jsonify({Model_View_Base.FLAG_STATUS: Model_View_Base.FLAG_FAILURE, Model_View_Base.FLAG_MESSAGE: f'Form invalid.\n{form_filters.errors}'})
-        # ToDo: manually validate category, product
-        filters_form = Filters_Stock_Item.from_form(form_filters)
-        model = Model_View_Store_Stock_Item(filters_stock_item=filters_form)
-        return jsonify({Model_View_Base.FLAG_STATUS: Model_View_Base.FLAG_SUCCESS, 'Success': True, Model_View_Base.KEY_DATA: model.category_list.to_permutation_row_list()})
-    except Exception as e:
-        return jsonify({Model_View_Base.FLAG_STATUS: Model_View_Base.FLAG_FAILURE, Model_View_Base.FLAG_MESSAGE: f'Bad data received by controller.\n{e}'})
-
-def get_Filters_Stock_Items(data_request):
-    data_form = data_request[Model_View_Store_Stock_Item.KEY_FORM]
-    form_filters = Filters_Stock_Item(**data_form)
-    form_filters.is_out_of_stock.data = av.input_bool(data_form['is_out_of_stock'], 'is_out_of_stock', 'permutations_post')
-    return form_filters
-
-@routes_store_stock_item.route('/store/stock_item_save', methods=['POST'])
-def stock_save():
-    data = Helper_App.get_request_data(request)
-""
-    form_filters = None
-    try:
-        form_filters = get_Filters_Stock_Items(data)
-        if not form_filters.validate_on_submit():
-            return jsonify({Model_View_Base.FLAG_STATUS: Model_View_Base.FLAG_FAILURE, Model_View_Base.FLAG_MESSAGE: f'Filters form invalid.\n{form_filters.errors}'})
-        
-        stock_items = data[Model_View_Store_Stock.KEY_PERMUTATIONS]
-        print(f'stock_items: {stock_items}')
-        if len(stock_items) == 0:
-            return jsonify({Model_View_Base.FLAG_STATUS: Model_View_Base.FLAG_FAILURE, Model_View_Base.FLAG_MESSAGE: f'No stock items.'})
-        objsStockItem = []
-        for stock_item in stock_items:
-            objsStockItem.append(Product_Permutation.from_json(stock_item))
-        print(f'objsStockItem: {objsStockItem}')
-
-        # ToDo: manually validate category, product
-        filters_form = Stock_Filters.from_form(form_filters)
-        model_save = Model_View_Store_Stock(filters_product=filters_form)
-        model_save.save_stock_items(data.comment, objsPermutation)
-
-        model_return = Model_View_Store_Stock(filters_product=filters_form)
-        return jsonify({Model_View_Base.FLAG_STATUS: Model_View_Base.FLAG_SUCCESS, 'Success': True, Model_View_Base.KEY_DATA: model_return.category_list.to_permutation_row_list()})
-    except Exception as e:
-        return jsonify({Model_View_Base.FLAG_STATUS: Model_View_Base.FLAG_FAILURE, Model_View_Base.FLAG_MESSAGE: f'Bad data received by controller.\n{e}'})
-""
-"""
-
-
 @routes_store_stock_item.route(Model_View_Store_Stock_Item.HASH_PAGE_STORE_STOCK_ITEMS, methods=['GET'])
-def permutations():
-    print('permutations')
+def stock_items():
+    print('stock_items')
     try:
         form_filters = Filters_Stock_Item.from_json(request.args)
     except Exception as e:
@@ -103,19 +38,39 @@ def permutations():
         form_filters = Filters_Stock_Item()
     print(f'form_filters={form_filters}')
     model = Model_View_Store_Stock_Item(form_filters)
-    return render_template('pages/store/_stock_items.html', model = model)
+    if not model.is_user_logged_in:
+        # return redirect(url_for('routes_user.login', data = jsonify({ Model_View_Store_Stock_Item.KEY_CALLBACK: Model_View_Store_Stock_Item.HASH_PAGE_STORE_STOCK_ITEMS })))
+        # return requests.post(f"{current_app.config['URL_HOST']}{url_for('routes_user.login')}", json={ Model_View_Store_Stock_Item.KEY_CALLBACK: Model_View_Store_Stock_Item.HASH_PAGE_STORE_STOCK_ITEMS })
+        return redirect(url_for('routes_core.home'))
+    return render_template('pages/store/_stock_items.html', model = model, datetime = datetime)
 
 @routes_store_stock_item.route(Model_View_Store_Stock_Item.HASH_GET_STORE_STOCK_ITEM, methods=['POST'])
-def filter_permutation():
+def filter_stock_item():
     data = Helper_App.get_request_data(request)
     try:
         form_filters = Filters_Stock_Item.from_json(data)
         if not form_filters.validate_on_submit():
-            return jsonify({
-                Model_View_Store_Stock_Item.FLAG_STATUS: Model_View_Store_Stock_Item.FLAG_FAILURE, 
-                Model_View_Store_Stock_Item.FLAG_MESSAGE: f'Form invalid.\n{form_filters.errors}'
-            })
-        model = Model_View_Store_Stock_Item(form_filters = form_filters)
+            error_keys = list(form_filters.errors.keys())
+            try:
+                error_keys.remove(Stock_Item.ATTR_ID_PRODUCT_CATEGORY)
+                """
+                if not av.val_int(form_filters.id_product_category.data):
+                    form_filters.errors[Stock_Item.ATTR_ID_PRODUCT_CATEGORY] = ['Invalid category.']
+                """
+            except:
+                pass
+            try:
+                error_keys.remove(Stock_Item.ATTR_ID_PRODUCT)
+            except:
+                pass
+            if error_keys:
+                return jsonify({
+                    Model_View_Store_Stock_Item.FLAG_STATUS: Model_View_Store_Stock_Item.FLAG_FAILURE, 
+                    Model_View_Store_Stock_Item.FLAG_MESSAGE: f'Form invalid.\n{form_filters.errors}'
+                })
+        model = Model_View_Store_Stock_Item(filters_stock_item = form_filters)
+        if not model.is_user_logged_in:
+            raise Exception('User not logged in.')
         return jsonify({
             Model_View_Store_Stock_Item.FLAG_STATUS: Model_View_Store_Stock_Item.FLAG_SUCCESS, 
             Model_View_Store_Stock_Item.KEY_DATA: model.category_list.to_json()
@@ -127,33 +82,55 @@ def filter_permutation():
         })
 
 @routes_store_stock_item.route(Model_View_Store_Stock_Item.HASH_SAVE_STORE_STOCK_ITEM, methods=['POST'])
-def save_permutation():
+def save_stock_item():
     data = Helper_App.get_request_data(request)
     try:
         form_filters = Filters_Stock_Item.from_json(data[Model_View_Store_Stock_Item.FLAG_FORM_FILTERS])
+        """
         if not form_filters.validate_on_submit():
-            return jsonify({
-                Model_View_Store_Stock_Item.FLAG_STATUS: Model_View_Store_Stock_Item.FLAG_FAILURE, 
-                Model_View_Store_Stock_Item.FLAG_MESSAGE: f'Filters form invalid.\n{form_filters.errors}'
-            })
+            error_keys = list(form_filters.errors.keys())
+            try:
+                error_keys.remove(Stock_Item.ATTR_ID_PRODUCT_CATEGORY)
+                ""
+                if not av.val_int(form_filters.id_product_category.data):
+                    form_filters.errors[Stock_Item.ATTR_ID_PRODUCT_CATEGORY] = ['Invalid category.']
+                ""
+            except:
+                pass
+            try:
+                error_keys.remove(Stock_Item.ATTR_ID_PRODUCT)
+            except:
+                pass
+            if error_keys:
+                return jsonify({
+                    Model_View_Store_Stock_Item.FLAG_STATUS: Model_View_Store_Stock_Item.FLAG_FAILURE, 
+                    Model_View_Store_Stock_Item.FLAG_MESSAGE: f'Form invalid.\n{form_filters.errors}'
+                })
+        """
         # filters_form = Filters_Stock_Item.from_form(form_filters)
         print(f'form_filters: {form_filters}')
 
-        permutations = data[Model_View_Store_Stock_Item.FLAG_STOCK_ITEM]
-        if len(permutations) == 0:
+        stock_items = data[Model_View_Store_Stock_Item.FLAG_STOCK_ITEM]
+        if len(stock_items) == 0:
             return jsonify({
                 Model_View_Store_Stock_Item.FLAG_STATUS: Model_View_Store_Stock_Item.FLAG_FAILURE, 
-                Model_View_Store_Stock_Item.FLAG_MESSAGE: f'No permutations.'
+                Model_View_Store_Stock_Item.FLAG_MESSAGE: f'No stock items.'
             })
-        objsPermutation = []
-        for permutation in permutations:
-            objsPermutation.append(Stock_Item.from_json(permutation))
+        print(f'stock_items={stock_items}')
+        objs_stock_item = []
+        for stock_item in stock_items:
+            objs_stock_item.append(Stock_Item.from_json(stock_item))
         # model_save = Model_View_Store_Stock_Item() # filters_product=filters_form)
-        print(f'objsPermutation={objsPermutation}')
-        Model_View_Store_Stock_Item.save_permutations(data.get('comment', 'No comment'), objsPermutation)
-
-        model_return = Model_View_Store_Stock_Item(form_filters=form_filters)
-        print('nips')
+        print(f'objs_stock_item={objs_stock_item}')
+        save_errors = Model_View_Store_Stock_Item.save_stock_items(data.get('comment', 'No comment'), objs_stock_item)
+        if len(save_errors) > 0:
+            return jsonify({
+                Model_View_Store_Stock_Item.FLAG_STATUS: Model_View_Store_Stock_Item.FLAG_FAILURE, 
+                Model_View_Store_Stock_Item.FLAG_MESSAGE: f'Save errors: {save_errors}'
+            })
+        model_return = Model_View_Store_Stock_Item(filters_stock_item=form_filters)
+        if not model_return.is_user_logged_in:
+            raise Exception('User not logged in.')
         return jsonify({
             Model_View_Store_Stock_Item.FLAG_STATUS: Model_View_Store_Stock_Item.FLAG_SUCCESS, 
             Model_View_Store_Stock_Item.KEY_DATA: model_return.category_list.to_json()

controllers/store/supplier.py

@@ -53,6 +53,9 @@ def supplier():
         # if not logged in:
         try:
             model = Model_View_Store_Supplier(form)
+            if not model.is_user_logged_in:
+                # return redirect(url_for('routes_user.login', data = jsonify({ Model_View_Store_Supplier.KEY_CALLBACK: Model_View_Store_Supplier.HASH_PAGE_STORE_SUPPLIERS })))
+                return redirect(url_for('routes_core.home'))
             # print('importing basket')
             # model.import_JSON_basket(data)
             model.get_basket(data)

controllers/user.py

@@ -170,6 +170,9 @@ def logout_callback():
 def user():
     try:
         model = Model_View_User(current_app, db)
+        if not model.is_user_logged_in:
+            # return redirect(url_for('routes_user.login', data = jsonify({ Model_View_User.KEY_CALLBACK: Model_View_User.HASH_PAGE_USER_ACCOUNT })))
+            return redirect(url_for('routes_core.home'))
         html_body = render_template('pages/user/_user.html', model = model)
     except Exception as e:
         return str(e)