Merge pull request #326 from flask-dashboard/custom-graphs-enddate

mircealungu · web-flow · commit d9f989165f11 · 2020-04-29T10:23:36.000+02:00
Include the selected date into the custom graph end date
diff --git a/flask_monitoringdashboard/database/custom_graph.py b/flask_monitoringdashboard/database/custom_graph.py
@@ -1,3 +1,5 @@
+from datetime import timedelta
+
 from sqlalchemy.orm.exc import NoResultFound
 
 from flask_monitoringdashboard.database import CustomGraph, CustomGraphData, row2dict
@@ -43,7 +45,7 @@ def get_graph_data(db_session, graph_id, start_date, end_date):
         .filter(
             CustomGraphData.graph_id == graph_id,
             CustomGraphData.time >= start_date,
-            CustomGraphData.time <= end_date,
+            CustomGraphData.time < end_date + timedelta(days=1),
         )
         .all()
     ]

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+from datetime import timedelta`
	`2`	`+`
`1`	`3`	`from sqlalchemy.orm.exc import NoResultFound`
`2`	`4`
`3`	`5`	`from flask_monitoringdashboard.database import CustomGraph, CustomGraphData, row2dict`
`@@ -43,7 +45,7 @@ def get_graph_data(db_session, graph_id, start_date, end_date):`
`43`	`45`	`.filter(`
`44`	`46`	`CustomGraphData.graph_id == graph_id,`
`45`	`47`	`CustomGraphData.time >= start_date,`
`46`		`- CustomGraphData.time <= end_date,`
	`48`	`+ CustomGraphData.time < end_date + timedelta(days=1),`
`47`	`49`	`)`
`48`	`50`	`.all()`
`49`	`51`	`]`