Working on graph

Pipfile.lock

@@ -1,11 +1,11 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "f1736fd02266147bd4504b42fa289bb3bb9c6141e05e0cd0367e7f133d1cd790"
+            "sha256": "72f98bebfb64233485a7d9328fe3c123f15206092838f23cbf68fd818f6ee349"
         },
         "pipfile-spec": 6,
         "requires": {
-            "python_version": "3.7"
+            "python_version": "3.8"
         },
         "sources": [
             {

app/__main__.py

@@ -76,7 +76,7 @@ def job_send_telegram_update(state_id, group_id, resource_type):
 
 def graph():
     """make graph"""
-    date = datetime.now() + timedelta(1)
+    date = datetime.now()# + timedelta(1)
     region_4001 = get_resources(4001, date, 0)
     region_4002 = get_resources(4002, date, 0)
     region_4003 = get_resources(4003, date, 0)
@@ -104,7 +104,7 @@ def graph():
     end_date_time = date.replace(hour=19, minute=0, second=0, microsecond=0)
     start_date_time = end_date_time - timedelta(hours=24)
     ax.set_xlim([start_date_time, end_date_time])
-    ax.set_ylim([0, 2500])
+    ax.set_ylim([0, 2700])
 
     # style
     plt.style.use('seaborn-darkgrid')
@@ -146,7 +146,8 @@ if __name__ == '__main__':
     # job_refill_resource(2788, 4002, 0)
     # job_check_resources(2788, 4002, 0, False) # VN
     # job_check_resources(2620, 4002, 0, False) # Zeelandiae
-    # graph()
+    graph()
+    exit()
     # get_resources(4001, datetime.now(), 0)
 
     # VN

app/database.py

@@ -44,7 +44,7 @@ def save_region(session, region_id, region_dict):
 
 def get_resources(region_id, date, resource_type):
     """Get resources on a date"""
-    end_date_time = date.replace(hour=18, minute=0, second=0, microsecond=0)
+    end_date_time = date.replace(hour=19, minute=0, second=0, microsecond=0)
     start_date_time = end_date_time - timedelta(1)
     session = SESSION()
     resource = {}
@@ -55,17 +55,13 @@ def get_resources(region_id, date, resource_type):
         .filter(ResourceTrack.resource_type == resource_type) \
         .filter(ResourceTrack.date_time >= start_date_time) \
         .filter(ResourceTrack.date_time <= end_date_time) \
+        .order_by(ResourceTrack.date_time.desc()) \
         .all()
-    start_limit = resource_stats[0].explored
     for resource_stat in resource_stats:
         time = resource_stat.resource_track.date_time
         resource[time] = resource_stat.explored + resource_stat.limit_left
     session.close()
-    new_resource = {}
-    for time, amount in resource.items():
-        new_time = time.replace(tzinfo=timezone.utc).astimezone(tz=None) + timedelta(hours=1)
-        new_resource[new_time] = amount - start_limit
-    return new_resource
+    return resource
 
 
 def _get_state_stat(session, state_id, resource_type, date_time):
@@ -110,10 +106,10 @@ def get_work_percentage(state_id, resource_type, end_date_time, hours, times):
     for i in range(0, times):
         data[i]['progress'] = {}
         reset_date_time = data[i+1]['date']
-        if reset_date_time.hour >= 18:
-            reset_date_time = reset_date_time.replace(hour=18) + timedelta(1)
+        if reset_date_time.hour >= 19:
+            reset_date_time = reset_date_time.replace(hour=19) + timedelta(1)
         else:
-            reset_date_time = reset_date_time.replace(hour=18)
+            reset_date_time = reset_date_time.replace(hour=19)
         time_left = reset_date_time - data[i]['date']
         if time_left.seconds != 0:
             seconds_left = time_left.seconds