seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop'

pull/121/MERGE
13621160019@163.com 2022-01-26 18:21:58 +08:00
parent a544b58d5f 577f937fc5
commit a93dbe2d1b
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
myems-aggregation/carbon_dioxide_emmision_factor.py
View File

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

1
myems-api/example.env
View File

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