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

Feat: Architecture redesign for Assessments, Commands, Modalities, Training Techniques, Reinforcement Schedules, Distractions, and Assessment Responses.

Browse Source
This commit is contained in:
Teddy Middleton-Smith
2025-09-06 12:13:16 +01:00
parent 12f5fc994f
commit 2da465935d
158 changed files with 14781 additions and 3477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

282
business_objects/dog/assessment_command_modality_link.py
View File

@@ -10,14 +10,15 @@ Feature: Assessment_Command_Modality_Link Command Modality Link Business Obje
# internal
from business_objects.base import Base
from business_objects.dog.assessment import Assessment
from business_objects.dog.bribe import Bribe
from business_objects.dog.assessment_command_link import Assessment_Command_Link
# from business_objects.dog.bribe import Bribe
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.command import Command
from business_objects.dog.command_modality import Command_Modality
from business_objects.dog.obedience_level import Obedience_Level
# from business_objects.dog.obedience_level import Obedience_Level
from business_objects.dog.reinforcement_schedule import Reinforcement_Schedule
from business_objects.dog.user import User
from extensions import db
from forms.dog.assessment import Filters_Assessment
@@ -31,14 +32,7 @@ from typing import ClassVar, Optional
class Assessment_Command_Modality_Link(SQLAlchemy_ABC, Base):
ATTR_ID_ASSESSMENT_COMMAND_MODALITY_LINK: ClassVar[str] = 'id_link'
FLAG_ASSESSMENT_COMMAND_MODALITY_LINK: ClassVar[str] = Assessment.FLAG_ASSESSMENT_COMMAND_MODALITY_LINK
FLAG_ASSESSMENT_RESPONSE: ClassVar[str] = 'assessment_response'
FLAG_DISTANCE_FROM_HANDLER_METRES: ClassVar[str] = 'distance-from-handler-metres'
FLAG_IS_IN_HEARING_RANGE_OF_HANDLER: ClassVar[str] = 'is-in-hearing-range-of-handler'
FLAG_IS_IN_SCENT_RANGE_OF_HANDLER: ClassVar[str] = 'is-in-scent-range-of-handler'
FLAG_IS_IN_SIGHT_OF_HANDLER: ClassVar[str] = 'is-in-sight-of-handler'
FLAG_IS_ON_LEAD: ClassVar[str] = 'is-on-lead'
FLAG_TRIAL_COUNT: ClassVar[str] = 'trial-count'
FLAG_ASSESSMENT_COMMAND_MODALITY_LINK: ClassVar[str] = Assessment_Command_Link.FLAG_ASSESSMENT_COMMAND_MODALITY_LINK
NAME_ATTR_OPTION_VALUE: ClassVar[str] = ATTR_ID_ASSESSMENT_COMMAND_MODALITY_LINK
NAME_ATTR_OPTION_TEXT: ClassVar[str] = ATTR_ID_ASSESSMENT_COMMAND_MODALITY_LINK
@@ -46,27 +40,16 @@ class Assessment_Command_Modality_Link(SQLAlchemy_ABC, Base):
__table_args__ = { 'extend_existing': True }
id_link = db.Column(db.Integer, primary_key=True)
id_assessment = db.Column(db.Integer)
id_command = db.Column(db.Integer)
id_assessment_command_link = db.Column(db.Integer)
id_command_modality = db.Column(db.Integer)
id_bribe = db.Column(db.Integer)
distance_from_handler_metres = db.Column(db.Float)
is_in_hearing_range_of_handler = db.Column(db.Boolean)
is_in_scent_range_of_handler = db.Column(db.Boolean)
is_in_sight_of_handler = db.Column(db.Boolean)
is_on_lead = db.Column(db.Boolean)
trial_count = 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.assessment = None
self.command = None
self.assessment_command_link = None
self.command_modality = None
self.bribe = None
self.assessment_responses = None
super().__init__()
@classmethod
@@ -74,22 +57,12 @@ class Assessment_Command_Modality_Link(SQLAlchemy_ABC, Base):
_m = f'{cls.__qualname__}.from_db_assessment_command_modality_link'
assessment_command_modality_link = cls()
assessment_command_modality_link.id_link = query_row[0]
assessment_command_modality_link.id_assessment = query_row[1]
assessment_command_modality_link.id_command = query_row[5]
assessment_command_modality_link.id_assessment_command_link = query_row[1]
assessment_command_modality_link.id_command_modality = query_row[7]
assessment_command_modality_link.id_bribe = query_row[9]
assessment_command_modality_link.distance_from_handler_metres = query_row[11]
assessment_command_modality_link.is_in_hearing_range_of_handler = av.input_bool(query_row[12], 'is_in_hearing_range_of_handler', _m)
assessment_command_modality_link.is_in_scent_range_of_handler = av.input_bool(query_row[13], 'is_in_scent_range_of_handler', _m)
assessment_command_modality_link.is_in_sight_of_handler = av.input_bool(query_row[14], 'is_in_sight_of_handler', _m)
assessment_command_modality_link.is_on_lead = av.input_bool(query_row[15], 'is_on_lead', _m)
assessment_command_modality_link.trial_count = query_row[16]
assessment_command_modality_link.active = av.input_bool(query_row[17], 'active', _m)
assessment_command_modality_link.assessment = Assessment.from_db_assessment_command_modality_link(query_row)
assessment_command_modality_link.command = Command.from_db_assessment_command_modality_link(query_row)
assessment_command_modality_link.assessment_command_link = Assessment_Command_Link.from_db_assessment_command_modality_link(query_row)
assessment_command_modality_link.command_modality = Command_Modality.from_db_assessment_command_modality_link(query_row)
assessment_command_modality_link.bribe = Bribe.from_db_assessment_command_modality_link(query_row)
return assessment_command_modality_link
@classmethod
@@ -105,16 +78,8 @@ class Assessment_Command_Modality_Link(SQLAlchemy_ABC, Base):
assessment_command_modality_link = cls()
if json is None: return assessment_command_modality_link
assessment_command_modality_link.id_link = json.get(Assessment_Command_Modality_Link.ATTR_ID_ASSESSMENT_COMMAND_MODALITY_LINK, -1)
assessment_command_modality_link.id_assessment = json[Assessment.ATTR_ID_ASSESSMENT]
assessment_command_modality_link.id_command = json[Command.ATTR_ID_COMMAND]
assessment_command_modality_link.id_assessment_command_link = json[Assessment.ATTR_ID_ASSESSMENT_COMMAND_LINK]
assessment_command_modality_link.id_command_modality = json[Command_Modality.ATTR_ID_COMMAND_MODALITY]
assessment_command_modality_link.id_bribe = json[Bribe.ATTR_ID_BRIBE]
assessment_command_modality_link.distance_from_handler_metres = json[cls.FLAG_DISTANCE_FROM_HANDLER_METRES]
assessment_command_modality_link.is_in_hearing_range_of_handler = av.input_bool(json[cls.FLAG_IS_IN_HEARING_RANGE_OF_HANDLER], cls.FLAG_IS_IN_HEARING_RANGE_OF_HANDLER, _m)
assessment_command_modality_link.is_in_scent_range_of_handler = av.input_bool(json[cls.FLAG_IS_IN_SCENT_RANGE_OF_HANDLER], cls.FLAG_IS_IN_SCENT_RANGE_OF_HANDLER, _m)
assessment_command_modality_link.is_in_sight_of_handler = av.input_bool(json[cls.FLAG_IS_IN_SIGHT_OF_HANDLER], cls.FLAG_IS_IN_SIGHT_OF_HANDLER, _m)
assessment_command_modality_link.is_on_lead = av.input_bool(json[cls.FLAG_IS_ON_LEAD], cls.FLAG_IS_ON_LEAD, _m)
assessment_command_modality_link.trial_count = json.get(cls.FLAG_TRIAL_COUNT)
assessment_command_modality_link.active = av.input_bool(json[cls.FLAG_ACTIVE], cls.FLAG_ACTIVE, _m)
assessment_command_modality_link.created_on = json.get(cls.FLAG_CREATED_ON, None)
return assessment_command_modality_link
@@ -123,16 +88,8 @@ class Assessment_Command_Modality_Link(SQLAlchemy_ABC, Base):
as_json = {
**self.get_shared_json_attributes(self)
, self.ATTR_ID_ASSESSMENT_COMMAND_MODALITY_LINK: self.id_link
, Assessment.ATTR_ID_ASSESSMENT: { Assessment.ATTR_ID_ASSESSMENT: None } if self.assessment is None else self.assessment.to_json()
, Command.ATTR_ID_COMMAND: { Command.ATTR_ID_COMMAND: None } if self.command is None else self.command.to_json()
, Assessment.ATTR_ID_ASSESSMENT_COMMAND_LINK: { Assessment.ATTR_ID_ASSESSMENT_COMMAND_LINK: None } if self.assessment_command_link is None else self.assessment_command_link.to_json()
, Command_Modality.ATTR_ID_COMMAND_MODALITY: { Command_Modality.ATTR_ID_COMMAND_MODALITY: None } if self.command_modality is None else self.command_modality.to_json()
, Bribe.FLAG_BRIBE: { Bribe.FLAG_BRIBE: None } if self.bribe is None else self.bribe.to_json()
, self.FLAG_DISTANCE_FROM_HANDLER_METRES: self.distance_from_handler_metres
, self.FLAG_IS_IN_HEARING_RANGE_OF_HANDLER: self.is_in_hearing_range_of_handler
, self.FLAG_IS_IN_SCENT_RANGE_OF_HANDLER: self.is_in_scent_range_of_handler
, self.FLAG_IS_IN_SIGHT_OF_HANDLER: self.is_in_sight_of_handler
, self.FLAG_IS_ON_LEAD: self.is_on_lead
, self.FLAG_TRIAL_COUNT: self.trial_count
, self.FLAG_ACTIVE: self.active
, self.FLAG_CREATED_ON: self.created_on
, self.FLAG_ASSESSMENT_RESPONSE: [] if self.assessment_responses is None else [response.to_json() for response in self.assessment_responses]
@@ -143,16 +100,8 @@ class Assessment_Command_Modality_Link(SQLAlchemy_ABC, Base):
return f'''
{self.__class__.__name__}(
{self.FLAG_ASSESSMENT_COMMAND_MODALITY_LINK}: {self.id_link}
{Assessment.FLAG_ASSESSMENT}: {self.assessment}
{Command.FLAG_COMMAND}: {self.command}
{Assessment_Command_Link.FLAG_ASSESSMENT_COMMAND_LINK}: {self.assessment_command_link}
{Command_Modality.FLAG_COMMAND_MODALITY}: {self.command_modality}
{Bribe.FLAG_BRIBE}: {self.bribe}
{self.FLAG_DISTANCE_FROM_HANDLER_METRES}: {self.distance_from_handler_metres}
{self.FLAG_IS_IN_HEARING_RANGE_OF_HANDLER}: {self.is_in_hearing_range_of_handler}
{self.FLAG_IS_IN_SCENT_RANGE_OF_HANDLER}: {self.is_in_scent_range_of_handler}
{self.FLAG_IS_IN_SIGHT_OF_HANDLER}: {self.is_in_sight_of_handler}
{self.FLAG_IS_ON_LEAD}: {self.is_on_lead}
{self.FLAG_TRIAL_COUNT}: {self.trial_count}
{self.FLAG_ACTIVE}: {self.active}
{self.FLAG_CREATED_ON}: {self.created_on}
)
@@ -164,16 +113,8 @@ class Assessment_Command_Modality_Link_Temp(db.Model, Base):
__table_args__ = { 'extend_existing': True }
id_temp = db.Column(db.Integer, primary_key=True)
id_link = db.Column(db.Integer)
id_assessment = db.Column(db.Integer)
id_command = db.Column(db.Integer)
id_assessment_command_link = db.Column(db.Integer)
id_command_modality = db.Column(db.Integer)
id_bribe = db.Column(db.Integer)
distance_from_handler_metres = db.Column(db.Float)
is_in_hearing_range_of_handler = db.Column(db.Boolean)
is_in_scent_range_of_handler = db.Column(db.Boolean)
is_in_sight_of_handler = db.Column(db.Boolean)
is_on_lead = db.Column(db.Boolean)
trial_count = db.Column(db.Integer)
active = db.Column(db.Boolean)
# created_on = db.Column(db.DateTime)
guid: str = db.Column(db.String(36))
@@ -186,16 +127,8 @@ class Assessment_Command_Modality_Link_Temp(db.Model, Base):
_m = f'{cls.__qualname__}.from_assessment_command_modality_link'
temp = cls()
temp.id_link = assessment_command_modality_link.id_link
temp.id_assessment = assessment_command_modality_link.id_assessment
temp.id_command = assessment_command_modality_link.id_command
temp.id_assessment_command_link = assessment_command_modality_link.id_assessment_command_link
temp.id_command_modality = assessment_command_modality_link.id_command_modality
temp.id_bribe = assessment_command_modality_link.id_bribe
temp.distance_from_handler_metres = assessment_command_modality_link.distance_from_handler_metres
temp.is_in_hearing_range_of_handler = assessment_command_modality_link.is_in_hearing_range_of_handler
temp.is_in_scent_range_of_handler = assessment_command_modality_link.is_in_scent_range_of_handler
temp.is_in_sight_of_handler = assessment_command_modality_link.is_in_sight_of_handler
temp.is_on_lead = assessment_command_modality_link.is_on_lead
temp.trial_count = assessment_command_modality_link.trial_count
temp.active = assessment_command_modality_link.active
# temp.created_on = assessment_command_modality_link.created_on
return temp
@@ -205,14 +138,18 @@ class Parameters_Assessment_Command_Modality_Link(Get_Many_Parameters_Base):
get_all_link: bool
get_inactive_link: bool
ids_link: str
min_distance_from_handler_metres_link: Optional[float]
max_distance_from_handler_metres_link: Optional[float]
value_is_in_sight_of_handler_link: Optional[bool]
value_is_in_scent_range_of_handler_link: Optional[bool]
value_is_in_hearing_range_of_handler_link: Optional[bool]
value_is_on_lead_link: Optional[bool]
min_trial_count_link: Optional[float]
max_trial_count_link: Optional[float]
get_all_AC_link: bool
get_inactive_AC_link: bool
ids_AC_link: str
min_distance_from_handler_metres_AC_link: Optional[float]
max_distance_from_handler_metres_AC_link: Optional[float]
value_is_in_sight_of_handler_AC_link: Optional[bool]
value_is_in_scent_range_of_handler_AC_link: Optional[bool]
value_is_in_hearing_range_of_handler_AC_link: Optional[bool]
value_is_on_lead_AC_link: Optional[bool]
min_trial_count_AC_link: Optional[float]
max_trial_count_AC_link: Optional[float]
get_all_assessment: bool
get_inactive_assessment: bool
@@ -220,6 +157,10 @@ class Parameters_Assessment_Command_Modality_Link(Get_Many_Parameters_Base):
notes_assessment: str
min_temperature_assessment: Optional[float]
max_temperature_assessment: Optional[float]
get_all_assessment_type: bool
get_inactive_assessment_type: bool
ids_assessment_type: str
names_assessment_type: str
get_all_weather: bool
get_inactive_weather: bool
ids_weather: str
@@ -250,16 +191,16 @@ class Parameters_Assessment_Command_Modality_Link(Get_Many_Parameters_Base):
hand_signal_default_descriptions_command: str
notes_command: str
get_all_reinforcement_schedule: bool
get_inactive_reinforcement_schedule: bool
ids_reinforcement_schedule: str
names_reinforcement_schedule: str
get_all_command_modality: bool
get_inactive_command_modality: bool
ids_command_modality: str
names_command_modality: str
get_all_bribe: bool
get_inactive_bribe: bool
ids_bribe: str
names_bribe: str
require_all_id_search_filters_met: bool
require_any_id_search_filters_met: bool
require_all_non_id_search_filters_met: bool
@@ -271,14 +212,17 @@ class Parameters_Assessment_Command_Modality_Link(Get_Many_Parameters_Base):
get_all_link = True
, get_inactive_link = False
, ids_link = ''
, min_distance_from_handler_metres_link = None
, max_distance_from_handler_metres_link = None
, value_is_in_sight_of_handler_link = None
, value_is_in_scent_range_of_handler_link = None
, value_is_in_hearing_range_of_handler_link = None
, value_is_on_lead_link = None
, min_trial_count_link = None
, max_trial_count_link = None
, get_all_AC_link = True
, get_inactive_AC_link = False
, ids_AC_link = ''
, min_distance_from_handler_metres_AC_link = None
, max_distance_from_handler_metres_AC_link = None
, value_is_in_sight_of_handler_AC_link = None
, value_is_in_scent_range_of_handler_AC_link = None
, value_is_in_hearing_range_of_handler_AC_link = None
, value_is_on_lead_AC_link = None
, min_trial_count_AC_link = None
, max_trial_count_AC_link = None
, get_all_assessment = True
, get_inactive_assessment = False
@@ -286,6 +230,10 @@ class Parameters_Assessment_Command_Modality_Link(Get_Many_Parameters_Base):
, notes_assessment = ''
, min_temperature_assessment = None
, max_temperature_assessment = None
, get_all_assessment_type = True
, get_inactive_assessment_type = False
, ids_assessment_type = ''
, names_assessment_type = ''
, get_all_weather = True
, get_inactive_weather = False
, ids_weather = ''
@@ -316,16 +264,16 @@ class Parameters_Assessment_Command_Modality_Link(Get_Many_Parameters_Base):
, hand_signal_default_descriptions_command = ''
, notes_command = ''
, get_all_reinforcement_schedule = True
, get_inactive_reinforcement_schedule = False
, ids_reinforcement_schedule = ''
, names_reinforcement_schedule = ''
, get_all_command_modality = True
, get_inactive_command_modality = False
, ids_command_modality = ''
, names_command_modality = ''
, get_all_bribe = True
, get_inactive_bribe = False
, ids_bribe = ''
, names_bribe = ''
, require_all_id_search_filters_met = True
, require_any_id_search_filters_met = True
, require_all_non_id_search_filters_met = False
@@ -338,15 +286,18 @@ class Parameters_Assessment_Command_Modality_Link(Get_Many_Parameters_Base):
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', '')
, notes_assessment_command_modality_link = json.get('a_notes_assessment_command_modality_link', '')
, min_distance_from_handler_metres_link = json.get('a_min_distance_from_handler_metres_link', None)
, max_distance_from_handler_metres_link = json.get('a_max_distance_from_handler_metres_link', None)
, value_is_in_sight_of_handler_link = json.get('a_value_is_in_sight_of_handler_link', None)
, value_is_in_scent_range_of_handler_link = json.get('a_value_is_in_scent_range_of_handler_link', None)
, value_is_in_hearing_range_of_handler_link = json.get('a_value_is_in_hearing_range_of_handler_link', None)
, value_is_on_lead_link = json.get('a_value_is_on_lead_link', None)
, min_trial_count_link = json.get('a_min_trial_count_link', None)
, max_trial_count_link = json.get('a_max_trial_count_link', None)
, get_all_AC_link = json.get('a_get_all_AC_link', False)
, get_inactive_AC_link = json.get('a_get_inactive_AC_link', False)
, ids_AC_link = json.get('a_ids_AC_link', '')
, notes_assessment_command_modality_AC_link = json.get('a_notes_assessment_command_modality_AC_link', '')
, min_distance_from_handler_metres_AC_link = json.get('a_min_distance_from_handler_metres_AC_link', None)
, max_distance_from_handler_metres_AC_link = json.get('a_max_distance_from_handler_metres_AC_link', None)
, value_is_in_sight_of_handler_AC_link = json.get('a_value_is_in_sight_of_handler_AC_link', None)
, value_is_in_scent_range_of_handler_AC_link = json.get('a_value_is_in_scent_range_of_handler_AC_link', None)
, value_is_in_hearing_range_of_handler_AC_link = json.get('a_value_is_in_hearing_range_of_handler_AC_link', None)
, value_is_on_lead_AC_link = json.get('a_value_is_on_lead_AC_link', None)
, min_trial_count_AC_link = json.get('a_min_trial_count_AC_link', None)
, max_trial_count_AC_link = json.get('a_max_trial_count_AC_link', None)
, get_all_assessment = json.get('a_get_all_assessment', False)
, get_inactive_assessment = json.get('a_get_inactive_assessment', False)
@@ -354,6 +305,10 @@ class Parameters_Assessment_Command_Modality_Link(Get_Many_Parameters_Base):
, notes_assessment = json.get('a_notes_assessment', '')
, min_temperature_assessment = json.get('a_min_temperature_assessment', None)
, max_temperature_assessment = json.get('a_max_temperature_assessment', None)
, get_all_assessment_type = json.get('a_get_all_assessment_type', False)
, get_inactive_assessment_type = json.get('a_get_inactive_assessment_type', False)
, ids_assessment_type = json.get('a_ids_assessment_type', '')
, names_assessment_type = json.get('a_names_assessment_type', '')
, get_all_weather = json.get('a_get_all_weather', False)
, get_inactive_weather = json.get('a_get_inactive_weather', False)
, ids_weather = json.get('a_ids_weather', '')
@@ -384,16 +339,16 @@ class Parameters_Assessment_Command_Modality_Link(Get_Many_Parameters_Base):
, hand_signal_default_descriptions_command = json.get('a_hand_signal_default_descriptions_command', '')
, notes_command = json.get('a_notes_command', '')
, get_all_reinforcement_schedule = json.get('a_get_all_reinforcement_schedule', False)
, get_inactive_reinforcement_schedule = json.get('a_get_inactive_reinforcement_schedule', False)
, ids_reinforcement_schedule = json.get('a_ids_reinforcement_schedule', '')
, names_reinforcement_schedule = json.get('a_names_reinforcement_schedule', '')
, get_all_command_modality = json.get('a_get_all_command_modality', False)
, get_inactive_command_modality = json.get('a_get_inactive_command_modality', False)
, ids_command_modality = json.get('a_ids_command_modality', '')
, names_command_modality = json.get('a_names_command_modality', '')
, get_all_bribe = json.get('a_get_all_bribe', False)
, get_inactive_bribe = json.get('a_get_inactive_bribe', False)
, ids_bribe = json.get('a_ids_bribe', '')
, names_bribe = json.get('a_names_bribe', '')
, 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)
@@ -405,31 +360,39 @@ class Parameters_Assessment_Command_Modality_Link(Get_Many_Parameters_Base):
_m = f'{cls.__qualname__}.from_form_filters_assessment'
av.val_instance(form, 'form', _m, Filters_Assessment)
has_filter_search_text = not (form.search.data == '' or form.search.data is None)
has_filter_assessment = not (form.id_assessment.data == '0' or form.id_assessment.data == '' or form.id_assessment.data is None)
has_filter_command = False
has_filter_command_modality = False
has_filter_bribe = False
has_filter_assessment_type = not (form.id_assessment_type.data == '0' or form.id_assessment_type.data == '' or form.id_assessment_type.data is None)
has_filter_weather = not (form.id_weather.data == '0' or form.id_weather.data == '' or form.id_weather.data is None)
has_filter_lighting_level = not (form.id_lighting_level.data == '0' or form.id_lighting_level.data == '' or form.id_lighting_level.data is None)
has_filter_location = not (form.id_location.data == '0' or form.id_location.data == '' or form.id_location.data is None)
has_filter_user_handler = not (form.id_user_handler.data == '0' or form.id_user_handler.data == '' or form.id_user_handler.data is None)
active_only = av.input_bool(form.active_only.data, "active", _m)
filters = cls.get_default()
filters.get_all_link = True
filters.get_inactive_link = not active_only
filters.ids_link = ''
filters.get_all_assessment = not has_filter_assessment
filters.get_all_assessment = True
filters.get_inactive_assessment = not active_only
filters.ids_assessment = form.id_assessment.data if has_filter_assessment else ''
filters.get_all_command = not has_filter_command
filters.get_inactive_command = not active_only
filters.ids_command = ''
filters.names_command = form.search.data if has_filter_search_text else ''
filters.get_all_command_modality = not has_filter_command_modality
filters.get_inactive_command_modality = not active_only
filters.ids_command_modality = ''
filters.names_command_modality = form.search.data if has_filter_search_text else ''
filters.get_all_bribe = not has_filter_bribe
filters.get_inactive_bribe = not active_only
filters.ids_bribe = ''
filters.names_bribe = form.search.data if has_filter_search_text else ''
filters.ids_assessment = ''
filters.get_all_assessment_type = not has_filter_assessment_type
filters.get_inactive_assessment_type = not active_only
filters.ids_assessment_type = form.id_assessment_type if has_filter_assessment_type else ''
filters.names_assessment_type = form.search.data if has_filter_search_text else ''
filters.get_all_weather = not has_filter_weather
filters.get_inactive_weather = not active_only
filters.ids_weather = form.id_weather.data if has_filter_weather else ''
filters.names_weather = form.search.data if has_filter_search_text else ''
filters.get_all_lighting_level = not has_filter_lighting_level
filters.get_inactive_lighting_level = not active_only
filters.ids_lighting_level = form.id_lighting_level.data if has_filter_lighting_level else ''
filters.names_lighting_level = 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 ''
filters.get_all_user_handler = not has_filter_user_handler
filters.get_inactive_user_handler = not active_only
filters.ids_user_handler = form.id_user_handler.data if has_filter_user_handler else ''
# filters.auth0_ids_user_handler = form.id_user_handler.data if has_filter_user_handler else ''
filters.names_user_handler = form.search.data if has_filter_search_text else ''
filters.emails_user_handler = form.search.data if has_filter_search_text else ''
return filters
def to_json(self):
@@ -437,14 +400,17 @@ class Parameters_Assessment_Command_Modality_Link(Get_Many_Parameters_Base):
'a_get_all_link': self.get_all_link
, 'a_get_inactive_link': self.get_inactive_link
, 'a_ids_link': self.ids_link
, 'a_min_distance_from_handler_metres_link': self.min_distance_from_handler_metres_link
, 'a_max_distance_from_handler_metres_link': self.max_distance_from_handler_metres_link
, 'a_value_is_in_sight_of_handler_link': self.value_is_in_sight_of_handler_link
, 'a_value_is_in_scent_range_of_handler_link': self.value_is_in_scent_range_of_handler_link
, 'a_value_is_in_hearing_range_of_handler_link': self.value_is_in_hearing_range_of_handler_link
, 'a_value_is_on_lead_link': self.value_is_on_lead_link
, 'a_min_trial_count_link': self.min_trial_count_link
, 'a_max_trial_count_link': self.max_trial_count_link
, 'a_get_all_AC_link': self.get_all_AC_link
, 'a_get_inactive_AC_link': self.get_inactive_AC_link
, 'a_ids_AC_link': self.ids_AC_link
, 'a_min_distance_from_handler_metres_AC_link': self.min_distance_from_handler_metres_AC_link
, 'a_max_distance_from_handler_metres_AC_link': self.max_distance_from_handler_metres_AC_link
, 'a_value_is_in_sight_of_handler_AC_link': self.value_is_in_sight_of_handler_AC_link
, 'a_value_is_in_scent_range_of_handler_AC_link': self.value_is_in_scent_range_of_handler_AC_link
, 'a_value_is_in_hearing_range_of_handler_AC_link': self.value_is_in_hearing_range_of_handler_AC_link
, 'a_value_is_on_lead_AC_link': self.value_is_on_lead_AC_link
, 'a_min_trial_count_AC_link': self.min_trial_count_AC_link
, 'a_max_trial_count_AC_link': self.max_trial_count_AC_link
, 'a_get_all_assessment': self.get_all_assessment
, 'a_get_inactive_assessment': self.get_inactive_assessment
@@ -452,6 +418,10 @@ class Parameters_Assessment_Command_Modality_Link(Get_Many_Parameters_Base):
, 'a_notes_assessment': self.notes_assessment
, 'a_min_temperature_assessment': self.min_temperature_assessment
, 'a_max_temperature_assessment': self.max_temperature_assessment
, 'a_get_all_assessment_type': self.get_all_assessment_type
, 'a_get_inactive_assessment_type': self.get_inactive_assessment_type
, 'a_ids_assessment_type': self.ids_assessment_type
, 'a_names_assessment_type': self.names_assessment_type
, 'get_all_weather': self.get_all_weather
, 'get_inactive_weather': self.get_inactive_weather
, 'ids_weather': self.ids_weather
@@ -482,16 +452,16 @@ class Parameters_Assessment_Command_Modality_Link(Get_Many_Parameters_Base):
, 'a_hand_signal_default_descriptions_command': self.hand_signal_default_descriptions_command
, 'a_notes_command': self.notes_command
, 'a_get_all_reinforcement_schedule': self.get_all_reinforcement_schedule
, 'a_get_inactive_reinforcement_schedule': self.get_inactive_reinforcement_schedule
, 'a_ids_reinforcement_schedule': self.ids_reinforcement_schedule
, 'a_names_reinforcement_schedule': self.names_reinforcement_schedule
, 'a_get_all_command_modality': self.get_all_command_modality
, 'a_get_inactive_command_modality': self.get_inactive_command_modality
, 'a_ids_command_modality': self.ids_command_modality
, 'a_names_command_modality': self.names_command_modality
, 'a_get_all_bribe': self.get_all_bribe
, 'a_get_inactive_bribe': self.get_inactive_bribe
, 'a_ids_bribe': self.ids_bribe
, 'a_names_bribe': self.names_bribe
, '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