From 13c8e73682eea9f75217e8099dbbd21919021c42 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: Thu, 27 Oct 2022 00:47:39 +0300
Subject: [PATCH] fixes

---
 daemons/notify.py    |  6 +++---
 helpers/keyboards.py |  2 +-
 helpers/ruz.py       | 14 +++++++++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/daemons/notify.py b/daemons/notify.py
index 5d474ad..0ecc56e 100644
--- a/daemons/notify.py
+++ b/daemons/notify.py
@@ -18,11 +18,11 @@ def process():
             "begin": {"$lte": time_now + datetime.timedelta(minutes=user["notify_minutes"])},
             "notified": False
         }):
-            ans = ""
+            ans = f"Дата: {lesson['begin'].strftime('%d.%m')}\n"
             ans += f"Дисциплина: {lesson['discipline']}\n"
             ans += f"Аудитория: {lesson['building']}, {lesson['auditorium']}\n"
-            ans += f"Начало: {lesson['begin'].strftime('%d.%m %H:%M')}\n"
-            ans += f"Конец: {lesson['end'].strftime('%d.%m %H:%M')}\n"
+            ans += f"Начало: {lesson['begin'].strftime('%H:%M')}\n"
+            ans += f"Конец: {lesson['end'].strftime('%H:%M')}\n"
             ans += f"Преподаватель: {(lesson['lecturer'] or 'Неизвестно')}\n"
             try:
                 bot.send_message(
diff --git a/helpers/keyboards.py b/helpers/keyboards.py
index 1328d8c..38e44d3 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'].capitalize())
+        kb.row(entity['description'])
     kb.row("Начать заново")
     return kb
 
diff --git a/helpers/ruz.py b/helpers/ruz.py
index 4125fd9..f8d7a9b 100644
--- a/helpers/ruz.py
+++ b/helpers/ruz.py
@@ -29,7 +29,10 @@ class RUZ:
         except:
             return None
         if data.status_code == 200:
-            return data.json()
+            data = data.json()
+            for index, value in enumerate(data):
+                data[index]['description'] = value['description'].capitalize()
+            return data
         return None
 
     def get_schedule(self, user: User, begin_date: datetime.datetime, end_date: datetime.datetime):
@@ -58,11 +61,16 @@ class RUZ:
 
     def schedule_builder(self, lessons: list[dict]) -> str:
         ans = ""
+        last_date = None
         for lesson in lessons:
+            date = lesson['begin'].strftime('%d.%m')
+            if date != last_date:
+                last_date = date
+                ans += f"Дата: {date}\n"
             ans += f"Дисциплина: {lesson['discipline']}\n"
             ans += f"Аудитория: {lesson['building']}, {lesson['auditorium']}\n"
-            ans += f"Начало: {lesson['begin'].strftime('%d.%m %H:%M')}\n"
-            ans += f"Конец: {lesson['end'].strftime('%d.%m %H:%M')}\n"
+            ans += f"Начало: {lesson['begin'].strftime('%H:%M')}\n"
+            ans += f"Конец: {lesson['end'].strftime('%H:%M')}\n"
             ans += f"Преподаватель: {(lesson['lecturer'] or 'Неизвестно')}\n"
             ans += "_______________\n"
         return ans