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:
@@ -48,14 +48,15 @@ class Dog_Command_Link(SQLAlchemy_ABC, Base):
|
||||
self.command = None
|
||||
super().__init__()
|
||||
|
||||
def from_db_dog_command_link(query_row):
|
||||
@classmethod
|
||||
def from_db_dog_command_link(cls, query_row):
|
||||
_m = 'Dog_Command_Link.from_db_dog_command_link'
|
||||
dog_command_link = Dog_Command_Link()
|
||||
dog_command_link = cls()
|
||||
dog_command_link.id_link = query_row[0]
|
||||
dog_command_link.id_dog = query_row[1]
|
||||
#dog_command_link.id_command_category = query_row[3]
|
||||
dog_command_link.id_command = query_row[5]
|
||||
dog_command_link.hand_signal_description = query_row[8]
|
||||
dog_command_link.hand_signal_description = query_row[7]
|
||||
dog_command_link.notes = query_row[9]
|
||||
dog_command_link.active = av.input_bool(query_row[10], 'active', _m)
|
||||
# dog_command_link.created_on = query_row[7]
|
||||
@@ -140,58 +141,146 @@ class Dog_Command_Link_Temp(db.Model, Base):
|
||||
|
||||
|
||||
class Parameters_Dog_Command_Link(Get_Many_Parameters_Base):
|
||||
get_all_link: bool
|
||||
get_inactive_link: bool
|
||||
ids_link: str
|
||||
get_all_dog: bool
|
||||
get_inactive_dog: bool
|
||||
ids_dog: str
|
||||
names_dog: 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_descriptions_link: str
|
||||
notes_command: str
|
||||
notes_link: 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_dog = True
|
||||
get_all_link = True
|
||||
, get_inactive_link = False
|
||||
, ids_link = ''
|
||||
, get_all_dog = True
|
||||
, get_inactive_dog = False
|
||||
, ids_dog = ''
|
||||
, names_dog = ''
|
||||
, 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_descriptions_link = ''
|
||||
, notes_command = ''
|
||||
, notes_link = ''
|
||||
, 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_dog = json.get('a_get_all_dog', False)
|
||||
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_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_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_descriptions_link = json.get('a_hand_signal_descriptions_link', '')
|
||||
, notes_command = json.get('a_notes_command', '')
|
||||
, notes_link = json.get('a_notes_link', '')
|
||||
, 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_dog_command_link(cls, form):
|
||||
av.val_instance(form, 'form', 'Parameters_Dog_Command_Link.from_form_filters_dog_command_link', Filters_Dog_Command_Link)
|
||||
_m = f'{cls.__qualname__}.from_form_filters_dog_command_link'
|
||||
Helper_App.console_log(_m)
|
||||
Helper_App.console_log(f'Filters: {form}')
|
||||
av.val_instance(form, 'form', _m, Filters_Dog_Command_Link)
|
||||
has_filter_search_text = not (form.search.data == '' or form.search.data is None)
|
||||
has_filter_dog = not (has_filter_search_text or form.id_dog.data == '0' or form.id_dog.data == '' or form.id_dog.data is None)
|
||||
has_filter_command = not (has_filter_search_text or form.id_command.data == '0' or form.id_command.data == '' or form.id_command.data is None)
|
||||
active_only = av.input_bool(form.active_only.data, "active", "Parameters_Dog_Command_Link.from_form_filters_dog_command_link")
|
||||
return cls(
|
||||
get_all_dog = not has_filter_dog
|
||||
, get_inactive_dog = not active_only
|
||||
, ids_dog = form.id_dog.data if has_filter_dog else form.search.data if has_filter_search_text else ''
|
||||
, get_all_command = not has_filter_command
|
||||
, get_inactive_command = not active_only
|
||||
, ids_command = form.id_command.data if has_filter_command else form.search.data if has_filter_search_text else ''
|
||||
)
|
||||
has_filter_dog = not (form.id_dog.data == '0' or form.id_dog.data == '' or form.id_dog.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)
|
||||
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_dog: {has_filter_dog}
|
||||
has_filter_command_category: {has_filter_command_category}
|
||||
has_filter_command: {has_filter_command}
|
||||
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_dog = not has_filter_dog
|
||||
filters.get_inactive_dog = not active_only
|
||||
filters.ids_dog = form.id_dog.data if has_filter_dog else ''
|
||||
filters.names_dog = form.search.data if has_filter_search_text else ''
|
||||
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_descriptions_link = form.search.data if has_filter_search_text else ''
|
||||
# filters.notes_command = form.search.data if has_filter_search_text else ''
|
||||
filters.notes_link = form.search.data if has_filter_search_text else ''
|
||||
return filters
|
||||
|
||||
def to_json(self):
|
||||
return {
|
||||
'a_get_all_dog': self.get_all_dog
|
||||
'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_dog': self.get_all_dog
|
||||
, 'a_get_inactive_dog': self.get_inactive_dog
|
||||
, 'a_ids_dog': self.ids_dog
|
||||
, 'a_names_dog': self.names_dog
|
||||
, '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_descriptions_link': self.hand_signal_descriptions_link
|
||||
, 'a_notes_command': self.notes_command
|
||||
, 'a_notes_link': self.notes_link
|
||||
, '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
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user