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

templates/components/common/buttons/_buttons_save_cancel.html

@@ -1,15 +1,15 @@
 {% if block_id == 'button_save' %}
-<button id="{{ model.ID_BUTTON_SAVE }}" type="button" class="{{ model.FLAG_SUBMIT }} {{ model.FLAG_SAVE }}">Save</button>
+<button id="{{ model.ID_BUTTON_SAVE }}" type="button" class="{{ model.FLAG_SUBMIT }} {{ model.FLAG_SAVE }} {{ model.FLAG_BUTTON }} {{ model.FLAG_BUTTON_PRIMARY }}">Save</button>
 {% elif block_id == 'button_cancel' %}
-<button id="{{ model.ID_BUTTON_CANCEL }}" type="button" class="{{ model.FLAG_CANCEL }}">Cancel</button>
+<button id="{{ model.ID_BUTTON_CANCEL }}" type="button" class="{{ model.FLAG_CANCEL }} {{ model.FLAG_BUTTON }} {{ model.FLAG_BUTTON_PRIMARY }}">Cancel</button>
 {% elif block_id == 'button_add' %}
-<button type="button" class="{{ model.FLAG_ACTIVE }} {{ model.FLAG_ADD }}">+</button>
+<button type="button" class="{{ model.FLAG_ACTIVE }} {{ model.FLAG_ADD }} {{ model.FLAG_BUTTON }} {{ model.FLAG_BUTTON_PRIMARY }}">+</button>
 {% elif block_id == 'button_confirm' %}
-<button id="{{ model.ID_BUTTON_CONFIRM }}" type="button" class="{{ model.FLAG_SUBMIT }}">Confirm</button>
+<button id="{{ model.ID_BUTTON_CONFIRM }}" type="button" class="{{ model.FLAG_SUBMIT }} {{ model.FLAG_BUTTON }} {{ model.FLAG_BUTTON_PRIMARY }}">Confirm</button>
 {% elif block_id == 'button_get_in_touch' %}
-<button class="{{ model.FLAG_NAV_CONTACT }}" alt="Get in touch" aria-label="Get in touch">Get in touch</button>
+<button class="{{ model.FLAG_NAV_CONTACT }} {{ model.FLAG_BUTTON }} {{ model.FLAG_BUTTON_PRIMARY }}" alt="Get in touch" aria-label="Get in touch">Get in touch</button>
 {% elif block_id == 'button_apply_filters' %}
-<button id="{{ model.ID_BUTTON_APPLY_FILTERS }}" type="button" class="{{ model.FLAG_SUBMIT }}">Apply filters</button>
+<button id="{{ model.ID_BUTTON_APPLY_FILTERS }}" type="button" class="{{ model.FLAG_SUBMIT }} {{ model.FLAG_BUTTON }} {{ model.FLAG_BUTTON_PRIMARY }}">Apply filters</button>
 {% elif block_id == 'button_clear_filters' %}
 {% elif block_id == 'buttons_table_default' %}
 <div class="{{ model.FLAG_CONTAINER }} {{ model.FLAG_COLUMN }}">

templates/components/common/temporary/_overlay_confirm.html

@@ -1,4 +1,4 @@
-<div class="{{ model.FLAG_OVERLAY }} {{ model.FLAG_COLLAPSED }} {{ model.FLAG_CARD }}" id="{{ model.ID_OVERLAY_CONFIRM }}" style="visibility: hidden;" z-index="2">
+<div class="{{ model.FLAG_OVERLAY }} {{ model.FLAG_COLLAPSED }} {{ model.FLAG_CARD }} {{ model.FLAG_COLUMN }}" id="{{ model.ID_OVERLAY_CONFIRM }}" style="visibility: hidden;" z-index="2">
     <div class="{{ model.FLAG_CONTAINER }} {{ model.FLAG_ROW }}">
         <h2>Are you sure?</h2>
     </div>

templates/components/common/temporary/template_overlay.html

@@ -12,7 +12,7 @@
                 <h2>{{ overlay_title }}</h2>
             </div>
             <div class="{{ model.flag_container }} {{ model.flag_column }}">
-                <button class="{{ model.flag_btn_overlay_close }}">Close</button>
+                <button class="{{ model.FLAG_BUTTON }} {{ model.FLAG_BUTTON_PRIMARY }} {{ model.flag_btn_overlay_close }}">Close</button>
             </div>
         </div>
         <div class="{{ model.flag_container }} {{ model.flag_row }}">

templates/components/dog/_row_command.html

@@ -0,0 +1,61 @@
+
+{% if is_blank_row %}
+    <tr class="{{ model.FLAG_ROW_NEW }} {{ model.FLAG_COMMAND }}" {{ model.ATTR_ID_COMMAND }}>
+        <td class="{{ model.FLAG_COMMAND_CATEGORY }}">
+            {% include 'components/dog/_preview_DDL_command_category.html' %}
+        </td>
+        <td class="{{ model.FLAG_NAME }}">
+            <input type="text" 
+                class="{{ model.FLAG_NAME }}" 
+                {{ model.ATTR_VALUE_CURRENT }} {{ model.ATTR_VALUE_PREVIOUS }} />
+        </td>
+        <td class="{{ model.FLAG_HAND_SIGNAL_DEFAULT_DESCRIPTION }}">
+            <input type="text" 
+                class="{{ model.FLAG_HAND_SIGNAL_DEFAULT_DESCRIPTION }}" 
+                {{ model.ATTR_VALUE_CURRENT }} {{ model.ATTR_VALUE_PREVIOUS }} />
+        </td>
+        <td class="{{ model.FLAG_CAN_HAVE_BUTTON }}">
+            <input type="checkbox" checked class="{{ model.FLAG_CAN_HAVE_BUTTON }}" {{ model.ATTR_VALUE_CURRENT }} {{ model.ATTR_VALUE_PREVIOUS }} />
+        </td>
+        <td class="{{ model.FLAG_NOTES }}">
+            <input type="text" 
+                class="{{ model.FLAG_NOTES }}" 
+                {{ model.ATTR_VALUE_CURRENT }} {{ model.ATTR_VALUE_PREVIOUS }} />
+        </td>
+        {% set active = True %}
+        {% include 'components/dog/_td_active.html' %}
+    </tr>
+{% else %}
+    <tr class="{{ model.FLAG_COMMAND }}" {{ model.ATTR_ID_COMMAND }}="{{ command.id_command }}">
+        {% set command_category = command.command_category %}
+        <td class="{{ model.FLAG_COMMAND_CATEGORY }}">
+            {% include 'components/dog/_preview_DDL_command_category.html' %}
+        </td>
+        <td class="{{ model.FLAG_NAME }}">
+            <input type="text" 
+                class="{{ model.FLAG_NAME }}" 
+                {{ model.ATTR_VALUE_CURRENT }}="{{ model.format_null_string_as_blank(command.name)|escape }}" 
+                {{ model.ATTR_VALUE_PREVIOUS }}="{{ model.format_null_string_as_blank(command.name)|escape }}"
+                value="{{ model.format_null_string_as_blank(command.name) }}" />
+        </td>
+        <td class="{{ model.FLAG_HAND_SIGNAL_DEFAULT_DESCRIPTION }}">
+            <input type="text" 
+                class="{{ model.FLAG_HAND_SIGNAL_DEFAULT_DESCRIPTION }}" 
+                {{ model.ATTR_VALUE_CURRENT }}="{{ model.format_null_string_as_blank(command.hand_signal_default_description)|escape }}" 
+                {{ model.ATTR_VALUE_PREVIOUS }}="{{ model.format_null_string_as_blank(command.hand_signal_default_description)|escape }}"
+                value="{{ model.format_null_string_as_blank(command.hand_signal_default_description) }}" />
+        </td>
+        <td class="{{ model.FLAG_CAN_HAVE_BUTTON }}">
+            <input type="checkbox" {% if command.can_have_button %}checked{% endif %} class="{{ model.FLAG_CAN_HAVE_BUTTON }}" {{ model.ATTR_VALUE_CURRENT }}="{{ command.can_have_button|lower }}" {{ model.ATTR_VALUE_PREVIOUS }}="{{ command.can_have_button|lower }}" />
+        </td>
+        <td class="{{ model.FLAG_NOTES }}">
+            <input type="text" 
+                class="{{ model.FLAG_NOTES }}" 
+                {{ model.ATTR_VALUE_CURRENT }}="{{ model.format_null_string_as_blank(command.notes)|escape }}" 
+                {{ model.ATTR_VALUE_PREVIOUS }}="{{ model.format_null_string_as_blank(command.notes)|escape }}"
+                value="{{ model.format_null_string_as_blank(command.notes) }}" />
+        </td>
+        {% set active = command.active %}
+        {% include 'components/dog/_td_active.html' %}
+    </tr>
+{% endif %}

templates/components/dog/_row_command_category.html

@@ -0,0 +1,32 @@
+
+{% if is_blank_row %}
+    <tr class="{{ model.FLAG_ROW_NEW }} {{ model.FLAG_COMMAND_CATEGORY }}" {{ model.ATTR_ID_COMMAND_CATEGORY }}>
+        <td class="{{ model.FLAG_CODE }}">
+            <input type="text" class="{{ model.FLAG_CODE }}" 
+                {{ model.ATTR_VALUE_CURRENT }} {{ model.ATTR_VALUE_PREVIOUS }} />
+        </td>
+        <td class="{{ model.FLAG_NAME }}">
+            <input type="text" class="{{ model.FLAG_NAME }}" 
+                {{ model.ATTR_VALUE_CURRENT }} {{ model.ATTR_VALUE_PREVIOUS }} />
+        </td>
+        {% set active = True %}
+        {% include 'components/dog/_td_active.html' %}
+    </tr>
+{% else %}
+    <tr class="{{ model.FLAG_COMMAND_CATEGORY }}" {{ model.ATTR_ID_COMMAND_CATEGORY }}="{{ command_category.id_command_category }}">
+        <td class="{{ model.FLAG_CODE }}">
+            <input type="text" class="{{ model.FLAG_CODE }}" 
+                value="{{ model.format_null_string_as_blank(command_category.code)|escape }}"
+                {{ model.ATTR_VALUE_CURRENT }}="{{ model.format_null_string_as_blank(command_category.code)|escape }}" 
+                {{ model.ATTR_VALUE_PREVIOUS }}="{{ model.format_null_string_as_blank(command_category.code)|escape }}" />
+        </td>
+        <td class="{{ model.FLAG_NAME }}">
+            <input type="text" class="{{ model.FLAG_NAME }}" 
+                {{ model.ATTR_VALUE_CURRENT }}="{{ model.format_null_string_as_blank(command_category.name)|escape }}" 
+                {{ model.ATTR_VALUE_PREVIOUS }}="{{ model.format_null_string_as_blank(command_category.name)|escape }}"
+                value="{{ model.format_null_string_as_blank(command_category.name) }}" />
+        </td>
+        {% set active = command_category.active %}
+        {% include 'components/dog/_td_active.html' %}
+    </tr>
+{% endif %}

templates/components/dog/_row_dog_command_link.html

@@ -10,11 +10,15 @@
         <td class="{{ model.FLAG_COMMAND }}">
             {% include 'components/dog/_preview_DDL_command.html' %}
         </td>
-        <td class="{{ model.FLAG_HAND_SIGNAL_DESCRIPTION}}">
-            <textarea class="{{ model.FLAG_HAND_SIGNAL_DESCRIPTION }}" {{ model.ATTR_VALUE_CURRENT }} {{ model.ATTR_VALUE_PREVIOUS }}></textarea>
+        <td class="{{ model.FLAG_HAND_SIGNAL_DESCRIPTION }}">
+            <input type="text" 
+                class="{{ model.FLAG_HAND_SIGNAL_DESCRIPTION }}" 
+                {{ model.ATTR_VALUE_CURRENT }} {{ model.ATTR_VALUE_PREVIOUS }} />
         </td>
-        <td class="{{ model.FLAG_NOTES}}">
-            <textarea class="{{ model.FLAG_NOTES }}" {{ model.ATTR_VALUE_CURRENT }} {{ model.ATTR_VALUE_PREVIOUS }}></textarea>
+        <td class="{{ model.FLAG_NOTES }}">
+            <input type="text" 
+                class="{{ model.FLAG_NOTES }}" 
+                {{ model.ATTR_VALUE_CURRENT }} {{ model.ATTR_VALUE_PREVIOUS }} />
         </td>
         {% set active = True %}
         {% include 'components/dog/_td_active.html' %}
@@ -33,11 +37,19 @@
         <td class="{{ model.FLAG_COMMAND }}">
             {% include 'components/dog/_preview_DDL_command.html' %}
         </td>
-        <td class="{{ model.FLAG_HAND_SIGNAL_DESCRIPTION}}">
-            <textarea class="{{ model.FLAG_HAND_SIGNAL_DESCRIPTION }}" {{ model.ATTR_VALUE_CURRENT }}="{{ link.hand_signal_description|escape }}" {{ model.ATTR_VALUE_PREVIOUS }}="{{ link.hand_signal_description|escape }}">{{ link.hand_signal_description }}</textarea>
+        <td class="{{ model.FLAG_HAND_SIGNAL_DESCRIPTION }}">
+            <input type="text" 
+                class="{{ model.FLAG_HAND_SIGNAL_DESCRIPTION }}" 
+                {{ model.ATTR_VALUE_CURRENT }}="{{ model.format_null_string_as_blank(link.hand_signal_description)|escape }}" 
+                {{ model.ATTR_VALUE_PREVIOUS }}="{{ model.format_null_string_as_blank(link.hand_signal_description)|escape }}"
+                value="{{ model.format_null_string_as_blank(link.hand_signal_description) }}" />
         </td>
-        <td class="{{ model.FLAG_NOTES}}">
-            <textarea class="{{ model.FLAG_NOTES }}" {{ model.ATTR_VALUE_CURRENT }}="{{ link.notes|escape }}" {{ model.ATTR_VALUE_PREVIOUS }}="{{ link.notes|escape }}">{{ link.notes }}</textarea>
+        <td class="{{ model.FLAG_NOTES }}">
+            <input type="text" 
+                class="{{ model.FLAG_NOTES }}" 
+                {{ model.ATTR_VALUE_CURRENT }}="{{ model.format_null_string_as_blank(link.notes)|escape }}" 
+                {{ model.ATTR_VALUE_PREVIOUS }}="{{ model.format_null_string_as_blank(link.notes)|escape }}"
+                value="{{ model.format_null_string_as_blank(link.notes) }}" />
         </td>
         {% set active = link.active %}
         {% include 'components/dog/_td_active.html' %}

templates/layouts/layout.html

@@ -99,6 +99,7 @@
         var flagDirty = "{{ model.FLAG_DIRTY }}";
         var flagDisplayOrder = "{{ model.FLAG_DISPLAY_ORDER }}";
         var flagDog = "{{ model.FLAG_DOG }}";
+        var flagDogDogCommandLink = "{{ model.FLAG_DOG_DOG_COMMAND_LINK }}";
         var flagDragging = "dragging";
         var flagDragOver = "drag-over";
         var flagEdit = "{{ model.FLAG_EDIT }}";
@@ -128,6 +129,7 @@
         var flagNavAdminHome = "{{ model.FLAG_NAV_ADMIN_HOME }}";
         var flagNavContact = "{{ model.FLAG_NAV_CONTACT }}";
         var flagNavHome = "{{ model.FLAG_NAV_HOME }}";
+        var flagNavDogCommandCategories = "{{ model.FLAG_NAV_DOG_COMMAND_CATEGORIES }}";
         var flagNavDogCommands = "{{ model.FLAG_NAV_DOG_COMMANDS }}";
         var flagNavDogDogs = "{{ model.FLAG_NAV_DOG_DOGS }}";
         var flagNavDogDogCommandLinks = "{{ model.FLAG_NAV_DOG_DOG_COMMAND_LINKS }}";
@@ -165,6 +167,7 @@
         var hashPageContact = "{{ model.HASH_PAGE_CONTACT }}";
         var hashPageContactSuccess = "{{ model.HASH_PAGE_CONTACT_SUCCESS }}";
         var hashPageDataRetentionSchedule = "{{ model.HASH_PAGE_DATA_RETENTION_SCHEDULE }}";
+        var hashPageDogCommandCategories = "{{ model.HASH_PAGE_DOG_COMMAND_CATEGORIES }}";
         var hashPageDogCommands = "{{ model.HASH_PAGE_DOG_COMMANDS }}";
         var hashPageDogDogCommandLinks = "{{ model.HASH_PAGE_DOG_DOG_COMMAND_LINKS }}";
         var hashPageDogDogs = "{{ model.HASH_PAGE_DOG_DOGS }}";
@@ -177,6 +180,9 @@
         var hashPageUserAdmin = "{{ model.HASH_PAGE_USER_ADMIN }}";
         var hashPageUserLogin = "{{ model.HASH_PAGE_USER_LOGIN }}";
         var hashPageUserLogout = "{{ model.HASH_PAGE_USER_LOGOUT }}";
+        var hashSaveDogCommand = "{{ model.HASH_SAVE_DOG_COMMAND }}";
+        var hashSaveDogCommandCategory = "{{ model.HASH_SAVE_DOG_COMMAND_CATEGORY }}";
+        var hashSaveDogDogCommandLink = "{{ model.HASH_SAVE_DOG_DOG_COMMAND_LINK }}";
         var idButtonApplyFilters = "#{{ model.ID_BUTTON_APPLY_FILTERS }}";
         var idButtonHamburger = "#{{ model.ID_BUTTON_HAMBURGER }}";
         var idContainerTemplateElements = "#{{ model.ID_CONTAINER_TEMPLATE_ELEMENTS }}";
@@ -224,7 +230,7 @@
         </div>
         {#
         <div class="{{ model.FLAG_CONTAINER }}" style="width: 7vw; min-width: 7vw; max-width: 15vw; justify-content: flex-end; "> <!-- padding-left: 25%; -->
-            <button id="{{ model.ID_BUTTON_HAMBURGER }}" tabindex="1" alt="Hamburger menu button" aria-label="Hamburger menu button">☰</button>
+            <button id="{{ model.ID_BUTTON_HAMBURGER }}" class="{{ model.FLAG_BUTTON }} {{ model.FLAG_BUTTON_PRIMARY }}" tabindex="1" alt="Hamburger menu button" aria-label="Hamburger menu button">☰</button>
         </div>
         #}
     </div>

templates/pages/dog/_command_categories.html

@@ -0,0 +1,73 @@
+{% extends 'layouts/layout.html' %}
+
+{% block page_body %}
+    <link rel="stylesheet" href="{{ url_for('static', filename='dist/css/dog_command_categories.bundle.css') }}">
+    
+    <form id="{{ model.ID_FORM_FILTERS }}" class="{{ model.FLAG_FILTER }} {{ model.FLAG_ROW }} {{ model.FLAG_CARD }}">
+        {{ model.form_filters.hidden_tag() }}
+        <div class="{{ model.FLAG_CONTAINER }} {{ model.FLAG_COLUMN }}">
+            <div class="{{ model.FLAG_CONTAINER }} {{ model.FLAG_ROW }}">
+                <div class="{{ model.FLAG_CONTAINER_INPUT }} {{ model.FLAG_COLUMN }} {{ model.FLAG_FILTER }} {{ model.FLAG_SEARCH }}">
+                    {{ model.form_filters.search.label }}
+                    {{ model.form_filters.search() }}
+                    {% for error in model.form_filters.search.errors %}
+                        <p class="error">{{ error }}</p>
+                    {% endfor %}
+                </div>
+                <div class="{{ model.FLAG_CONTAINER_INPUT }} {{ model.FLAG_COLUMN }} {{ model.FLAG_FILTER }} {{ model.FLAG_ACTIVE_ONLY }}" {{ model.ATTR_VALUE_PREVIOUS }}="{{ model.form_filters.active_only.data }}">
+                    {{ model.form_filters.active_only.label }}
+                    {{ model.form_filters.active_only() }}
+                    {% for error in model.form_filters.active_only.errors %}
+                        <p class="error">{{ error }}</p>
+                    {% endfor %}
+                    {% set class_name = model.FLAG_FILTER + ' ' + model.FLAG_ACTIVE_ONLY + ' ' + model.FLAG_CHECKBOX %}
+                    {% include 'components/common/buttons/_icon_checkbox.html' %}
+                </div>
+            </div>
+        </div>
+        {% set block_id = 'buttons_table_default' %}
+        {% include 'components/common/buttons/_buttons_save_cancel.html' %}
+    </form>
+
+    <table id="{{ model.ID_TABLE_MAIN }}" class="{{ model.FLAG_ROW }} {{ model.FLAG_CARD }} {{ model.FLAG_COMMAND_CATEGORY }}">
+        <thead>
+            <tr class="{{ model.FLAG_COMMAND_CATEGORY }}">
+                <th class="{{ model.FLAG_CODE }}">Code</th>
+                <th class="{{ model.FLAG_NAME }}">Name</th>
+                <th class="{{ model.FLAG_ACTIVE }}">
+                    {% set class_name = model.FLAG_ACTIVE %}
+                    {% set attribute_text = '' %}
+                    {% include 'components/common/buttons/_icon_add.html' %}
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+            {% set is_blank_row = False %}
+            {% for command_category in model.command_categories %}
+                {% include 'components/dog/_row_command_category.html' %}
+            {% endfor %}
+
+            {% set is_blank_row = True %}
+            {% include 'components/dog/_row_command_category.html' %}
+        </tbody>
+    </table>
+    
+    {% include 'components/common/temporary/_overlay_confirm.html' %}
+    {% include 'components/common/temporary/_overlay_error.html' %}
+
+    <div id="{{ model.ID_CONTAINER_TEMPLATE_ELEMENTS }}">
+        <!-- Active column -->
+        <!-- Delete -->
+        {% set class_name = '' %}
+        {% include 'components/common/buttons/_icon_trash.html' %}
+        <!-- Undelete -->
+        {% set class_name = model.FLAG_ACTIVE %}
+        {% set attribute_text = '' %}
+        {% include 'components/common/buttons/_icon_add.html' %}
+    </div>
+
+    <script src="{{ url_for('routes_dog.scripts_section_dog') }}"></script>
+
+    <script>
+    </script>
+{% endblock %}

templates/pages/dog/_commands.html

@@ -0,0 +1,89 @@
+{% extends 'layouts/layout.html' %}
+
+{% block page_body %}
+    <link rel="stylesheet" href="{{ url_for('static', filename='dist/css/dog_commands.bundle.css') }}">
+    
+    <form id="{{ model.ID_FORM_FILTERS }}" class="{{ model.FLAG_FILTER }} {{ model.FLAG_ROW }} {{ model.FLAG_CARD }}">
+        {{ model.form_filters.hidden_tag() }}
+        <div class="{{ model.FLAG_CONTAINER }} {{ model.FLAG_COLUMN }}">
+            <div class="{{ model.FLAG_CONTAINER }} {{ model.FLAG_ROW }}">
+                <div class="{{ model.FLAG_CONTAINER_INPUT }} {{ model.FLAG_COLUMN }} {{ model.FLAG_FILTER }} {{ model.FLAG_SEARCH }}">
+                    {{ model.form_filters.search.label }}
+                    {{ model.form_filters.search() }}
+                    {% for error in model.form_filters.search.errors %}
+                        <p class="error">{{ error }}</p>
+                    {% endfor %}
+                </div>
+                <div class="{{ model.FLAG_CONTAINER_INPUT }} {{ model.FLAG_COLUMN }} {{ model.FLAG_FILTER }} {{ model.ATTR_ID_COMMAND_CATEGORY }}">
+                    {{ model.form_filters.id_command_category.label }}
+                    {{ model.form_filters.id_command_category() }}
+                    {% for error in model.form_filters.id_command_category.errors %}
+                        <p class="error">{{ error }}</p>
+                    {% endfor %}
+                </div>
+                <div class="{{ model.FLAG_CONTAINER_INPUT }} {{ model.FLAG_COLUMN }} {{ model.FLAG_FILTER }} {{ model.FLAG_ACTIVE_ONLY }}" {{ model.ATTR_VALUE_PREVIOUS }}="{{ model.form_filters.active_only.data }}">
+                    {{ model.form_filters.active_only.label }}
+                    {{ model.form_filters.active_only() }}
+                    {% for error in model.form_filters.active_only.errors %}
+                        <p class="error">{{ error }}</p>
+                    {% endfor %}
+                    {% set class_name = model.FLAG_FILTER + ' ' + model.FLAG_ACTIVE_ONLY + ' ' + model.FLAG_CHECKBOX %}
+                    {% include 'components/common/buttons/_icon_checkbox.html' %}
+                </div>
+            </div>
+        </div>
+        {% set block_id = 'buttons_table_default' %}
+        {% include 'components/common/buttons/_buttons_save_cancel.html' %}
+    </form>
+
+    <table id="{{ model.ID_TABLE_MAIN }}" class="{{ model.FLAG_ROW }} {{ model.FLAG_CARD }} {{ model.FLAG_COMMAND }}">
+        <thead>
+            <tr class="{{ model.FLAG_COMMAND }}">
+                <th class="{{ model.FLAG_COMMAND_CATEGORY }}">Command Category</th>
+                <th class="{{ model.FLAG_NAME }}">Command</th>
+                <th class="{{ model.FLAG_HAND_SIGNAL_DEFAULT_DESCRIPTION }}">Default Hand Signal</th>
+                <th class="{{ model.FLAG_CAN_HAVE_BUTTON }}">Can Have Button?</th>
+                <th class="{{ model.FLAG_NOTES }}">Notes</th>
+                <th class="{{ model.FLAG_ACTIVE }}">
+                    {% set class_name = model.FLAG_ACTIVE %}
+                    {% set attribute_text = '' %}
+                    {% include 'components/common/buttons/_icon_add.html' %}
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+            {% set is_blank_row = False %}
+            {% for command in model.commands %}
+                {% include 'components/dog/_row_command.html' %}
+            {% endfor %}
+
+            {% set is_blank_row = True %}
+            {% include 'components/dog/_row_command.html' %}
+        </tbody>
+    </table>
+    
+    {% include 'components/common/temporary/_overlay_confirm.html' %}
+    {% include 'components/common/temporary/_overlay_error.html' %}
+
+    <div id="{{ model.ID_CONTAINER_TEMPLATE_ELEMENTS }}">
+        <!-- Active column -->
+        <!-- Delete -->
+        {% set class_name = '' %}
+        {% include 'components/common/buttons/_icon_trash.html' %}
+        <!-- Undelete -->
+        {% set class_name = model.FLAG_ACTIVE %}
+        {% set attribute_text = '' %}
+        {% include 'components/common/buttons/_icon_add.html' %}
+    </div>
+
+    <script src="{{ url_for('routes_dog.scripts_section_dog') }}"></script>
+
+    <script>
+        {#
+            var dogCommandLinks = {{ model.convert_list_objects_to_dict_json_by_attribute_key_default(model.dog_command_links) | tojson | safe }};
+        #}
+        var filterCommandCategories = {{ model.convert_list_objects_to_dict_json_by_attribute_key_default(model.filter_command_categories) | tojson | safe }};
+        var flagCanHaveButton = "{{ model.FLAG_CAN_HAVE_BUTTON }}";
+        var flagHandSignalDefaultDescription = "{{ model.FLAG_HAND_SIGNAL_DEFAULT_DESCRIPTION }}";
+    </script>
+{% endblock %}

templates/pages/dog/_dog_command_links.html

@@ -93,15 +93,12 @@
     <script src="{{ url_for('routes_dog.scripts_section_dog') }}"></script>
 
     <script>
+        {#
+            var dogCommandLinks = {{ model.convert_list_objects_to_dict_json_by_attribute_key_default(model.dog_command_links) | tojson | safe }};
+        #}
         var filterCommandCategories = {{ model.convert_list_objects_to_dict_json_by_attribute_key_default(model.filter_command_categories) | tojson | safe }};
         var filterCommands = {{ model.convert_list_objects_to_dict_json_by_attribute_key_default(model.filter_commands) | tojson | safe }};
-        var filterDogCommandLinks = {{ model.convert_list_objects_to_dict_json_by_attribute_key_default(model.filter_dog_command_links) | tojson | safe }};
         var filterDogs = {{ model.convert_list_objects_to_dict_json_by_attribute_key_default(model.filter_dogs) | tojson | safe }};
         var flagHandSignalDescription = "{{ model.FLAG_HAND_SIGNAL_DESCRIPTION }}";
-
-        {#
-        var accessLevels = {{ model.convert_list_objects_to_dict_json_by_attribute_key_default(model.access_levels) | tojson | safe }};
-        var flagIsNotEmpty = "{{ model.FLAG_IS_NOT_EMPTY }}";
-        #}
     </script>
 {% endblock %}

templates/pages/dog/_home.html

@@ -9,13 +9,16 @@
         <div class="{{ model.FLAG_CONTAINER }} {{ model.FLAG_COLUMN }}">
             <h2>Dog</h2>
             <div class="{{ model.FLAG_CONTAINER }} {{ model.FLAG_ROW }}">
-                <button class="{{ model.FLAG_NAV_DOG_DOGS }}">Dogs</button>
+                <button class="{{ model.FLAG_NAV_DOG_DOGS }} {{ model.FLAG_BUTTON }} {{ model.FLAG_BUTTON_PRIMARY }}">Dogs</button>
             </div>
             <div class="{{ model.FLAG_CONTAINER }} {{ model.FLAG_ROW }}">
-                <button class="{{ model.FLAG_NAV_DOG_COMMANDS }}">Commands</button>
+                <button class="{{ model.FLAG_NAV_DOG_COMMAND_CATEGORIES }} {{ model.FLAG_BUTTON }} {{ model.FLAG_BUTTON_PRIMARY }}">Command Categories</button>
             </div>
             <div class="{{ model.FLAG_CONTAINER }} {{ model.FLAG_ROW }}">
-                <button class="{{ model.FLAG_NAV_DOG_DOG_COMMAND_LINKS }}">Dog Command Links</button>
+                <button class="{{ model.FLAG_NAV_DOG_COMMANDS }} {{ model.FLAG_BUTTON }} {{ model.FLAG_BUTTON_PRIMARY }}">Commands</button>
+            </div>
+            <div class="{{ model.FLAG_CONTAINER }} {{ model.FLAG_ROW }}">
+                <button class="{{ model.FLAG_NAV_DOG_DOG_COMMAND_LINKS }} {{ model.FLAG_BUTTON }} {{ model.FLAG_BUTTON_PRIMARY }}">Dog Command Links</button>
             </div>
         </div>
     </div>