admin/dog_training
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix(Python): Corrected module references for web server.

Browse Source
This commit is contained in:
Teddy Middleton-Smith
2025-07-10 16:29:54 +01:00
parent d5d2f6f710
commit 77c63994c3
40 changed files with 219 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app.py
View File

@@ -17,16 +17,16 @@ Initializes the Flask application, sets the configuration based on the environme
# IMPORTS
# internal
from config import app_config, Config
from dog_training.controllers.dog.command import routes_dog_command
from dog_training.controllers.dog.command_category import routes_dog_command_category
from dog_training.controllers.dog.dog import routes_dog
from dog_training.controllers.dog.dog_command_link import routes_dog_dog_command_link
from dog_training.controllers.dog.home import routes_dog_home
from controllers.dog.command import routes_dog_command
from controllers.dog.command_category import routes_dog_command_category
from controllers.dog.dog import routes_dog
from controllers.dog.dog_command_link import routes_dog_dog_command_link
from controllers.dog.home import routes_dog_home
from controllers.core.home import routes_core_home
from controllers.legal.legal import routes_legal
from controllers.user.user import routes_user
from dog_training.extensions import db, csrf, mail, oauth
from dog_training.helpers.helper_app import Helper_App
from extensions import db, csrf, mail, oauth
from helpers.helper_app import Helper_App
# external
from flask import Flask, render_template, jsonify, request, render_template_string, send_from_directory, redirect, url_for, session
# from flask_appconfig import AppConfig

4
business_objects/api.py
View File

@@ -11,8 +11,8 @@ Abstract business object
"""
# internal
from dog_training.extensions import db
import dog_training.lib.argument_validation as av
from extensions import db
import lib.argument_validation as av
# external
from typing import ClassVar
from flask import jsonify

4
business_objects/base.py
View File

@@ -11,8 +11,8 @@ Abstract base class for all business objects in app
"""
# internal
from dog_training.extensions import db
import dog_training.lib.argument_validation as av
from extensions import db
import lib.argument_validation as av
# external
from typing import ClassVar

6
business_objects/db_base.py
View File

@@ -11,9 +11,9 @@ Abstract base class for database objects
"""
# internal
# from dog_training.helpers.DEPRECATED.helper_abc import Interface_ABC
from dog_training.extensions import db
import dog_training.lib.argument_validation as av
# from helpers.DEPRECATED.helper_abc import Interface_ABC
from extensions import db
import lib.argument_validation as av
# external
from typing import ClassVar
from abc import abstractmethod, ABCMeta

8
business_objects/dog/DEPRECATED - access_level.py
View File

@@ -11,10 +11,10 @@ Business object for product
"""
# internal
import dog_training.lib.argument_validation as av
from dog_training.business_objects.base import Base
from dog_training.extensions import db
from dog_training.helpers.helper_app import Helper_App
import lib.argument_validation as av
from business_objects.base import Base
from extensions import db
from helpers.helper_app import Helper_App
# external
from pydantic import BaseModel
from typing import ClassVar

12
business_objects/dog/DEPRECATED - dog_command_link_container.py
View File

@@ -14,12 +14,12 @@ DEPRECATED AS NOT REQUIRED - USE A LIST
"""
# internal
import dog_training.lib.argument_validation as av
from dog_training.business_objects.base import Base
from dog_training.business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base
from dog_training.business_objects.dog.dog_command_link import Dog_Command_Link
from dog_training.extensions import db
from dog_training.helpers.helper_app import Helper_App
import lib.argument_validation as av
from business_objects.base import Base
from business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base
from business_objects.dog.dog_command_link import Dog_Command_Link
from extensions import db
from helpers.helper_app import Helper_App
# external
from pydantic import BaseModel
from typing import ClassVar

10
business_objects/dog/DEPRECATED - understanding_level.py
View File

@@ -8,11 +8,11 @@ Feature: Understanding Level Business Object
"""
# internal
from dog_training.business_objects.base import Base
from dog_training.business_objects.db_base import SQLAlchemy_ABC
import dog_training.lib.argument_validation as av
from dog_training.extensions import db
from dog_training.helpers.helper_app import Helper_App
from business_objects.base import Base
from business_objects.db_base import SQLAlchemy_ABC
import lib.argument_validation as av
from extensions import db
from helpers.helper_app import Helper_App
# external
from dataclasses import dataclass
from typing import ClassVar

16
business_objects/dog/command.py
View File

@@ -8,14 +8,14 @@ Feature: Command Business Object
"""
# internal
from dog_training.business_objects.base import Base
from dog_training.business_objects.dog.command_category import Command_Category
from dog_training.business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base
import dog_training.lib.argument_validation as av
from dog_training.extensions import db
from dog_training.forms.dog.command import Filters_Command
from dog_training.forms.dog.command_category import Filters_Command_Category
from dog_training.helpers.helper_app import Helper_App
from business_objects.base import Base
from business_objects.dog.command_category import Command_Category
from business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base
import lib.argument_validation as av
from extensions import db
from forms.dog.command import Filters_Command
from forms.dog.command_category import Filters_Command_Category
from helpers.helper_app import Helper_App
# external
from dataclasses import dataclass
from typing import ClassVar

10
business_objects/dog/command_category.py
View File

@@ -8,11 +8,11 @@ Feature: Command Category Business Object
"""
# internal
from dog_training.business_objects.base import Base
from dog_training.business_objects.db_base import SQLAlchemy_ABC
import dog_training.lib.argument_validation as av
from dog_training.extensions import db
from dog_training.helpers.helper_app import Helper_App
from business_objects.base import Base
from business_objects.db_base import SQLAlchemy_ABC
import lib.argument_validation as av
from extensions import db
from helpers.helper_app import Helper_App
# external
from dataclasses import dataclass
from typing import ClassVar

10
business_objects/dog/dog.py
View File

@@ -8,11 +8,11 @@ Feature: Dog Business Object
"""
# internal
from dog_training.business_objects.base import Base
from dog_training.business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base
import dog_training.lib.argument_validation as av
from dog_training.extensions import db
from dog_training.helpers.helper_app import Helper_App
from business_objects.base import Base
from business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base
import lib.argument_validation as av
from extensions import db
from helpers.helper_app import Helper_App
# external
from dataclasses import dataclass
from typing import ClassVar

20
business_objects/dog/dog_command_link.py
View File

@@ -8,16 +8,16 @@ Feature: Dog Command Link Business Object
"""
# internal
from dog_training.business_objects.base import Base
from dog_training.business_objects.dog.command import Command
# from dog_training.business_objects.dog.command_category import Command_Category
from dog_training.business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base
from dog_training.business_objects.dog.dog import Dog
from dog_training.business_objects.dog.obedience_level import Obedience_Level
from dog_training.extensions import db
from dog_training.forms.dog.dog_command_link import Filters_Dog_Command_Link
from dog_training.helpers.helper_app import Helper_App
import dog_training.lib.argument_validation as av
from business_objects.base import Base
from business_objects.dog.command import Command
# from business_objects.dog.command_category import Command_Category
from business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base
from business_objects.dog.dog import Dog
from business_objects.dog.obedience_level import Obedience_Level
from extensions import db
from forms.dog.dog_command_link import Filters_Dog_Command_Link
from helpers.helper_app import Helper_App
import lib.argument_validation as av
# external
from dataclasses import dataclass
from typing import ClassVar

10
business_objects/dog/obedience_level.py
View File

@@ -8,11 +8,11 @@ Feature: Obedience Level Business Object
"""
# internal
from dog_training.business_objects.base import Base
from dog_training.business_objects.db_base import SQLAlchemy_ABC
import dog_training.lib.argument_validation as av
from dog_training.extensions import db
from dog_training.helpers.helper_app import Helper_App
from business_objects.base import Base
from business_objects.db_base import SQLAlchemy_ABC
import lib.argument_validation as av
from extensions import db
from helpers.helper_app import Helper_App
# external
from dataclasses import dataclass
from typing import ClassVar

12
business_objects/dog/user.py
View File

@@ -8,12 +8,12 @@ Feature: User Business Object
"""
# internal
from dog_training.business_objects.base import Base
from dog_training.business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base
import dog_training.lib.argument_validation as av
from dog_training.extensions import db
from dog_training.forms.base import Form_Filters_User
from dog_training.helpers.helper_app import Helper_App
from business_objects.base import Base
from business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base
import lib.argument_validation as av
from extensions import db
from forms.base import Form_Filters_User
from helpers.helper_app import Helper_App
# external
from dataclasses import dataclass
from typing import ClassVar

6
business_objects/sql_error.py
View File

@@ -11,9 +11,9 @@ Business object for SQL errors returned by Get Many Stored Procedures
"""
# internal
from dog_training.business_objects.base import Base
import dog_training.lib.argument_validation as av
from dog_training.lib import data_types
from business_objects.base import Base
import lib.argument_validation as av
from lib import data_types
# external
from enum import Enum
from datetime import datetime, timedelta

4
controllers/core/home.py
View File

@@ -11,8 +11,8 @@ Home Page Controller.
"""
# internal
from dog_training.business_objects.api import API
from dog_training.models.model_view_home import Model_View_Home
from business_objects.api import API
from models.model_view_home import Model_View_Home
# external
from flask import render_template, jsonify, Blueprint

20
controllers/dog/command.py
View File

@@ -12,19 +12,19 @@ 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
from business_objects.api import API
from business_objects.dog.command import Command
from business_objects.dog.dog_command_link import Dog_Command_Link
from datastores.datastore_dog import DataStore_Dog
from forms.dog.command import Filters_Command
from helpers.helper_app import Helper_App
from models.model_view_dog_command import Model_View_Dog_Command
from models.model_view_home import Model_View_Home
import 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 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

18
controllers/dog/command_category.py
View File

@@ -12,18 +12,18 @@ 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
from business_objects.api import API
from business_objects.dog.command_category import Command_Category
from datastores.datastore_dog import DataStore_Dog
from forms.dog.command_category import Filters_Command_Category
from helpers.helper_app import Helper_App
from models.model_view_dog_command_category import Model_View_Dog_Command_Category
from models.model_view_home import Model_View_Home
import 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 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

20
controllers/dog/dog.py
View File

@@ -12,19 +12,19 @@ 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.dog_command_link import Filters_Dog_Command_Link
from dog_training.helpers.helper_app import Helper_App
from dog_training.models.model_view_dog_base import Model_View_Dog_Base
from dog_training.models.model_view_home import Model_View_Home
import dog_training.lib.argument_validation as av
from business_objects.api import API
from business_objects.dog.command import Command
from business_objects.dog.dog_command_link import Dog_Command_Link
from datastores.datastore_dog import DataStore_Dog
from forms.dog.dog_command_link import Filters_Dog_Command_Link
from helpers.helper_app import Helper_App
from models.model_view_dog_base import Model_View_Dog_Base
from models.model_view_home import Model_View_Home
import 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, Response
from flask_mail import Mail, Message
from dog_training.extensions import db, oauth, mail
from 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

20
controllers/dog/dog_command_link.py
View File

@@ -12,19 +12,19 @@ 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.dog_command_link import Filters_Dog_Command_Link
from dog_training.helpers.helper_app import Helper_App
from dog_training.models.model_view_dog_dog_command_link import Model_View_Dog_Dog_Command_Link
from dog_training.models.model_view_home import Model_View_Home
import dog_training.lib.argument_validation as av
from business_objects.api import API
from business_objects.dog.command import Command
from business_objects.dog.dog_command_link import Dog_Command_Link
from datastores.datastore_dog import DataStore_Dog
from forms.dog.dog_command_link import Filters_Dog_Command_Link
from helpers.helper_app import Helper_App
from models.model_view_dog_dog_command_link import Model_View_Dog_Dog_Command_Link
from models.model_view_home import Model_View_Home
import 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 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

20
controllers/dog/home.py
View File

@@ -12,19 +12,19 @@ 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.dog_command_link import Filters_Dog_Command_Link
from dog_training.helpers.helper_app import Helper_App
from dog_training.models.model_view_dog_base import Model_View_Dog_Base
from dog_training.models.model_view_home import Model_View_Home
import dog_training.lib.argument_validation as av
from business_objects.api import API
from business_objects.dog.command import Command
from business_objects.dog.dog_command_link import Dog_Command_Link
from datastores.datastore_dog import DataStore_Dog
from forms.dog.dog_command_link import Filters_Dog_Command_Link
from helpers.helper_app import Helper_App
from models.model_view_dog_base import Model_View_Dog_Base
from models.model_view_home import Model_View_Home
import 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 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

14
controllers/legal/legal.py
View File

@@ -12,13 +12,13 @@ Legal Section Controller.
# IMPORTS
# internal
# from dog_training.models.model_view_home import Model_View_Home
from dog_training.models.model_view_license import Model_View_License
from dog_training.models.model_view_privacy_policy import Model_View_Privacy_Policy
from dog_training.models.model_view_accessibility_report import Model_View_Accessibility_Report
from dog_training.models.model_view_accessibility_statement import Model_View_Accessibility_Statement
from dog_training.models.model_view_retention_schedule import Model_View_Retention_Schedule
import dog_training.lib.argument_validation as av
# from models.model_view_home import Model_View_Home
from models.model_view_license import Model_View_License
from models.model_view_privacy_policy import Model_View_Privacy_Policy
from models.model_view_accessibility_report import Model_View_Accessibility_Report
from models.model_view_accessibility_statement import Model_View_Accessibility_Statement
from models.model_view_retention_schedule import Model_View_Retention_Schedule
import lib.argument_validation as av
# external
from flask import render_template, Blueprint

14
datastores/datastore_base.py
View File

@@ -12,13 +12,13 @@ Datastore for Store
# internal
# from routes import bp_home
import dog_training.lib.argument_validation as av
from dog_training.business_objects.sql_error import SQL_Error
from dog_training.business_objects.dog.user import User
# from dog_training.helpers.helper_db_mysql import Helper_DB_MySQL
# from dog_training.models.model_view_store_checkout import Model_View_Store_Checkout # circular!
from dog_training.extensions import db
from dog_training.helpers.helper_app import Helper_App
import lib.argument_validation as av
from business_objects.sql_error import SQL_Error
from business_objects.dog.user import User
# from helpers.helper_db_mysql import Helper_DB_MySQL
# from models.model_view_store_checkout import Model_View_Store_Checkout # circular!
from extensions import db
from helpers.helper_app import Helper_App
# external
from sqlalchemy import text
from flask import Flask, session, current_app

22
datastores/datastore_dog.py
View File

@@ -12,17 +12,17 @@ Datastore for Users
# internal
# from routes import bp_home
import dog_training.lib.argument_validation as av
from dog_training.business_objects.dog.command import Command, Command_Temp
from dog_training.business_objects.dog.command_category import Command_Category, Command_Category_Temp
from dog_training.business_objects.dog.dog import Dog
from dog_training.business_objects.dog.dog_command_link import Dog_Command_Link, Dog_Command_Link_Temp
from dog_training.business_objects.sql_error import SQL_Error
from dog_training.datastores.datastore_base import DataStore_Base
from dog_training.helpers.helper_app import Helper_App
from dog_training.helpers.helper_db_mysql import Helper_DB_MySQL
# from dog_training.models.model_view_store_checkout import Model_View_Store_Checkout # circular!
from dog_training.extensions import db
import lib.argument_validation as av
from business_objects.dog.command import Command, Command_Temp
from business_objects.dog.command_category import Command_Category, Command_Category_Temp
from business_objects.dog.dog import Dog
from business_objects.dog.dog_command_link import Dog_Command_Link, Dog_Command_Link_Temp
from business_objects.sql_error import SQL_Error
from datastores.datastore_base import DataStore_Base
from helpers.helper_app import Helper_App
from helpers.helper_db_mysql import Helper_DB_MySQL
# from models.model_view_store_checkout import Model_View_Store_Checkout # circular!
from extensions import db
# external
from flask_sqlalchemy import SQLAlchemy
from datetime import datetime

2
forms/base.py
View File

@@ -11,7 +11,7 @@ Defines Flask-WTF base forms for handling user input.
"""
# internal
from dog_training.helpers.helper_app import Helper_App
from helpers.helper_app import Helper_App
# external
from flask_wtf import FlaskForm
from abc import ABCMeta, abstractmethod

16
forms/dog/command.py
View File

@@ -12,14 +12,14 @@ Defines Flask-WTF form for handling user input on Commands page.
# IMPORTS
# internal
from dog_training.business_objects.base import Base
from dog_training.business_objects.dog.command_category import Command_Category
# from dog_training.business_objects.dog.command import Command # Circular
from dog_training.helpers.helper_app import Helper_App
# from dog_training.models.model_view_store import Model_View_Store # circular
# from dog_training.models.model_view_base import Model_View_Base
from dog_training.forms.base import Form_Base
import dog_training.lib.argument_validation as av
from business_objects.base import Base
from business_objects.dog.command_category import Command_Category
# from business_objects.dog.command import Command # Circular
from helpers.helper_app import Helper_App
# from models.model_view_store import Model_View_Store # circular
# from models.model_view_base import Model_View_Base
from forms.base import Form_Base
import lib.argument_validation as av
# external
from flask import Flask, render_template, request, flash, redirect, url_for, current_app
from flask_wtf import FlaskForm

16
forms/dog/command_category.py
View File

@@ -12,14 +12,14 @@ Defines Flask-WTF form for handling user input on Commands page.
# IMPORTS
# internal
from dog_training.business_objects.base import Base
# from dog_training.business_objects.dog.command_category import Command_Category # Circular
# from dog_training.business_objects.dog.command import Command # Circular
from dog_training.helpers.helper_app import Helper_App
# from dog_training.models.model_view_store import Model_View_Store # circular
# from dog_training.models.model_view_base import Model_View_Base
from dog_training.forms.base import Form_Base
import dog_training.lib.argument_validation as av
from business_objects.base import Base
# from business_objects.dog.command_category import Command_Category # Circular
# from business_objects.dog.command import Command # Circular
from helpers.helper_app import Helper_App
# from models.model_view_store import Model_View_Store # circular
# from models.model_view_base import Model_View_Base
from forms.base import Form_Base
import lib.argument_validation as av
# external
from flask import Flask, render_template, request, flash, redirect, url_for, current_app
from flask_wtf import FlaskForm

20
forms/dog/dog_command_link.py
View File

@@ -12,16 +12,16 @@ Defines Flask-WTF form for handling user input on Dog Command Links page.
# IMPORTS
# internal
from dog_training.business_objects.base import Base
from dog_training.business_objects.dog.command_category import Command_Category
from dog_training.business_objects.dog.command import Command
from dog_training.business_objects.dog.dog import Dog
from dog_training.business_objects.dog.obedience_level import Obedience_Level
from dog_training.helpers.helper_app import Helper_App
# from dog_training.models.model_view_store import Model_View_Store # circular
# from dog_training.models.model_view_base import Model_View_Base
from dog_training.forms.base import Form_Base
import dog_training.lib.argument_validation as av
from business_objects.base import Base
from business_objects.dog.command_category import Command_Category
from business_objects.dog.command import Command
from business_objects.dog.dog import Dog
from business_objects.dog.obedience_level import Obedience_Level
from helpers.helper_app import Helper_App
# from models.model_view_store import Model_View_Store # circular
# from models.model_view_base import Model_View_Base
from forms.base import Form_Base
import lib.argument_validation as av
# external
from flask import Flask, render_template, request, flash, redirect, url_for, current_app
from flask_wtf import FlaskForm

2
lib/argument_validation.py
View File

@@ -7,7 +7,7 @@ Created on Thu Apr 27 12:33:59 2023
Argument Validation
"""
from dog_training.helpers.helper_app import Helper_App
from helpers.helper_app import Helper_App
from typing import Optional
def error_msg_str(v, v_name, method, v_type, suppress_errors = False, suppress_console_outputs = False, v_arg_type = 'argument'):

2
models/model_view_accessibility_report.py
View File

@@ -11,7 +11,7 @@ Data model for accessibility report view
"""
# internal
from dog_training.models.model_view_base import Model_View_Base
from models.model_view_base import Model_View_Base
# from routes import bp_home
# external

2
models/model_view_accessibility_statement.py
View File

@@ -11,7 +11,7 @@ Data model for accessibility statement view
"""
# internal
from dog_training.models.model_view_base import Model_View_Base
from models.model_view_base import Model_View_Base
# from routes import bp_home
# external

22
models/model_view_base.py
View File

@@ -17,17 +17,17 @@ Base data model for views
# IMPORTS
# internal
# from routes import bp_home
from dog_training.business_objects.base import Base
from dog_training.business_objects.dog.user import User
from dog_training.business_objects.dog.command import Command
from dog_training.business_objects.dog.command_category import Command_Category
from dog_training.business_objects.dog.dog import Dog
from dog_training.business_objects.dog.dog_command_link import Dog_Command_Link
from dog_training.datastores.datastore_base import DataStore_Base
from dog_training.datastores.datastore_dog import DataStore_Dog
from dog_training.datastores.datastore_user import DataStore_User
from dog_training.helpers.helper_app import Helper_App
import dog_training.lib.argument_validation as av
from business_objects.base import Base
from business_objects.dog.user import User
from business_objects.dog.command import Command
from business_objects.dog.command_category import Command_Category
from business_objects.dog.dog import Dog
from business_objects.dog.dog_command_link import Dog_Command_Link
from datastores.datastore_base import DataStore_Base
from datastores.datastore_dog import DataStore_Dog
from datastores.datastore_user import DataStore_User
from helpers.helper_app import Helper_App
import lib.argument_validation as av
# external
from abc import ABC, abstractmethod
from flask_sqlalchemy import SQLAlchemy

10
models/model_view_dog_base.py
View File

@@ -13,11 +13,11 @@ Parent data model for store views
# internal
# from context import models
from dog_training.business_objects.dog.dog import Dog, Parameters_Dog
from dog_training.datastores.datastore_dog import DataStore_Dog
from dog_training.helpers.helper_app import Helper_App
import dog_training.lib.argument_validation as av
from dog_training.models.model_view_base import Model_View_Base
from business_objects.dog.dog import Dog, Parameters_Dog
from datastores.datastore_dog import DataStore_Dog
from helpers.helper_app import Helper_App
import lib.argument_validation as av
from models.model_view_base import Model_View_Base
# external
from flask import send_file, jsonify
from flask_sqlalchemy import SQLAlchemy

12
models/model_view_dog_command.py
View File

@@ -11,13 +11,13 @@ Data model for store permutations view
"""
# internal
from dog_training.business_objects.dog.command import Command, Parameters_Command
from dog_training.datastores.datastore_dog import DataStore_Dog
from dog_training.models.model_view_dog_base import Model_View_Dog_Base
from dog_training.forms.dog.command import Filters_Command
from business_objects.dog.command import Command, Parameters_Command
from datastores.datastore_dog import DataStore_Dog
from models.model_view_dog_base import Model_View_Dog_Base
from forms.dog.command import Filters_Command
# from routes import bp_home
from dog_training.helpers.helper_app import Helper_App
import dog_training.lib.argument_validation as av
from helpers.helper_app import Helper_App
import lib.argument_validation as av
# external
from pydantic import BaseModel

14
models/model_view_dog_command_category.py
View File

@@ -11,14 +11,14 @@ Data model for store permutations view
"""
# internal
from dog_training.business_objects.dog.command import Parameters_Command
from dog_training.business_objects.dog.command_category import Command_Category
from dog_training.datastores.datastore_dog import DataStore_Dog
from dog_training.models.model_view_dog_base import Model_View_Dog_Base
from dog_training.forms.dog.command_category import Filters_Command_Category
from business_objects.dog.command import Parameters_Command
from business_objects.dog.command_category import Command_Category
from datastores.datastore_dog import DataStore_Dog
from models.model_view_dog_base import Model_View_Dog_Base
from forms.dog.command_category import Filters_Command_Category
# from routes import bp_home
from dog_training.helpers.helper_app import Helper_App
import dog_training.lib.argument_validation as av
from helpers.helper_app import Helper_App
import lib.argument_validation as av
# external
from pydantic import BaseModel

18
models/model_view_dog_dog_command_link.py
View File

@@ -11,16 +11,16 @@ Data model for store permutations view
"""
# internal
from dog_training.business_objects.dog.command import Command, Parameters_Command
from dog_training.business_objects.dog.dog import Dog, Parameters_Dog
from dog_training.business_objects.dog.dog_command_link import Dog_Command_Link, Parameters_Dog_Command_Link
from dog_training.business_objects.dog.obedience_level import Obedience_Level
from dog_training.datastores.datastore_dog import DataStore_Dog
from dog_training.models.model_view_dog_base import Model_View_Dog_Base
from dog_training.forms.dog.dog_command_link import Filters_Dog_Command_Link
from business_objects.dog.command import Command, Parameters_Command
from business_objects.dog.dog import Dog, Parameters_Dog
from business_objects.dog.dog_command_link import Dog_Command_Link, Parameters_Dog_Command_Link
from business_objects.dog.obedience_level import Obedience_Level
from datastores.datastore_dog import DataStore_Dog
from models.model_view_dog_base import Model_View_Dog_Base
from forms.dog.dog_command_link import Filters_Dog_Command_Link
# from routes import bp_home
from dog_training.helpers.helper_app import Helper_App
import dog_training.lib.argument_validation as av
from helpers.helper_app import Helper_App
import lib.argument_validation as av
# external
from pydantic import BaseModel

2
models/model_view_home.py
View File

@@ -11,7 +11,7 @@ Data model for home view
"""
# internal
from dog_training.models.model_view_base import Model_View_Base
from models.model_view_base import Model_View_Base
# from routes import bp_home
# external

2
models/model_view_license.py
View File

@@ -11,7 +11,7 @@ Data model for license view
"""
# internal
from dog_training.models.model_view_base import Model_View_Base
from models.model_view_base import Model_View_Base
# from routes import bp_home
# external

2
models/model_view_privacy_policy.py
View File

@@ -11,7 +11,7 @@ Data model for privacy policy view
"""
# internal
from dog_training.models.model_view_base import Model_View_Base
from models.model_view_base import Model_View_Base
# from routes import bp_home
# external

2
models/model_view_retention_schedule.py
View File

@@ -11,7 +11,7 @@ Data model for retention schedule view
"""
# internal
from dog_training.models.model_view_base import Model_View_Base
from models.model_view_base import Model_View_Base
# from routes import bp_home
# external

54
routes.py
View File

@@ -1,54 +0,0 @@
"""
Project: PARTS Website
Author: Edward Middleton-Smith
Precision And Research Technology Systems Limited
Technology: Backend
Feature: Controller - Webpage routing
Description:
Defines the routes and view functions for each page.
Manages the interaction between the frontend and backend.
"""
from flask import render_template, url_for, Blueprint
from app import app
from app.forms import Form_Contact
# from dog_training.forms import MyForm
# from app import MyForm
from model_view_contact import Model_View_Contact
"""
@app.route('/', methods=['GET'])
def home():
return render_template('_home.html', title='Home')
@app.route('/store', methods=['GET'])
def store_home():
return render_template('_store_home.html', title='Store Home')
@app.route('/contact', methods=['GET', 'POST'])
def contact():
form = Form_Contact()
if form.validate_on_submit():
# Handle form submission
email = form.sender_email.data
CC = form.sender_CC.data
name = form.sender_name.data
msg = form.sender_message.data
# return render_template('contact.html', form=form)
# return render_template('_contact.html', title='Contact Us')
return render_template('contact.html', model=Model_View_Contact(form))
@app.route('/about')
def about():
return render_template('about.html')
@app.route('/contact', methods=['GET', 'POST'])
def contact():
form = MyForm()
if form.validate_on_submit():
# Handle form submission
pass
return render_template('contact.html', form=form)
"""