Feat(SQL, UI): 1. Dog Command Links page completed with get + set functionality. \n 2. Commands page and Command Categories page completed with get + set functionality.

2025-07-09 17:42:43 +01:00
parent 660b15cb8f
commit 28158cb0c4
68 changed files with 3302 additions and 3926 deletions
--- a/controllers/dog/command.py
+++ b/controllers/dog/command.py
@@ -0,0 +1,98 @@
+"""
+Project:    PARTS Website
+Author:     Edward Middleton-Smith
+            Precision And Research Technology Systems Limited
+
+Technology: App Routing
+Feature:    Dog - Command Routes
+
+Description:
+Contact Page Controller.
+"""
+
+# IMPORTS
+# internal
+from dog_training.business_objects.api import API
+from dog_training.business_objects.dog.command import Command
+from dog_training.business_objects.dog.dog_command_link import Dog_Command_Link
+from dog_training.datastores.datastore_dog import DataStore_Dog
+from dog_training.forms.dog.command import Filters_Command
+from dog_training.helpers.helper_app import Helper_App
+from dog_training.models.model_view_dog_command import Model_View_Dog_Command
+from dog_training.models.model_view_home import Model_View_Home
+import dog_training.lib.argument_validation as av
+# external
+from flask import Flask, render_template, jsonify, request,  render_template_string, send_from_directory, redirect, url_for, session, Blueprint, current_app, flash
+from flask_mail import Mail, Message
+from dog_training.extensions import db, oauth, mail
+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 json
+import base64
+import hmac
+import hashlib
+import datetime
+from altcha import ChallengeOptions, create_challenge, verify_solution
+
+
+routes_dog_command = Blueprint('routes_dog_command', __name__)
+
+
+@routes_dog_command.route(Model_View_Dog_Command.HASH_PAGE_DOG_COMMANDS, methods=['GET'])
+def commands():
+    Helper_App.console_log('commands')
+    Helper_App.console_log(f'request_args: {request.args}')
+    try:
+        form_filters = Filters_Command.from_json(request.args)
+    except Exception as e:
+        Helper_App.console_log(f'Error: {e}')
+        form_filters = Filters_Command()
+    Helper_App.console_log(f'form_filters={form_filters}')
+    model = Model_View_Dog_Command(form_filters_old = form_filters)
+    if not model.is_user_logged_in:
+        return redirect(url_for('routes_core_home.home'))
+    Helper_App.console_log(f'form_filters={form_filters}')
+    return render_template('pages/dog/_commands.html', model = model)
+
+@routes_dog_command.route(Model_View_Dog_Command.HASH_SAVE_DOG_COMMAND, methods=['POST'])
+def save_command():
+    data = Helper_App.get_request_data(request)
+    try:
+        form_filters = Filters_Command.from_json(data[Model_View_Dog_Command.FLAG_FORM_FILTERS])
+        if not form_filters.validate_on_submit():
+            return jsonify({
+                Model_View_Dog_Command.FLAG_STATUS: Model_View_Dog_Command.FLAG_FAILURE, 
+                Model_View_Dog_Command.FLAG_MESSAGE: f'Filters form invalid.\n{form_filters.errors}'
+            })
+        model_return = Model_View_Dog_Command(form_filters_old=form_filters)
+        if not model_return.is_user_logged_in:
+            raise Exception('User not logged in')
+        
+        commands = data[Model_View_Dog_Command.FLAG_COMMAND]
+        if len(commands) == 0:
+            return jsonify({
+                Model_View_Dog_Command.FLAG_STATUS: Model_View_Dog_Command.FLAG_FAILURE, 
+                Model_View_Dog_Command.FLAG_MESSAGE: f'No commands.'
+            })
+        objs_command = []
+        for command in commands:
+            objs_command.append(Command.from_json(command))
+        Helper_App.console_log(f'objs_command={objs_command}')
+        errors = DataStore_Dog.save_commands(data.get('comment', 'No comment'), objs_command)
+
+        if (len(errors) > 0):
+            return jsonify({
+                Model_View_Dog_Command.FLAG_STATUS: Model_View_Dog_Command.FLAG_FAILURE, 
+                Model_View_Dog_Command.FLAG_MESSAGE: f'Error saving commands.\n{model_return.convert_list_objects_to_json(errors)}'
+            })
+        return jsonify({
+            Model_View_Dog_Command.FLAG_STATUS: Model_View_Dog_Command.FLAG_SUCCESS, 
+            Model_View_Dog_Command.FLAG_DATA: Model_View_Dog_Command.convert_list_objects_to_json(model_return.commands)
+        })
+    except Exception as e:
+        return jsonify({
+            Model_View_Dog_Command.FLAG_STATUS: Model_View_Dog_Command.FLAG_FAILURE, 
+            Model_View_Dog_Command.FLAG_MESSAGE: f'Bad data received by controller.\n{e}'
+        })
--- a/controllers/dog/command_category.py
+++ b/controllers/dog/command_category.py
@@ -0,0 +1,97 @@
+"""
+Project:    PARTS Website
+Author:     Edward Middleton-Smith
+            Precision And Research Technology Systems Limited
+
+Technology: App Routing
+Feature:    Dog - Command Routes
+
+Description:
+Contact Page Controller.
+"""
+
+# IMPORTS
+# internal
+from dog_training.business_objects.api import API
+from dog_training.business_objects.dog.command_category import Command_Category
+from dog_training.datastores.datastore_dog import DataStore_Dog
+from dog_training.forms.dog.command_category import Filters_Command_Category
+from dog_training.helpers.helper_app import Helper_App
+from dog_training.models.model_view_dog_command_category import Model_View_Dog_Command_Category
+from dog_training.models.model_view_home import Model_View_Home
+import dog_training.lib.argument_validation as av
+# external
+from flask import Flask, render_template, jsonify, request,  render_template_string, send_from_directory, redirect, url_for, session, Blueprint, current_app, flash
+from flask_mail import Mail, Message
+from dog_training.extensions import db, oauth, mail
+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 json
+import base64
+import hmac
+import hashlib
+import datetime
+from altcha import ChallengeOptions, create_challenge, verify_solution
+
+
+routes_dog_command_category = Blueprint('routes_dog_command_category', __name__)
+
+
+@routes_dog_command_category.route(Model_View_Dog_Command_Category.HASH_PAGE_DOG_COMMAND_CATEGORIES, methods=['GET'])
+def command_categories():
+    Helper_App.console_log('command categories')
+    Helper_App.console_log(f'request_args: {request.args}')
+    try:
+        form_filters = Filters_Command_Category.from_json(request.args)
+    except Exception as e:
+        Helper_App.console_log(f'Error: {e}')
+        form_filters = Filters_Command_Category()
+    Helper_App.console_log(f'form_filters={form_filters}')
+    model = Model_View_Dog_Command_Category(form_filters_old = form_filters)
+    if not model.is_user_logged_in:
+        return redirect(url_for('routes_core_home.home'))
+    Helper_App.console_log(f'form_filters={form_filters}')
+    return render_template('pages/dog/_command_categories.html', model = model)
+
+@routes_dog_command_category.route(Model_View_Dog_Command_Category.HASH_SAVE_DOG_COMMAND_CATEGORY, methods=['POST'])
+def save_command_category():
+    data = Helper_App.get_request_data(request)
+    try:
+        form_filters = Filters_Command_Category.from_json(data[Model_View_Dog_Command_Category.FLAG_FORM_FILTERS])
+        if not form_filters.validate_on_submit():
+            return jsonify({
+                Model_View_Dog_Command_Category.FLAG_STATUS: Model_View_Dog_Command_Category.FLAG_FAILURE, 
+                Model_View_Dog_Command_Category.FLAG_MESSAGE: f'Filters form invalid.\n{form_filters.errors}'
+            })
+        model_return = Model_View_Dog_Command_Category(form_filters_old=form_filters)
+        if not model_return.is_user_logged_in:
+            raise Exception('User not logged in')
+        
+        command_categories = data[Model_View_Dog_Command_Category.FLAG_COMMAND_CATEGORY]
+        if len(command_categories) == 0:
+            return jsonify({
+                Model_View_Dog_Command_Category.FLAG_STATUS: Model_View_Dog_Command_Category.FLAG_FAILURE, 
+                Model_View_Dog_Command_Category.FLAG_MESSAGE: f'No command categories.'
+            })
+        objs_command_category = []
+        for command_category in command_categories:
+            objs_command_category.append(Command_Category.from_json(command_category))
+        Helper_App.console_log(f'objs_command_category={objs_command_category}')
+        errors = DataStore_Dog.save_command_categories(data.get('comment', 'No comment'), objs_command_category)
+
+        if (len(errors) > 0):
+            return jsonify({
+                Model_View_Dog_Command_Category.FLAG_STATUS: Model_View_Dog_Command_Category.FLAG_FAILURE, 
+                Model_View_Dog_Command_Category.FLAG_MESSAGE: f'Error saving command categories.\n{model_return.convert_list_objects_to_json(errors)}'
+            })
+        return jsonify({
+            Model_View_Dog_Command_Category.FLAG_STATUS: Model_View_Dog_Command_Category.FLAG_SUCCESS, 
+            Model_View_Dog_Command_Category.FLAG_DATA: Model_View_Dog_Command_Category.convert_list_objects_to_json(model_return.command_categories)
+        })
+    except Exception as e:
+        return jsonify({
+            Model_View_Dog_Command_Category.FLAG_STATUS: Model_View_Dog_Command_Category.FLAG_FAILURE, 
+            Model_View_Dog_Command_Category.FLAG_MESSAGE: f'Bad data received by controller.\n{e}'
+        })
--- a/controllers/dog/dog_command_link.py
+++ b/controllers/dog/dog_command_link.py
@@ -4,7 +4,7 @@ Author:     Edward Middleton-Smith
            Precision And Research Technology Systems Limited

 Technology: App Routing
-Feature:    Core - Contact Routes
+Feature:    Dog - Dog Command Link Routes

 Description:
 Contact Page Controller.
@@ -56,9 +56,8 @@ def dog_command_links():
    Helper_App.console_log(f'form_filters={form_filters}')
    return render_template('pages/dog/_dog_command_links.html', model = model)

-"""
@routes_dog_dog_command_link.route(Model_View_Dog_Dog_Command_Link.HASH_SAVE_DOG_DOG_COMMAND_LINK, methods=['POST'])
-def save_category():
+def save_dog_command_link():
    data = Helper_App.get_request_data(request)
    try:
        form_filters = Filters_Dog_Command_Link.from_json(data[Model_View_Dog_Dog_Command_Link.FLAG_FORM_FILTERS])
@@ -67,8 +66,11 @@ def save_category():
                Model_View_Dog_Dog_Command_Link.FLAG_STATUS: Model_View_Dog_Dog_Command_Link.FLAG_FAILURE, 
                Model_View_Dog_Dog_Command_Link.FLAG_MESSAGE: f'Filters form invalid.\n{form_filters.errors}'
            })
+        model_return = Model_View_Dog_Dog_Command_Link(form_filters_old=form_filters)
+        if not model_return.is_user_logged_in:
+            raise Exception('User not logged in')
        
-        dog_command_links = data[Model_View_Dog_Dog_Command_Link.FLAG_PRODUCT_CATEGORY]
+        dog_command_links = data[Model_View_Dog_Dog_Command_Link.FLAG_DOG_COMMAND_LINK]
        if len(dog_command_links) == 0:
            return jsonify({
                Model_View_Dog_Dog_Command_Link.FLAG_STATUS: Model_View_Dog_Dog_Command_Link.FLAG_FAILURE, 
@@ -78,11 +80,8 @@ def save_category():
        for dog_command_link in dog_command_links:
            objs_dog_command_link.append(Dog_Command_Link.from_json(dog_command_link))
        Helper_App.console_log(f'objs_dog_command_link={objs_dog_command_link}')
-        errors = Model_View_Dog_Dog_Command_Link.save_dog_command_links(data.get('comment', 'No comment'), objs_dog_command_link)
+        errors = DataStore_Dog.save_dog_command_links(data.get('comment', 'No comment'), objs_dog_command_link)

-        model_return = Model_View_Dog_Dog_Command_Link(form_filters_old=form_filters)
-        if not model_return.is_user_logged_in:
-            raise Exception('User not logged in')
        if (len(errors) > 0):
            return jsonify({
                Model_View_Dog_Dog_Command_Link.FLAG_STATUS: Model_View_Dog_Dog_Command_Link.FLAG_FAILURE, 
@@ -90,11 +89,10 @@ def save_category():
            })
        return jsonify({
            Model_View_Dog_Dog_Command_Link.FLAG_STATUS: Model_View_Dog_Dog_Command_Link.FLAG_SUCCESS, 
-            Model_View_Dog_Dog_Command_Link.FLAG_DATA: model_return.category_list.to_json()
+            Model_View_Dog_Dog_Command_Link.FLAG_DATA: Model_View_Dog_Dog_Command_Link.convert_list_objects_to_json(model_return.dog_command_links)
        })
    except Exception as e:
        return jsonify({
            Model_View_Dog_Dog_Command_Link.FLAG_STATUS: Model_View_Dog_Dog_Command_Link.FLAG_FAILURE, 
            Model_View_Dog_Dog_Command_Link.FLAG_MESSAGE: f'Bad data received by controller.\n{e}'
-        })
-"""
+        })