Fix: Hamburger menu styles.
This commit is contained in:
@@ -11,9 +11,10 @@ Feature: User Business Object
|
||||
from business_objects.base import Base
|
||||
from business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base
|
||||
from business_objects.dog.company import Company
|
||||
from business_objects.dog.role import Role
|
||||
import lib.argument_validation as av
|
||||
from extensions import db
|
||||
from forms.base import Form_Filters_User
|
||||
from forms.dog.user import Filters_User
|
||||
from helpers.helper_app import Helper_App
|
||||
# external
|
||||
from dataclasses import dataclass
|
||||
@@ -24,11 +25,9 @@ class User(SQLAlchemy_ABC, Base):
|
||||
ATTR_ID_USER_AUTH0: ClassVar[str] = 'id_user_auth0'
|
||||
FLAG_CAN_ADMIN_DOG: ClassVar[str] = 'can_admin_dog'
|
||||
FLAG_CAN_ADMIN_USER: ClassVar[str] = 'can_admin_user'
|
||||
FLAG_FIRSTNAME: ClassVar[str] = 'firstname'
|
||||
FLAG_IS_EMAIL_VERIFIED: ClassVar[str] = 'is_email_verified'
|
||||
FLAG_IS_SUPER_USER: ClassVar[str] = 'is_super_user'
|
||||
FLAG_PRIORITY_ACCESS_LEVEL: ClassVar[str] = 'priority_access_level'
|
||||
FLAG_SURNAME: ClassVar[str] = 'surname'
|
||||
NAME_ATTR_OPTION_VALUE: ClassVar[str] = Base.ATTR_ID_USER
|
||||
NAME_ATTR_OPTION_TEXT: ClassVar[str] = Base.FLAG_NAME
|
||||
|
||||
@@ -46,6 +45,7 @@ class User(SQLAlchemy_ABC, Base):
|
||||
can_admin_dog = db.Column(db.Boolean)
|
||||
can_admin_user = db.Column(db.Boolean)
|
||||
is_new = db.Column(db.Boolean)
|
||||
active = db.Column(db.Boolean)
|
||||
|
||||
def __init__(self):
|
||||
self.id_user = 0
|
||||
@@ -54,11 +54,14 @@ class User(SQLAlchemy_ABC, Base):
|
||||
self.can_admin_user = False
|
||||
self.id_company = None
|
||||
self.company = None
|
||||
self.id_role = None
|
||||
self.role = None
|
||||
super().__init__()
|
||||
|
||||
@classmethod
|
||||
def from_db_user(cls, query_row):
|
||||
_m = f'{cls.__qualname__}.from_db_user'
|
||||
Helper_App.console_log(f'user record: {query_row}')
|
||||
user = cls()
|
||||
user.id_user = query_row[0]
|
||||
user.id_user_auth0 = query_row[1]
|
||||
@@ -66,12 +69,14 @@ class User(SQLAlchemy_ABC, Base):
|
||||
user.surname = query_row[3]
|
||||
user.email = query_row[4]
|
||||
user.is_email_verified = av.input_bool(query_row[5], cls.FLAG_IS_EMAIL_VERIFIED, _m)
|
||||
user.id_company = query_row[6]
|
||||
user.is_super_user = av.input_bool(query_row[9], cls.FLAG_IS_SUPER_USER, _m)
|
||||
user.priority_access_level = query_row[10]
|
||||
user.can_admin_dog = av.input_bool(query_row[11], cls.FLAG_CAN_ADMIN_DOG, _m)
|
||||
user.can_admin_user = av.input_bool(query_row[12], cls.FLAG_CAN_ADMIN_USER, _m)
|
||||
user.id_role = query_row[6]
|
||||
user.id_company = query_row[8]
|
||||
user.is_super_user = av.input_bool(query_row[11], cls.FLAG_IS_SUPER_USER, _m)
|
||||
user.priority_access_level = query_row[12]
|
||||
user.can_admin_dog = av.input_bool(query_row[13], cls.FLAG_CAN_ADMIN_DOG, _m)
|
||||
user.can_admin_user = av.input_bool(query_row[14], cls.FLAG_CAN_ADMIN_USER, _m)
|
||||
# user.is_new = av.input_bool(query_row[9], 'is_new', _m)
|
||||
user.role = Role.from_db_user(query_row)
|
||||
user.company = Company.from_db_user(query_row)
|
||||
return user
|
||||
|
||||
@@ -96,10 +101,12 @@ class User(SQLAlchemy_ABC, Base):
|
||||
user.surname = json[cls.FLAG_SURNAME]
|
||||
user.email = json[cls.FLAG_EMAIL]
|
||||
user.is_email_verified = av.input_bool(json[cls.FLAG_IS_EMAIL_VERIFIED], cls.FLAG_IS_EMAIL_VERIFIED, _m)
|
||||
user.id_role = json[Role.ATTR_ID_ROLE]
|
||||
user.id_company = json[Company.ATTR_ID_COMPANY]
|
||||
user.is_super_user = av.input_bool(json[cls.FLAG_IS_SUPER_USER], cls.FLAG_IS_SUPER_USER, _m)
|
||||
user.can_admin_dog = user.is_super_user or json[cls.FLAG_CAN_ADMIN_DOG]
|
||||
user.can_admin_user = user.is_super_user or json[cls.FLAG_CAN_ADMIN_USER]
|
||||
user.role = Role.from_json(json[Role.FLAG_ROLE])
|
||||
user.company = Company.from_json(json[Company.FLAG_COMPANY])
|
||||
return user
|
||||
|
||||
@@ -138,6 +145,8 @@ class User(SQLAlchemy_ABC, Base):
|
||||
, self.FLAG_CAN_ADMIN_USER: self.can_admin_user
|
||||
, Company.ATTR_ID_COMPANY: self.id_company
|
||||
, Company.FLAG_COMPANY: self.company.to_json()
|
||||
, Role.ATTR_ID_ROLE: self.id_role
|
||||
, Role.FLAG_ROLE: self.role.to_json()
|
||||
}
|
||||
return as_json
|
||||
|
||||
@@ -155,6 +164,10 @@ User (
|
||||
, {self.FLAG_PRIORITY_ACCESS_LEVEL}: {self.priority_access_level}
|
||||
, {self.FLAG_CAN_ADMIN_DOG}: {self.can_admin_dog}
|
||||
, {self.FLAG_CAN_ADMIN_USER}: {self.can_admin_user}
|
||||
, {Role.ATTR_ID_ROLE}: {self.id_role}
|
||||
, {Role.FLAG_ROLE}: {self.role}
|
||||
, {Company.ATTR_ID_COMPANY}: {self.id_company}
|
||||
, {Company.FLAG_COMPANY}: {self.company}
|
||||
) '''
|
||||
|
||||
def get_is_logged_in(self):
|
||||
@@ -168,18 +181,36 @@ class User_Temp(db.Model, Base):
|
||||
__table_args__ = { 'extend_existing': True }
|
||||
id_temp = db.Column(db.Integer, primary_key=True)
|
||||
id_user = db.Column(db.Integer)
|
||||
id_role = db.Column(db.Integer)
|
||||
id_user_auth0 = db.Column(db.String(250))
|
||||
firstname = db.Column(db.String(250))
|
||||
surname = db.Column(db.String(250))
|
||||
email = db.Column(db.String(250))
|
||||
is_email_verified = db.Column(db.Boolean)
|
||||
is_super_user = db.Column(db.Boolean)
|
||||
active = db.Column(db.Boolean)
|
||||
guid: str = db.Column(db.String(36))
|
||||
# is_logged_in: bool
|
||||
|
||||
def __init__(self):
|
||||
self.id_user = 0
|
||||
super().__init__()
|
||||
|
||||
@classmethod
|
||||
def from_user(cls, role):
|
||||
_m = f'{cls.__qualname__}.from_user'
|
||||
temp = cls()
|
||||
temp.id_user = user.id_user
|
||||
temp.id_role = user.role.id_role
|
||||
temp.id_user_auth0 = user.id_user_auth0
|
||||
temp.firstname = user.firstname
|
||||
temp.surname = user.surname
|
||||
temp.email = user.email
|
||||
temp.is_email_verified = user.is_email_verified
|
||||
temp.is_super_user = user.is_super_user
|
||||
temp.active = role.active
|
||||
return temp
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -202,14 +233,15 @@ class Parameters_User(Get_Many_Parameters_Base):
|
||||
|
||||
|
||||
@classmethod
|
||||
def from_form(cls, form):
|
||||
av.val_instance(form, 'form', 'Parameters_User.from_form', Form_Filters_User)
|
||||
get_inactive = av.input_bool(form.active.data, "active", "Parameters_User.from_form")
|
||||
id_user = '' if form.id_user.data is None else form.id_user.data
|
||||
def from_form_filters_user(cls, form):
|
||||
_m = f'{cls.__qualname__}.from_form_filters_user'
|
||||
av.val_instance(form, 'form', _m, Filters_User)
|
||||
get_inactive = not av.input_bool(form.active_only.data, "active", _m)
|
||||
# id_user = '' if form.id_user.data is None else form.id_user.data
|
||||
filters = cls.get_default()
|
||||
filters.get_all_user = (id_user == '')
|
||||
filters.get_all_user = True # (id_user == '')
|
||||
filters.get_inactive_user = get_inactive
|
||||
filters.ids_user = id_user
|
||||
filters.ids_user = '' # id_user
|
||||
filters.ids_user_auth0 = ''
|
||||
filters.require_all_id_search_filters_met = True
|
||||
filters.require_any_id_search_filters_met = True
|
||||
|
||||
Reference in New Issue
Block a user