diff --git a/myems-api/reports/combinedequipmentcost.py b/myems-api/reports/combinedequipmentcost.py index 64dbf462..1810508b 100644 --- a/myems-api/reports/combinedequipmentcost.py +++ b/myems-api/reports/combinedequipmentcost.py @@ -436,7 +436,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/combinedequipmentefficiency.py b/myems-api/reports/combinedequipmentefficiency.py index 0772008f..0d22ccb6 100644 --- a/myems-api/reports/combinedequipmentefficiency.py +++ b/myems-api/reports/combinedequipmentefficiency.py @@ -592,7 +592,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/combinedequipmentenergycategory.py b/myems-api/reports/combinedequipmentenergycategory.py index e3793b05..f52806be 100644 --- a/myems-api/reports/combinedequipmentenergycategory.py +++ b/myems-api/reports/combinedequipmentenergycategory.py @@ -450,7 +450,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/combinedequipmentenergyitem.py b/myems-api/reports/combinedequipmentenergyitem.py index 239bc7a4..e32efa7e 100644 --- a/myems-api/reports/combinedequipmentenergyitem.py +++ b/myems-api/reports/combinedequipmentenergyitem.py @@ -440,7 +440,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/combinedequipmentincome.py b/myems-api/reports/combinedequipmentincome.py index ae6c629f..d6333bbf 100644 --- a/myems-api/reports/combinedequipmentincome.py +++ b/myems-api/reports/combinedequipmentincome.py @@ -416,7 +416,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/combinedequipmentload.py b/myems-api/reports/combinedequipmentload.py index e5d46d7c..4ff9c702 100644 --- a/myems-api/reports/combinedequipmentload.py +++ b/myems-api/reports/combinedequipmentload.py @@ -436,7 +436,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/combinedequipmentoutput.py b/myems-api/reports/combinedequipmentoutput.py index f16d5316..826d148b 100644 --- a/myems-api/reports/combinedequipmentoutput.py +++ b/myems-api/reports/combinedequipmentoutput.py @@ -416,7 +416,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/combinedequipmentsaving.py b/myems-api/reports/combinedequipmentsaving.py index 1eac1d8a..b18c8861 100644 --- a/myems-api/reports/combinedequipmentsaving.py +++ b/myems-api/reports/combinedequipmentsaving.py @@ -565,7 +565,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/combinedequipmentstatistics.py b/myems-api/reports/combinedequipmentstatistics.py index 3b07ce15..9596154f 100644 --- a/myems-api/reports/combinedequipmentstatistics.py +++ b/myems-api/reports/combinedequipmentstatistics.py @@ -442,7 +442,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/equipmentcost.py b/myems-api/reports/equipmentcost.py index 7162ff30..46e34253 100644 --- a/myems-api/reports/equipmentcost.py +++ b/myems-api/reports/equipmentcost.py @@ -411,7 +411,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/equipmentefficiency.py b/myems-api/reports/equipmentefficiency.py index 6fd438fa..ff504823 100644 --- a/myems-api/reports/equipmentefficiency.py +++ b/myems-api/reports/equipmentefficiency.py @@ -582,7 +582,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/equipmentenergycategory.py b/myems-api/reports/equipmentenergycategory.py index b7e7f01d..f380fc4f 100644 --- a/myems-api/reports/equipmentenergycategory.py +++ b/myems-api/reports/equipmentenergycategory.py @@ -425,7 +425,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/equipmentenergyitem.py b/myems-api/reports/equipmentenergyitem.py index 825ec9e8..bdf1b2fe 100644 --- a/myems-api/reports/equipmentenergyitem.py +++ b/myems-api/reports/equipmentenergyitem.py @@ -417,7 +417,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/equipmentincome.py b/myems-api/reports/equipmentincome.py index 6c8a09f4..0c1234d4 100644 --- a/myems-api/reports/equipmentincome.py +++ b/myems-api/reports/equipmentincome.py @@ -392,7 +392,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/equipmentload.py b/myems-api/reports/equipmentload.py index c392f148..622d1bb0 100644 --- a/myems-api/reports/equipmentload.py +++ b/myems-api/reports/equipmentload.py @@ -414,7 +414,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/equipmentoutput.py b/myems-api/reports/equipmentoutput.py index 0489bc1a..9bbdbec1 100644 --- a/myems-api/reports/equipmentoutput.py +++ b/myems-api/reports/equipmentoutput.py @@ -392,7 +392,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/equipmentsaving.py b/myems-api/reports/equipmentsaving.py index bb3dd551..a3e7cd35 100644 --- a/myems-api/reports/equipmentsaving.py +++ b/myems-api/reports/equipmentsaving.py @@ -539,7 +539,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/equipmentstatistics.py b/myems-api/reports/equipmentstatistics.py index f191ad41..804f2671 100644 --- a/myems-api/reports/equipmentstatistics.py +++ b/myems-api/reports/equipmentstatistics.py @@ -420,7 +420,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/metercost.py b/myems-api/reports/metercost.py index 3c32b144..7c3c7085 100644 --- a/myems-api/reports/metercost.py +++ b/myems-api/reports/metercost.py @@ -393,7 +393,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/meterenergy.py b/myems-api/reports/meterenergy.py index 5e5fd21a..6b452596 100644 --- a/myems-api/reports/meterenergy.py +++ b/myems-api/reports/meterenergy.py @@ -334,7 +334,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/meterrealtime.py b/myems-api/reports/meterrealtime.py index 1c21eab7..92eccfd0 100644 --- a/myems-api/reports/meterrealtime.py +++ b/myems-api/reports/meterrealtime.py @@ -155,7 +155,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/metertrend.py b/myems-api/reports/metertrend.py index b4ea8682..b6e97d71 100644 --- a/myems-api/reports/metertrend.py +++ b/myems-api/reports/metertrend.py @@ -190,7 +190,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/shopfloorcost.py b/myems-api/reports/shopfloorcost.py index 6a618690..3754f1ee 100644 --- a/myems-api/reports/shopfloorcost.py +++ b/myems-api/reports/shopfloorcost.py @@ -426,7 +426,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/shopfloorenergycategory.py b/myems-api/reports/shopfloorenergycategory.py index ceff62bc..82ce06d2 100644 --- a/myems-api/reports/shopfloorenergycategory.py +++ b/myems-api/reports/shopfloorenergycategory.py @@ -440,7 +440,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/shopfloorenergyitem.py b/myems-api/reports/shopfloorenergyitem.py index ed59f557..18599a21 100644 --- a/myems-api/reports/shopfloorenergyitem.py +++ b/myems-api/reports/shopfloorenergyitem.py @@ -432,7 +432,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/shopfloorload.py b/myems-api/reports/shopfloorload.py index a7c6129e..18afa989 100644 --- a/myems-api/reports/shopfloorload.py +++ b/myems-api/reports/shopfloorload.py @@ -429,7 +429,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/shopfloorsaving.py b/myems-api/reports/shopfloorsaving.py index 86a89c0a..c6df8405 100644 --- a/myems-api/reports/shopfloorsaving.py +++ b/myems-api/reports/shopfloorsaving.py @@ -554,7 +554,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/shopfloorstatistics.py b/myems-api/reports/shopfloorstatistics.py index 53f4839a..e85a4b68 100644 --- a/myems-api/reports/shopfloorstatistics.py +++ b/myems-api/reports/shopfloorstatistics.py @@ -435,7 +435,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/spacecost.py b/myems-api/reports/spacecost.py index b3393e09..57f75fee 100644 --- a/myems-api/reports/spacecost.py +++ b/myems-api/reports/spacecost.py @@ -439,7 +439,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/spaceefficiency.py b/myems-api/reports/spaceefficiency.py index f8bde890..d719b108 100644 --- a/myems-api/reports/spaceefficiency.py +++ b/myems-api/reports/spaceefficiency.py @@ -524,7 +524,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) @@ -736,5 +737,5 @@ class Reporting: reporting_start_datetime_local, reporting_end_datetime_local, period_type) - + resp.body = json.dumps(result) diff --git a/myems-api/reports/spaceenergycategory.py b/myems-api/reports/spaceenergycategory.py index d91a7d98..f1f23bd0 100644 --- a/myems-api/reports/spaceenergycategory.py +++ b/myems-api/reports/spaceenergycategory.py @@ -453,7 +453,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/spaceenergyitem.py b/myems-api/reports/spaceenergyitem.py index f8b2b7b6..bcb29ad8 100644 --- a/myems-api/reports/spaceenergyitem.py +++ b/myems-api/reports/spaceenergyitem.py @@ -445,7 +445,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/spaceincome.py b/myems-api/reports/spaceincome.py index 83d0d0df..66951485 100644 --- a/myems-api/reports/spaceincome.py +++ b/myems-api/reports/spaceincome.py @@ -420,7 +420,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/spaceload.py b/myems-api/reports/spaceload.py index 77837326..0ff06e40 100644 --- a/myems-api/reports/spaceload.py +++ b/myems-api/reports/spaceload.py @@ -429,7 +429,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/spaceoutput.py b/myems-api/reports/spaceoutput.py index 0955b525..e3da5da5 100644 --- a/myems-api/reports/spaceoutput.py +++ b/myems-api/reports/spaceoutput.py @@ -420,7 +420,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/spacesaving.py b/myems-api/reports/spacesaving.py index 9f6dc75d..9821e4e3 100644 --- a/myems-api/reports/spacesaving.py +++ b/myems-api/reports/spacesaving.py @@ -565,7 +565,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/spacestatistics.py b/myems-api/reports/spacestatistics.py index 9ccbc6b5..72c059a3 100644 --- a/myems-api/reports/spacestatistics.py +++ b/myems-api/reports/spacestatistics.py @@ -433,7 +433,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/storecost.py b/myems-api/reports/storecost.py index 55700365..db5a8153 100644 --- a/myems-api/reports/storecost.py +++ b/myems-api/reports/storecost.py @@ -424,7 +424,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/storeenergycategory.py b/myems-api/reports/storeenergycategory.py index e752e688..d794586a 100644 --- a/myems-api/reports/storeenergycategory.py +++ b/myems-api/reports/storeenergycategory.py @@ -438,7 +438,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/storeenergyitem.py b/myems-api/reports/storeenergyitem.py index 14e0ed98..d0e6eae3 100644 --- a/myems-api/reports/storeenergyitem.py +++ b/myems-api/reports/storeenergyitem.py @@ -430,7 +430,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/storeload.py b/myems-api/reports/storeload.py index 6ab5c27a..11031f8a 100644 --- a/myems-api/reports/storeload.py +++ b/myems-api/reports/storeload.py @@ -429,7 +429,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/storesaving.py b/myems-api/reports/storesaving.py index 651548c7..cd4df993 100644 --- a/myems-api/reports/storesaving.py +++ b/myems-api/reports/storesaving.py @@ -550,7 +550,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/storestatistics.py b/myems-api/reports/storestatistics.py index a5c2f16a..f6835b61 100644 --- a/myems-api/reports/storestatistics.py +++ b/myems-api/reports/storestatistics.py @@ -434,7 +434,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/tenantcost.py b/myems-api/reports/tenantcost.py index cad4f0a7..f8871102 100644 --- a/myems-api/reports/tenantcost.py +++ b/myems-api/reports/tenantcost.py @@ -424,7 +424,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/tenantenergycategory.py b/myems-api/reports/tenantenergycategory.py index c5827be6..73c69794 100644 --- a/myems-api/reports/tenantenergycategory.py +++ b/myems-api/reports/tenantenergycategory.py @@ -438,7 +438,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/tenantenergyitem.py b/myems-api/reports/tenantenergyitem.py index 515589db..3cf1f7da 100644 --- a/myems-api/reports/tenantenergyitem.py +++ b/myems-api/reports/tenantenergyitem.py @@ -430,7 +430,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/tenantload.py b/myems-api/reports/tenantload.py index c0f828bf..b37a6860 100644 --- a/myems-api/reports/tenantload.py +++ b/myems-api/reports/tenantload.py @@ -429,7 +429,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/tenantsaving.py b/myems-api/reports/tenantsaving.py index bf503c47..46dd1645 100644 --- a/myems-api/reports/tenantsaving.py +++ b/myems-api/reports/tenantsaving.py @@ -550,7 +550,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) diff --git a/myems-api/reports/tenantstatistics.py b/myems-api/reports/tenantstatistics.py index 3f189a5c..b99fcfeb 100644 --- a/myems-api/reports/tenantstatistics.py +++ b/myems-api/reports/tenantstatistics.py @@ -433,7 +433,8 @@ class Reporting: query = (" SELECT utc_date_time, actual_value " " FROM tbl_digital_value " " WHERE point_id = %s " - " AND utc_date_time BETWEEN %s AND %s ") + " AND utc_date_time BETWEEN %s AND %s " + " ORDER BY utc_date_time ") cursor_historical.execute(query, (point['id'], reporting_start_datetime_utc, reporting_end_datetime_utc))