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

fixed unit issue in CombinedEquipmentCost report in API

pull/28/head
13621160019@163.com 2021-04-02 13:49:55 +08:00
parent af8be9d20e
commit 51cd31faa7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
myems-api/reports/combinedequipmentcost.py
View File

@ -573,12 +573,12 @@ class Reporting:
result['associated_equipment']['units'] = list() result['associated_equipment']['units'] = list()
result['associated_equipment']['associated_equipment_names_array'] = list() result['associated_equipment']['associated_equipment_names_array'] = list()
result['associated_equipment']['subtotals_array'] = list() result['associated_equipment']['subtotals_array'] = list()
result['associated_equipment']['total_unit'] = config.currency_unit
if energy_category_set is not None and len(energy_category_set) > 0: if energy_category_set is not None and len(energy_category_set) > 0:
for energy_category_id in energy_category_set: for energy_category_id in energy_category_set:
result['associated_equipment']['energy_category_names'].append( result['associated_equipment']['energy_category_names'].append(
energy_category_dict[energy_category_id]['name']) energy_category_dict[energy_category_id]['name'])
result['associated_equipment']['units'].append( result['associated_equipment']['units'].append(config.currency_unit)
energy_category_dict[energy_category_id]['unit_of_measure'])
result['associated_equipment']['associated_equipment_names_array'].append( result['associated_equipment']['associated_equipment_names_array'].append(
associated_equipment_data[energy_category_id]['associated_equipment_names']) associated_equipment_data[energy_category_id]['associated_equipment_names'])
result['associated_equipment']['subtotals_array'].append( result['associated_equipment']['subtotals_array'].append(