Feat(SQL, UI): 1. Perfected architecture for modular Search functionality across heirarchical Get Many and Calc Stored Procedures that allows text search filtering on different fields as well as by record Id with control over how the filters are applied. \n 2. Updated User Calc and Get Many Stored Procedures with new Search functionality. \n 3. Improved styles on Dog Command Link page.
This commit is contained in:
@@ -1,15 +1,2 @@
|
||||
|
||||
{% if not is_blank_row %}
|
||||
<div
|
||||
class="{{ model.FLAG_COMMAND }}"
|
||||
{{ model.ATTR_VALUE_CURRENT }}="{{ command.id_command }}"
|
||||
{{ model.ATTR_VALUE_PREVIOUS }}="{{ command.id_command }}"
|
||||
>{{ command.name }}</div>
|
||||
{% else %}
|
||||
<select class="{{ model.FLAG_COMMAND }}" {{ model.ATTR_VALUE_CURRENT }}="0" {{ model.ATTR_VALUE_PREVIOUS }}="0">
|
||||
{% include 'components/common/inputs/_option_blank.html' %}
|
||||
{% for command in model.filter_commands %}
|
||||
<option value="{{ command.id_command }}">{{ command.name }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
{% endif %}
|
||||
<div class="{{ model.FLAG_COMMAND }}" >{% if not is_blank_row %}{{ command.name }}{% endif %}</div>
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
|
||||
<div class="{{ model.FLAG_COMMAND_CATEGORY }}" >{% if not is_blank_row %}{{ command_category.name }}{% endif %}</div>
|
||||
@@ -1,15 +1,2 @@
|
||||
|
||||
{% if not is_blank_row %}
|
||||
<div
|
||||
class="{{ model.FLAG_DOG }}"
|
||||
{{ model.ATTR_VALUE_CURRENT }}="{{ dog.id_dog }}"
|
||||
{{ model.ATTR_VALUE_PREVIOUS }}="{{ dog.id_dog }}"
|
||||
>{{ dog.name }}</div>
|
||||
{% else %}
|
||||
<select class="{{ model.FLAG_DOG }}" {{ model.ATTR_VALUE_CURRENT }}="0" {{ model.ATTR_VALUE_PREVIOUS }}="0">
|
||||
{% include 'components/common/inputs/_option_blank.html' %}
|
||||
{% for dog in model.filter_dogs %}
|
||||
<option value="{{ dog.id_dog }}">{{ dog.name }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
{% endif %}
|
||||
<div class="{{ model.FLAG_DOG }}" >{% if not is_blank_row %}{{ dog.name }}{% endif %}</div>
|
||||
|
||||
@@ -4,6 +4,9 @@
|
||||
<td class="{{ model.FLAG_DOG }}" {{ model.ATTR_VALUE_CURRENT }}="0" {{ model.ATTR_VALUE_PREVIOUS }}="0">
|
||||
{% include 'components/dog/_preview_DDL_dog.html' %}
|
||||
</td>
|
||||
<td class="{{ model.FLAG_COMMAND_CATEGORY }}" {{ model.ATTR_VALUE_CURRENT }}="0" {{ model.ATTR_VALUE_PREVIOUS }}="0">
|
||||
{% include 'components/dog/_preview_DDL_command_category.html' %}
|
||||
</td>
|
||||
<td class="{{ model.FLAG_COMMAND }}" {{ model.ATTR_VALUE_CURRENT }}="0" {{ model.ATTR_VALUE_PREVIOUS }}="0">
|
||||
{% include 'components/dog/_preview_DDL_command.html' %}
|
||||
</td>
|
||||
@@ -19,11 +22,15 @@
|
||||
{% else %}
|
||||
<tr class="{{ model.FLAG_DOG_COMMAND_LINK }}" {{ model.ATTR_ID_DOG_COMMAND_LINK }}="{{ link.id_link }}">
|
||||
{% set dog = link.dog %}
|
||||
<td class="{{ model.FLAG_DOG }}" {{ model.ATTR_VALUE_CURRENT }}="{{ link.id_dog }}" {{ model.ATTR_VALUE_PREVIOUS }}="{{ link.id_dog }}">
|
||||
<td class="{{ model.FLAG_DOG }}" {{ model.ATTR_VALUE_CURRENT }}="{{ dog.id_dog }}" {{ model.ATTR_VALUE_PREVIOUS }}="{{ dog.id_dog }}">
|
||||
{% include 'components/dog/_preview_DDL_dog.html' %}
|
||||
</td>
|
||||
{% set command_category = link.command.command_category %}
|
||||
<td class="{{ model.FLAG_COMMAND_CATEGORY }}" {{ model.ATTR_VALUE_CURRENT }}="{{ command_category.id_command_category }}" {{ model.ATTR_VALUE_PREVIOUS }}="{{ command_category.id_command_category }}">
|
||||
{% include 'components/dog/_preview_DDL_command_category.html' %}
|
||||
</td>
|
||||
{% set command = link.command %}
|
||||
<td class="{{ model.FLAG_COMMAND }}" {{ model.ATTR_VALUE_CURRENT }}="{{ link.id_command }}" {{ model.ATTR_VALUE_PREVIOUS }}="{{ link.id_command }}">
|
||||
<td class="{{ model.FLAG_COMMAND }}" {{ model.ATTR_VALUE_CURRENT }}="{{ command.id_command }}" {{ model.ATTR_VALUE_PREVIOUS }}="{{ command.id_command }}">
|
||||
{% include 'components/dog/_preview_DDL_command.html' %}
|
||||
</td>
|
||||
<td class="{{ model.FLAG_HAND_SIGNAL_DESCRIPTION}}" {{ model.ATTR_VALUE_CURRENT }}="{{ link.hand_signal_description }}" {{ model.ATTR_VALUE_PREVIOUS }}="{{ link.hand_signal_description }}">
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
|
||||
<div class="{{ model.FLAG_COMMAND }}" >{% if not is_blank_row %}{{ command.name }}{% endif %}</div>
|
||||
|
||||
{#
|
||||
{ % if not is_blank_row % }
|
||||
<div
|
||||
class="{{ model.FLAG_COMMAND }}"
|
||||
{#
|
||||
{{ model.ATTR_VALUE_CURRENT }}="{ { command.id_command } }"
|
||||
{{ model.ATTR_VALUE_PREVIOUS }}="{ { command.id_command } }"
|
||||
#}
|
||||
>{ { command.name } }</div>
|
||||
{ % else % }
|
||||
<select class="{{ model.FLAG_COMMAND }}"> {# {{ model.ATTR_VALUE_CURRENT }}="0" {{ model.ATTR_VALUE_PREVIOUS }}="0" #}
|
||||
{ % include 'components/common/inputs/_option_blank.html' % }
|
||||
{ % for command in model.filter_commands % }
|
||||
<option value="{ { command.id_command } }">{ { command.name } }</option>
|
||||
{ % endfor % }
|
||||
</select>
|
||||
{ % endif % }
|
||||
#}
|
||||
@@ -0,0 +1,21 @@
|
||||
|
||||
<div class="{{ model.FLAG_COMMAND_CATEGORY }}" >{% if not is_blank_row %}{{ command_category.name }}{% endif %}</div>
|
||||
|
||||
{#
|
||||
{ % if not is_blank_row % }
|
||||
<div
|
||||
class="{{ model.FLAG_COMMAND_CATEGORY }}"
|
||||
{#
|
||||
{{ model.ATTR_VALUE_CURRENT }}="{ { command_category.id_command_category } }"
|
||||
{{ model.ATTR_VALUE_PREVIOUS }}="{ { command_category.id_command_category } }"
|
||||
#}
|
||||
>{ { command_category.name } }</div>
|
||||
{ % else % }
|
||||
<select class="{{ model.FLAG_COMMAND_CATEGORY }}"> {# {{ model.ATTR_VALUE_CURRENT }}="0" {{ model.ATTR_VALUE_PREVIOUS }}="0" #}
|
||||
{ % include 'components/common/inputs/_option_blank.html' % }
|
||||
{ % for command_category in model.filter_command_categorys % }
|
||||
<option value="{ { command_category.id_command_category } }">{ { command_category.name } }</option>
|
||||
{ % endfor % }
|
||||
</select>
|
||||
{ % endif % }
|
||||
#}
|
||||
21
templates/components/dog/deprecated/_preview_DDL_dog.html
Normal file
21
templates/components/dog/deprecated/_preview_DDL_dog.html
Normal file
@@ -0,0 +1,21 @@
|
||||
|
||||
<div class="{{ model.FLAG_DOG }}" >{% if not is_blank_row %}{{ dog.name }}{% endif %}</div>
|
||||
|
||||
{#
|
||||
{ % if not is_blank_row % }
|
||||
<div
|
||||
class="{{ model.FLAG_DOG }}"
|
||||
{#
|
||||
{{ model.ATTR_VALUE_CURRENT }}="{ { dog.id_dog } }"
|
||||
{{ model.ATTR_VALUE_PREVIOUS }}="{ { dog.id_dog } }"
|
||||
#}
|
||||
>{ { dog.name } }</div>
|
||||
{ % else % }
|
||||
<select class="{{ model.FLAG_DOG }}"> {# {{ model.ATTR_VALUE_CURRENT }}="0" {{ model.ATTR_VALUE_PREVIOUS }}="0" #}
|
||||
{ % include 'components/common/inputs/_option_blank.html' % }
|
||||
{ % for dog in model.filter_dogs % }
|
||||
<option value="{ { dog.id_dog } }">{ { dog.name } }</option>
|
||||
{ % endfor % }
|
||||
</select>
|
||||
{ % endif % }
|
||||
#}
|
||||
Reference in New Issue
Block a user