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

added associated equipment data to combinedequipmentenergyitem report in API

pull/26/head
13621160019@163.com 2021-03-31 13:15:07 +08:00
parent 7800a96e64
commit 3bf04cc27d
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
myems-api/excelexporters/combinedequipmentenergyitem.py
View File

@ -483,7 +483,7 @@ def generate_excel(report,
for j in range(0, ca_len):
col = chr(ord('C') + j)
ws[col + row].font = name_font
ws[col + row].font = title_font
ws[col + row].alignment = c_c_alignment
ws[col + row] = round(associated_equipment['subtotals_array'][j][i], 2)
ws[col + row].border = f_border

14
myems-api/reports/combinedequipmentenergycategory.py
View File

@ -483,12 +483,12 @@ class Reporting:
associated_equipment['name'])
cursor_energy.execute(" SELECT SUM(actual_value) "
" FROM tbl_equipment_input_category_hourly "
" WHERE equipment_id = %s "
" AND energy_category_id = %s "
" AND start_datetime_utc >= %s "
" AND start_datetime_utc < %s "
" ORDER BY start_datetime_utc ",
" FROM tbl_equipment_input_category_hourly "
" WHERE equipment_id = %s "
" AND energy_category_id = %s "
" AND start_datetime_utc >= %s "
" AND start_datetime_utc < %s "
" ORDER BY start_datetime_utc ",
(associated_equipment['id'],
energy_category_id,
reporting_start_datetime_utc,
@ -582,7 +582,7 @@ class Reporting:
result['reporting_period']['increment_rates'].append(
(reporting[energy_category_id]['subtotal'] - base[energy_category_id]['subtotal']) /
base[energy_category_id]['subtotal']
if base[energy_category_id]['subtotal'] > 0.0 else None)
if base[energy_category_id]['subtotal'] > Decimal(0.0) else None)
result['reporting_period']['total_in_kgce'] += reporting[energy_category_id]['subtotal_in_kgce']
result['reporting_period']['total_in_kgco2e'] += reporting[energy_category_id]['subtotal_in_kgco2e']

3
myems-api/reports/combinedequipmentenergyitem.py
View File

@ -253,7 +253,6 @@ class Reporting:
for row in rows_associated_equipments:
associated_equipment_list.append({"id": row[0], "name": row[1]})
print(associated_equipment_list)
################################################################################################################
# Step 6: query base period energy input
################################################################################################################
@ -560,7 +559,7 @@ class Reporting:
result['reporting_period']['increment_rates'].append(
(reporting[energy_item_id]['subtotal'] - base[energy_item_id]['subtotal']) /
base[energy_item_id]['subtotal']
if base[energy_item_id]['subtotal'] > 0.0 else None)
if base[energy_item_id]['subtotal'] > Decimal(0.0) else None)
result['parameters'] = {
"names": parameters_data['names'],