fix date_picker, fix filter, improve language selector
This commit is contained in:
@@ -109,6 +109,9 @@ async def date_picker_year(query: CallbackQuery,
|
||||
|
||||
start_date = datetime.strptime(callback_data.data, "%Y-%m-%d")
|
||||
|
||||
state_data = await state.get_data()
|
||||
kwargs["state_data"] = state_data
|
||||
|
||||
keyboard_builder = InlineKeyboardBuilder()
|
||||
keyboard_builder.row(InlineKeyboardButton(text = "🔼",
|
||||
callback_data = ContextData(
|
||||
@@ -117,8 +120,7 @@ async def date_picker_year(query: CallbackQuery,
|
||||
entity_name = callback_data.entity_name,
|
||||
entity_id = callback_data.entity_id,
|
||||
field_name = callback_data.field_name,
|
||||
data = start_date.replace(year = start_date.year - 20).strftime("%Y-%m-%d"),
|
||||
save_state = True).pack()))
|
||||
data = start_date.replace(year = start_date.year - 20).strftime("%Y-%m-%d")).pack()))
|
||||
|
||||
for r in range(4):
|
||||
buttons = []
|
||||
@@ -143,15 +145,14 @@ async def date_picker_year(query: CallbackQuery,
|
||||
entity_name = callback_data.entity_name,
|
||||
entity_id = callback_data.entity_id,
|
||||
field_name = callback_data.field_name,
|
||||
data = start_date.replace(year = start_date.year + 20).strftime("%Y-%m-%d"),
|
||||
save_state = True).pack()))
|
||||
data = start_date.replace(year = start_date.year + 20).strftime("%Y-%m-%d")).pack()))
|
||||
|
||||
field_descriptor = get_field_descriptor(app, callback_data)
|
||||
|
||||
await wrap_editor(keyboard_builder = keyboard_builder,
|
||||
field_descriptor = field_descriptor,
|
||||
callback_data = callback_data,
|
||||
state = state)
|
||||
state_data = state_data)
|
||||
|
||||
await query.message.edit_reply_markup(reply_markup = keyboard_builder.as_markup())
|
||||
|
||||
@@ -160,6 +161,9 @@ async def date_picker_year(query: CallbackQuery,
|
||||
async def date_picker_month(query: CallbackQuery, callback_data: ContextData, app: "QBotApp", **kwargs):
|
||||
|
||||
field_descriptor = get_field_descriptor(app, callback_data)
|
||||
state: FSMContext = kwargs["state"]
|
||||
state_data = await state.get_data()
|
||||
kwargs["state_data"] = state_data
|
||||
|
||||
await date_picker(query.message,
|
||||
field_descriptor = field_descriptor,
|
||||
|
||||
Reference in New Issue
Block a user