Working on Telegram update

app/__main__.py

@@ -23,8 +23,8 @@ if __name__ == '__main__':
     # jobs.check_resources(2620, 4002, 0, False) # Zeelandiae
     # app.graph()
     # get_resources(4001, datetime.now(), 0)
-    # jobs.send_telegram_update(2788, '@vn_resources', 'gold')
-    jobs.send_telegram_update(2788, '@vn_uranium_resources', 'uranium')
+    jobs.send_telegram_update(2788, '@vn_resources', 'gold')
+    # jobs.send_telegram_update(2788, '@vn_uranium_resources', 'uranium')
     sys.exit()
 
     JOBS = job_storage.get_jobs()

app/app.py

@@ -85,6 +85,12 @@ def send_telegram_update(state_id, group_id, resource_name):
     """Send resource update to telegram"""
     resource_id = RESOURCE_NAMES[resource_name]
     # date = datetime.now()
+    date = datetime.today().replace(hour=15, minute=5) - timedelta(1)
+    print(date)
+    message = database.get_work_percentage(state_id, resource_id, date, 1, 1)
+    date = datetime.today().replace(hour=16, minute=5) - timedelta(1)
+    print(date)
+    message = database.get_work_percentage(state_id, resource_id, date, 1, 1)
     date = datetime.today().replace(hour=17, minute=5) - timedelta(1)
     print(date)
     message = database.get_work_percentage(state_id, resource_id, date, 1, 1)

app/database.py

@@ -151,7 +151,7 @@ def get_work_percentage(state_id, resource_type, end_date_time, hours, times):
                 percentage = 100
             data[i]['progress'][stat.region_id] = percentage
             print('{:5} left: {:4} mined: {:4} required: {:6.2f} percentage: {:7.2f}'.format(
-                stat.region_id, stat.total(), mined, required, percentage
+                stat.region_id, next_stat.total(), mined, required, percentage
             ))
 
     message_text = ''