Добавлена функция просотра всех событий

bot/database.py

@@ -47,9 +47,7 @@ class Database:
             return False
         elif len(result_set) > 0:
             for row in result_set:
-                users_data = {"ID": row['id'],
-                              "ФИО": row['name'],
-                              "Номер телефона": row['phone']}
+                users_data = {"ID": row['id'], "ФИО": row['name'], "Номер телефона": row['phone']}
                 users_list.append(users_data)
             return users_list
 
@@ -61,8 +59,7 @@ class Database:
             return False
         elif len(result_set) > 0:
             for row in result_set:
-                event_data = {"desc": row['description'],
-                              "date": row['date']}
+                event_data = {"desc": row['description'], "date": row['date']}
                 events_list.append(event_data)
             return events_list
 
@@ -75,7 +72,8 @@ class Database:
         elif len(result_set) > 0:
             for row in result_set:
                 event_data = {"Описание": row['description'],
-                              "Инициатор": row['name']}
+                              "Инициатор": row['name'],
+                              "Дата": row['dat']}
                 events_list.append(event_data)
             return events_list
 

bot/functions.py

@@ -54,6 +54,13 @@ def beauty_reg_request(data):
     return result
 
 
+def beauty_all_events(data):
+    result = (f"Инициатор : {data['Инициатор']}\n"
+              f"Событие : {data['Описание']}\n"
+              f"Дата: {data['Дата']}")
+    return result
+
+
 def make_date():
     today = datetime.datetime.now()
     return datetime.datetime.strftime(today, '%d.%m.%Y')

handlers/user/events.py

@@ -1,7 +1,7 @@
 from aiogram import types, Dispatcher
 from bot import database
 from bot.keyboards import register_kb, make_calendar
-from bot.functions import make_date
+from bot.functions import make_date,beauty_all_events
 
 
 async def make_event(message: types.message):
@@ -33,8 +33,6 @@ async def my_events(message: types.Message):
     else:
         events = Db.sql_parse_user_events(f"select description,`date` from events_table WHERE owner ={message.from_user.id}")
         await message.answer("Список событий которые Вы запланировали")
-        for event in events:
-            await message.answer(event)
 
 
 async def all_events(message: types.Message):
@@ -44,10 +42,10 @@ async def all_events(message: types.Message):
         await message.delete()
         await message.answer("Команды станут доступны после регистрации", reply_markup=register_kb)
     else:
-        events = Db.sql_parse_all_events(f"select events_table.description, user_table.name from events_table inner join user_table on events_table.owner = user_table.tg_id")
+        events = Db.sql_parse_all_events(f"select events_table.description, user_table.name, events_table.dat from events_table inner join user_table on events_table.owner = user_table.tg_id")
         await message.answer("Список всех событий")
         for event in events:
-            await message.answer(event)
+            await message.answer(beauty_all_events(event))
 
 
 def events_register(dp: Dispatcher):