Feat: User Relationships and Session Members.
This commit is contained in:
@@ -249,7 +249,7 @@ class Model_View_Base(BaseModel, ABC):
|
||||
self.app = current_app
|
||||
with self.app.app_context():
|
||||
self.session = session
|
||||
Helper_App.console_log(f'session: {self.session}')
|
||||
# Helper_App.console_log(f'session: {self.session}')
|
||||
|
||||
datastore_base = DataStore_Base()
|
||||
self.user = datastore_base.get_user_session()
|
||||
|
||||
@@ -75,7 +75,7 @@ class Model_View_MTG_Base(Model_View_Base):
|
||||
|
||||
def __init__(self, hash_page_current, **kwargs):
|
||||
_m = 'Model_View_MTG_Base.__init__'
|
||||
Helper_App.console_log(f'{_m}\nstarting')
|
||||
# Helper_App.console_log(f'{_m}\nstarting')
|
||||
super().__init__(hash_page_current=hash_page_current, **kwargs)
|
||||
self.is_page_mtg = True
|
||||
if self.hash_page_current == Model_View_MTG_Base.HASH_PAGE_MTG_TRIAL_GAME:
|
||||
|
||||
@@ -34,21 +34,16 @@ class Model_View_MTG_Decks(Model_View_MTG_Base):
|
||||
|
||||
def __init__(self, parameters_deck=None, hash_page_current=Model_View_MTG_Base.HASH_PAGE_MTG_DECKS):
|
||||
_m = 'Model_View_MTG_Decks.__init__'
|
||||
Helper_App.console_log(f'{_m}\nstarting...')
|
||||
# Helper_App.console_log(f'{_m}\nstarting...')
|
||||
super().__init__(hash_page_current=hash_page_current)
|
||||
self._title = 'MTG Decks'
|
||||
datastore = DataStore_MTG()
|
||||
|
||||
# Get all decks
|
||||
parameters_deck = Parameters_MTG_Deck.get_default()
|
||||
parameters_deck.get_all_deck = True
|
||||
parameters_deck.require_all_id_filters_met = False
|
||||
parameters_deck.require_any_id_filters_met = False
|
||||
parameters_deck.require_all_non_id_filters_met = False
|
||||
parameters_deck.require_any_non_id_filters_met = False
|
||||
parameters_deck = Parameters_MTG_Deck.get_default(self.user.user_id)
|
||||
self.decks, errors = datastore.get_many_mtg_deck(parameters_deck)
|
||||
|
||||
Helper_App.console_log(f'Decks IDs: {self.decks}')
|
||||
# Helper_App.console_log(f'Decks IDs: {self.decks}')
|
||||
# Get all commander brackets
|
||||
parameters_commander_bracket = Parameters_MTG_Deck_Commander_Bracket.get_default()
|
||||
parameters_commander_bracket.get_all_commander_bracket = True
|
||||
@@ -56,12 +51,12 @@ class Model_View_MTG_Decks(Model_View_MTG_Base):
|
||||
parameters_commander_bracket.require_any_id_filters_met = False
|
||||
self.commander_brackets, errors = datastore.get_many_mtg_deck_commander_bracket(parameters_commander_bracket = parameters_commander_bracket)
|
||||
|
||||
Helper_App.console_log(f'Brackets: {self.commander_brackets}')
|
||||
# Helper_App.console_log(f'Brackets: {self.commander_brackets}')
|
||||
commander_bracket_index = {}
|
||||
for index_commander_bracket in range(len(self.commander_brackets)):
|
||||
bracket = self.commander_brackets[index_commander_bracket]
|
||||
commander_bracket_index[bracket.commander_bracket_id] = bracket
|
||||
Helper_App.console_log(f'Bracket IDs: {commander_bracket_index}')
|
||||
# Helper_App.console_log(f'Bracket IDs: {commander_bracket_index}')
|
||||
|
||||
deck_index = {}
|
||||
for index_deck in range(len(self.decks)):
|
||||
|
||||
@@ -36,6 +36,8 @@ class Model_View_MTG_Game(Model_View_MTG_Base):
|
||||
FLAG_ROUND_DISPLAY_ORDER_BUTTON: ClassVar[str] = 'btn-round-display-order'
|
||||
FLAG_ROUND_DISPLAY_ORDER_MINUS: ClassVar[str] = 'round-display-order-minus'
|
||||
FLAG_ROUND_DISPLAY_ORDER_PLUS: ClassVar[str] = 'round-display-order-plus'
|
||||
GAME_DATA_OUTDATED_LABEL_ID: ClassVar[str] = 'game-data-outdated-label'
|
||||
ID_OVERLAY_GAME_OUTDATED: ClassVar[str] = 'overlay-game-outdated'
|
||||
PLAYER_SETUP_WRAPPER_TEMPLATE_ID: ClassVar[str] = 'player-setup-wrapper-template'
|
||||
|
||||
damage_records: list = None
|
||||
@@ -53,7 +55,7 @@ class Model_View_MTG_Game(Model_View_MTG_Base):
|
||||
|
||||
def __init__(self, game_id, hash_page_current=Model_View_MTG_Base.HASH_PAGE_MTG_GAME):
|
||||
_m = 'Model_View_MTG_Game.__init__'
|
||||
Helper_App.console_log(f'{_m}\nstarting...')
|
||||
# Helper_App.console_log(f'{_m}\nstarting...')
|
||||
super().__init__(hash_page_current=hash_page_current)
|
||||
self._title = 'MTG Game'
|
||||
datastore = DataStore_MTG()
|
||||
@@ -68,7 +70,7 @@ class Model_View_MTG_Game(Model_View_MTG_Base):
|
||||
self.game = games[0]
|
||||
|
||||
# Get all decks
|
||||
parameters_deck = Parameters_MTG_Deck.get_default()
|
||||
parameters_deck = Parameters_MTG_Deck.get_default(user_session.user_id)
|
||||
parameters_deck.get_all_deck = True
|
||||
parameters_deck.require_all_id_filters_met = False
|
||||
parameters_deck.require_any_id_filters_met = False
|
||||
|
||||
@@ -29,7 +29,7 @@ class Model_View_MTG_Games(Model_View_MTG_Base):
|
||||
|
||||
def __init__(self, parameters_game=None, hash_page_current=Model_View_MTG_Base.HASH_PAGE_MTG_GAMES):
|
||||
_m = 'Model_View_MTG_Games.__init__'
|
||||
Helper_App.console_log(f'{_m}\nstarting...')
|
||||
# Helper_App.console_log(f'{_m}\nstarting...')
|
||||
super().__init__(hash_page_current=hash_page_current)
|
||||
self._title = 'MTG Games'
|
||||
datastore = DataStore_MTG()
|
||||
@@ -41,5 +41,5 @@ class Model_View_MTG_Games(Model_View_MTG_Base):
|
||||
else:
|
||||
self.parameters_game = parameters_game
|
||||
|
||||
Helper_App.console_log(f'Query args: {self.parameters_game}')
|
||||
# Helper_App.console_log(f'Query args: {self.parameters_game}')
|
||||
self.games, errors = datastore.get_many_mtg_game(self.parameters_game)
|
||||
|
||||
@@ -27,6 +27,6 @@ class Model_View_MTG_Home(Model_View_MTG_Base):
|
||||
|
||||
def __init__(self, hash_page_current=Model_View_MTG_Base.HASH_PAGE_MTG_HOME):
|
||||
_m = 'Model_View_MTG_Home.__init__'
|
||||
Helper_App.console_log(f'{_m}\nstarting...')
|
||||
# Helper_App.console_log(f'{_m}\nstarting...')
|
||||
super().__init__(hash_page_current=hash_page_current)
|
||||
self._title = 'MTG Home'
|
||||
|
||||
@@ -37,13 +37,13 @@ class Model_View_User(Model_View_Base):
|
||||
self._title = 'Users'
|
||||
self.form_filters = form_filters_old
|
||||
|
||||
Helper_App.console_log(f'Form filters: {self.form_filters}')
|
||||
# Helper_App.console_log(f'Form filters: {self.form_filters}')
|
||||
|
||||
datastore = DataStore_User()
|
||||
|
||||
parameters_user = Parameters_User.from_form_filters_user(self.form_filters)
|
||||
if self.hash_page_current == Model_View_Base.HASH_PAGE_USER_ACCOUNT:
|
||||
parameters_user.user_ids = str(self.user.user_id)
|
||||
Helper_App.console_log(f'Query args: {parameters_user}')
|
||||
# Helper_App.console_log(f'Query args: {parameters_user}')
|
||||
self.users, errors = datastore.get_many_user(parameters_user)
|
||||
|
||||
Reference in New Issue
Block a user