FascioSchool/FascioSchoolBot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix after merge

Browse Source
This commit is contained in:
DaShMore
2025-11-14 14:14:15 +03:00
parent 343dc8fb5f
commit 1be3401d09
4 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/bot/dialogs/flows/events/dialogs.py
View File

@@ -4,11 +4,7 @@ from aiogram_dialog.widgets.text import Case, Const, Format, Jinja
from app.bot.dialogs.templates import event_template from app.bot.dialogs.templates import event_template
<<<<<<< HEAD
from .getters import event_getter, events_list_getter, registration_getter from .getters import event_getter, events_list_getter, registration_getter
=======
from .getters import event_getter, events_list_getter
>>>>>>> 7e5939394de1e40064ccf364bcfabbbd117d5d32
from .handlers import change_registration, on_event_selected from .handlers import change_registration, on_event_selected
from .states import EventsSG from .states import EventsSG
@@ -35,10 +31,7 @@ events_dialog = Dialog(
[Const("зарегистрироваться"), Const("отменить регистрацию")], [Const("зарегистрироваться"), Const("отменить регистрацию")],
selector="is_registered_to_event", selector="is_registered_to_event",
), ),
<<<<<<< HEAD
id="change_registration_btn", id="change_registration_btn",
=======
>>>>>>> 7e5939394de1e40064ccf364bcfabbbd117d5d32
on_click=change_registration, on_click=change_registration,
), ),
Back(Const("Назад")), Back(Const("Назад")),

3
app/bot/dialogs/flows/events/getters.py
View File

@@ -5,10 +5,7 @@ from app.infrastructure.database.crud import (
get_event_by_id, get_event_by_id,
get_events_list, get_events_list,
) )
<<<<<<< HEAD
from app.infrastructure.database.enums import UserEventStatus from app.infrastructure.database.enums import UserEventStatus
=======
>>>>>>> 7e5939394de1e40064ccf364bcfabbbd117d5d32
from app.infrastructure.database.models import Event from app.infrastructure.database.models import Event

5
app/bot/dialogs/flows/events/handlers.py
View File

@@ -19,7 +19,6 @@ async def on_event_selected(
manager.dialog_data["selected_event"] = int(item_id) manager.dialog_data["selected_event"] = int(item_id)
await manager.next() await manager.next()
<<<<<<< HEAD
async def change_registration( async def change_registration(
callback: CallbackQuery, callback: CallbackQuery,
@@ -40,7 +39,3 @@ async def change_registration(
await register_user_to_event( await register_user_to_event(
manager.middleware_data["session"], user.id, event_id manager.middleware_data["session"], user.id, event_id
) )
=======
async def change_registration():
...
>>>>>>> 7e5939394de1e40064ccf364bcfabbbd117d5d32

3
app/infrastructure/database/crud.py
View File

@@ -104,7 +104,6 @@ async def update_event(
event.end_date = end_date event.end_date = end_date
await session.commit() await session.commit()
return event return event
<<<<<<< HEAD
async def register_user_to_event(session: AsyncSession, user_id: int, event_id: int): async def register_user_to_event(session: AsyncSession, user_id: int, event_id: int):
@@ -134,5 +133,3 @@ async def unregister_user_to_event(session: AsyncSession, user_id: int, event_id
).scalar_one() ).scalar_one()
user_event.status = UserEventStatus.CANCELLED.value user_event.status = UserEventStatus.CANCELLED.value
await session.commit() await session.commit()
=======
>>>>>>> 7e5939394de1e40064ccf364bcfabbbd117d5d32