diff --git a/myems-api/excelexporters/combinedequipmentenergyitem.py b/myems-api/excelexporters/combinedequipmentenergyitem.py index 690dd4d7..8f61a331 100644 --- a/myems-api/excelexporters/combinedequipmentenergyitem.py +++ b/myems-api/excelexporters/combinedequipmentenergyitem.py @@ -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 diff --git a/myems-api/reports/combinedequipmentenergycategory.py b/myems-api/reports/combinedequipmentenergycategory.py index 56872ae7..b018aa6b 100644 --- a/myems-api/reports/combinedequipmentenergycategory.py +++ b/myems-api/reports/combinedequipmentenergycategory.py @@ -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'] diff --git a/myems-api/reports/combinedequipmentenergyitem.py b/myems-api/reports/combinedequipmentenergyitem.py index 710376be..7c9c76a8 100644 --- a/myems-api/reports/combinedequipmentenergyitem.py +++ b/myems-api/reports/combinedequipmentenergyitem.py @@ -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'],