Merge branch 'develop'

MyEMS · May 6, 2024 · 78139b6 · 78139b6
2 parents 18ea150 + 388aa9d
commit 78139b6
Show file tree

Hide file tree

Showing 8 changed files with 1,552 additions and 1,073 deletions.
diff --git a/myems-api/app.py b/myems-api/app.py
@@ -60,6 +60,9 @@
 from reports import microgriddetails
 from reports import microgridlist
 from reports import microgridreporting
+from reports import microgridsenergy
+from reports import microgridsbilling
+from reports import microgridscarbon
 from reports import offlinemeterbatch
 from reports import offlinemetercarbon
 from reports import offlinemetercost
@@ -992,6 +995,12 @@
               microgridlist.Reporting())
 api.add_route('/reports/microgridreporting',
               microgridreporting.Reporting())
+api.add_route('/reports/microgridsenergy',
+              microgridsenergy.Reporting())
+api.add_route('/reports/microgridsbilling',
+              microgridsbilling.Reporting())
+api.add_route('/reports/microgridscarbon',
+              microgridscarbon.Reporting())
 api.add_route('/reports/offlinemeterbatch',
               offlinemeterbatch.Reporting())
 api.add_route('/reports/offlinemetercarbon',

diff --git a/myems-api/reports/microgridsbilling.py b/myems-api/reports/microgridsbilling.py
diff --git a/myems-api/reports/microgridscarbon.py b/myems-api/reports/microgridscarbon.py
diff --git a/myems-api/reports/microgridsenergy.py b/myems-api/reports/microgridsenergy.py