Feat(SQL, UI): 1. Updated User Calc Stored Procedure with Search functionality from previous commit on Command and Dog tables. \n 2. Corrected functionality of active field trash and add icons instead of button with replaceable text. \n 3. Improved styling on Dog Command Link page.
This commit is contained in:
@@ -144,11 +144,14 @@ class User_Temp(db.Model, Base):
|
||||
|
||||
|
||||
class Parameters_User(Get_Many_Parameters_Base):
|
||||
id_user: int
|
||||
auth0_id_user: str
|
||||
get_all_user: bool
|
||||
get_inactive_user: bool
|
||||
ids_user: str
|
||||
ids_user_auth0: str
|
||||
names_user: str
|
||||
emails_user: str
|
||||
require_all_id_search_filters_met: bool
|
||||
require_any_id_search_filters_met: bool
|
||||
require_all_non_id_search_filters_met: bool
|
||||
@@ -179,16 +182,21 @@ class Parameters_User(Get_Many_Parameters_Base):
|
||||
filters.get_inactive_user = False
|
||||
filters.ids_user = '' if user.id_user is None else str(user.id_user)
|
||||
filters.ids_user_auth0 = user.id_user_auth0
|
||||
filters.names_user = user.firstname + ' ' + user.surname
|
||||
filters.emails_user = user.email
|
||||
return filters
|
||||
|
||||
@classmethod
|
||||
def get_default(cls):
|
||||
return cls(
|
||||
get_all_user = False
|
||||
id_user = None
|
||||
, auth0_id_user = ''
|
||||
, get_all_user = False
|
||||
, get_inactive_user = False
|
||||
, ids_user = ''
|
||||
, ids_user_auth0 = ''
|
||||
, names_user = ''
|
||||
, emails_user = ''
|
||||
, require_all_id_search_filters_met = True
|
||||
, require_any_id_search_filters_met = True
|
||||
, require_all_non_id_search_filters_met = False
|
||||
@@ -200,11 +208,14 @@ class Parameters_User(Get_Many_Parameters_Base):
|
||||
pass
|
||||
def to_json(self):
|
||||
return {
|
||||
'a_get_all_user': self.get_all_user
|
||||
'a_id_user': self.id_user
|
||||
, 'a_auth0_id_user': self.auth0_id_user
|
||||
, 'a_get_all_user': self.get_all_user
|
||||
, 'a_get_inactive_user': self.get_inactive_user
|
||||
, 'a_ids_user': self.ids_user
|
||||
, 'a_ids_user_auth0': self.ids_user_auth0
|
||||
, 'a_names_user': self.names_user
|
||||
, 'a_emails_user': self.emails_user
|
||||
, '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
|
||||
|
||||
Reference in New Issue
Block a user