From 3ac48d67d110dd713a52afec56e83b530de5e378 Mon Sep 17 00:00:00 2001 From: Administrator Date: Thu, 27 Oct 2022 00:33:52 +0300 Subject: [PATCH] fixes --- daemons/notify.py | 4 ++-- helpers/keyboards.py | 2 +- helpers/ruz.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/daemons/notify.py b/daemons/notify.py index 223af09..5d474ad 100644 --- a/daemons/notify.py +++ b/daemons/notify.py @@ -21,8 +21,8 @@ def process(): ans = "" ans += f"Дисциплина: {lesson['discipline']}\n" ans += f"Аудитория: {lesson['building']}, {lesson['auditorium']}\n" - ans += f"Начало: {lesson['begin'].strftime('%H:%M')}\n" - ans += f"Конец: {lesson['end'].strftime('%H:%M')}\n" + ans += f"Начало: {lesson['begin'].strftime('%d.%m %H:%M')}\n" + ans += f"Конец: {lesson['end'].strftime('%d.%m %H:%M')}\n" ans += f"Преподаватель: {(lesson['lecturer'] or 'Неизвестно')}\n" try: bot.send_message( diff --git a/helpers/keyboards.py b/helpers/keyboards.py index 38e44d3..1328d8c 100644 --- a/helpers/keyboards.py +++ b/helpers/keyboards.py @@ -53,7 +53,7 @@ def again_keyboard(): def groups_keyboard(data): kb = telebot.types.ReplyKeyboardMarkup(True, False) for entity in data: - kb.row(entity['description']) + kb.row(entity['description'].capitalize()) kb.row("Начать заново") return kb diff --git a/helpers/ruz.py b/helpers/ruz.py index 3753ac6..4125fd9 100644 --- a/helpers/ruz.py +++ b/helpers/ruz.py @@ -61,8 +61,8 @@ class RUZ: for lesson in lessons: ans += f"Дисциплина: {lesson['discipline']}\n" ans += f"Аудитория: {lesson['building']}, {lesson['auditorium']}\n" - ans += f"Начало: {lesson['begin'].strftime('%H:%M')}\n" - ans += f"Конец: {lesson['end'].strftime('%H:%M')}\n" + ans += f"Начало: {lesson['begin'].strftime('%d.%m %H:%M')}\n" + ans += f"Конец: {lesson['end'].strftime('%d.%m %H:%M')}\n" ans += f"Преподаватель: {(lesson['lecturer'] or 'Неизвестно')}\n" ans += "_______________\n" return ans