From f9bda14dc906076f50d3a66fdb6ce2d4c7038576 Mon Sep 17 00:00:00 2001
From: TolaMironcenko <mironcenkotola@gmail.com>
Date: Fri, 21 Oct 2022 12:08:30 +0700
Subject: [PATCH] added some features

---
 database.sqlite    | Bin 16384 -> 16384 bytes
 database/models.py |   1 +
 main.py            | 102 ++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 92 insertions(+), 11 deletions(-)

diff --git a/database.sqlite b/database.sqlite
index 1647fa530a30c87ad72abaa6c8698057b5c91ed1..a7453c0850635eeb3daa62332a029f4b5d99222c 100644
GIT binary patch
delta 262
zcmZo@U~Fh$oFL7}F;T`@n1ewt+>4iifq|KKI|F|apEB?Ejg79nlh5+za{4f_iz_QL
zw!}|%=6lFll9`*Tq!8liJ6W9nJ<A6M{tuf41s?EE3}BPtV`O2FXEZZ1G`BD^G_jBb
zna9LGlY##{|4g8wUjBL$CJqKgMovX-+2s7Z;?jbW%=|nqBLgENT|)z1BSS+&D^p`D
zV<SBy0|R42gA02uYye?>Mh*sXu&&I!<osM^6b&ZkR)*$!mga`0#^x{$Twsg8Gw}c6
b{|;or!Dd;3D?pcWbFwgVGBPnUb8-RzH)26%

delta 514
zcmZo@U~Fh$oFL68GEv4^ScE|@+>4iifq|L#ECYWLpC#|v&4L2aypy-{=5m@bv5PA!
zGqxB{*5!LRS%v=*%SQ(OkDCPzp7Coi@G`P6$a9z(8Jb%d8Jbvt%;4bL#lU}!e-(cx
ze=NTtKQrGQzFk1m7V*_9aIiCoGjS@)X67a5=O(T&GB7gIH8jvQGPtni!oCZ;FKkw2
zXJ=3ZsYuSxD=sZ4$;{8grc8$osEm<QQ5T_12Fb8p7aJ~Y1sb{IV$+3P7dB|ILR8ml
zB9t2-Dc^8m6Hwv43mY#sUu@K3fha~&D}hU`JTuTgKxaVwlY*pd&xH*afLMzO;vIFc
z#R(Yx$;;16RY*=ONlni$s?=bFgpMv|=xo2R0qCXuz!2I1bm;~zP$=`?WZ?h9|DFF6
t|6BeS{EzwX@!tf7@<D!e7G_RH4iLc(BG^C#D~MnL5zHWhiJ6&`69BvJps@e|

diff --git a/database/models.py b/database/models.py
index 947e170..138265a 100644
--- a/database/models.py
+++ b/database/models.py
@@ -27,6 +27,7 @@ class Transaction(BaseModel):
     sum = FloatField(column_name='TransactionSum', null=False, default=0)
     user = ForeignKeyField(User, unique=False)
     date = DateField(column_name='Date', default=datetime.datetime.today())
+    time = TimeField(column_name='time', default=datetime.datetime.now())
     category = TextField(column_name='category', default='none category')
 
     class Meta:
diff --git a/main.py b/main.py
index 74e3c25..a6d289b 100644
--- a/main.py
+++ b/main.py
@@ -32,7 +32,7 @@ def main_bot(messages):
                 mes = 'Баланс: '
             elif locales.LOCALE == 'en':
                 mes = 'Balance: '
-            mes += to_fixed(user.balance, 2)
+            mes += to_fixed(user.balance, 2) + '₽'
             bot.send_message(message.chat.id, mes)
         elif message.text.split(' ')[0] == '/add' or message.text.split(' ')[0] == '+':
             if len(message.text.split(' ')) < 2:
@@ -59,7 +59,7 @@ def main_bot(messages):
                         type='incom',
                         user=User.get(username=message.chat.id)
                     )
-                bot.send_message(message.chat.id, to_fixed(user.balance, 2))
+                bot.send_message(message.chat.id, to_fixed(user.balance, 2) + '₽')
         elif message.text.split(' ')[0] == '/rm' or message.text.split(' ')[0] == '-':
             if len(message.text.split(' ')) < 2:
                 mes = None
@@ -85,7 +85,7 @@ def main_bot(messages):
                         type='consuption',
                         user=User.get(username=message.chat.id)
                     )
-                bot.send_message(message.chat.id, to_fixed(user.balance, 2))
+                bot.send_message(message.chat.id, to_fixed(user.balance, 2) + '₽')
         elif message.text.split(' ')[0] == '/addtoday':
             transactions = Transaction.select().where(
                 Transaction.type == 'incom',
@@ -98,10 +98,17 @@ def main_bot(messages):
             elif locales.LOCALE == 'en':
                 mes = 'Your incomes today:\n\n'
             iteration = 1
+            if len(transactions) == 0:
+                if locales.LOCALE == 'ru':
+                    mes += 'Нет доходов за сегодня'
+                elif locales.LOCALE == 'en':
+                    mes += 'No incomes today'
             for i in transactions:
-                mes += str(iteration) + '. 􀅼' + str(i.sum) + '􁑆   ' + i.category + '\n\n'
+                mes += '-------------------------------------\n'
+                mes += str(iteration) + '  ||  +' + str(i.sum) + '₽  ||  ' + i.category + '  ||  ' + str(i.date) \
+                    + '  ||  ' + i.time.strftime('%H:%M:%S') + '  ||\n'
                 iteration += 1
-
+            mes += '-------------------------------------\n'
             bot.send_message(message.chat.id, mes)
         elif message.text.split(' ')[0] == '/rmtoday':
             transactions = Transaction.select().where(
@@ -115,10 +122,17 @@ def main_bot(messages):
             elif locales.LOCALE == 'en':
                 mes = 'Your consuptions today:\n\n'
             iteration = 1
+            if len(transactions) == 0:
+                if locales.LOCALE == 'ru':
+                    mes += 'Нет расходов за сегодня'
+                elif locales.LOCALE == 'en':
+                    mes += 'No consuptions today'
             for i in transactions:
-                mes += str(iteration) + '. 􀅽' + str(i.sum) + '􁑆   ' + i.category + '\n\n'
+                mes += '-------------------------------------\n'
+                mes += str(iteration) + '  ||  -' + str(i.sum) + '₽  ||  ' + i.category + '  ||  ' + str(i.date) \
+                    + '  ||  ' + i.time.strftime('%H:%M:%S') + '  ||\n'
                 iteration += 1
-
+            mes += '-------------------------------------\n'
             bot.send_message(message.chat.id, mes)
         elif message.text.split(' ')[0] == '/rmall':
             transactions = Transaction.select().where(
@@ -131,10 +145,17 @@ def main_bot(messages):
             elif locales.LOCALE == 'en':
                 mes = 'Your all consuptions:\n\n'
             iteration = 1
+            if len(transactions) == 0:
+                if locales.LOCALE == 'ru':
+                    mes += 'Нет расходов за все время'
+                elif locales.LOCALE == 'en':
+                    mes += 'No consuptions for all time'
             for i in transactions:
-                mes += str(iteration) + '. 􀅽' + str(i.sum) + '􁑆   ' + i.category + '\n\n'
+                mes += '-------------------------------------\n'
+                mes += str(iteration) + '  ||  -' + str(i.sum) + '+  ||  ' + i.category + '  ||  ' + str(i.date) \
+                    + '  ||  ' + i.time.strftime('%H:%M:%S') + '  ||\n'
                 iteration += 1
-
+            mes += '-------------------------------------\n'
             bot.send_message(message.chat.id, mes)
         elif message.text.split(' ')[0] == '/addall':
             transactions = Transaction.select().where(
@@ -147,11 +168,70 @@ def main_bot(messages):
             elif locales.LOCALE == 'en':
                 mes = 'Your all incomes:\n\n'
             iteration = 1
+            if len(transactions) == 0:
+                if locales.LOCALE == 'ru':
+                    mes += 'Нет доходов за все время'
+                elif locales.LOCALE == 'en':
+                    mes += 'No incomes for all time'
             for i in transactions:
-                mes += str(iteration) + '. 􀅼' + str(i.sum) + '􁑆   ' + i.category + '\n\n'
+                mes += '-------------------------------------\n'
+                mes += str(iteration) + '  ||  +' + str(i.sum) + '₽  ||  ' + i.category + '  ||  ' + str(i.date) \
+                    + '  ||  ' + i.time.strftime('%H:%M:%S') + '  ||\n'
                 iteration += 1
-
+            mes += '-------------------------------------\n'
             bot.send_message(message.chat.id, mes)
+        elif message.text.split(' ')[0] == '/rmmonth':
+            transactions = Transaction.select().where(
+                Transaction.user == User.get(username=message.chat.id),
+                Transaction.type == 'consuption'
+            )
+            mes = ''
+            if locales.LOCALE == 'ru':
+                mes = 'Ваши расходы за этот месяц:\n\n'
+            elif locales.LOCALE == 'en':
+                mes = 'Your consuptions for this month:\n\n'
+            iteration = 1
+            if len(transactions) == 0:
+                if locales.LOCALE == 'ru':
+                    mes += 'Нет расходов за этот месяц\n'
+                elif locales.LOCALE == 'en':
+                    mes += 'No consuptions for this month\n'
+
+            for i in transactions:
+                if str(i.date).split('-')[1] == datetime.datetime.today().strftime('%m'):
+                    mes += '-------------------------------------\n'
+                    mes += str(iteration) + '  ||  -' + str(i.sum) + '₽  ||  ' + i.category + '  ||  ' + str(i.date) \
+                        + '  ||  ' + i.time.strftime('%H:%M:%S') + '  ||\n'
+                    iteration += 1
+            mes += '-------------------------------------\n'
+            bot.send_message(message.chat.id, mes)
+        elif message.text.split(' ')[0] == '/addmonth':
+            transactions = Transaction.select().where(
+                Transaction.user == User.get(username=message.chat.id),
+                Transaction.type == 'incom'
+            )
+            mes = ''
+            if locales.LOCALE == 'ru':
+                mes = 'Ваши доходы за этот месяц:\n\n'
+            elif locales.LOCALE == 'en':
+                mes = 'Your incomes for this month:\n\n'
+            iteration = 1
+            if len(transactions) == 0:
+                if locales.LOCALE == 'ru':
+                    mes += 'Нет доходов за этот месяц\n'
+                elif locales.LOCALE == 'en':
+                    mes += 'No incomes for this month\n'
+
+            for i in transactions:
+                if str(i.date).split('-')[1] == datetime.datetime.today().strftime('%m'):
+                    mes += '-------------------------------------\n'
+                    mes += str(iteration) + '  ||  +' + str(i.sum) + '₽  ||  ' + i.category + '  ||  ' + str(i.date) \
+                        + '  ||  ' + i.time.strftime('%H:%M:%S') + '  ||\n'
+                    iteration += 1
+            mes += '-------------------------------------\n'
+            bot.send_message(message.chat.id, mes)
+        elif message.text.split(' ')[0] == '/analysismonth':
+            bot.send_message(message.chat.id, 'pass')
         else:
             mes = None
             if locales.LOCALE == 'ru':