Merge branch 'develop'

myems-aggregation/carbon_dioxide_emmision_factor.py

@@ -22,7 +22,7 @@ def get_energy_category_factor(energy_category_id, start_datetime_utc, end_datet
         cursor = cnx.cursor()
         query_factors = (" SELECT kgco2e "
                          " FROM tbl_energy_categories "
-                         " WHERE energy_category_id = %s ")
+                         " WHERE id = %s ")
         cursor.execute(query_factors, (energy_category_id,))
         rows_factor = cursor.fetchone()
     except Exception as e:

myems-api/example.env

@@ -83,7 +83,6 @@ WORKING_DAY_START_TIME_LOCAL=00:00:00
 # must use the root folder of myems-admin web application
 # for example if you serve myems-admin at /var/www/html/admin
 # you should set the upload_path as below
-# todo: share upload folder with admin container on Docker
 UPLOAD_PATH=/var/www/html/admin/upload/
 
 # main currency unit