updated commands and files

renamed dockerfile, added support for month balance, updated readme

Author: portbusy

moneyTrackerBot renamed to Dockerfile

@@ -1,4 +1,18 @@
 # Description
+This is the first version of my telegram bot which allows a simple expenses tracker.
 
-## Installtion
-* First create the `master.txt`  and `token.txt` files, filled respectively with your master chat id and telegram bot token 
+The bot can now take income and outcome and display the current month resume; here is a list of commands:
+* `/listoutcome` print the list of current month outcome
+* `/listincome` print the list of current month income
+* `/delete +/-<income/outcome amount> <comment>` delete the specified entry
+* `/balance` print total income, total outcome and the difference between those 2 (aka balance)
+* `+<income amount> <comment>` add to the income table the amount and the comment associated
+* `-<outcome amount> <comment>` add to the outcome table the amount and the comment associated
+
+## Installation
+* First create the `master.txt`  and `token.txt` files, filled respectively with your master chat id 
+    and telegram bot token
+* `Install docker`
+* Go into the clone folder and run `docker build moneytrakerBot/`
+* Copy the container id
+* Run `docker run <container id>`

README.md

@@ -70,6 +70,8 @@ def text_handler(text, chat_id):
             message = "Current month income list:\n\n"
             for r in rows:
                 message = message + str(r).replace("(", "").replace(")", "").replace("'", "") + "\n"
+            total_income = db.get_total_income(month)
+            message = message+"\n\nTotal income: "+str(total_income)+" €"
         else:
             message = "No income to be displayed here " + emoji["openhands"]
     elif text == "/listoutcome":
@@ -80,8 +82,21 @@ def text_handler(text, chat_id):
             message = "Current month outcome list:\n\n"
             for r in rows:
                 message = message+str(r).replace("(", "").replace(")", "").replace("'", "")+"\n"
+            total_outcome = db.get_total_income(month)
+            message = message+"\n\nTotal income: "+str(total_outcome)+" €"
         else:
             message = "No income to be displayed here " + emoji["openhands"]
+    elif text == "/balance":
+        month = datetime.now().strftime("%m")
+        total_income = db.get_total_income(month)
+        if total_income is None:
+            total_income = 0.0
+        total_outcome = db.get_total_outcome(month)
+        if total_outcome is None:
+            total_outcome = 0.0
+        logging.info(total_outcome)
+        balance = total_income + total_outcome
+        message = "Current month balance: "+str(balance)+" €\n\n\nTotal income: "+str(total_income)+" €\n\nTotal outcome: "+str(total_outcome)+" €"
     handler.send_message(message, chat_id)
 
 

__pycache__/dbHelper.cpython-37.pyc

@@ -44,9 +44,24 @@ def get_income(self, month):
         rows = cur.fetchall()
         return rows
 
+    def get_total_income(self, month):
+        cur = self.conn.cursor()
+        stmt = "SELECT SUM(value) FROM income WHERE strftime('%m', date) = '" + month + "'"
+        cur.execute(stmt)
+        total = cur.fetchone()
+        return total[0]
+
     def get_outcome(self, month):
         cur = self.conn.cursor()
         stmt = "SELECT * FROM outcome WHERE strftime('%m', date) = '"+month+"'"
         cur.execute(stmt)
         rows = cur.fetchall()
         return rows
+
+    def get_total_outcome(self, month):
+        cur = self.conn.cursor()
+        stmt = "SELECT SUM(value) FROM outcome WHERE strftime('%m', date) = '" + month + "'"
+        cur.execute(stmt)
+        total = cur.fetchone()
+        return total[0]
+

__pycache__/messageHandler.cpython-37.pyc

@@ -1,5 +1,2 @@
-sqlite3
-logging
-datetime
 requests==2.22.0
 urllib3==1.24.2