Feat(SQL, UI): Button Icons page, Command Button Links page created with get and set functionality.

app.py

@@ -17,7 +17,9 @@ Initializes the Flask application, sets the configuration based on the environme
 # IMPORTS
 # internal
 from config import app_config, Config
+from controllers.dog.button_icon import routes_dog_button_icon
 from controllers.dog.command import routes_dog_command
+from controllers.dog.command_button_link import routes_dog_command_button_link
 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
@@ -118,8 +120,11 @@ app.register_blueprint(routes_core_home)
 app.register_blueprint(routes_dog)
 app.register_blueprint(routes_dog_command)
 app.register_blueprint(routes_dog_command_category)
-app.register_blueprint(routes_dog_home)
 app.register_blueprint(routes_dog_dog_command_link)
+app.register_blueprint(routes_dog_home)
+app.register_blueprint(routes_dog_location)
+app.register_blueprint(routes_dog_button_icon)
+app.register_blueprint(routes_dog_command_button_link)
 app.register_blueprint(routes_legal)
 app.register_blueprint(routes_user)
 

business_objects/base.py

@@ -58,6 +58,7 @@ class Base():
     FLAG_NAME_SINGULAR: ClassVar[str] = 'name_singular'
     FLAG_NAME_PLURAL: ClassVar[str] = 'name_plural'
     FLAG_NOTES: ClassVar[str] = "notes"
+    FLAG_PATH: ClassVar[str] = 'path'
     FLAG_PHONE_NUMBER: ClassVar[str] = 'phone_number'
     FLAG_POSTCODE: ClassVar[str] = 'postcode'
     FLAG_PRIORITY: ClassVar[str] = 'priority'

business_objects/dog/button_icon.py

@@ -0,0 +1,258 @@
+"""
+Project:    PARTS Website
+Author:     Edward Middleton-Smith
+            Precision And Research Technology Systems Limited
+
+Technology: Business Objects
+Feature:    Button_Icon Business Object
+"""
+
+# internal
+from business_objects.base import Base
+from business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base
+from business_objects.dog.image import Image
+import lib.argument_validation as av
+from extensions import db
+from forms.dog.button_icon import Filters_Button_Icon
+from helpers.helper_app import Helper_App
+# external
+from dataclasses import dataclass
+from typing import ClassVar
+
+
+class Button_Icon(SQLAlchemy_ABC, Base):
+    ATTR_ID_BUTTON_ICON: ClassVar[str] = 'id_button_icon'
+    FLAG_BUTTON_ICON: ClassVar[str] = 'button_icon'
+    NAME_ATTR_OPTION_VALUE: ClassVar[str] = ATTR_ID_BUTTON_ICON
+    NAME_ATTR_OPTION_TEXT: ClassVar[str] = Base.FLAG_NAME
+
+    __tablename__ = 'DOG_Button_Icon'
+    __table_args__ = { 'extend_existing': True }
+
+    id_button_icon = db.Column(db.Integer, primary_key=True)
+    id_image = db.Column(db.Integer)
+    code = db.Column(db.String(250))
+    name = db.Column(db.String(250))
+    notes = db.Column(db.Text)
+    active = db.Column(db.Boolean)
+    created_on = db.Column(db.DateTime)
+    
+    def __init__(self):
+        self.id_button_icon = 0
+        self.image = None
+        self.is_new = False
+        super().__init__()
+        
+    @classmethod
+    def from_db_button_icon(cls, query_row):
+        _m = f'{cls.__qualname__}.from_db_button_icon'
+        button_icon = cls()
+        button_icon.id_button_icon = query_row[0]
+        button_icon.id_image = query_row[1]
+        button_icon.code = query_row[4]
+        button_icon.name = query_row[5]
+        button_icon.notes = query_row[6]
+        button_icon.active = av.input_bool(query_row[7], 'active', _m)
+        # button_icon.created_on = query_row[7]
+        button_icon.image = Image.from_db_button_icon(query_row)
+        return button_icon
+        
+    @classmethod
+    def from_db_command_button_link(cls, query_row):
+        _m = f'{cls.__qualname__}.from_db_command_button_link'
+        button_icon = cls()
+        button_icon.id_button_icon = query_row[0]
+        button_icon.name = query_row[4]
+        button_icon.active = True
+        button_icon.image = Image.from_db_command_button_link(query_row)
+        return button_icon
+    
+    @classmethod
+    def from_json(cls, json):
+        _m = f'{cls.__qualname__}.from_json'
+        button_icon = cls()
+        if json is None: return button_icon
+        # Helper_App.console_log(f'{_m}\njson: {json}')
+        button_icon.id_button_icon = json.get(Button_Icon.ATTR_ID_BUTTON_ICON, -1)
+        button_icon.id_image = json[Image.FLAG_IMAGE]
+        button_icon.name = json[cls.FLAG_NAME]
+        button_icon.code = json.get(cls.FLAG_CODE, button_icon.name.upper().replace(" ", "_"))
+        button_icon.notes = json[cls.FLAG_NOTES]
+        button_icon.active = json[cls.FLAG_ACTIVE]
+        button_icon.created_on = json.get(cls.FLAG_CREATED_ON, None)
+        # Helper_App.console_log(f'Button_Icon: {button_icon}')
+        return button_icon
+    
+    def to_json(self):
+        as_json = {
+            **self.get_shared_json_attributes(self)
+            , self.ATTR_ID_BUTTON_ICON: self.id_button_icon
+            , Image.FLAG_IMAGE: self.id_image
+            , self.FLAG_CODE: self.code
+            , self.FLAG_NAME: self.name
+            , self.FLAG_NOTES: self.notes
+            , self.FLAG_ACTIVE: self.active
+            , self.FLAG_CREATED_ON: self.created_on
+        }
+        # Helper_App.console_log(f'as_json: {as_json}')
+        return as_json
+        
+    def __repr__(self):
+        return f'''
+{self.__class__.__name__}(
+    {self.FLAG_BUTTON_ICON}: {self.id_button_icon}
+    {Image.FLAG_IMAGE}: {self.id_image}
+    {self.FLAG_CODE}: {self.code}
+    {self.FLAG_NAME}: {self.name}
+    {self.FLAG_NOTES}: {self.notes}
+    {self.FLAG_ACTIVE}: {self.active}
+    {self.FLAG_CREATED_ON}: {self.created_on}
+)
+            '''
+
+class Button_Icon_Temp(db.Model, Base):
+    __tablename__ = 'DOG_Button_Icon_Temp'
+    __table_args__ = { 'extend_existing': True }
+    id_temp = db.Column(db.Integer, primary_key=True)
+    id_button_icon = db.Column(db.Integer)
+    id_image = db.Column(db.Integer)
+    code = db.Column(db.String(250))
+    name = db.Column(db.String(250))
+    notes = db.Column(db.Text)
+    active = db.Column(db.Boolean)
+    # created_on = db.Column(db.DateTime)
+    guid: str = db.Column(db.String(36))
+
+    def __init__(self):
+        super().__init__()
+
+    @classmethod
+    def from_button_icon(cls, button_icon):
+        _m = 'Button_Icon_Temp.from_button_icon'
+        temp = cls()
+        temp.id_button_icon = button_icon.id_button_icon
+        temp.id_image = button_icon.id_image
+        temp.code = button_icon.code
+        temp.name = button_icon.name
+        temp.notes = button_icon.notes
+        temp.active = button_icon.active
+        # temp.created_on = button_icon.created_on
+        return temp
+
+    def __repr__(self):
+        return f'''
+{self.__class__.__name__}(
+    {Button_Icon.FLAG_BUTTON_ICON}: {self.id_button_icon}
+    {Image.FLAG_IMAGE}: {self.id_image}
+    {self.FLAG_CODE}: {self.code}
+    {self.FLAG_NAME}: {self.name}
+    {self.FLAG_NOTES}: {self.notes}
+    {self.FLAG_ACTIVE}: {self.active}
+)
+            '''
+
+class Parameters_Button_Icon(Get_Many_Parameters_Base):
+    get_all_file_type: bool
+    get_inactive_file_type: bool
+    ids_file_type: str
+    names_file_type: str
+    get_all_image: bool
+    get_inactive_image: bool
+    ids_image: str
+    names_image: str
+    get_all_button_icon: bool
+    get_inactive_button_icon: bool
+    ids_button_icon: str
+    names_button_icon: str
+    notes_button_icon: str
+    require_all_id_search_filters_met: bool
+    require_any_id_search_filters_met: bool
+    require_all_non_id_search_filters_met: bool
+    require_any_non_id_search_filters_met: bool
+    
+    @classmethod
+    def get_default(cls):
+        return cls(
+              get_all_file_type = True
+            , get_inactive_file_type = False
+            , ids_file_type = ''
+            , names_file_type = ''
+            , get_all_image = True
+            , get_inactive_image = False
+            , ids_image = ''
+            , names_image = ''
+            , get_all_button_icon = True
+            , get_inactive_button_icon = False
+            , ids_button_icon = ''
+            , names_button_icon = ''
+            , notes_button_icon = ''
+            , require_all_id_search_filters_met = True
+            , require_any_id_search_filters_met = True
+            , require_all_non_id_search_filters_met = False
+            , require_any_non_id_search_filters_met = True
+        )
+    
+    @classmethod
+    def from_json(cls, json):
+        return cls(
+              get_all_file_type = json.get('a_get_all_file_type', False)
+            , get_inactive_file_type = json.get('a_get_inactive_file_type', False)
+            , ids_file_type = json.get('a_ids_file_type', '')
+            , names_file_type = json.get('a_names_file_type', '')
+            , get_all_image = json.get('a_get_all_image', False)
+            , get_inactive_image = json.get('a_get_inactive_image', False)
+            , ids_image = json.get('a_ids_image', '')
+            , names_image = json.get('a_names_image', '')
+            , get_all_button_icon = json.get('a_get_all_button_icon', False)
+            , get_inactive_button_icon = json.get('a_get_inactive_button_icon', False)
+            , ids_button_icon = json.get('a_ids_button_icon', '')
+            , names_button_icon = json.get('a_names_button_icon', '')
+            , notes_button_icon = json.get('a_notes_button_icon', '')
+            , require_all_id_search_filters_met = json.get('a_require_all_id_search_filters_met', True)
+            , require_any_id_search_filters_met = json.get('a_require_any_id_search_filters_met', True)
+            , require_all_non_id_search_filters_met = json.get('a_require_all_non_id_search_filters_met', False)
+            , require_any_non_id_search_filters_met = json.get('a_require_any_non_id_search_filters_met', True)
+        )
+    
+    @classmethod
+    def from_form_filters_button_icon(cls, form):
+        av.val_instance(form, 'form', 'Parameters_Button_Icon.from_form_filters_button_icon', Filters_Button_Icon)
+        has_filter_search_text = not (form.search.data == '' or form.search.data is None)
+        active_only = av.input_bool(form.active_only.data, "active", "Parameters_Button_Icon.from_form_filters_button_icon")
+        filters = cls.get_default()
+        filters.get_all_file_type = True
+        filters.get_inactive_file_type = not active_only
+        filters.ids_file_type = ''
+        filters.names_file_type = form.search.data if has_filter_search_text else ''
+        filters.get_all_image = True
+        filters.get_inactive_image = not active_only
+        filters.ids_image = ''
+        filters.names_image = form.search.data if has_filter_search_text else ''
+        filters.get_all_button_icon = True
+        filters.get_inactive_button_icon = not active_only
+        filters.ids_button_icon = ''
+        filters.names_button_icon = form.search.data if has_filter_search_text else ''
+        filters.notes_button_icon = form.search.data if has_filter_search_text else ''
+        return filters
+
+    def to_json(self):
+        return {
+              'a_get_all_file_type': self.get_all_file_type
+            , 'a_get_inactive_file_type': self.get_inactive_file_type
+            , 'a_ids_file_type': self.ids_file_type
+            , 'a_names_file_type': self.names_file_type
+            , 'a_get_all_image': self.get_all_image
+            , 'a_get_inactive_image': self.get_inactive_image
+            , 'a_ids_image': self.ids_image
+            , 'a_names_image': self.names_image
+            , 'a_get_all_button_icon': self.get_all_button_icon
+            , 'a_get_inactive_button_icon': self.get_inactive_button_icon
+            , 'a_ids_button_icon': self.ids_button_icon
+            , 'a_names_button_icon': self.names_button_icon
+            , 'a_notes_button_icon': self.notes_button_icon
+            , 'a_require_all_id_search_filters_met': self.require_all_id_search_filters_met
+            , 'a_require_any_id_search_filters_met': self.require_any_id_search_filters_met
+            , 'a_require_all_non_id_search_filters_met': self.require_all_non_id_search_filters_met
+            , 'a_require_any_non_id_search_filters_met': self.require_any_non_id_search_filters_met
+        }
+

business_objects/dog/button_shape.py

@@ -0,0 +1,207 @@
+"""
+Project:    PARTS Website
+Author:     Edward Middleton-Smith
+            Precision And Research Technology Systems Limited
+
+Technology: Business Objects
+Feature:    Button Shape Business Object
+"""
+
+# internal
+from business_objects.base import Base
+from business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base
+from business_objects.dog.image import Image
+import lib.argument_validation as av
+from extensions import db
+# from forms.dog.button_shape import Filters_Button_Shape
+from helpers.helper_app import Helper_App
+# external
+from dataclasses import dataclass
+from typing import ClassVar
+
+
+class Button_Shape(SQLAlchemy_ABC, Base):
+    ATTR_ID_BUTTON_SHAPE: ClassVar[str] = 'id_button_shape'
+    FLAG_BUTTON_SHAPE: ClassVar[str] = 'button_shape'
+    NAME_ATTR_OPTION_VALUE: ClassVar[str] = ATTR_ID_BUTTON_SHAPE
+    NAME_ATTR_OPTION_TEXT: ClassVar[str] = Base.FLAG_NAME
+
+    __tablename__ = 'DOG_Button_Shape'
+    __table_args__ = { 'extend_existing': True }
+
+    id_button_shape = db.Column(db.Integer, primary_key=True)
+    code = db.Column(db.String(250))
+    name = db.Column(db.String(250))
+    notes = db.Column(db.Text)
+    active = db.Column(db.Boolean)
+    created_on = db.Column(db.DateTime)
+    
+    def __init__(self):
+        self.id_button_shape = 0
+        self.is_new = False
+        super().__init__()
+        
+    @classmethod
+    def from_db_button_shape(cls, query_row):
+        _m = f'{cls.__qualname__}.from_db_button_shape'
+        button_shape = cls()
+        button_shape.id_button_shape = query_row[0]
+        button_shape.code = query_row[1]
+        button_shape.name = query_row[2]
+        button_shape.notes = query_row[3]
+        button_shape.active = av.input_bool(query_row[4], 'active', _m)
+        return button_shape
+        
+    @classmethod
+    def from_db_command_button_link(cls, query_row):
+        _m = f'{cls.__qualname__}.from_db_command_button_link'
+        button_shape = cls()
+        button_shape.id_button_shape = query_row[5]
+        button_shape.name = query_row[6]
+        button_shape.active = True
+        return button_shape
+    
+    @classmethod
+    def from_json(cls, json):
+        _m = f'{cls.__qualname__}.from_json'
+        button_shape = cls()
+        if json is None: return button_shape
+        # Helper_App.console_log(f'{_m}\njson: {json}')
+        button_shape.id_button_shape = json.get(Button_Shape.ATTR_ID_BUTTON_SHAPE, -1)
+        button_shape.name = json[cls.FLAG_NAME]
+        button_shape.code = json.get(cls.FLAG_CODE, button_shape.name.upper().replace(" ", "_"))
+        button_shape.notes = json[cls.FLAG_NOTES]
+        button_shape.active = json[cls.FLAG_ACTIVE]
+        button_shape.created_on = json.get(cls.FLAG_CREATED_ON, None)
+        # Helper_App.console_log(f'Button_Shape: {button_shape}')
+        return button_shape
+    
+    def to_json(self):
+        as_json = {
+            **self.get_shared_json_attributes(self)
+            , self.ATTR_ID_BUTTON_SHAPE: self.id_button_shape
+            , self.FLAG_CODE: self.code
+            , self.FLAG_NAME: self.name
+            , self.FLAG_NOTES: self.notes
+            , self.FLAG_ACTIVE: self.active
+            , self.FLAG_CREATED_ON: self.created_on
+        }
+        # Helper_App.console_log(f'as_json: {as_json}')
+        return as_json
+        
+    def __repr__(self):
+        return f'''
+{self.__class__.__name__}(
+    {self.FLAG_BUTTON_SHAPE}: {self.id_button_shape}
+    {self.FLAG_CODE}: {self.code}
+    {self.FLAG_NAME}: {self.name}
+    {self.FLAG_NOTES}: {self.notes}
+    {self.FLAG_ACTIVE}: {self.active}
+    {self.FLAG_CREATED_ON}: {self.created_on}
+)
+            '''
+
+class Button_Shape_Temp(db.Model, Base):
+    __tablename__ = 'DOG_Button_Shape_Temp'
+    __table_args__ = { 'extend_existing': True }
+    id_temp = db.Column(db.Integer, primary_key=True)
+    id_button_shape = db.Column(db.Integer)
+    code = db.Column(db.String(250))
+    name = db.Column(db.String(250))
+    notes = db.Column(db.Text)
+    active = db.Column(db.Boolean)
+    # created_on = db.Column(db.DateTime)
+    guid: str = db.Column(db.String(36))
+
+    def __init__(self):
+        super().__init__()
+
+    @classmethod
+    def from_button_shape(cls, button_shape):
+        _m = 'Button_Shape_Temp.from_button_shape'
+        temp = cls()
+        temp.id_button_shape = button_shape.id_button_shape
+        temp.code = button_shape.code
+        temp.name = button_shape.name
+        temp.notes = button_shape.notes
+        temp.active = button_shape.active
+        # temp.created_on = button_shape.created_on
+        return temp
+
+    def __repr__(self):
+        return f'''
+{self.__class__.__name__}(
+    {Button_Shape.FLAG_BUTTON_SHAPE}: {self.id_button_shape}
+    {self.FLAG_CODE}: {self.code}
+    {self.FLAG_NAME}: {self.name}
+    {self.FLAG_NOTES}: {self.notes}
+    {self.FLAG_ACTIVE}: {self.active}
+)
+            '''
+
+class Parameters_Button_Shape(Get_Many_Parameters_Base):
+    get_all_button_shape: bool
+    get_inactive_button_shape: bool
+    ids_button_shape: str
+    names_button_shape: str
+    notes_button_shape: str
+    require_all_id_search_filters_met: bool
+    require_any_id_search_filters_met: bool
+    require_all_non_id_search_filters_met: bool
+    require_any_non_id_search_filters_met: bool
+    
+    @classmethod
+    def get_default(cls):
+        return cls(
+              get_all_button_shape = True
+            , get_inactive_button_shape = False
+            , ids_button_shape = ''
+            , names_button_shape = ''
+            , notes_button_shape = ''
+            , require_all_id_search_filters_met = True
+            , require_any_id_search_filters_met = True
+            , require_all_non_id_search_filters_met = False
+            , require_any_non_id_search_filters_met = True
+        )
+    
+    @classmethod
+    def from_json(cls, json):
+        return cls(
+              get_all_button_shape = json.get('a_get_all_button_shape', False)
+            , get_inactive_button_shape = json.get('a_get_inactive_button_shape', False)
+            , ids_button_shape = json.get('a_ids_button_shape', '')
+            , names_button_shape = json.get('a_names_button_shape', '')
+            , notes_button_shape = json.get('a_notes_button_shape', '')
+            , require_all_id_search_filters_met = json.get('a_require_all_id_search_filters_met', True)
+            , require_any_id_search_filters_met = json.get('a_require_any_id_search_filters_met', True)
+            , require_all_non_id_search_filters_met = json.get('a_require_all_non_id_search_filters_met', False)
+            , require_any_non_id_search_filters_met = json.get('a_require_any_non_id_search_filters_met', True)
+        )
+    
+    """
+    @classmethod
+    def from_form_filters_button_shape(cls, form):
+        av.val_instance(form, 'form', 'Parameters_Button_Shape.from_form_filters_button_shape', Filters_Button_Shape)
+        has_filter_search_text = not (form.search.data == '' or form.search.data is None)
+        active_only = av.input_bool(form.active_only.data, "active", "Parameters_Button_Shape.from_form_filters_button_shape")
+        filters = cls.get_default()
+        filters.get_all_button_shape = True
+        filters.get_inactive_button_shape = not active_only
+        filters.ids_button_shape = ''
+        filters.names_button_shape = form.search.data if has_filter_search_text else ''
+        filters.notes_button_shape = form.search.data if has_filter_search_text else ''
+        return filters
+    """
+
+    def to_json(self):
+        return {
+              'a_get_all_button_shape': self.get_all_button_shape
+            , 'a_get_inactive_button_shape': self.get_inactive_button_shape
+            , 'a_ids_button_shape': self.ids_button_shape
+            , 'a_names_button_shape': self.names_button_shape
+            , 'a_notes_button_shape': self.notes_button_shape
+            , 'a_require_all_id_search_filters_met': self.require_all_id_search_filters_met
+            , 'a_require_any_id_search_filters_met': self.require_any_id_search_filters_met
+            , 'a_require_all_non_id_search_filters_met': self.require_all_non_id_search_filters_met
+            , 'a_require_any_non_id_search_filters_met': self.require_any_non_id_search_filters_met
+        }

business_objects/dog/colour.py

@@ -0,0 +1,193 @@
+"""
+Project:    PARTS Website
+Author:     Edward Middleton-Smith
+            Precision And Research Technology Systems Limited
+
+Technology: Business Objects
+Feature:    Colour Business Object
+"""
+
+# internal
+from business_objects.base import Base
+from business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base
+from business_objects.dog.image import Image
+import lib.argument_validation as av
+from extensions import db
+# from forms.dog.colour import Filters_Colour
+from helpers.helper_app import Helper_App
+# external
+from dataclasses import dataclass
+from typing import ClassVar
+
+
+class Colour(SQLAlchemy_ABC, Base):
+    ATTR_ID_COLOUR: ClassVar[str] = 'id_colour'
+    FLAG_COLOUR: ClassVar[str] = 'colour'
+    NAME_ATTR_OPTION_VALUE: ClassVar[str] = ATTR_ID_COLOUR
+    NAME_ATTR_OPTION_TEXT: ClassVar[str] = Base.FLAG_NAME
+
+    __tablename__ = 'DOG_Colour'
+    __table_args__ = { 'extend_existing': True }
+
+    id_colour = db.Column(db.Integer, primary_key=True)
+    code = db.Column(db.String(250))
+    name = db.Column(db.String(250))
+    active = db.Column(db.Boolean)
+    created_on = db.Column(db.DateTime)
+    
+    def __init__(self):
+        self.id_colour = 0
+        self.is_new = False
+        super().__init__()
+        
+    @classmethod
+    def from_db_colour(cls, query_row):
+        _m = f'{cls.__qualname__}.from_db_colour'
+        colour = cls()
+        colour.id_colour = query_row[0]
+        colour.code = query_row[1]
+        colour.name = query_row[2]
+        colour.active = av.input_bool(query_row[3], 'active', _m)
+        return colour
+        
+    @classmethod
+    def from_db_command_button_link(cls, query_row):
+        _m = f'{cls.__qualname__}.from_db_command_button_link'
+        colour = cls()
+        colour.id_colour = query_row[7]
+        colour.name = query_row[8]
+        colour.active = True
+        return colour
+    
+    @classmethod
+    def from_json(cls, json):
+        _m = f'{cls.__qualname__}.from_json'
+        colour = cls()
+        if json is None: return colour
+        # Helper_App.console_log(f'{_m}\njson: {json}')
+        colour.id_colour = json.get(Colour.ATTR_ID_COLOUR, -1)
+        colour.name = json[cls.FLAG_NAME]
+        colour.code = json.get(cls.FLAG_CODE, colour.name.upper().replace(" ", "_"))
+        colour.active = json[cls.FLAG_ACTIVE]
+        colour.created_on = json.get(cls.FLAG_CREATED_ON, None)
+        # Helper_App.console_log(f'Colour: {colour}')
+        return colour
+    
+    def to_json(self):
+        as_json = {
+            **self.get_shared_json_attributes(self)
+            , self.ATTR_ID_COLOUR: self.id_colour
+            , self.FLAG_CODE: self.code
+            , self.FLAG_NAME: self.name
+            , self.FLAG_ACTIVE: self.active
+            , self.FLAG_CREATED_ON: self.created_on
+        }
+        # Helper_App.console_log(f'as_json: {as_json}')
+        return as_json
+        
+    def __repr__(self):
+        return f'''
+{self.__class__.__name__}(
+    {self.FLAG_COLOUR}: {self.id_colour}
+    {self.FLAG_CODE}: {self.code}
+    {self.FLAG_NAME}: {self.name}
+    {self.FLAG_ACTIVE}: {self.active}
+    {self.FLAG_CREATED_ON}: {self.created_on}
+)
+            '''
+
+class Colour_Temp(db.Model, Base):
+    __tablename__ = 'DOG_Colour_Temp'
+    __table_args__ = { 'extend_existing': True }
+    id_temp = db.Column(db.Integer, primary_key=True)
+    id_colour = db.Column(db.Integer)
+    code = db.Column(db.String(250))
+    name = db.Column(db.String(250))
+    active = db.Column(db.Boolean)
+    # created_on = db.Column(db.DateTime)
+    guid: str = db.Column(db.String(36))
+
+    def __init__(self):
+        super().__init__()
+
+    @classmethod
+    def from_colour(cls, colour):
+        _m = 'Colour_Temp.from_colour'
+        temp = cls()
+        temp.id_colour = colour.id_colour
+        temp.code = colour.code
+        temp.name = colour.name
+        temp.active = colour.active
+        # temp.created_on = colour.created_on
+        return temp
+
+    def __repr__(self):
+        return f'''
+{self.__class__.__name__}(
+    {Colour.FLAG_COLOUR}: {self.id_colour}
+    {self.FLAG_CODE}: {self.code}
+    {self.FLAG_NAME}: {self.name}
+    {self.FLAG_ACTIVE}: {self.active}
+)
+            '''
+
+class Parameters_Colour(Get_Many_Parameters_Base):
+    get_all_colour: bool
+    get_inactive_colour: bool
+    ids_colour: str
+    names_colour: str
+    require_all_id_search_filters_met: bool
+    require_any_id_search_filters_met: bool
+    require_all_non_id_search_filters_met: bool
+    require_any_non_id_search_filters_met: bool
+    
+    @classmethod
+    def get_default(cls):
+        return cls(
+              get_all_colour = True
+            , get_inactive_colour = False
+            , ids_colour = ''
+            , names_colour = ''
+            , require_all_id_search_filters_met = True
+            , require_any_id_search_filters_met = True
+            , require_all_non_id_search_filters_met = False
+            , require_any_non_id_search_filters_met = True
+        )
+    
+    @classmethod
+    def from_json(cls, json):
+        return cls(
+              get_all_colour = json.get('a_get_all_colour', False)
+            , get_inactive_colour = json.get('a_get_inactive_colour', False)
+            , ids_colour = json.get('a_ids_colour', '')
+            , names_colour = json.get('a_names_colour', '')
+            , require_all_id_search_filters_met = json.get('a_require_all_id_search_filters_met', True)
+            , require_any_id_search_filters_met = json.get('a_require_any_id_search_filters_met', True)
+            , require_all_non_id_search_filters_met = json.get('a_require_all_non_id_search_filters_met', False)
+            , require_any_non_id_search_filters_met = json.get('a_require_any_non_id_search_filters_met', True)
+        )
+    """
+    @classmethod
+    def from_form_filters_colour(cls, form):
+        av.val_instance(form, 'form', 'Parameters_Colour.from_form_filters_colour', Filters_Colour)
+        has_filter_search_text = not (form.search.data == '' or form.search.data is None)
+        active_only = av.input_bool(form.active_only.data, "active", "Parameters_Colour.from_form_filters_colour")
+        filters = cls.get_default()
+        filters.get_all_colour = True
+        filters.get_inactive_colour = not active_only
+        filters.ids_colour = ''
+        filters.names_colour = form.search.data if has_filter_search_text else ''
+        return filters
+    """
+
+    def to_json(self):
+        return {
+              'a_get_all_colour': self.get_all_colour
+            , 'a_get_inactive_colour': self.get_inactive_colour
+            , 'a_ids_colour': self.ids_colour
+            , 'a_names_colour': self.names_colour
+            , 'a_require_all_id_search_filters_met': self.require_all_id_search_filters_met
+            , 'a_require_any_id_search_filters_met': self.require_any_id_search_filters_met
+            , 'a_require_all_non_id_search_filters_met': self.require_all_non_id_search_filters_met
+            , 'a_require_any_non_id_search_filters_met': self.require_any_non_id_search_filters_met
+        }

business_objects/dog/command.py

@@ -79,6 +79,16 @@ class Command(SQLAlchemy_ABC, Base):
         # command.created_on = query_row[7]
         command.command_category = Command_Category.from_db_dog_command_link(query_row) # this is done in datastore get many method using category dictionary
         return command
+        
+    @classmethod
+    def from_db_command_button_link(cls, query_row):
+        _m = f'{cls.__qualname__}.from_db_command_button_link'
+        command = cls()
+        command.id_command = query_row[3]
+        command.name = query_row[4]
+        command.active = True
+        command.command_category = Command_Category.from_db_command_button_link(query_row)
+        return command
     
     @classmethod
     def from_json(cls, json):
@@ -86,7 +96,7 @@ class Command(SQLAlchemy_ABC, Base):
         command = cls()
         if json is None: return command
         # Helper_App.console_log(f'{_m}\njson: {json}')
-        command.id_command = -1
+        command.id_command = json.get(Command.ATTR_ID_COMMAND, -1)
         command.id_command_category = json[Command_Category.ATTR_ID_COMMAND_CATEGORY]
         command.name = json[cls.FLAG_NAME]
         command.hand_signal_default_description = json[cls.FLAG_HAND_SIGNAL_DEFAULT_DESCRIPTION]

business_objects/dog/command_button_link.py

@@ -0,0 +1,412 @@
+"""
+Project:    PARTS Website
+Author:     Edward Middleton-Smith
+            Precision And Research Technology Systems Limited
+
+Technology: Business Objects
+Feature:    Dog Command Link Business Object
+"""
+
+# internal
+from business_objects.base import Base
+from business_objects.dog.button_icon import Button_Icon
+from business_objects.dog.button_shape import Button_Shape
+from business_objects.dog.colour import Colour
+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.location import Location
+from business_objects.dog.obedience_level import Obedience_Level
+from extensions import db
+from forms.dog.command_button_link import Filters_Command_Button_Link
+from helpers.helper_app import Helper_App
+import lib.argument_validation as av
+# external
+from dataclasses import dataclass
+from typing import ClassVar
+
+
+class Command_Button_Link(SQLAlchemy_ABC, Base):
+    ATTR_ID_COMMAND_BUTTON_LINK: ClassVar[str] = 'id_link'
+    FLAG_COMMAND_BUTTON_LINK: ClassVar[str] = 'command_button_link'
+    NAME_ATTR_OPTION_VALUE: ClassVar[str] = ATTR_ID_COMMAND_BUTTON_LINK
+    NAME_ATTR_OPTION_TEXT: ClassVar[str] = ATTR_ID_COMMAND_BUTTON_LINK
+
+    __tablename__ = 'DOG_Command_Button_Link'
+    __table_args__ = { 'extend_existing': True }
+
+    id_link = db.Column(db.Integer, primary_key=True)
+    id_command = db.Column(db.Integer)
+    id_button_shape = db.Column(db.Integer)
+    id_button_colour = db.Column(db.Integer)
+    id_button_icon = db.Column(db.Integer)
+    id_location = db.Column(db.Integer)
+    active = db.Column(db.Boolean)
+    created_on = db.Column(db.DateTime)
+    
+    def __init__(self):
+        self.id_link = 0
+        self.is_new = False
+        self.command = None
+        self.button_shape = None
+        self.colour = None
+        self.button_icon = None
+        self.location = None
+        super().__init__()
+        
+    @classmethod
+    def from_db_command_button_link(cls, query_row):
+        _m = 'Command_Button_Link.from_db_command_button_link'
+        command_button_link = cls()
+        command_button_link.id_link = query_row[0]
+        command_button_link.id_command = query_row[3]
+        command_button_link.id_button_shape = query_row[5]
+        command_button_link.id_button_colour = query_row[7]
+        command_button_link.id_button_icon = query_row[9]
+        command_button_link.id_location = query_row[14]
+        command_button_link.active = av.input_bool(query_row[16], 'active', _m)
+        # command_button_link.created_on = query_row[7]
+        command_button_link.command = Command.from_db_command_button_link(query_row)
+        command_button_link.button_shape = Button_Shape.from_db_command_button_link(query_row)
+        command_button_link.colour = Colour.from_db_command_button_link(query_row)
+        command_button_link.button_icon = Button_Icon.from_db_command_button_link(query_row)
+        command_button_link.location = Location.from_db_command_button_link(query_row)
+        return command_button_link
+    
+    @classmethod
+    def from_json(cls, json):
+        _m = 'Command_Button_Link.from_json'
+        command_button_link = cls()
+        if json is None: return command_button_link
+        # Helper_App.console_log(f'{_m}\njson: {json}')
+        command_button_link.id_link = json.get(Command_Button_Link.ATTR_ID_COMMAND_BUTTON_LINK, -1)
+        command_button_link.id_command = json[Command.FLAG_COMMAND]
+        command_button_link.id_button_shape = json[Button_Shape.FLAG_BUTTON_SHAPE]
+        command_button_link.id_button_colour = json[Colour.FLAG_COLOUR]
+        command_button_link.id_button_icon = json[Button_Icon.FLAG_BUTTON_ICON]
+        command_button_link.id_location = json[Location.FLAG_LOCATION]
+        command_button_link.active = json[cls.FLAG_ACTIVE]
+        command_button_link.created_on = json.get(cls.FLAG_CREATED_ON, None)
+        # command_button_link.id_command_category = json[Command_Category.FLAG_COMMAND_CATEGORY]
+        # Helper_App.console_log(f'Dog Command Link: {command_button_link}')
+        return command_button_link
+    
+    def to_json(self):
+        as_json = {
+            **self.get_shared_json_attributes(self)
+            , self.ATTR_ID_COMMAND_BUTTON_LINK: self.id_link
+            , Command.FLAG_COMMAND: self.id_command
+            , Button_Shape.FLAG_BUTTON_SHAPE: self.id_button_shape
+            , Colour.FLAG_COLOUR: self.id_button_colour
+            , Button_Icon.FLAG_BUTTON_ICON: self.id_button_icon
+            , Location.FLAG_LOCATION: self.id_location
+            , self.FLAG_ACTIVE: self.active
+            , self.FLAG_CREATED_ON: self.created_on
+        }
+        #   , Command_Category.FLAG_COMMAND_CATEGORY: self.id_command_category
+        # Helper_App.console_log(f'as_json: {as_json}')
+        return as_json
+        
+    def __repr__(self):
+        return f'''
+{self.__class__.__name__}(
+    {self.FLAG_COMMAND_BUTTON_LINK}: {self.id_link}
+    {Command.FLAG_COMMAND}: {self.command}
+    {Button_Shape.FLAG_BUTTON_SHAPE}: {self.button_shape}
+    {Colour.FLAG_COLOUR}: {self.colour}
+    {Button_Icon.FLAG_BUTTON_ICON}: {self.button_icon}
+    {Location.FLAG_LOCATION}: {self.location}
+    {self.FLAG_ACTIVE}: {self.active}
+    {self.FLAG_CREATED_ON}: {self.created_on}
+)
+            '''
+#   {Command_Category.FLAG_COMMAND_CATEGORY}: {self.id_command_category}
+
+class Command_Button_Link_Temp(db.Model, Base):
+    __tablename__ = 'DOG_Command_Button_Link_Temp'
+    __table_args__ = { 'extend_existing': True }
+    id_temp = db.Column(db.Integer, primary_key=True)
+    id_link = db.Column(db.Integer)
+    id_command = db.Column(db.Integer)
+    id_button_shape = db.Column(db.Integer)
+    id_button_colour = db.Column(db.Integer)
+    id_button_icon = db.Column(db.Integer)
+    id_location = db.Column(db.Integer)
+    active = db.Column(db.Boolean)
+    # created_on = db.Column(db.DateTime)
+    guid: str = db.Column(db.String(36))
+
+    def __init__(self):
+        super().__init__()
+
+    @classmethod
+    def from_command_button_link(cls, command_button_link):
+        _m = 'Command_Button_Link_Temp.from_command_button_link'
+        temp = cls()
+        temp.id_link = command_button_link.id_link
+        temp.id_command = command_button_link.id_command
+        temp.id_button_shape = command_button_link.id_button_shape
+        temp.id_button_colour = command_button_link.id_button_colour
+        temp.id_button_icon = command_button_link.id_button_icon
+        temp.id_location = command_button_link.id_location
+        temp.active = command_button_link.active
+        # temp.created_on = command_button_link.created_on
+        return temp
+
+
+class Parameters_Command_Button_Link(Get_Many_Parameters_Base):
+    get_all_link: bool
+    get_inactive_link: bool
+    ids_link: str
+    get_all_command_category: bool
+    get_inactive_command_category: bool
+    ids_command_category: str
+    names_command_category: str
+    get_all_command: bool
+    get_inactive_command: bool
+    ids_command: str
+    names_command: str
+    hand_signal_default_descriptions_command: str
+    notes_command: str
+    get_all_button_shape: bool
+    get_inactive_button_shape: bool
+    ids_button_shape: str
+    names_button_shape: str
+    notes_button_shape: str
+    get_all_colour: bool
+    get_inactive_colour: bool
+    ids_colour: str
+    names_colour: str
+    get_all_file_type: bool
+    get_inactive_file_type: bool
+    ids_file_type: str
+    names_file_type: str
+    get_all_image: bool
+    get_inactive_image: bool
+    ids_image: str
+    names_image: str
+    get_all_button_icon: bool
+    get_inactive_button_icon: bool
+    ids_button_icon: str
+    names_button_icon: str
+    notes_button_icon: str
+    get_all_location: bool
+    get_inactive_location: bool
+    ids_location: str
+    names_location: str
+    require_all_id_search_filters_met: bool
+    require_any_id_search_filters_met: bool
+    require_all_non_id_search_filters_met: bool
+    require_any_non_id_search_filters_met: bool
+    
+    @classmethod
+    def get_default(cls):
+        return cls(
+              get_all_link = True
+            , get_inactive_link = False
+            , ids_link = ''
+            , get_all_command_category = True
+            , get_inactive_command_category = False
+            , ids_command_category = ''
+            , names_command_category = ''
+            , get_all_command = True
+            , get_inactive_command = False
+            , ids_command = ''
+            , names_command = ''
+            , hand_signal_default_descriptions_command = ''
+            , notes_command = ''
+            , get_all_button_shape = True
+            , get_inactive_button_shape = False
+            , ids_button_shape = ''
+            , names_button_shape = ''
+            , notes_button_shape = ''
+            , get_all_colour = True
+            , get_inactive_colour = False
+            , ids_colour = ''
+            , names_colour = ''
+            , get_all_file_type = True
+            , get_inactive_file_type = False
+            , ids_file_type = ''
+            , names_file_type = ''
+            , get_all_image = True
+            , get_inactive_image = False
+            , ids_image = ''
+            , names_image = ''
+            , get_all_button_icon = True
+            , get_inactive_button_icon = False
+            , ids_button_icon = ''
+            , names_button_icon = ''
+            , notes_button_icon = ''
+            , get_all_location = True
+            , get_inactive_location = False
+            , ids_location = ''
+            , names_location = ''
+            , require_all_id_search_filters_met = True
+            , require_any_id_search_filters_met = True
+            , require_all_non_id_search_filters_met = False
+            , require_any_non_id_search_filters_met = True
+        )
+    
+    @classmethod
+    def from_json(cls, json):
+        return cls(
+              get_all_link = json.get('a_get_all_link', False)
+            , get_inactive_link = json.get('a_get_inactive_link', False)
+            , ids_link = json.get('a_ids_link', '')
+            , get_all_command_category = json.get('a_get_all_command_category', False)
+            , get_inactive_command_category = json.get('a_get_inactive_command_category', False)
+            , ids_command_category = json.get('a_ids_command_category', '')
+            , names_command_category = json.get('a_names_command_category', '')
+            , get_all_command = json.get('a_get_all_command', False)
+            , get_inactive_command = json.get('a_get_inactive_command', False)
+            , ids_command = json.get('a_ids_command', '')
+            , names_command = json.get('a_names_command', '')
+            , hand_signal_default_descriptions_command = json.get('a_hand_signal_default_descriptions_command', '')
+            , notes_command = json.get('a_notes_command', '')
+            , get_all_button_shape = json.get('a_get_all_button_shape', False)
+            , get_inactive_button_shape = json.get('a_get_inactive_button_shape', False)
+            , ids_button_shape = json.get('a_ids_button_shape', '')
+            , names_button_shape = json.get('a_names_button_shape', '')
+            , notes_button_shape = json.get('a_notes_button_shape', '')
+            , get_all_colour = json.get('a_get_all_colour', False)
+            , get_inactive_colour = json.get('a_get_inactive_colour', False)
+            , ids_colour = json.get('a_ids_colour', '')
+            , names_colour = json.get('a_names_colour', '')
+            , get_all_file_type = json.get('a_get_all_file_type', False)
+            , get_inactive_file_type = json.get('a_get_inactive_file_type', False)
+            , ids_file_type = json.get('a_ids_file_type', '')
+            , names_file_type = json.get('a_names_file_type', '')
+            , get_all_image = json.get('a_get_all_image', False)
+            , get_inactive_image = json.get('a_get_inactive_image', False)
+            , ids_image = json.get('a_ids_image', '')
+            , names_image = json.get('a_names_image', '')
+            , get_all_button_icon = json.get('a_get_all_button_icon', False)
+            , get_inactive_button_icon = json.get('a_get_inactive_button_icon', False)
+            , ids_button_icon = json.get('a_ids_button_icon', '')
+            , names_button_icon = json.get('a_names_button_icon', '')
+            , notes_button_icon = json.get('a_notes_button_icon', '')
+            , get_all_location = json.get('a_get_all_location', False)
+            , get_inactive_location = json.get('a_get_inactive_location', False)
+            , ids_location = json.get('a_ids_location', '')
+            , names_location = json.get('a_names_location', '')
+            , require_all_id_search_filters_met = json.get('a_require_all_id_search_filters_met', True)
+            , require_any_id_search_filters_met = json.get('a_require_any_id_search_filters_met', True)
+            , require_all_non_id_search_filters_met = json.get('a_require_all_non_id_search_filters_met', False)
+            , require_any_non_id_search_filters_met = json.get('a_require_any_non_id_search_filters_met', True)
+        )
+    
+    @classmethod
+    def from_form_filters_command_button_link(cls, form):
+        _m = f'{cls.__qualname__}.from_form_filters_command_button_link'
+        Helper_App.console_log(_m)
+        Helper_App.console_log(f'Filters: {form}')
+        av.val_instance(form, 'form', _m, Filters_Command_Button_Link)
+        has_filter_search_text = not (form.search.data == '' or form.search.data is None)
+        has_filter_command_category = not (form.id_command_category.data == '0' or form.id_command_category.data == '' or form.id_command_category.data is None)
+        has_filter_command = not (form.id_command.data == '0' or form.id_command.data == '' or form.id_command.data is None)
+        has_filter_button_shape = not (form.id_button_shape.data == '0' or form.id_button_shape.data == '' or form.id_button_shape.data is None)
+        has_filter_colour = not (form.id_colour.data == '0' or form.id_colour.data == '' or form.id_colour.data is None)
+        has_filter_button_icon = not (form.id_button_icon.data == '0' or form.id_button_icon.data == '' or form.id_button_icon.data is None)
+        has_filter_location = not (form.id_location.data == '0' or form.id_location.data == '' or form.id_location.data is None)
+        active_only = av.input_bool(form.active_only.data, "active", _m)
+        Helper_App.console_log(f'''
+has_filter_search_text: {has_filter_search_text}
+has_filter_command_category: {has_filter_command_category}
+has_filter_command: {has_filter_command}
+has_filter_button_shape: {has_filter_button_shape}
+has_filter_colour: {has_filter_colour}
+has_filter_button_icon: {has_filter_button_icon}
+has_filter_location: {has_filter_location}
+active_only: {active_only}
+''')
+        filters = cls.get_default()
+        filters.get_all_link = True
+        filters.get_inactive_link = not active_only
+        filters.ids_link = ''
+        filters.get_all_command_category = not has_filter_command_category
+        filters.get_inactive_command_category = not active_only
+        filters.ids_command_category = form.id_command_category.data if has_filter_command_category else ''
+        filters.names_command_category = form.search.data if has_filter_search_text else ''
+        filters.get_all_command = not has_filter_command
+        filters.get_inactive_command = not active_only
+        filters.ids_command = form.id_command.data if has_filter_command else ''
+        filters.names_command = form.search.data if has_filter_search_text else ''
+        filters.hand_signal_default_descriptions_command = form.search.data if has_filter_search_text else ''
+        filters.notes_command = form.search.data if has_filter_search_text else ''
+        filters.get_all_button_shape = not has_filter_button_shape
+        filters.get_inactive_button_shape = not active_only
+        filters.ids_button_shape = form.id_button_shape.data if has_filter_button_shape else ''
+        filters.names_button_shape = form.search.data if has_filter_search_text else ''
+        filters.notes_button_shape = form.search.data if has_filter_search_text else ''
+        filters.get_all_colour = not has_filter_colour
+        filters.get_inactive_colour = not active_only
+        filters.ids_colour = form.id_colour.data if has_filter_colour else ''
+        filters.names_colour = form.search.data if has_filter_search_text else ''
+        filters.get_all_file_type = True
+        filters.get_inactive_file_type = False
+        filters.ids_file_type = ''
+        filters.names_file_type = ''
+        filters.get_all_image = True
+        filters.get_inactive_image = False
+        filters.ids_image = ''
+        filters.names_image = ''
+        filters.get_all_button_icon = not has_filter_button_icon
+        filters.get_inactive_button_icon = not active_only
+        filters.ids_button_icon = form.id_button_icon.data if has_filter_button_icon else ''
+        filters.names_button_icon = form.search.data if has_filter_search_text else ''
+        filters.notes_button_icon = form.search.data if has_filter_search_text else ''
+        filters.get_all_location = not has_filter_location
+        filters.get_inactive_location = not active_only
+        filters.ids_location = form.id_location.data if has_filter_location else ''
+        filters.names_location = form.search.data if has_filter_search_text else ''
+        return filters
+
+    def to_json(self):
+        return {
+              'a_get_all_link': self.get_all_link
+            , 'a_get_inactive_link': self.get_inactive_link
+            , 'a_ids_link': self.ids_link
+            , 'a_get_all_command_category': self.get_all_command_category
+            , 'a_get_inactive_command_category': self.get_inactive_command_category
+            , 'a_ids_command_category': self.ids_command_category
+            , 'a_names_command_category': self.names_command_category
+            , 'a_get_all_command': self.get_all_command
+            , 'a_get_inactive_command': self.get_inactive_command
+            , 'a_ids_command': self.ids_command
+            , 'a_names_command': self.names_command
+            , 'a_hand_signal_default_descriptions_command': self.hand_signal_default_descriptions_command
+            , 'a_notes_command': self.notes_command
+            , 'a_get_all_button_shape': self.get_all_button_shape
+            , 'a_get_inactive_button_shape': self.get_inactive_button_shape
+            , 'a_ids_button_shape': self.ids_button_shape
+            , 'a_names_button_shape': self.names_button_shape
+            , 'a_notes_button_shape': self.notes_button_shape
+            , 'a_get_all_colour': self.get_all_colour
+            , 'a_get_inactive_colour': self.get_inactive_colour
+            , 'a_ids_colour': self.ids_colour
+            , 'a_names_colour': self.names_colour
+            , 'a_get_all_file_type': self.get_all_file_type
+            , 'a_get_inactive_file_type': self.get_inactive_file_type
+            , 'a_ids_file_type': self.ids_file_type
+            , 'a_names_file_type': self.names_file_type
+            , 'a_get_all_image': self.get_all_image
+            , 'a_get_inactive_image': self.get_inactive_image
+            , 'a_ids_image': self.ids_image
+            , 'a_names_image': self.names_image
+            , 'a_get_all_button_icon': self.get_all_button_icon
+            , 'a_get_inactive_button_icon': self.get_inactive_button_icon
+            , 'a_ids_button_icon': self.ids_button_icon
+            , 'a_names_button_icon': self.names_button_icon
+            , 'a_notes_button_icon': self.notes_button_icon
+            , 'a_get_all_location': self.get_all_location
+            , 'a_get_inactive_location': self.get_inactive_location
+            , 'a_ids_location': self.ids_location
+            , 'a_names_location': self.names_location
+            , 'a_require_all_id_search_filters_met': self.require_all_id_search_filters_met
+            , 'a_require_any_id_search_filters_met': self.require_any_id_search_filters_met
+            , 'a_require_all_non_id_search_filters_met': self.require_all_non_id_search_filters_met
+            , 'a_require_any_non_id_search_filters_met': self.require_any_non_id_search_filters_met
+        }
+
+

business_objects/dog/command_category.py

@@ -28,7 +28,7 @@ class Command_Category(SQLAlchemy_ABC, Base):
     __table_args__ = { 'extend_existing': True }
 
     id_command_category = db.Column(db.Integer, primary_key=True)
-    code = db.Column(db.String(100))
+    code = db.Column(db.String(250))
     name = db.Column(db.String(250))
     active = db.Column(db.Boolean)
     
@@ -57,6 +57,15 @@ class Command_Category(SQLAlchemy_ABC, Base):
         level.name = query_row[4]
         level.active = True
         return level
+        
+    @classmethod
+    def from_db_command_button_link(cls, query_row):
+        _m = f'{cls.__qualname__}.from_db_command_button_link'
+        level = cls()
+        level.id_command_category = query_row[1]
+        level.name = query_row[2]
+        level.active = True
+        return level
     
     @classmethod
     def from_json(cls, json):
@@ -65,8 +74,8 @@ class Command_Category(SQLAlchemy_ABC, Base):
         if json is None: return Command_Category
         # Helper_App.console_log(f'{_m}\njson: {json}')
         command_category.id_command_category = json.get(cls.ATTR_ID_COMMAND_CATEGORY, -1)
-        command_category.code = json[cls.FLAG_CODE]
         command_category.name = json[cls.FLAG_NAME]
+        command_category.code = json.get(cls.FLAG_CODE, command_category.name.upper().replace(" ", "_"))
         command_category.active = json[cls.FLAG_ACTIVE]
         # Helper_App.console_log(f'Command_Category: {command_category}')
         return command_category
@@ -99,7 +108,7 @@ class Command_Category_Temp(db.Model, Base):
     __table_args__ = { 'extend_existing': True }
     id_temp = db.Column(db.Integer, primary_key=True)
     id_command_category = db.Column(db.Integer)
-    # code = db.Column(db.String(100))
+    # code = db.Column(db.String(250))
     name = db.Column(db.String(250))
     active = db.Column(db.Boolean)
     guid: str = db.Column(db.String(36))

business_objects/dog/deprecated/DEPRECATED - understanding_level.py

@@ -27,7 +27,7 @@ class Understanding_Level(SQLAlchemy_ABC, Base):
     __table_args__ = { 'extend_existing': True }
 
     id_understanding_level = db.Column(db.Integer, primary_key=True)
-    code = db.Column(db.String(100))
+    code = db.Column(db.String(250))
     name = db.Column(db.String(250))
     active = db.Column(db.Boolean)
     
@@ -85,7 +85,7 @@ class Understanding_Level_Temp(db.Model, Base):
     __table_args__ = { 'extend_existing': True }
     id_temp = db.Column(db.Integer, primary_key=True)
     id_understanding_level = db.Column(db.Integer)
-    code = db.Column(db.String(100))
+    code = db.Column(db.String(250))
     name = db.Column(db.String(250))
     active = db.Column(db.Boolean)
     guid: str = db.Column(db.String(36))

business_objects/dog/dog.py

@@ -74,7 +74,7 @@ class Dog(SQLAlchemy_ABC, Base):
         dog = cls()
         if json is None: return Dog
         # Helper_App.console_log(f'{_m}\njson: {json}')
-        dog.id_dog = -1
+        dog.id_dog = json.get(Dog.ATTR_ID_DOG, -1)
         dog.name = json[cls.FLAG_NAME]
         dog.appearance = json[cls.FLAG_APPEARANCE]
         dog.mass_kg = json[cls.FLAG_MASS_KG]

business_objects/dog/dog_command_link.py

@@ -70,7 +70,7 @@ class Dog_Command_Link(SQLAlchemy_ABC, Base):
         dog_command_link = cls()
         if json is None: return dog_command_link
         # Helper_App.console_log(f'{_m}\njson: {json}')
-        dog_command_link.id_link = -1
+        dog_command_link.id_link = json.get(Dog_Command_Link.ATTR_ID_DOG_COMMAND_LINK, -1)
         dog_command_link.id_dog = json[Dog.ATTR_ID_DOG]
         dog_command_link.id_command = json[Command.ATTR_ID_COMMAND]
         dog_command_link.hand_signal_description = json[cls.FLAG_HAND_SIGNAL_DESCRIPTION]

business_objects/dog/image.py

@@ -0,0 +1,240 @@
+"""
+Project:    PARTS Website
+Author:     Edward Middleton-Smith
+            Precision And Research Technology Systems Limited
+
+Technology: Business Objects
+Feature:    Image Business Object
+"""
+
+# internal
+from business_objects.base import Base
+from business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base
+from business_objects.file_type import File_Type
+from business_objects.dog.dog import Dog
+import lib.argument_validation as av
+from extensions import db
+# from forms.dog.image import Filters_Image
+from helpers.helper_app import Helper_App
+# external
+from dataclasses import dataclass
+from typing import ClassVar
+
+
+class Image(SQLAlchemy_ABC, Base):
+    ATTR_ID_IMAGE: ClassVar[str] = 'id_image'
+    FLAG_IMAGE: ClassVar[str] = 'image'
+    NAME_ATTR_OPTION_VALUE: ClassVar[str] = ATTR_ID_IMAGE
+    NAME_ATTR_OPTION_TEXT: ClassVar[str] = Base.FLAG_NAME
+
+    __tablename__ = 'DOG_Image'
+    __table_args__ = { 'extend_existing': True }
+
+    id_image = db.Column(db.Integer, primary_key=True)
+    id_file_type = db.Column(db.Integer)
+    id_dog = db.Column(db.Integer)
+    path = db.Column(db.String(1024))
+    name = db.Column(db.String(1024))
+    active = db.Column(db.Boolean)
+    created_on = db.Column(db.DateTime)
+    
+    def __init__(self):
+        self.id_image = 0
+        self.is_new = False
+        super().__init__()
+        
+    """
+    @classmethod
+    def from_db_image(cls, query_row):
+        _m = f'{cls.__qualname__}.from_db_image'
+        image = cls()
+        image.id_image = query_row[0]
+        image.code = query_row[3]
+        image.name = query_row[4]
+        image.active = av.input_bool(query_row[5], 'active', _m)
+        # image.created_on = query_row[7]
+        return image
+    """
+    @classmethod
+    def from_db_button_icon(cls, query_row):
+        _m = f'{cls.__qualname__}.from_db_button_icon'
+        image = cls()
+        image.id_image = query_row[1]
+        image.path = query_row[2]
+        image.name = query_row[3]
+        image.active = True
+        return image
+    @classmethod
+    def from_db_command_button_link(cls, query_row):
+        _m = f'{cls.__qualname__}.from_db_command_button_link'
+        image = cls()
+        image.id_image = query_row[11]
+        image.path = query_row[12]
+        image.name = query_row[13]
+        image.active = True
+        return image
+    
+    @classmethod
+    def from_json(cls, json):
+        _m = f'{cls.__qualname__}.from_json'
+        image = cls()
+        if json is None: return image
+        # Helper_App.console_log(f'{_m}\njson: {json}')
+        image.id_image = json.get(Image.ATTR_ID_IMAGE, -1)
+        image.id_file_type = json[File_Type.FLAG_FILE_TYPE]
+        image.id_dog = json[Dog.FLAG_DOG]
+        image.path = json[cls.FLAG_PATH]
+        image.name = json[cls.FLAG_NAME]
+        image.active = json[cls.FLAG_ACTIVE]
+        image.created_on = json.get(cls.FLAG_CREATED_ON, None)
+        # Helper_App.console_log(f'Image: {image}')
+        return image
+    
+    def to_json(self):
+        as_json = {
+            **self.get_shared_json_attributes(self)
+            , self.ATTR_ID_IMAGE: self.id_image
+            , self.FLAG_CODE: self.code
+            , self.FLAG_NAME: self.name
+            , self.FLAG_ACTIVE: self.active
+            , self.FLAG_CREATED_ON: self.created_on
+        }
+        # Helper_App.console_log(f'as_json: {as_json}')
+        return as_json
+        
+    def __repr__(self):
+        return f'''
+{self.__class__.__name__}(
+    {self.FLAG_IMAGE}: {self.id_image}
+    {self.FLAG_CODE}: {self.code}
+    {self.FLAG_NAME}: {self.name}
+    {self.FLAG_ACTIVE}: {self.active}
+    {self.FLAG_CREATED_ON}: {self.created_on}
+)
+            '''
+
+class Image_Temp(db.Model, Base):
+    __tablename__ = 'DOG_Image_Temp'
+    __table_args__ = { 'extend_existing': True }
+    id_temp = db.Column(db.Integer, primary_key=True)
+    id_image = db.Column(db.Integer)
+    code = db.Column(db.String(250))
+    name = db.Column(db.String(250))
+    active = db.Column(db.Boolean)
+    # created_on = db.Column(db.DateTime)
+    guid: str = db.Column(db.String(36))
+
+    def __init__(self):
+        super().__init__()
+
+    @classmethod
+    def from_image(cls, image):
+        _m = 'Image_Temp.from_image'
+        temp = cls()
+        temp.id_image = image.id_image
+        temp.id_image = image.id_image
+        temp.code = image.code
+        temp.name = image.name
+        temp.active = image.active
+        # temp.created_on = image.created_on
+        return temp
+
+    def __repr__(self):
+        return f'''
+{self.__class__.__name__}(
+    {Image.FLAG_IMAGE}: {self.id_image}
+    {Image.FLAG_IMAGE}: {self.id_image}
+    {self.FLAG_CODE}: {self.code}
+    {self.FLAG_NAME}: {self.name}
+    {self.FLAG_ACTIVE}: {self.active}
+)
+            '''
+
+class Parameters_Image(Get_Many_Parameters_Base):
+    get_all_file_type: bool
+    get_inactive_file_type: bool
+    ids_file_type: str
+    names_file_type: str
+    get_all_dog: bool
+    get_inactive_dog: bool
+    ids_dog: str
+    names_dog: str
+    get_all_image: bool
+    get_inactive_image: bool
+    ids_image: str
+    names_image: str
+    require_all_id_search_filters_met: bool
+    require_any_id_search_filters_met: bool
+    require_all_non_id_search_filters_met: bool
+    require_any_non_id_search_filters_met: bool
+    
+    @classmethod
+    def get_default(cls):
+        return cls(
+              get_all_file_type = True
+            , get_inactive_file_type = False
+            , ids_file_type = ''
+            , names_file_type = ''
+            , get_all_dog = True
+            , get_inactive_dog = False
+            , ids_dog = ''
+            , names_dog = ''
+            , get_all_image = True
+            , get_inactive_image = False
+            , ids_image = ''
+            , names_image = ''
+            , require_all_id_search_filters_met = True
+            , require_any_id_search_filters_met = True
+            , require_all_non_id_search_filters_met = False
+            , require_any_non_id_search_filters_met = True
+        )
+    
+    @classmethod
+    def from_json(cls, json):
+        return cls(
+              get_all_file_type = json.get('a_get_all_file_type', False)
+            , get_inactive_file_type = json.get('a_get_inactive_file_type', False)
+            , ids_file_type = json.get('a_ids_file_type', '')
+            , names_file_type = json.get('a_names_file_type', '')
+            , get_all_dog = json.get('a_get_all_dog', False)
+            , get_inactive_dog = json.get('a_get_inactive_dog', False)
+            , ids_dog = json.get('a_ids_dog', '')
+            , names_dog = json.get('a_names_dog', '')
+            , get_all_image = json.get('a_get_all_image', False)
+            , get_inactive_image = json.get('a_get_inactive_image', False)
+            , ids_image = json.get('a_ids_image', '')
+            , names_image = json.get('a_names_image', '')
+            , require_all_id_search_filters_met = json.get('a_require_all_id_search_filters_met', True)
+            , require_any_id_search_filters_met = json.get('a_require_any_id_search_filters_met', True)
+            , require_all_non_id_search_filters_met = json.get('a_require_all_non_id_search_filters_met', False)
+            , require_any_non_id_search_filters_met = json.get('a_require_any_non_id_search_filters_met', True)
+        )
+    
+    """
+    @classmethod
+    def from_form_filters_image(cls, form):
+        av.val_instance(form, 'form', 'Parameters_Image.from_form_filters_image', Filters_Image)
+        has_filter_search_text = not (form.search.data == '' or form.search.data is None)
+        active_only = av.input_bool(form.active_only.data, "active", "Parameters_Image.from_form_filters_image")
+        filters = cls.get_default()
+        filters.get_all_image = True
+        filters.get_inactive_image = not active_only
+        filters.ids_image = ''
+        filters.names_image = form.search.data if has_filter_search_text else ''
+        return filters
+    """
+
+    def to_json(self):
+        return {
+              'a_get_all_image': self.get_all_image
+            , 'a_get_inactive_image': self.get_inactive_image
+            , 'a_ids_image': self.ids_image
+            , 'a_names_image': self.names_image
+            , 'a_require_all_id_search_filters_met': self.require_all_id_search_filters_met
+            , 'a_require_any_id_search_filters_met': self.require_any_id_search_filters_met
+            , 'a_require_all_non_id_search_filters_met': self.require_all_non_id_search_filters_met
+            , 'a_require_any_non_id_search_filters_met': self.require_any_non_id_search_filters_met
+            , 'a_output_images': self.output_images
+        }
+
+

business_objects/dog/location.py

@@ -9,12 +9,10 @@ Feature:    Location Business Object
 
 # internal
 from business_objects.base import Base
-from business_objects.dog.location_category import Location_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.location import Filters_Location
-from forms.dog.location_category import Filters_Location_Category
 from helpers.helper_app import Helper_App
 # external
 from dataclasses import dataclass
@@ -32,19 +30,16 @@ class Location(SQLAlchemy_ABC, Base):
     __table_args__ = { 'extend_existing': True }
 
     id_location = db.Column(db.Integer, primary_key=True)
-    id_location_category = db.Column(db.Integer)
+    id_location_parent = db.Column(db.Integer)
+    code = db.Column(db.String(250))
     name = db.Column(db.String(250))
-    hand_signal_default_description = db.Column(db.Text)
-    can_have_button = db.Column(db.Boolean)
-    notes = db.Column(db.Text)
     active = db.Column(db.Boolean)
     created_on = db.Column(db.DateTime)
     
     def __init__(self):
         self.id_location = 0
-        self.location_category = None
+        self.location_parent = None
         self.is_new = False
-        self.has_button = False
         super().__init__()
         
     @classmethod
@@ -52,31 +47,23 @@ class Location(SQLAlchemy_ABC, Base):
         _m = f'{cls.__qualname__}.from_db_location'
         location = cls()
         location.id_location = query_row[0]
-        location.id_location_category = query_row[1]
+        location.id_location_parent = query_row[1]
-        location.name = query_row[2]
+        location.code = query_row[3]
-        location.hand_signal_default_description = query_row[3]
+        location.name = query_row[4]
-        location.can_have_button = av.input_bool(query_row[4], 'can_have_button', _m)
+        location.active = av.input_bool(query_row[5], 'active', _m)
-        # location.has_button = av.input_bool(query_row[7], 'has_button', _m)
-        location.notes = query_row[5]
-        location.active = av.input_bool(query_row[6], 'active', _m)
         # location.created_on = query_row[7]
-        # location.location_category = Location_Category.from_db_location(query_row)
+        location.location_parent = cls()
+        location.location_parent.id_location = location.id_location_parent
+        location.location_parent.name = query_row[2]
         return location
         
     @classmethod
-    def from_db_dog_location_link(cls, query_row):
+    def from_db_command_button_link(cls, query_row):
-        _m = f'{cls.__qualname__}.from_db_dog_location_link'
+        _m = f'{cls.__qualname__}.from_db_command_button_link'
         location = cls()
-        location.id_location = query_row[5]
+        location.id_location = query_row[14]
-        location.id_location_category = query_row[3]
+        location.name = query_row[15]
-        location.name = query_row[6]
+        location.active = True
-        # location.hand_signal_default_description = query_row[2]
-        location.can_have_button = av.input_bool(query_row[8], 'can_have_button', _m)
-        # location.has_button = av.input_bool(query_row[7], 'has_button', _m)
-        # location.notes = query_row[4]
-        location.active = True # av.input_bool(True, 'active', _m)
-        # location.created_on = query_row[7]
-        location.location_category = Location_Category.from_db_dog_location_link(query_row) # this is done in datastore get many method using category dictionary
         return location
     
     @classmethod
@@ -85,12 +72,10 @@ class Location(SQLAlchemy_ABC, Base):
         location = cls()
         if json is None: return location
         # Helper_App.console_log(f'{_m}\njson: {json}')
-        location.id_location = -1
+        location.id_location = json.get(Location.ATTR_ID_LOCATION, -1)
-        location.id_location_category = json[Location_Category.ATTR_ID_LOCATION_CATEGORY]
+        location.id_location_parent = json[Location.FLAG_LOCATION_PARENT]
         location.name = json[cls.FLAG_NAME]
-        location.hand_signal_default_description = json[cls.FLAG_HAND_SIGNAL_DEFAULT_DESCRIPTION]
+        location.code = json.get(cls.FLAG_CODE, location.name.upper().replace(" ", "_"))
-        location.can_have_button = json[cls.FLAG_CAN_HAVE_BUTTON]
-        location.notes = json[cls.FLAG_NOTES]
         location.active = json[cls.FLAG_ACTIVE]
         location.created_on = json.get(cls.FLAG_CREATED_ON, None)
         # Helper_App.console_log(f'Location: {location}')
@@ -100,11 +85,9 @@ class Location(SQLAlchemy_ABC, Base):
         as_json = {
             **self.get_shared_json_attributes(self)
             , self.ATTR_ID_LOCATION: self.id_location
-            , Location_Category.ATTR_ID_LOCATION_CATEGORY: self.id_location_category
+            , Location.FLAG_LOCATION_PARENT: self.id_location_parent
+            , self.FLAG_CODE: self.code
             , self.FLAG_NAME: self.name
-            , self.FLAG_HAND_SIGNAL_DEFAULT_DESCRIPTION: self.hand_signal_default_description
-            , self.FLAG_CAN_HAVE_BUTTON: self.can_have_button
-            , self.FLAG_NOTES: self.notes
             , self.FLAG_ACTIVE: self.active
             , self.FLAG_CREATED_ON: self.created_on
         }
@@ -115,11 +98,9 @@ class Location(SQLAlchemy_ABC, Base):
         return f'''
 {self.__class__.__name__}(
     {self.FLAG_LOCATION}: {self.id_location}
-    {Location_Category.FLAG_LOCATION_CATEGORY}: {self.id_location_category}
+    {Location.FLAG_LOCATION_PARENT}: {self.id_location_parent}
+    {self.FLAG_CODE}: {self.code}
     {self.FLAG_NAME}: {self.name}
-    {self.FLAG_HAND_SIGNAL_DEFAULT_DESCRIPTION}: {self.hand_signal_default_description}
-    {self.FLAG_CAN_HAVE_BUTTON}: {self.can_have_button}
-    {self.FLAG_NOTES}: {self.notes}
     {self.FLAG_ACTIVE}: {self.active}
     {self.FLAG_CREATED_ON}: {self.created_on}
 )
@@ -130,13 +111,11 @@ class Location_Temp(db.Model, Base):
     __table_args__ = { 'extend_existing': True }
     id_temp = db.Column(db.Integer, primary_key=True)
     id_location = db.Column(db.Integer)
-    id_location_category = db.Column(db.Integer)
+    id_location_parent = db.Column(db.Integer)
+    code = db.Column(db.String(250))
     name = db.Column(db.String(250))
-    hand_signal_default_description = db.Column(db.Text)
-    can_have_button = db.Column(db.Boolean)
-    notes = db.Column(db.Text)
     active = db.Column(db.Boolean)
-    created_on = db.Column(db.DateTime)
+    # created_on = db.Column(db.DateTime)
     guid: str = db.Column(db.String(36))
 
     def __init__(self):
@@ -147,68 +126,56 @@ class Location_Temp(db.Model, Base):
         _m = 'Location_Temp.from_location'
         temp = cls()
         temp.id_location = location.id_location
-        temp.id_location_category = location.id_location_category
+        temp.id_location_parent = location.id_location_parent
+        temp.code = location.code
         temp.name = location.name
-        temp.hand_signal_default_description = location.hand_signal_default_description
-        temp.can_have_button = location.can_have_button
-        temp.notes = location.notes
         temp.active = location.active
-        temp.created_on = location.created_on
+        # temp.created_on = location.created_on
         return temp
 
+    def __repr__(self):
+        return f'''
+{self.__class__.__name__}(
+    {Location.FLAG_LOCATION}: {self.id_location}
+    {Location.FLAG_LOCATION_PARENT}: {self.id_location_parent}
+    {self.FLAG_CODE}: {self.code}
+    {self.FLAG_NAME}: {self.name}
+    {self.FLAG_ACTIVE}: {self.active}
+)
+            '''
 
 class Parameters_Location(Get_Many_Parameters_Base):
-    get_all_location_category: bool
-    get_inactive_location_category: bool
-    ids_location_category: str
-    names_location_category: str
     get_all_location: bool
     get_inactive_location: bool
     ids_location: str
     names_location: str
-    hand_signal_default_descriptions_location: str
-    notes_location: str
     require_all_id_search_filters_met: bool
     require_any_id_search_filters_met: bool
     require_all_non_id_search_filters_met: bool
     require_any_non_id_search_filters_met: bool
-    output_location_categories: bool
     output_locations: bool
     
     @classmethod
     def get_default(cls):
         return cls(
-              get_all_location_category = True
+              get_all_location = True
-            , get_inactive_location_category = False
-            , ids_location_category = ''
-            , names_location_category = ''
-            , get_all_location = True
             , get_inactive_location = False
             , ids_location = ''
             , names_location = ''
-            , hand_signal_default_descriptions_location = ''
-            , notes_location = ''
             , require_all_id_search_filters_met = True
             , require_any_id_search_filters_met = True
             , require_all_non_id_search_filters_met = False
             , require_any_non_id_search_filters_met = True
-            , output_location_categories = True
             , output_locations = True
         )
     
     @classmethod
     def from_json(cls, json):
         return cls(
-              get_all_location_category = json.get('a_get_all_location_category', False)
+              get_all_location = json.get('a_get_all_location', False)
-            , get_inactive_location_category = json.get('a_get_inactive_location_category', False)
-            , ids_location_category = json.get('a_ids_location_category', '')
-            , names_location_category = json.get('a_names_location_category', '')
-            , get_all_location = json.get('a_get_all_location', False)
             , get_inactive_location = json.get('a_get_inactive_location', False)
             , ids_location = json.get('a_ids_location', '')
             , names_location = json.get('a_names_location', '')
-            , hand_signal_default_descriptions_location = json.get('a_hand_signal_default_descriptions_location', '')
-            , notes_location = json.get('a_notes_location', '')
             , require_all_id_search_filters_met = json.get('a_require_all_id_search_filters_met', True)
             , require_any_id_search_filters_met = json.get('a_require_any_id_search_filters_met', True)
             , require_all_non_id_search_filters_met = json.get('a_require_all_non_id_search_filters_met', False)
@@ -221,54 +188,24 @@ class Parameters_Location(Get_Many_Parameters_Base):
     def from_form_filters_location(cls, form):
         av.val_instance(form, 'form', 'Parameters_Location.from_form_filters_location', Filters_Location)
         has_filter_search_text = not (form.search.data == '' or form.search.data is None)
-        has_filter_location_category = not (has_filter_search_text or form.id_location_category.data == '0' or form.id_location_category.data == '' or form.id_location_category.data is None)
         active_only = av.input_bool(form.active_only.data, "active", "Parameters_Location.from_form_filters_location")
         filters = cls.get_default()
-        filters.get_all_location_category = not has_filter_location_category
-        filters.get_inactive_location_category = not active_only
-        filters.ids_location_category = form.id_location_category.data if has_filter_location_category else ''
-        filters.names_location_category = form.search.data if has_filter_search_text else ''
         filters.get_all_location = True
         filters.get_inactive_location = not active_only
         filters.ids_location = ''
         filters.names_location = form.search.data if has_filter_search_text else ''
         return filters
 
-    @classmethod
-    def from_form_filters_location_category(cls, form):
-        av.val_instance(form, 'form', 'Parameters_Location.from_form_filters_location_category', Filters_Location_Category)
-        has_filter_search_text = not (form.search.data == '' or form.search.data is None)
-        active_only = av.input_bool(form.active_only.data, "active", "Parameters_Location.from_form_filters_location")
-        filters = cls.get_default()
-        filters.get_all_location_category = True
-        filters.get_inactive_location_category = not active_only
-        filters.ids_location_category = ''
-        filters.names_location_category = form.search.data if has_filter_search_text else ''
-        filters.get_all_location = False
-        filters.get_inactive_location = False
-        filters.ids_location = ''
-        filters.names_location = ''
-        filters.require_all_id_search_filters_met = False
-        filters.output_locations = False
-        return filters
-
     def to_json(self):
         return {
-              'a_get_all_location_category': self.get_all_location_category
+              'a_get_all_location': self.get_all_location
-            , 'a_get_inactive_location_category': self.get_inactive_location_category
-            , 'a_ids_location_category': self.ids_location_category
-            , 'a_names_location_category': self.names_location_category
-            , 'a_get_all_location': self.get_all_location
             , 'a_get_inactive_location': self.get_inactive_location
             , 'a_ids_location': self.ids_location
             , 'a_names_location': self.names_location
-            , 'a_hand_signal_default_descriptions_location': self.hand_signal_default_descriptions_location
-            , 'a_notes_location': self.notes_location
             , 'a_require_all_id_search_filters_met': self.require_all_id_search_filters_met
             , 'a_require_any_id_search_filters_met': self.require_any_id_search_filters_met
             , 'a_require_all_non_id_search_filters_met': self.require_all_non_id_search_filters_met
             , 'a_require_any_non_id_search_filters_met': self.require_any_non_id_search_filters_met
-            , 'a_output_location_categories': self.output_location_categories
             , 'a_output_locations': self.output_locations
         }
 

business_objects/dog/obedience_level.py

@@ -28,7 +28,7 @@ class Obedience_Level(SQLAlchemy_ABC, Base):
     __table_args__ = { 'extend_existing': True }
 
     id_obedience_level = db.Column(db.Integer, primary_key=True)
-    code = db.Column(db.String(100))
+    code = db.Column(db.String(250))
     name = db.Column(db.String(250))
     active = db.Column(db.Boolean)
     
@@ -53,7 +53,7 @@ class Obedience_Level(SQLAlchemy_ABC, Base):
         obedience_level = cls()
         if json is None: return Obedience_Level
         Helper_App.console_log(f'{_m}\njson: {json}')
-        obedience_level.id_obedience_level = -1
+        obedience_level.id_obedience_level = json.get(Obedience_Level.ATTR_ID_OBEDIENCE_LEVEL, -1)
         obedience_level.code = json[cls.FLAG_CODE]
         obedience_level.name = json[cls.FLAG_NAME]
         obedience_level.active = json[cls.FLAG_ACTIVE]
@@ -88,7 +88,7 @@ class Obedience_Level_Temp(db.Model, Base):
     __table_args__ = { 'extend_existing': True }
     id_temp = db.Column(db.Integer, primary_key=True)
     id_obedience_level = db.Column(db.Integer)
-    code = db.Column(db.String(100))
+    code = db.Column(db.String(250))
     name = db.Column(db.String(250))
     active = db.Column(db.Boolean)
     guid: str = db.Column(db.String(36))

business_objects/file_type.py

@@ -0,0 +1,116 @@
+"""
+Project:    PARTS Website
+Author:     Edward Middleton-Smith
+            Precision And Research Technology Systems Limited
+
+Technology: Business Objects
+Feature:    Command Category Business Object
+"""
+
+# internal
+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
+
+
+class File_Type(SQLAlchemy_ABC, Base):
+    ATTR_ID_FILE_TYPE: ClassVar[str] = 'id_file_type'
+    FLAG_FILE_TYPE: ClassVar[str] = 'command-category'
+    FLAG_IS_IMAGE: ClassVar[str] = 'is_image'
+    NAME_ATTR_OPTION_VALUE: ClassVar[str] = ATTR_ID_FILE_TYPE
+    NAME_ATTR_OPTION_TEXT: ClassVar[str] = Base.FLAG_NAME
+
+    __tablename__ = 'CORE_File_Type'
+    __table_args__ = { 'extend_existing': True }
+
+    id_file_type = db.Column(db.Integer, primary_key=True)
+    code = db.Column(db.String(250))
+    name = db.Column(db.String(250))
+    is_image = db.Column(db.Boolean)
+    active = db.Column(db.Boolean)
+    
+    def __init__(self):
+        self.id_file_type = 0
+        self.is_new = False
+        super().__init__()
+        
+    @classmethod
+    def from_db_file_type(cls, query_row):
+        _m = f'{cls.__qualname__}.from_db_command'
+        category = cls()
+        category.id_file_type = query_row[0]
+        category.code = query_row[1]
+        category.name = query_row[2]
+        category.is_image = av.input_bool(query_row[3], 'is_image', _m)
+        category.active = av.input_bool(query_row[4], 'active', _m)
+        # command.created_on = query_row[7]
+        return category
+    
+    @classmethod
+    def from_json(cls, json):
+        _m = 'File_Type.from_json'
+        file_type = cls()
+        if json is None: return File_Type
+        # Helper_App.console_log(f'{_m}\njson: {json}')
+        file_type.id_file_type = json.get(cls.ATTR_ID_FILE_TYPE, -1)
+        file_type.name = json[cls.FLAG_NAME]
+        file_type.code = json.get(cls.FLAG_CODE, file_type.name.upper().replace(" ", "_"))
+        file_type.is_image = json[cls.FLAG_IS_IMAGE]
+        file_type.active = json[cls.FLAG_ACTIVE]
+        # Helper_App.console_log(f'File_Type: {file_type}')
+        return file_type
+    
+    
+    def to_json(self):
+        as_json = {
+            **self.get_shared_json_attributes(self)
+            , self.ATTR_ID_FILE_TYPE: self.id_file_type
+            , self.FLAG_CODE: self.code
+            , self.FLAG_NAME: self.name
+            , self.FLAG_IS_IMAGE: self.is_image
+            , self.FLAG_ACTIVE: self.active
+        }
+        # Helper_App.console_log(f'as_json: {as_json}')
+        return as_json
+        
+    def __repr__(self):
+        return f'''
+{self.__class__.__name__}(
+    {self.FLAG_FILE_TYPE}: {self.id_file_type}
+    {self.FLAG_CODE}: {self.code}
+    {self.FLAG_NAME}: {self.name}
+    {self.FLAG_IS_IMAGE}: {self.is_image}
+    {self.FLAG_ACTIVE}: {self.active}
+)
+            '''
+
+
+class File_Type_Temp(db.Model, Base):
+    __tablename__ = 'CORE_File_Type_Temp'
+    __table_args__ = { 'extend_existing': True }
+    id_temp = db.Column(db.Integer, primary_key=True)
+    id_file_type = db.Column(db.Integer)
+    # code = db.Column(db.String(250))
+    name = db.Column(db.String(250))
+    is_image = db.Column(db.Boolean)
+    active = db.Column(db.Boolean)
+    guid: str = db.Column(db.String(36))
+
+    def __init__(self):
+        super().__init__()
+
+    @classmethod
+    def from_file_type(cls, file_type):
+        _m = 'File_Type_Temp.from_File_Type'
+        temp = cls()
+        temp.id_file_type = file_type.id_file_type
+        # temp.code = file_type.code
+        temp.name = file_type.name
+        temp.is_image = file_type.is_image
+        temp.active = file_type.active
+        return temp

controllers/dog/button_icon.py

@@ -0,0 +1,97 @@
+"""
+Project:    PARTS Website
+Author:     Edward Middleton-Smith
+            Precision And Research Technology Systems Limited
+
+Technology: App Routing
+Feature:    Dog - Button Icon Routes
+
+Description:
+Contact Page Controller.
+"""
+
+# IMPORTS
+# internal
+from business_objects.api import API
+from business_objects.dog.button_icon import Button_Icon
+from datastores.datastore_dog import DataStore_Dog
+from forms.dog.button_icon import Filters_Button_Icon
+from helpers.helper_app import Helper_App
+from models.model_view_dog_button_icon import Model_View_Dog_Button_Icon
+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 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_button_icon = Blueprint('routes_dog_button_icon', __name__)
+
+
+@routes_dog_button_icon.route(Model_View_Dog_Button_Icon.HASH_PAGE_DOG_BUTTON_ICONS, methods=['GET'])
+def button_icons():
+    Helper_App.console_log('button_icons')
+    Helper_App.console_log(f'request_args: {request.args}')
+    try:
+        form_filters = Filters_Button_Icon.from_json(request.args)
+    except Exception as e:
+        Helper_App.console_log(f'Error: {e}')
+        form_filters = Filters_Button_Icon()
+    Helper_App.console_log(f'form_filters={form_filters}')
+    model = Model_View_Dog_Button_Icon(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/_button_icons.html', model = model)
+
+@routes_dog_button_icon.route(Model_View_Dog_Button_Icon.HASH_SAVE_DOG_BUTTON_ICON, methods=['POST'])
+def save_button_icon():
+    data = Helper_App.get_request_data(request)
+    try:
+        form_filters = Filters_Button_Icon.from_json(data[Model_View_Dog_Button_Icon.FLAG_FORM_FILTERS])
+        if not form_filters.validate_on_submit():
+            return jsonify({
+                Model_View_Dog_Button_Icon.FLAG_STATUS: Model_View_Dog_Button_Icon.FLAG_FAILURE, 
+                Model_View_Dog_Button_Icon.FLAG_MESSAGE: f'Filters form invalid.\n{form_filters.errors}'
+            })
+        model_return = Model_View_Dog_Button_Icon(form_filters_old=form_filters)
+        if not model_return.is_user_logged_in:
+            raise Exception('User not logged in')
+        
+        button_icons = data[Model_View_Dog_Button_Icon.FLAG_BUTTON_ICON]
+        if len(button_icons) == 0:
+            return jsonify({
+                Model_View_Dog_Button_Icon.FLAG_STATUS: Model_View_Dog_Button_Icon.FLAG_FAILURE, 
+                Model_View_Dog_Button_Icon.FLAG_MESSAGE: f'No button icons.'
+            })
+        objs_button_icon = []
+        for button_icon in button_icons:
+            objs_button_icon.append(Button_Icon.from_json(button_icon))
+        Helper_App.console_log(f'objs_button_icon={objs_button_icon}')
+        errors = DataStore_Dog.save_button_icons(data.get('comment', 'No comment'), objs_button_icon)
+
+        if (len(errors) > 0):
+            return jsonify({
+                Model_View_Dog_Button_Icon.FLAG_STATUS: Model_View_Dog_Button_Icon.FLAG_FAILURE, 
+                Model_View_Dog_Button_Icon.FLAG_MESSAGE: f'Error saving button icons.\n{model_return.convert_list_objects_to_json(errors)}'
+            })
+        return jsonify({
+            Model_View_Dog_Button_Icon.FLAG_STATUS: Model_View_Dog_Button_Icon.FLAG_SUCCESS, 
+            Model_View_Dog_Button_Icon.FLAG_DATA: Model_View_Dog_Button_Icon.convert_list_objects_to_json(model_return.button_icons)
+        })
+    except Exception as e:
+        return jsonify({
+            Model_View_Dog_Button_Icon.FLAG_STATUS: Model_View_Dog_Button_Icon.FLAG_FAILURE, 
+            Model_View_Dog_Button_Icon.FLAG_MESSAGE: f'Bad data received by controller.\n{e}'
+        })

controllers/dog/command_button_link.py

@@ -0,0 +1,98 @@
+"""
+Project:    PARTS Website
+Author:     Edward Middleton-Smith
+            Precision And Research Technology Systems Limited
+
+Technology: App Routing
+Feature:    Dog - Dog Command Link Routes
+
+Description:
+Contact Page Controller.
+"""
+
+# IMPORTS
+# internal
+from business_objects.api import API
+from business_objects.dog.command import Command
+from business_objects.dog.command_button_link import Command_Button_Link
+from datastores.datastore_dog import DataStore_Dog
+from forms.dog.command_button_link import Filters_Command_Button_Link
+from helpers.helper_app import Helper_App
+from models.model_view_dog_command_button_link import Model_View_Dog_Command_Button_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 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_button_link = Blueprint('routes_dog_command_button_link', __name__)
+
+
+@routes_dog_command_button_link.route(Model_View_Dog_Command_Button_Link.HASH_PAGE_DOG_COMMAND_BUTTON_LINKS, methods=['GET'])
+def command_button_links():
+    Helper_App.console_log('command_button_links')
+    Helper_App.console_log(f'request_args: {request.args}')
+    try:
+        form_filters = Filters_Command_Button_Link.from_json(request.args)
+    except Exception as e:
+        Helper_App.console_log(f'Error: {e}')
+        form_filters = Filters_Command_Button_Link()
+    Helper_App.console_log(f'form_filters={form_filters}')
+    model = Model_View_Dog_Command_Button_Link(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_button_links.html', model = model)
+
+@routes_dog_command_button_link.route(Model_View_Dog_Command_Button_Link.HASH_SAVE_DOG_COMMAND_BUTTON_LINK, methods=['POST'])
+def save_command_button_link():
+    data = Helper_App.get_request_data(request)
+    try:
+        form_filters = Filters_Command_Button_Link.from_json(data[Model_View_Dog_Command_Button_Link.FLAG_FORM_FILTERS])
+        if not form_filters.validate_on_submit():
+            return jsonify({
+                Model_View_Dog_Command_Button_Link.FLAG_STATUS: Model_View_Dog_Command_Button_Link.FLAG_FAILURE, 
+                Model_View_Dog_Command_Button_Link.FLAG_MESSAGE: f'Filters form invalid.\n{form_filters.errors}'
+            })
+        model_return = Model_View_Dog_Command_Button_Link(form_filters_old=form_filters)
+        if not model_return.is_user_logged_in:
+            raise Exception('User not logged in')
+        
+        command_button_links = data[Model_View_Dog_Command_Button_Link.FLAG_COMMAND_BUTTON_LINK]
+        if len(command_button_links) == 0:
+            return jsonify({
+                Model_View_Dog_Command_Button_Link.FLAG_STATUS: Model_View_Dog_Command_Button_Link.FLAG_FAILURE, 
+                Model_View_Dog_Command_Button_Link.FLAG_MESSAGE: f'No dog command links.'
+            })
+        objs_command_button_link = []
+        for command_button_link in command_button_links:
+            objs_command_button_link.append(Command_Button_Link.from_json(command_button_link))
+        Helper_App.console_log(f'objs_command_button_link={objs_command_button_link}')
+        errors = DataStore_Dog.save_command_button_links(data.get('comment', 'No comment'), objs_command_button_link)
+
+        if (len(errors) > 0):
+            return jsonify({
+                Model_View_Dog_Command_Button_Link.FLAG_STATUS: Model_View_Dog_Command_Button_Link.FLAG_FAILURE, 
+                Model_View_Dog_Command_Button_Link.FLAG_MESSAGE: f'Error saving dog command links.\n{model_return.convert_list_objects_to_json(errors)}'
+            })
+        return jsonify({
+            Model_View_Dog_Command_Button_Link.FLAG_STATUS: Model_View_Dog_Command_Button_Link.FLAG_SUCCESS, 
+            Model_View_Dog_Command_Button_Link.FLAG_DATA: Model_View_Dog_Command_Button_Link.convert_list_objects_to_json(model_return.command_button_links)
+        })
+    except Exception as e:
+        return jsonify({
+            Model_View_Dog_Command_Button_Link.FLAG_STATUS: Model_View_Dog_Command_Button_Link.FLAG_FAILURE, 
+            Model_View_Dog_Command_Button_Link.FLAG_MESSAGE: f'Bad data received by controller.\n{e}'
+        })

controllers/dog/location.py

@@ -4,7 +4,7 @@ Author:     Edward Middleton-Smith
             Precision And Research Technology Systems Limited
 
 Technology: App Routing
-Feature:    Dog - Command Routes
+Feature:    Dog - Location Routes
 
 Description:
 Contact Page Controller.
@@ -13,12 +13,11 @@ Contact Page Controller.
 # IMPORTS
 # internal
 from business_objects.api import API
-from business_objects.dog.command import Command
+from business_objects.dog.location import Location
-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 forms.dog.location import Filters_Location
 from helpers.helper_app import Helper_App
-from models.model_view_dog_command import Model_View_Dog_Command
+from models.model_view_dog_location import Model_View_Dog_Location
 from models.model_view_home import Model_View_Home
 import lib.argument_validation as av
 # external
@@ -37,62 +36,62 @@ import datetime
 from altcha import ChallengeOptions, create_challenge, verify_solution
 
 
-routes_dog_command = Blueprint('routes_dog_command', __name__)
+routes_dog_location = Blueprint('routes_dog_location', __name__)
 
 
-@routes_dog_command.route(Model_View_Dog_Command.HASH_PAGE_DOG_COMMANDS, methods=['GET'])
+@routes_dog_location.route(Model_View_Dog_Location.HASH_PAGE_DOG_LOCATIONS, methods=['GET'])
-def commands():
+def locations():
-    Helper_App.console_log('commands')
+    Helper_App.console_log('locations')
     Helper_App.console_log(f'request_args: {request.args}')
     try:
-        form_filters = Filters_Command.from_json(request.args)
+        form_filters = Filters_Location.from_json(request.args)
     except Exception as e:
         Helper_App.console_log(f'Error: {e}')
-        form_filters = Filters_Command()
+        form_filters = Filters_Location()
     Helper_App.console_log(f'form_filters={form_filters}')
-    model = Model_View_Dog_Command(form_filters_old = form_filters)
+    model = Model_View_Dog_Location(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)
+    return render_template('pages/dog/_locations.html', model = model)
 
-@routes_dog_command.route(Model_View_Dog_Command.HASH_SAVE_DOG_COMMAND, methods=['POST'])
+@routes_dog_location.route(Model_View_Dog_Location.HASH_SAVE_DOG_LOCATION, methods=['POST'])
-def save_command():
+def save_location():
     data = Helper_App.get_request_data(request)
     try:
-        form_filters = Filters_Command.from_json(data[Model_View_Dog_Command.FLAG_FORM_FILTERS])
+        form_filters = Filters_Location.from_json(data[Model_View_Dog_Location.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_Location.FLAG_STATUS: Model_View_Dog_Location.FLAG_FAILURE, 
-                Model_View_Dog_Command.FLAG_MESSAGE: f'Filters form invalid.\n{form_filters.errors}'
+                Model_View_Dog_Location.FLAG_MESSAGE: f'Filters form invalid.\n{form_filters.errors}'
             })
-        model_return = Model_View_Dog_Command(form_filters_old=form_filters)
+        model_return = Model_View_Dog_Location(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]
+        locations = data[Model_View_Dog_Location.FLAG_LOCATION]
-        if len(commands) == 0:
+        if len(locations) == 0:
             return jsonify({
-                Model_View_Dog_Command.FLAG_STATUS: Model_View_Dog_Command.FLAG_FAILURE, 
+                Model_View_Dog_Location.FLAG_STATUS: Model_View_Dog_Location.FLAG_FAILURE, 
-                Model_View_Dog_Command.FLAG_MESSAGE: f'No commands.'
+                Model_View_Dog_Location.FLAG_MESSAGE: f'No locations.'
             })
-        objs_command = []
+        objs_location = []
-        for command in commands:
+        for location in locations:
-            objs_command.append(Command.from_json(command))
+            objs_location.append(Location.from_json(location))
-        Helper_App.console_log(f'objs_command={objs_command}')
+        Helper_App.console_log(f'objs_location={objs_location}')
-        errors = DataStore_Dog.save_commands(data.get('comment', 'No comment'), objs_command)
+        errors = DataStore_Dog.save_locations(data.get('comment', 'No comment'), objs_location)
 
         if (len(errors) > 0):
             return jsonify({
-                Model_View_Dog_Command.FLAG_STATUS: Model_View_Dog_Command.FLAG_FAILURE, 
+                Model_View_Dog_Location.FLAG_STATUS: Model_View_Dog_Location.FLAG_FAILURE, 
-                Model_View_Dog_Command.FLAG_MESSAGE: f'Error saving commands.\n{model_return.convert_list_objects_to_json(errors)}'
+                Model_View_Dog_Location.FLAG_MESSAGE: f'Error saving locations.\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_Location.FLAG_STATUS: Model_View_Dog_Location.FLAG_SUCCESS, 
-            Model_View_Dog_Command.FLAG_DATA: Model_View_Dog_Command.convert_list_objects_to_json(model_return.commands)
+            Model_View_Dog_Location.FLAG_DATA: Model_View_Dog_Location.convert_list_objects_to_json(model_return.locations)
         })
     except Exception as e:
         return jsonify({
-            Model_View_Dog_Command.FLAG_STATUS: Model_View_Dog_Command.FLAG_FAILURE, 
+            Model_View_Dog_Location.FLAG_STATUS: Model_View_Dog_Location.FLAG_FAILURE, 
-            Model_View_Dog_Command.FLAG_MESSAGE: f'Bad data received by controller.\n{e}'
+            Model_View_Dog_Location.FLAG_MESSAGE: f'Bad data received by controller.\n{e}'
         })

datastores/datastore_dog.py

@@ -13,11 +13,16 @@ Datastore for Users
 # internal
 # from routes import bp_home
 import lib.argument_validation as av
+from business_objects.dog.button_icon import Button_Icon, Button_Icon_Temp
+from business_objects.dog.button_shape import Button_Shape, Button_Shape_Temp
+from business_objects.dog.colour import Colour, Colour_Temp
 from business_objects.dog.command import Command, Command_Temp
+from business_objects.dog.command_button_link import Command_Button_Link, Command_Button_Link_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.dog.location import Location
+from business_objects.dog.command_button_link import Command_Button_Link, Command_Button_Link_Temp
+from business_objects.dog.location import Location, Location_Temp
 from business_objects.sql_error import SQL_Error
 from datastores.datastore_base import DataStore_Base
 from helpers.helper_app import Helper_App
@@ -298,6 +303,82 @@ class DataStore_Dog(DataStore_Base):
         return errors
     
 
+    @classmethod
+    def get_many_button_shape(cls, filters_button_shape):
+        _m = f'{cls.__qualname__}.get_many_button_shape'
+        user = cls.get_user_session()
+        argument_dict = {
+            'a_id_user': user.id_user
+            , **filters_button_shape.to_json()
+            , 'a_debug': 0
+        }
+        Helper_App.console_log(f'argument_dict: {argument_dict}')
+        result = cls.db_procedure_execute('p_dog_get_many_button_shape', argument_dict)
+        cursor = result.cursor
+        
+        # Button_Shapes
+        result_set_1 = cursor.fetchall()
+        Helper_App.console_log(f'raw button_shapes: {result_set_1}')
+        button_shapes = []
+        button_shape_indexes = {}
+        for row in result_set_1:
+            new_button_shape = Button_Shape.from_db_button_shape(row)
+            button_shape_indexes[new_button_shape.id_button_shape] = len(button_shapes)
+            button_shapes.append(new_button_shape)
+        
+        # Errors
+        cursor.nextset()
+        result_set_e = cursor.fetchall()
+        Helper_App.console_log(f'raw errors: {result_set_e}')
+        errors = []
+        if len(result_set_e) > 0:
+            errors = [SQL_Error.from_db_record(row) for row in result_set_e]
+            for error in errors:
+                Helper_App.console_log(f"Error [{error.code}]: {error.msg}")
+        
+        cls.db_cursor_clear(cursor)
+
+        return button_shapes, errors
+    
+
+    @classmethod
+    def get_many_colour(cls, filters_colour):
+        _m = f'{cls.__qualname__}.get_many_colour'
+        user = cls.get_user_session()
+        argument_dict = {
+            'a_id_user': user.id_user
+            , **filters_colour.to_json()
+            , 'a_debug': 0
+        }
+        Helper_App.console_log(f'argument_dict: {argument_dict}')
+        result = cls.db_procedure_execute('p_dog_get_many_colour', argument_dict)
+        cursor = result.cursor
+        
+        # Colours
+        result_set_1 = cursor.fetchall()
+        Helper_App.console_log(f'raw colours: {result_set_1}')
+        colours = []
+        colour_indexes = {}
+        for row in result_set_1:
+            new_colour = Colour.from_db_colour(row)
+            colour_indexes[new_colour.id_colour] = len(colours)
+            colours.append(new_colour)
+        
+        # Errors
+        cursor.nextset()
+        result_set_e = cursor.fetchall()
+        Helper_App.console_log(f'raw errors: {result_set_e}')
+        errors = []
+        if len(result_set_e) > 0:
+            errors = [SQL_Error.from_db_record(row) for row in result_set_e]
+            for error in errors:
+                Helper_App.console_log(f"Error [{error.code}]: {error.msg}")
+        
+        cls.db_cursor_clear(cursor)
+
+        return colours, errors
+    
+
     @classmethod
     def get_many_location(cls, filters_location):
         _m = f'{cls.__qualname__}.get_many_location'
@@ -334,3 +415,220 @@ class DataStore_Dog(DataStore_Base):
         cls.db_cursor_clear(cursor)
 
         return locations, errors
+
+    @classmethod
+    def save_locations(cls, comment, locations):
+        _m = f'{cls}.save_locations'
+        av.val_str(comment, 'comment', _m)
+
+        guid = Helper_DB_MySQL.create_guid_str()
+        now = datetime.now()
+        user = cls.get_user_session()
+
+        Helper_App.console_log(f'saving locations: {locations}')
+
+        rows = []
+        for link in locations:
+            row = Location_Temp.from_location(link)
+            row.guid = guid
+            rows.append(row)
+        
+        Helper_App.console_log(f'rows: {rows}')
+
+        cls.upload_bulk(Location_Temp.__tablename__, rows, 1000)
+
+        Helper_App.console_log('locations uploaded')
+
+        argument_dict_list = {
+            'a_comment': comment,
+            'a_guid': guid,
+            'a_id_user': user.id_user,
+            'a_debug': 0
+        }
+        result = cls.db_procedure_execute('p_dog_save_location', argument_dict_list)
+        
+        Helper_App.console_log('Locations saved')
+
+        # Errors
+        cursor = result.cursor
+        cursor.nextset()
+        result_set_e = cursor.fetchall()
+        Helper_App.console_log(f"Raw errors: {result_set_e}")
+        errors = []
+        if len(result_set_e) > 0:
+            errors = [SQL_Error.from_db_record(row) for row in result_set_e]
+            for error in errors:
+                Helper_App.console_log(f"Error [{error.code}]: {error.msg}")
+
+        cls.db_cursor_clear(cursor)
+
+        return [] # errors
+    
+
+    @classmethod
+    def get_many_button_icon(cls, filters_button_icon):
+        _m = f'{cls.__qualname__}.get_many_button_icon'
+        user = cls.get_user_session()
+        argument_dict = {
+            'a_id_user': user.id_user
+            , **filters_button_icon.to_json()
+            , 'a_debug': 0
+        }
+        Helper_App.console_log(f'argument_dict: {argument_dict}')
+        result = cls.db_procedure_execute('p_dog_get_many_button_icon', argument_dict)
+        cursor = result.cursor
+        
+        # Button_Icons
+        result_set_1 = cursor.fetchall()
+        Helper_App.console_log(f'raw button_icons: {result_set_1}')
+        button_icons = []
+        button_icon_indexes = {}
+        for row in result_set_1:
+            new_button_icon = Button_Icon.from_db_button_icon(row)
+            button_icon_indexes[new_button_icon.id_button_icon] = len(button_icons)
+            button_icons.append(new_button_icon)
+        
+        # Errors
+        cursor.nextset()
+        result_set_e = cursor.fetchall()
+        Helper_App.console_log(f'raw errors: {result_set_e}')
+        errors = []
+        if len(result_set_e) > 0:
+            errors = [SQL_Error.from_db_record(row) for row in result_set_e]
+            for error in errors:
+                Helper_App.console_log(f"Error [{error.code}]: {error.msg}")
+        
+        cls.db_cursor_clear(cursor)
+
+        return button_icons, errors
+
+    @classmethod
+    def save_button_icons(cls, comment, button_icons):
+        _m = f'{cls}.save_button_icons'
+        av.val_str(comment, 'comment', _m)
+
+        guid = Helper_DB_MySQL.create_guid_str()
+        now = datetime.now()
+        user = cls.get_user_session()
+
+        Helper_App.console_log(f'saving button_icons: {button_icons}')
+
+        rows = []
+        for link in button_icons:
+            row = Button_Icon_Temp.from_button_icon(link)
+            row.guid = guid
+            rows.append(row)
+        
+        Helper_App.console_log(f'rows: {rows}')
+
+        cls.upload_bulk(Button_Icon_Temp.__tablename__, rows, 1000)
+
+        Helper_App.console_log('button_icons uploaded')
+
+        argument_dict_list = {
+            'a_comment': comment,
+            'a_guid': guid,
+            'a_id_user': user.id_user,
+            'a_debug': 0
+        }
+        result = cls.db_procedure_execute('p_dog_save_button_icon', argument_dict_list)
+        
+        Helper_App.console_log('Button_Icons saved')
+
+        # Errors
+        cursor = result.cursor
+        cursor.nextset()
+        result_set_e = cursor.fetchall()
+        Helper_App.console_log(f"Raw errors: {result_set_e}")
+        errors = []
+        if len(result_set_e) > 0:
+            errors = [SQL_Error.from_db_record(row) for row in result_set_e]
+            for error in errors:
+                Helper_App.console_log(f"Error [{error.code}]: {error.msg}")
+
+        cls.db_cursor_clear(cursor)
+
+        return errors
+
+
+    @classmethod
+    def get_many_command_button_link(cls, filters_command_button_link):
+        _m = f'{cls.__qualname__}.get_many_command_button_link'
+        user = cls.get_user_session()
+        argument_dict = {
+            'a_id_user': user.id_user
+            , **filters_command_button_link.to_json()
+            , 'a_debug': 0
+        }
+        Helper_App.console_log(f'argument_dict: {argument_dict}')
+        result = cls.db_procedure_execute('p_dog_get_many_command_button_link', argument_dict)
+        cursor = result.cursor
+        
+        # Command Button Links
+        result_set_1 = cursor.fetchall()
+        Helper_App.console_log(f'raw command button links: {result_set_1}')
+        command_button_links = []
+        command_button_link_indexes = {}
+        for row in result_set_1:
+            # Helper_App.console_log(f'Raw dog command link: {row}')
+            new_command_button_link = Command_Button_Link.from_db_command_button_link(row)
+            command_button_link_indexes[new_command_button_link.id_link] = len(command_button_links)
+            command_button_links.append(new_command_button_link)
+        
+        # Errors
+        cursor.nextset()
+        result_set_e = cursor.fetchall()
+        Helper_App.console_log(f'raw errors: {result_set_e}')
+        errors = []
+        if len(result_set_e) > 0:
+            errors = [SQL_Error.from_db_record(row) for row in result_set_e]
+            for error in errors:
+                Helper_App.console_log(f"Error [{error.code}]: {error.msg}")
+        
+        cls.db_cursor_clear(cursor)
+
+        return command_button_links, errors
+
+    @classmethod
+    def save_command_button_links(cls, comment, links):
+        _m = f'{cls}.save_command_button_links'
+        av.val_str(comment, 'comment', _m)
+
+        guid = Helper_DB_MySQL.create_guid_str()
+        now = datetime.now()
+        user = cls.get_user_session()
+
+        Helper_App.console_log(f'saving links: {links}')
+
+        rows = []
+        for link in links:
+            row = Command_Button_Link_Temp.from_command_button_link(link)
+            row.guid = guid
+            rows.append(row)
+        
+        cls.upload_bulk(Command_Button_Link_Temp.__tablename__, rows, 1000)
+
+        Helper_App.console_log('Links uploaded')
+
+        argument_dict_list = {
+            'a_comment': comment,
+            'a_guid': guid,
+            'a_id_user': user.id_user,
+            'a_debug': 0
+        }
+        result = cls.db_procedure_execute('p_dog_save_command_button_link', argument_dict_list)
+        
+        Helper_App.console_log('Command Button Links saved')
+
+        # Errors
+        cursor = result.cursor
+        cursor.nextset()
+        result_set_e = cursor.fetchall()
+        errors = []
+        if len(result_set_e) > 0:
+            errors = [SQL_Error.from_db_record(row) for row in result_set_e]
+            for error in errors:
+                Helper_App.console_log(f"Error [{error.code}]: {error.msg}")
+
+        cls.db_cursor_clear(cursor)
+        return errors

forms/dog/button_icon.py

@@ -0,0 +1,54 @@
+"""
+Project:    PARTS Website
+Author:     Edward Middleton-Smith
+            Precision And Research Technology Systems Limited
+
+Technology: Backend
+Feature:    Button_Icon Form
+
+Description:
+Defines Flask-WTF form for handling user input on Button_Icons page.
+"""
+
+# IMPORTS
+# internal
+from business_objects.base import Base
+# from business_objects.dog.button_icon import Button_Icon # 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
+from wtforms import SelectField, BooleanField, StringField, SubmitField
+from wtforms.validators import DataRequired, Email, ValidationError
+import markupsafe
+from flask_wtf.recaptcha import RecaptchaField
+from abc import ABCMeta, abstractmethod
+import json
+
+class Filters_Button_Icon(Form_Base):
+    search = StringField(
+        'Search'
+    )
+    active_only = BooleanField(
+          'Active'
+        , default = True
+    )
+
+    @classmethod
+    def from_json(cls, json):
+        _m = f'{cls.__qualname__}.from_json'
+        Helper_App.console_log(f'{_m}\njson: {json}')
+        filters = cls()
+        filters.search.data = json[Base.FLAG_SEARCH]
+        filters.active_only.data = av.input_bool(json[Base.FLAG_ACTIVE_ONLY], Base.FLAG_ACTIVE_ONLY, f'{cls.__name__}.from_json')
+        return filters
+
+    def to_json(self):
+        return {
+              Base.FLAG_SEARCH: self.search.data
+            , Base.FLAG_ACTIVE_ONLY: self.active_only.data
+        }

forms/dog/command_button_link.py

@@ -0,0 +1,103 @@
+"""
+Project:    PARTS Website
+Author:     Edward Middleton-Smith
+            Precision And Research Technology Systems Limited
+
+Technology: Backend
+Feature:    Dog Command Link Form
+
+Description:
+Defines Flask-WTF form for handling user input on Dog Command Links page.
+"""
+
+# IMPORTS
+# internal
+from business_objects.base import Base
+from business_objects.dog.button_icon import Button_Icon
+from business_objects.dog.button_shape import Button_Shape
+from business_objects.dog.colour import Colour
+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.location import Location
+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
+from wtforms import SelectField, BooleanField, StringField, SubmitField
+from wtforms.validators import DataRequired, Email, ValidationError
+import markupsafe
+from flask_wtf.recaptcha import RecaptchaField
+from abc import ABCMeta, abstractmethod
+import json
+
+class Filters_Command_Button_Link(Form_Base):
+    search = StringField(
+        'Search'
+    )
+    id_command_category = SelectField(
+          'Command Category'
+        , choices = [Form_Base.get_select_option_all()]
+        , default = Form_Base.get_select_option_default_value()
+    )
+    id_command = SelectField(
+          'Command'
+        , choices = [Form_Base.get_select_option_all()]
+        , default = Form_Base.get_select_option_default_value()
+    )
+    id_button_shape = SelectField(
+          'Shape'
+        , choices = [Form_Base.get_select_option_all()]
+        , default = Form_Base.get_select_option_default_value()
+    )
+    id_colour = SelectField(
+          'Colour'
+        , choices = [Form_Base.get_select_option_all()]
+        , default = Form_Base.get_select_option_default_value()
+    )
+    id_button_icon = SelectField(
+          'Icon'
+        , choices = [Form_Base.get_select_option_all()]
+        , default = Form_Base.get_select_option_default_value()
+    )
+    id_location = SelectField(
+          'Location'
+        , choices = [Form_Base.get_select_option_all()]
+        , default = Form_Base.get_select_option_default_value()
+    )
+    active_only = BooleanField(
+          'Active'
+        , default = True
+    )
+
+    @classmethod
+    def from_json(cls, json):
+        _m = f'{cls.__qualname__}.from_json'
+        Helper_App.console_log(f'{_m}\njson: {json}')
+        filters = cls()
+        filters.search.data = json[Base.FLAG_SEARCH]
+        filters.id_command_category.data = json[Command_Category.ATTR_ID_COMMAND_CATEGORY]
+        filters.id_command.data = json[Command.ATTR_ID_COMMAND]
+        filters.id_button_shape.data = json[Button_Shape.ATTR_ID_BUTTON_SHAPE]
+        filters.id_colour.data = json[Colour.ATTR_ID_COLOUR]
+        filters.id_button_icon.data = json[Button_Icon.ATTR_ID_BUTTON_ICON]
+        filters.id_location.data = json[Location.ATTR_ID_LOCATION]
+        filters.active_only.data = av.input_bool(json[Base.FLAG_ACTIVE_ONLY], Base.FLAG_ACTIVE_ONLY, f'{cls.__name__}.from_json')
+        return filters
+
+    def to_json(self):
+        return {
+              Base.FLAG_SEARCH: self.search.data
+            , Command_Category.ATTR_ID_COMMAND_CATEGORY: self.id_command_category.data
+            , Command.ATTR_ID_COMMAND: self.id_command.data
+            , Button_Shape.ATTR_ID_BUTTON_SHAPE: self.id_button_shape.data
+            , Colour.ATTR_ID_COLOUR: self.id_colour.data
+            , Button_Icon.ATTR_ID_BUTTON_ICON: self.id_button_icon.data
+            , Location.ATTR_ID_LOCATION: self.id_location.data
+            , Base.FLAG_ACTIVE_ONLY: self.active_only.data
+        }

models/model_view_base.py

@@ -18,12 +18,18 @@ Base data model for views
 # internal
 # from routes import bp_home
 from business_objects.base import Base
-from business_objects.dog.user import User
+from business_objects.file_type import File_Type
+from business_objects.dog.button_icon import Button_Icon
+from business_objects.dog.button_shape import Button_Shape
+from business_objects.dog.colour import Colour
 from business_objects.dog.command import Command
+from business_objects.dog.command_button_link import Command_Button_Link
 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 business_objects.dog.image import Image
 from business_objects.dog.location import Location
+from business_objects.dog.user import User
 from datastores.datastore_base import DataStore_Base
 from datastores.datastore_dog import DataStore_Dog
 from datastores.datastore_user import DataStore_User
@@ -38,10 +44,16 @@ from typing import ClassVar
 
 
 class Model_View_Base(BaseModel, ABC):
+    ATTR_ID_BUTTON_ICON: ClassVar[str] = Button_Icon.ATTR_ID_BUTTON_ICON
+    ATTR_ID_BUTTON_SHAPE: ClassVar[str] = Button_Shape.ATTR_ID_BUTTON_SHAPE
+    ATTR_ID_COLOUR: ClassVar[str] = Colour.ATTR_ID_COLOUR
     ATTR_ID_COMMAND: ClassVar[str] = Command.ATTR_ID_COMMAND
+    ATTR_ID_COMMAND_BUTTON_LINK: ClassVar[str] = Command_Button_Link.ATTR_ID_COMMAND_BUTTON_LINK
     ATTR_ID_COMMAND_CATEGORY: ClassVar[str] = Command_Category.ATTR_ID_COMMAND_CATEGORY
     ATTR_ID_DOG: ClassVar[str] = Dog.ATTR_ID_DOG
     ATTR_ID_DOG_COMMAND_LINK: ClassVar[str] = Dog_Command_Link.ATTR_ID_DOG_COMMAND_LINK
+    ATTR_ID_FILE_TYPE: ClassVar[str] = File_Type.ATTR_ID_FILE_TYPE
+    ATTR_ID_IMAGE: ClassVar[str] = Image.ATTR_ID_IMAGE
     ATTR_ID_LOCATION: ClassVar[str] = Location.ATTR_ID_LOCATION
     ATTR_TEXT_COLLAPSED: ClassVar[str] = 'textCollapsed'
     ATTR_TEXT_EXPANDED: ClassVar[str] = 'textExpanded'
@@ -78,8 +90,10 @@ class Model_View_Base(BaseModel, ABC):
     FLAG_BOOL_FALSE: ClassVar[str] = 'false'
     FLAG_BOOL_TRUE: ClassVar[str] = 'true'
     FLAG_BUTTON: ClassVar[str] = 'button'
+    FLAG_BUTTON_ICON: ClassVar[str] = Button_Icon.FLAG_BUTTON_ICON
     FLAG_BUTTON_LIGHT: ClassVar[str] = 'button-light'
     FLAG_BUTTON_PRIMARY: ClassVar[str] = 'button-primary'
+    FLAG_BUTTON_SHAPE: ClassVar[str] = Button_Shape.FLAG_BUTTON_SHAPE
     FLAG_CANCEL: ClassVar[str] = 'button-cancel'
     FLAG_CALLBACK: ClassVar[str] = 'callback'
     FLAG_CAPTCHA: ClassVar[str] = 'captcha'
@@ -88,7 +102,9 @@ class Model_View_Base(BaseModel, ABC):
     FLAG_CLOSE_TEMPORARY_ELEMENT: ClassVar[str] = 'button-temporary-element-close'
     FLAG_CODE: ClassVar[str] = Base.FLAG_CODE
     FLAG_COLLAPSIBLE: ClassVar[str] = 'collapsible'
+    FLAG_COLOUR: ClassVar[str] = Colour.FLAG_COLOUR
     FLAG_COMMAND: ClassVar[str] = Command.FLAG_COMMAND
+    FLAG_COMMAND_BUTTON_LINK: ClassVar[str] = Command_Button_Link.FLAG_COMMAND_BUTTON_LINK
     FLAG_COMMAND_CATEGORY: ClassVar[str] = Command_Category.FLAG_COMMAND_CATEGORY
     FLAG_COLUMN: ClassVar[str] = 'column'
     FLAG_COMMENT: ClassVar[str] = 'comment'
@@ -135,11 +151,15 @@ class Model_View_Base(BaseModel, ABC):
     # FLAG_NAME_SINGULAR: ClassVar[str] = Base.FLAG_NAME_SINGULAR
     FLAG_NAV_ADMIN_HOME: ClassVar[str] = 'navAdminHome'
     FLAG_NAV_CONTACT: ClassVar[str] = 'navContact'
+    FLAG_NAV_DOG_BUTTON_ICONS: ClassVar[str] = 'navDogButtonIcons'
+    FLAG_NAV_DOG_COLOURS: ClassVar[str] = 'navDogColours'
+    FLAG_NAV_DOG_COMMAND_BUTTON_LINKS: ClassVar[str] = 'navDogCommandButtonLinks'
     FLAG_NAV_DOG_COMMAND_CATEGORIES: ClassVar[str] = 'navDogCommandCategories'
     FLAG_NAV_DOG_COMMANDS: ClassVar[str] = 'navDogCommands'
     FLAG_NAV_DOG_DOGS: ClassVar[str] = 'navDogDogs'
     FLAG_NAV_DOG_DOG_COMMAND_LINKS: ClassVar[str] = 'navDogDogCommandLinks'
     FLAG_NAV_DOG_HOME: ClassVar[str] = 'navDogHome'
+    FLAG_NAV_DOG_LOCATIONS: ClassVar[str] = 'navDogLocations'
     FLAG_NAV_HOME: ClassVar[str] = 'navHome'
     FLAG_NAV_USER_ACCOUNT: ClassVar[str] = 'navUserAccount'
     FLAG_NAV_USER_ADMIN: ClassVar[str] = 'navUserAdmin'
@@ -170,6 +190,8 @@ class Model_View_Base(BaseModel, ABC):
     HASH_PAGE_CONTACT: ClassVar[str] = '/contact'
     HASH_PAGE_CONTACT_SUCCESS: ClassVar[str] = '/contact-success'
     HASH_PAGE_DATA_RETENTION_SCHEDULE: ClassVar[str] = '/retention-schedule'
+    HASH_PAGE_DOG_BUTTON_ICONS: ClassVar[str] = '/dog/button-icons'
+    HASH_PAGE_DOG_COMMAND_BUTTON_LINKS: ClassVar[str] = '/dog/command-button-links'
     HASH_PAGE_DOG_COMMAND_CATEGORIES: ClassVar[str] = '/dog/command-categories'
     HASH_PAGE_DOG_COMMANDS: ClassVar[str] = '/dog/commands'
     HASH_PAGE_DOG_DOG_COMMAND_LINKS: ClassVar[str] = '/dog/dog-command-links'
@@ -183,7 +205,10 @@ class Model_View_Base(BaseModel, ABC):
     HASH_PAGE_USER_ACCOUNT: ClassVar[str] = '/user'
     HASH_PAGE_USER_LOGIN: ClassVar[str] = '/login'
     HASH_PAGE_USER_LOGOUT: ClassVar[str] = '/logout'
+    HASH_SAVE_DOG_BUTTON_ICON: ClassVar[str] = '/dog/save-button-icon'
+    HASH_SAVE_DOG_COLOUR: ClassVar[str] = '/dog/save-colour'
     HASH_SAVE_DOG_COMMAND: ClassVar[str] = '/dog/save-command'
+    HASH_SAVE_DOG_COMMAND_BUTTON_LINK: ClassVar[str] = '/dog/save-command-button-link'
     HASH_SAVE_DOG_COMMAND_CATEGORY: ClassVar[str] = '/dog/save-command-category'
     HASH_SAVE_DOG_DOG_COMMAND_LINK: ClassVar[str] = '/dog/save-dog-command-link'
     HASH_SAVE_DOG_LOCATION: ClassVar[str] = '/dog/save-location'

models/model_view_dog_button_icon.py

@@ -0,0 +1,53 @@
+"""
+Project:    PARTS Website
+Author:     Edward Middleton-Smith
+            Precision And Research Technology Systems Limited
+
+Technology: View Models
+Feature:    Dog Button_Icons View Model
+
+Description:
+Data model for dog button_icons view
+"""
+
+# internal
+from business_objects.dog.button_icon import Button_Icon, Parameters_Button_Icon
+from datastores.datastore_dog import DataStore_Dog
+from models.model_view_dog_base import Model_View_Dog_Base
+from forms.dog.button_icon import Filters_Button_Icon
+# from routes import bp_home
+from helpers.helper_app import Helper_App
+import lib.argument_validation as av
+
+# external
+from pydantic import BaseModel
+from typing import ClassVar
+
+class Model_View_Dog_Button_Icon(Model_View_Dog_Base):
+    button_icons: list = None
+    form_filters: Filters_Button_Icon = None
+    form_filters_old: Filters_Button_Icon
+
+    @property
+    def title(self):
+        return 'Button Icon'
+    
+    def __init__(self, form_filters_old, hash_page_current=Model_View_Dog_Base.HASH_PAGE_DOG_BUTTON_ICONS):
+        _m = 'Model_View_Dog_Button_Icon.__init__'
+        Helper_App.console_log(f'{_m}\nstarting...')
+        super().__init__(hash_page_current=hash_page_current, form_filters_old=form_filters_old)
+        self.form_filters = form_filters_old
+        datastore = DataStore_Dog()
+        
+        Helper_App.console_log(f'Form filters: {self.form_filters}')
+        parameters_filter_button_icon = Parameters_Button_Icon.from_form_filters_button_icon(self.form_filters)
+        Helper_App.console_log(f'Query args: {parameters_filter_button_icon}')
+        self.button_icons, errors = datastore.get_many_button_icon(parameters_filter_button_icon)
+
+
+    """
+    @classmethod
+    def save_categories(cls, comment, list_categories):
+        _m = f'{cls.__name__}.save_categories'
+        return DataStore_Store_Product_Category().save_categories(comment, list_categories)
+    """

models/model_view_dog_command_button_link.py

@@ -0,0 +1,90 @@
+"""
+Project:    PARTS Website
+Author:     Edward Middleton-Smith
+            Precision And Research Technology Systems Limited
+
+Technology: View Models
+Feature:    Dog Dog Command Link View Model
+
+Description:
+Data model for dog dog command links view
+"""
+
+# internal
+from business_objects.dog.button_icon import Button_Icon, Parameters_Button_Icon
+from business_objects.dog.button_shape import Button_Shape, Parameters_Button_Shape
+from business_objects.dog.colour import Colour, Parameters_Colour
+from business_objects.dog.command import Command, Parameters_Command
+from business_objects.dog.dog import Dog, Parameters_Dog
+from business_objects.dog.command_button_link import Command_Button_Link, Parameters_Command_Button_Link
+from business_objects.dog.location import Location, Parameters_Location
+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.command_button_link import Filters_Command_Button_Link
+# from routes import bp_home
+from helpers.helper_app import Helper_App
+import lib.argument_validation as av
+
+# external
+from pydantic import BaseModel
+from typing import ClassVar
+from operator import attrgetter
+
+class Model_View_Dog_Command_Button_Link(Model_View_Dog_Base):
+    filter_command_categories: list = None
+    filter_commands: list = None
+    filter_button_shapes: list = None
+    filter_colours: list = None
+    filter_button_icons: list = None
+    filter_locations: list = None
+    command_button_links: list = None
+    form_filters: Filters_Command_Button_Link = None
+    form_filters_old: Filters_Command_Button_Link
+
+    @property
+    def title(self):
+        return 'Command Button Link'
+    
+    def __init__(self, form_filters_old, hash_page_current=Model_View_Dog_Base.HASH_PAGE_DOG_COMMAND_BUTTON_LINKS):
+        _m = 'Model_View_Dog_Command_Button_Link.__init__'
+        Helper_App.console_log(f'{_m}\nstarting...')
+        super().__init__(hash_page_current=hash_page_current, form_filters_old=form_filters_old)
+        self.form_filters = form_filters_old
+        datastore = DataStore_Dog()
+        
+        parameters_filter_command = Parameters_Command.get_default()
+        self.filter_command_categories, self.filter_commands, errors = datastore.get_many_command(parameters_filter_command)
+        if len(self.filter_command_categories) > 0:
+            self.form_filters.id_command_category.choices += [(str(command_category.id_command_category), command_category.name) for command_category in self.filter_command_categories]
+        if len(self.filter_commands) > 0:
+            Helper_App.console_log(f'filter commands: {self.filter_commands}')
+            sorted_filter_commands = self.filter_commands
+            sorted_filter_commands.sort(key = attrgetter('name'))
+            Helper_App.console_log(f'sorted filter commands: {sorted_filter_commands}')
+            self.form_filters.id_command.choices += [(str(command.id_command), command.name) for command in sorted_filter_commands] # .sort(key = lambda command: command[1])
+
+        parameters_filter_button_shape = Parameters_Button_Shape.get_default()
+        self.filter_button_shapes, errors = datastore.get_many_button_shape(parameters_filter_button_shape)
+        if len(self.filter_button_shapes) > 0:
+            self.form_filters.id_button_shape.choices += [(str(button_shape.id_button_shape), button_shape.name) for button_shape in self.filter_button_shapes]
+
+        parameters_filter_colour = Parameters_Colour.get_default()
+        self.filter_colours, errors = datastore.get_many_colour(parameters_filter_colour)
+        if len(self.filter_colours) > 0:
+            self.form_filters.id_colour.choices += [(str(colour.id_colour), colour.name) for colour in self.filter_colours]
+
+        parameters_filter_button_icon = Parameters_Button_Icon.get_default()
+        self.filter_button_icons, errors = datastore.get_many_button_icon(parameters_filter_button_icon)
+        if len(self.filter_button_icons) > 0:
+            self.form_filters.id_button_icon.choices += [(str(button_icon.id_button_icon), button_icon.name) for button_icon in self.filter_button_icons]
+
+        parameters_filter_location = Parameters_Location.get_default()
+        self.filter_locations, errors = datastore.get_many_location(parameters_filter_location)
+        if len(self.filter_locations) > 0:
+            self.form_filters.id_location.choices += [(str(location.id_location), location.name) for location in self.filter_locations]
+
+        Helper_App.console_log(f'Form filters: {self.form_filters}')
+        parameters_command_button_link = Parameters_Command_Button_Link.from_form_filters_command_button_link(self.form_filters)
+        Helper_App.console_log(f'Query args: {parameters_command_button_link}')
+        self.command_button_links, errors = datastore.get_many_command_button_link(parameters_command_button_link)

models/model_view_dog_location.py

@@ -24,9 +24,6 @@ from pydantic import BaseModel
 from typing import ClassVar
 
 class Model_View_Dog_Location(Model_View_Dog_Base):
-    FLAG_CAN_HAVE_BUTTON: ClassVar[str] = Location.FLAG_CAN_HAVE_BUTTON
-    FLAG_HAND_SIGNAL_DEFAULT_DESCRIPTION: ClassVar[str] = Location.FLAG_HAND_SIGNAL_DEFAULT_DESCRIPTION
-    filter_location_categories: list = None
     locations: list = None
     form_filters: Filters_Location = None
     form_filters_old: Filters_Location
@@ -42,14 +39,10 @@ class Model_View_Dog_Location(Model_View_Dog_Base):
         self.form_filters = form_filters_old
         datastore = DataStore_Dog()
         
-        parameters_filter_location = Parameters_Location.get_default()
-        self.filter_location_categories, filter_locations, errors = datastore.get_many_location(parameters_filter_location)
-        self.form_filters.id_location_category.choices += [(str(location_category.id_location_category), location_category.name) for location_category in self.filter_location_categories]
-
         Helper_App.console_log(f'Form filters: {self.form_filters}')
         parameters_filter_location = Parameters_Location.from_form_filters_location(self.form_filters)
         Helper_App.console_log(f'Query args: {parameters_filter_location}')
-        location_categories, self.locations, errors = datastore.get_many_location(parameters_filter_location)
+        self.locations, errors = datastore.get_many_location(parameters_filter_location)
 
 
     """

static/MySQL/00000_combined.sql

@@ -1,21 +1,28 @@
  
 USE demo;
 
-DROP PROCEDURE IF EXISTS demo.p_dog_get_many_location;
+DROP PROCEDURE IF EXISTS demo.p_dog_get_many_button_icon;
 
 DELIMITER //
-CREATE PROCEDURE demo.p_dog_get_many_location (
+CREATE PROCEDURE demo.p_dog_get_many_button_icon (
 	  IN a_id_user INT
-    , IN a_get_all_location BIT
+    , IN a_get_all_file_type BIT
-	, IN a_get_inactive_location BIT
+	, IN a_get_inactive_file_type BIT
-	, IN a_ids_location TEXT
+	, IN a_ids_file_type TEXT
-    , IN a_names_location TEXT
+    , IN a_names_file_type TEXT
+    , IN a_get_all_image BIT
+	, IN a_get_inactive_image BIT
+	, IN a_ids_image TEXT
+    , IN a_names_image TEXT
+    , IN a_get_all_button_icon BIT
+	, IN a_get_inactive_button_icon BIT
+	, IN a_ids_button_icon TEXT
+    , IN a_names_button_icon TEXT
+    , IN a_notes_button_icon TEXT
     , IN a_require_all_id_search_filters_met BIT
     , IN a_require_any_id_search_filters_met BIT
     , IN a_require_all_non_id_search_filters_met BIT
     , IN a_require_any_non_id_search_filters_met BIT
-    , IN a_output_LOCATIONS BIT
-    , IN a_output_LOCATION_links BIT
     , IN a_debug BIT
 )
 BEGIN
@@ -43,7 +50,7 @@ BEGIN
 		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
 			  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 			, id_type INT NULL
-			, code VARCHAR(100) NOT NULL
+			, code VARCHAR(250) NOT NULL
 			, msg TEXT NOT NULL
 		);
 
@@ -88,34 +95,46 @@ BEGIN
     
     SET a_id_user := IFNULL(a_id_user, 0);
     /*
-    SET a_get_all_location := IFNULL(a_get_all_location, 0);
+    SET a_get_all_file_type := IFNULL(a_get_all_file_type, 0);
-    SET a_get_inactive_location := IFNULL(a_get_inactive_location, 0);
+    SET a_get_inactive_file_type := IFNULL(a_get_inactive_file_type, 0);
-    SET a_ids_location := TRIM(IFNULL(a_ids_location, ''));
+    SET a_ids_file_type := TRIM(IFNULL(a_ids_file_type, ''));
-    SET a_names_location := TRIM(IFNULL(a_names_location, ''));
+    SET a_names_file_type := TRIM(IFNULL(a_names_file_type, ''));
-    SET a_hand_signal_default_descriptions_location := TRIM(IFNULL(a_hand_signal_default_descriptions_location, ''));
+    SET a_get_all_image := IFNULL(a_get_all_image, 0);
-    SET a_notes_location := TRIM(IFNULL(a_notes_location, ''));
+    SET a_get_inactive_image := IFNULL(a_get_inactive_image, 0);
+    SET a_ids_image := TRIM(IFNULL(a_ids_image, ''));
+    SET a_names_image := TRIM(IFNULL(a_names_image, ''));
+    SET a_get_all_button_icon := IFNULL(a_get_all_button_icon, 0);
+    SET a_get_inactive_button_icon := IFNULL(a_get_inactive_button_icon, 0);
+    SET a_ids_button_icon := TRIM(IFNULL(a_ids_button_icon, ''));
+    SET a_names_button_icon := TRIM(IFNULL(a_names_button_icon, ''));
+    SET a_notes_button_icon := TRIM(IFNULL(a_notes_button_icon, ''));
     SET a_require_all_id_search_filters_met := IFNULL(a_require_all_id_search_filters_met, 1);
     SET a_require_any_id_search_filters_met := IFNULL(a_require_any_id_search_filters_met, 1);
     SET a_require_all_non_id_search_filters_met := IFNULL(a_require_all_non_id_search_filters_met, 0);
     SET a_require_any_non_id_search_filters_met := IFNULL(a_require_any_non_id_search_filters_met, 1);
     */
-    SET a_output_LOCATIONS := IFNULL(a_output_LOCATIONS, 0);
-    SET a_output_LOCATION_links := IFNULL(a_output_LOCATION_links, 0);
     SET a_debug := IFNULL(a_debug, 0);
     
     IF a_debug = 1 THEN
 		SELECT 
 			  a_id_user
-            , a_get_all_location
+            , a_get_all_file_type
-            , a_get_inactive_location
+            , a_get_inactive_file_type
-            , a_ids_location
+            , a_ids_file_type
-            , a_names_location
+            , a_names_file_type
+            , a_get_all_image
+            , a_get_inactive_image
+            , a_ids_image
+            , a_names_image
+            , a_get_all_button_icon
+            , a_get_inactive_button_icon
+            , a_ids_button_icon
+            , a_names_button_icon
+            , a_notes_button_icon
             , a_require_all_id_search_filters_met
             , a_require_any_id_search_filters_met
             , a_require_all_non_id_search_filters_met
             , a_require_any_non_id_search_filters_met
-            , a_output_LOCATIONS
-            , a_output_LOCATION_links
             , a_debug
 		;
 
@@ -129,23 +148,14 @@ BEGIN
     END IF;
 
     DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error;
-    DROP TEMPORARY TABLE IF EXISTS tmp_Location_Link;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Button_Icon;
-    DROP TEMPORARY TABLE IF EXISTS tmp_Location;
     
-    CREATE TEMPORARY TABLE tmp_Location (
+    CREATE TEMPORARY TABLE tmp_Button_Icon (
-		  id_location INT NOT NULL
+		  id_button_icon INT NOT NULL
-		, code VARCHAR(100)
+        , id_image INT
+		, code VARCHAR(250)
         , name VARCHAR(250)
-        , active BIT
+        , notes TEXT
-
-        , does_meet_id_filters BIT
-        , does_meet_non_id_filters BIT
-    );
-    
-    CREATE TEMPORARY TABLE tmp_Location_Link (
-		  id_link INT NOT NULL
-		, id_location_parent INT 
-		, id_location_child INT
         , active BIT
 
         , does_meet_id_filters BIT
@@ -155,7 +165,7 @@ BEGIN
 	CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
           id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 		, id_type INT NULL
-		, code VARCHAR(100) NOT NULL
+		, code VARCHAR(250) NOT NULL
         , msg TEXT NOT NULL
     );
     
@@ -226,7 +236,7 @@ BEGIN
 		VALUES (
 			  v_id_type_error_no_permission
             , v_code_type_error_no_permission
-			, 'You do not have permission to view Locations.'
+			, 'You do not have permission to view Button_Icons.'
 		)
         ;
     END IF;
@@ -237,16 +247,25 @@ BEGIN
 	);
 
     
-    -- Call Location Calc
+    -- Call Button_Icon Calc
     IF NOT EXISTS(SELECT * FROM tmp_Msg_Error t_ERROR INNER JOIN demo.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
         IF a_debug = 1 THEN
             SELECT 
                   v_guid -- a_guid
                 , a_id_user -- a_id_user
-                , a_get_all_location -- a_get_all_location
+                , a_get_all_file_type -- a_get_all_file_type
-                , a_get_inactive_location -- a_get_inactive_location
+                , a_get_inactive_file_type -- a_get_inactive_file_type
-                , a_ids_location -- a_ids_location
+                , a_ids_file_type -- a_ids_file_type
-                , a_names_location -- a_names_location
+                , a_names_file_type -- a_names_file_type
+                , a_get_all_image -- a_get_all_image
+                , a_get_inactive_image -- a_get_inactive_image
+                , a_ids_image -- a_ids_image
+                , a_names_image -- a_names_image
+                , a_get_all_button_icon -- a_get_all_button_icon
+                , a_get_inactive_button_icon -- a_get_inactive_button_icon
+                , a_ids_button_icon -- a_ids_button_icon
+                , a_names_button_icon -- a_names_button_icon
+                , a_notes_button_icon -- a_notes_button_icon
                 , a_require_all_id_search_filters_met -- a_require_all_id_search_filters_met
                 , a_require_any_id_search_filters_met -- a_require_any_id_search_filters_met
                 , a_require_all_non_id_search_filters_met -- a_require_all_non_id_search_filters_met
@@ -256,13 +275,22 @@ BEGIN
             ;
         END IF;
         
-        CALL demo.p_dog_calc_location (
+        CALL demo.p_dog_calc_button_icon (
               v_guid -- a_guid
             , a_id_user -- a_id_user
-            , a_get_all_location -- a_get_all_location
+            , a_get_all_file_type -- a_get_all_file_type
-            , a_get_inactive_location -- a_get_inactive_location
+            , a_get_inactive_file_type -- a_get_inactive_file_type
-            , a_ids_location -- a_ids_location
+            , a_ids_file_type -- a_ids_file_type
-            , a_names_location -- a_names_location
+            , a_names_file_type -- a_names_file_type
+            , a_get_all_image -- a_get_all_image
+            , a_get_inactive_image -- a_get_inactive_image
+            , a_ids_image -- a_ids_image
+            , a_names_image -- a_names_image
+            , a_get_all_button_icon -- a_get_all_button_icon
+            , a_get_inactive_button_icon -- a_get_inactive_button_icon
+            , a_ids_button_icon -- a_ids_button_icon
+            , a_names_button_icon -- a_names_button_icon
+            , a_notes_button_icon -- a_notes_button_icon
             , a_require_all_id_search_filters_met -- a_require_all_id_search_filters_met
             , a_require_any_id_search_filters_met -- a_require_any_id_search_filters_met
             , a_require_all_non_id_search_filters_met -- a_require_all_non_id_search_filters_met
@@ -272,105 +300,69 @@ BEGIN
         );
         
         IF a_debug = 1 THEN
-            SELECT COUNT(*) FROM demo.DOG_Location_Temp;
+            SELECT COUNT(*) FROM demo.DOG_Button_Icon_Temp;
-            SELECT * FROM demo.DOG_Location_Temp;
+            SELECT * FROM demo.DOG_Button_Icon_Temp;
-            SELECT COUNT(*) FROM demo.DOG_Location_Link_Temp;
-            SELECT * FROM demo.DOG_Location_Link_Temp;
         END IF;
         
-        INSERT INTO tmp_Location (
+        INSERT INTO tmp_Button_Icon (
-              id_location
+              id_button_icon
+            , id_image
             , code
             , name
+            , notes
             , active
 
             , does_meet_id_filters
             , does_meet_non_id_filters
         )
         SELECT
-              LOCATION_T.id_location
+              BUTTON_ICON_T.id_button_icon
-            , LOCATION_T.code
+            , BUTTON_ICON_T.id_image
-            , LOCATION_T.name
+            , BUTTON_ICON_T.code
-            , LOCATION_T.active
+            , BUTTON_ICON_T.name
+            , BUTTON_ICON_T.notes
+            , BUTTON_ICON_T.active
 
-            , LOCATION_T.does_meet_id_filters
+            , BUTTON_ICON_T.does_meet_id_filters
-            , LOCATION_T.does_meet_non_id_filters
+            , BUTTON_ICON_T.does_meet_non_id_filters
-        FROM demo.DOG_Location_Temp LOCATION_T
+        FROM demo.DOG_Button_Icon_Temp BUTTON_ICON_T
-        WHERE LOCATION_T.GUID = v_guid
+        WHERE BUTTON_ICON_T.GUID = v_guid
-        ;
-        
-        INSERT INTO tmp_Location_Link (
-              id_link
-            , id_location_parent
-            , id_location_child
-            , active
-
-            , does_meet_id_filters
-            , does_meet_non_id_filters
-        )
-        SELECT
-              LOCATION_LINK_T.id_link
-            , LOCATION_LINK_T.id_location_parent
-            , LOCATION_LINK_T.id_location_child
-            , LOCATION_LINK_T.active
-
-            , NULL AS does_meet_id_filters
-            , NULL AS does_meet_non_id_filters
-        FROM demo.DOG_Location_Link_Temp LOCATION_LINK_T
-        WHERE LOCATION_LINK_T.GUID = v_guid
         ;
         
         IF a_debug = 1 THEN
-            SELECT COUNT(*) FROM tmp_Location;
+            SELECT COUNT(*) FROM tmp_Button_Icon;
-            SELECT * FROM tmp_Location;
+            SELECT * FROM tmp_Button_Icon;
-            SELECT COUNT(*) FROM tmp_Location_Link;
-            SELECT * FROM tmp_Location_Link;
         END IF;
     END IF;
     
     -- Filter outputs
     IF EXISTS(SELECT * FROM tmp_Msg_Error t_ERROR INNER JOIN demo.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
         IF a_debug = 1 THEN
-            SELECT * FROM tmp_Location;
+            SELECT * FROM tmp_Button_Icon;
-            SELECT * FROM tmp_Location_Link;
         END IF;
 
-        DELETE FROM tmp_Location_Link;
+        DELETE FROM tmp_Button_Icon;
-        DELETE FROM tmp_Location;
     END IF;
 
 
     -- Outputs
-    -- Locations
+    -- Button_Icons
-    IF a_output_LOCATIONS = 1 THEN
+    SELECT 
-        SELECT 
+          t_BUTTON_ICONS.id_button_icon
-              t_LOCATIONS.id_location
+        , t_BUTTON_ICONS.id_image
-            , t_LOCATIONS.code
+        , IMAGES.path AS path_image
-            , t_LOCATIONS.name
+        , IMAGES.name AS name_image
-            , t_LOCATIONS.active
+        , t_BUTTON_ICONS.code
+        , t_BUTTON_ICONS.name
+        , t_BUTTON_ICONS.notes
+        , t_BUTTON_ICONS.active
 
-            , t_LOCATIONS.does_meet_id_filters
+        , t_BUTTON_ICONS.does_meet_id_filters
-            , t_LOCATIONS.does_meet_non_id_filters
+        , t_BUTTON_ICONS.does_meet_non_id_filters
-        FROM tmp_Location t_LOCATIONS
+    FROM tmp_Button_Icon t_BUTTON_ICONS
-        ORDER BY t_LOCATIONS.name
+    LEFT JOIN demo.DOG_Image IMAGES ON t_BUTTON_ICONS.id_image = IMAGES.id_image
-        ;
+    ORDER BY t_BUTTON_ICONS.name
-    END IF;
+    ;
-
-    -- Location Links
-    IF a_output_LOCATION_links = 1 THEN
-        SELECT 
-              t_LOCATION_LINK.id_link
-            , t_LOCATION_LINK.id_location_parent
-            , t_LOCATION_LINK.id_location_child
-            , t_LOCATION_LINK.active
-
-            , t_LOCATION_LINK.does_meet_id_filters
-            , t_LOCATION_LINK.does_meet_non_id_filters
-        FROM tmp_Location_Link t_LOCATION_LINK
-        INNER JOIN tmp_Location t_LOCATIONS ON t_LOCATION_LINK.id_location_child = t_LOCATIONS.id_location
-        ORDER BY t_LOCATIONS.name
-        ;
-    END IF;
 
     -- Errors
     SELECT 
@@ -388,17 +380,16 @@ BEGIN
 	;
     
     IF a_debug = 1 AND v_can_view = 1 THEN
-        SELECT * FROM tmp_Location;
+        SELECT * FROM tmp_Button_Icon;
     END IF;
 	
-	CALL demo.p_dog_clear_calc_location(
+	CALL demo.p_dog_clear_calc_button_icon(
 		v_guid -- a_guid
         , 0 -- a_debug
 	);
     
     DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error;
-    DROP TEMPORARY TABLE IF EXISTS tmp_Location_Link;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Button_Icon;
-    DROP TEMPORARY TABLE IF EXISTS tmp_Location;
     
     IF a_debug = 1 THEN
 		CALL demo.p_core_debug_timing_reporting ( v_time_start );
@@ -408,35 +399,49 @@ DELIMITER ;
 
 
 
-CALL demo.p_dog_get_many_location (
+CALL demo.p_dog_get_many_button_icon (
 	  1 -- 'auth0|6582b95c895d09a70ba10fef',	-- a_id_user
-    , 1                                     	-- a_get_all_location
+    , 1                                     	-- a_get_all_file_type
-	, 0                                     	-- a_get_inactive_location
+	, 0                                     	-- a_get_inactive_file_type
-	, ''                                    	-- a_ids_location
+	, ''                                    	-- a_ids_file_type
-    , ''                                        -- a_names_location
+    , ''                                        -- a_names_file_type
+    , 1                                     	-- a_get_all_image
+	, 0                                     	-- a_get_inactive_image
+	, ''                                    	-- a_ids_image
+    , ''                                        -- a_names_image
+    , 1                                     	-- a_get_all_button_icon
+	, 0                                     	-- a_get_inactive_button_icon
+	, ''                                    	-- a_ids_button_icon
+    , ''                                        -- a_names_button_icon
+    , ''                                        -- a_notes_button_icon
     , 1                                         -- a_require_all_id_search_filters_met
     , 1                                         -- a_require_any_id_search_filters_met
     , 0                                         -- a_require_all_non_id_search_filters_met
     , 1                                         -- a_require_any_non_id_search_filters_met
-    , 1                                     	-- a_output_LOCATIONS
+    , 1                                     	-- a_debug
-    , 1                                     	-- a_output_LOCATION_links
-    , 0                                     	-- a_debug
 );
 
-/*
 
-CALL demo.p_dog_get_many_location (
+/*
+CALL demo.p_dog_get_many_button_icon (
 	  1 -- 'auth0|6582b95c895d09a70ba10fef',	-- a_id_user
-    , 1                                     	-- a_get_all_location
+    , 1                                     	-- a_get_all_file_type
-	, 0                                     	-- a_get_inactive_location
+	, 0                                     	-- a_get_inactive_file_type
-	, ''                                    	-- a_ids_location
+	, ''                                    	-- a_ids_file_type
-    , 'pat,point'                                        -- a_names_location
+    , 'pat,point'                                        -- a_names_file_type
+    , 1                                     	-- a_get_all_image
+	, 0                                     	-- a_get_inactive_image
+	, ''                                    	-- a_ids_image
+    , 'pat,point'                                        -- a_names_image
+    , 1                                     	-- a_get_all_button_icon
+	, 0                                     	-- a_get_inactive_button_icon
+	, ''                                    	-- a_ids_button_icon
+    , 'pat,point'                                        -- a_names_button_icon
+    , 'pat,point'                                        -- a_notes_button_icon
     , 1                                         -- a_require_all_id_search_filters_met
     , 1                                         -- a_require_any_id_search_filters_met
     , 0                                         -- a_require_all_non_id_search_filters_met
     , 1                                         -- a_require_any_non_id_search_filters_met
-    , 1                                     	-- a_output_LOCATIONS
-    , 1                                     	-- a_output_LOCATION_links
     , 1                                     	-- a_debug
 );
 

static/MySQL/10000_tbl_CORE_Msg_Error_Type.sql

@@ -10,7 +10,7 @@ WHERE
 
 CREATE TABLE IF NOT EXISTS parts.CORE_Msg_Error_Type (
 	  id_type INT NOT NULL AUTO_INCREMENT PRIMARY KEY
-	, code VARCHAR(100) NOT NULL
+	, code VARCHAR(250) NOT NULL
 	, name VARCHAR(500) NOT NULL
 	, description VARCHAR(1000)
     , is_breaking_error BIT NOT NULL

static/MySQL/10004_tbl_CORE_File_Type.sql

@@ -10,7 +10,7 @@ WHERE
 
 CREATE TABLE IF NOT EXISTS parts.CORE_File_Type (
 	  id_file_type INT NOT NULL AUTO_INCREMENT PRIMARY KEY
-	, code VARCHAR(100) NOT NULL
+	, code VARCHAR(250) NOT NULL
     , name VARCHAR(250) NOT NULL
     , is_image BIT NOT NULL DEFAULT 0
     , active BIT NOT NULL DEFAULT 1

static/MySQL/10504_tbl_DOG_Access_Level.sql

@@ -10,7 +10,7 @@ WHERE
 
 CREATE TABLE IF NOT EXISTS parts.DOG_Access_Level (
       id_access_level INT NOT NULL AUTO_INCREMENT PRIMARY KEY
-    , code VARCHAR(100)
+    , code VARCHAR(250)
     , name VARCHAR(250)
     , priority INT NOT NULL
     , display_order INT NOT NULL

static/MySQL/10508_tbl_DOG_Permission_Group.sql

@@ -10,7 +10,7 @@ WHERE
 
 CREATE TABLE IF NOT EXISTS parts.DOG_Permission_Group (
       id_group INT NOT NULL AUTO_INCREMENT PRIMARY KEY
-    , code VARCHAR(100)
+    , code VARCHAR(250)
     , name VARCHAR(250)
     , display_order INT NOT NULL
     , active BIT NOT NULL DEFAULT 1

static/MySQL/10512_tbl_DOG_Permission.sql

@@ -10,7 +10,7 @@ WHERE
 
 CREATE TABLE IF NOT EXISTS parts.DOG_Permission (
       id_permission INT NOT NULL AUTO_INCREMENT PRIMARY KEY
-    , code VARCHAR(100)
+    , code VARCHAR(250)
     , name VARCHAR(250)
     , id_permission_group INT NOT NULL
     , CONSTRAINT FK_DOG_Permission_id_permission_group

static/MySQL/10520_tbl_DOG_Role.sql

@@ -10,7 +10,7 @@ WHERE
 
 CREATE TABLE IF NOT EXISTS parts.DOG_Role (
       id_role INT NOT NULL AUTO_INCREMENT PRIMARY KEY
-    , code VARCHAR(100)
+    , code VARCHAR(250)
     , name VARCHAR(250)
     , display_order INT NOT NULL
     , active BIT NOT NULL DEFAULT 1

static/MySQL/11005_tbl_DOG_Breed.sql

@@ -10,7 +10,7 @@ WHERE
 
 CREATE TABLE IF NOT EXISTS parts.DOG_Breed (
 	  id_breed INT NOT NULL AUTO_INCREMENT PRIMARY KEY
-    , code VARCHAR(100) NOT NULL
+    , code VARCHAR(250) NOT NULL
     , name VARCHAR(250) NOT NULL
     , active BIT NOT NULL DEFAULT 1
 	, created_on DATETIME

static/MySQL/11007_tbl_DOG_Breed_Temp.sql

@@ -11,7 +11,7 @@ WHERE
 CREATE TABLE IF NOT EXISTS parts.DOG_Breed_Temp (
 	  id_temp INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 	, id_breed INT
-    , code VARCHAR(100)
+    , code VARCHAR(250)
 	, name VARCHAR(250)
 	, active BIT
     , guid BINARY(36)

static/MySQL/11030_tbl_DOG_Drive.sql

@@ -10,7 +10,7 @@ WHERE
 
 CREATE TABLE IF NOT EXISTS parts.DOG_Drive (
 	  id_drive INT NOT NULL AUTO_INCREMENT PRIMARY KEY
-    , code VARCHAR(100) NOT NULL
+    , code VARCHAR(250) NOT NULL
     , name VARCHAR(250) NOT NULL
     , active BIT NOT NULL DEFAULT 1
 	, created_on DATETIME

static/MySQL/11032_tbl_DOG_Drive_Temp.sql

@@ -11,7 +11,7 @@ WHERE
 CREATE TABLE IF NOT EXISTS parts.DOG_Drive_Temp (
 	  id_temp INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 	, id_drive INT
-    , code VARCHAR(100)
+    , code VARCHAR(250)
     , name VARCHAR(250)
 	, active BIT
     , guid BINARY(36)

static/MySQL/11100_tbl_DOG_Command_Category.sql

@@ -10,7 +10,7 @@ WHERE
 
 CREATE TABLE IF NOT EXISTS parts.DOG_Command_Category (
 	  id_command_category INT NOT NULL AUTO_INCREMENT PRIMARY KEY
-    , code VARCHAR(100) NOT NULL
+    , code VARCHAR(250) NOT NULL
     , name VARCHAR(250) NOT NULL
     , active BIT NOT NULL DEFAULT 1
 	, created_on DATETIME

static/MySQL/11102_tbl_DOG_Command_Category_Temp.sql

@@ -11,7 +11,7 @@ WHERE
 CREATE TABLE IF NOT EXISTS parts.DOG_Command_Category_Temp (
 	  id_temp INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 	, id_command_category INT
-	, code VARCHAR(100)
+	, code VARCHAR(250)
 	, name VARCHAR(250)
 	, active BIT
     , guid BINARY(36)

static/MySQL/11111_tbl_DOG_Command_Modality.sql

@@ -10,7 +10,7 @@ WHERE
 
 CREATE TABLE IF NOT EXISTS parts.DOG_Command_Modality (
 	  id_command_modality INT NOT NULL AUTO_INCREMENT PRIMARY KEY
-    , code VARCHAR(100) NOT NULL
+    , code VARCHAR(250) NOT NULL
     , name VARCHAR(250) NOT NULL
     , active BIT NOT NULL DEFAULT 1
 	, created_on DATETIME

static/MySQL/11113_tbl_DOG_Command_Modality_Temp.sql

@@ -11,7 +11,7 @@ WHERE
 CREATE TABLE IF NOT EXISTS parts.DOG_Command_Modality_Temp (
 	  id_temp INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 	, id_command_modality INT
-    , code VARCHAR(100)
+    , code VARCHAR(250)
 	, name VARCHAR(250)
 	, active BIT
     , guid BINARY(36)

static/MySQL/11200_tbl_DOG_Location.sql

@@ -11,7 +11,7 @@ WHERE
 CREATE TABLE IF NOT EXISTS parts.DOG_Location (
 	  id_location INT NOT NULL AUTO_INCREMENT PRIMARY KEY
     , id_locaiton_parent INT
-    , code VARCHAR(100) NOT NULL
+    , code VARCHAR(250) NOT NULL
     , name VARCHAR(250) NOT NULL
     , active BIT NOT NULL DEFAULT 1
 	, created_on DATETIME

static/MySQL/11202_tbl_DOG_Location_Temp.sql

@@ -12,7 +12,7 @@ CREATE TABLE IF NOT EXISTS parts.DOG_Location_Temp (
 	  id_temp INT NOT NULL PRIMARY KEY AUTO_INCREMENT
     , id_location INT
     , id_location_parent INT
-    , code VARCHAR(100)
+    , code VARCHAR(250)
     , name VARCHAR(250)
 	, active BIT
 

static/MySQL/11220_tbl_DOG_Button_Shape.sql

@@ -10,9 +10,9 @@ WHERE
 
 CREATE TABLE IF NOT EXISTS parts.DOG_Button_Shape (
 	  id_button_shape INT NOT NULL AUTO_INCREMENT PRIMARY KEY
-    , code VARCHAR(100) NOT NULL
+    , code VARCHAR(250) NOT NULL
     , name VARCHAR(250) NOT NULL
-    , description TEXT
+    , notes TEXT
     , active BIT NOT NULL DEFAULT 1
 	, created_on DATETIME
     , id_user_created_by INT

static/MySQL/11222_tbl_DOG_Button_Shape_Temp.sql

@@ -11,9 +11,13 @@ WHERE
 CREATE TABLE IF NOT EXISTS parts.DOG_Button_Shape_Temp (
 	  id_temp INT NOT NULL PRIMARY KEY AUTO_INCREMENT
     , id_button_shape INT
-    , code VARCHAR(100)
+    , code VARCHAR(250)
     , name VARCHAR(250)
-    , description TEXT
+    , notes TEXT
 	, active BIT
+
+    , does_meet_id_filters BIT
+    , does_meet_non_id_filters BIT
+    
     , guid BINARY(36)
 );

static/MySQL/11224_tbl_DOG_Colour.sql

@@ -10,7 +10,7 @@ WHERE
 
 CREATE TABLE IF NOT EXISTS parts.DOG_Colour (
 	  id_colour INT NOT NULL AUTO_INCREMENT PRIMARY KEY
-    , code VARCHAR(100) NOT NULL
+    , code VARCHAR(250) NOT NULL
     , name VARCHAR(250) NOT NULL
     , active BIT NOT NULL DEFAULT 1
 	, created_on DATETIME

static/MySQL/11226_tbl_DOG_Colour_Temp.sql

@@ -11,8 +11,12 @@ WHERE
 CREATE TABLE IF NOT EXISTS parts.DOG_Colour_Temp (
 	  id_temp INT NOT NULL PRIMARY KEY AUTO_INCREMENT
     , id_colour INT
-    , code VARCHAR(100)
+    , code VARCHAR(250)
     , name VARCHAR(250)
 	, active BIT
+
+    , does_meet_id_filters BIT
+    , does_meet_non_id_filters BIT
+    
     , guid BINARY(36)
 );

static/MySQL/11228_tbl_DOG_Image.sql

@@ -19,6 +19,7 @@ CREATE TABLE IF NOT EXISTS parts.DOG_Image (
         FOREIGN KEY (id_dog)
         REFERENCES parts.DOG_Dog(id_dog)
     , path VARCHAR(1024) NOT NULL
+    , name VARCHAR(1024) NOT NULL
     , display_order INT
     , active BIT NOT NULL DEFAULT 1
 	, created_on DATETIME

static/MySQL/11230_tbl_DOG_Image_Temp.sql

@@ -14,7 +14,12 @@ CREATE TABLE IF NOT EXISTS parts.DOG_Image_Temp (
     , id_file_type INT NOT NULL
     , id_dog INT
     , path VARCHAR(1024) NOT NULL
+    , name VARCHAR(1024) NOT NULL
     , display_order INT
 	, active BIT
+
+    , does_meet_id_filters BIT
+    , does_meet_non_id_filters BIT
+    
     , guid BINARY(36)
 );

static/MySQL/11232_tbl_DOG_Button_Icon.sql

@@ -14,9 +14,9 @@ CREATE TABLE IF NOT EXISTS parts.DOG_Button_Icon (
     , CONSTRAINT FK_DOG_Button_Icon_id_image
         FOREIGN KEY (id_image)
         REFERENCES parts.DOG_Image(id_image)
-    , code VARCHAR(100) NOT NULL
+    , code VARCHAR(250) NOT NULL
     , name VARCHAR(250) NOT NULL
-    , description TEXT
+    , notes TEXT
     , active BIT NOT NULL DEFAULT 1
 	, created_on DATETIME
     , id_user_created_by INT

static/MySQL/11234_tbl_DOG_Button_Icon_Temp.sql

@@ -12,9 +12,13 @@ CREATE TABLE IF NOT EXISTS parts.DOG_Button_Icon_Temp (
 	  id_temp INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 	, id_button_icon INT
     , id_image INT
-    , code VARCHAR(100)
+    , code VARCHAR(250)
     , name VARCHAR(250)
-    , description TEXT
+    , notes TEXT
 	, active BIT
+
+    , does_meet_id_filters BIT
+    , does_meet_non_id_filters BIT
+    
     , guid BINARY(36)
 );

static/MySQL/11238_tbl_DOG_Command_Button_Link_Temp.sql

@@ -18,5 +18,9 @@ CREATE TABLE IF NOT EXISTS parts.DOG_Command_Button_Link_Temp (
 	, id_location INT
     , has_button BIT
 	, active BIT
+
+    , does_meet_id_filters BIT
+    , does_meet_non_id_filters BIT
+    
     , guid BINARY(36)
 );

static/MySQL/11300_tbl_DOG_Weather.sql

@@ -10,7 +10,7 @@ WHERE
 
 CREATE TABLE IF NOT EXISTS parts.DOG_Weather (
 	  id_weather INT NOT NULL AUTO_INCREMENT PRIMARY KEY
-    , code VARCHAR(100) NOT NULL
+    , code VARCHAR(250) NOT NULL
     , name VARCHAR(250) NOT NULL
     , active BIT NOT NULL DEFAULT 1
 	, created_on DATETIME

static/MySQL/11302_tbl_DOG_Weather_Temp.sql

@@ -11,7 +11,7 @@ WHERE
 CREATE TABLE IF NOT EXISTS parts.DOG_Weather_Temp (
 	  id_temp INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 	, id_weather INT
-    , code VARCHAR(100)
+    , code VARCHAR(250)
 	, name VARCHAR(250)
 	, active BIT
     , guid BINARY(36)

static/MySQL/11304_tbl_DOG_Lighting_Level.sql

@@ -10,7 +10,7 @@ WHERE
 
 CREATE TABLE IF NOT EXISTS parts.DOG_Lighting_Level (
 	  id_lighting_level INT NOT NULL AUTO_INCREMENT PRIMARY KEY
-    , code VARCHAR(100) NOT NULL
+    , code VARCHAR(250) NOT NULL
     , name VARCHAR(250) NOT NULL
     , active BIT NOT NULL DEFAULT 1
 	, created_on DATETIME

static/MySQL/11306_tbl_DOG_Lighting_Level_Temp.sql

@@ -11,7 +11,7 @@ WHERE
 CREATE TABLE IF NOT EXISTS parts.DOG_Lighting_Level_Temp (
 	  id_temp INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 	, id_lighting_level INT
-    , code VARCHAR(100)
+    , code VARCHAR(250)
 	, name VARCHAR(250)
 	, active BIT
     , guid BINARY(36)

static/MySQL/11312_tbl_DOG_Distraction_Type.sql

@@ -10,7 +10,7 @@ WHERE
 
 CREATE TABLE IF NOT EXISTS parts.DOG_Distraction_Type (
 	  id_type INT NOT NULL AUTO_INCREMENT PRIMARY KEY
-    , code VARCHAR(100) NOT NULL
+    , code VARCHAR(250) NOT NULL
     , name VARCHAR(250) NOT NULL
     , active BIT NOT NULL DEFAULT 1
 	, created_on DATETIME

static/MySQL/11314_tbl_DOG_Distraction_Type_Temp.sql

@@ -11,7 +11,7 @@ WHERE
 CREATE TABLE IF NOT EXISTS parts.DOG_Distraction_Type_Temp (
 	  id_temp INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 	, id_type INT
-    , code VARCHAR(100)
+    , code VARCHAR(250)
 	, name VARCHAR(250)
 	, active BIT
     , guid BINARY(36)

static/MySQL/11316_tbl_DOG_Distraction_Intensity_Level.sql

@@ -10,7 +10,7 @@ WHERE
 
 CREATE TABLE IF NOT EXISTS parts.DOG_Distraction_Intensity_Level (
 	  id_intensity_level INT NOT NULL AUTO_INCREMENT PRIMARY KEY
-    , code VARCHAR(100) NOT NULL
+    , code VARCHAR(250) NOT NULL
     , name VARCHAR(250) NOT NULL
     , active BIT NOT NULL DEFAULT 1
 	, created_on DATETIME

static/MySQL/11318_tbl_DOG_Distraction_Intensity_Level_Temp.sql

@@ -11,7 +11,7 @@ WHERE
 CREATE TABLE IF NOT EXISTS parts.DOG_Distraction_Intensity_Level_Temp (
 	  id_temp INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 	, id_intensity_level INT
-    , code VARCHAR(100)
+    , code VARCHAR(250)
 	, name VARCHAR(250)
 	, active BIT
     , guid BINARY(36)

static/MySQL/11324_tbl_DOG_Bribe.sql

@@ -10,7 +10,7 @@ WHERE
 
 CREATE TABLE IF NOT EXISTS parts.DOG_Bribe (
 	  id_bribe INT NOT NULL AUTO_INCREMENT PRIMARY KEY
-    , code VARCHAR(100) NOT NULL
+    , code VARCHAR(250) NOT NULL
     , name VARCHAR(250) NOT NULL
     , active BIT NOT NULL DEFAULT 1
 	, created_on DATETIME

static/MySQL/11326_tbl_DOG_Bribe_Temp.sql

@@ -11,7 +11,7 @@ WHERE
 CREATE TABLE IF NOT EXISTS parts.DOG_Bribe_Temp (
 	  id_temp INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 	, id_bribe INT
-    , code VARCHAR(100)
+    , code VARCHAR(250)
 	, name VARCHAR(250)
 	, active BIT
     , guid BINARY(36)

static/MySQL/11332_tbl_DOG_Response_Quality_Metric.sql

@@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS parts.DOG_Response_Quality_Metric (
     , CONSTRAINT FK_DOG_Response_Quality_Metric_id_unit_measurement
 		FOREIGN KEY (id_unit_measurement)
         REFERENCES parts.DOG_Unit_Measurement(id_unit_measurement)
-    , code VARCHAR(100) NOT NULL
+    , code VARCHAR(250) NOT NULL
     , name VARCHAR(250) NOT NULL
     , value_min DOUBLE
     , value_max DOUBLE

static/MySQL/11334_tbl_DOG_Response_Quality_Metric_Temp.sql

@@ -12,7 +12,7 @@ CREATE TABLE IF NOT EXISTS parts.DOG_Response_Quality_Metric_Temp (
 	  id_temp INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 	, id_metric INT
     , id_unit_measurement INT
-    , code VARCHAR(100)
+    , code VARCHAR(250)
 	, name VARCHAR(250)
     , value_min DOUBLE
     , value_max DOUBLE

static/MySQL/11336_tbl_DOG_Obedience_Level.sql

@@ -10,7 +10,7 @@ WHERE
 
 CREATE TABLE IF NOT EXISTS parts.DOG_Obedience_Level (
 	  id_obedience_level INT NOT NULL AUTO_INCREMENT PRIMARY KEY
-    , code VARCHAR(100) NOT NULL
+    , code VARCHAR(250) NOT NULL
     , name VARCHAR(250) NOT NULL
     , active BIT NOT NULL DEFAULT 1
 	, created_on DATETIME

static/MySQL/11338_tbl_DOG_Obedience_Level_Temp.sql

@@ -11,7 +11,7 @@ WHERE
 CREATE TABLE IF NOT EXISTS parts.DOG_Obedience_Level_Temp (
 	  id_temp INT NOT NULL PRIMARY KEY AUTO_INCREMENT
     , id_obedience_level INT  
-    , code VARCHAR(100)
+    , code VARCHAR(250)
     , name VARCHAR(250)
 	, active BIT
     , guid BINARY(36)

static/MySQL/31228_tri_DOG_Image.sql

@@ -42,6 +42,10 @@ BEGIN
 	SELECT NEW.id_image, 'path', OLD.path, NEW.path, NEW.id_change_set
 		WHERE NOT (OLD.path <=> NEW.path)
 	UNION
+	-- Changed name
+	SELECT NEW.id_image, 'name', OLD.name, NEW.name, NEW.id_change_set
+		WHERE NOT (OLD.name <=> NEW.name)
+	UNION
 	-- Changed display_order
 	SELECT NEW.id_image, 'display_order', CONVERT(OLD.display_order, CHAR), CONVERT(NEW.display_order, CHAR), NEW.id_change_set
 		WHERE NOT (OLD.display_order <=> NEW.display_order)

static/MySQL/31232_tri_DOG_Button_Icon.sql

@@ -42,9 +42,9 @@ BEGIN
 	SELECT NEW.id_button_icon, 'name', OLD.name, NEW.name, NEW.id_change_set
 		WHERE NOT (OLD.name <=> NEW.name)
 	UNION
-	-- Changed description
+	-- Changed notes
-	SELECT NEW.id_button_icon, 'description', OLD.description, NEW.description, NEW.id_change_set
+	SELECT NEW.id_button_icon, 'notes', OLD.notes, NEW.notes, NEW.id_change_set
-		WHERE NOT (OLD.description <=> NEW.description)
+		WHERE NOT (OLD.notes <=> NEW.notes)
 	UNION
 	-- Changed active
 	SELECT NEW.id_button_icon, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set

static/MySQL/70516_p_dog_create_new_user_auth0.sql

@@ -45,7 +45,7 @@ BEGIN
 		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
 			  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 			, id_type INT NULL
-			, code VARCHAR(100) NOT NULL
+			, code VARCHAR(250) NOT NULL
 			, msg TEXT NOT NULL
 		);
 
@@ -122,7 +122,7 @@ BEGIN
 	CREATE TEMPORARY TABLE tmp_Msg_Error (
 		  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 		, id_type INT NOT NULL
-        , code VARCHAR(100) NOT NULL
+        , code VARCHAR(250) NOT NULL
         , msg TEXT NOT NULL
 	);
     

static/MySQL/70516_p_dog_get_many_user.sql

@@ -53,7 +53,7 @@ BEGIN
 		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
 			  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 			, id_type INT NULL
-			, code VARCHAR(100) NOT NULL
+			, code VARCHAR(250) NOT NULL
 			, msg TEXT NOT NULL
 		);
 
@@ -164,7 +164,7 @@ BEGIN
 	CREATE TEMPORARY TABLE tmp_Msg_Error (
 		  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 		, id_type INT NOT NULL
-        , code VARCHAR(100) NOT NULL
+        , code VARCHAR(250) NOT NULL
         , msg TEXT NOT NULL
 	);
 

static/MySQL/70518_p_dog_save_user.sql

@@ -33,7 +33,7 @@ BEGIN
 		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
 			display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 			, id_type INT NULL
-			, code VARCHAR(100) NOT NULL
+			, code VARCHAR(250) NOT NULL
 			, msg TEXT NOT NULL
 		);
         INSERT INTO tmp_Msg_Error (
@@ -81,7 +81,7 @@ BEGIN
     CREATE TABLE tmp_Msg_Error (
 		display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT,
 		id_type INT NOT NULL,
-        code VARCHAR(100) NOT NULL,
+        code VARCHAR(250) NOT NULL,
 		msg TEXT NOT NULL
     );
     

static/MySQL/70530_p_dog_calc_user.sql

@@ -54,7 +54,7 @@ BEGIN
 		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error_Calc_User (
 			  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 			, id_type INT NULL
-			, code VARCHAR(100) NOT NULL
+			, code VARCHAR(250) NOT NULL
 			, msg TEXT NOT NULL
 		);
 
@@ -170,7 +170,7 @@ BEGIN
 	CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error_Calc_User (
 		  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 		, id_type INT NULL
-        , code VARCHAR(100) NOT NULL
+        , code VARCHAR(250) NOT NULL
         , msg TEXT NOT NULL
 	);
     

static/MySQL/71001_p_dog_calc_dog.sql

@@ -44,7 +44,7 @@ BEGIN
 		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error_Calc_Dog (
 			  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 			, id_type INT NULL
-			, code VARCHAR(100) NOT NULL
+			, code VARCHAR(250) NOT NULL
 			, msg TEXT NOT NULL
 		);
 
@@ -138,7 +138,7 @@ BEGIN
 	CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error_Calc_Dog (
           id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 		, id_type INT NULL
-		, code VARCHAR(100) NOT NULL
+		, code VARCHAR(250) NOT NULL
         , msg TEXT NOT NULL
 	);
     

static/MySQL/71001_p_dog_get_many_dog.sql

@@ -41,7 +41,7 @@ BEGIN
 		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
 			  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 			, id_type INT NULL
-			, code VARCHAR(100) NOT NULL
+			, code VARCHAR(250) NOT NULL
 			, msg TEXT NOT NULL
 		);
 
@@ -138,7 +138,7 @@ BEGIN
 	CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
           id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 		, id_type INT NULL
-		, code VARCHAR(100) NOT NULL
+		, code VARCHAR(250) NOT NULL
         , msg TEXT NOT NULL
     );
     

static/MySQL/71003_p_dog_save_command.sql

@@ -35,7 +35,7 @@ BEGIN
 		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
 			  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 			, id_type INT NULL
-			, code VARCHAR(100)
+			, code VARCHAR(250)
 			, msg TEXT NOT NULL
 		);
 
@@ -115,7 +115,7 @@ BEGIN
 	CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
 		  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 		, id_type INT NULL
-        , code VARCHAR(100)
+        , code VARCHAR(250)
         , msg TEXT NOT NULL
 	);
         

static/MySQL/71102_p_dog_save_command_category.sql

@@ -33,7 +33,7 @@ BEGIN
 		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
 			  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 			, id_type INT NULL
-			, code VARCHAR(100)
+			, code VARCHAR(250)
 			, msg TEXT NOT NULL
 		);
 
@@ -83,7 +83,7 @@ BEGIN
     CREATE TEMPORARY TABLE tmp_Command_Category (
           id_temp INT
         , id_command_category INT
-        , code VARCHAR(100)
+        , code VARCHAR(250)
         , name VARCHAR(250)
         , active BIT
         , is_new BIT
@@ -93,7 +93,7 @@ BEGIN
     CREATE TEMPORARY TABLE tmp_Command_Category_Copy (
           id_temp INT
         , id_command_category INT
-        , code VARCHAR(100)
+        , code VARCHAR(250)
         , name VARCHAR(250)
         , active BIT
         , is_new BIT
@@ -103,7 +103,7 @@ BEGIN
 	CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
 		  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 		, id_type INT NULL
-        , code VARCHAR(100)
+        , code VARCHAR(250)
         , msg TEXT NOT NULL
 	);
         

static/MySQL/71104_p_dog_calc_command.sql

@@ -54,7 +54,7 @@ BEGIN
 		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error_Calc_Command (
 			  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 			, id_type INT NULL
-			, code VARCHAR(100) NOT NULL
+			, code VARCHAR(250) NOT NULL
 			, msg TEXT NOT NULL
 		);
 
@@ -172,7 +172,7 @@ BEGIN
 	CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error_Calc_Command (
           id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 		, id_type INT NULL
-		, code VARCHAR(100) NOT NULL
+		, code VARCHAR(250) NOT NULL
         , msg TEXT NOT NULL
 	);
     

static/MySQL/71104_p_dog_get_many_command.sql

@@ -49,7 +49,7 @@ BEGIN
 		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
 			  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 			, id_type INT NULL
-			, code VARCHAR(100) NOT NULL
+			, code VARCHAR(250) NOT NULL
 			, msg TEXT NOT NULL
 		);
 
@@ -150,7 +150,7 @@ BEGIN
     
     CREATE TEMPORARY TABLE tmp_Command_Category (
 		  id_command_category INT NOT NULL
-        , code VARCHAR(100)
+        , code VARCHAR(250)
         , name VARCHAR(250)
         , active BIT
 
@@ -174,7 +174,7 @@ BEGIN
 	CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
           id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 		, id_type INT NULL
-		, code VARCHAR(100) NOT NULL
+		, code VARCHAR(250) NOT NULL
         , msg TEXT NOT NULL
     );
     

static/MySQL/71108_p_dog_get_many_dog_command_link.sql

@@ -69,7 +69,7 @@ BEGIN
 		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
 			  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 			, id_type INT NULL
-			, code VARCHAR(100) NOT NULL
+			, code VARCHAR(250) NOT NULL
 			, msg TEXT NOT NULL
 		);
 
@@ -234,7 +234,7 @@ BEGIN
     
     CREATE TEMPORARY TABLE tmp_Command_Category (
 		  id_command_category INT NOT NULL
-        , code VARCHAR(100)
+        , code VARCHAR(250)
         , name VARCHAR(250)
         , active BIT
 
@@ -258,7 +258,7 @@ BEGIN
 	CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
           id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 		, id_type INT NULL
-		, code VARCHAR(100) NOT NULL
+		, code VARCHAR(250) NOT NULL
         , msg TEXT NOT NULL
 	);
     
@@ -368,9 +368,9 @@ BEGIN
                 , a_ids_dog -- a_ids_dog
                 , a_names_dog -- a_names_dog
                 , a_require_all_id_search_filters_met -- a_require_all_id_search_filters_met
-                , a_require_any_id_search_filters_met -- a_require_any_id_search_filters_met
+                , 0 -- a_require_any_id_search_filters_met
                 , a_require_all_non_id_search_filters_met -- a_require_all_non_id_search_filters_met
-                , a_require_any_non_id_search_filters_met -- a_require_any_non_id_search_filters_met
+                , 0 -- a_require_any_non_id_search_filters_met
                 , 0 -- a_show_errors
                 , 0 -- a_debug
             ;
@@ -732,7 +732,7 @@ BEGIN
                 (
                     a_require_all_id_search_filters_met = 1
                 AND (
-                        IFNULL(t_DOG_COMMAND_LINK.does_meet_id_filters, 0) = 0
+                        t_DOG_COMMAND_LINK.does_meet_id_filters = 0
                     OR  IFNULL(t_DOG.does_meet_id_filters, 0) = 0
                     OR  IFNULL(t_COMMAND.does_meet_id_filters, 0) = 0
                     OR  IFNULL(t_COMMAND_CATEGORY.does_meet_id_filters, 0) = 0
@@ -741,7 +741,7 @@ BEGIN
             OR  (
                     a_require_all_non_id_search_filters_met = 1
                 AND (
-                        IFNULL(t_DOG_COMMAND_LINK.does_meet_non_id_filters, 0) = 0
+                        t_DOG_COMMAND_LINK.does_meet_non_id_filters = 0
                     OR  IFNULL(t_DOG.does_meet_non_id_filters, 0) = 0
                     OR  IFNULL(t_COMMAND.does_meet_non_id_filters, 0) = 0
                     OR  IFNULL(t_COMMAND_CATEGORY.does_meet_non_id_filters, 0) = 0
@@ -749,14 +749,14 @@ BEGIN
             )
             OR  (
                     a_require_any_id_search_filters_met = 1
-                AND IFNULL(t_DOG_COMMAND_LINK.does_meet_id_filters, 0) = 0
+                AND t_DOG_COMMAND_LINK.does_meet_id_filters = 0
                 AND IFNULL(t_DOG.does_meet_id_filters, 0) = 0
                 AND IFNULL(t_COMMAND.does_meet_id_filters, 0) = 0
                 AND IFNULL(t_COMMAND_CATEGORY.does_meet_id_filters, 0) = 0
             )
             OR  (
                     a_require_any_non_id_search_filters_met = 1
-                AND IFNULL(t_DOG_COMMAND_LINK.does_meet_non_id_filters, 0) = 0
+                AND t_DOG_COMMAND_LINK.does_meet_non_id_filters = 0
                 AND IFNULL(t_DOG.does_meet_non_id_filters, 0) = 0
                 AND IFNULL(t_COMMAND.does_meet_non_id_filters, 0) = 0
                 AND IFNULL(t_COMMAND_CATEGORY.does_meet_non_id_filters, 0) = 0
@@ -840,6 +840,9 @@ BEGIN
         SELECT * FROM tmp_Command;
         SELECT * FROM tmp_Command_Category;
     END IF;
+
+    CALL parts.p_dog_clear_calc_dog ( v_guid, 0 );
+    CALL parts.p_dog_clear_calc_command ( v_guid, 0 );
     
     DROP TEMPORARY TABLE IF EXISTS tmp_Split_Notes_Calc_Dog_Command_Link;
     DROP TEMPORARY TABLE IF EXISTS tmp_Split_Hand_Signal_Description_Calc_Dog_Command_Link;

static/MySQL/71110_p_dog_save_dog_command_link.sql

@@ -33,7 +33,7 @@ BEGIN
 		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
 			  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 			, id_type INT NULL
-			, code VARCHAR(100)
+			, code VARCHAR(250)
 			, msg TEXT NOT NULL
 		);
 
@@ -107,7 +107,7 @@ BEGIN
 	CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
 		  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 		, id_type INT NULL
-        , code VARCHAR(100)
+        , code VARCHAR(250)
         , msg TEXT NOT NULL
 	);
         

static/MySQL/71200_p_dog_calc_location.sql

@@ -44,7 +44,7 @@ BEGIN
 		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error_Calc_Location (
 			  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 			, id_type INT NULL
-			, code VARCHAR(100) NOT NULL
+			, code VARCHAR(250) NOT NULL
 			, msg TEXT NOT NULL
 		);
 
@@ -133,6 +133,7 @@ BEGIN
     
     CREATE TEMPORARY TABLE tmp_Location_Calc_Location (
 		  id_location INT NOT NULL
+        , id_location_parent INT
         , does_meet_id_filters BIT NOT NULL
         , does_meet_non_id_filters BIT NOT NULL
 		, csv_id_locations_parent TEXT
@@ -151,7 +152,7 @@ BEGIN
 	CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error_Calc_Location (
           id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 		, id_type INT NULL
-		, code VARCHAR(100) NOT NULL
+		, code VARCHAR(250) NOT NULL
         , msg TEXT NOT NULL
 	);
     
@@ -317,6 +318,7 @@ BEGIN
             END IF;
 			INSERT INTO tmp_Location_Calc_Location (
 				  id_location
+                , id_location_parent
                 , does_meet_id_filters
                 , does_meet_non_id_filters
 			)
@@ -356,6 +358,7 @@ BEGIN
                 )
             SELECT 
                   LOCATIONS.id_location
+                , LOCATIONS.id_location_parent
                 , CASE WHEN 
                         v_has_filter_location_id = 0 
                     OR  IFNULL(LOCATIONS_FILTERS.does_meet_id_filter, 0) = 1
@@ -555,6 +558,7 @@ BEGIN
         INSERT INTO parts.DOG_Location_Temp (
               guid
             , id_location
+            , id_location_parent
             , code
             , name
             , active
@@ -567,6 +571,7 @@ BEGIN
         SELECT 
               a_guid
             , t_LOCATIONS.id_location
+            , t_LOCATIONS.id_location_parent
             , LOCATIONS.code
             , LOCATIONS.name
             , LOCATIONS.active
@@ -619,7 +624,7 @@ DELIMITER ;
 
 
 CALL parts.p_dog_calc_location (
-      'slops                               ' -- a_guid
+      'grops                               ' -- a_guid
 	, 1 -- 'auth0|6582b95c895d09a70ba10fef',	-- a_id_user
     , 1                                     	-- a_get_all_location
 	, 0                                     	-- a_get_inactive_location
@@ -634,7 +639,7 @@ CALL parts.p_dog_calc_location (
 );
 
 CALL parts.p_dog_calc_location (
-      'slops                               ' -- a_guid
+      'grops                               ' -- a_guid
 	, 1 -- 'auth0|6582b95c895d09a70ba10fef',	-- a_id_user
     , 1                                     	-- a_get_all_location
 	, 0                                     	-- a_get_inactive_location
@@ -659,7 +664,7 @@ WHERE
 ;
 */
 CALL parts.p_dog_clear_calc_location (
-	'slips                               ' -- a_guid
+	'grops                               ' -- a_guid
     , 1 -- debug
 );
 

static/MySQL/71200_p_dog_get_many_location.sql

@@ -42,7 +42,7 @@ BEGIN
 		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
 			  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 			, id_type INT NULL
-			, code VARCHAR(100) NOT NULL
+			, code VARCHAR(250) NOT NULL
 			, msg TEXT NOT NULL
 		);
 
@@ -130,7 +130,8 @@ BEGIN
     
     CREATE TEMPORARY TABLE tmp_Location (
 		  id_location INT NOT NULL
-		, code VARCHAR(100)
+        , id_location_parent INT
+		, code VARCHAR(250)
         , name VARCHAR(250)
         , active BIT
 
@@ -141,7 +142,7 @@ BEGIN
 	CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
           id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
 		, id_type INT NULL
-		, code VARCHAR(100) NOT NULL
+		, code VARCHAR(250) NOT NULL
         , msg TEXT NOT NULL
     );
     
@@ -264,6 +265,7 @@ BEGIN
         
         INSERT INTO tmp_Location (
               id_location
+            , id_location_parent
             , code
             , name
             , active
@@ -273,6 +275,7 @@ BEGIN
         )
         SELECT
               LOCATION_T.id_location
+            , LOCATION_T.id_location_parent
             , LOCATION_T.code
             , LOCATION_T.name
             , LOCATION_T.active
@@ -304,6 +307,8 @@ BEGIN
     IF a_output_LOCATIONS = 1 THEN
         SELECT 
               t_LOCATIONS.id_location
+            , t_LOCATIONS.id_location_parent
+            , LOCATION_PARENT.name AS name_location_parent
             , t_LOCATIONS.code
             , t_LOCATIONS.name
             , t_LOCATIONS.active
@@ -311,7 +316,10 @@ BEGIN
             , t_LOCATIONS.does_meet_id_filters
             , t_LOCATIONS.does_meet_non_id_filters
         FROM tmp_Location t_LOCATIONS
-        ORDER BY t_LOCATIONS.name
+        LEFT JOIN parts.DOG_Location LOCATION_PARENT ON t_LOCATIONS.id_location_parent = LOCATION_PARENT.id_location
+        ORDER BY 
+              LOCATION_PARENT.name
+            , t_LOCATIONS.name
         ;
     END IF;
 

static/MySQL/71202_p_dog_save_location.sql

@@ -0,0 +1,594 @@
+
+USE parts;
+
+DROP PROCEDURE IF EXISTS parts.p_dog_save_location;
+
+DELIMITER //
+CREATE PROCEDURE parts.p_dog_save_location (
+    IN a_comment VARCHAR(500),
+	IN a_guid BINARY(36),
+    IN a_id_user INT,
+    IN a_debug BIT
+)
+BEGIN
+    DECLARE v_can_admin BIT;
+    DECLARE v_can_create BIT;
+	DECLARE v_code_type_error_bad_data VARCHAR(100);
+    DECLARE v_id_access_level_edit INT;
+    DECLARE v_id_change_set INT;
+    DECLARE v_id_permission_dog_new INT;
+    DECLARE v_id_type_error_bad_data INT;
+    DECLARE v_time_start TIMESTAMP(6);
+    
+    DECLARE exit handler for SQLEXCEPTION
+    BEGIN
+        GET DIAGNOSTICS CONDITION 1
+            @sqlstate = RETURNED_SQLSTATE
+            , @errno = MYSQL_ERRNO
+            , @text = MESSAGE_TEXT
+		;
+        
+        ROLLBACK;
+        
+		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
+			  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
+			, id_type INT NULL
+			, code VARCHAR(250)
+			, msg TEXT NOT NULL
+		);
+
+        INSERT INTO tmp_Msg_Error (
+			  id_type
+			, code
+            , msg
+		)
+        SELECT 
+			  MET.id_type
+            , @errno
+            , @text
+		FROM parts.CORE_Msg_Error_Type MET
+        WHERE MET.code = 'MYSQL_ERROR'
+		;
+
+        SELECT 
+            t_ERROR.id_error
+            , t_ERROR.id_type
+            , t_ERROR.code
+            , ERROR_TYPE.name
+            , ERROR_TYPE.description
+            , ERROR_TYPE.is_breaking_error
+            , ERROR_TYPE.background_colour
+            , ERROR_TYPE.text_colour
+            , t_ERROR.msg
+        FROM tmp_Msg_Error t_ERROR
+        INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
+        ;
+
+		DROP TABLE IF EXISTS tmp_Msg_Error;
+    END;
+    
+    SET SESSION group_concat_max_len=15000;
+
+    SET v_time_start := CURRENT_TIMESTAMP(6);
+    SET v_code_type_error_bad_data := 'BAD_DATA';
+    SET v_id_type_error_bad_data := (SELECT ERROR_TYPE.id_type FROM parts.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_bad_data LIMIT 1);
+    SET v_id_permission_dog_new := (SELECT PERMISSION.id_permission FROM parts.DOG_Permission PERMISSION WHERE PERMISSION.code = 'DOG_CREATE' LIMIT 1);
+    SET v_id_access_level_edit := (SELECT ACCESS_LEVEL.id_access_level FROM parts.DOG_Access_Level ACCESS_LEVEL WHERE ACCESS_LEVEL.code = 'EDIT' LIMIT 1);
+    
+    CALL parts.p_core_validate_guid ( a_guid );
+    
+    DROP TABLE IF EXISTS tmp_Location_Copy;
+    DROP TABLE IF EXISTS tmp_Location;
+    
+    CREATE TEMPORARY TABLE tmp_Location (
+          id_temp INT
+        , id_location INT
+        , id_location_parent INT
+        , code VARCHAR(250)
+        , name VARCHAR(250)
+        , active BIT
+        , is_new BIT
+        , name_error VARCHAR(250)
+    );
+
+    CREATE TEMPORARY TABLE tmp_Location_Copy (
+          id_temp INT
+        , id_location INT
+        , id_location_parent INT
+        , code VARCHAR(250)
+        , name VARCHAR(250)
+        , active BIT
+        , is_new BIT
+        , name_error VARCHAR(250)
+    );
+        
+	CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
+		  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
+		, id_type INT NULL
+        , code VARCHAR(250)
+        , msg TEXT NOT NULL
+	);
+        
+    
+    -- Get data from Temp table
+    INSERT INTO tmp_Location (
+		  id_temp
+        , id_location
+        , id_location_parent
+        , code
+        , name
+        , active
+        , is_new
+	)
+    SELECT 
+		  LOCATIONS_T.id_temp
+		, COALESCE(
+              LOCATIONS.id_location
+            , LOCATIONS_T.id_location
+        ) AS id_location
+        , CASE WHEN IFNULL(LOCATIONS_T.id_location_parent, 0) < 1 THEN NULL ELSE LOCATIONS_T.id_location_parent END AS id_location_parent
+        , COALESCE(
+              LOCATIONS_T.code
+            , LOCATIONS.code
+        ) AS code
+        , COALESCE(
+              LOCATIONS_T.name
+            , LOCATIONS.name
+        ) AS name
+        , COALESCE(LOCATIONS_T.active, 1) AS active
+        , CASE WHEN COALESCE(LOCATIONS.id_location, LOCATIONS_T.id_location, 0) < 1 THEN 1 ELSE 0 END AS is_new
+	FROM parts.DOG_Location_Temp LOCATIONS_T
+    LEFT JOIN parts.DOG_Location LOCATIONS 
+        ON  LOCATIONS_T.id_location = LOCATIONS.id_location
+        OR  (
+                LOCATIONS_T.id_location_parent = LOCATIONS.id_location_parent
+            AND LOCATIONS_T.name = LOCATIONS.name
+        )
+    WHERE LOCATIONS_T.guid = a_guid
+    ;
+
+    IF a_debug = 1 THEN
+        SELECT 'Location_Temp records';
+        SELECT * FROM tmp_Location;
+        SELECT COUNT(*) FROM tmp_Location;
+    END IF;
+
+    -- Error names
+    UPDATE tmp_Location t_LOCATIONS
+    LEFT JOIN parts.DOG_Location LOCATIONS_PARENT ON t_LOCATIONS.id_location_parent = LOCATIONS_PARENT.id_location
+    SET t_LOCATIONS.name_error = CONCAT(
+          COALESCE(LOCATIONS_PARENT.name, t_LOCATIONS.id_location_parent, '(No Parent Location)')
+        , ' - '
+        , COALESCE(t_LOCATIONS.name, t_LOCATIONS.code, t_LOCATIONS.id_location, '(No Location)')
+    )
+    ;
+
+    IF a_debug = 1 THEN
+        SELECT 'After set name_error';
+        SELECT * FROM tmp_Location;
+        SELECT COUNT(*) FROM tmp_Location;
+    END IF;
+
+    -- Validation
+    -- Missing mandatory fields
+    -- code
+    IF EXISTS ( SELECT * FROM tmp_Location t_LOCATIONS WHERE t_LOCATIONS.code IS NULL ) THEN
+        INSERT INTO tmp_Msg_Error (
+            id_type
+            , code
+            , msg
+        )
+        SELECT
+            v_id_type_error_bad_data
+            , v_code_type_error_bad_data
+            , CONCAT('The following Location(s) do not have a valid Code: ', GROUP_CONCAT(t_LOCATIONS.name_error SEPARATOR ', ')) AS msg
+        FROM tmp_Location t_LOCATIONS
+        WHERE t_LOCATIONS.code IS NULL
+        ;
+    END IF;
+    -- name
+    IF EXISTS ( SELECT * FROM tmp_Location t_LOCATIONS WHERE t_LOCATIONS.name IS NULL ) THEN
+        INSERT INTO tmp_Msg_Error (
+            id_type
+            , name
+            , msg
+        )
+        SELECT
+            v_id_type_error_bad_data
+            , v_name_type_error_bad_data
+            , CONCAT('The following Location(s) do not have a valid Name: ', GROUP_CONCAT(t_LOCATIONS.name_error SEPARATOR ', ')) AS msg
+        FROM tmp_Location t_LOCATIONS
+        WHERE t_LOCATIONS.name IS NULL
+        ;
+    END IF;
+
+    -- Duplicates
+    -- Duplicate names
+    INSERT INTO tmp_Location_Copy (
+        id_temp
+        , id_location
+        , id_location_parent
+        , code
+        , name
+        , active
+        , is_new
+        , name_error
+    )
+    SELECT 
+          t_LOCATIONS.id_temp
+        , t_LOCATIONS.id_location
+        , t_LOCATIONS.id_location_parent
+        , t_LOCATIONS.code
+        , t_LOCATIONS.name
+        , t_LOCATIONS.active
+        , t_LOCATIONS.is_new
+        , t_LOCATIONS.name_error
+    FROM tmp_Location t_LOCATIONS
+    ;
+
+    IF a_debug = 1 THEN
+        SELECT COUNT(*) AS Count_Temp_Location FROM tmp_Location;
+        SELECT COUNT(*) AS Count_Temp_Location_Copy FROM tmp_Location_Copy;
+
+        WITH 
+              Combined_Locations AS (
+                SELECT 
+                      LOCATIONS.id_location
+                    , LOCATIONS.id_location_parent
+                    , LOCATIONS.code
+                    , LOCATIONS.name
+                    , CONCAT(
+                        COALESCE(LOCATIONS_PARENT.name, t_LOCATIONS_COPY.id_location_parent, '(No Parent Location)')
+                        , ' - '
+                        , COALESCE(t_LOCATIONS_COPY.name, t_LOCATIONS_COPY.code, t_LOCATIONS_COPY.id_location, '(No Location)')
+                    ) AS name_error
+                FROM parts.DOG_Location LOCATIONS 
+                LEFT JOIN tmp_Location_Copy t_LOCATIONS_COPY ON LOCATIONS.name = t_LOCATIONS_COPY.name
+                LEFT JOIN parts.DOG_Location LOCATIONS_PARENT ON LOCATIONS.id_location = LOCATIONS_PARENT.id_location_parent
+                WHERE t_LOCATIONS_COPY.is_new = 1
+                UNION
+                SELECT 
+                      t_LOCATIONS.id_location
+                    , t_LOCATIONS.id_location_parent
+                    , t_LOCATIONS.code
+                    , t_LOCATIONS.name
+                    , t_LOCATIONS.name_error
+                FROM tmp_Location t_LOCATIONS
+            )
+            , Duplicate_Location_Name_Row_Numbers AS (
+                SELECT 
+                      COMBINED_LOCATIONS.id_location
+                    , COMBINED_LOCATIONS.id_location_parent
+                    , COMBINED_LOCATIONS.code
+                    , COMBINED_LOCATIONS.name
+                    , COMBINED_LOCATIONS.name_error
+                    , ROW_NUMBER() OVER (PARTITION BY COMBINED_LOCATIONS.name ORDER BY COMBINED_LOCATIONS.name_error ASC) AS index_location_name_as_duplicate
+                FROM Combined_Locations COMBINED_LOCATIONS
+            )
+        SELECT *
+        FROM Duplicate_Location_Name_Row_Numbers
+        ;
+    END IF;
+    
+    IF EXISTS (
+        WITH 
+              Combined_Locations AS (
+                SELECT 
+                      LOCATIONS.id_location
+                    , LOCATIONS.id_location_parent
+                    , LOCATIONS.code
+                    , LOCATIONS.name
+                    , CONCAT(
+                        COALESCE(LOCATIONS_PARENT.name, t_LOCATIONS_COPY.id_location_parent, '(No Parent Location)')
+                        , ' - '
+                        , COALESCE(t_LOCATIONS_COPY.name, t_LOCATIONS_COPY.code, t_LOCATIONS_COPY.id_location, '(No Location)')
+                    ) AS name_error
+                FROM parts.DOG_Location LOCATIONS 
+                LEFT JOIN tmp_Location_Copy t_LOCATIONS_COPY ON LOCATIONS.name = t_LOCATIONS_COPY.name
+                LEFT JOIN parts.DOG_Location LOCATIONS_PARENT ON LOCATIONS.id_location = LOCATIONS_PARENT.id_location_parent
+                WHERE t_LOCATIONS_COPY.is_new = 1
+                UNION
+                SELECT 
+                      t_LOCATIONS.id_location
+                    , t_LOCATIONS.id_location_parent
+                    , t_LOCATIONS.code
+                    , t_LOCATIONS.name
+                    , t_LOCATIONS.name_error
+                FROM tmp_Location t_LOCATIONS
+            )
+            , Duplicate_Location_Name_Row_Numbers AS (
+                SELECT 
+                      COMBINED_LOCATIONS.id_location
+                    , COMBINED_LOCATIONS.id_location_parent
+                    , COMBINED_LOCATIONS.code
+                    , COMBINED_LOCATIONS.name
+                    , COMBINED_LOCATIONS.name_error
+                    , ROW_NUMBER() OVER (PARTITION BY COMBINED_LOCATIONS.name ORDER BY COMBINED_LOCATIONS.name_error ASC) AS index_location_name_as_duplicate
+                FROM Combined_Locations COMBINED_LOCATIONS
+            )
+        SELECT *
+        FROM Duplicate_Location_Name_Row_Numbers DUPLICATE_LOCATIONS
+        WHERE DUPLICATE_LOCATIONS.index_location_name_as_duplicate > 1
+        GROUP BY DUPLICATE_LOCATIONS.name
+    ) THEN
+        INSERT INTO tmp_Msg_Error (
+              id_type
+            , code
+            , msg
+        )
+        WITH 
+              Combined_Locations AS (
+                SELECT 
+                      LOCATIONS.id_location
+                    , LOCATIONS.id_location_parent
+                    , LOCATIONS.code
+                    , LOCATIONS.name
+                    , CONCAT(
+                        COALESCE(LOCATIONS_PARENT.name, t_LOCATIONS_COPY.id_location_parent, '(No Parent Location)')
+                        , ' - '
+                        , COALESCE(t_LOCATIONS_COPY.name, t_LOCATIONS_COPY.code, t_LOCATIONS_COPY.id_location, '(No Location)')
+                    ) AS name_error
+                FROM parts.DOG_Location LOCATIONS 
+                LEFT JOIN tmp_Location_Copy t_LOCATIONS_COPY ON LOCATIONS.name = t_LOCATIONS_COPY.name
+                LEFT JOIN parts.DOG_Location LOCATIONS_PARENT ON LOCATIONS.id_location = LOCATIONS_PARENT.id_location_parent
+                WHERE t_LOCATIONS_COPY.is_new = 1
+                UNION
+                SELECT 
+                      t_LOCATIONS.id_location
+                    , t_LOCATIONS.id_location_parent
+                    , t_LOCATIONS.code
+                    , t_LOCATIONS.name
+                    , t_LOCATIONS.name_error
+                FROM tmp_Location t_LOCATIONS
+            )
+            , Duplicate_Location_Name_Row_Numbers AS (
+                SELECT 
+                      COMBINED_LOCATIONS.id_location
+                    , COMBINED_LOCATIONS.id_location_parent
+                    , COMBINED_LOCATIONS.code
+                    , COMBINED_LOCATIONS.name
+                    , COMBINED_LOCATIONS.name_error
+                    , ROW_NUMBER() OVER (PARTITION BY COMBINED_LOCATIONS.name ORDER BY COMBINED_LOCATIONS.name_error ASC) AS index_location_name_as_duplicate
+                FROM Combined_Locations COMBINED_LOCATIONS
+            )
+        SELECT
+              v_id_type_error_bad_data
+            , v_code_type_error_bad_data
+            , CONCAT('Attempt to create duplicate or overwrite existing Locations on: ', GROUP_CONCAT(DUPLICATE_LOCATIONS.name_error SEPARATOR ', ')) AS msg
+        FROM Duplicate_Location_Name_Row_Numbers DUPLICATE_LOCATIONS
+        WHERE DUPLICATE_LOCATIONS.index_location_as_duplicate > 1
+        GROUP BY DUPLICATE_LOCATIONS.name
+        ;
+    END IF;
+    
+    -- Permissions
+    -- Can Create
+	CALL parts.p_dog_calc_user(
+          a_guid
+        , 0 -- get_all_user
+        , 0 -- get_inactive_user
+        , a_id_user -- ids_user
+        , '' -- a_auth0_ids_user
+        , '' -- a_names_user
+        , '' -- a_emails_user
+        , 1 -- a_require_all_id_search_filters_met
+        , 1 -- a_require_any_id_search_filters_met
+        , 0 -- a_require_all_non_id_search_filters_met
+        , 0 -- a_require_any_non_id_search_filters_met
+        , v_id_permission_dog_new -- ids_permission
+        , v_id_access_level_edit -- ids_access_level
+        , 0 -- a_show_errors
+        , 0 -- a_debug
+    );
+	
+    SELECT
+          IFNULL(CU_T.has_access, 0)
+    INTO
+          v_can_create
+    FROM parts.DOG_Calc_User_Temp CU_T
+    WHERE CU_T.GUID = a_guid
+    LIMIT 1
+    ;
+	
+	CALL parts.p_dog_clear_calc_user(
+		  a_guid
+        , 0 -- a_debug
+	);
+    
+    IF v_can_create = 0 THEN
+		DELETE t_ME
+        FROM tmp_Msg_Error t_ME
+        WHERE t_ME.id_type <> v_id_type_error_no_permission
+        ;
+		INSERT INTO tmp_Msg_Error (
+			  id_type
+            , code
+			, msg
+		)
+		VALUES (
+			  v_id_type_error_no_permission
+            , v_code_type_error_no_permission
+			, 'You do not have permission to edit Locations.'
+		)
+        ;
+    END IF;
+
+    IF EXISTS (SELECT * FROM tmp_Msg_Error t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+    	IF a_debug = 1 THEN
+	    	SELECT * from tmp_Location;
+	    END IF;
+
+        DELETE FROM tmp_Location;
+    END IF;
+
+    IF NOT EXISTS (SELECT * FROM tmp_Msg_Error t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+		START TRANSACTION;
+		
+			INSERT INTO parts.DOG_Dog_Change_Set ( 
+                  comment
+                , id_user_updated_last_by
+                , updated_last_on
+            )
+			VALUES ( 
+                  a_comment
+                , a_id_user
+                , v_time_start
+            )
+			;
+			
+			SET v_id_change_set := LAST_INSERT_ID();
+			
+			UPDATE parts.DOG_Location LOCATIONS
+			INNER JOIN tmp_Location t_LOCATIONS 
+				ON  LOCATIONS.id_location = t_LOCATIONS.id_location
+				AND t_LOCATIONS.is_new = 0
+			SET 
+				  LOCATIONS.id_location_parent = t_LOCATIONS.id_location_parent
+				, LOCATIONS.code = t_LOCATIONS.code
+				, LOCATIONS.name = t_LOCATIONS.name
+				, LOCATIONS.active = t_LOCATIONS.active
+				, LOCATIONS.id_change_set = v_id_change_set
+			;
+			
+			INSERT INTO parts.DOG_Location (
+				  id_location_parent
+				, code
+				, name
+				, active
+				, id_user_created_by
+				, created_on
+			)
+			SELECT
+				  t_LOCATIONS.id_location_parent                     AS id_location_parent
+				, t_LOCATIONS.code                      AS code
+				, t_LOCATIONS.name                      AS name
+				, t_LOCATIONS.active                      AS active
+				, a_id_user                                     AS created_by
+				, v_time_start                                  AS created_on
+			FROM tmp_Location t_LOCATIONS
+			WHERE 
+				    t_LOCATIONS.is_new = 1
+				AND t_LOCATIONS.active = 1
+			;
+			
+		COMMIT;
+    END IF;
+	
+	START TRANSACTION;
+
+		DELETE FROM parts.DOG_Location_Temp
+		WHERE GUID = a_guid
+        ;
+		
+	COMMIT;
+    
+    -- Errors
+    SELECT 
+          t_ERROR.id_error
+		, t_ERROR.id_type
+        , t_ERROR.code
+        , ERROR_TYPE.name
+        , ERROR_TYPE.description
+        , ERROR_TYPE.is_breaking_error
+        , ERROR_TYPE.background_colour
+        , ERROR_TYPE.text_colour
+		, t_ERROR.msg
+    FROM tmp_Msg_Error t_ERROR
+	INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
+	;
+    
+	IF a_debug = 1 THEN
+		SELECT * FROM tmp_Location;
+	END IF;
+
+    DROP TEMPORARY TABLE tmp_Location;
+    DROP TEMPORARY TABLE tmp_Msg_Error;
+    
+	IF a_debug = 1 THEN
+		CALL parts.p_core_debug_timing_reporting ( v_time_start );
+	END IF;
+END //
+DELIMITER ;
+
+
+
+/*
+
+'ripplesipplenippletippledipplekippsy'
+DELETE FROM parts.DOG_Location WHERE id_location > 740;
+* /
+delete
+from parts.DOG_Location_Audit
+where id_location > 768
+;
+delete
+from parts.DOG_Location
+where id_location > 768
+;
+delete
+from parts.DOG_Location_Temp
+;
+select 
+	*
+    -- COUNT(*)
+-- delete
+from parts.DOG_Location_Temp
+;
+select COUNT(*)
+from parts.DOG_Location_Temp
+;
+select 
+	*
+    -- COUNT(*)
+-- delete
+from parts.DOG_Location
+;
+select COUNT(*)
+from parts.DOG_Location
+;
+
+INSERT INTO parts.DOG_Location_Temp (
+      id_location
+    , id_location_parent
+    , code
+    , name
+    , active
+    , guid
+)
+VALUES (
+      -1 -- id_location
+    , 1 -- id_location_parent
+    , 'HOME' -- code
+    , 'Home' -- name
+    , 1 -- active
+    , 'ripplesipplenippletippledipplekippsy'
+);
+
+CALL parts.p_dog_save_location (
+	'nipples'
+    , 'ripplesipplenippletippledipplekippsy'
+    , 1
+    , 1
+);
+
+
+select 
+	*
+    -- COUNT(*)
+-- delete
+from parts.DOG_Location_Temp
+;
+select COUNT(*)
+from parts.DOG_Location_Temp
+;
+select 
+	*
+    -- COUNT(*)
+-- delete
+from parts.DOG_Location
+;
+select COUNT(*)
+from parts.DOG_Location
+;
+
+*/

static/MySQL/71220_p_dog_calc_button_shape.sql

@@ -0,0 +1,605 @@
+ 
+USE parts;
+
+DROP PROCEDURE IF EXISTS parts.p_dog_calc_button_shape;
+
+DELIMITER //
+CREATE PROCEDURE parts.p_dog_calc_button_shape (
+      IN a_guid BINARY(36)
+    , IN a_id_user INT
+    , IN a_get_all_button_shape BIT
+	, IN a_get_inactive_button_shape BIT
+	, IN a_ids_button_shape TEXT
+    , IN a_names_button_shape TEXT
+    , IN a_notes_button_shape TEXT
+    , IN a_require_all_id_search_filters_met BIT
+    , IN a_require_any_id_search_filters_met BIT
+    , IN a_require_all_non_id_search_filters_met BIT
+    , IN a_require_any_non_id_search_filters_met BIT
+    , IN a_show_errors BIT
+    , IN a_debug BIT
+)
+BEGIN
+    DECLARE v_can_view BIT;
+    DECLARE v_code_type_error_bad_data VARCHAR(100);
+    DECLARE v_code_type_error_no_permission VARCHAR(100);
+    DECLARE v_has_filter_button_shape_id BIT;
+    DECLARE v_has_filter_button_shape_name BIT;
+    DECLARE v_has_filter_button_shape_notes BIT;
+    DECLARE v_id_access_level_view INT;
+    DECLARE v_id_minimum INT;
+    DECLARE v_id_permission_dog_view INT;
+    DECLARE v_id_type_error_bad_data INT;
+    DECLARE v_id_type_error_no_permission INT;
+    DECLARE v_time_start TIMESTAMP(6);
+    
+    DECLARE exit handler for SQLEXCEPTION
+    BEGIN
+        GET DIAGNOSTICS CONDITION 1
+            @sqlstate = RETURNED_SQLSTATE
+            , @errno = MYSQL_ERRNO
+            , @text = MESSAGE_TEXT
+		;
+        
+        ROLLBACK;
+        
+		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error_Calc_Button_Shape (
+			  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
+			, id_type INT NULL
+			, code VARCHAR(250) NOT NULL
+			, msg TEXT NOT NULL
+		);
+
+        INSERT INTO tmp_Msg_Error_Calc_Button_Shape (
+			  id_type
+            , code
+            , msg
+		)
+        SELECT 
+			  MET.id_type
+            , @errno
+            , @text
+		FROM parts.CORE_Msg_Error_Type MET
+        WHERE MET.code = 'MYSQL_ERROR'
+		;
+        
+        SELECT 
+            t_ERROR.id_error
+            , t_ERROR.id_type
+            , t_ERROR.code
+            , ERROR_TYPE.name
+            , ERROR_TYPE.description
+            , ERROR_TYPE.is_breaking_error
+            , ERROR_TYPE.background_colour
+            , ERROR_TYPE.text_colour
+            , t_ERROR.msg
+        FROM tmp_Msg_Error_Calc_Button_Shape t_ERROR
+        INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
+        ;
+        
+		DROP TABLE IF EXISTS tmp_Msg_Error_Calc_Button_Shape;
+    END;
+
+    SET v_time_start := CURRENT_TIMESTAMP(6);
+    SET v_code_type_error_bad_data := 'BAD_DATA';
+    SET v_code_type_error_no_permission := 'NO_PERMISSION';
+    SET v_id_type_error_bad_data := (SELECT ERROR_TYPE.id_type FROM parts.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_bad_data LIMIT 1);
+    SET v_id_type_error_no_permission := (SELECT ERROR_TYPE.id_type FROM parts.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_no_permission LIMIT 1);
+    SET v_id_permission_dog_view := (SELECT PERMISSION.id_permission FROM parts.DOG_Permission PERMISSION WHERE PERMISSION.code = 'DOG_VIEW' LIMIT 1);
+    SET v_id_access_level_view := (SELECT ACCESS_LEVEL.id_access_level FROM parts.DOG_Access_Level ACCESS_LEVEL WHERE ACCESS_LEVEL.code = 'VIEW' LIMIT 1);
+    
+    
+    CALL parts.p_core_validate_guid ( a_guid );
+
+    SET a_id_user := IFNULL(a_id_user, 0);
+    SET a_get_all_button_shape := IFNULL(a_get_all_button_shape, 0);
+    SET a_get_inactive_button_shape := IFNULL(a_get_inactive_button_shape, 0);
+    SET a_ids_button_shape := TRIM(IFNULL(a_ids_button_shape, ''));
+    SET a_names_button_shape := TRIM(IFNULL(a_names_button_shape, ''));
+    SET a_notes_button_shape := TRIM(IFNULL(a_notes_button_shape, ''));
+    SET a_require_all_id_search_filters_met := IFNULL(a_require_all_id_search_filters_met, 1);
+    SET a_require_any_id_search_filters_met := IFNULL(a_require_any_id_search_filters_met, 1);
+    SET a_require_all_non_id_search_filters_met := IFNULL(a_require_all_non_id_search_filters_met, 0);
+    SET a_require_any_non_id_search_filters_met := IFNULL(a_require_any_non_id_search_filters_met, 1);
+    SET a_show_errors := IFNULL(a_show_errors, 0);
+    SET a_debug := IFNULL(a_debug, 0);
+    
+    IF a_debug = 1 THEN
+		SELECT 
+              a_guid
+			, a_id_user
+            , a_get_all_button_shape
+            , a_get_inactive_button_shape
+            , a_ids_button_shape
+            , a_names_button_shape
+            , a_notes_button_shape
+            , a_require_all_id_search_filters_met
+            , a_require_any_id_search_filters_met
+            , a_require_all_non_id_search_filters_met
+            , a_require_any_non_id_search_filters_met
+            , a_show_errors
+            , a_debug
+		;
+
+        SELECT
+              v_id_type_error_bad_data
+            , v_id_type_error_no_permission
+            , v_id_permission_dog_view
+            , v_time_start
+        ;
+    END IF;
+
+    DROP TEMPORARY TABLE IF EXISTS tmp_Split_Notes_Calc_Button_Shape;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Split_Name_Calc_Button_Shape;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Split_Id_Calc_Button_Shape;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error_Calc_Button_Shape;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Button_Shape_Calc_Button_Shape;
+    
+    CREATE TEMPORARY TABLE tmp_Button_Shape_Calc_Button_Shape (
+		  id_button_shape INT NOT NULL
+        , does_meet_id_filters BIT NOT NULL
+        , does_meet_non_id_filters BIT NOT NULL
+    );
+
+	CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error_Calc_Button_Shape (
+          id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
+		, id_type INT NULL
+		, code VARCHAR(250) NOT NULL
+        , msg TEXT NOT NULL
+	);
+    
+    CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Split_Id_Calc_Button_Shape (
+		  substring VARCHAR(4000) NOT NULL
+        , as_int INT NULL
+	);
+    DELETE FROM tmp_Split_Id_Calc_Button_Shape;
+    
+    CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Split_Name_Calc_Button_Shape (
+		  substring VARCHAR(4000) NOT NULL
+        , as_int INT NULL
+	);
+    DELETE FROM tmp_Split_Name_Calc_Button_Shape;
+    
+    CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Split_Notes_Calc_Button_Shape (
+		  substring VARCHAR(4000) NOT NULL
+        , as_int INT NULL
+	);
+    DELETE FROM tmp_Split_Notes_Calc_Button_Shape;
+    
+    SET v_has_filter_button_shape_id = CASE WHEN a_ids_button_shape <> '' THEN 1 ELSE 0 END;
+    SET v_has_filter_button_shape_name = CASE WHEN a_names_button_shape <> '' THEN 1 ELSE 0 END;
+    SET v_has_filter_button_shape_notes = CASE WHEN a_notes_button_shape <> '' THEN 1 ELSE 0 END;
+
+    -- Button_Shapes
+    IF v_has_filter_button_shape_id = 1 THEN
+		CALL parts.p_core_split(a_guid, a_ids_button_shape, ',', a_debug);
+
+        SET sql_mode = '';
+		
+		INSERT INTO tmp_Split_Id_Calc_Button_Shape (
+			  substring
+			, as_int
+		)
+		SELECT 
+			  SPLIT_T.substring
+			, CAST(SPLIT_T.substring AS DECIMAL(10,0)) AS as_int
+		FROM parts.CORE_Split_Temp SPLIT_T
+		WHERE 
+                SPLIT_T.GUID = a_guid
+			AND IFNULL(SPLIT_T.substring, '') <> ''
+		;
+		
+		CALL parts.p_core_clear_split( a_guid );
+	END IF;
+
+    IF v_has_filter_button_shape_name = 1 THEN
+		CALL parts.p_core_split(a_guid, a_names_button_shape, ',', a_debug);
+
+        SET sql_mode = '';
+		
+		INSERT INTO tmp_Split_Name_Calc_Button_Shape (
+			  substring
+			, as_int
+		)
+		SELECT 
+			  SPLIT_T.substring
+			, CAST(SPLIT_T.substring AS DECIMAL(10,0)) AS as_int
+		FROM parts.CORE_Split_Temp SPLIT_T
+		WHERE 
+                SPLIT_T.GUID = a_guid
+			AND IFNULL(SPLIT_T.substring, '') <> ''
+		;
+		
+		CALL parts.p_core_clear_split( a_guid );
+	END IF;
+    
+    IF v_has_filter_button_shape_notes = 1 THEN
+		CALL parts.p_core_split(a_guid, a_notes_button_shape, ',', a_debug);
+
+        SET sql_mode = '';
+		
+		INSERT INTO tmp_Split_Notes_Calc_Button_Shape (
+			  substring
+			, as_int
+		)
+		SELECT 
+			  SPLIT_T.substring
+			, CAST(SPLIT_T.substring AS DECIMAL(10,0)) AS as_int
+		FROM parts.CORE_Split_Temp SPLIT_T
+		WHERE 
+                SPLIT_T.GUID = a_guid
+			AND IFNULL(SPLIT_T.substring, '') <> ''
+		;
+		
+		CALL parts.p_core_clear_split( a_guid );
+	END IF;
+    
+    IF NOT EXISTS (SELECT * FROM tmp_Msg_Error_Calc_Button_Shape t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+		IF EXISTS (
+			SELECT * 
+            FROM tmp_Split_Id_Calc_Button_Shape t_SPLIT_ID
+            LEFT JOIN parts.DOG_Button_Shape BUTTON_SHAPES ON t_SPLIT_ID.as_int = BUTTON_SHAPES.id_button_shape 
+			WHERE 
+				    ISNULL(t_SPLIT_ID.as_int) 
+                OR  ISNULL(BUTTON_SHAPES.id_button_shape)
+				OR  (
+					BUTTON_SHAPES.active = 0
+					AND a_get_inactive_button_shape = 0
+				)
+		) THEN
+			INSERT INTO tmp_Msg_Error_Calc_Button_Shape (
+				  id_type
+		        , code
+				, msg
+			)
+			SELECT
+				  v_id_type_error_bad_data
+                , v_code_type_error_bad_data
+				, CONCAT('Invalid or inactive Button_Shape IDs: ', IFNULL(GROUP_CONCAT(t_SPLIT_ID.substring SEPARATOR ', '), 'NULL'))
+			FROM tmp_Split_Id_Calc_Button_Shape t_SPLIT_ID
+			LEFT JOIN parts.DOG_Button_Shape BUTTON_SHAPES ON t_SPLIT_ID.as_int = BUTTON_SHAPES.id_button_shape
+			WHERE 
+				    ISNULL(t_SPLIT_ID.as_int) 
+				OR  ISNULL(BUTTON_SHAPES.id_button_shape)
+				OR  (
+					BUTTON_SHAPES.active = 0
+					AND a_get_inactive_button_shape = 0
+				)
+			;
+        /* Don't error on names, hand signals, or notes not found
+		ELSEIF EXISTS ()
+        */
+		ELSE
+			INSERT INTO tmp_Button_Shape_Calc_Button_Shape (
+				  id_button_shape
+                , does_meet_id_filters
+                , does_meet_non_id_filters
+			)
+            WITH 
+                  Button_Shape_Id_Filter AS (
+                    SELECT BUTTON_SHAPES.id_button_shape
+                    FROM tmp_Split_Id_Calc_Button_Shape t_SPLIT_ID
+                    INNER JOIN parts.DOG_Button_Shape BUTTON_SHAPES ON t_SPLIT_ID.as_int = BUTTON_SHAPES.id_button_shape
+                )
+                , Button_Shape_Name_Filter AS (
+                    SELECT BUTTON_SHAPES.id_button_shape
+                    FROM tmp_Split_Name_Calc_Button_Shape t_SPLIT_NAME
+                    INNER JOIN parts.DOG_Button_Shape BUTTON_SHAPES ON BUTTON_SHAPES.name LIKE CONCAT('%', t_SPLIT_NAME.substring, '%')
+                    WHERE NULLIF(t_SPLIT_NAME.substring, '') IS NOT NULL
+                )
+                , Button_Shape_Notes_Filter AS (
+                    SELECT BUTTON_SHAPES.id_button_shape
+                    FROM tmp_Split_Notes_Calc_Button_Shape t_SPLIT_NOTES
+                    INNER JOIN parts.DOG_Button_Shape BUTTON_SHAPES ON BUTTON_SHAPES.name LIKE CONCAT('%', t_SPLIT_NOTES.substring, '%')
+                    WHERE NULLIF(t_SPLIT_NOTES.substring, '') IS NOT NULL
+                )
+                , Button_Shape_Filters AS (
+                    SELECT 
+                          BUTTON_SHAPES_COMBINED.id_button_shape
+                        , MAX(BUTTON_SHAPES_COMBINED.does_meet_id_filter) AS does_meet_id_filter
+                        , MAX(BUTTON_SHAPES_COMBINED.does_meet_name_filter) AS does_meet_name_filter
+                        , MAX(BUTTON_SHAPES_COMBINED.does_meet_notes_filter) AS does_meet_notes_filter
+                    FROM (
+                        SELECT 
+                              BUTTON_SHAPES_ID_FILTER.id_button_shape 
+                            , 1 AS does_meet_id_filter
+                            , 0 AS does_meet_name_filter
+                            , 0 AS does_meet_notes_filter
+                        FROM Button_Shape_Id_Filter BUTTON_SHAPES_ID_FILTER
+                        UNION
+                        SELECT 
+                              BUTTON_SHAPES_NAME_FILTER.id_button_shape 
+                            , 0 AS does_meet_id_filter
+                            , 1 AS does_meet_name_filter
+                            , 0 AS does_meet_notes_filter
+                        FROM Button_Shape_Name_Filter BUTTON_SHAPES_NAME_FILTER
+                        UNION
+                        SELECT 
+                              BUTTON_SHAPES_NOTES_FILTER.id_button_shape 
+                            , 0 AS does_meet_id_filter
+                            , 0 AS does_meet_name_filter
+                            , 1 AS does_meet_notes_filter
+                        FROM Button_Shape_Notes_Filter BUTTON_SHAPES_NOTES_FILTER
+                    ) BUTTON_SHAPES_COMBINED
+                    GROUP BY BUTTON_SHAPES_COMBINED.id_button_shape
+                )
+            SELECT 
+                  BUTTON_SHAPES.id_button_shape
+                , CASE WHEN 
+                        v_has_filter_button_shape_id = 0 
+                    OR  IFNULL(BUTTON_SHAPES_FILTERS.does_meet_id_filter, 0) = 1
+                THEN 1 ELSE 0 END AS does_meet_id_filters
+                , CASE WHEN 
+                        (
+                            v_has_filter_button_shape_name = 0
+                        AND v_has_filter_button_shape_notes = 0
+                    )
+                    OR  IFNULL(BUTTON_SHAPES_FILTERS.does_meet_name_filter, 0) = 1
+                    OR  IFNULL(BUTTON_SHAPES_FILTERS.does_meet_notes_filter, 0) = 1
+                THEN 1 ELSE 0 END AS does_meet_non_id_filters
+            FROM parts.DOG_Button_Shape BUTTON_SHAPES
+            LEFT JOIN Button_Shape_Filters BUTTON_SHAPES_FILTERS ON BUTTON_SHAPES.id_button_shape = BUTTON_SHAPES_FILTERS.id_button_shape
+            WHERE 
+                (
+                        a_get_all_button_shape = 1
+                    OR  (
+                            v_has_filter_button_shape_id = 1
+                        AND BUTTON_SHAPES_FILTERS.does_meet_id_filter = 1
+                    )
+                    OR  (
+                            v_has_filter_button_shape_name = 1
+                        AND BUTTON_SHAPES_FILTERS.does_meet_name_filter = 1
+                    )
+                )
+                AND (
+                        a_get_inactive_button_shape = 1
+                    OR  BUTTON_SHAPES.active = 1
+                )
+			;
+		END IF;
+	END IF;
+    
+    DELETE FROM tmp_Split_Id_Calc_Button_Shape;
+    DELETE FROM tmp_Split_Name_Calc_Button_Shape;
+    DELETE FROM tmp_Split_Notes_Calc_Button_Shape;
+
+    IF a_debug = 1 THEN
+        SELECT 'After get Button_Shapes ';
+        SELECT * FROM tmp_Button_Shape_Calc_Button_Shape;
+    END IF;
+
+    -- Filter records
+    IF NOT EXISTS (SELECT * FROM tmp_Msg_Error_Calc_Button_Shape t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+        DELETE t_BUTTON_SHAPES
+        FROM tmp_Button_Shape_Calc_Button_Shape t_BUTTON_SHAPES
+        WHERE
+                (
+                    a_require_all_id_search_filters_met = 1
+                AND (
+                        t_BUTTON_SHAPES.does_meet_id_filters = 0
+                )
+            )
+            OR  (
+                    a_require_all_non_id_search_filters_met = 1
+                AND (
+                        t_BUTTON_SHAPES.does_meet_non_id_filters = 0
+                )
+            )
+            OR  (
+                a_require_any_id_search_filters_met = 1
+                AND t_BUTTON_SHAPES.does_meet_id_filters = 0
+            )
+            OR  (
+                a_require_any_non_id_search_filters_met = 1
+                AND t_BUTTON_SHAPES.does_meet_non_id_filters = 0
+            )
+        ;
+    END IF;
+
+    IF a_debug = 1 THEN
+        SELECT 'After filter Button_Shapes';
+        SELECT * FROM tmp_Button_Shape_Calc_Button_Shape;
+    END IF;
+
+    -- Calculated fields
+
+    -- Permissions
+    IF a_debug = 1 THEN
+		SELECT 
+			  a_guid -- a_guid
+            , 0 -- get_all_user
+            , 0 -- get_inactive_user
+            , a_id_user -- ids_user
+            , '' -- a_auth0_ids_user
+            , '' -- a_names_user
+            , '' -- a_emails_user
+            , 1 -- a_require_all_id_search_filters_met
+            , 1 -- a_require_any_id_search_filters_met
+            , 0 -- a_require_all_non_id_search_filters_met
+            , 0 -- a_require_any_non_id_search_filters_met
+            , v_id_permission_dog_view -- ids_permission
+            , v_id_access_level_view -- ids_access_level
+            , 0 -- a_show_errors
+			, 0 -- a_debug
+        ;
+    END IF;
+    
+	CALL parts.p_dog_calc_user(
+          a_guid -- a_guid
+        , 0 -- get_all_user
+        , 0 -- get_inactive_user
+        , a_id_user -- ids_user
+        , '' -- a_auth0_ids_user
+        , '' -- a_names_user
+        , '' -- a_emails_user
+        , 1 -- a_require_all_id_search_filters_met
+        , 1 -- a_require_any_id_search_filters_met
+        , 0 -- a_require_all_non_id_search_filters_met
+        , 0 -- a_require_any_non_id_search_filters_met
+        , v_id_permission_dog_view -- ids_permission
+        , v_id_access_level_view -- ids_access_level
+        , 0 -- a_show_errors
+        , 0 -- a_debug
+    );
+	
+    SELECT
+          IFNULL(CALC_USER_T.has_access, 0)
+    INTO
+          v_can_view
+    FROM parts.DOG_Calc_User_Temp CALC_USER_T
+    WHERE CALC_USER_T.GUID = a_guid
+    LIMIT 1
+    ;
+    
+    IF a_debug = 1 THEN
+        SELECT v_can_view;
+    END IF;
+    
+    IF (v_can_view = 0) THEN
+		DELETE t_ME
+        FROM tmp_Msg_Error_Calc_Button_Shape t_ME
+        WHERE t_ME.id_type <> v_id_type_error_no_permission
+        ;
+		INSERT INTO tmp_Msg_Error_Calc_Button_Shape (
+			  id_type
+			, code
+            , msg
+		)
+		VALUES (
+			  v_id_type_error_no_permission
+            , v_code_type_error_no_permission
+			, 'You do not have permission to view Dogs and Button_Shapes.'
+		)
+        ;
+    END IF;
+	
+	CALL parts.p_dog_clear_calc_user(
+		a_guid
+        , 0 -- a_debug
+	);
+
+    IF a_debug = 1 THEN
+        SELECT 'Before non-permitted data deletion';
+        SELECT * FROM tmp_Button_Shape_Calc_Button_Shape;
+        SELECT * FROM tmp_Msg_Error_Calc_Button_Shape;
+    END IF;
+    
+    IF EXISTS(SELECT * FROM tmp_Msg_Error_Calc_Button_Shape t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+        IF a_debug = 1 THEN
+            SELECT * FROM tmp_Button_Shape_Calc_Button_Shape;
+        END IF;
+
+        DELETE FROM tmp_Button_Shape_Calc_Button_Shape;
+    END IF;
+
+    IF a_debug = 1 THEN
+        SELECT 'After non-permitted data deletion';
+    END IF;
+
+    -- Outputs
+	START TRANSACTION;
+        -- Button_Shapes
+        INSERT INTO parts.DOG_Button_Shape_Temp (
+              guid
+            , id_button_shape
+            , code
+            , name
+            , notes
+            , active
+
+            , does_meet_id_filters
+            , does_meet_non_id_filters
+        )
+        SELECT 
+              a_guid
+            , t_BUTTON_SHAPES.id_button_shape
+            , BUTTON_SHAPES.code
+            , BUTTON_SHAPES.name
+            , BUTTON_SHAPES.notes
+            , BUTTON_SHAPES.active
+
+            , t_BUTTON_SHAPES.does_meet_id_filters
+            , t_BUTTON_SHAPES.does_meet_non_id_filters
+        FROM parts.DOG_Button_Shape BUTTON_SHAPES
+        INNER JOIN tmp_Button_Shape_Calc_Button_Shape t_BUTTON_SHAPES ON BUTTON_SHAPES.id_button_shape = t_BUTTON_SHAPES.id_button_shape
+        ORDER BY BUTTON_SHAPES.name
+        ;
+    COMMIT;
+
+    -- Errors
+    IF a_show_errors = 1 THEN
+        SELECT 
+            t_ERROR.id_error
+            , t_ERROR.id_type
+            , t_ERROR.code
+            , ERROR_TYPE.name
+            , ERROR_TYPE.description
+            , ERROR_TYPE.is_breaking_error
+            , ERROR_TYPE.background_colour
+            , ERROR_TYPE.text_colour
+            , t_ERROR.msg
+        FROM tmp_Msg_Error_Calc_Button_Shape t_ERROR
+        INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
+        ;
+    END IF;
+
+    IF a_debug = 1 AND v_can_view = 1 THEN
+        SELECT * FROM tmp_Button_Shape_Calc_Button_Shape;
+    END IF;
+    
+    CALL parts.p_dog_clear_calc_dog ( a_guid, 0 );
+
+    DROP TEMPORARY TABLE IF EXISTS tmp_Split_Notes_Calc_Button_Shape;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Split_Name_Calc_Button_Shape;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Split_Id_Calc_Button_Shape;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error_Calc_Button_Shape;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Button_Shape_Calc_Button_Shape;
+    
+    IF a_debug = 1 THEN
+		CALL parts.p_core_debug_timing_reporting ( v_time_start );
+    END IF;
+END //
+DELIMITER ;
+
+
+/*
+
+
+CALL parts.p_dog_calc_button_shape (
+      'gripe                               ' -- a_guid
+	, 1 -- 'auth0|6582b95c895d09a70ba10fef',	-- a_id_user
+    , 1                                     	-- a_get_all_button_shape
+	, 0                                     	-- a_get_inactive_button_shape
+	, ''                                    	-- a_ids_button_shape
+    , ''                                        -- a_names_button_shape
+    , ''                                        -- a_notes_button_shape
+    , 0                                         -- a_require_all_id_search_filters_met
+    , 0                                         -- a_require_any_id_search_filters_met
+    , 0                                         -- a_require_all_non_id_search_filters_met
+    , 0                                         -- a_require_any_non_id_search_filters_met
+    , 0                                         -- a_show_errors
+    , 0                                     	-- a_debug
+);
+
+SELECT *
+FROM parts.DOG_Button_Shape_Temp
+;
+/*
+SELECT *
+FROM parts.DOG_Button_Shape_Temp C
+WHERE 
+        C.does_meet_id_filters
+    AND C.does_meet_non_id_filters
+;
+*/
+CALL parts.p_dog_clear_calc_button_shape (
+	'gripe                               ' -- a_guid
+    , 1 -- debug
+);
+
+
+DELETE
+FROM parts.DOG_Button_Shape_Temp
+;
+
+*/

static/MySQL/71220_p_dog_clear_calc_button_shape.sql

@@ -0,0 +1,45 @@
+
+USE parts;
+
+DROP PROCEDURE IF EXISTS parts.p_dog_clear_calc_button_shape;
+DROP PROCEDURE IF EXISTS parts.p_button_shape_clear_calc_button_shape;
+
+DELIMITER //
+CREATE PROCEDURE parts.p_dog_clear_calc_button_shape (
+	  IN a_guid BINARY(36)
+    , IN a_debug BIT
+)
+BEGIN
+	DECLARE v_time_start TIMESTAMP(6);
+    SET v_time_start := CURRENT_TIMESTAMP(6);
+    
+    CALL parts.p_core_validate_guid ( a_guid );
+    
+	START TRANSACTION;
+		
+		DELETE BUTTON_SHAPES_T
+        FROM parts.DOG_Button_Shape_Temp BUTTON_SHAPES_T
+		WHERE BUTTON_SHAPES_T.GUID = a_guid
+		;
+		
+	COMMIT;
+    
+    IF a_debug = 1 THEN
+		CALL parts.p_debug_timing_reporting( v_time_start );
+    END IF;
+END //
+DELIMITER ;
+
+/*
+
+CALL parts.p_dog_clear_calc_button_shape (
+	'crips                               ' -- a_guid
+    , 1 -- debug
+);
+
+SELECT *
+FROM parts.DOG_Calc_User_Temp
+WHERE GUID = 'chips                               '
+;
+
+*/

static/MySQL/71220_p_dog_get_many_button_shape.sql

@@ -0,0 +1,386 @@
+ 
+USE parts;
+
+DROP PROCEDURE IF EXISTS parts.p_dog_get_many_button_shape;
+
+DELIMITER //
+CREATE PROCEDURE parts.p_dog_get_many_button_shape (
+	  IN a_id_user INT
+    , IN a_get_all_button_shape BIT
+	, IN a_get_inactive_button_shape BIT
+	, IN a_ids_button_shape TEXT
+    , IN a_names_button_shape TEXT
+    , IN a_notes_button_shape TEXT
+    , IN a_require_all_id_search_filters_met BIT
+    , IN a_require_any_id_search_filters_met BIT
+    , IN a_require_all_non_id_search_filters_met BIT
+    , IN a_require_any_non_id_search_filters_met BIT
+    , IN a_debug BIT
+)
+BEGIN
+    DECLARE v_can_view BIT;
+    DECLARE v_code_type_error_bad_data VARCHAR(100);
+    DECLARE v_code_type_error_no_permission VARCHAR(100);
+    DECLARE v_guid BINARY(36);
+    DECLARE v_id_access_level_view INT;
+    DECLARE v_id_minimum INT;
+    DECLARE v_id_permission_dog_view INT;
+    DECLARE v_id_type_error_bad_data INT;
+    DECLARE v_id_type_error_no_permission INT;
+    DECLARE v_time_start TIMESTAMP(6);
+    
+    DECLARE exit handler for SQLEXCEPTION
+    BEGIN
+        GET DIAGNOSTICS CONDITION 1
+            @sqlstate = RETURNED_SQLSTATE
+            , @errno = MYSQL_ERRNO
+            , @text = MESSAGE_TEXT
+		;
+        
+        ROLLBACK;
+        
+		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
+			  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
+			, id_type INT NULL
+			, code VARCHAR(250) NOT NULL
+			, msg TEXT NOT NULL
+		);
+
+        INSERT INTO tmp_Msg_Error (
+			  id_type
+            , code
+            , msg
+		)
+        SELECT 
+			  MET.id_type
+            , @errno
+            , @text
+		FROM parts.CORE_Msg_Error_Type MET
+        WHERE MET.code = 'MYSQL_ERROR'
+		;
+        
+        SELECT 
+            t_ERROR.id_error
+            , t_ERROR.id_type
+            , t_ERROR.code
+            , ERROR_TYPE.name
+            , ERROR_TYPE.description
+            , ERROR_TYPE.is_breaking_error
+            , ERROR_TYPE.background_colour
+            , ERROR_TYPE.text_colour
+            , t_ERROR.msg
+        FROM tmp_Msg_Error t_ERROR
+        INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
+        ;
+        
+		DROP TABLE IF EXISTS tmp_Msg_Error;
+    END;
+
+    SET v_time_start := CURRENT_TIMESTAMP(6);
+    SET v_guid := UUID();
+    SET v_code_type_error_bad_data := 'BAD_DATA';
+    SET v_code_type_error_no_permission := 'NO_PERMISSION';
+    SET v_id_type_error_bad_data := (SELECT ERROR_TYPE.id_type FROM parts.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_bad_data LIMIT 1);
+    SET v_id_type_error_no_permission := (SELECT ERROR_TYPE.id_type FROM parts.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_no_permission LIMIT 1);
+    SET v_id_permission_dog_view := (SELECT PERMISSION.id_permission FROM parts.DOG_Permission PERMISSION WHERE PERMISSION.code = 'DOG_VIEW' LIMIT 1);
+    SET v_id_access_level_view := (SELECT ACCESS_LEVEL.id_access_level FROM parts.DOG_Access_Level ACCESS_LEVEL WHERE ACCESS_LEVEL.code = 'VIEW' LIMIT 1);
+    
+    SET a_id_user := IFNULL(a_id_user, 0);
+    /*
+    SET a_get_all_button_shape := IFNULL(a_get_all_button_shape, 0);
+    SET a_get_inactive_button_shape := IFNULL(a_get_inactive_button_shape, 0);
+    SET a_ids_button_shape := TRIM(IFNULL(a_ids_button_shape, ''));
+    SET a_names_button_shape := TRIM(IFNULL(a_names_button_shape, ''));
+    SET a_notes_button_shape := TRIM(IFNULL(a_notes_button_shape, ''));
+    SET a_require_all_id_search_filters_met := IFNULL(a_require_all_id_search_filters_met, 1);
+    SET a_require_any_id_search_filters_met := IFNULL(a_require_any_id_search_filters_met, 1);
+    SET a_require_all_non_id_search_filters_met := IFNULL(a_require_all_non_id_search_filters_met, 0);
+    SET a_require_any_non_id_search_filters_met := IFNULL(a_require_any_non_id_search_filters_met, 1);
+    */
+    SET a_debug := IFNULL(a_debug, 0);
+    
+    IF a_debug = 1 THEN
+		SELECT 
+			  a_id_user
+            , a_get_all_button_shape
+            , a_get_inactive_button_shape
+            , a_ids_button_shape
+            , a_names_button_shape
+            , a_notes_button_shape
+            , a_require_all_id_search_filters_met
+            , a_require_any_id_search_filters_met
+            , a_require_all_non_id_search_filters_met
+            , a_require_any_non_id_search_filters_met
+            , a_debug
+		;
+
+        SELECT
+              v_id_type_error_bad_data
+            , v_id_type_error_no_permission
+            , v_guid
+            , v_id_permission_dog_view
+            , v_time_start
+        ;
+    END IF;
+
+    DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Button_Shape;
+    
+    CREATE TEMPORARY TABLE tmp_Button_Shape (
+		  id_button_shape INT NOT NULL
+		, code VARCHAR(250)
+        , name VARCHAR(250)
+        , notes TEXT
+        , active BIT
+
+        , does_meet_id_filters BIT
+        , does_meet_non_id_filters BIT
+    );
+    
+	CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
+          id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
+		, id_type INT NULL
+		, code VARCHAR(250) NOT NULL
+        , msg TEXT NOT NULL
+    );
+    
+    -- Permissions
+    IF a_debug = 1 THEN
+		SELECT 
+			  v_guid
+            , 0 -- get_all_user
+            , 0 -- get_inactive_user
+            , a_id_user -- ids_user
+            , '' -- a_auth0_ids_user
+            , '' -- a_names_user
+            , '' -- a_emails_user
+            , 1 -- a_require_all_id_search_filters_met
+            , 1 -- a_require_any_id_search_filters_met
+            , 0 -- a_require_all_non_id_search_filters_met
+            , 0 -- a_require_any_non_id_search_filters_met
+            , v_id_permission_dog_view -- ids_permission
+            , v_id_access_level_view -- ids_access_level
+            , 0 -- a_show_errors
+			, 0 -- a_debug
+        ;
+    END IF;
+    
+	CALL parts.p_dog_calc_user(
+          v_guid
+        , 0 -- get_all_user
+        , 0 -- get_inactive_user
+        , a_id_user -- ids_user
+        , '' -- a_auth0_ids_user
+        , '' -- a_names_user
+        , '' -- a_emails_user
+        , 1 -- a_require_all_id_search_filters_met
+        , 1 -- a_require_any_id_search_filters_met
+        , 0 -- a_require_all_non_id_search_filters_met
+        , 0 -- a_require_any_non_id_search_filters_met
+        , v_id_permission_dog_view -- ids_permission
+        , v_id_access_level_view -- ids_access_level
+        , 0 -- a_show_errors
+        , 0 -- a_debug
+    );
+	
+    SELECT
+          IFNULL(CALC_USER_T.has_access, 0)
+    INTO
+          v_can_view
+    FROM parts.DOG_Calc_User_Temp CALC_USER_T
+    WHERE CALC_USER_T.GUID = v_guid
+    LIMIT 1
+    ;
+    
+    IF a_debug = 1 THEN
+        SELECT v_can_view;
+        SELECT COUNT(*) AS Count_Errors FROM tmp_Msg_Error t_ERROR;
+        SELECT * FROM tmp_Msg_Error t_ERROR;
+    END IF;
+    
+    IF (v_can_view = 0) THEN
+		DELETE t_ME
+        FROM tmp_Msg_Error t_ME
+        WHERE t_ME.id_type <> v_id_type_error_no_permission
+        ;
+		INSERT INTO tmp_Msg_Error (
+			  id_type
+			, code
+            , msg
+		)
+		VALUES (
+			  v_id_type_error_no_permission
+            , v_code_type_error_no_permission
+			, 'You do not have permission to view Button_Shapes.'
+		)
+        ;
+    END IF;
+	
+	CALL parts.p_dog_clear_calc_user(
+		  v_guid
+        , 0 -- a_debug
+	);
+
+    
+    -- Call Button_Shape Calc
+    IF NOT EXISTS(SELECT * FROM tmp_Msg_Error t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+        IF a_debug = 1 THEN
+            SELECT 
+                  v_guid -- a_guid
+                , a_id_user -- a_id_user
+                , a_get_all_button_shape -- a_get_all_button_shape
+                , a_get_inactive_button_shape -- a_get_inactive_button_shape
+                , a_ids_button_shape -- a_ids_button_shape
+                , a_names_button_shape -- a_names_button_shape
+                , a_notes_button_shape -- a_notes_button_shape
+                , a_require_all_id_search_filters_met -- a_require_all_id_search_filters_met
+                , a_require_any_id_search_filters_met -- a_require_any_id_search_filters_met
+                , a_require_all_non_id_search_filters_met -- a_require_all_non_id_search_filters_met
+                , a_require_any_non_id_search_filters_met -- a_require_any_non_id_search_filters_met
+                , 0 -- a_show_errors
+                , 0 -- a_debug
+            ;
+        END IF;
+        
+        CALL parts.p_dog_calc_button_shape (
+              v_guid -- a_guid
+            , a_id_user -- a_id_user
+            , a_get_all_button_shape -- a_get_all_button_shape
+            , a_get_inactive_button_shape -- a_get_inactive_button_shape
+            , a_ids_button_shape -- a_ids_button_shape
+            , a_names_button_shape -- a_names_button_shape
+            , a_notes_button_shape -- a_notes_button_shape
+            , a_require_all_id_search_filters_met -- a_require_all_id_search_filters_met
+            , a_require_any_id_search_filters_met -- a_require_any_id_search_filters_met
+            , a_require_all_non_id_search_filters_met -- a_require_all_non_id_search_filters_met
+            , a_require_any_non_id_search_filters_met -- a_require_any_non_id_search_filters_met
+            , 0 -- a_show_errors
+            , 0 -- a_debug
+        );
+        
+        IF a_debug = 1 THEN
+            SELECT COUNT(*) FROM parts.DOG_Button_Shape_Temp;
+            SELECT * FROM parts.DOG_Button_Shape_Temp;
+        END IF;
+        
+        INSERT INTO tmp_Button_Shape (
+              id_button_shape
+            , code
+            , name
+            , notes
+            , active
+
+            , does_meet_id_filters
+            , does_meet_non_id_filters
+        )
+        SELECT
+              BUTTON_SHAPE_T.id_button_shape
+            , BUTTON_SHAPE_T.code
+            , BUTTON_SHAPE_T.name
+            , BUTTON_SHAPE_T.notes
+            , BUTTON_SHAPE_T.active
+
+            , BUTTON_SHAPE_T.does_meet_id_filters
+            , BUTTON_SHAPE_T.does_meet_non_id_filters
+        FROM parts.DOG_Button_Shape_Temp BUTTON_SHAPE_T
+        WHERE BUTTON_SHAPE_T.GUID = v_guid
+        ;
+        
+        IF a_debug = 1 THEN
+            SELECT COUNT(*) FROM tmp_Button_Shape;
+            SELECT * FROM tmp_Button_Shape;
+        END IF;
+    END IF;
+    
+    -- Filter outputs
+    IF EXISTS(SELECT * FROM tmp_Msg_Error t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+        IF a_debug = 1 THEN
+            SELECT * FROM tmp_Button_Shape;
+        END IF;
+
+        DELETE FROM tmp_Button_Shape;
+    END IF;
+
+
+    -- Outputs
+    -- Button_Shapes
+    SELECT 
+          t_BUTTON_SHAPES.id_button_shape
+        , t_BUTTON_SHAPES.code
+        , t_BUTTON_SHAPES.name
+        , t_BUTTON_SHAPES.notes
+        , t_BUTTON_SHAPES.active
+
+        , t_BUTTON_SHAPES.does_meet_id_filters
+        , t_BUTTON_SHAPES.does_meet_non_id_filters
+    FROM tmp_Button_Shape t_BUTTON_SHAPES
+    LEFT JOIN parts.DOG_Button_Shape BUTTON_SHAPES ON t_BUTTON_SHAPES.id_button_shape = BUTTON_SHAPES.id_button_shape
+    ORDER BY t_BUTTON_SHAPES.name
+    ;
+
+    -- Errors
+    SELECT 
+          t_ERROR.id_error
+		, t_ERROR.id_type
+        , t_ERROR.code
+        , ERROR_TYPE.name
+        , ERROR_TYPE.description
+        , ERROR_TYPE.is_breaking_error
+        , ERROR_TYPE.background_colour
+        , ERROR_TYPE.text_colour
+		, t_ERROR.msg
+    FROM tmp_Msg_Error t_ERROR
+	INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
+	;
+    
+    IF a_debug = 1 AND v_can_view = 1 THEN
+        SELECT * FROM tmp_Button_Shape;
+    END IF;
+	
+	CALL parts.p_dog_clear_calc_button_shape(
+		v_guid -- a_guid
+        , 0 -- a_debug
+	);
+    
+    DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Button_Shape;
+    
+    IF a_debug = 1 THEN
+		CALL parts.p_core_debug_timing_reporting ( v_time_start );
+    END IF;
+END //
+DELIMITER ;
+
+
+/*
+
+CALL parts.p_dog_get_many_button_shape (
+	  1 -- 'auth0|6582b95c895d09a70ba10fef',	-- a_id_user
+    , 1                                     	-- a_get_all_button_shape
+	, 0                                     	-- a_get_inactive_button_shape
+	, ''                                    	-- a_ids_button_shape
+    , ''                                        -- a_names_button_shape
+    , ''                                        -- a_notes_button_shape
+    , 1                                         -- a_require_all_id_search_filters_met
+    , 1                                         -- a_require_any_id_search_filters_met
+    , 0                                         -- a_require_all_non_id_search_filters_met
+    , 1                                         -- a_require_any_non_id_search_filters_met
+    , 1                                     	-- a_debug
+);
+
+
+CALL demo.p_dog_get_many_button_shape (
+	  1 -- 'auth0|6582b95c895d09a70ba10fef',	-- a_id_user
+    , 1                                     	-- a_get_all_button_shape
+	, 0                                     	-- a_get_inactive_button_shape
+	, ''                                    	-- a_ids_button_shape
+    , 'pat,point'                               -- a_names_button_shape
+    , 'pat,point'                                        -- a_notes_button_shape
+    , 1                                         -- a_require_all_id_search_filters_met
+    , 1                                         -- a_require_any_id_search_filters_met
+    , 0                                         -- a_require_all_non_id_search_filters_met
+    , 1                                         -- a_require_any_non_id_search_filters_met
+    , 1                                     	-- a_debug
+);
+
+*/

static/MySQL/71224_p_dog_calc_colour.sql

@@ -0,0 +1,549 @@
+ 
+USE parts;
+
+DROP PROCEDURE IF EXISTS parts.p_dog_calc_colour;
+
+DELIMITER //
+CREATE PROCEDURE parts.p_dog_calc_colour (
+      IN a_guid BINARY(36)
+    , IN a_id_user INT
+    , IN a_get_all_colour BIT
+	, IN a_get_inactive_colour BIT
+	, IN a_ids_colour TEXT
+    , IN a_names_colour TEXT
+    , IN a_require_all_id_search_filters_met BIT
+    , IN a_require_any_id_search_filters_met BIT
+    , IN a_require_all_non_id_search_filters_met BIT
+    , IN a_require_any_non_id_search_filters_met BIT
+    , IN a_show_errors BIT
+    , IN a_debug BIT
+)
+BEGIN
+    DECLARE v_can_view BIT;
+    DECLARE v_code_type_error_bad_data VARCHAR(100);
+    DECLARE v_code_type_error_no_permission VARCHAR(100);
+    DECLARE v_has_filter_colour_id BIT;
+    DECLARE v_has_filter_colour_name BIT;
+    DECLARE v_id_access_level_view INT;
+    DECLARE v_id_minimum INT;
+    DECLARE v_id_permission_dog_view INT;
+    DECLARE v_id_type_error_bad_data INT;
+    DECLARE v_id_type_error_no_permission INT;
+    DECLARE v_time_start TIMESTAMP(6);
+    
+    DECLARE exit handler for SQLEXCEPTION
+    BEGIN
+        GET DIAGNOSTICS CONDITION 1
+            @sqlstate = RETURNED_SQLSTATE
+            , @errno = MYSQL_ERRNO
+            , @text = MESSAGE_TEXT
+		;
+        
+        ROLLBACK;
+        
+		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error_Calc_Colour (
+			  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
+			, id_type INT NULL
+			, code VARCHAR(250) NOT NULL
+			, msg TEXT NOT NULL
+		);
+
+        INSERT INTO tmp_Msg_Error_Calc_Colour (
+			  id_type
+            , code
+            , msg
+		)
+        SELECT 
+			  MET.id_type
+            , @errno
+            , @text
+		FROM parts.CORE_Msg_Error_Type MET
+        WHERE MET.code = 'MYSQL_ERROR'
+		;
+        
+        SELECT 
+            t_ERROR.id_error
+            , t_ERROR.id_type
+            , t_ERROR.code
+            , ERROR_TYPE.name
+            , ERROR_TYPE.description
+            , ERROR_TYPE.is_breaking_error
+            , ERROR_TYPE.background_colour
+            , ERROR_TYPE.text_colour
+            , t_ERROR.msg
+        FROM tmp_Msg_Error_Calc_Colour t_ERROR
+        INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
+        ;
+        
+		DROP TABLE IF EXISTS tmp_Msg_Error_Calc_Colour;
+    END;
+
+    SET v_time_start := CURRENT_TIMESTAMP(6);
+    SET v_code_type_error_bad_data := 'BAD_DATA';
+    SET v_code_type_error_no_permission := 'NO_PERMISSION';
+    SET v_id_type_error_bad_data := (SELECT ERROR_TYPE.id_type FROM parts.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_bad_data LIMIT 1);
+    SET v_id_type_error_no_permission := (SELECT ERROR_TYPE.id_type FROM parts.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_no_permission LIMIT 1);
+    SET v_id_permission_dog_view := (SELECT PERMISSION.id_permission FROM parts.DOG_Permission PERMISSION WHERE PERMISSION.code = 'DOG_VIEW' LIMIT 1);
+    SET v_id_access_level_view := (SELECT ACCESS_LEVEL.id_access_level FROM parts.DOG_Access_Level ACCESS_LEVEL WHERE ACCESS_LEVEL.code = 'VIEW' LIMIT 1);
+    
+    
+    CALL parts.p_core_validate_guid ( a_guid );
+
+    SET a_id_user := IFNULL(a_id_user, 0);
+    SET a_get_all_colour := IFNULL(a_get_all_colour, 0);
+    SET a_get_inactive_colour := IFNULL(a_get_inactive_colour, 0);
+    SET a_ids_colour := TRIM(IFNULL(a_ids_colour, ''));
+    SET a_names_colour := TRIM(IFNULL(a_names_colour, ''));
+    SET a_require_all_id_search_filters_met := IFNULL(a_require_all_id_search_filters_met, 1);
+    SET a_require_any_id_search_filters_met := IFNULL(a_require_any_id_search_filters_met, 1);
+    SET a_require_all_non_id_search_filters_met := IFNULL(a_require_all_non_id_search_filters_met, 0);
+    SET a_require_any_non_id_search_filters_met := IFNULL(a_require_any_non_id_search_filters_met, 1);
+    SET a_show_errors := IFNULL(a_show_errors, 0);
+    SET a_debug := IFNULL(a_debug, 0);
+    
+    IF a_debug = 1 THEN
+		SELECT 
+              a_guid
+			, a_id_user
+            , a_get_all_colour
+            , a_get_inactive_colour
+            , a_ids_colour
+            , a_names_colour
+            , a_require_all_id_search_filters_met
+            , a_require_any_id_search_filters_met
+            , a_require_all_non_id_search_filters_met
+            , a_require_any_non_id_search_filters_met
+            , a_show_errors
+            , a_debug
+		;
+
+        SELECT
+              v_id_type_error_bad_data
+            , v_id_type_error_no_permission
+            , v_id_permission_dog_view
+            , v_time_start
+        ;
+    END IF;
+
+    DROP TEMPORARY TABLE IF EXISTS tmp_Split_Name_Calc_Colour;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Split_Id_Calc_Colour;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error_Calc_Colour;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Colour_Calc_Colour;
+    
+    CREATE TEMPORARY TABLE tmp_Colour_Calc_Colour (
+		  id_colour INT NOT NULL
+        , does_meet_id_filters BIT NOT NULL
+        , does_meet_non_id_filters BIT NOT NULL
+    );
+
+	CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error_Calc_Colour (
+          id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
+		, id_type INT NULL
+		, code VARCHAR(250) NOT NULL
+        , msg TEXT NOT NULL
+	);
+    
+    CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Split_Id_Calc_Colour (
+		  substring VARCHAR(4000) NOT NULL
+        , as_int INT NULL
+	);
+    DELETE FROM tmp_Split_Id_Calc_Colour;
+    
+    CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Split_Name_Calc_Colour (
+		  substring VARCHAR(4000) NOT NULL
+        , as_int INT NULL
+	);
+    DELETE FROM tmp_Split_Name_Calc_Colour;
+    
+    SET v_has_filter_colour_id = CASE WHEN a_ids_colour <> '' THEN 1 ELSE 0 END;
+    SET v_has_filter_colour_name = CASE WHEN a_names_colour <> '' THEN 1 ELSE 0 END;
+
+    -- Colours
+    IF v_has_filter_colour_id = 1 THEN
+		CALL parts.p_core_split(a_guid, a_ids_colour, ',', a_debug);
+
+        SET sql_mode = '';
+		
+		INSERT INTO tmp_Split_Id_Calc_Colour (
+			  substring
+			, as_int
+		)
+		SELECT 
+			  SPLIT_T.substring
+			, CAST(SPLIT_T.substring AS DECIMAL(10,0)) AS as_int
+		FROM parts.CORE_Split_Temp SPLIT_T
+		WHERE 
+                SPLIT_T.GUID = a_guid
+			AND IFNULL(SPLIT_T.substring, '') <> ''
+		;
+		
+		CALL parts.p_core_clear_split( a_guid );
+	END IF;
+
+    IF v_has_filter_colour_name = 1 THEN
+		CALL parts.p_core_split(a_guid, a_names_colour, ',', a_debug);
+
+        SET sql_mode = '';
+		
+		INSERT INTO tmp_Split_Name_Calc_Colour (
+			  substring
+			, as_int
+		)
+		SELECT 
+			  SPLIT_T.substring
+			, CAST(SPLIT_T.substring AS DECIMAL(10,0)) AS as_int
+		FROM parts.CORE_Split_Temp SPLIT_T
+		WHERE 
+                SPLIT_T.GUID = a_guid
+			AND IFNULL(SPLIT_T.substring, '') <> ''
+		;
+		
+		CALL parts.p_core_clear_split( a_guid );
+	END IF;
+    
+    IF NOT EXISTS (SELECT * FROM tmp_Msg_Error_Calc_Colour t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+		IF EXISTS (
+			SELECT * 
+            FROM tmp_Split_Id_Calc_Colour t_SPLIT_ID
+            LEFT JOIN parts.DOG_Colour COLOURS ON t_SPLIT_ID.as_int = COLOURS.id_colour 
+			WHERE 
+				    ISNULL(t_SPLIT_ID.as_int) 
+                OR  ISNULL(COLOURS.id_colour)
+				OR  (
+					COLOURS.active = 0
+					AND a_get_inactive_colour = 0
+				)
+		) THEN
+			INSERT INTO tmp_Msg_Error_Calc_Colour (
+				  id_type
+		        , code
+				, msg
+			)
+			SELECT
+				  v_id_type_error_bad_data
+                , v_code_type_error_bad_data
+				, CONCAT('Invalid or inactive Colour IDs: ', IFNULL(GROUP_CONCAT(t_SPLIT_ID.substring SEPARATOR ', '), 'NULL'))
+			FROM tmp_Split_Id_Calc_Colour t_SPLIT_ID
+			LEFT JOIN parts.DOG_Colour COLOURS ON t_SPLIT_ID.as_int = COLOURS.id_colour
+			WHERE 
+				    ISNULL(t_SPLIT_ID.as_int) 
+				OR  ISNULL(COLOURS.id_colour)
+				OR  (
+					COLOURS.active = 0
+					AND a_get_inactive_colour = 0
+				)
+			;
+        /* Don't error on names, hand signals, or notes not found
+		ELSEIF EXISTS ()
+        */
+		ELSE
+			INSERT INTO tmp_Colour_Calc_Colour (
+				  id_colour
+                , does_meet_id_filters
+                , does_meet_non_id_filters
+			)
+            WITH 
+                  Colour_Id_Filter AS (
+                    SELECT COLOURS.id_colour
+                    FROM tmp_Split_Id_Calc_Colour t_SPLIT_ID
+                    INNER JOIN parts.DOG_Colour COLOURS ON t_SPLIT_ID.as_int = COLOURS.id_colour
+                )
+                , Colour_Name_Filter AS (
+                    SELECT COLOURS.id_colour
+                    FROM tmp_Split_Name_Calc_Colour t_SPLIT_NAME
+                    INNER JOIN parts.DOG_Colour COLOURS ON COLOURS.name LIKE CONCAT('%', t_SPLIT_NAME.substring, '%')
+                    WHERE NULLIF(t_SPLIT_NAME.substring, '') IS NOT NULL
+                )
+                , Colour_Filters AS (
+                    SELECT 
+                          COLOURS_COMBINED.id_colour
+                        , MAX(COLOURS_COMBINED.does_meet_id_filter) AS does_meet_id_filter
+                        , MAX(COLOURS_COMBINED.does_meet_name_filter) AS does_meet_name_filter
+                    FROM (
+                        SELECT 
+                              COLOURS_ID_FILTER.id_colour 
+                            , 1 AS does_meet_id_filter
+                            , 0 AS does_meet_name_filter
+                        FROM Colour_Id_Filter COLOURS_ID_FILTER
+                        UNION
+                        SELECT 
+                              COLOURS_NAME_FILTER.id_colour 
+                            , 0 AS does_meet_id_filter
+                            , 1 AS does_meet_name_filter
+                        FROM Colour_Name_Filter COLOURS_NAME_FILTER
+                    ) COLOURS_COMBINED
+                    GROUP BY COLOURS_COMBINED.id_colour
+                )
+            SELECT 
+                  COLOURS.id_colour
+                , CASE WHEN 
+                        v_has_filter_colour_id = 0 
+                    OR  IFNULL(COLOURS_FILTERS.does_meet_id_filter, 0) = 1
+                THEN 1 ELSE 0 END AS does_meet_id_filters
+                , CASE WHEN 
+                        (
+                            v_has_filter_colour_name = 0
+                    )
+                    OR  IFNULL(COLOURS_FILTERS.does_meet_name_filter, 0) = 1
+                THEN 1 ELSE 0 END AS does_meet_non_id_filters
+            FROM parts.DOG_Colour COLOURS
+            LEFT JOIN Colour_Filters COLOURS_FILTERS ON COLOURS.id_colour = COLOURS_FILTERS.id_colour
+            WHERE 
+                (
+                        a_get_all_colour = 1
+                    OR  (
+                            v_has_filter_colour_id = 1
+                        AND COLOURS_FILTERS.does_meet_id_filter = 1
+                    )
+                    OR  (
+                            v_has_filter_colour_name = 1
+                        AND COLOURS_FILTERS.does_meet_name_filter = 1
+                    )
+                )
+                AND (
+                        a_get_inactive_colour = 1
+                    OR  COLOURS.active = 1
+                )
+			;
+		END IF;
+	END IF;
+    
+    DELETE FROM tmp_Split_Id_Calc_Colour;
+    DELETE FROM tmp_Split_Name_Calc_Colour;
+
+    IF a_debug = 1 THEN
+        SELECT 'After get Colours ';
+        SELECT * FROM tmp_Colour_Calc_Colour;
+    END IF;
+
+    -- Filter records
+    IF NOT EXISTS (SELECT * FROM tmp_Msg_Error_Calc_Colour t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+        DELETE t_COLOURS
+        FROM tmp_Colour_Calc_Colour t_COLOURS
+        WHERE
+                (
+                    a_require_all_id_search_filters_met = 1
+                AND (
+                        t_COLOURS.does_meet_id_filters = 0
+                )
+            )
+            OR  (
+                    a_require_all_non_id_search_filters_met = 1
+                AND (
+                        t_COLOURS.does_meet_non_id_filters = 0
+                )
+            )
+            OR  (
+                a_require_any_id_search_filters_met = 1
+                AND t_COLOURS.does_meet_id_filters = 0
+            )
+            OR  (
+                a_require_any_non_id_search_filters_met = 1
+                AND t_COLOURS.does_meet_non_id_filters = 0
+            )
+        ;
+    END IF;
+
+    IF a_debug = 1 THEN
+        SELECT 'After filter Colours';
+        SELECT * FROM tmp_Colour_Calc_Colour;
+    END IF;
+
+    -- Calculated fields
+
+    -- Permissions
+    IF a_debug = 1 THEN
+		SELECT 
+			  a_guid -- a_guid
+            , 0 -- get_all_user
+            , 0 -- get_inactive_user
+            , a_id_user -- ids_user
+            , '' -- a_auth0_ids_user
+            , '' -- a_names_user
+            , '' -- a_emails_user
+            , 1 -- a_require_all_id_search_filters_met
+            , 1 -- a_require_any_id_search_filters_met
+            , 0 -- a_require_all_non_id_search_filters_met
+            , 0 -- a_require_any_non_id_search_filters_met
+            , v_id_permission_dog_view -- ids_permission
+            , v_id_access_level_view -- ids_access_level
+            , 0 -- a_show_errors
+			, 0 -- a_debug
+        ;
+    END IF;
+    
+	CALL parts.p_dog_calc_user(
+          a_guid -- a_guid
+        , 0 -- get_all_user
+        , 0 -- get_inactive_user
+        , a_id_user -- ids_user
+        , '' -- a_auth0_ids_user
+        , '' -- a_names_user
+        , '' -- a_emails_user
+        , 1 -- a_require_all_id_search_filters_met
+        , 1 -- a_require_any_id_search_filters_met
+        , 0 -- a_require_all_non_id_search_filters_met
+        , 0 -- a_require_any_non_id_search_filters_met
+        , v_id_permission_dog_view -- ids_permission
+        , v_id_access_level_view -- ids_access_level
+        , 0 -- a_show_errors
+        , 0 -- a_debug
+    );
+	
+    SELECT
+          IFNULL(CALC_USER_T.has_access, 0)
+    INTO
+          v_can_view
+    FROM parts.DOG_Calc_User_Temp CALC_USER_T
+    WHERE CALC_USER_T.GUID = a_guid
+    LIMIT 1
+    ;
+    
+    IF a_debug = 1 THEN
+        SELECT v_can_view;
+    END IF;
+    
+    IF (v_can_view = 0) THEN
+		DELETE t_ME
+        FROM tmp_Msg_Error_Calc_Colour t_ME
+        WHERE t_ME.id_type <> v_id_type_error_no_permission
+        ;
+		INSERT INTO tmp_Msg_Error_Calc_Colour (
+			  id_type
+			, code
+            , msg
+		)
+		VALUES (
+			  v_id_type_error_no_permission
+            , v_code_type_error_no_permission
+			, 'You do not have permission to view Dogs and Colours.'
+		)
+        ;
+    END IF;
+	
+	CALL parts.p_dog_clear_calc_user(
+		a_guid
+        , 0 -- a_debug
+	);
+
+    IF a_debug = 1 THEN
+        SELECT 'Before non-permitted data deletion';
+        SELECT * FROM tmp_Colour_Calc_Colour;
+        SELECT * FROM tmp_Msg_Error_Calc_Colour;
+    END IF;
+    
+    IF EXISTS(SELECT * FROM tmp_Msg_Error_Calc_Colour t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+        IF a_debug = 1 THEN
+            SELECT * FROM tmp_Colour_Calc_Colour;
+        END IF;
+
+        DELETE FROM tmp_Colour_Calc_Colour;
+    END IF;
+
+    IF a_debug = 1 THEN
+        SELECT 'After non-permitted data deletion';
+    END IF;
+
+    -- Outputs
+	START TRANSACTION;
+        -- Colours
+        INSERT INTO parts.DOG_Colour_Temp (
+              guid
+            , id_colour
+            , code
+            , name
+            , active
+
+            , does_meet_id_filters
+            , does_meet_non_id_filters
+        )
+        SELECT 
+              a_guid
+            , t_COLOURS.id_colour
+            , COLOURS.code
+            , COLOURS.name
+            , COLOURS.active
+
+            , t_COLOURS.does_meet_id_filters
+            , t_COLOURS.does_meet_non_id_filters
+        FROM parts.DOG_Colour COLOURS
+        INNER JOIN tmp_Colour_Calc_Colour t_COLOURS ON COLOURS.id_colour = t_COLOURS.id_colour
+        ORDER BY COLOURS.name
+        ;
+    COMMIT;
+
+    -- Errors
+    IF a_show_errors = 1 THEN
+        SELECT 
+            t_ERROR.id_error
+            , t_ERROR.id_type
+            , t_ERROR.code
+            , ERROR_TYPE.name
+            , ERROR_TYPE.description
+            , ERROR_TYPE.is_breaking_error
+            , ERROR_TYPE.background_colour
+            , ERROR_TYPE.text_colour
+            , t_ERROR.msg
+        FROM tmp_Msg_Error_Calc_Colour t_ERROR
+        INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
+        ;
+    END IF;
+
+    IF a_debug = 1 AND v_can_view = 1 THEN
+        SELECT * FROM tmp_Colour_Calc_Colour;
+    END IF;
+    
+    CALL parts.p_dog_clear_calc_dog ( a_guid, 0 );
+
+    DROP TEMPORARY TABLE IF EXISTS tmp_Split_Name_Calc_Colour;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Split_Id_Calc_Colour;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error_Calc_Colour;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Colour_Calc_Colour;
+    
+    IF a_debug = 1 THEN
+		CALL parts.p_core_debug_timing_reporting ( v_time_start );
+    END IF;
+END //
+DELIMITER ;
+
+
+/*
+
+
+CALL parts.p_dog_calc_colour (
+      'gripe                               ' -- a_guid
+	, 1 -- 'auth0|6582b95c895d09a70ba10fef',	-- a_id_user
+    , 1                                     	-- a_get_all_colour
+	, 0                                     	-- a_get_inactive_colour
+	, ''                                    	-- a_ids_colour
+    , ''                                        -- a_names_colour
+    , 0                                         -- a_require_all_id_search_filters_met
+    , 0                                         -- a_require_any_id_search_filters_met
+    , 0                                         -- a_require_all_non_id_search_filters_met
+    , 0                                         -- a_require_any_non_id_search_filters_met
+    , 0                                         -- a_show_errors
+    , 0                                     	-- a_debug
+);
+
+SELECT *
+FROM parts.DOG_Colour_Temp
+;
+/*
+SELECT *
+FROM parts.DOG_Colour_Temp C
+WHERE 
+        C.does_meet_id_filters
+    AND C.does_meet_non_id_filters
+;
+*/
+CALL parts.p_dog_clear_calc_colour (
+	'gripe                               ' -- a_guid
+    , 1 -- debug
+);
+
+
+DELETE
+FROM parts.DOG_Colour_Temp
+;
+
+*/

static/MySQL/71224_p_dog_clear_calc_colour.sql

@@ -0,0 +1,45 @@
+
+USE parts;
+
+DROP PROCEDURE IF EXISTS parts.p_dog_clear_calc_colour;
+DROP PROCEDURE IF EXISTS parts.p_colour_clear_calc_colour;
+
+DELIMITER //
+CREATE PROCEDURE parts.p_dog_clear_calc_colour (
+	  IN a_guid BINARY(36)
+    , IN a_debug BIT
+)
+BEGIN
+	DECLARE v_time_start TIMESTAMP(6);
+    SET v_time_start := CURRENT_TIMESTAMP(6);
+    
+    CALL parts.p_core_validate_guid ( a_guid );
+    
+	START TRANSACTION;
+		
+		DELETE COLOURS_T
+        FROM parts.DOG_Colour_Temp COLOURS_T
+		WHERE COLOURS_T.GUID = a_guid
+		;
+		
+	COMMIT;
+    
+    IF a_debug = 1 THEN
+		CALL parts.p_debug_timing_reporting( v_time_start );
+    END IF;
+END //
+DELIMITER ;
+
+/*
+
+CALL parts.p_dog_clear_calc_colour (
+	'crips                               ' -- a_guid
+    , 1 -- debug
+);
+
+SELECT *
+FROM parts.DOG_Calc_User_Temp
+WHERE GUID = 'chips                               '
+;
+
+*/

static/MySQL/71224_p_dog_get_many_colour.sql

@@ -0,0 +1,375 @@
+ 
+USE parts;
+
+DROP PROCEDURE IF EXISTS parts.p_dog_get_many_colour;
+
+DELIMITER //
+CREATE PROCEDURE parts.p_dog_get_many_colour (
+	  IN a_id_user INT
+    , IN a_get_all_colour BIT
+	, IN a_get_inactive_colour BIT
+	, IN a_ids_colour TEXT
+    , IN a_names_colour TEXT
+    , IN a_require_all_id_search_filters_met BIT
+    , IN a_require_any_id_search_filters_met BIT
+    , IN a_require_all_non_id_search_filters_met BIT
+    , IN a_require_any_non_id_search_filters_met BIT
+    , IN a_debug BIT
+)
+BEGIN
+    DECLARE v_can_view BIT;
+    DECLARE v_code_type_error_bad_data VARCHAR(100);
+    DECLARE v_code_type_error_no_permission VARCHAR(100);
+    DECLARE v_guid BINARY(36);
+    DECLARE v_id_access_level_view INT;
+    DECLARE v_id_minimum INT;
+    DECLARE v_id_permission_dog_view INT;
+    DECLARE v_id_type_error_bad_data INT;
+    DECLARE v_id_type_error_no_permission INT;
+    DECLARE v_time_start TIMESTAMP(6);
+    
+    DECLARE exit handler for SQLEXCEPTION
+    BEGIN
+        GET DIAGNOSTICS CONDITION 1
+            @sqlstate = RETURNED_SQLSTATE
+            , @errno = MYSQL_ERRNO
+            , @text = MESSAGE_TEXT
+		;
+        
+        ROLLBACK;
+        
+		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
+			  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
+			, id_type INT NULL
+			, code VARCHAR(250) NOT NULL
+			, msg TEXT NOT NULL
+		);
+
+        INSERT INTO tmp_Msg_Error (
+			  id_type
+            , code
+            , msg
+		)
+        SELECT 
+			  MET.id_type
+            , @errno
+            , @text
+		FROM parts.CORE_Msg_Error_Type MET
+        WHERE MET.code = 'MYSQL_ERROR'
+		;
+        
+        SELECT 
+            t_ERROR.id_error
+            , t_ERROR.id_type
+            , t_ERROR.code
+            , ERROR_TYPE.name
+            , ERROR_TYPE.description
+            , ERROR_TYPE.is_breaking_error
+            , ERROR_TYPE.background_colour
+            , ERROR_TYPE.text_colour
+            , t_ERROR.msg
+        FROM tmp_Msg_Error t_ERROR
+        INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
+        ;
+        
+		DROP TABLE IF EXISTS tmp_Msg_Error;
+    END;
+
+    SET v_time_start := CURRENT_TIMESTAMP(6);
+    SET v_guid := UUID();
+    SET v_code_type_error_bad_data := 'BAD_DATA';
+    SET v_code_type_error_no_permission := 'NO_PERMISSION';
+    SET v_id_type_error_bad_data := (SELECT ERROR_TYPE.id_type FROM parts.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_bad_data LIMIT 1);
+    SET v_id_type_error_no_permission := (SELECT ERROR_TYPE.id_type FROM parts.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_no_permission LIMIT 1);
+    SET v_id_permission_dog_view := (SELECT PERMISSION.id_permission FROM parts.DOG_Permission PERMISSION WHERE PERMISSION.code = 'DOG_VIEW' LIMIT 1);
+    SET v_id_access_level_view := (SELECT ACCESS_LEVEL.id_access_level FROM parts.DOG_Access_Level ACCESS_LEVEL WHERE ACCESS_LEVEL.code = 'VIEW' LIMIT 1);
+    
+    SET a_id_user := IFNULL(a_id_user, 0);
+    /*
+    SET a_get_all_colour := IFNULL(a_get_all_colour, 0);
+    SET a_get_inactive_colour := IFNULL(a_get_inactive_colour, 0);
+    SET a_ids_colour := TRIM(IFNULL(a_ids_colour, ''));
+    SET a_names_colour := TRIM(IFNULL(a_names_colour, ''));
+    SET a_require_all_id_search_filters_met := IFNULL(a_require_all_id_search_filters_met, 1);
+    SET a_require_any_id_search_filters_met := IFNULL(a_require_any_id_search_filters_met, 1);
+    SET a_require_all_non_id_search_filters_met := IFNULL(a_require_all_non_id_search_filters_met, 0);
+    SET a_require_any_non_id_search_filters_met := IFNULL(a_require_any_non_id_search_filters_met, 1);
+    */
+    SET a_debug := IFNULL(a_debug, 0);
+    
+    IF a_debug = 1 THEN
+		SELECT 
+			  a_id_user
+            , a_get_all_colour
+            , a_get_inactive_colour
+            , a_ids_colour
+            , a_names_colour
+            , a_require_all_id_search_filters_met
+            , a_require_any_id_search_filters_met
+            , a_require_all_non_id_search_filters_met
+            , a_require_any_non_id_search_filters_met
+            , a_debug
+		;
+
+        SELECT
+              v_id_type_error_bad_data
+            , v_id_type_error_no_permission
+            , v_guid
+            , v_id_permission_dog_view
+            , v_time_start
+        ;
+    END IF;
+
+    DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Colour;
+    
+    CREATE TEMPORARY TABLE tmp_Colour (
+		  id_colour INT NOT NULL
+		, code VARCHAR(250)
+        , name VARCHAR(250)
+        , active BIT
+
+        , does_meet_id_filters BIT
+        , does_meet_non_id_filters BIT
+    );
+    
+	CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
+          id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
+		, id_type INT NULL
+		, code VARCHAR(250) NOT NULL
+        , msg TEXT NOT NULL
+    );
+    
+    -- Permissions
+    IF a_debug = 1 THEN
+		SELECT 
+			  v_guid
+            , 0 -- get_all_user
+            , 0 -- get_inactive_user
+            , a_id_user -- ids_user
+            , '' -- a_auth0_ids_user
+            , '' -- a_names_user
+            , '' -- a_emails_user
+            , 1 -- a_require_all_id_search_filters_met
+            , 1 -- a_require_any_id_search_filters_met
+            , 0 -- a_require_all_non_id_search_filters_met
+            , 0 -- a_require_any_non_id_search_filters_met
+            , v_id_permission_dog_view -- ids_permission
+            , v_id_access_level_view -- ids_access_level
+            , 0 -- a_show_errors
+			, 0 -- a_debug
+        ;
+    END IF;
+    
+	CALL parts.p_dog_calc_user(
+          v_guid
+        , 0 -- get_all_user
+        , 0 -- get_inactive_user
+        , a_id_user -- ids_user
+        , '' -- a_auth0_ids_user
+        , '' -- a_names_user
+        , '' -- a_emails_user
+        , 1 -- a_require_all_id_search_filters_met
+        , 1 -- a_require_any_id_search_filters_met
+        , 0 -- a_require_all_non_id_search_filters_met
+        , 0 -- a_require_any_non_id_search_filters_met
+        , v_id_permission_dog_view -- ids_permission
+        , v_id_access_level_view -- ids_access_level
+        , 0 -- a_show_errors
+        , 0 -- a_debug
+    );
+	
+    SELECT
+          IFNULL(CALC_USER_T.has_access, 0)
+    INTO
+          v_can_view
+    FROM parts.DOG_Calc_User_Temp CALC_USER_T
+    WHERE CALC_USER_T.GUID = v_guid
+    LIMIT 1
+    ;
+    
+    IF a_debug = 1 THEN
+        SELECT v_can_view;
+        SELECT COUNT(*) AS Count_Errors FROM tmp_Msg_Error t_ERROR;
+        SELECT * FROM tmp_Msg_Error t_ERROR;
+    END IF;
+    
+    IF (v_can_view = 0) THEN
+		DELETE t_ME
+        FROM tmp_Msg_Error t_ME
+        WHERE t_ME.id_type <> v_id_type_error_no_permission
+        ;
+		INSERT INTO tmp_Msg_Error (
+			  id_type
+			, code
+            , msg
+		)
+		VALUES (
+			  v_id_type_error_no_permission
+            , v_code_type_error_no_permission
+			, 'You do not have permission to view Colours.'
+		)
+        ;
+    END IF;
+	
+	CALL parts.p_dog_clear_calc_user(
+		  v_guid
+        , 0 -- a_debug
+	);
+
+    
+    -- Call Colour Calc
+    IF NOT EXISTS(SELECT * FROM tmp_Msg_Error t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+        IF a_debug = 1 THEN
+            SELECT 
+                  v_guid -- a_guid
+                , a_id_user -- a_id_user
+                , a_get_all_colour -- a_get_all_colour
+                , a_get_inactive_colour -- a_get_inactive_colour
+                , a_ids_colour -- a_ids_colour
+                , a_names_colour -- a_names_colour
+                , a_require_all_id_search_filters_met -- a_require_all_id_search_filters_met
+                , a_require_any_id_search_filters_met -- a_require_any_id_search_filters_met
+                , a_require_all_non_id_search_filters_met -- a_require_all_non_id_search_filters_met
+                , a_require_any_non_id_search_filters_met -- a_require_any_non_id_search_filters_met
+                , 0 -- a_show_errors
+                , 0 -- a_debug
+            ;
+        END IF;
+        
+        CALL parts.p_dog_calc_colour (
+              v_guid -- a_guid
+            , a_id_user -- a_id_user
+            , a_get_all_colour -- a_get_all_colour
+            , a_get_inactive_colour -- a_get_inactive_colour
+            , a_ids_colour -- a_ids_colour
+            , a_names_colour -- a_names_colour
+            , a_require_all_id_search_filters_met -- a_require_all_id_search_filters_met
+            , a_require_any_id_search_filters_met -- a_require_any_id_search_filters_met
+            , a_require_all_non_id_search_filters_met -- a_require_all_non_id_search_filters_met
+            , a_require_any_non_id_search_filters_met -- a_require_any_non_id_search_filters_met
+            , 0 -- a_show_errors
+            , 0 -- a_debug
+        );
+        
+        IF a_debug = 1 THEN
+            SELECT COUNT(*) FROM parts.DOG_Colour_Temp;
+            SELECT * FROM parts.DOG_Colour_Temp;
+        END IF;
+        
+        INSERT INTO tmp_Colour (
+              id_colour
+            , code
+            , name
+            , active
+
+            , does_meet_id_filters
+            , does_meet_non_id_filters
+        )
+        SELECT
+              COLOUR_T.id_colour
+            , COLOUR_T.code
+            , COLOUR_T.name
+            , COLOUR_T.active
+
+            , COLOUR_T.does_meet_id_filters
+            , COLOUR_T.does_meet_non_id_filters
+        FROM parts.DOG_Colour_Temp COLOUR_T
+        WHERE COLOUR_T.GUID = v_guid
+        ;
+        
+        IF a_debug = 1 THEN
+            SELECT COUNT(*) FROM tmp_Colour;
+            SELECT * FROM tmp_Colour;
+        END IF;
+    END IF;
+    
+    -- Filter outputs
+    IF EXISTS(SELECT * FROM tmp_Msg_Error t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+        IF a_debug = 1 THEN
+            SELECT * FROM tmp_Colour;
+        END IF;
+
+        DELETE FROM tmp_Colour;
+    END IF;
+
+
+    -- Outputs
+    -- Colours
+    SELECT 
+          t_COLOURS.id_colour
+        , t_COLOURS.code
+        , t_COLOURS.name
+        , t_COLOURS.active
+
+        , t_COLOURS.does_meet_id_filters
+        , t_COLOURS.does_meet_non_id_filters
+    FROM tmp_Colour t_COLOURS
+    LEFT JOIN parts.DOG_Colour COLOURS ON t_COLOURS.id_colour = COLOURS.id_colour
+    ORDER BY t_COLOURS.name
+    ;
+
+    -- Errors
+    SELECT 
+          t_ERROR.id_error
+		, t_ERROR.id_type
+        , t_ERROR.code
+        , ERROR_TYPE.name
+        , ERROR_TYPE.description
+        , ERROR_TYPE.is_breaking_error
+        , ERROR_TYPE.background_colour
+        , ERROR_TYPE.text_colour
+		, t_ERROR.msg
+    FROM tmp_Msg_Error t_ERROR
+	INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
+	;
+    
+    IF a_debug = 1 AND v_can_view = 1 THEN
+        SELECT * FROM tmp_Colour;
+    END IF;
+	
+	CALL parts.p_dog_clear_calc_colour(
+		v_guid -- a_guid
+        , 0 -- a_debug
+	);
+    
+    DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Colour;
+    
+    IF a_debug = 1 THEN
+		CALL parts.p_core_debug_timing_reporting ( v_time_start );
+    END IF;
+END //
+DELIMITER ;
+
+
+/*
+
+CALL parts.p_dog_get_many_colour (
+	  1 -- 'auth0|6582b95c895d09a70ba10fef',	-- a_id_user
+    , 1                                     	-- a_get_all_colour
+	, 0                                     	-- a_get_inactive_colour
+	, ''                                    	-- a_ids_colour
+    , ''                                        -- a_names_colour
+    , 1                                         -- a_require_all_id_search_filters_met
+    , 1                                         -- a_require_any_id_search_filters_met
+    , 0                                         -- a_require_all_non_id_search_filters_met
+    , 1                                         -- a_require_any_non_id_search_filters_met
+    , 1                                     	-- a_debug
+);
+
+
+CALL demo.p_dog_get_many_colour (
+	  1 -- 'auth0|6582b95c895d09a70ba10fef',	-- a_id_user
+    , 1                                     	-- a_get_all_colour
+	, 0                                     	-- a_get_inactive_colour
+	, ''                                    	-- a_ids_colour
+    , 'pat,point'                               -- a_names_colour
+    , 1                                         -- a_require_all_id_search_filters_met
+    , 1                                         -- a_require_any_id_search_filters_met
+    , 0                                         -- a_require_all_non_id_search_filters_met
+    , 1                                         -- a_require_any_non_id_search_filters_met
+    , 1                                     	-- a_debug
+);
+
+*/

static/MySQL/71228_p_dog_calc_image.sql

@@ -0,0 +1,908 @@
+ 
+USE parts;
+
+DROP PROCEDURE IF EXISTS parts.p_dog_calc_image;
+
+DELIMITER //
+CREATE PROCEDURE parts.p_dog_calc_image (
+      IN a_guid BINARY(36)
+    , IN a_id_user INT
+    , IN a_get_all_file_type BIT
+	, IN a_get_inactive_file_type BIT
+	, IN a_ids_file_type TEXT
+    , IN a_names_file_type TEXT
+    , IN a_get_all_dog BIT
+	, IN a_get_inactive_dog BIT
+	, IN a_ids_dog TEXT
+    , IN a_names_dog TEXT
+    , IN a_get_all_image BIT
+	, IN a_get_inactive_image BIT
+	, IN a_ids_image TEXT
+    , IN a_names_image TEXT
+    , IN a_require_all_id_search_filters_met BIT
+    , IN a_require_any_id_search_filters_met BIT
+    , IN a_require_all_non_id_search_filters_met BIT
+    , IN a_require_any_non_id_search_filters_met BIT
+    , IN a_show_errors BIT
+    , IN a_debug BIT
+)
+BEGIN
+    DECLARE v_can_view BIT;
+    DECLARE v_code_type_error_bad_data VARCHAR(100);
+    DECLARE v_code_type_error_no_permission VARCHAR(100);
+    DECLARE v_has_filter_file_type_id BIT;
+    DECLARE v_has_filter_file_type_name BIT;
+    DECLARE v_has_filter_image_id BIT;
+    DECLARE v_has_filter_image_name BIT;
+    DECLARE v_id_access_level_view INT;
+    DECLARE v_id_minimum INT;
+    DECLARE v_id_permission_dog_view INT;
+    DECLARE v_id_type_error_bad_data INT;
+    DECLARE v_id_type_error_no_permission INT;
+    DECLARE v_time_start TIMESTAMP(6);
+    
+    DECLARE exit handler for SQLEXCEPTION
+    BEGIN
+        GET DIAGNOSTICS CONDITION 1
+            @sqlstate = RETURNED_SQLSTATE
+            , @errno = MYSQL_ERRNO
+            , @text = MESSAGE_TEXT
+		;
+        
+        ROLLBACK;
+        
+		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error_Calc_Image (
+			  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
+			, id_type INT NULL
+			, code VARCHAR(250) NOT NULL
+			, msg TEXT NOT NULL
+		);
+
+        INSERT INTO tmp_Msg_Error_Calc_Image (
+			  id_type
+            , code
+            , msg
+		)
+        SELECT 
+			  MET.id_type
+            , @errno
+            , @text
+		FROM parts.CORE_Msg_Error_Type MET
+        WHERE MET.code = 'MYSQL_ERROR'
+		;
+        
+        SELECT 
+            t_ERROR.id_error
+            , t_ERROR.id_type
+            , t_ERROR.code
+            , ERROR_TYPE.name
+            , ERROR_TYPE.description
+            , ERROR_TYPE.is_breaking_error
+            , ERROR_TYPE.background_colour
+            , ERROR_TYPE.text_colour
+            , t_ERROR.msg
+        FROM tmp_Msg_Error_Calc_Image t_ERROR
+        INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
+        ;
+        
+		DROP TABLE IF EXISTS tmp_Msg_Error_Calc_Image;
+    END;
+
+    SET v_time_start := CURRENT_TIMESTAMP(6);
+    SET v_code_type_error_bad_data := 'BAD_DATA';
+    SET v_code_type_error_no_permission := 'NO_PERMISSION';
+    SET v_id_type_error_bad_data := (SELECT ERROR_TYPE.id_type FROM parts.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_bad_data LIMIT 1);
+    SET v_id_type_error_no_permission := (SELECT ERROR_TYPE.id_type FROM parts.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_no_permission LIMIT 1);
+    SET v_id_permission_dog_view := (SELECT PERMISSION.id_permission FROM parts.DOG_Permission PERMISSION WHERE PERMISSION.code = 'DOG_VIEW' LIMIT 1);
+    SET v_id_access_level_view := (SELECT ACCESS_LEVEL.id_access_level FROM parts.DOG_Access_Level ACCESS_LEVEL WHERE ACCESS_LEVEL.code = 'VIEW' LIMIT 1);
+    
+    
+    CALL parts.p_core_validate_guid ( a_guid );
+
+    SET a_id_user := IFNULL(a_id_user, 0);
+    -- SET a_get_all_dog := IFNULL(a_get_all_dog, 0);
+    -- SET a_get_inactive_dog := IFNULL(a_get_inactive_dog, 0);
+    -- SET a_ids_dog := TRIM(IFNULL(a_ids_dog, ''));
+    -- SET a_names_dog := TRIM(IFNULL(a_names_dog, ''));
+    SET a_get_all_file_type := IFNULL(a_get_all_file_type, 0);
+    SET a_get_inactive_file_type := IFNULL(a_get_inactive_file_type, 0);
+    SET a_ids_file_type := TRIM(IFNULL(a_ids_file_type, ''));
+    SET a_names_file_type := TRIM(IFNULL(a_names_file_type, ''));
+    SET a_get_all_image := IFNULL(a_get_all_image, 0);
+    SET a_get_inactive_image := IFNULL(a_get_inactive_image, 0);
+    SET a_ids_image := TRIM(IFNULL(a_ids_image, ''));
+    SET a_names_image := TRIM(IFNULL(a_names_image, ''));
+    SET a_require_all_id_search_filters_met := IFNULL(a_require_all_id_search_filters_met, 1);
+    SET a_require_any_id_search_filters_met := IFNULL(a_require_any_id_search_filters_met, 1);
+    SET a_require_all_non_id_search_filters_met := IFNULL(a_require_all_non_id_search_filters_met, 0);
+    SET a_require_any_non_id_search_filters_met := IFNULL(a_require_any_non_id_search_filters_met, 1);
+    SET a_show_errors := IFNULL(a_show_errors, 0);
+    SET a_debug := IFNULL(a_debug, 0);
+    
+    IF a_debug = 1 THEN
+		SELECT 
+              a_guid
+			, a_id_user
+            , a_get_all_file_type
+            , a_get_inactive_file_type
+            , a_ids_file_type
+            , a_names_file_type
+            , a_get_all_dog
+            , a_get_inactive_dog
+            , a_ids_dog
+            , a_names_dog
+            , a_get_all_image
+            , a_get_inactive_image
+            , a_ids_image
+            , a_names_image
+            , a_require_all_id_search_filters_met
+            , a_require_any_id_search_filters_met
+            , a_require_all_non_id_search_filters_met
+            , a_require_any_non_id_search_filters_met
+            , a_show_errors
+            , a_debug
+		;
+
+        SELECT
+              v_id_type_error_bad_data
+            , v_id_type_error_no_permission
+            , v_id_permission_dog_view
+            , v_time_start
+        ;
+    END IF;
+
+    DROP TEMPORARY TABLE IF EXISTS tmp_Split_Name_Calc_Image;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Split_Id_Calc_Image;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error_Calc_Image;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Image_Calc_Image;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Dog_Calc_Image;
+    DROP TEMPORARY TABLE IF EXISTS tmp_File_Type_Calc_Image;
+    
+    CREATE TEMPORARY TABLE tmp_File_Type_Calc_Image (
+		  id_file_type INT NOT NULL
+        , does_meet_id_filters BIT NOT NULL
+        , does_meet_non_id_filters BIT NOT NULL
+    );
+    
+    CREATE TEMPORARY TABLE tmp_Dog_Calc_Image (
+		  id_dog INT NOT NULL
+        , name VARCHAR(250)
+        , appearance VARCHAR(1000)
+        , mass_kg DECIMAL(7, 3)
+        , notes TEXT
+        , active BIT
+
+        , does_meet_id_filters BIT NOT NULL
+        , does_meet_non_id_filters BIT NOT NULL
+    );
+    
+    CREATE TEMPORARY TABLE tmp_Image_Calc_Image (
+		  id_image INT NOT NULL
+	    , id_file_type INT NOT NULL
+        , does_meet_id_filters BIT NOT NULL
+        , does_meet_non_id_filters BIT NOT NULL
+    );
+
+	CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error_Calc_Image (
+          id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
+		, id_type INT NULL
+		, code VARCHAR(250) NOT NULL
+        , msg TEXT NOT NULL
+	);
+    
+    CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Split_Id_Calc_Image (
+		  substring VARCHAR(4000) NOT NULL
+        , as_int INT NULL
+	);
+    DELETE FROM tmp_Split_Id_Calc_Image;
+    
+    CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Split_Name_Calc_Image (
+		  substring VARCHAR(4000) NOT NULL
+        , as_int INT NULL
+	);
+    DELETE FROM tmp_Split_Name_Calc_Image;
+    
+    SET v_has_filter_file_type_id = CASE WHEN a_ids_file_type <> '' THEN 1 ELSE 0 END;
+    SET v_has_filter_file_type_name = CASE WHEN a_names_file_type <> '' THEN 1 ELSE 0 END;
+    SET v_has_filter_image_id = CASE WHEN a_ids_image <> '' THEN 1 ELSE 0 END;
+    SET v_has_filter_image_name = CASE WHEN a_names_image <> '' THEN 1 ELSE 0 END;
+
+    -- File Types
+    IF v_has_filter_file_type_id = 1 THEN
+		CALL parts.p_core_split(a_guid, a_ids_file_type, ',', a_debug);
+
+        SET sql_mode = '';
+		
+		INSERT INTO tmp_Split_Id_Calc_Image (
+			  substring
+			, as_int
+		)
+		SELECT 
+			  SPLIT_T.substring
+			, CAST(SPLIT_T.substring AS DECIMAL(10,0)) AS as_int
+		FROM parts.CORE_Split_Temp SPLIT_T
+		WHERE 
+                SPLIT_T.GUID = a_guid
+			AND IFNULL(SPLIT_T.substring, '') <> ''
+		;
+		
+		CALL parts.p_core_clear_split( a_guid );
+	END IF;
+
+    IF v_has_filter_file_type_name = 1 THEN
+		CALL parts.p_core_split(a_guid, a_names_file_type, ',', a_debug);
+
+        SET sql_mode = '';
+		
+		INSERT INTO tmp_Split_Name_Calc_Image (
+			  substring
+			, as_int
+		)
+		SELECT 
+			  SPLIT_T.substring
+			, CAST(SPLIT_T.substring AS DECIMAL(10,0)) AS as_int
+		FROM parts.CORE_Split_Temp SPLIT_T
+		WHERE 
+                SPLIT_T.GUID = a_guid
+			AND IFNULL(SPLIT_T.substring, '') <> ''
+		;
+		
+		CALL parts.p_core_clear_split( a_guid );
+	END IF;
+    
+    IF NOT EXISTS (SELECT * FROM tmp_Msg_Error_Calc_Image t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+		IF EXISTS (
+			SELECT * 
+            FROM tmp_Split_Id_Calc_Image t_SPLIT_ID
+            LEFT JOIN parts.CORE_File_Type FILE_TYPES ON t_SPLIT_ID.as_int = FILE_TYPES.id_file_type 
+			WHERE 
+				    ISNULL(t_SPLIT_ID.as_int) 
+                OR  ISNULL(FILE_TYPES.id_file_type)
+				OR  (
+					FILE_TYPES.active = 0
+					AND a_get_inactive_file_type = 0
+				)
+		) THEN
+			INSERT INTO tmp_Msg_Error_Calc_Image (
+				  id_type
+		        , code
+				, msg
+			)
+			SELECT
+				  v_id_type_error_bad_data
+                , v_code_type_error_bad_data
+				, CONCAT('Invalid or inactive File_Type IDs: ', IFNULL(GROUP_CONCAT(t_SPLIT_ID.substring SEPARATOR ', '), 'NULL'))
+			FROM tmp_Split_Id_Calc_Image t_SPLIT_ID
+			LEFT JOIN parts.CORE_File_Type FILE_TYPES ON t_SPLIT_ID.as_int = FILE_TYPES.id_file_type
+			WHERE 
+				    ISNULL(t_SPLIT_ID.as_int) 
+				OR  ISNULL(FILE_TYPES.id_file_type)
+				OR  (
+					FILE_TYPES.active = 0
+					AND a_get_inactive_file_type = 0
+				)
+			;
+        /* Don't error on names, hand signals, or notes not found
+		ELSEIF EXISTS ()
+        */
+		ELSE
+            IF a_debug = 1 THEN
+                SELECT 'File_Type Filters';
+                WITH 
+                    File_Type_Id_Filter AS (
+                        SELECT FILE_TYPES.id_file_type
+                        FROM tmp_Split_Id_Calc_Image t_SPLIT_ID
+                        INNER JOIN parts.CORE_File_Type FILE_TYPES ON t_SPLIT_ID.as_int = FILE_TYPES.id_file_type
+                    )
+                    , File_Type_Name_Filter AS (
+                        SELECT FILE_TYPES.id_file_type
+                        FROM tmp_Split_Name_Calc_Image t_SPLIT_NAME
+                        INNER JOIN parts.CORE_File_Type FILE_TYPES ON FILE_TYPES.name LIKE CONCAT('%', t_SPLIT_NAME.substring, '%')
+                        WHERE NULLIF(t_SPLIT_NAME.substring, '') IS NOT NULL
+                    )
+                    , File_Type_Filters AS (
+                        SELECT 
+                            FILE_TYPES_COMBINED.id_file_type
+                            , MAX(FILE_TYPES_COMBINED.does_meet_id_filter) AS does_meet_id_filter
+                            , MAX(FILE_TYPES_COMBINED.does_meet_name_filter) AS does_meet_name_filter
+                        FROM (
+                            SELECT 
+                                FILE_TYPES_ID_FILTER.id_file_type 
+                                , 1 AS does_meet_id_filter
+                                , 0 AS does_meet_name_filter
+                            FROM File_Type_Id_Filter FILE_TYPES_ID_FILTER
+                            UNION
+                            SELECT 
+                                FILE_TYPES_NAME_FILTER.id_file_type 
+                                , 0 AS does_meet_id_filter
+                                , 1 AS does_meet_name_filter
+                            FROM File_Type_Name_Filter FILE_TYPES_NAME_FILTER
+                        ) FILE_TYPES_COMBINED
+                        GROUP BY FILE_TYPES_COMBINED.id_file_type
+                    )
+                SELECT 
+                      FILE_TYPES.id_file_type
+                    , CASE WHEN 
+                            v_has_filter_file_type_id = 0 
+                        OR  FILE_TYPES_FILTERS.does_meet_id_filter = 1
+                    THEN 1 ELSE 0 END AS does_meet_non_id_filters
+                    , CASE WHEN 
+                            (
+                                v_has_filter_file_type_name = 0
+                        )
+                        OR  FILE_TYPES_FILTERS.does_meet_name_filter = 1
+                    THEN 1 ELSE 0 END AS does_meet_id_filters
+                FROM parts.CORE_File_Type FILE_TYPES
+                LEFT JOIN File_Type_Filters FILE_TYPES_FILTERS ON FILE_TYPES.id_file_type = FILE_TYPES_FILTERS.id_file_type
+                WHERE 
+                    (
+                            a_get_all_file_type = 1
+                        OR  (
+                                v_has_filter_file_type_id = 1
+                            AND FILE_TYPES_FILTERS.does_meet_id_filter = 1
+                        )
+                        OR  (
+                                v_has_filter_file_type_name = 1
+                            AND FILE_TYPES_FILTERS.does_meet_name_filter = 1
+                        )
+                    )
+                    AND (
+                            a_get_inactive_file_type = 1
+                        OR  FILE_TYPES.active = 1
+                    )
+                ;
+            END IF;
+			INSERT INTO tmp_File_Type_Calc_Image (
+				  id_file_type
+                , does_meet_id_filters
+                , does_meet_non_id_filters
+			)
+            WITH 
+                  File_Type_Id_Filter AS (
+                    SELECT FILE_TYPES.id_file_type
+                    FROM tmp_Split_Id_Calc_Image t_SPLIT_ID
+                    INNER JOIN parts.CORE_File_Type FILE_TYPES ON t_SPLIT_ID.as_int = FILE_TYPES.id_file_type
+                )
+                , File_Type_Name_Filter AS (
+                    SELECT FILE_TYPES.id_file_type
+                    FROM tmp_Split_Name_Calc_Image t_SPLIT_NAME
+                    INNER JOIN parts.CORE_File_Type FILE_TYPES ON FILE_TYPES.name LIKE CONCAT('%', t_SPLIT_NAME.substring, '%')
+                    WHERE 
+                            t_SPLIT_NAME.substring IS NOT NULL
+                        AND t_SPLIT_NAME.substring <> ''
+                )
+                , File_Type_Filters AS (
+                    SELECT 
+                          FILE_TYPES_COMBINED.id_file_type
+                        , MAX(FILE_TYPES_COMBINED.does_meet_id_filter) AS does_meet_id_filter
+                        , MAX(FILE_TYPES_COMBINED.does_meet_name_filter) AS does_meet_name_filter
+                    FROM (
+                        SELECT 
+                              FILE_TYPES_ID_FILTER.id_file_type 
+                            , 1 AS does_meet_id_filter
+                            , 0 AS does_meet_name_filter
+                        FROM File_Type_Id_Filter FILE_TYPES_ID_FILTER
+                        UNION
+                        SELECT 
+                              FILE_TYPES_NAME_FILTER.id_file_type 
+                            , 0 AS does_meet_id_filter
+                            , 1 AS does_meet_name_filter
+                        FROM File_Type_Name_Filter FILE_TYPES_NAME_FILTER
+                    ) FILE_TYPES_COMBINED
+                    GROUP BY FILE_TYPES_COMBINED.id_file_type
+                )
+            SELECT 
+                  FILE_TYPES.id_file_type
+                , CASE WHEN 
+                        v_has_filter_file_type_id = 0 
+                    OR  IFNULL(FILE_TYPES_FILTERS.does_meet_id_filter, 0) = 1
+                THEN 1 ELSE 0 END AS does_meet_id_filters
+                , CASE WHEN 
+                        (
+                            v_has_filter_file_type_name = 0
+                    )
+                    OR  IFNULL(FILE_TYPES_FILTERS.does_meet_name_filter, 0) = 1
+                THEN 1 ELSE 0 END AS does_meet_non_id_filters
+            FROM parts.CORE_File_Type FILE_TYPES
+            LEFT JOIN File_Type_Filters FILE_TYPES_FILTERS ON FILE_TYPES.id_file_type = FILE_TYPES_FILTERS.id_file_type
+            WHERE 
+                (
+                        a_get_all_file_type = 1
+                    OR  (
+                            v_has_filter_file_type_id = 1
+                        AND FILE_TYPES_FILTERS.does_meet_id_filter = 1
+                    )
+                    OR  (
+                            v_has_filter_file_type_name = 1
+                        AND FILE_TYPES_FILTERS.does_meet_name_filter = 1
+                    )
+                )
+                AND (
+                        a_get_inactive_file_type = 1
+                    OR  FILE_TYPES.active = 1
+                )
+			;
+		END IF;
+	END IF;
+    
+    DELETE FROM tmp_Split_Id_Calc_Image;
+    DELETE FROM tmp_Split_Name_Calc_Image;
+
+
+    -- Call Dog Calc
+    IF NOT EXISTS(SELECT * FROM tmp_Msg_Error_Calc_Image t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+        IF a_debug = 1 THEN
+            SELECT 
+                  a_guid -- a_guid
+                , a_id_user -- a_id_user
+                , a_get_all_dog -- a_get_all_dog
+                , a_get_inactive_dog -- a_get_inactive_dog
+                , a_ids_dog -- a_ids_dog
+                , a_names_dog -- a_names_dog
+                , a_require_all_id_search_filters_met -- a_require_all_id_search_filters_met
+                , 0 -- a_require_any_id_search_filters_met
+                , a_require_all_non_id_search_filters_met -- a_require_all_non_id_search_filters_met
+                , 0 -- a_require_any_non_id_search_filters_met
+                , 0 -- a_show_errors
+                , 0 -- a_debug
+            ;
+        END IF;
+        
+        CALL parts.p_dog_calc_dog(
+              a_guid -- a_guid
+            , a_id_user -- a_id_user
+            , a_get_all_dog -- a_get_all_dog
+            , a_get_inactive_dog -- a_get_inactive_dog
+            , a_ids_dog -- a_ids_dog
+            , a_names_dog -- a_names_dog
+            , a_require_all_id_search_filters_met -- a_require_all_id_search_filters_met
+            , 0 -- a_require_any_id_search_filters_met -- a_require_any_id_search_filters_met
+            , a_require_all_non_id_search_filters_met -- a_require_all_non_id_search_filters_met
+            , 0 -- a_require_any_non_id_search_filters_met -- a_require_any_non_id_search_filters_met
+            , 0 -- a_show_errors
+            , 0 -- a_debug
+        );
+        
+        INSERT INTO tmp_Dog_Calc_Image (
+              id_dog
+            , name
+            , appearance
+            , mass_kg
+            , notes
+            , active
+
+            , does_meet_id_filters
+            , does_meet_non_id_filters
+        )
+        SELECT
+              DOG_T.id_dog
+            , DOG_T.name
+            , DOG_T.appearance
+            , DOG_T.mass_kg
+            , DOG_T.notes
+            , DOG_T.active
+
+            , DOG_T.does_meet_id_filters
+            , DOG_T.does_meet_non_id_filters
+        FROM parts.DOG_Dog_Temp DOG_T
+        WHERE DOG_T.GUID = a_guid
+        ;
+        
+        IF a_debug = 1 THEN
+            SELECT * FROM tmp_Dog_Calc_Image;
+        END IF;
+    END IF;
+
+
+    -- Images
+    IF v_has_filter_image_id = 1 THEN
+		CALL parts.p_core_split(a_guid, a_ids_image, ',', a_debug);
+
+        SET sql_mode = '';
+		
+		INSERT INTO tmp_Split_Id_Calc_Image (
+			  substring
+			, as_int
+		)
+		SELECT 
+			  SPLIT_T.substring
+			, CAST(SPLIT_T.substring AS DECIMAL(10,0)) AS as_int
+		FROM parts.CORE_Split_Temp SPLIT_T
+		WHERE 
+                SPLIT_T.GUID = a_guid
+			AND IFNULL(SPLIT_T.substring, '') <> ''
+		;
+		
+		CALL parts.p_core_clear_split( a_guid );
+	END IF;
+
+    IF v_has_filter_image_name = 1 THEN
+		CALL parts.p_core_split(a_guid, a_names_image, ',', a_debug);
+
+        SET sql_mode = '';
+		
+		INSERT INTO tmp_Split_Name_Calc_Image (
+			  substring
+			, as_int
+		)
+		SELECT 
+			  SPLIT_T.substring
+			, CAST(SPLIT_T.substring AS DECIMAL(10,0)) AS as_int
+		FROM parts.CORE_Split_Temp SPLIT_T
+		WHERE 
+                SPLIT_T.GUID = a_guid
+			AND IFNULL(SPLIT_T.substring, '') <> ''
+		;
+		
+		CALL parts.p_core_clear_split( a_guid );
+	END IF;
+    
+    IF NOT EXISTS (SELECT * FROM tmp_Msg_Error_Calc_Image t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+		IF EXISTS (
+			SELECT * 
+            FROM tmp_Split_Id_Calc_Image t_SPLIT_ID
+            LEFT JOIN parts.DOG_Image IMAGES ON t_SPLIT_ID.as_int = IMAGES.id_image 
+			WHERE 
+				    ISNULL(t_SPLIT_ID.as_int) 
+                OR  ISNULL(IMAGES.id_image)
+				OR  (
+					IMAGES.active = 0
+					AND a_get_inactive_image = 0
+				)
+		) THEN
+			INSERT INTO tmp_Msg_Error_Calc_Image (
+				  id_type
+		        , code
+				, msg
+			)
+			SELECT
+				  v_id_type_error_bad_data
+                , v_code_type_error_bad_data
+				, CONCAT('Invalid or inactive Image IDs: ', IFNULL(GROUP_CONCAT(t_SPLIT_ID.substring SEPARATOR ', '), 'NULL'))
+			FROM tmp_Split_Id_Calc_Image t_SPLIT_ID
+			LEFT JOIN parts.DOG_Image IMAGES ON t_SPLIT_ID.as_int = IMAGES.id_image
+			WHERE 
+				    ISNULL(t_SPLIT_ID.as_int) 
+				OR  ISNULL(IMAGES.id_image)
+				OR  (
+					IMAGES.active = 0
+					AND a_get_inactive_image = 0
+				)
+			;
+        /* Don't error on names, hand signals, or notes not found
+		ELSEIF EXISTS ()
+        */
+		ELSE
+			INSERT INTO tmp_Image_Calc_Image (
+				  id_image
+                , does_meet_id_filters
+                , does_meet_non_id_filters
+			)
+            WITH 
+                  Image_Id_Filter AS (
+                    SELECT IMAGES.id_image
+                    FROM tmp_Split_Id_Calc_Image t_SPLIT_ID
+                    INNER JOIN parts.DOG_Image IMAGES ON t_SPLIT_ID.as_int = IMAGES.id_image
+                )
+                , Image_Name_Filter AS (
+                    SELECT IMAGES.id_image
+                    FROM tmp_Split_Name_Calc_Image t_SPLIT_NAME
+                    INNER JOIN parts.DOG_Image IMAGES ON IMAGES.name LIKE CONCAT('%', t_SPLIT_NAME.substring, '%')
+                    WHERE 
+                            t_SPLIT_NAME.substring IS NOT NULL
+                        AND t_SPLIT_NAME.substring <> ''
+                )
+                , Image_Filters AS (
+                    SELECT 
+                          IMAGES_COMBINED.id_image
+                        , MAX(IMAGES_COMBINED.does_meet_id_filter) AS does_meet_id_filter
+                        , MAX(IMAGES_COMBINED.does_meet_name_filter) AS does_meet_name_filter
+                    FROM (
+                        SELECT 
+                              IMAGES_ID_FILTER.id_image 
+                            , 1 AS does_meet_id_filter
+                            , 0 AS does_meet_name_filter
+                        FROM Image_Id_Filter IMAGES_ID_FILTER
+                        UNION
+                        SELECT 
+                              IMAGES_NAME_FILTER.id_image 
+                            , 0 AS does_meet_id_filter
+                            , 1 AS does_meet_name_filter
+                        FROM Image_Name_Filter IMAGES_NAME_FILTER
+                    ) IMAGES_COMBINED
+                    GROUP BY IMAGES_COMBINED.id_image
+                )
+            SELECT 
+                  IMAGES.id_image
+                , CASE WHEN 
+                        v_has_filter_image_id = 0 
+                    OR  IFNULL(IMAGES_FILTERS.does_meet_id_filter, 0) = 1
+                THEN 1 ELSE 0 END AS does_meet_id_filters
+                , CASE WHEN 
+                        (
+                            v_has_filter_image_name = 0
+                    )
+                    OR  IFNULL(IMAGES_FILTERS.does_meet_name_filter, 0) = 1
+                THEN 1 ELSE 0 END AS does_meet_non_id_filters
+            FROM parts.DOG_Image IMAGES
+            INNER JOIN tmp_File_Type_Calc_Image t_FILE_TYPE ON IMAGES.id_file_type = t_FILE_TYPE.id_file_type
+            LEFT JOIN tmp_Dog_Calc_Image t_DOG ON IMAGES.id_dog = t_DOG.id_dog
+            LEFT JOIN Image_Filters IMAGES_FILTERS ON IMAGES.id_image = IMAGES_FILTERS.id_image
+            WHERE 
+                (
+                        a_get_all_image = 1
+                    OR  (
+                            v_has_filter_image_id = 1
+                        AND IMAGES_FILTERS.does_meet_id_filter = 1
+                    )
+                    OR  (
+                            v_has_filter_image_name = 1
+                        AND IMAGES_FILTERS.does_meet_name_filter = 1
+                    )
+                )
+                AND (
+                        a_get_inactive_image = 1
+                    OR  IMAGES.active = 1
+                )
+			;
+		END IF;
+	END IF;
+    
+    DELETE FROM tmp_Split_Id_Calc_Image;
+    DELETE FROM tmp_Split_Name_Calc_Image;
+
+    IF a_debug = 1 THEN
+        SELECT 'After get Images ';
+        SELECT * FROM tmp_Image_Calc_Image;
+    END IF;
+
+    -- Filter records
+    IF NOT EXISTS (SELECT * FROM tmp_Msg_Error_Calc_Image t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+        DELETE t_IMAGES
+        FROM tmp_Image_Calc_Image t_IMAGES
+        LEFT JOIN tmp_File_Type_Calc_Image t_FILE_TYPE ON t_IMAGES.id_file_type = t_FILE_TYPE.id_file_type
+        WHERE
+                (
+                    a_require_all_id_search_filters_met = 1
+                AND (
+                        t_IMAGES.does_meet_id_filters = 0
+                    OR  IFNULL(t_FILE_TYPE.does_meet_id_filters, 0) = 0
+                )
+            )
+            OR  (
+                    a_require_all_non_id_search_filters_met = 1
+                AND (
+                        t_IMAGES.does_meet_non_id_filters = 0
+                    OR  IFNULL(t_FILE_TYPE.does_meet_non_id_filters, 0) = 0
+                )
+            )
+            OR  (
+                a_require_any_id_search_filters_met = 1
+                AND t_IMAGES.does_meet_id_filters = 0
+                AND IFNULL(t_FILE_TYPE.does_meet_id_filters, 0) = 0
+            )
+            OR  (
+                a_require_any_non_id_search_filters_met = 1
+                AND t_IMAGES.does_meet_non_id_filters = 0
+                AND IFNULL(t_FILE_TYPE.does_meet_non_id_filters, 0) = 0
+            )
+        ;
+    END IF;
+
+    IF a_debug = 1 THEN
+        SELECT 'After filter Images';
+        SELECT * FROM tmp_Image_Calc_Image;
+    END IF;
+
+    -- Calculated fields
+
+    -- Permissions
+    IF a_debug = 1 THEN
+		SELECT 
+			  a_guid -- a_guid
+            , 0 -- get_all_user
+            , 0 -- get_inactive_user
+            , a_id_user -- ids_user
+            , '' -- a_auth0_ids_user
+            , '' -- a_names_user
+            , '' -- a_emails_user
+            , 1 -- a_require_all_id_search_filters_met
+            , 1 -- a_require_any_id_search_filters_met
+            , 0 -- a_require_all_non_id_search_filters_met
+            , 0 -- a_require_any_non_id_search_filters_met
+            , v_id_permission_dog_view -- ids_permission
+            , v_id_access_level_view -- ids_access_level
+            , 0 -- a_show_errors
+			, 0 -- a_debug
+        ;
+    END IF;
+    
+	CALL parts.p_dog_calc_user(
+          a_guid -- a_guid
+        , 0 -- get_all_user
+        , 0 -- get_inactive_user
+        , a_id_user -- ids_user
+        , '' -- a_auth0_ids_user
+        , '' -- a_names_user
+        , '' -- a_emails_user
+        , 1 -- a_require_all_id_search_filters_met
+        , 1 -- a_require_any_id_search_filters_met
+        , 0 -- a_require_all_non_id_search_filters_met
+        , 0 -- a_require_any_non_id_search_filters_met
+        , v_id_permission_dog_view -- ids_permission
+        , v_id_access_level_view -- ids_access_level
+        , 0 -- a_show_errors
+        , 0 -- a_debug
+    );
+	
+    SELECT
+          IFNULL(CALC_USER_T.has_access, 0)
+    INTO
+          v_can_view
+    FROM parts.DOG_Calc_User_Temp CALC_USER_T
+    WHERE CALC_USER_T.GUID = a_guid
+    LIMIT 1
+    ;
+    
+    IF a_debug = 1 THEN
+        SELECT v_can_view;
+    END IF;
+    
+    IF (v_can_view = 0) THEN
+		DELETE t_ME
+        FROM tmp_Msg_Error_Calc_Image t_ME
+        WHERE t_ME.id_type <> v_id_type_error_no_permission
+        ;
+		INSERT INTO tmp_Msg_Error_Calc_Image (
+			  id_type
+			, code
+            , msg
+		)
+		VALUES (
+			  v_id_type_error_no_permission
+            , v_code_type_error_no_permission
+			, 'You do not have permission to view Dogs and Images.'
+		)
+        ;
+    END IF;
+	
+	CALL parts.p_dog_clear_calc_user(
+		a_guid
+        , 0 -- a_debug
+	);
+
+    IF a_debug = 1 THEN
+        SELECT 'Before non-permitted data deletion';
+        SELECT * FROM tmp_Image_Calc_Image;
+        SELECT * FROM tmp_Msg_Error_Calc_Image;
+    END IF;
+    
+    IF EXISTS(SELECT * FROM tmp_Msg_Error_Calc_Image t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+        IF a_debug = 1 THEN
+            SELECT * FROM tmp_Image_Calc_Image;
+        END IF;
+
+        DELETE FROM tmp_Image_Calc_Image;
+    END IF;
+
+    IF a_debug = 1 THEN
+        SELECT 'After non-permitted data deletion';
+    END IF;
+
+    -- Outputs
+	START TRANSACTION;
+        -- Images
+        INSERT INTO parts.DOG_Image_Temp (
+              guid
+            , id_image
+            , id_file_type
+            , id_dog
+            , path
+            , name
+            , active
+
+            , does_meet_id_filters
+            , does_meet_non_id_filters
+        )
+        SELECT 
+              a_guid
+            , t_IMAGES.id_image
+            , IMAGES.id_file_type
+            , IMAGES.id_dog
+            , IMAGES.path
+            , IMAGES.name
+            , IMAGES.active
+
+            , t_IMAGES.does_meet_id_filters
+            , t_IMAGES.does_meet_non_id_filters
+        FROM parts.DOG_Image IMAGES
+        INNER JOIN tmp_Image_Calc_Image t_IMAGES ON IMAGES.id_image = t_IMAGES.id_image
+        ORDER BY IMAGES.name
+        ;
+    COMMIT;
+
+    -- Errors
+    IF a_show_errors = 1 THEN
+        SELECT 
+            t_ERROR.id_error
+            , t_ERROR.id_type
+            , t_ERROR.code
+            , ERROR_TYPE.name
+            , ERROR_TYPE.description
+            , ERROR_TYPE.is_breaking_error
+            , ERROR_TYPE.background_colour
+            , ERROR_TYPE.text_colour
+            , t_ERROR.msg
+        FROM tmp_Msg_Error_Calc_Image t_ERROR
+        INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
+        ;
+    END IF;
+
+    IF a_debug = 1 AND v_can_view = 1 THEN
+        SELECT * FROM tmp_Image_Calc_Image;
+    END IF;
+    
+    CALL parts.p_dog_clear_calc_dog ( a_guid, 0 );
+
+    DROP TEMPORARY TABLE IF EXISTS tmp_Split_Name_Calc_Image;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Split_Id_Calc_Image;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error_Calc_Image;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Image_Calc_Image;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Dog_Calc_Image;
+    DROP TEMPORARY TABLE IF EXISTS tmp_File_Type_Calc_Image;
+    
+    IF a_debug = 1 THEN
+		CALL parts.p_core_debug_timing_reporting ( v_time_start );
+    END IF;
+END //
+DELIMITER ;
+
+
+/*
+
+
+CALL parts.p_dog_calc_image (
+      'grope                               ' -- a_guid
+	, 1 -- 'auth0|6582b95c895d09a70ba10fef',	-- a_id_user
+    , 1                                     	-- a_get_all_file_type
+	, 0                                     	-- a_get_inactive_file_type
+	, ''                                    	-- a_ids_file_type
+    , ''                                        -- a_names_file_type
+    , 1                                     	-- a_get_all_dog
+	, 0                                     	-- a_get_inactive_dog
+	, ''                                    	-- a_ids_dog
+	, ''                                    	-- a_names_dog
+    , 1                                     	-- a_get_all_image
+	, 0                                     	-- a_get_inactive_image
+	, ''                                    	-- a_ids_image
+    , ''                                        -- a_names_image
+    , 0                                         -- a_require_all_id_search_filters_met
+    , 0                                         -- a_require_any_id_search_filters_met
+    , 0                                         -- a_require_all_non_id_search_filters_met
+    , 0                                         -- a_require_any_non_id_search_filters_met
+    , 0                                         -- a_show_errors
+    , 0                                     	-- a_debug
+);
+
+SELECT *
+FROM parts.DOG_Image_Temp
+;
+/*
+SELECT *
+FROM parts.DOG_Image_Temp C
+WHERE 
+        C.does_meet_id_filters
+    AND C.does_meet_non_id_filters
+;
+*/
+CALL parts.p_dog_clear_calc_image (
+	'grope                               ' -- a_guid
+    , 1 -- debug
+);
+
+
+DELETE
+FROM parts.DOG_Image_Temp
+;
+
+*/

static/MySQL/71228_p_dog_clear_calc_image.sql

@@ -0,0 +1,45 @@
+
+USE parts;
+
+DROP PROCEDURE IF EXISTS parts.p_dog_clear_calc_image;
+DROP PROCEDURE IF EXISTS parts.p_image_clear_calc_image;
+
+DELIMITER //
+CREATE PROCEDURE parts.p_dog_clear_calc_image (
+	  IN a_guid BINARY(36)
+    , IN a_debug BIT
+)
+BEGIN
+	DECLARE v_time_start TIMESTAMP(6);
+    SET v_time_start := CURRENT_TIMESTAMP(6);
+    
+    CALL parts.p_core_validate_guid ( a_guid );
+    
+	START TRANSACTION;
+		
+		DELETE IMAGES_T
+        FROM parts.DOG_Image_Temp IMAGES_T
+		WHERE IMAGES_T.GUID = a_guid
+		;
+		
+	COMMIT;
+    
+    IF a_debug = 1 THEN
+		CALL parts.p_debug_timing_reporting( v_time_start );
+    END IF;
+END //
+DELIMITER ;
+
+/*
+
+CALL parts.p_dog_clear_calc_image (
+	'crips                               ' -- a_guid
+    , 1 -- debug
+);
+
+SELECT *
+FROM parts.DOG_Calc_User_Temp
+WHERE GUID = 'chips                               '
+;
+
+*/

static/MySQL/71228_p_dog_get_many_image.sql

@@ -0,0 +1,450 @@
+ 
+USE parts;
+
+DROP PROCEDURE IF EXISTS parts.p_dog_get_many_image;
+
+DELIMITER //
+CREATE PROCEDURE parts.p_dog_get_many_image (
+	  IN a_id_user INT
+    , IN a_get_all_file_type BIT
+	, IN a_get_inactive_file_type BIT
+	, IN a_ids_file_type TEXT
+    , IN a_names_file_type TEXT
+    , IN a_get_all_dog BIT
+	, IN a_get_inactive_dog BIT
+	, IN a_ids_dog TEXT
+    , IN a_names_dog TEXT
+    , IN a_get_all_image BIT
+	, IN a_get_inactive_image BIT
+	, IN a_ids_image TEXT
+    , IN a_names_image TEXT
+    , IN a_require_all_id_search_filters_met BIT
+    , IN a_require_any_id_search_filters_met BIT
+    , IN a_require_all_non_id_search_filters_met BIT
+    , IN a_require_any_non_id_search_filters_met BIT
+    , IN a_output_images BIT
+    , IN a_debug BIT
+)
+BEGIN
+    DECLARE v_can_view BIT;
+    DECLARE v_code_type_error_bad_data VARCHAR(100);
+    DECLARE v_code_type_error_no_permission VARCHAR(100);
+    DECLARE v_guid BINARY(36);
+    DECLARE v_id_access_level_view INT;
+    DECLARE v_id_minimum INT;
+    DECLARE v_id_permission_dog_view INT;
+    DECLARE v_id_type_error_bad_data INT;
+    DECLARE v_id_type_error_no_permission INT;
+    DECLARE v_time_start TIMESTAMP(6);
+    
+    DECLARE exit handler for SQLEXCEPTION
+    BEGIN
+        GET DIAGNOSTICS CONDITION 1
+            @sqlstate = RETURNED_SQLSTATE
+            , @errno = MYSQL_ERRNO
+            , @text = MESSAGE_TEXT
+		;
+        
+        ROLLBACK;
+        
+		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
+			  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
+			, id_type INT NULL
+			, code VARCHAR(250) NOT NULL
+			, msg TEXT NOT NULL
+		);
+
+        INSERT INTO tmp_Msg_Error (
+			  id_type
+            , code
+            , msg
+		)
+        SELECT 
+			  MET.id_type
+            , @errno
+            , @text
+		FROM parts.CORE_Msg_Error_Type MET
+        WHERE MET.code = 'MYSQL_ERROR'
+		;
+        
+        SELECT 
+            t_ERROR.id_error
+            , t_ERROR.id_type
+            , t_ERROR.code
+            , ERROR_TYPE.name
+            , ERROR_TYPE.description
+            , ERROR_TYPE.is_breaking_error
+            , ERROR_TYPE.background_colour
+            , ERROR_TYPE.text_colour
+            , t_ERROR.msg
+        FROM tmp_Msg_Error t_ERROR
+        INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
+        ;
+        
+		DROP TABLE IF EXISTS tmp_Msg_Error;
+    END;
+
+    SET v_time_start := CURRENT_TIMESTAMP(6);
+    SET v_guid := UUID();
+    SET v_code_type_error_bad_data := 'BAD_DATA';
+    SET v_code_type_error_no_permission := 'NO_PERMISSION';
+    SET v_id_type_error_bad_data := (SELECT ERROR_TYPE.id_type FROM parts.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_bad_data LIMIT 1);
+    SET v_id_type_error_no_permission := (SELECT ERROR_TYPE.id_type FROM parts.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_no_permission LIMIT 1);
+    SET v_id_permission_dog_view := (SELECT PERMISSION.id_permission FROM parts.DOG_Permission PERMISSION WHERE PERMISSION.code = 'DOG_VIEW' LIMIT 1);
+    SET v_id_access_level_view := (SELECT ACCESS_LEVEL.id_access_level FROM parts.DOG_Access_Level ACCESS_LEVEL WHERE ACCESS_LEVEL.code = 'VIEW' LIMIT 1);
+    
+    SET a_id_user := IFNULL(a_id_user, 0);
+    /*
+    SET a_get_all_file_type := IFNULL(a_get_all_file_type, 0);
+    SET a_get_inactive_file_type := IFNULL(a_get_inactive_file_type, 0);
+    SET a_ids_file_type := TRIM(IFNULL(a_ids_file_type, ''));
+    SET a_names_file_type := TRIM(IFNULL(a_names_file_type, ''));
+    -- SET a_get_all_dog := IFNULL(a_get_all_dog, 0);
+    -- SET a_get_inactive_dog := IFNULL(a_get_inactive_dog, 0);
+    -- SET a_ids_dog := TRIM(IFNULL(a_ids_dog, ''));
+    -- SET a_names_dog := TRIM(IFNULL(a_names_dog, ''));
+    SET a_get_all_image := IFNULL(a_get_all_image, 0);
+    SET a_get_inactive_image := IFNULL(a_get_inactive_image, 0);
+    SET a_ids_image := TRIM(IFNULL(a_ids_image, ''));
+    SET a_names_image := TRIM(IFNULL(a_names_image, ''));
+    SET a_require_all_id_search_filters_met := IFNULL(a_require_all_id_search_filters_met, 1);
+    SET a_require_any_id_search_filters_met := IFNULL(a_require_any_id_search_filters_met, 1);
+    SET a_require_all_non_id_search_filters_met := IFNULL(a_require_all_non_id_search_filters_met, 0);
+    SET a_require_any_non_id_search_filters_met := IFNULL(a_require_any_non_id_search_filters_met, 1);
+    */
+    SET a_output_images := IFNULL(a_output_images, 0);
+    SET a_debug := IFNULL(a_debug, 0);
+    
+    IF a_debug = 1 THEN
+		SELECT 
+			  a_id_user
+            , a_get_all_file_type
+            , a_get_inactive_file_type
+            , a_ids_file_type
+            , a_names_file_type
+            , a_get_all_dog
+            , a_get_inactive_dog
+            , a_ids_dog
+            , a_names_dog
+            , a_get_all_image
+            , a_get_inactive_image
+            , a_ids_image
+            , a_names_image
+            , a_require_all_id_search_filters_met
+            , a_require_any_id_search_filters_met
+            , a_require_all_non_id_search_filters_met
+            , a_require_any_non_id_search_filters_met
+            , a_output_images
+            , a_debug
+		;
+
+        SELECT
+              v_id_type_error_bad_data
+            , v_id_type_error_no_permission
+            , v_guid
+            , v_id_permission_dog_view
+            , v_time_start
+        ;
+    END IF;
+
+    DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Image;
+    
+    CREATE TEMPORARY TABLE tmp_Image (
+		  id_image INT NOT NULL
+        , id_file_type INT
+        , id_dog INT
+		, path VARCHAR(1024)
+        , name VARCHAR(1024)
+        , active BIT
+
+        , does_meet_id_filters BIT
+        , does_meet_non_id_filters BIT
+    );
+    
+	CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
+          id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
+		, id_type INT NULL
+		, code VARCHAR(250) NOT NULL
+        , msg TEXT NOT NULL
+    );
+    
+    -- Permissions
+    IF a_debug = 1 THEN
+		SELECT 
+			  v_guid
+            , 0 -- get_all_user
+            , 0 -- get_inactive_user
+            , a_id_user -- ids_user
+            , '' -- a_auth0_ids_user
+            , '' -- a_names_user
+            , '' -- a_emails_user
+            , 1 -- a_require_all_id_search_filters_met
+            , 1 -- a_require_any_id_search_filters_met
+            , 0 -- a_require_all_non_id_search_filters_met
+            , 0 -- a_require_any_non_id_search_filters_met
+            , v_id_permission_dog_view -- ids_permission
+            , v_id_access_level_view -- ids_access_level
+            , 0 -- a_show_errors
+			, 0 -- a_debug
+        ;
+    END IF;
+    
+	CALL parts.p_dog_calc_user(
+          v_guid
+        , 0 -- get_all_user
+        , 0 -- get_inactive_user
+        , a_id_user -- ids_user
+        , '' -- a_auth0_ids_user
+        , '' -- a_names_user
+        , '' -- a_emails_user
+        , 1 -- a_require_all_id_search_filters_met
+        , 1 -- a_require_any_id_search_filters_met
+        , 0 -- a_require_all_non_id_search_filters_met
+        , 0 -- a_require_any_non_id_search_filters_met
+        , v_id_permission_dog_view -- ids_permission
+        , v_id_access_level_view -- ids_access_level
+        , 0 -- a_show_errors
+        , 0 -- a_debug
+    );
+	
+    SELECT
+          IFNULL(CALC_USER_T.has_access, 0)
+    INTO
+          v_can_view
+    FROM parts.DOG_Calc_User_Temp CALC_USER_T
+    WHERE CALC_USER_T.GUID = v_guid
+    LIMIT 1
+    ;
+    
+    IF a_debug = 1 THEN
+        SELECT v_can_view;
+        SELECT COUNT(*) AS Count_Errors FROM tmp_Msg_Error t_ERROR;
+        SELECT * FROM tmp_Msg_Error t_ERROR;
+    END IF;
+    
+    IF (v_can_view = 0) THEN
+		DELETE t_ME
+        FROM tmp_Msg_Error t_ME
+        WHERE t_ME.id_type <> v_id_type_error_no_permission
+        ;
+		INSERT INTO tmp_Msg_Error (
+			  id_type
+			, code
+            , msg
+		)
+		VALUES (
+			  v_id_type_error_no_permission
+            , v_code_type_error_no_permission
+			, 'You do not have permission to view Images.'
+		)
+        ;
+    END IF;
+	
+	CALL parts.p_dog_clear_calc_user(
+		  v_guid
+        , 0 -- a_debug
+	);
+
+    
+    -- Call Image Calc
+    IF NOT EXISTS(SELECT * FROM tmp_Msg_Error t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+        IF a_debug = 1 THEN
+            SELECT 
+                  v_guid -- a_guid
+                , a_id_user -- a_id_user
+                , a_get_all_file_type -- a_get_all_file_type
+                , a_get_inactive_file_type -- a_get_inactive_file_type
+                , a_ids_file_type -- a_ids_file_type
+                , a_names_file_type -- a_names_file_type
+                , a_get_all_dog -- a_get_all_dog
+                , a_get_inactive_dog -- a_get_inactive_dog
+                , a_ids_dog -- a_ids_dog
+                , a_names_dog -- a_names_dog
+                , a_get_all_image -- a_get_all_image
+                , a_get_inactive_image -- a_get_inactive_image
+                , a_ids_image -- a_ids_image
+                , a_names_image -- a_names_image
+                , a_require_all_id_search_filters_met -- a_require_all_id_search_filters_met
+                , a_require_any_id_search_filters_met -- a_require_any_id_search_filters_met
+                , a_require_all_non_id_search_filters_met -- a_require_all_non_id_search_filters_met
+                , a_require_any_non_id_search_filters_met -- a_require_any_non_id_search_filters_met
+                , 0 -- a_show_errors
+                , 0 -- a_debug
+            ;
+        END IF;
+        
+        CALL parts.p_dog_calc_image (
+              v_guid -- a_guid
+            , a_id_user -- a_id_user
+            , a_get_all_file_type -- a_get_all_file_type
+            , a_get_inactive_file_type -- a_get_inactive_file_type
+            , a_ids_file_type -- a_ids_file_type
+            , a_names_file_type -- a_names_file_type
+            , a_get_all_dog -- a_get_all_dog
+            , a_get_inactive_dog -- a_get_inactive_dog
+            , a_ids_dog -- a_ids_dog
+            , a_names_dog -- a_names_dog
+            , a_get_all_image -- a_get_all_image
+            , a_get_inactive_image -- a_get_inactive_image
+            , a_ids_image -- a_ids_image
+            , a_names_image -- a_names_image
+            , a_require_all_id_search_filters_met -- a_require_all_id_search_filters_met
+            , a_require_any_id_search_filters_met -- a_require_any_id_search_filters_met
+            , a_require_all_non_id_search_filters_met -- a_require_all_non_id_search_filters_met
+            , a_require_any_non_id_search_filters_met -- a_require_any_non_id_search_filters_met
+            , 0 -- a_show_errors
+            , 0 -- a_debug
+        );
+        
+        IF a_debug = 1 THEN
+            SELECT COUNT(*) FROM parts.DOG_Image_Temp;
+            SELECT * FROM parts.DOG_Image_Temp;
+        END IF;
+        
+        INSERT INTO tmp_Image (
+              id_image
+            , id_file_type
+            , id_dog
+            , path
+            , name
+            , active
+
+            , does_meet_id_filters
+            , does_meet_non_id_filters
+        )
+        SELECT
+              IMAGE_T.id_image
+            , IMAGE_T.id_file_type
+            , IMAGE_T.id_dog
+            , IMAGE_T.path
+            , IMAGE_T.name
+            , IMAGE_T.active
+
+            , IMAGE_T.does_meet_id_filters
+            , IMAGE_T.does_meet_non_id_filters
+        FROM parts.DOG_Image_Temp IMAGE_T
+        WHERE IMAGE_T.GUID = v_guid
+        ;
+        
+        IF a_debug = 1 THEN
+            SELECT COUNT(*) FROM tmp_Image;
+            SELECT * FROM tmp_Image;
+        END IF;
+    END IF;
+    
+    -- Filter outputs
+    IF EXISTS(SELECT * FROM tmp_Msg_Error t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+        IF a_debug = 1 THEN
+            SELECT * FROM tmp_Image;
+        END IF;
+
+        DELETE FROM tmp_Image;
+    END IF;
+
+
+    -- Outputs
+    -- Images
+    IF a_output_images = 1 THEN
+        SELECT 
+              t_IMAGES.id_image
+            , t_IMAGES.id_file_type
+            , FILE_TYPE.name AS name_file_type
+            , t_IMAGES.id_dog
+            , DOG.name AS name_dog
+            , t_IMAGES.path
+            , t_IMAGES.name
+            , t_IMAGES.active
+
+            , t_IMAGES.does_meet_id_filters
+            , t_IMAGES.does_meet_non_id_filters
+        FROM tmp_Image t_IMAGES
+        LEFT JOIN parts.DOG_Image IMAGES ON t_IMAGES.id_image = IMAGES.id_image
+        LEFT JOIN parts.CORE_File_Type FILE_TYPE ON IMAGES.id_file_type = FILE_TYPE.id_file_type
+        LEFT JOIN parts.DOG_Dog DOG ON IMAGES.id_dog = DOG.id_dog
+        ORDER BY t_IMAGES.name
+        ;
+    END IF;
+
+    -- Errors
+    SELECT 
+          t_ERROR.id_error
+		, t_ERROR.id_type
+        , t_ERROR.code
+        , ERROR_TYPE.name
+        , ERROR_TYPE.description
+        , ERROR_TYPE.is_breaking_error
+        , ERROR_TYPE.background_colour
+        , ERROR_TYPE.text_colour
+		, t_ERROR.msg
+    FROM tmp_Msg_Error t_ERROR
+	INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
+	;
+    
+    IF a_debug = 1 AND v_can_view = 1 THEN
+        SELECT * FROM tmp_Image;
+    END IF;
+	
+	CALL parts.p_dog_clear_calc_image(
+		v_guid -- a_guid
+        , 0 -- a_debug
+	);
+    
+    DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Image;
+    
+    IF a_debug = 1 THEN
+		CALL parts.p_core_debug_timing_reporting ( v_time_start );
+    END IF;
+END //
+DELIMITER ;
+
+
+/*
+
+CALL parts.p_dog_get_many_image (
+	  1 -- 'auth0|6582b95c895d09a70ba10fef',	-- a_id_user
+    , 1                                     	-- a_get_all_file_type
+	, 0                                     	-- a_get_inactive_file_type
+	, ''                                    	-- a_ids_file_type
+    , ''                                        -- a_names_file_type
+    , 1                                     	-- a_get_all_dog
+	, 0                                     	-- a_get_inactive_dog
+	, ''                                    	-- a_ids_dog
+	, ''                                    	-- a_names_dog
+    , 1                                     	-- a_get_all_image
+	, 0                                     	-- a_get_inactive_image
+	, ''                                    	-- a_ids_image
+    , ''                                        -- a_names_image
+    , 1                                         -- a_require_all_id_search_filters_met
+    , 1                                         -- a_require_any_id_search_filters_met
+    , 0                                         -- a_require_all_non_id_search_filters_met
+    , 1                                         -- a_require_any_non_id_search_filters_met
+    , 1                                     	-- a_output_images
+    , 1                                     	-- a_debug
+);
+
+
+CALL demo.p_dog_get_many_image (
+	  1 -- 'auth0|6582b95c895d09a70ba10fef',	-- a_id_user
+    , 1                                     	-- a_get_all_file_type
+	, 0                                     	-- a_get_inactive_file_type
+	, ''                                    	-- a_ids_file_type
+    , 'pat,point'                               -- a_names_file_type
+    , 1                                     	-- a_get_all_dog
+	, 0                                     	-- a_get_inactive_dog
+	, ''                                    	-- a_ids_dog
+	, 'pat,point'                              	-- a_names_dog
+    , 1                                     	-- a_get_all_image
+	, 0                                     	-- a_get_inactive_image
+	, ''                                    	-- a_ids_image
+    , 'pat,point'                               -- a_names_image
+    , 1                                         -- a_require_all_id_search_filters_met
+    , 1                                         -- a_require_any_id_search_filters_met
+    , 0                                         -- a_require_all_non_id_search_filters_met
+    , 1                                         -- a_require_any_non_id_search_filters_met
+    , 1                                     	-- a_output_images
+    , 1                                     	-- a_debug
+);
+
+*/

static/MySQL/71232_p_dog_calc_button_icon.sql

@@ -0,0 +1,975 @@
+ 
+USE parts;
+
+DROP PROCEDURE IF EXISTS parts.p_dog_calc_button_icon;
+
+DELIMITER //
+CREATE PROCEDURE parts.p_dog_calc_button_icon (
+      IN a_guid BINARY(36)
+    , IN a_id_user INT
+    , IN a_get_all_file_type BIT
+	, IN a_get_inactive_file_type BIT
+	, IN a_ids_file_type TEXT
+    , IN a_names_file_type TEXT
+    , IN a_get_all_image BIT
+	, IN a_get_inactive_image BIT
+	, IN a_ids_image TEXT
+    , IN a_names_image TEXT
+    , IN a_get_all_button_icon BIT
+	, IN a_get_inactive_button_icon BIT
+	, IN a_ids_button_icon TEXT
+    , IN a_names_button_icon TEXT
+    , IN a_notes_button_icon TEXT
+    , IN a_require_all_id_search_filters_met BIT
+    , IN a_require_any_id_search_filters_met BIT
+    , IN a_require_all_non_id_search_filters_met BIT
+    , IN a_require_any_non_id_search_filters_met BIT
+    , IN a_show_errors BIT
+    , IN a_debug BIT
+)
+BEGIN
+    DECLARE v_can_view BIT;
+    DECLARE v_code_type_error_bad_data VARCHAR(100);
+    DECLARE v_code_type_error_no_permission VARCHAR(100);
+    DECLARE v_has_filter_image_id BIT;
+    DECLARE v_has_filter_image_name BIT;
+    DECLARE v_has_filter_button_icon_id BIT;
+    DECLARE v_has_filter_button_icon_name BIT;
+    DECLARE v_has_filter_button_icon_notes BIT;
+    DECLARE v_id_access_level_view INT;
+    DECLARE v_id_minimum INT;
+    DECLARE v_id_permission_dog_view INT;
+    DECLARE v_id_type_error_bad_data INT;
+    DECLARE v_id_type_error_no_permission INT;
+    DECLARE v_time_start TIMESTAMP(6);
+    
+    DECLARE exit handler for SQLEXCEPTION
+    BEGIN
+        GET DIAGNOSTICS CONDITION 1
+            @sqlstate = RETURNED_SQLSTATE
+            , @errno = MYSQL_ERRNO
+            , @text = MESSAGE_TEXT
+		;
+        
+        ROLLBACK;
+        
+		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error_Calc_Button_Icon (
+			  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
+			, id_type INT NULL
+			, code VARCHAR(250) NOT NULL
+			, msg TEXT NOT NULL
+		);
+
+        INSERT INTO tmp_Msg_Error_Calc_Button_Icon (
+			  id_type
+            , code
+            , msg
+		)
+        SELECT 
+			  MET.id_type
+            , @errno
+            , @text
+		FROM parts.CORE_Msg_Error_Type MET
+        WHERE MET.code = 'MYSQL_ERROR'
+		;
+        
+        SELECT 
+            t_ERROR.id_error
+            , t_ERROR.id_type
+            , t_ERROR.code
+            , ERROR_TYPE.name
+            , ERROR_TYPE.description
+            , ERROR_TYPE.is_breaking_error
+            , ERROR_TYPE.background_colour
+            , ERROR_TYPE.text_colour
+            , t_ERROR.msg
+        FROM tmp_Msg_Error_Calc_Button_Icon t_ERROR
+        INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
+        ;
+        
+		DROP TABLE IF EXISTS tmp_Msg_Error_Calc_Button_Icon;
+    END;
+
+    SET v_time_start := CURRENT_TIMESTAMP(6);
+    SET v_code_type_error_bad_data := 'BAD_DATA';
+    SET v_code_type_error_no_permission := 'NO_PERMISSION';
+    SET v_id_type_error_bad_data := (SELECT ERROR_TYPE.id_type FROM parts.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_bad_data LIMIT 1);
+    SET v_id_type_error_no_permission := (SELECT ERROR_TYPE.id_type FROM parts.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_no_permission LIMIT 1);
+    SET v_id_permission_dog_view := (SELECT PERMISSION.id_permission FROM parts.DOG_Permission PERMISSION WHERE PERMISSION.code = 'DOG_VIEW' LIMIT 1);
+    SET v_id_access_level_view := (SELECT ACCESS_LEVEL.id_access_level FROM parts.DOG_Access_Level ACCESS_LEVEL WHERE ACCESS_LEVEL.code = 'VIEW' LIMIT 1);
+    
+    
+    CALL parts.p_core_validate_guid ( a_guid );
+
+    SET a_id_user := IFNULL(a_id_user, 0);
+    /*
+    SET a_get_all_file_type := IFNULL(a_get_all_file_type, 0);
+    SET a_get_inactive_file_type := IFNULL(a_get_inactive_file_type, 0);
+    SET a_ids_file_type := TRIM(IFNULL(a_ids_file_type, ''));
+    SET a_names_file_type := TRIM(IFNULL(a_names_file_type, ''));
+    SET a_get_all_image := IFNULL(a_get_all_image, 0);
+    SET a_get_inactive_image := IFNULL(a_get_inactive_image, 0);
+    SET a_ids_image := TRIM(IFNULL(a_ids_image, ''));
+    SET a_names_image := TRIM(IFNULL(a_names_image, ''));
+    */
+    SET a_get_all_button_icon := IFNULL(a_get_all_button_icon, 0);
+    SET a_get_inactive_button_icon := IFNULL(a_get_inactive_button_icon, 0);
+    SET a_ids_button_icon := TRIM(IFNULL(a_ids_button_icon, ''));
+    SET a_names_button_icon := TRIM(IFNULL(a_names_button_icon, ''));
+    SET a_notes_button_icon := TRIM(IFNULL(a_notes_button_icon, ''));
+    SET a_require_all_id_search_filters_met := IFNULL(a_require_all_id_search_filters_met, 1);
+    SET a_require_any_id_search_filters_met := IFNULL(a_require_any_id_search_filters_met, 1);
+    SET a_require_all_non_id_search_filters_met := IFNULL(a_require_all_non_id_search_filters_met, 0);
+    SET a_require_any_non_id_search_filters_met := IFNULL(a_require_any_non_id_search_filters_met, 1);
+    SET a_show_errors := IFNULL(a_show_errors, 0);
+    SET a_debug := IFNULL(a_debug, 0);
+    
+    IF a_debug = 1 THEN
+		SELECT 
+              a_guid
+			, a_id_user
+            , a_get_all_file_type
+            , a_get_inactive_file_type
+            , a_ids_file_type
+            , a_names_file_type
+            , a_get_all_image
+            , a_get_inactive_image
+            , a_ids_image
+            , a_names_image
+            , a_get_all_button_icon
+            , a_get_inactive_button_icon
+            , a_ids_button_icon
+            , a_names_button_icon
+            , a_notes_button_icon
+            , a_require_all_id_search_filters_met
+            , a_require_any_id_search_filters_met
+            , a_require_all_non_id_search_filters_met
+            , a_require_any_non_id_search_filters_met
+            , a_show_errors
+            , a_debug
+		;
+
+        SELECT
+              v_id_type_error_bad_data
+            , v_id_type_error_no_permission
+            , v_id_permission_dog_view
+            , v_time_start
+        ;
+    END IF;
+
+    DROP TEMPORARY TABLE IF EXISTS tmp_Split_Notes_Calc_Button_Icon;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Split_Name_Calc_Button_Icon;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Split_Id_Calc_Button_Icon;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error_Calc_Button_Icon;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Button_Icon_Calc_Button_Icon;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Image_Calc_Button_Icon;
+    
+    CREATE TEMPORARY TABLE tmp_Image_Calc_Button_Icon (
+		  id_image INT NOT NULL
+        , id_file_type INT
+        , id_dog INT
+        , path VARCHAR(1024)
+        , name VARCHAR(1024)
+        , active BIT
+        , does_meet_id_filters BIT NOT NULL
+        , does_meet_non_id_filters BIT NOT NULL
+    );
+    
+    CREATE TEMPORARY TABLE tmp_Button_Icon_Calc_Button_Icon (
+		  id_button_icon INT NOT NULL
+		, id_image INT
+        , does_meet_id_filters BIT NOT NULL
+        , does_meet_non_id_filters BIT NOT NULL
+        , does_image_already_exist_in_temp_table BIT NOT NULL
+    );
+    
+	CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error_Calc_Button_Icon (
+          id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
+		, id_type INT NULL
+		, code VARCHAR(250) NOT NULL
+        , msg TEXT NOT NULL
+	);
+    
+    CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Split_Id_Calc_Button_Icon (
+		  substring VARCHAR(4000) NOT NULL
+        , as_int INT NULL
+	);
+    DELETE FROM tmp_Split_Id_Calc_Button_Icon;
+    
+    CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Split_Name_Calc_Button_Icon (
+		  substring VARCHAR(4000) NOT NULL
+        , as_int INT NULL
+	);
+    DELETE FROM tmp_Split_Name_Calc_Button_Icon;
+    
+    CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Split_Notes_Calc_Button_Icon (
+		  substring VARCHAR(4000) NOT NULL
+        , as_int INT NULL
+	);
+    DELETE FROM tmp_Split_Notes_Calc_Button_Icon;
+    
+    SET v_has_filter_button_icon_id = CASE WHEN a_ids_button_icon <> '' THEN 1 ELSE 0 END;
+    SET v_has_filter_button_icon_name = CASE WHEN a_names_button_icon <> '' THEN 1 ELSE 0 END;
+    SET v_has_filter_button_icon_notes = CASE WHEN a_notes_button_icon <> '' THEN 1 ELSE 0 END;
+
+    -- Call Calc Images
+    IF NOT EXISTS(SELECT * FROM tmp_Msg_Error_Calc_Button_Icon t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+        IF a_debug = 1 THEN
+            SELECT 
+                  a_guid -- a_guid
+                , a_id_user -- a_id_user
+                , a_get_all_file_type -- a_get_all_file_type
+                , a_get_inactive_file_type -- a_get_inactive_file_type
+                , a_ids_file_type -- a_ids_file_type
+                , a_names_file_type -- a_names_file_type
+                , 1 -- a_get_all_dog
+                , 0 -- a_get_inactive_dog
+                , '' -- a_ids_dog
+                , '' -- a_names_dog
+                , a_get_all_image -- a_get_all_image
+                , a_get_inactive_image -- a_get_inactive_image
+                , a_ids_image -- a_ids_image
+                , a_names_image -- a_names_image
+                , a_require_all_id_search_filters_met -- a_require_all_id_search_filters_met
+                , 0 -- a_require_any_id_search_filters_met
+                , a_require_all_non_id_search_filters_met -- a_require_all_non_id_search_filters_met
+                , 0 -- a_require_any_non_id_search_filters_met
+                , 0 -- a_show_errors
+                , 0 -- a_debug
+            ;
+        END IF;
+        
+        CALL parts.p_dog_calc_image (
+              a_guid -- a_guid
+            , a_id_user -- a_id_user
+            , a_get_all_file_type -- a_get_all_file_type
+            , a_get_inactive_file_type -- a_get_inactive_file_type
+            , a_ids_file_type -- a_ids_file_type
+            , a_names_file_type -- a_names_file_type
+            , 1 -- a_get_all_dog
+            , 0 -- a_get_inactive_dog
+            , '' -- a_ids_dog
+            , '' -- a_names_dog
+            , a_get_all_image -- a_get_all_image
+            , a_get_inactive_image -- a_get_inactive_image
+            , a_ids_image -- a_ids_image
+            , a_names_image -- a_names_image
+            , a_require_all_id_search_filters_met -- a_require_all_id_search_filters_met
+            , 0 -- a_require_any_id_search_filters_met -- a_require_any_id_search_filters_met
+            , a_require_all_non_id_search_filters_met -- a_require_all_non_id_search_filters_met
+            , 0 -- a_require_any_non_id_search_filters_met -- a_require_any_non_id_search_filters_met
+            , 0 -- a_show_errors
+            , 0 -- a_debug
+        );
+        
+        INSERT INTO tmp_Image_Calc_Button_Icon (
+              id_image
+            , id_file_type
+            , id_dog
+            , path
+            , name
+            , active
+
+            , does_meet_id_filters
+            , does_meet_non_id_filters
+        )
+        SELECT
+              IMAGES_T.id_image
+            , IMAGES_T.id_file_type
+            , IMAGES_T.id_dog
+            , IMAGES_T.path
+            , IMAGES_T.name
+            , IMAGES_T.active
+
+            , IMAGES_T.does_meet_id_filters
+            , IMAGES_T.does_meet_non_id_filters
+        FROM parts.DOG_Image_Temp IMAGES_T
+        WHERE IMAGES_T.GUID = a_guid
+        ;
+        
+        IF a_debug = 1 THEN
+            SELECT * FROM tmp_Image_Calc_Button_Icon;
+        END IF;
+    END IF;
+
+    -- Button_Icons
+    IF v_has_filter_button_icon_id = 1 THEN
+		CALL parts.p_core_split(a_guid, a_ids_button_icon, ',', a_debug);
+
+        SET sql_mode = '';
+		
+		INSERT INTO tmp_Split_Id_Calc_Button_Icon (
+			  substring
+			, as_int
+		)
+		SELECT 
+			  SPLIT_T.substring
+			, CAST(SPLIT_T.substring AS DECIMAL(10,0)) AS as_int
+		FROM parts.CORE_Split_Temp SPLIT_T
+		WHERE 
+                SPLIT_T.GUID = a_guid
+			AND IFNULL(SPLIT_T.substring, '') <> ''
+		;
+		
+		CALL parts.p_core_clear_split( a_guid );
+	END IF;
+
+    IF v_has_filter_button_icon_name = 1 THEN
+		CALL parts.p_core_split(a_guid, a_names_button_icon, ',', a_debug);
+
+        SET sql_mode = '';
+		
+		INSERT INTO tmp_Split_Name_Calc_Button_Icon (
+			  substring
+			, as_int
+		)
+		SELECT 
+			  SPLIT_T.substring
+			, CAST(SPLIT_T.substring AS DECIMAL(10,0)) AS as_int
+		FROM parts.CORE_Split_Temp SPLIT_T
+		WHERE 
+                SPLIT_T.GUID = a_guid
+			AND IFNULL(SPLIT_T.substring, '') <> ''
+		;
+		
+		CALL parts.p_core_clear_split( a_guid );
+	END IF;
+
+    IF v_has_filter_button_icon_notes = 1 THEN
+		CALL parts.p_core_split(a_guid, a_notes_button_icon, ',', a_debug);
+
+        SET sql_mode = '';
+		
+		INSERT INTO tmp_Split_Notes_Calc_Button_Icon (
+			  substring
+			, as_int
+		)
+		SELECT 
+			  SPLIT_T.substring
+			, CAST(SPLIT_T.substring AS DECIMAL(10,0)) AS as_int
+		FROM parts.CORE_Split_Temp SPLIT_T
+		WHERE 
+                SPLIT_T.GUID = a_guid
+			AND IFNULL(SPLIT_T.substring, '') <> ''
+		;
+		
+		CALL parts.p_core_clear_split( a_guid );
+	END IF;
+    
+    IF NOT EXISTS (SELECT * FROM tmp_Msg_Error_Calc_Button_Icon t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+		IF EXISTS (
+			SELECT * 
+            FROM tmp_Split_Id_Calc_Button_Icon t_SPLIT_ID
+            LEFT JOIN parts.DOG_Button_Icon BUTTON_ICON ON t_SPLIT_ID.as_int = BUTTON_ICON.id_button_icon 
+			WHERE 
+				    ISNULL(t_SPLIT_ID.as_int) 
+                OR  ISNULL(BUTTON_ICON.id_button_icon)
+				OR  (
+					BUTTON_ICON.active = 0
+					AND a_get_inactive_button_icon = 0
+				)
+		) THEN
+			INSERT INTO tmp_Msg_Error_Calc_Button_Icon (
+				  id_type
+		        , code
+				, msg
+			)
+			SELECT
+				  v_id_type_error_bad_data
+                , v_code_type_error_bad_data
+				, CONCAT('Invalid or inactive Button_Icon IDs: ', IFNULL(GROUP_CONCAT(t_SPLIT_ID.substring SEPARATOR ', '), 'NULL'))
+			FROM tmp_Split_Id_Calc_Button_Icon t_SPLIT_ID
+			LEFT JOIN parts.DOG_Button_Icon BUTTON_ICON ON t_SPLIT_ID.as_int = BUTTON_ICON.id_button_icon
+			WHERE 
+				    ISNULL(t_SPLIT_ID.as_int) 
+				OR  ISNULL(BUTTON_ICON.id_button_icon)
+				OR  (
+					BUTTON_ICON.active = 0
+					AND a_get_inactive_button_icon = 0
+				)
+			;
+        /* Don't error on names, or notes not found
+		ELSEIF EXISTS ()
+        */
+		ELSE
+            IF a_debug = 1 THEN
+                SELECT 'Button_Icon Filters';
+                WITH 
+                    Button_Icon_Id_Filter AS (
+                        SELECT BUTTON_ICON.id_button_icon
+                        FROM tmp_Split_Id_Calc_Button_Icon t_SPLIT_ID
+                        INNER JOIN parts.DOG_Button_Icon BUTTON_ICON ON t_SPLIT_ID.as_int = BUTTON_ICON.id_button_icon
+                    )
+                    , Button_Icon_Name_Filter AS (
+                        SELECT BUTTON_ICON.id_button_icon
+                        FROM tmp_Split_Name_Calc_Button_Icon t_SPLIT_NAME
+                        INNER JOIN parts.DOG_Button_Icon BUTTON_ICON ON BUTTON_ICON.name LIKE CONCAT('%', t_SPLIT_NAME.substring, '%')
+                        WHERE 
+                                t_SPLIT_NAME.substring IS NOT NULL
+                            AND t_SPLIT_NAME.substring <> ''
+                    )
+                    , Button_Icon_Notes_Filter AS (
+                        SELECT BUTTON_ICON.id_button_icon
+                        FROM tmp_Split_Notes_Calc_Button_Icon t_SPLIT_NOTES
+                        INNER JOIN parts.DOG_Button_Icon BUTTON_ICON ON BUTTON_ICON.notes LIKE CONCAT('%', t_SPLIT_NOTES.substring, '%')
+                        WHERE 
+                                t_SPLIT_NOTES.substring IS NOT NULL
+                            AND t_SPLIT_NOTES.substring <> ''
+                    )
+                    , Button_Icon_Filters AS (
+                        SELECT 
+                            BUTTON_ICON_COMBINED.id_button_icon
+                            , MAX(BUTTON_ICON_COMBINED.does_meet_id_filter) AS does_meet_id_filter
+                            , MAX(BUTTON_ICON_COMBINED.does_meet_name_filter) AS does_meet_name_filter
+                            , MAX(BUTTON_ICON_COMBINED.does_meet_notes_filter) AS does_meet_notes_filter
+                        FROM (
+                            SELECT 
+                                BUTTON_ICON_ID_FILTER.id_button_icon 
+                                , 1 AS does_meet_id_filter
+                                , 0 AS does_meet_name_filter
+                                , 0 AS does_meet_notes_filter
+                            FROM Button_Icon_Id_Filter BUTTON_ICON_ID_FILTER
+                            UNION
+                            SELECT 
+                                BUTTON_ICON_NAME_FILTER.id_button_icon 
+                                , 0 AS does_meet_id_filter
+                                , 1 AS does_meet_name_filter
+                                , 0 AS does_meet_notes_filter
+                            FROM Button_Icon_Name_Filter BUTTON_ICON_NAME_FILTER
+                            UNION
+                            SELECT 
+                                BUTTON_ICON_NOTES_FILTER.id_button_icon 
+                                , 0 AS does_meet_id_filter
+                                , 0 AS does_meet_name_filter
+                                , 1 AS does_meet_notes_filter
+                            FROM Button_Icon_Notes_Filter BUTTON_ICON_NOTES_FILTER
+                        ) BUTTON_ICON_COMBINED
+                        GROUP BY BUTTON_ICON_COMBINED.id_button_icon
+                    )
+                SELECT 
+                      BUTTON_ICON.id_button_icon
+                    , BUTTON_ICON.id_image
+                    , BUTTON_ICON.code
+                    , BUTTON_ICON.name
+                    , BUTTON_ICON.notes
+                    , CASE WHEN 
+                            v_has_filter_button_icon_id = 0 
+                        OR  BUTTON_ICON_FILTERS.does_meet_id_filter = 1
+                    THEN 1 ELSE 0 END AS does_meet_non_id_filters
+                    , CASE WHEN 
+                            (
+                                v_has_filter_button_icon_name = 0
+                            AND v_has_filter_button_icon_notes = 0
+                        )
+                        OR  BUTTON_ICON_FILTERS.does_meet_name_filter = 1
+                        OR  BUTTON_ICON_FILTERS.does_meet_notes_filter = 1
+                    THEN 1 ELSE 0 END AS does_meet_id_filters
+                    , CASE WHEN t_IMAGE.id_image IS NOT NULL THEN 1 ELSE 0 END AS does_image_already_exist_in_temp_table
+                FROM parts.DOG_Button_Icon BUTTON_ICON
+                LEFT JOIN tmp_Image_Calc_Button_Icon t_IMAGE ON BUTTON_ICON.id_image = t_IMAGE.id_image
+                LEFT JOIN Button_Icon_Filters BUTTON_ICON_FILTERS ON BUTTON_ICON.id_button_icon = BUTTON_ICON_FILTERS.id_button_icon
+                WHERE 
+                    (
+                            a_get_all_button_icon = 1
+                        OR  (
+                                v_has_filter_button_icon_id = 1
+                            AND BUTTON_ICON_FILTERS.does_meet_id_filter = 1
+                        )
+                        OR  (
+                                v_has_filter_button_icon_name = 1
+                            AND BUTTON_ICON_FILTERS.does_meet_name_filter = 1
+                        )
+                        OR  (
+                                v_has_filter_button_icon_notes = 1
+                            AND BUTTON_ICON_FILTERS.does_meet_notes_filter = 1
+                        )
+                    )
+                    AND (
+                            a_get_inactive_button_icon = 1
+                        OR  BUTTON_ICON.active = 1
+                    )
+                ;
+            END IF;
+			INSERT INTO tmp_Button_Icon_Calc_Button_Icon (
+				  id_button_icon
+                , id_image
+                , does_meet_id_filters
+                , does_meet_non_id_filters
+                , does_image_already_exist_in_temp_table
+			)
+            WITH 
+                  Button_Icon_Id_Filter AS (
+                    SELECT BUTTON_ICON.id_button_icon
+                    FROM tmp_Split_Id_Calc_Button_Icon t_SPLIT_ID
+                    INNER JOIN parts.DOG_Button_Icon BUTTON_ICON ON t_SPLIT_ID.as_int = BUTTON_ICON.id_button_icon
+                )
+                , Button_Icon_Name_Filter AS (
+                    SELECT BUTTON_ICON.id_button_icon
+                    FROM tmp_Split_Name_Calc_Button_Icon t_SPLIT_NAME
+                    INNER JOIN parts.DOG_Button_Icon BUTTON_ICON ON BUTTON_ICON.name LIKE CONCAT('%', t_SPLIT_NAME.substring, '%')
+                    WHERE 
+                            t_SPLIT_NAME.substring IS NOT NULL
+                        AND t_SPLIT_NAME.substring <> ''
+                )
+                , Button_Icon_Notes_Filter AS (
+                    SELECT BUTTON_ICON.id_button_icon
+                    FROM tmp_Split_Notes_Calc_Button_Icon t_SPLIT_NOTES
+                    INNER JOIN demo.DOG_Button_Icon BUTTON_ICON ON BUTTON_ICON.notes LIKE CONCAT('%', t_SPLIT_NOTES.substring, '%')
+                    WHERE 
+                            t_SPLIT_NOTES.substring IS NOT NULL
+                        AND t_SPLIT_NOTES.substring <> ''
+                )
+                , Button_Icon_Filters AS (
+                    SELECT 
+                          BUTTON_ICON_COMBINED.id_button_icon
+                        , MAX(BUTTON_ICON_COMBINED.does_meet_id_filter) AS does_meet_id_filter
+                        , MAX(BUTTON_ICON_COMBINED.does_meet_name_filter) AS does_meet_name_filter
+                        , MAX(BUTTON_ICON_COMBINED.does_meet_notes_filter) AS does_meet_notes_filter
+                    FROM (
+                        SELECT 
+                              BUTTON_ICON_ID_FILTER.id_button_icon 
+                            , 1 AS does_meet_id_filter
+                            , 0 AS does_meet_name_filter
+                            , 0 AS does_meet_notes_filter
+                        FROM Button_Icon_Id_Filter BUTTON_ICON_ID_FILTER
+                        UNION
+                        SELECT 
+                              BUTTON_ICON_NAME_FILTER.id_button_icon 
+                            , 0 AS does_meet_id_filter
+                            , 1 AS does_meet_name_filter
+                            , 0 AS does_meet_notes_filter
+                        FROM Button_Icon_Name_Filter BUTTON_ICON_NAME_FILTER
+                        UNION
+                        SELECT 
+                              BUTTON_ICON_NOTES_FILTER.id_button_icon 
+                            , 0 AS does_meet_id_filter
+                            , 0 AS does_meet_name_filter
+                            , 1 AS does_meet_notes_filter
+                        FROM Button_Icon_Notes_Filter BUTTON_ICON_NOTES_FILTER
+                    ) BUTTON_ICON_COMBINED
+                    GROUP BY BUTTON_ICON_COMBINED.id_button_icon
+                )
+            SELECT 
+                  BUTTON_ICON.id_button_icon
+                , BUTTON_ICON.id_image
+                , CASE WHEN 
+                        v_has_filter_button_icon_id = 0 
+                    OR  IFNULL(BUTTON_ICON_FILTERS.does_meet_id_filter, 0) = 1
+                THEN 1 ELSE 0 END AS does_meet_id_filters
+                , CASE WHEN 
+                        (
+                            v_has_filter_button_icon_name = 0
+                        AND v_has_filter_button_icon_notes = 0
+                    )
+                    OR  IFNULL(BUTTON_ICON_FILTERS.does_meet_name_filter, 0) = 1
+                    OR  IFNULL(BUTTON_ICON_FILTERS.does_meet_notes_filter, 0) = 1
+                THEN 1 ELSE 0 END AS does_meet_non_id_filters
+                , CASE WHEN t_IMAGE.id_image IS NOT NULL THEN 1 ELSE 0 END AS does_image_already_exist_in_temp_table
+            FROM parts.DOG_Button_Icon BUTTON_ICON
+            LEFT JOIN tmp_Image_Calc_Button_Icon t_IMAGE ON BUTTON_ICON.id_image = t_IMAGE.id_image
+            LEFT JOIN Button_Icon_Filters BUTTON_ICON_FILTERS ON BUTTON_ICON.id_button_icon = BUTTON_ICON_FILTERS.id_button_icon
+            WHERE 
+                (
+                        a_get_all_button_icon = 1
+                    OR  (
+                            v_has_filter_button_icon_id = 1
+                        AND BUTTON_ICON_FILTERS.does_meet_id_filter = 1
+                    )
+                    OR  (
+                            v_has_filter_button_icon_name = 1
+                        AND BUTTON_ICON_FILTERS.does_meet_name_filter = 1
+                    )
+                    OR  (
+                            v_has_filter_button_icon_notes = 1
+                        AND BUTTON_ICON_FILTERS.does_meet_notes_filter = 1
+                    )
+                )
+                AND (
+                        a_get_inactive_button_icon = 1
+                    OR  BUTTON_ICON.active = 1
+                )
+			;
+		END IF;
+	END IF;
+    
+    DELETE FROM tmp_Split_Id_Calc_Button_Icon;
+    DELETE FROM tmp_Split_Name_Calc_Button_Icon;
+    DELETE FROM tmp_Split_Notes_Calc_Button_Icon;
+
+    IF a_debug = 1 THEN
+        SELECT 'After get Button Icons and Images';
+        SELECT * FROM tmp_Image_Calc_Button_Icon;
+        SELECT * FROM tmp_Button_Icon_Calc_Button_Icon;
+    END IF;
+    
+    -- Missing Images
+    IF NOT EXISTS (SELECT * FROM tmp_Msg_Error_Calc_Button_Icon t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+       
+        IF 
+                a_require_all_id_search_filters_met = 0 
+            AND a_require_all_non_id_search_filters_met = 0
+        THEN
+            INSERT INTO tmp_Image_Calc_Button_Icon (
+                  id_image
+                , does_meet_id_filters
+                , does_meet_non_id_filters
+            )
+            SELECT DISTINCT
+                  IMAGE.id_image
+                , 0 AS does_meet_id_filters
+                , 0 AS does_meet_non_id_filters
+            FROM parts.DOG_Image IMAGE
+            INNER JOIN tmp_Button_Icon_Calc_Button_Icon t_BUTTON_ICON 
+                ON  IMAGE.id_image = t_BUTTON_ICON.id_image
+                AND t_BUTTON_ICON.does_image_already_exist_in_temp_table = 0
+            ;
+        END IF;
+    END IF;
+
+    -- Filter records
+    IF NOT EXISTS (SELECT * FROM tmp_Msg_Error_Calc_Button_Icon t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+        DELETE t_BUTTON_ICON
+        FROM tmp_Button_Icon_Calc_Button_Icon t_BUTTON_ICON
+        LEFT JOIN tmp_Image_Calc_Button_Icon t_IMAGE ON t_BUTTON_ICON.id_image = t_IMAGE.id_image
+        WHERE
+                (
+                    a_require_all_id_search_filters_met = 1
+                AND (
+                        t_BUTTON_ICON.does_meet_id_filters = 0
+                    OR  IFNULL(t_IMAGE.does_meet_id_filters, 1) = 0
+                )
+            )
+            OR  (
+                    a_require_all_non_id_search_filters_met = 1
+                AND (
+                        t_BUTTON_ICON.does_meet_non_id_filters = 0
+                    OR  IFNULL(t_IMAGE.does_meet_non_id_filters, 1) = 0
+                )
+            )
+            OR  (
+                a_require_any_id_search_filters_met = 1
+                AND t_BUTTON_ICON.does_meet_id_filters = 0
+                AND IFNULL(t_IMAGE.does_meet_id_filters, 1) = 0
+            )
+            OR  (
+                a_require_any_non_id_search_filters_met = 1
+                AND t_BUTTON_ICON.does_meet_non_id_filters = 0
+                AND IFNULL(t_IMAGE.does_meet_non_id_filters, 1) = 0
+            )
+        ;
+
+        IF a_debug = 1 THEN
+            WITH 
+                Image_And_Best_Button_Icon AS (
+                    SELECT 
+                        t_BUTTON_ICON.id_image
+                        , MAX(IFNULL(t_BUTTON_ICON.does_meet_id_filters, 0)) AS does_meet_id_filters
+                        , MAX(IFNULL(t_BUTTON_ICON.does_meet_non_id_filters, 0)) AS does_meet_non_id_filters
+                    FROM tmp_Button_Icon_Calc_Button_Icon t_BUTTON_ICON 
+                    GROUP BY t_BUTTON_ICON.id_image
+                )
+            SELECT *
+            FROM tmp_Image_Calc_Button_Icon t_IMAGE
+            LEFT JOIN Image_And_Best_Button_Icon IMAGE_BEST ON t_IMAGE.id_image = IMAGE_BEST.id_image
+            WHERE
+                    (
+                        a_require_all_id_search_filters_met = 1
+                    AND (
+                            IMAGE_BEST.does_meet_id_filters = 0
+                        OR  IFNULL(t_IMAGE.does_meet_id_filters, 1) = 0
+                    )
+                )
+                OR  (
+                        a_require_all_non_id_search_filters_met = 1
+                    AND (
+                            IMAGE_BEST.does_meet_non_id_filters = 0
+                        OR  IFNULL(t_IMAGE.does_meet_non_id_filters, 1) = 0
+                    )
+                )
+                OR  (
+                    a_require_any_id_search_filters_met = 1
+                    AND IMAGE_BEST.does_meet_id_filters = 0
+                    AND IFNULL(t_IMAGE.does_meet_id_filters, 1) = 0
+                )
+                OR  (
+                    a_require_any_non_id_search_filters_met = 1
+                    AND IMAGE_BEST.does_meet_non_id_filters = 0
+                    AND IFNULL(t_IMAGE.does_meet_non_id_filters, 1) = 0
+                )
+            ;
+        END IF;
+
+        WITH 
+            Image_And_Best_Button_Icon AS (
+                SELECT 
+                      t_BUTTON_ICON.id_image
+                    , MAX(IFNULL(t_BUTTON_ICON.does_meet_id_filters, 0)) AS does_meet_id_filters
+                    , MAX(IFNULL(t_BUTTON_ICON.does_meet_non_id_filters, 0)) AS does_meet_non_id_filters
+                FROM tmp_Button_Icon_Calc_Button_Icon t_BUTTON_ICON
+                GROUP BY t_BUTTON_ICON.id_image
+            )
+        DELETE t_IMAGE
+        FROM tmp_Image_Calc_Button_Icon t_IMAGE
+        LEFT JOIN Image_And_Best_Button_Icon IMAGE_BEST ON t_IMAGE.id_image = IMAGE_BEST.id_image
+        WHERE
+                (
+                    a_require_all_id_search_filters_met = 1
+                AND (
+                        IFNULL(IMAGE_BEST.does_meet_id_filters, 0) = 0
+                    OR  IFNULL(t_IMAGE.does_meet_id_filters, 1) = 0
+                )
+            )
+            OR  (
+                    a_require_all_non_id_search_filters_met = 1
+                AND (
+                        IFNULL(IMAGE_BEST.does_meet_non_id_filters, 0) = 0
+                    OR  IFNULL(t_IMAGE.does_meet_non_id_filters, 1) = 0
+                )
+            )
+            OR  (
+                a_require_any_id_search_filters_met = 1
+                AND IFNULL(IMAGE_BEST.does_meet_id_filters, 0) = 0
+                AND IFNULL(t_IMAGE.does_meet_id_filters, 1) = 0
+            )
+            OR  (
+                a_require_any_non_id_search_filters_met = 1
+                AND IFNULL(IMAGE_BEST.does_meet_non_id_filters, 0) = 0
+                AND IFNULL(t_IMAGE.does_meet_non_id_filters, 1) = 0
+            )
+        ;
+    END IF;
+
+    IF a_debug = 1 THEN
+        SELECT 'After filter Button_Icons';
+        SELECT * FROM tmp_Image_Calc_Button_Icon;
+        SELECT * FROM tmp_Button_Icon_Calc_Button_Icon;
+    END IF;
+
+
+    -- Permissions
+    IF a_debug = 1 THEN
+		SELECT 
+			  a_guid -- a_guid
+            , 0 -- get_all_user
+            , 0 -- get_inactive_user
+            , a_id_user -- ids_user
+            , '' -- a_auth0_ids_user
+            , '' -- a_names_user
+            , '' -- a_emails_user
+            , 1 -- a_require_all_id_search_filters_met
+            , 1 -- a_require_any_id_search_filters_met
+            , 0 -- a_require_all_non_id_search_filters_met
+            , 0 -- a_require_any_non_id_search_filters_met
+            , v_id_permission_dog_view -- ids_permission
+            , v_id_access_level_view -- ids_access_level
+            , 0 -- a_show_errors
+			, 0 -- a_debug
+        ;
+    END IF;
+    
+	CALL parts.p_dog_calc_user(
+          a_guid -- a_guid
+        , 0 -- get_all_user
+        , 0 -- get_inactive_user
+        , a_id_user -- ids_user
+        , '' -- a_auth0_ids_user
+        , '' -- a_names_user
+        , '' -- a_emails_user
+        , 1 -- a_require_all_id_search_filters_met
+        , 1 -- a_require_any_id_search_filters_met
+        , 0 -- a_require_all_non_id_search_filters_met
+        , 0 -- a_require_any_non_id_search_filters_met
+        , v_id_permission_dog_view -- ids_permission
+        , v_id_access_level_view -- ids_access_level
+        , 0 -- a_show_errors
+        , 0 -- a_debug
+    );
+	
+    SELECT
+          IFNULL(CALC_USER_T.has_access, 0)
+    INTO
+          v_can_view
+    FROM parts.DOG_Calc_User_Temp CALC_USER_T
+    WHERE CALC_USER_T.GUID = a_guid
+    LIMIT 1
+    ;
+    
+    IF a_debug = 1 THEN
+        SELECT v_can_view;
+    END IF;
+    
+    IF (v_can_view = 0) THEN
+		DELETE t_ME
+        FROM tmp_Msg_Error_Calc_Button_Icon t_ME
+        WHERE t_ME.id_type <> v_id_type_error_no_permission
+        ;
+		INSERT INTO tmp_Msg_Error_Calc_Button_Icon (
+			  id_type
+			, code
+            , msg
+		)
+		VALUES (
+			  v_id_type_error_no_permission
+            , v_code_type_error_no_permission
+			, 'You do not have permission to view Dogs and Button Icons.'
+		)
+        ;
+    END IF;
+	
+	CALL parts.p_dog_clear_calc_user(
+		a_guid
+        , 0 -- a_debug
+	);
+
+    IF a_debug = 1 THEN
+        SELECT 'Before non-permitted data deletion';
+        SELECT * FROM tmp_Image_Calc_Button_Icon;
+        SELECT * FROM tmp_Button_Icon_Calc_Button_Icon;
+        SELECT * FROM tmp_Msg_Error_Calc_Button_Icon;
+    END IF;
+    
+    IF EXISTS(SELECT * FROM tmp_Msg_Error_Calc_Button_Icon t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+        IF a_debug = 1 THEN
+            SELECT * FROM tmp_Image_Calc_Button_Icon;
+            SELECT * FROM tmp_Button_Icon_Calc_Button_Icon;
+        END IF;
+
+        DELETE FROM tmp_Button_Icon_Calc_Button_Icon;
+        DELETE FROM tmp_Image_Calc_Button_Icon;
+    END IF;
+
+    IF a_debug = 1 THEN
+        SELECT 'After non-permitted data deletion';
+    END IF;
+
+    -- Outputs
+	START TRANSACTION;
+        -- Button_Icons
+        INSERT INTO parts.DOG_Button_Icon_Temp (
+            guid
+            , id_button_icon
+            , id_image
+            , code
+            , name
+            , notes
+            , active
+
+            , does_meet_id_filters
+            , does_meet_non_id_filters
+        )
+        SELECT 
+            a_guid
+            , t_BUTTON_ICON.id_button_icon
+            , t_BUTTON_ICON.id_image
+            , BUTTON_ICON.code
+            , BUTTON_ICON.name
+            , BUTTON_ICON.notes
+            , BUTTON_ICON.active
+
+            , t_BUTTON_ICON.does_meet_id_filters
+            , t_BUTTON_ICON.does_meet_non_id_filters
+        FROM parts.DOG_Button_Icon BUTTON_ICON
+        INNER JOIN tmp_Button_Icon_Calc_Button_Icon t_BUTTON_ICON ON BUTTON_ICON.id_button_icon = t_BUTTON_ICON.id_button_icon
+        ;
+    COMMIT;
+
+    -- Errors
+    IF a_show_errors = 1 THEN
+        SELECT 
+            t_ERROR.id_error
+            , t_ERROR.id_type
+            , t_ERROR.code
+            , ERROR_TYPE.name
+            , ERROR_TYPE.description
+            , ERROR_TYPE.is_breaking_error
+            , ERROR_TYPE.background_colour
+            , ERROR_TYPE.text_colour
+            , t_ERROR.msg
+        FROM tmp_Msg_Error_Calc_Button_Icon t_ERROR
+        INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
+        ;
+    END IF;
+
+    IF a_debug = 1 AND v_can_view = 1 THEN
+        SELECT * FROM tmp_Image_Calc_Button_Icon;
+        SELECT * FROM tmp_Button_Icon_Calc_Button_Icon;
+    END IF;
+    
+    DROP TEMPORARY TABLE IF EXISTS tmp_Split_Notes_Calc_Button_Icon;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Split_Name_Calc_Button_Icon;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Split_Id_Calc_Button_Icon;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error_Calc_Button_Icon;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Button_Icon_Calc_Button_Icon;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Image_Calc_Button_Icon;
+    
+    IF a_debug = 1 THEN
+		CALL parts.p_core_debug_timing_reporting ( v_time_start );
+    END IF;
+END //
+DELIMITER ;
+
+
+/*
+
+
+CALL parts.p_dog_calc_button_icon (
+      'slips                               ' -- a_guid
+	, 1 -- 'auth0|6582b95c895d09a70ba10fef',	-- a_id_user
+    , 1                                     	-- a_get_all_file_type
+	, 0                                     	-- a_get_inactive_file_type
+	, ''                                    	-- a_ids_file_type
+    , ''                                        -- a_names_file_type
+    , 1                                     	-- a_get_all_image
+	, 0                                     	-- a_get_inactive_image
+	, ''                                    	-- a_ids_image
+    , ''                                        -- a_names_image
+    , 1                                     	-- a_get_all_button_icon
+	, 0                                     	-- a_get_inactive_button_icon
+	, ''                                    	-- a_ids_button_icon
+    , ''                                        -- a_names_button_icon
+    , ''                                        -- a_notes_button_icon
+    , 0                                         -- a_require_all_id_search_filters_met
+    , 0                                         -- a_require_any_id_search_filters_met
+    , 0                                         -- a_require_all_non_id_search_filters_met
+    , 0                                         -- a_require_any_non_id_search_filters_met
+    , 0                                         -- a_show_errors
+    , 0                                     	-- a_debug
+);
+
+CALL parts.p_dog_calc_button_icon (
+      'slips                               ' -- a_guid
+	, 1 -- 'auth0|6582b95c895d09a70ba10fef',	-- a_id_user
+    , 1                                     	-- a_get_all_file_type
+	, 0                                     	-- a_get_inactive_file_type
+	, ''                                    	-- a_ids_file_type
+    , 'pat,point'                                        -- a_names_file_type
+    , 1                                     	-- a_get_all_image
+	, 0                                     	-- a_get_inactive_image
+	, ''                                    	-- a_ids_image
+    , 'pat,point'                                        -- a_names_image
+    , 1                                     	-- a_get_all_button_icon
+	, 0                                     	-- a_get_inactive_button_icon
+	, ''                                    	-- a_ids_button_icon
+    , 'pat,point'                                        -- a_names_button_icon
+    , 'pat,point'                                        -- a_notes_button_icon
+    , 1                                         -- a_require_all_id_search_filters_met
+    , 1                                         -- a_require_any_id_search_filters_met
+    , 0                                         -- a_require_all_non_id_search_filters_met
+    , 1                                         -- a_require_any_non_id_search_filters_met
+    , 1                                         -- a_show_errors
+    , 0                                     	-- a_debug
+);
+SELECT *
+FROM parts.DOG_Button_Icon_Temp
+;
+
+CALL parts.p_dog_clear_calc_button_icon (
+	'slips                               ' -- a_guid
+    , 1 -- debug
+);
+
+DELETE
+FROM parts.DOG_Button_Icon_Temp
+;
+
+*/

static/MySQL/71232_p_dog_clear_calc_button_icon.sql

@@ -0,0 +1,45 @@
+
+USE parts;
+
+DROP PROCEDURE IF EXISTS parts.p_dog_clear_calc_button_icon;
+DROP PROCEDURE IF EXISTS parts.p_button_icon_clear_calc_button_icon;
+
+DELIMITER //
+CREATE PROCEDURE parts.p_dog_clear_calc_button_icon (
+	  IN a_guid BINARY(36)
+    , IN a_debug BIT
+)
+BEGIN
+	DECLARE v_time_start TIMESTAMP(6);
+    SET v_time_start := CURRENT_TIMESTAMP(6);
+    
+    CALL parts.p_core_validate_guid ( a_guid );
+    
+	START TRANSACTION;
+		
+		DELETE BUTTON_ICONS_T
+        FROM parts.DOG_Button_Icon_Temp BUTTON_ICONS_T
+		WHERE BUTTON_ICONS_T.GUID = a_guid
+		;
+		
+	COMMIT;
+    
+    IF a_debug = 1 THEN
+		CALL parts.p_debug_timing_reporting( v_time_start );
+    END IF;
+END //
+DELIMITER ;
+
+/*
+
+CALL parts.p_dog_clear_calc_button_icon (
+	'crips                               ' -- a_guid
+    , 1 -- debug
+);
+
+SELECT *
+FROM parts.DOG_Calc_User_Temp
+WHERE GUID = 'chips                               '
+;
+
+*/

static/MySQL/71232_p_dog_get_many_button_icon.sql

@@ -0,0 +1,448 @@
+ 
+USE parts;
+
+DROP PROCEDURE IF EXISTS parts.p_dog_get_many_button_icon;
+
+DELIMITER //
+CREATE PROCEDURE parts.p_dog_get_many_button_icon (
+	  IN a_id_user INT
+    , IN a_get_all_file_type BIT
+	, IN a_get_inactive_file_type BIT
+	, IN a_ids_file_type TEXT
+    , IN a_names_file_type TEXT
+    , IN a_get_all_image BIT
+	, IN a_get_inactive_image BIT
+	, IN a_ids_image TEXT
+    , IN a_names_image TEXT
+    , IN a_get_all_button_icon BIT
+	, IN a_get_inactive_button_icon BIT
+	, IN a_ids_button_icon TEXT
+    , IN a_names_button_icon TEXT
+    , IN a_notes_button_icon TEXT
+    , IN a_require_all_id_search_filters_met BIT
+    , IN a_require_any_id_search_filters_met BIT
+    , IN a_require_all_non_id_search_filters_met BIT
+    , IN a_require_any_non_id_search_filters_met BIT
+    , IN a_debug BIT
+)
+BEGIN
+    DECLARE v_can_view BIT;
+    DECLARE v_code_type_error_bad_data VARCHAR(100);
+    DECLARE v_code_type_error_no_permission VARCHAR(100);
+    DECLARE v_guid BINARY(36);
+    DECLARE v_id_access_level_view INT;
+    DECLARE v_id_minimum INT;
+    DECLARE v_id_permission_dog_view INT;
+    DECLARE v_id_type_error_bad_data INT;
+    DECLARE v_id_type_error_no_permission INT;
+    DECLARE v_time_start TIMESTAMP(6);
+    
+    DECLARE exit handler for SQLEXCEPTION
+    BEGIN
+        GET DIAGNOSTICS CONDITION 1
+            @sqlstate = RETURNED_SQLSTATE
+            , @errno = MYSQL_ERRNO
+            , @text = MESSAGE_TEXT
+		;
+        
+        ROLLBACK;
+        
+		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
+			  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
+			, id_type INT NULL
+			, code VARCHAR(250) NOT NULL
+			, msg TEXT NOT NULL
+		);
+
+        INSERT INTO tmp_Msg_Error (
+			  id_type
+            , code
+            , msg
+		)
+        SELECT 
+			  MET.id_type
+            , @errno
+            , @text
+		FROM parts.CORE_Msg_Error_Type MET
+        WHERE MET.code = 'MYSQL_ERROR'
+		;
+        
+        SELECT 
+            t_ERROR.id_error
+            , t_ERROR.id_type
+            , t_ERROR.code
+            , ERROR_TYPE.name
+            , ERROR_TYPE.description
+            , ERROR_TYPE.is_breaking_error
+            , ERROR_TYPE.background_colour
+            , ERROR_TYPE.text_colour
+            , t_ERROR.msg
+        FROM tmp_Msg_Error t_ERROR
+        INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
+        ;
+        
+		DROP TABLE IF EXISTS tmp_Msg_Error;
+    END;
+
+    SET v_time_start := CURRENT_TIMESTAMP(6);
+    SET v_guid := UUID();
+    SET v_code_type_error_bad_data := 'BAD_DATA';
+    SET v_code_type_error_no_permission := 'NO_PERMISSION';
+    SET v_id_type_error_bad_data := (SELECT ERROR_TYPE.id_type FROM parts.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_bad_data LIMIT 1);
+    SET v_id_type_error_no_permission := (SELECT ERROR_TYPE.id_type FROM parts.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_no_permission LIMIT 1);
+    SET v_id_permission_dog_view := (SELECT PERMISSION.id_permission FROM parts.DOG_Permission PERMISSION WHERE PERMISSION.code = 'DOG_VIEW' LIMIT 1);
+    SET v_id_access_level_view := (SELECT ACCESS_LEVEL.id_access_level FROM parts.DOG_Access_Level ACCESS_LEVEL WHERE ACCESS_LEVEL.code = 'VIEW' LIMIT 1);
+    
+    SET a_id_user := IFNULL(a_id_user, 0);
+    /*
+    SET a_get_all_file_type := IFNULL(a_get_all_file_type, 0);
+    SET a_get_inactive_file_type := IFNULL(a_get_inactive_file_type, 0);
+    SET a_ids_file_type := TRIM(IFNULL(a_ids_file_type, ''));
+    SET a_names_file_type := TRIM(IFNULL(a_names_file_type, ''));
+    SET a_get_all_image := IFNULL(a_get_all_image, 0);
+    SET a_get_inactive_image := IFNULL(a_get_inactive_image, 0);
+    SET a_ids_image := TRIM(IFNULL(a_ids_image, ''));
+    SET a_names_image := TRIM(IFNULL(a_names_image, ''));
+    SET a_get_all_button_icon := IFNULL(a_get_all_button_icon, 0);
+    SET a_get_inactive_button_icon := IFNULL(a_get_inactive_button_icon, 0);
+    SET a_ids_button_icon := TRIM(IFNULL(a_ids_button_icon, ''));
+    SET a_names_button_icon := TRIM(IFNULL(a_names_button_icon, ''));
+    SET a_notes_button_icon := TRIM(IFNULL(a_notes_button_icon, ''));
+    SET a_require_all_id_search_filters_met := IFNULL(a_require_all_id_search_filters_met, 1);
+    SET a_require_any_id_search_filters_met := IFNULL(a_require_any_id_search_filters_met, 1);
+    SET a_require_all_non_id_search_filters_met := IFNULL(a_require_all_non_id_search_filters_met, 0);
+    SET a_require_any_non_id_search_filters_met := IFNULL(a_require_any_non_id_search_filters_met, 1);
+    */
+    SET a_debug := IFNULL(a_debug, 0);
+    
+    IF a_debug = 1 THEN
+		SELECT 
+			  a_id_user
+            , a_get_all_file_type
+            , a_get_inactive_file_type
+            , a_ids_file_type
+            , a_names_file_type
+            , a_get_all_image
+            , a_get_inactive_image
+            , a_ids_image
+            , a_names_image
+            , a_get_all_button_icon
+            , a_get_inactive_button_icon
+            , a_ids_button_icon
+            , a_names_button_icon
+            , a_notes_button_icon
+            , a_require_all_id_search_filters_met
+            , a_require_any_id_search_filters_met
+            , a_require_all_non_id_search_filters_met
+            , a_require_any_non_id_search_filters_met
+            , a_debug
+		;
+
+        SELECT
+              v_id_type_error_bad_data
+            , v_id_type_error_no_permission
+            , v_guid
+            , v_id_permission_dog_view
+            , v_time_start
+        ;
+    END IF;
+
+    DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Button_Icon;
+    
+    CREATE TEMPORARY TABLE tmp_Button_Icon (
+		  id_button_icon INT NOT NULL
+        , id_image INT
+		, code VARCHAR(250)
+        , name VARCHAR(250)
+        , notes TEXT
+        , active BIT
+
+        , does_meet_id_filters BIT
+        , does_meet_non_id_filters BIT
+    );
+    
+	CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
+          id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
+		, id_type INT NULL
+		, code VARCHAR(250) NOT NULL
+        , msg TEXT NOT NULL
+    );
+    
+    -- Permissions
+    IF a_debug = 1 THEN
+		SELECT 
+			  v_guid
+            , 0 -- get_all_user
+            , 0 -- get_inactive_user
+            , a_id_user -- ids_user
+            , '' -- a_auth0_ids_user
+            , '' -- a_names_user
+            , '' -- a_emails_user
+            , 1 -- a_require_all_id_search_filters_met
+            , 1 -- a_require_any_id_search_filters_met
+            , 0 -- a_require_all_non_id_search_filters_met
+            , 0 -- a_require_any_non_id_search_filters_met
+            , v_id_permission_dog_view -- ids_permission
+            , v_id_access_level_view -- ids_access_level
+            , 0 -- a_show_errors
+			, 0 -- a_debug
+        ;
+    END IF;
+    
+	CALL parts.p_dog_calc_user(
+          v_guid
+        , 0 -- get_all_user
+        , 0 -- get_inactive_user
+        , a_id_user -- ids_user
+        , '' -- a_auth0_ids_user
+        , '' -- a_names_user
+        , '' -- a_emails_user
+        , 1 -- a_require_all_id_search_filters_met
+        , 1 -- a_require_any_id_search_filters_met
+        , 0 -- a_require_all_non_id_search_filters_met
+        , 0 -- a_require_any_non_id_search_filters_met
+        , v_id_permission_dog_view -- ids_permission
+        , v_id_access_level_view -- ids_access_level
+        , 0 -- a_show_errors
+        , 0 -- a_debug
+    );
+	
+    SELECT
+          IFNULL(CALC_USER_T.has_access, 0)
+    INTO
+          v_can_view
+    FROM parts.DOG_Calc_User_Temp CALC_USER_T
+    WHERE CALC_USER_T.GUID = v_guid
+    LIMIT 1
+    ;
+    
+    IF a_debug = 1 THEN
+        SELECT v_can_view;
+        SELECT COUNT(*) AS Count_Errors FROM tmp_Msg_Error t_ERROR;
+        SELECT * FROM tmp_Msg_Error t_ERROR;
+    END IF;
+    
+    IF (v_can_view = 0) THEN
+		DELETE t_ME
+        FROM tmp_Msg_Error t_ME
+        WHERE t_ME.id_type <> v_id_type_error_no_permission
+        ;
+		INSERT INTO tmp_Msg_Error (
+			  id_type
+			, code
+            , msg
+		)
+		VALUES (
+			  v_id_type_error_no_permission
+            , v_code_type_error_no_permission
+			, 'You do not have permission to view Button_Icons.'
+		)
+        ;
+    END IF;
+	
+	CALL parts.p_dog_clear_calc_user(
+		  v_guid
+        , 0 -- a_debug
+	);
+
+    
+    -- Call Button_Icon Calc
+    IF NOT EXISTS(SELECT * FROM tmp_Msg_Error t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+        IF a_debug = 1 THEN
+            SELECT 
+                  v_guid -- a_guid
+                , a_id_user -- a_id_user
+                , a_get_all_file_type -- a_get_all_file_type
+                , a_get_inactive_file_type -- a_get_inactive_file_type
+                , a_ids_file_type -- a_ids_file_type
+                , a_names_file_type -- a_names_file_type
+                , a_get_all_image -- a_get_all_image
+                , a_get_inactive_image -- a_get_inactive_image
+                , a_ids_image -- a_ids_image
+                , a_names_image -- a_names_image
+                , a_get_all_button_icon -- a_get_all_button_icon
+                , a_get_inactive_button_icon -- a_get_inactive_button_icon
+                , a_ids_button_icon -- a_ids_button_icon
+                , a_names_button_icon -- a_names_button_icon
+                , a_notes_button_icon -- a_notes_button_icon
+                , a_require_all_id_search_filters_met -- a_require_all_id_search_filters_met
+                , a_require_any_id_search_filters_met -- a_require_any_id_search_filters_met
+                , a_require_all_non_id_search_filters_met -- a_require_all_non_id_search_filters_met
+                , a_require_any_non_id_search_filters_met -- a_require_any_non_id_search_filters_met
+                , 0 -- a_show_errors
+                , 0 -- a_debug
+            ;
+        END IF;
+        
+        CALL parts.p_dog_calc_button_icon (
+              v_guid -- a_guid
+            , a_id_user -- a_id_user
+            , a_get_all_file_type -- a_get_all_file_type
+            , a_get_inactive_file_type -- a_get_inactive_file_type
+            , a_ids_file_type -- a_ids_file_type
+            , a_names_file_type -- a_names_file_type
+            , a_get_all_image -- a_get_all_image
+            , a_get_inactive_image -- a_get_inactive_image
+            , a_ids_image -- a_ids_image
+            , a_names_image -- a_names_image
+            , a_get_all_button_icon -- a_get_all_button_icon
+            , a_get_inactive_button_icon -- a_get_inactive_button_icon
+            , a_ids_button_icon -- a_ids_button_icon
+            , a_names_button_icon -- a_names_button_icon
+            , a_notes_button_icon -- a_notes_button_icon
+            , a_require_all_id_search_filters_met -- a_require_all_id_search_filters_met
+            , a_require_any_id_search_filters_met -- a_require_any_id_search_filters_met
+            , a_require_all_non_id_search_filters_met -- a_require_all_non_id_search_filters_met
+            , a_require_any_non_id_search_filters_met -- a_require_any_non_id_search_filters_met
+            , 0 -- a_show_errors
+            , 0 -- a_debug
+        );
+        
+        IF a_debug = 1 THEN
+            SELECT COUNT(*) FROM parts.DOG_Button_Icon_Temp;
+            SELECT * FROM parts.DOG_Button_Icon_Temp;
+        END IF;
+        
+        INSERT INTO tmp_Button_Icon (
+              id_button_icon
+            , id_image
+            , code
+            , name
+            , notes
+            , active
+
+            , does_meet_id_filters
+            , does_meet_non_id_filters
+        )
+        SELECT
+              BUTTON_ICON_T.id_button_icon
+            , BUTTON_ICON_T.id_image
+            , BUTTON_ICON_T.code
+            , BUTTON_ICON_T.name
+            , BUTTON_ICON_T.notes
+            , BUTTON_ICON_T.active
+
+            , BUTTON_ICON_T.does_meet_id_filters
+            , BUTTON_ICON_T.does_meet_non_id_filters
+        FROM parts.DOG_Button_Icon_Temp BUTTON_ICON_T
+        WHERE BUTTON_ICON_T.GUID = v_guid
+        ;
+        
+        IF a_debug = 1 THEN
+            SELECT COUNT(*) FROM tmp_Button_Icon;
+            SELECT * FROM tmp_Button_Icon;
+        END IF;
+    END IF;
+    
+    -- Filter outputs
+    IF EXISTS(SELECT * FROM tmp_Msg_Error t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+        IF a_debug = 1 THEN
+            SELECT * FROM tmp_Button_Icon;
+        END IF;
+
+        DELETE FROM tmp_Button_Icon;
+    END IF;
+
+
+    -- Outputs
+    -- Button_Icons
+    SELECT 
+          t_BUTTON_ICONS.id_button_icon
+        , t_BUTTON_ICONS.id_image
+        , IMAGES.path AS path_image
+        , IMAGES.name AS name_image
+        , t_BUTTON_ICONS.code
+        , t_BUTTON_ICONS.name
+        , t_BUTTON_ICONS.notes
+        , t_BUTTON_ICONS.active
+
+        , t_BUTTON_ICONS.does_meet_id_filters
+        , t_BUTTON_ICONS.does_meet_non_id_filters
+    FROM tmp_Button_Icon t_BUTTON_ICONS
+    LEFT JOIN parts.DOG_Image IMAGES ON t_BUTTON_ICONS.id_image = IMAGES.id_image
+    ORDER BY t_BUTTON_ICONS.name
+    ;
+
+    -- Errors
+    SELECT 
+          t_ERROR.id_error
+		, t_ERROR.id_type
+        , t_ERROR.code
+        , ERROR_TYPE.name
+        , ERROR_TYPE.description
+        , ERROR_TYPE.is_breaking_error
+        , ERROR_TYPE.background_colour
+        , ERROR_TYPE.text_colour
+		, t_ERROR.msg
+    FROM tmp_Msg_Error t_ERROR
+	INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
+	;
+    
+    IF a_debug = 1 AND v_can_view = 1 THEN
+        SELECT * FROM tmp_Button_Icon;
+    END IF;
+	
+	CALL parts.p_dog_clear_calc_button_icon(
+		v_guid -- a_guid
+        , 0 -- a_debug
+	);
+    
+    DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error;
+    DROP TEMPORARY TABLE IF EXISTS tmp_Button_Icon;
+    
+    IF a_debug = 1 THEN
+		CALL parts.p_core_debug_timing_reporting ( v_time_start );
+    END IF;
+END //
+DELIMITER ;
+
+
+/*
+
+CALL parts.p_dog_get_many_button_icon (
+	  1 -- 'auth0|6582b95c895d09a70ba10fef',	-- a_id_user
+    , 1                                     	-- a_get_all_file_type
+	, 0                                     	-- a_get_inactive_file_type
+	, ''                                    	-- a_ids_file_type
+    , ''                                        -- a_names_file_type
+    , 1                                     	-- a_get_all_image
+	, 0                                     	-- a_get_inactive_image
+	, ''                                    	-- a_ids_image
+    , ''                                        -- a_names_image
+    , 1                                     	-- a_get_all_button_icon
+	, 0                                     	-- a_get_inactive_button_icon
+	, ''                                    	-- a_ids_button_icon
+    , ''                                        -- a_names_button_icon
+    , ''                                        -- a_notes_button_icon
+    , 1                                         -- a_require_all_id_search_filters_met
+    , 1                                         -- a_require_any_id_search_filters_met
+    , 0                                         -- a_require_all_non_id_search_filters_met
+    , 1                                         -- a_require_any_non_id_search_filters_met
+    , 1                                     	-- a_debug
+);
+
+
+CALL demo.p_dog_get_many_button_icon (
+	  1 -- 'auth0|6582b95c895d09a70ba10fef',	-- a_id_user
+    , 1                                     	-- a_get_all_file_type
+	, 0                                     	-- a_get_inactive_file_type
+	, ''                                    	-- a_ids_file_type
+    , 'pat,point'                                        -- a_names_file_type
+    , 1                                     	-- a_get_all_image
+	, 0                                     	-- a_get_inactive_image
+	, ''                                    	-- a_ids_image
+    , 'pat,point'                                        -- a_names_image
+    , 1                                     	-- a_get_all_button_icon
+	, 0                                     	-- a_get_inactive_button_icon
+	, ''                                    	-- a_ids_button_icon
+    , 'pat,point'                                        -- a_names_button_icon
+    , 'pat,point'                                        -- a_notes_button_icon
+    , 1                                         -- a_require_all_id_search_filters_met
+    , 1                                         -- a_require_any_id_search_filters_met
+    , 0                                         -- a_require_all_non_id_search_filters_met
+    , 1                                         -- a_require_any_non_id_search_filters_met
+    , 1                                     	-- a_debug
+);
+
+*/

static/MySQL/71234_p_dog_save_button_icon.sql

@@ -0,0 +1,555 @@
+
+USE parts;
+
+DROP PROCEDURE IF EXISTS parts.p_dog_save_button_icon;
+
+DELIMITER //
+CREATE PROCEDURE parts.p_dog_save_button_icon (
+    IN a_comment VARCHAR(500),
+	IN a_guid BINARY(36),
+    IN a_id_user INT,
+    IN a_debug BIT
+)
+BEGIN
+    DECLARE v_can_admin BIT;
+    DECLARE v_can_create BIT;
+	DECLARE v_code_type_error_bad_data VARCHAR(100);
+    DECLARE v_id_access_level_edit INT;
+    DECLARE v_id_change_set INT;
+    DECLARE v_id_permission_dog_new INT;
+    DECLARE v_id_type_error_bad_data INT;
+    DECLARE v_time_start TIMESTAMP(6);
+    
+    DECLARE exit handler for SQLEXCEPTION
+    BEGIN
+        GET DIAGNOSTICS CONDITION 1
+            @sqlstate = RETURNED_SQLSTATE
+            , @errno = MYSQL_ERRNO
+            , @text = MESSAGE_TEXT
+		;
+        
+        ROLLBACK;
+        
+		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
+			  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
+			, id_type INT NULL
+			, code VARCHAR(250)
+			, msg TEXT NOT NULL
+		);
+
+        INSERT INTO tmp_Msg_Error (
+			  id_type
+			, code
+            , msg
+		)
+        SELECT 
+			  MET.id_type
+            , @errno
+            , @text
+		FROM parts.CORE_Msg_Error_Type MET
+        WHERE MET.code = 'MYSQL_ERROR'
+		;
+
+        SELECT 
+            t_ERROR.id_error
+            , t_ERROR.id_type
+            , t_ERROR.code
+            , ERROR_TYPE.name
+            , ERROR_TYPE.description
+            , ERROR_TYPE.is_breaking_error
+            , ERROR_TYPE.background_colour
+            , ERROR_TYPE.text_colour
+            , t_ERROR.msg
+        FROM tmp_Msg_Error t_ERROR
+        INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
+        ;
+
+		DROP TABLE IF EXISTS tmp_Msg_Error;
+    END;
+    
+    SET SESSION group_concat_max_len=15000;
+
+    SET v_time_start := CURRENT_TIMESTAMP(6);
+    SET v_code_type_error_bad_data := 'BAD_DATA';
+    SET v_id_type_error_bad_data := (SELECT ERROR_TYPE.id_type FROM parts.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_bad_data LIMIT 1);
+    SET v_id_permission_dog_new := (SELECT PERMISSION.id_permission FROM parts.DOG_Permission PERMISSION WHERE PERMISSION.code = 'DOG_CREATE' LIMIT 1);
+    SET v_id_access_level_edit := (SELECT ACCESS_LEVEL.id_access_level FROM parts.DOG_Access_Level ACCESS_LEVEL WHERE ACCESS_LEVEL.code = 'EDIT' LIMIT 1);
+    
+    CALL parts.p_core_validate_guid ( a_guid );
+    
+    DROP TABLE IF EXISTS tmp_Button_Icon_Copy;
+    DROP TABLE IF EXISTS tmp_Button_Icon;
+    
+    CREATE TEMPORARY TABLE tmp_Button_Icon (
+          id_temp INT
+        , id_button_icon INT
+        , id_image INT
+        , code VARCHAR(250)
+        , name VARCHAR(250)
+        , active BIT
+        , is_new BIT
+        , name_error VARCHAR(250)
+    );
+
+    CREATE TEMPORARY TABLE tmp_Button_Icon_Copy (
+          id_temp INT
+        , id_button_icon INT
+        , id_image INT
+        , code VARCHAR(250)
+        , name VARCHAR(250)
+        , active BIT
+        , is_new BIT
+        , name_error VARCHAR(250)
+    );
+        
+	CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
+		  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
+		, id_type INT NULL
+        , code VARCHAR(250)
+        , msg TEXT NOT NULL
+	);
+        
+    
+    -- Get data from Temp table
+    INSERT INTO tmp_Button_Icon (
+		  id_temp
+        , id_button_icon
+        , id_image
+        , code
+        , name
+        , active
+        , is_new
+	)
+    SELECT 
+		  BUTTON_ICONS_T.id_temp
+		, COALESCE(
+              BUTTON_ICONS.id_button_icon
+            , BUTTON_ICONS_T.id_button_icon
+        ) AS id_button_icon
+        , CASE WHEN IFNULL(BUTTON_ICONS_T.id_image, 0) < 1 THEN NULL ELSE BUTTON_ICONS_T.id_image END AS id_image
+        , COALESCE(
+              BUTTON_ICONS_T.code
+            , BUTTON_ICONS.code
+        ) AS code
+        , COALESCE(
+              BUTTON_ICONS_T.name
+            , BUTTON_ICONS.name
+        ) AS name
+        , COALESCE(BUTTON_ICONS_T.active, 1) AS active
+        , CASE WHEN COALESCE(BUTTON_ICONS.id_button_icon, BUTTON_ICONS_T.id_button_icon, 0) < 1 THEN 1 ELSE 0 END AS is_new
+	FROM parts.DOG_Button_Icon_Temp BUTTON_ICONS_T
+    LEFT JOIN parts.DOG_Button_Icon BUTTON_ICONS 
+        ON  BUTTON_ICONS_T.id_button_icon = BUTTON_ICONS.id_button_icon
+        OR  (
+                BUTTON_ICONS_T.name = BUTTON_ICONS.name
+        )
+    WHERE BUTTON_ICONS_T.guid = a_guid
+    ;
+
+    IF a_debug = 1 THEN
+        SELECT 'Button_Icon_Temp records';
+        SELECT * FROM tmp_Button_Icon;
+        SELECT COUNT(*) FROM tmp_Button_Icon;
+    END IF;
+
+    -- Error names
+    UPDATE tmp_Button_Icon t_BUTTON_ICONS
+    SET t_BUTTON_ICONS.name_error = COALESCE(t_BUTTON_ICONS.name, t_BUTTON_ICONS.code, t_BUTTON_ICONS.id_button_icon, '(No Button_Icon)')
+    ;
+
+    IF a_debug = 1 THEN
+        SELECT 'After set name_error';
+        SELECT * FROM tmp_Button_Icon;
+        SELECT COUNT(*) FROM tmp_Button_Icon;
+    END IF;
+
+    -- Validation
+    -- Missing mandatory fields
+    -- code
+    IF EXISTS ( SELECT * FROM tmp_Button_Icon t_BUTTON_ICONS WHERE t_BUTTON_ICONS.code IS NULL ) THEN
+        INSERT INTO tmp_Msg_Error (
+            id_type
+            , code
+            , msg
+        )
+        SELECT
+            v_id_type_error_bad_data
+            , v_code_type_error_bad_data
+            , CONCAT('The following Button_Icon(s) do not have a valid Code: ', GROUP_CONCAT(t_BUTTON_ICONS.name_error SEPARATOR ', ')) AS msg
+        FROM tmp_Button_Icon t_BUTTON_ICONS
+        WHERE t_BUTTON_ICONS.code IS NULL
+        ;
+    END IF;
+    -- name
+    IF EXISTS ( SELECT * FROM tmp_Button_Icon t_BUTTON_ICONS WHERE t_BUTTON_ICONS.name IS NULL ) THEN
+        INSERT INTO tmp_Msg_Error (
+            id_type
+            , name
+            , msg
+        )
+        SELECT
+            v_id_type_error_bad_data
+            , v_name_type_error_bad_data
+            , CONCAT('The following Button_Icon(s) do not have a valid Name: ', GROUP_CONCAT(t_BUTTON_ICONS.name_error SEPARATOR ', ')) AS msg
+        FROM tmp_Button_Icon t_BUTTON_ICONS
+        WHERE t_BUTTON_ICONS.name IS NULL
+        ;
+    END IF;
+
+    -- Duplicates
+    -- Duplicate names
+    INSERT INTO tmp_Button_Icon_Copy (
+        id_temp
+        , id_button_icon
+        , id_image
+        , code
+        , name
+        , active
+        , is_new
+        , name_error
+    )
+    SELECT 
+          t_BUTTON_ICONS.id_temp
+        , t_BUTTON_ICONS.id_button_icon
+        , t_BUTTON_ICONS.id_image
+        , t_BUTTON_ICONS.code
+        , t_BUTTON_ICONS.name
+        , t_BUTTON_ICONS.active
+        , t_BUTTON_ICONS.is_new
+        , t_BUTTON_ICONS.name_error
+    FROM tmp_Button_Icon t_BUTTON_ICONS
+    ;
+
+    IF a_debug = 1 THEN
+        SELECT COUNT(*) AS Count_Temp_Button_Icon FROM tmp_Button_Icon;
+        SELECT COUNT(*) AS Count_Temp_Button_Icon_Copy FROM tmp_Button_Icon_Copy;
+
+        WITH 
+              Combined_Button_Icons AS (
+                SELECT 
+                      BUTTON_ICONS.id_button_icon
+                    , BUTTON_ICONS.name
+                    , COALESCE(t_BUTTON_ICONS_COPY.name, t_BUTTON_ICONS_COPY.code, t_BUTTON_ICONS_COPY.id_button_icon, '(No Button_Icon)') AS name_error
+                FROM parts.DOG_Button_Icon BUTTON_ICONS 
+                LEFT JOIN tmp_Button_Icon_Copy t_BUTTON_ICONS_COPY ON BUTTON_ICONS.name = t_BUTTON_ICONS_COPY.name
+                WHERE t_BUTTON_ICONS_COPY.is_new = 1
+                UNION
+                SELECT 
+                      t_BUTTON_ICONS.id_button_icon
+                    , t_BUTTON_ICONS.name
+                    , t_BUTTON_ICONS.name_error
+                FROM tmp_Button_Icon t_BUTTON_ICONS
+            )
+            , Duplicate_Button_Icon_Name_Row_Numbers AS (
+                SELECT 
+                      COMBINED_BUTTON_ICONS.id_button_icon
+                    , COMBINED_BUTTON_ICONS.name
+                    , COMBINED_BUTTON_ICONS.name_error
+                    , ROW_NUMBER() OVER (PARTITION BY COMBINED_BUTTON_ICONS.name ORDER BY COMBINED_BUTTON_ICONS.name_error ASC) AS index_button_icon_name_as_duplicate
+                FROM Combined_Button_Icons COMBINED_BUTTON_ICONS
+            )
+        SELECT *
+        FROM Duplicate_Button_Icon_Name_Row_Numbers
+        ;
+    END IF;
+    
+    IF EXISTS (
+        WITH 
+              Combined_Button_Icons AS (
+                SELECT 
+                      BUTTON_ICONS.id_button_icon
+                    , BUTTON_ICONS.name
+                    , COALESCE(t_BUTTON_ICONS_COPY.name, t_BUTTON_ICONS_COPY.code, t_BUTTON_ICONS_COPY.id_button_icon, '(No Button_Icon)') AS name_error
+                FROM parts.DOG_Button_Icon BUTTON_ICONS 
+                LEFT JOIN tmp_Button_Icon_Copy t_BUTTON_ICONS_COPY ON BUTTON_ICONS.name = t_BUTTON_ICONS_COPY.name
+                WHERE t_BUTTON_ICONS_COPY.is_new = 1
+                UNION
+                SELECT 
+                      t_BUTTON_ICONS.id_button_icon
+                    , t_BUTTON_ICONS.name
+                    , t_BUTTON_ICONS.name_error
+                FROM tmp_Button_Icon t_BUTTON_ICONS
+            )
+            , Duplicate_Button_Icon_Name_Row_Numbers AS (
+                SELECT 
+                      COMBINED_BUTTON_ICONS.id_button_icon
+                    , COMBINED_BUTTON_ICONS.name
+                    , COMBINED_BUTTON_ICONS.name_error
+                    , ROW_NUMBER() OVER (PARTITION BY COMBINED_BUTTON_ICONS.name ORDER BY COMBINED_BUTTON_ICONS.name_error ASC) AS index_button_icon_name_as_duplicate
+                FROM Combined_Button_Icons COMBINED_BUTTON_ICONS
+            )
+        SELECT *
+        FROM Duplicate_Button_Icon_Name_Row_Numbers DUPLICATE_BUTTON_ICONS
+        WHERE DUPLICATE_BUTTON_ICONS.index_button_icon_name_as_duplicate > 1
+        GROUP BY DUPLICATE_BUTTON_ICONS.name
+    ) THEN
+        INSERT INTO tmp_Msg_Error (
+              id_type
+            , code
+            , msg
+        )
+        WITH 
+              Combined_Button_Icons AS (
+                SELECT 
+                      BUTTON_ICONS.id_button_icon
+                    , BUTTON_ICONS.name
+                    , COALESCE(t_BUTTON_ICONS_COPY.name, t_BUTTON_ICONS_COPY.code, t_BUTTON_ICONS_COPY.id_button_icon, '(No Button_Icon)') AS name_error
+                FROM parts.DOG_Button_Icon BUTTON_ICONS 
+                LEFT JOIN tmp_Button_Icon_Copy t_BUTTON_ICONS_COPY ON BUTTON_ICONS.name = t_BUTTON_ICONS_COPY.name
+                WHERE t_BUTTON_ICONS_COPY.is_new = 1
+                UNION
+                SELECT 
+                      t_BUTTON_ICONS.id_button_icon
+                    , t_BUTTON_ICONS.name
+                    , t_BUTTON_ICONS.name_error
+                FROM tmp_Button_Icon t_BUTTON_ICONS
+            )
+            , Duplicate_Button_Icon_Name_Row_Numbers AS (
+                SELECT 
+                      COMBINED_BUTTON_ICONS.id_button_icon
+                    , COMBINED_BUTTON_ICONS.name
+                    , COMBINED_BUTTON_ICONS.name_error
+                    , ROW_NUMBER() OVER (PARTITION BY COMBINED_BUTTON_ICONS.name ORDER BY COMBINED_BUTTON_ICONS.name_error ASC) AS index_button_icon_name_as_duplicate
+                FROM Combined_Button_Icons COMBINED_BUTTON_ICONS
+            )
+        SELECT
+              v_id_type_error_bad_data
+            , v_code_type_error_bad_data
+            , CONCAT('Attempt to create duplicate or overwrite existing Button_Icons on: ', GROUP_CONCAT(DUPLICATE_BUTTON_ICONS.name_error SEPARATOR ', ')) AS msg
+        FROM Duplicate_Button_Icon_Name_Row_Numbers DUPLICATE_BUTTON_ICONS
+        WHERE DUPLICATE_BUTTON_ICONS.index_button_icon_as_duplicate > 1
+        GROUP BY DUPLICATE_BUTTON_ICONS.name
+        ;
+    END IF;
+    
+    -- Permissions
+    -- Can Create
+	CALL parts.p_dog_calc_user(
+          a_guid
+        , 0 -- get_all_user
+        , 0 -- get_inactive_user
+        , a_id_user -- ids_user
+        , '' -- a_auth0_ids_user
+        , '' -- a_names_user
+        , '' -- a_emails_user
+        , 1 -- a_require_all_id_search_filters_met
+        , 1 -- a_require_any_id_search_filters_met
+        , 0 -- a_require_all_non_id_search_filters_met
+        , 0 -- a_require_any_non_id_search_filters_met
+        , v_id_permission_dog_new -- ids_permission
+        , v_id_access_level_edit -- ids_access_level
+        , 0 -- a_show_errors
+        , 0 -- a_debug
+    );
+	
+    SELECT
+          IFNULL(CU_T.has_access, 0)
+    INTO
+          v_can_create
+    FROM parts.DOG_Calc_User_Temp CU_T
+    WHERE CU_T.GUID = a_guid
+    LIMIT 1
+    ;
+	
+	CALL parts.p_dog_clear_calc_user(
+		  a_guid
+        , 0 -- a_debug
+	);
+    
+    IF v_can_create = 0 THEN
+		DELETE t_ME
+        FROM tmp_Msg_Error t_ME
+        WHERE t_ME.id_type <> v_id_type_error_no_permission
+        ;
+		INSERT INTO tmp_Msg_Error (
+			  id_type
+            , code
+			, msg
+		)
+		VALUES (
+			  v_id_type_error_no_permission
+            , v_code_type_error_no_permission
+			, 'You do not have permission to edit Button_Icons.'
+		)
+        ;
+    END IF;
+
+    IF EXISTS (SELECT * FROM tmp_Msg_Error t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+    	IF a_debug = 1 THEN
+	    	SELECT * from tmp_Button_Icon;
+	    END IF;
+
+        DELETE FROM tmp_Button_Icon;
+    END IF;
+
+    IF NOT EXISTS (SELECT * FROM tmp_Msg_Error t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+		START TRANSACTION;
+		
+			INSERT INTO parts.DOG_Dog_Change_Set ( 
+                  comment
+                , id_user_updated_last_by
+                , updated_last_on
+            )
+			VALUES ( 
+                  a_comment
+                , a_id_user
+                , v_time_start
+            )
+			;
+			
+			SET v_id_change_set := LAST_INSERT_ID();
+			
+			UPDATE parts.DOG_Button_Icon BUTTON_ICONS
+			INNER JOIN tmp_Button_Icon t_BUTTON_ICONS 
+				ON  BUTTON_ICONS.id_button_icon = t_BUTTON_ICONS.id_button_icon
+				AND t_BUTTON_ICONS.is_new = 0
+			SET 
+				  BUTTON_ICONS.id_image = t_BUTTON_ICONS.id_image
+				, BUTTON_ICONS.code = t_BUTTON_ICONS.code
+				, BUTTON_ICONS.name = t_BUTTON_ICONS.name
+				, BUTTON_ICONS.active = t_BUTTON_ICONS.active
+				, BUTTON_ICONS.id_change_set = v_id_change_set
+			;
+			
+			INSERT INTO parts.DOG_Button_Icon (
+				  id_image
+				, code
+				, name
+				, active
+				, id_user_created_by
+				, created_on
+			)
+			SELECT
+				  t_BUTTON_ICONS.id_image                     AS id_image
+				, t_BUTTON_ICONS.code                      AS code
+				, t_BUTTON_ICONS.name                      AS name
+				, t_BUTTON_ICONS.active                      AS active
+				, a_id_user                                     AS created_by
+				, v_time_start                                  AS created_on
+			FROM tmp_Button_Icon t_BUTTON_ICONS
+			WHERE 
+				    t_BUTTON_ICONS.is_new = 1
+				AND t_BUTTON_ICONS.active = 1
+			;
+			
+		COMMIT;
+    END IF;
+	
+	START TRANSACTION;
+
+		DELETE FROM parts.DOG_Button_Icon_Temp
+		WHERE GUID = a_guid
+        ;
+		
+	COMMIT;
+    
+    -- Errors
+    SELECT 
+          t_ERROR.id_error
+		, t_ERROR.id_type
+        , t_ERROR.code
+        , ERROR_TYPE.name
+        , ERROR_TYPE.description
+        , ERROR_TYPE.is_breaking_error
+        , ERROR_TYPE.background_colour
+        , ERROR_TYPE.text_colour
+		, t_ERROR.msg
+    FROM tmp_Msg_Error t_ERROR
+	INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
+	;
+    
+	IF a_debug = 1 THEN
+		SELECT * FROM tmp_Button_Icon;
+	END IF;
+
+    DROP TEMPORARY TABLE tmp_Button_Icon;
+    DROP TEMPORARY TABLE tmp_Msg_Error;
+    
+	IF a_debug = 1 THEN
+		CALL parts.p_core_debug_timing_reporting ( v_time_start );
+	END IF;
+END //
+DELIMITER ;
+
+
+
+/*
+
+'ripplesipplenippletippledippsykippsy'
+DELETE FROM parts.DOG_Button_Icon WHERE id_button_icon > 740;
+* /
+delete
+from parts.DOG_Button_Icon_Audit
+where id_button_icon > 768
+;
+delete
+from parts.DOG_Button_Icon
+where id_button_icon > 768
+;
+delete
+from parts.DOG_Button_Icon_Temp
+;
+select 
+	*
+    -- COUNT(*)
+-- delete
+from parts.DOG_Button_Icon_Temp
+;
+select COUNT(*)
+from parts.DOG_Button_Icon_Temp
+;
+select 
+	*
+    -- COUNT(*)
+-- delete
+from parts.DOG_Button_Icon
+;
+select COUNT(*)
+from parts.DOG_Button_Icon
+;
+
+INSERT INTO parts.DOG_Button_Icon_Temp (
+      id_button_icon
+    , id_image
+    , code
+    , name
+    , active
+    , guid
+)
+VALUES (
+      -1 -- id_button_icon
+    , NULL -- id_image
+    , 'NONE' -- code
+    , 'None' -- name
+    , 1 -- active
+    , 'ripplesipplenippletippledippsykippsy'
+);
+
+CALL parts.p_dog_save_button_icon (
+	'nipples'
+    , 'ripplesipplenippletippledippsykippsy'
+    , 1
+    , 1
+);
+
+
+select 
+	*
+    -- COUNT(*)
+-- delete
+from parts.DOG_Button_Icon_Temp
+;
+select COUNT(*)
+from parts.DOG_Button_Icon_Temp
+;
+select 
+	*
+    -- COUNT(*)
+-- delete
+from parts.DOG_Button_Icon
+;
+select COUNT(*)
+from parts.DOG_Button_Icon
+;
+
+*/

static/MySQL/71240_p_dog_save_command_button_link.sql

@@ -0,0 +1,787 @@
+
+USE parts;
+
+DROP PROCEDURE IF EXISTS parts.p_dog_save_command_button_link;
+
+DELIMITER //
+CREATE PROCEDURE parts.p_dog_save_command_button_link (
+    IN a_comment VARCHAR(500),
+	IN a_guid BINARY(36),
+    IN a_id_user INT,
+    IN a_debug BIT
+)
+BEGIN
+    DECLARE v_can_admin BIT;
+    DECLARE v_can_create BIT;
+	DECLARE v_code_type_error_bad_data VARCHAR(100);
+    DECLARE v_id_access_level_edit INT;
+    DECLARE v_id_change_set INT;
+    DECLARE v_id_permission_dog_new INT;
+    DECLARE v_id_type_error_bad_data INT;
+    DECLARE v_time_start TIMESTAMP(6);
+    
+    DECLARE exit handler for SQLEXCEPTION
+    BEGIN
+        GET DIAGNOSTICS CONDITION 1
+            @sqlstate = RETURNED_SQLSTATE
+            , @errno = MYSQL_ERRNO
+            , @text = MESSAGE_TEXT
+		;
+        
+        ROLLBACK;
+        
+		CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
+			  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
+			, id_type INT NULL
+			, code VARCHAR(250)
+			, msg TEXT NOT NULL
+		);
+
+        INSERT INTO tmp_Msg_Error (
+			  id_type
+			, code
+            , msg
+		)
+        SELECT 
+			  MET.id_type
+            , @errno
+            , @text
+		FROM parts.CORE_Msg_Error_Type MET
+        WHERE MET.code = 'MYSQL_ERROR'
+		;
+
+        SELECT 
+            t_ERROR.id_error
+            , t_ERROR.id_type
+            , t_ERROR.code
+            , ERROR_TYPE.name
+            , ERROR_TYPE.description
+            , ERROR_TYPE.is_breaking_error
+            , ERROR_TYPE.background_colour
+            , ERROR_TYPE.text_colour
+            , t_ERROR.msg
+        FROM tmp_Msg_Error t_ERROR
+        INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
+        ;
+
+		DROP TABLE IF EXISTS tmp_Msg_Error;
+    END;
+    
+    SET SESSION group_concat_max_len=15000;
+
+    SET v_time_start := CURRENT_TIMESTAMP(6);
+    SET v_code_type_error_bad_data := 'BAD_DATA';
+    SET v_id_type_error_bad_data := (SELECT ERROR_TYPE.id_type FROM parts.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_bad_data LIMIT 1);
+    SET v_id_permission_dog_new := (SELECT PERMISSION.id_permission FROM parts.DOG_Permission PERMISSION WHERE PERMISSION.code = 'DOG_CREATE' LIMIT 1);
+    SET v_id_access_level_edit := (SELECT ACCESS_LEVEL.id_access_level FROM parts.DOG_Access_Level ACCESS_LEVEL WHERE ACCESS_LEVEL.code = 'EDIT' LIMIT 1);
+    
+    CALL parts.p_core_validate_guid ( a_guid );
+    
+    DROP TABLE IF EXISTS tmp_Command_Button_Link_Copy;
+    DROP TABLE IF EXISTS tmp_Command_Button_Link;
+    
+    CREATE TEMPORARY TABLE tmp_Command_Button_Link (
+          id_temp INT
+        , id_link INT
+        , id_command INT
+        , id_button_shape INT
+        , id_button_colour INT
+        , id_button_icon INT
+        , id_location INT
+        , active BIT
+        , is_new BIT
+        , name_error VARCHAR(250)
+    );
+
+    CREATE TEMPORARY TABLE tmp_Command_Button_Link_Copy (
+          id_temp INT
+        , id_link INT
+        , id_command INT
+        , id_button_shape INT
+        , id_button_colour INT
+        , id_button_icon INT
+        , id_location INT
+        , active BIT
+        , is_new BIT
+        , name_error VARCHAR(250)
+    );
+        
+	CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
+		  id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
+		, id_type INT NULL
+        , code VARCHAR(250)
+        , msg TEXT NOT NULL
+	);
+        
+    
+    -- Get data from Temp table
+    INSERT INTO tmp_Command_Button_Link (
+		  id_temp
+        , id_link
+        , id_command
+        , id_button_shape
+        , id_button_colour
+        , id_button_icon
+        , id_location
+        , active
+        , is_new
+	)
+    SELECT 
+		  COMMAND_BUTTON_LINK_T.id_temp
+		, COALESCE(COMMAND_BUTTON_LINK.id_link, COMMAND_BUTTON_LINK_T.id_link)
+        , COALESCE(
+              COMMAND_BUTTON_LINK_T.id_command
+            , COMMAND_BUTTON_LINK.id_command
+        ) AS id_command
+        , COALESCE(
+              COMMAND_BUTTON_LINK_T.id_button_shape
+            , COMMAND_BUTTON_LINK.id_button_shape
+        ) AS id_button_shape
+        , COALESCE(
+              COMMAND_BUTTON_LINK_T.id_button_icon
+            , COMMAND_BUTTON_LINK.id_button_icon
+        ) AS id_button_colour
+        , COMMAND_BUTTON_LINK_T.id_button_icon
+        , COALESCE(
+              COMMAND_BUTTON_LINK_T.id_location
+            , COMMAND_BUTTON_LINK.id_location
+        ) AS id_location
+        , COALESCE(COMMAND_BUTTON_LINK_T.active, 1) AS active
+        , CASE WHEN COALESCE(COMMAND_BUTTON_LINK.id_link, COMMAND_BUTTON_LINK_T.id_link, 0) < 1 THEN 1 ELSE 0 END AS is_new
+	FROM parts.DOG_Command_Button_Link_Temp COMMAND_BUTTON_LINK_T
+    LEFT JOIN parts.DOG_Command_Button_Link COMMAND_BUTTON_LINK 
+        ON  COMMAND_BUTTON_LINK_T.id_link = COMMAND_BUTTON_LINK.id_link
+        OR  (
+                COMMAND_BUTTON_LINK_T.id_command = COMMAND_BUTTON_LINK.id_command
+            AND COMMAND_BUTTON_LINK_T.id_button_shape = COMMAND_BUTTON_LINK.id_button_shape
+            AND COMMAND_BUTTON_LINK_T.id_button_colour = COMMAND_BUTTON_LINK.id_button_colour
+            AND COMMAND_BUTTON_LINK_T.id_location = COMMAND_BUTTON_LINK.id_location
+            AND (
+                    COMMAND_BUTTON_LINK.id_button_icon IS NULL
+                OR  COMMAND_BUTTON_LINK_T.id_button_icon <=> COMMAND_BUTTON_LINK.id_button_icon
+            )
+        )
+    WHERE COMMAND_BUTTON_LINK_T.guid = a_guid
+    ;
+
+    IF a_debug = 1 THEN
+        SELECT 'Command_Button_Link_Temp records';
+        SELECT * FROM tmp_Command_Button_Link;
+        SELECT COUNT(*) FROM tmp_Command_Button_Link;
+    END IF;
+
+    -- Error names
+    UPDATE tmp_Command_Button_Link t_COMMAND_BUTTON_LINK
+    LEFT JOIN parts.DOG_Command COMMAND ON t_COMMAND_BUTTON_LINK.id_command = COMMAND.id_command
+    LEFT JOIN parts.DOG_Button_Shape BUTTON_SHAPE ON t_COMMAND_BUTTON_LINK.id_button_shape = BUTTON_SHAPE.id_button_shape
+    LEFT JOIN parts.DOG_Colour COLOUR ON t_COMMAND_BUTTON_LINK.id_button_colour = COLOUR.id_colour
+    LEFT JOIN parts.DOG_Button_Icon BUTTON_ICON ON t_COMMAND_BUTTON_LINK.id_button_icon = BUTTON_ICON.id_button_icon
+    LEFT JOIN parts.DOG_Location LOCATIONS ON t_COMMAND_BUTTON_LINK.id_location = LOCATIONS.id_location
+    SET t_COMMAND_BUTTON_LINK.name_error = CONCAT(
+          COALESCE(COMMAND.name, t_COMMAND_BUTTON_LINK.id_command, '(No Command)')
+        , ' - '
+        , COALESCE(BUTTON_SHAPE.name, t_COMMAND_BUTTON_LINK.id_button_shape, '(No Button Shape)')
+        , ' - '
+        , COALESCE(COLOUR.name, t_COMMAND_BUTTON_LINK.id_button_colour, '(No Colour)')
+        , ' - '
+        , COALESCE(BUTTON_ICON.name, t_COMMAND_BUTTON_LINK.id_button_icon, '(No Button Icon)')
+        , ' - '
+        , COALESCE(LOCATIONS.name, t_COMMAND_BUTTON_LINK.id_location, '(No Location)')
+    )
+    ;
+
+    IF a_debug = 1 THEN
+        SELECT 'After set name_error';
+        SELECT * FROM tmp_Command_Button_Link;
+        SELECT COUNT(*) FROM tmp_Command_Button_Link;
+    END IF;
+
+    -- Validation
+    -- Missing mandatory fields
+    -- id_command
+    IF EXISTS (
+        SELECT *
+        FROM tmp_Command_Button_Link t_COMMAND_BUTTON_LINK
+        LEFT JOIN demo.DOG_Command COMMAND ON t_COMMAND_BUTTON_LINK.id_command = COMMAND.id_command
+        WHERE 
+                ISNULL(t_COMMAND_BUTTON_LINK.id_command)
+            OR  ISNULL(COMMAND.id_command)
+            OR  COMMAND.active = 0
+    ) THEN
+        INSERT INTO tmp_Msg_Error (
+            id_type
+            , code
+            , msg
+        )
+        SELECT
+            v_id_type_error_bad_data
+            , v_code_type_error_bad_data
+            , CONCAT('The following Dog Command Link(s) do not have a valid Command: ', GROUP_CONCAT(t_COMMAND_BUTTON_LINK.name_error SEPARATOR ', ')) AS msg
+        FROM tmp_Command_Button_Link t_COMMAND_BUTTON_LINK
+        LEFT JOIN parts.DOG_Command COMMAND ON t_COMMAND_BUTTON_LINK.id_command = COMMAND.id_command
+        WHERE 
+                ISNULL(t_COMMAND_BUTTON_LINK.id_command)
+            OR  ISNULL(COMMAND.id_command)
+            OR  COMMAND.active = 0
+        ;
+    END IF;
+    -- id_button_shape
+    IF EXISTS (
+        SELECT *
+        FROM tmp_Command_Button_Link t_COMMAND_BUTTON_LINK
+        LEFT JOIN demo.DOG_Button_Shape BUTTON_SHAPE ON t_COMMAND_BUTTON_LINK.id_button_shape = BUTTON_SHAPE.id_button_shape
+        WHERE 
+                ISNULL(t_COMMAND_BUTTON_LINK.id_button_shape)
+            OR  ISNULL(BUTTON_SHAPE.id_button_shape)
+            OR  BUTTON_SHAPE.active = 0
+    ) THEN
+        INSERT INTO tmp_Msg_Error (
+            id_type
+            , code
+            , msg
+        )
+        SELECT
+            v_id_type_error_bad_data
+            , v_code_type_error_bad_data
+            , CONCAT('The following Dog Button_Shape Link(s) do not have a valid Button_Shape: ', GROUP_CONCAT(t_COMMAND_BUTTON_LINK.name_error SEPARATOR ', ')) AS msg
+        FROM tmp_Command_Button_Link t_COMMAND_BUTTON_LINK
+        LEFT JOIN parts.DOG_Button_Shape BUTTON_SHAPE ON t_COMMAND_BUTTON_LINK.id_button_shape = BUTTON_SHAPE.id_button_shape
+        WHERE 
+                ISNULL(t_COMMAND_BUTTON_LINK.id_button_shape)
+            OR  ISNULL(BUTTON_SHAPE.id_button_shape)
+            OR  BUTTON_SHAPE.active = 0
+        ;
+    END IF;
+    -- id_colour
+    IF EXISTS (
+        SELECT *
+        FROM tmp_Command_Button_Link t_COMMAND_BUTTON_LINK
+        LEFT JOIN demo.DOG_Colour COLOUR ON t_COMMAND_BUTTON_LINK.id_button_colour = COLOUR.id_colour
+        WHERE 
+                ISNULL(t_COMMAND_BUTTON_LINK.id_button_colour)
+            OR  ISNULL(COLOUR.id_colour)
+            OR  COLOUR.active = 0
+    ) THEN
+        INSERT INTO tmp_Msg_Error (
+            id_type
+            , code
+            , msg
+        )
+        SELECT
+            v_id_type_error_bad_data
+            , v_code_type_error_bad_data
+            , CONCAT('The following Dog Colour Link(s) do not have a valid Colour: ', GROUP_CONCAT(t_COMMAND_BUTTON_LINK.name_error SEPARATOR ', ')) AS msg
+        FROM tmp_Command_Button_Link t_COMMAND_BUTTON_LINK
+        LEFT JOIN parts.DOG_Colour COLOUR ON t_COMMAND_BUTTON_LINK.id_button_colour = COLOUR.id_colour
+        WHERE 
+                ISNULL(t_COMMAND_BUTTON_LINK.id_button_colour)
+            OR  ISNULL(COLOUR.id_colour)
+            OR  COLOUR.active = 0
+        ;
+    END IF;
+    -- id_location
+    IF EXISTS (
+        SELECT *
+        FROM tmp_Command_Button_Link t_COMMAND_BUTTON_LINK
+        LEFT JOIN demo.DOG_Location LOCATIONS ON t_COMMAND_BUTTON_LINK.id_location = LOCATIONS.id_location
+        WHERE 
+                ISNULL(t_COMMAND_BUTTON_LINK.id_location)
+            OR  ISNULL(LOCATIONS.id_location)
+            OR  LOCATIONS.active = 0
+    ) THEN
+        INSERT INTO tmp_Msg_Error (
+            id_type
+            , code
+            , msg
+        )
+        SELECT
+            v_id_type_error_bad_data
+            , v_code_type_error_bad_data
+            , CONCAT('The following Dog Location Link(s) do not have a valid Location: ', GROUP_CONCAT(t_COMMAND_BUTTON_LINK.name_error SEPARATOR ', ')) AS msg
+        FROM tmp_Command_Button_Link t_COMMAND_BUTTON_LINK
+        LEFT JOIN parts.DOG_Location LOCATIONS ON t_COMMAND_BUTTON_LINK.id_location = LOCATIONS.id_location
+        WHERE 
+                ISNULL(t_COMMAND_BUTTON_LINK.id_location)
+            OR  ISNULL(LOCATIONS.id_location)
+            OR  LOCATIONS.active = 0
+        ;
+    END IF;
+
+    -- Duplicates
+    INSERT INTO tmp_Command_Button_Link_Copy (
+        id_temp
+        , id_link
+        , id_command
+        , id_button_shape
+        , id_button_colour
+        , id_button_icon
+        , id_location
+        , active
+        , is_new
+        , name_error
+    )
+    SELECT 
+          t_COMMAND_BUTTON_LINK.id_temp
+        , t_COMMAND_BUTTON_LINK.id_link
+        , t_COMMAND_BUTTON_LINK.id_command
+        , t_COMMAND_BUTTON_LINK.id_button_shape
+        , t_COMMAND_BUTTON_LINK.id_button_colour
+        , t_COMMAND_BUTTON_LINK.id_button_icon
+        , t_COMMAND_BUTTON_LINK.id_location
+        , t_COMMAND_BUTTON_LINK.active
+        , t_COMMAND_BUTTON_LINK.is_new
+        , t_COMMAND_BUTTON_LINK.name_error
+    FROM tmp_Command_Button_Link t_COMMAND_BUTTON_LINK
+    ;
+
+    IF a_debug = 1 THEN
+        SELECT COUNT(*) AS Count_Temp_Link FROM tmp_Command_Button_Link;
+        SELECT COUNT(*) AS Count_Temp_Link_Copy FROM tmp_Command_Button_Link_Copy;
+
+        WITH 
+              Combined_Links AS (
+                SELECT 
+                      COMMAND_BUTTON_LINK.id_link
+                    , COMMAND_BUTTON_LINK.id_command
+                    , COMMAND_BUTTON_LINK.id_button_shape
+                    , COMMAND_BUTTON_LINK.id_button_colour
+                    , COMMAND_BUTTON_LINK.id_button_icon
+                    , COMMAND_BUTTON_LINK.id_location
+                    , IFNULL(
+                        t_COMMAND_BUTTON_LINK_COPY.name_error
+                        , CONCAT(
+                            COALESCE(COMMAND.name, t_COMMAND_BUTTON_LINK_COPY.id_command, '(No Command)')
+                            , ' - '
+                            , COALESCE(BUTTON_SHAPE.name, t_COMMAND_BUTTON_LINK_COPY.id_button_shape, '(No Button Shape)')
+                            , ' - '
+                            , COALESCE(COLOUR.name, t_COMMAND_BUTTON_LINK_COPY.id_button_colour, '(No Colour)')
+                            , ' - '
+                            , COALESCE(BUTTON_ICON.name, t_COMMAND_BUTTON_LINK_COPY.id_button_icon, '(No Button Icon)')
+                            , ' - '
+                            , COALESCE(LOCATIONS.name, t_COMMAND_BUTTON_LINK_COPY.id_location, '(No Location)')
+                        )
+                    ) AS name_error
+                FROM parts.DOG_Command_Button_Link COMMAND_BUTTON_LINK 
+                LEFT JOIN tmp_Command_Button_Link_Copy t_COMMAND_BUTTON_LINK_COPY 
+                    ON  COMMAND_BUTTON_LINK.id_command = t_COMMAND_BUTTON_LINK_COPY.id_command
+                    AND COMMAND_BUTTON_LINK.id_location = t_COMMAND_BUTTON_LINK_COPY.id_location
+                LEFT JOIN parts.DOG_Command COMMAND ON t_COMMAND_BUTTON_LINK_COPY.id_command = COMMAND.id_command
+                LEFT JOIN parts.DOG_Button_Shape BUTTON_SHAPE ON t_COMMAND_BUTTON_LINK_COPY.id_button_shape = BUTTON_SHAPE.id_button_shape
+                LEFT JOIN parts.DOG_Colour COLOUR ON t_COMMAND_BUTTON_LINK_COPY.id_button_colour = COLOUR.id_colour
+                LEFT JOIN parts.DOG_Button_Icon BUTTON_ICON ON t_COMMAND_BUTTON_LINK_COPY.id_button_icon = BUTTON_ICON.id_button_icon
+                LEFT JOIN parts.DOG_Location LOCATIONS ON t_COMMAND_BUTTON_LINK_COPY.id_location = LOCATIONS.id_location
+                WHERE t_COMMAND_BUTTON_LINK_COPY.is_new = 1
+                UNION
+                SELECT 
+                      t_COMMAND_BUTTON_LINK.id_link
+                    , t_COMMAND_BUTTON_LINK.id_command
+                    , t_COMMAND_BUTTON_LINK.id_button_shape
+                    , t_COMMAND_BUTTON_LINK.id_button_colour
+                    , t_COMMAND_BUTTON_LINK.id_button_icon
+                    , t_COMMAND_BUTTON_LINK.id_location
+                    , t_COMMAND_BUTTON_LINK.name_error
+                FROM tmp_Command_Button_Link t_COMMAND_BUTTON_LINK
+            )
+            , Duplicate_Link_Row_Numbers AS (
+                SELECT 
+                      COMBINED_LINK.id_link
+                    , COMBINED_LINK.id_command
+                    , COMBINED_LINK.id_button_shape
+                    , COMBINED_LINK.id_button_colour
+                    , COMBINED_LINK.id_button_icon
+                    , COMBINED_LINK.id_location
+                    , COMBINED_LINK.name_error
+                    , ROW_NUMBER() OVER (PARTITION BY COMBINED_LINK.id_command, COMBINED_LINK.id_location ORDER BY COMBINED_LINK.name_error ASC) AS index_link_as_duplicate
+                FROM Combined_Links COMBINED_LINK
+            )
+        SELECT *
+        FROM Duplicate_Link_Row_Numbers;
+    END IF;
+    
+    IF EXISTS (
+        WITH 
+              Combined_Links AS (
+                SELECT 
+                      COMMAND_BUTTON_LINK.id_link
+                    , COMMAND_BUTTON_LINK.id_command
+                    , COMMAND_BUTTON_LINK.id_button_shape
+                    , COMMAND_BUTTON_LINK.id_button_colour
+                    , COMMAND_BUTTON_LINK.id_button_icon
+                    , COMMAND_BUTTON_LINK.id_location
+                    , IFNULL(
+                        t_COMMAND_BUTTON_LINK_COPY.name_error
+                        , CONCAT(
+                            COALESCE(COMMAND.name, t_COMMAND_BUTTON_LINK_COPY.id_command, '(No Command)')
+                            , ' - '
+                            , COALESCE(BUTTON_SHAPE.name, t_COMMAND_BUTTON_LINK_COPY.id_button_shape, '(No Button Shape)')
+                            , ' - '
+                            , COALESCE(COLOUR.name, t_COMMAND_BUTTON_LINK_COPY.id_button_colour, '(No Colour)')
+                            , ' - '
+                            , COALESCE(BUTTON_ICON.name, t_COMMAND_BUTTON_LINK_COPY.id_button_icon, '(No Button Icon)')
+                            , ' - '
+                            , COALESCE(LOCATIONS.name, t_COMMAND_BUTTON_LINK_COPY.id_location, '(No Location)')
+                        )
+                    ) AS name_error
+                FROM parts.DOG_Command_Button_Link COMMAND_BUTTON_LINK 
+                LEFT JOIN tmp_Command_Button_Link_Copy t_COMMAND_BUTTON_LINK_COPY 
+                    ON  COMMAND_BUTTON_LINK.id_command = t_COMMAND_BUTTON_LINK_COPY.id_command
+                    AND COMMAND_BUTTON_LINK.id_location = t_COMMAND_BUTTON_LINK_COPY.id_location
+                LEFT JOIN parts.DOG_Command COMMAND ON t_COMMAND_BUTTON_LINK_COPY.id_command = COMMAND.id_command
+                LEFT JOIN parts.DOG_Button_Shape BUTTON_SHAPE ON t_COMMAND_BUTTON_LINK_COPY.id_button_shape = BUTTON_SHAPE.id_button_shape
+                LEFT JOIN parts.DOG_Colour COLOUR ON t_COMMAND_BUTTON_LINK_COPY.id_button_colour = COLOUR.id_colour
+                LEFT JOIN parts.DOG_Button_Icon BUTTON_ICON ON t_COMMAND_BUTTON_LINK_COPY.id_button_icon = BUTTON_ICON.id_button_icon
+                LEFT JOIN parts.DOG_Location LOCATIONS ON t_COMMAND_BUTTON_LINK_COPY.id_location = LOCATIONS.id_location
+                WHERE t_COMMAND_BUTTON_LINK_COPY.is_new = 1
+                UNION
+                SELECT 
+                      t_COMMAND_BUTTON_LINK.id_link
+                    , t_COMMAND_BUTTON_LINK.id_command
+                    , t_COMMAND_BUTTON_LINK.id_button_shape
+                    , t_COMMAND_BUTTON_LINK.id_button_colour
+                    , t_COMMAND_BUTTON_LINK.id_button_icon
+                    , t_COMMAND_BUTTON_LINK.id_location
+                    , t_COMMAND_BUTTON_LINK.name_error
+                FROM tmp_Command_Button_Link t_COMMAND_BUTTON_LINK
+            )
+            , Duplicate_Link_Row_Numbers AS (
+                SELECT 
+                      COMBINED_LINK.id_link
+                    , COMBINED_LINK.id_command
+                    , COMBINED_LINK.id_button_shape
+                    , COMBINED_LINK.id_button_colour
+                    , COMBINED_LINK.id_button_icon
+                    , COMBINED_LINK.id_location
+                    , COMBINED_LINK.name_error
+                    , ROW_NUMBER() OVER (PARTITION BY COMBINED_LINK.id_command, COMBINED_LINK.id_location ORDER BY COMBINED_LINK.name_error ASC) AS index_link_as_duplicate
+                FROM Combined_Links COMBINED_LINK
+            )
+        SELECT *
+        FROM Duplicate_Link_Row_Numbers DUPLICATE_LINK
+        WHERE DUPLICATE_LINK.index_link_as_duplicate > 1
+        GROUP BY 
+              DUPLICATE_LINK.id_command
+            , DUPLICATE_LINK.id_location
+    ) THEN
+        INSERT INTO tmp_Msg_Error (
+              id_type
+            , code
+            , msg
+        )
+        WITH 
+              Combined_Links AS (
+                SELECT 
+                      COMMAND_BUTTON_LINK.id_link
+                    , COMMAND_BUTTON_LINK.id_command
+                    , COMMAND_BUTTON_LINK.id_button_shape
+                    , COMMAND_BUTTON_LINK.id_button_colour
+                    , COMMAND_BUTTON_LINK.id_button_icon
+                    , COMMAND_BUTTON_LINK.id_location
+                    , IFNULL(
+                        t_COMMAND_BUTTON_LINK_COPY.name_error
+                        , CONCAT(
+                            COALESCE(COMMAND.name, t_COMMAND_BUTTON_LINK_COPY.id_command, '(No Command)')
+                            , ' - '
+                            , COALESCE(BUTTON_SHAPE.name, t_COMMAND_BUTTON_LINK_COPY.id_button_shape, '(No Button Shape)')
+                            , ' - '
+                            , COALESCE(COLOUR.name, t_COMMAND_BUTTON_LINK_COPY.id_button_colour, '(No Colour)')
+                            , ' - '
+                            , COALESCE(BUTTON_ICON.name, t_COMMAND_BUTTON_LINK_COPY.id_button_icon, '(No Button Icon)')
+                            , ' - '
+                            , COALESCE(LOCATIONS.name, t_COMMAND_BUTTON_LINK_COPY.id_location, '(No Location)')
+                        )
+                    ) AS name_error
+                FROM parts.DOG_Command_Button_Link COMMAND_BUTTON_LINK 
+                LEFT JOIN tmp_Command_Button_Link_Copy t_COMMAND_BUTTON_LINK_COPY 
+                    ON  COMMAND_BUTTON_LINK.id_command = t_COMMAND_BUTTON_LINK_COPY.id_command
+                    AND COMMAND_BUTTON_LINK.id_location = t_COMMAND_BUTTON_LINK_COPY.id_location
+                LEFT JOIN parts.DOG_Command COMMAND ON t_COMMAND_BUTTON_LINK_COPY.id_command = COMMAND.id_command
+                LEFT JOIN parts.DOG_Button_Shape BUTTON_SHAPE ON t_COMMAND_BUTTON_LINK_COPY.id_button_shape = BUTTON_SHAPE.id_button_shape
+                LEFT JOIN parts.DOG_Colour COLOUR ON t_COMMAND_BUTTON_LINK_COPY.id_button_colour = COLOUR.id_colour
+                LEFT JOIN parts.DOG_Button_Icon BUTTON_ICON ON t_COMMAND_BUTTON_LINK_COPY.id_button_icon = BUTTON_ICON.id_button_icon
+                LEFT JOIN parts.DOG_Location LOCATIONS ON t_COMMAND_BUTTON_LINK_COPY.id_location = LOCATIONS.id_location
+                WHERE t_COMMAND_BUTTON_LINK_COPY.is_new = 1
+                UNION
+                SELECT 
+                      t_COMMAND_BUTTON_LINK.id_link
+                    , t_COMMAND_BUTTON_LINK.id_command
+                    , t_COMMAND_BUTTON_LINK.id_button_shape
+                    , t_COMMAND_BUTTON_LINK.id_button_colour
+                    , t_COMMAND_BUTTON_LINK.id_button_icon
+                    , t_COMMAND_BUTTON_LINK.id_location
+                    , t_COMMAND_BUTTON_LINK.name_error
+                FROM tmp_Command_Button_Link t_COMMAND_BUTTON_LINK
+            )
+            , Duplicate_Link_Row_Numbers AS (
+                SELECT 
+                      COMBINED_LINK.id_link
+                    , COMBINED_LINK.id_command
+                    , COMBINED_LINK.id_button_shape
+                    , COMBINED_LINK.id_button_colour
+                    , COMBINED_LINK.id_button_icon
+                    , COMBINED_LINK.id_location
+                    , COMBINED_LINK.name_error
+                    , ROW_NUMBER() OVER (PARTITION BY COMBINED_LINK.id_command, COMBINED_LINK.id_location ORDER BY COMBINED_LINK.name_error ASC) AS index_link_as_duplicate
+                FROM Combined_Links COMBINED_LINK
+            )
+        SELECT
+              v_id_type_error_bad_data
+            , v_code_type_error_bad_data
+            , CONCAT('Attempt to create duplicate or overwrite existing Dog Command Links on: ', GROUP_CONCAT(DUPLICATE_LINK.name_error SEPARATOR ', ')) AS msg
+        FROM Duplicate_Link_Row_Numbers DUPLICATE_LINK
+        WHERE DUPLICATE_LINK.index_link_as_duplicate > 1
+        GROUP BY 
+              DUPLICATE_LINK.id_command
+            , DUPLICATE_LINK.id_location
+        ;
+    END IF;
+    
+    
+    -- Permissions
+    -- Can Create
+	CALL parts.p_dog_calc_user(
+          a_guid
+        , 0 -- get_all_user
+        , 0 -- get_inactive_user
+        , a_id_user -- ids_user
+        , '' -- a_auth0_ids_user
+        , '' -- a_names_user
+        , '' -- a_emails_user
+        , 1 -- a_require_all_id_search_filters_met
+        , 1 -- a_require_any_id_search_filters_met
+        , 0 -- a_require_all_non_id_search_filters_met
+        , 0 -- a_require_any_non_id_search_filters_met
+        , v_id_permission_dog_new -- ids_permission
+        , v_id_access_level_edit -- ids_access_level
+        , 0 -- a_show_errors
+        , 0 -- a_debug
+    );
+	
+    SELECT
+          IFNULL(CU_T.has_access, 0)
+    INTO
+          v_can_create
+    FROM parts.DOG_Calc_User_Temp CU_T
+    WHERE CU_T.GUID = a_guid
+    LIMIT 1
+    ;
+	
+	CALL parts.p_dog_clear_calc_user(
+		  a_guid
+        , 0 -- a_debug
+	);
+    
+    IF v_can_create = 0 THEN
+		DELETE t_ME
+        FROM tmp_Msg_Error t_ME
+        WHERE t_ME.id_type <> v_id_type_error_no_permission
+        ;
+		INSERT INTO tmp_Msg_Error (
+			  id_type
+            , code
+			, msg
+		)
+		VALUES (
+			  v_id_type_error_no_permission
+            , v_code_type_error_no_permission
+			, 'You do not have permission to edit Commands.'
+		)
+        ;
+    END IF;
+
+    IF EXISTS (SELECT * FROM tmp_Msg_Error t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+    	IF a_debug = 1 THEN
+	    	SELECT * from tmp_Command_Button_Link;
+	    END IF;
+
+        DELETE FROM tmp_Command_Button_Link;
+    END IF;
+
+    IF NOT EXISTS (SELECT * FROM tmp_Msg_Error t_ERROR INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
+		START TRANSACTION;
+		
+			INSERT INTO parts.DOG_Dog_Change_Set ( 
+                  comment
+                , id_user_updated_last_by
+                , updated_last_on
+            )
+			VALUES ( 
+                  a_comment
+                , a_id_user
+                , v_time_start
+            )
+			;
+			
+			SET v_id_change_set := LAST_INSERT_ID();
+			
+			UPDATE parts.DOG_Command_Button_Link COMMAND_BUTTON_LINK
+			INNER JOIN tmp_Command_Button_Link t_COMMAND_BUTTON_LINK 
+				ON  COMMAND_BUTTON_LINK.id_link = t_COMMAND_BUTTON_LINK.id_link
+				AND t_COMMAND_BUTTON_LINK.is_new = 0
+			SET 
+				  COMMAND_BUTTON_LINK.id_command = t_COMMAND_BUTTON_LINK.id_command
+				, COMMAND_BUTTON_LINK.id_button_shape = t_COMMAND_BUTTON_LINK.id_button_shape
+				, COMMAND_BUTTON_LINK.id_button_colour = t_COMMAND_BUTTON_LINK.id_button_colour
+				, COMMAND_BUTTON_LINK.id_button_icon = t_COMMAND_BUTTON_LINK.id_button_icon
+				, COMMAND_BUTTON_LINK.id_location = t_COMMAND_BUTTON_LINK.id_location
+				, COMMAND_BUTTON_LINK.active = t_COMMAND_BUTTON_LINK.active
+				, COMMAND_BUTTON_LINK.id_change_set = v_id_change_set
+			;
+			
+			INSERT INTO parts.DOG_Command_Button_Link (
+				  id_command
+				, id_button_shape
+				, id_button_colour
+				, id_button_icon
+				, id_location
+				, active
+				, id_user_created_by
+				, created_on
+			)
+			SELECT
+				  t_COMMAND_BUTTON_LINK.id_command                   AS id_command
+				, t_COMMAND_BUTTON_LINK.id_button_shape                     AS id_button_shape
+				, t_COMMAND_BUTTON_LINK.id_button_colour                     AS id_button_colour
+				, t_COMMAND_BUTTON_LINK.id_button_icon                     AS id_button_icon
+				, t_COMMAND_BUTTON_LINK.id_location                     AS id_location
+				, t_COMMAND_BUTTON_LINK.active                      AS active
+				, a_id_user                                     AS created_by
+				, v_time_start                                  AS created_on
+			FROM tmp_Command_Button_Link t_COMMAND_BUTTON_LINK
+			WHERE 
+				    t_COMMAND_BUTTON_LINK.is_new = 1
+				AND t_COMMAND_BUTTON_LINK.active = 1
+			;
+			
+		COMMIT;
+    END IF;
+	
+	START TRANSACTION;
+
+		DELETE FROM parts.DOG_Command_Button_Link_Temp
+		WHERE GUID = a_guid
+        ;
+		
+	COMMIT;
+    
+    -- Errors
+    SELECT 
+          t_ERROR.id_error
+		, t_ERROR.id_type
+        , t_ERROR.code
+        , ERROR_TYPE.name
+        , ERROR_TYPE.description
+        , ERROR_TYPE.is_breaking_error
+        , ERROR_TYPE.background_colour
+        , ERROR_TYPE.text_colour
+		, t_ERROR.msg
+    FROM tmp_Msg_Error t_ERROR
+	INNER JOIN parts.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
+	;
+    
+	IF a_debug = 1 THEN
+		SELECT * FROM tmp_Command_Button_Link;
+	END IF;
+
+    DROP TEMPORARY TABLE tmp_Command_Button_Link;
+    DROP TEMPORARY TABLE tmp_Msg_Error;
+    
+	IF a_debug = 1 THEN
+		CALL parts.p_core_debug_timing_reporting ( v_time_start );
+	END IF;
+END //
+DELIMITER ;
+
+
+
+/*
+
+
+SELECT * FROM demo.DOG_Command;
+SELECT * FROM demo.DOG_Button_Shape;
+SELECT * FROM demo.DOG_Colour;
+SELECT * FROM demo.DOG_Button_Icon;
+SELECT * FROM demo.DOG_Location;
+
+
+'ripplysipplenippletippledipplekipple'
+DELETE FROM parts.DOG_Command_Button_Link WHERE id_link > 740;
+* /
+delete
+from parts.DOG_Command_Button_Link_Audit
+where id_link > 768
+;
+delete
+from parts.DOG_Command_Button_Link
+where id_link > 768
+;
+delete
+from parts.DOG_Command_Button_Link_Temp
+;
+select 
+	*
+    -- COUNT(*)
+-- delete
+from parts.DOG_Command_Button_Link_Temp
+;
+select COUNT(*)
+from parts.DOG_Command_Button_Link_Temp
+;
+select 
+	*
+    -- COUNT(*)
+-- delete
+from parts.DOG_Command_Button_Link
+;
+select COUNT(*)
+from parts.DOG_Command_Button_Link
+;
+
+INSERT INTO parts.DOG_Command_Button_Link_Temp (
+      id_link
+    , id_command
+    , id_button_shape
+    , id_button_colour
+    , id_button_icon
+    , id_location
+    , active
+    , guid
+)
+VALUES (
+      -1 -- id_link
+    , 1 -- id_command
+    , 1 -- id_button_shape
+    , 1 -- id_button_colour
+    , 1 -- id_button_icon
+    , 1 -- id_location
+    , 1 -- active
+    , 'ripplysipplenippletippledipplekipple'
+);
+
+CALL parts.p_dog_save_command_button_link (
+	'nipples'
+    , 'ripplysipplenippletippledipplekipple'
+    , 1
+    , 1
+);
+
+
+select 
+	*
+    -- COUNT(*)
+-- delete
+from parts.DOG_Command_Button_Link_Temp
+;
+select COUNT(*)
+from parts.DOG_Command_Button_Link_Temp
+;
+select 
+	*
+    -- COUNT(*)
+-- delete
+from parts.DOG_Command_Button_Link
+;
+select COUNT(*)
+from parts.DOG_Command_Button_Link
+;
+
+*/

static/MySQL/deprecated/1230_tbl_DOG_Visual_Understanding_Level.sql

@@ -10,7 +10,7 @@ WHERE
 
 CREATE TABLE IF NOT EXISTS parts.DOG_Understanding_Level (
 	  id_understanding_level INT NOT NULL AUTO_INCREMENT PRIMARY KEY
-    , code VARCHAR(100) NOT NULL
+    , code VARCHAR(250) NOT NULL
     , name VARCHAR(250) NOT NULL
     , active BIT NOT NULL DEFAULT 1
 	, created_on DATETIME