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

bot/database.py

@@ -53,7 +53,33 @@ class Database:
                 users_list.append(users_data)
             return users_list
 
-    def sql_query_send(self, sql):
+    def sql_parse_user_events(self, sql: str):
+        self.execute(sql)
+        result_set = self.fetchall()
+        events_list = []
+        if len(result_set) == 0:
+            return False
+        elif len(result_set) > 0:
+            for row in result_set:
+                event_data = {"desc": row['description'],
+                              "date": row['date']}
+                events_list.append(event_data)
+            return events_list
+
+    def sql_parse_all_events(self, sql: str):
+        self.execute(sql)
+        result_set = self.fetchall()
+        events_list = []
+        if len(result_set) == 0:
+            return False
+        elif len(result_set) > 0:
+            for row in result_set:
+                event_data = {"Описание": row['description'],
+                              "Инициатор": row['name']}
+                events_list.append(event_data)
+            return events_list
+
+    def sql_query_send(self, sql: str):
         self.execute(sql)
         self.commit()
         self.close()
@@ -61,5 +87,6 @@ class Database:
 
 # Db = Database()
 # data = Db.sql_simple_check("select tg_id from user_table where tg_id = 338836490 and approved = 0")
+# data = Db.sql_simple_check(simple_select(columns="tg_id", table="user_table", tg_id='338836490', approved='0'))
 # print(data)
 

draft.py

@@ -24,10 +24,4 @@
 #     await bot.answer_callback_query(call.id)
 #     await bot.send_message(call.message.chat.id, "Вы выбрали " + call.data)
 
-# sql_query_users(f"select name,phone from user_table where approved = '0'")
-# print(sql_simple_check(f"select approved from user_table where tg_id='338836490'"))
-# print(sql_parse_users(f"select id, name,phone from user_table where approved = '0'"))
-# print(sql_simple_check(f"select admin from user_table where tg_id = '338836490'", "admin"))
-# print(not not sql_query_single_get(f"select tg_id from user_table where tg_id = '11'"))
-# sql_query(f"INSERT INTO user_table (tg_id,name,phone) VALUES ('123123','ФФ ыв ывыв','89539299323')")
-# select name,phone from user_table where approved = '0'
+

handlers/user/events.py

@@ -30,6 +30,11 @@ async def my_events(message: types.Message):
             not Db.sql_simple_check(sql=f"select approved from user_table where tg_id={message.from_user.id}"):
         await message.delete()
         await message.answer("Команды станут доступны после регистрации", reply_markup=register_kb)
+    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):
@@ -38,6 +43,11 @@ async def all_events(message: types.Message):
             not Db.sql_simple_check(sql=f"select approved from user_table where tg_id={message.from_user.id}"):
         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")
+        await message.answer("Список всех событий")
+        for event in events:
+            await message.answer(event)
 
 
 def events_register(dp: Dispatcher):