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

Merge branch 'develop'

pull/117/head
13621160019@163.com 2021-12-30 16:15:19 +08:00
parent 283033a6c7 0e01185730
commit 66ce56b7c2
71 changed files with 479 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/views/settings/datasource/point.model.html
View File

@ -77,12 +77,12 @@
<div class="form-group"><label class="col-sm-4 control-label">{{'POINT.IS_VIRTUAL' | translate}}</label>
<div class="col-sm-8">
<div class="checkbox checkbox-success">
<input id="chk_point_isvirtual" type="checkbox" ng-model="point.is_virtual" ng-checked="point.is_virtual">
<input id="chk_point_isvirtual" type="checkbox" ng-model="point.is_virtual" ng-checked="point.is_virtual"
ng-disabled="form_point.pointobject_type.$modelValue != 'ANALOG_VALUE'">
<label for="chk_point_isvirtual">{{'POINT.IS_VIRTUAL' | translate}}</label>
</div>
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-4 control-label">{{'POINT.ADDRESS' | translate}}</label>

168
myems-api/excelexporters/equipmentefficiency.py
View File

@ -168,6 +168,8 @@ def generate_excel(report,
current_row_number += 1
category = reporting_period_data['names']
numerator_names = reporting_period_data['numerator_names']
denominator_names = reporting_period_data['denominator_names']
ca_len = len(category)
ws.row_dimensions[current_row_number].height = 80
@ -186,6 +188,29 @@ def generate_excel(report,
col = chr(ord(col) + 1)
nu_len = len(numerator_names)
for i in range(0, nu_len):
ws[col + str(current_row_number)].fill = table_fill
ws[col + str(current_row_number)].font = name_font
ws[col + str(current_row_number)].alignment = c_c_alignment
ws[col + str(current_row_number)].border = f_border
ws[col + str(current_row_number)] = \
reporting_period_data['numerator_names'][i] + " (" + reporting_period_data['numerator_units'][i] + ")"
col = chr(ord(col) + 1)
de_len = len(denominator_names)
for i in range(0, de_len):
ws[col + str(current_row_number)].fill = table_fill
ws[col + str(current_row_number)].font = name_font
ws[col + str(current_row_number)].alignment = c_c_alignment
ws[col + str(current_row_number)].border = f_border
ws[col + str(current_row_number)] = \
reporting_period_data['denominator_names'][i] + " (" + \
reporting_period_data['denominator_units'][i] + ")"
col = chr(ord(col) + 1)
current_row_number += 1
ws['B' + str(current_row_number)].font = title_font
@ -203,6 +228,22 @@ def generate_excel(report,
col = chr(ord(col) + 1)
for i in range(0, nu_len):
ws[col + str(current_row_number)].font = name_font
ws[col + str(current_row_number)].alignment = c_c_alignment
ws[col + str(current_row_number)].border = f_border
ws[col + str(current_row_number)] = round(reporting_period_data['numerator_cumulation'][i], 2)
col = chr(ord(col) + 1)
for i in range(0, de_len):
ws[col + str(current_row_number)].font = name_font
ws[col + str(current_row_number)].alignment = c_c_alignment
ws[col + str(current_row_number)].border = f_border
ws[col + str(current_row_number)] = round(reporting_period_data['denominator_cumulation'][i], 2)
col = chr(ord(col) + 1)
current_row_number += 1
ws['B' + str(current_row_number)].font = title_font
@ -222,6 +263,25 @@ def generate_excel(report,
col = chr(ord(col) + 1)
for i in range(0, nu_len):
ws[col + str(current_row_number)].font = name_font
ws[col + str(current_row_number)].alignment = c_c_alignment
ws[col + str(current_row_number)].border = f_border
ws[col + str(current_row_number)] = str(
round(reporting_period_data['increment_rates_num'][i] * 100, 2)) + '%' \
if reporting_period_data['increment_rates_num'][i] is not None else '-'
col = chr(ord(col) + 1)
for i in range(0, de_len):
ws[col + str(current_row_number)].font = name_font
ws[col + str(current_row_number)].alignment = c_c_alignment
ws[col + str(current_row_number)].border = f_border
ws[col + str(current_row_number)] = str(
round(reporting_period_data['increment_rates_den'][i] * 100, 2)) + '%' \
if reporting_period_data['increment_rates_den'][i] is not None else '-'
col = chr(ord(col) + 1)
current_row_number += 2
####################################################################################################################
@ -262,6 +322,8 @@ def generate_excel(report,
if has_values_data and has_timestamps_data:
ca_len = len(reporting_period_data['names'])
de_len = len(reporting_period_data['denominator_names'])
nu_len = len(reporting_period_data['numerator_names'])
time = reporting_period_data['timestamps'][0]
ws['B' + str(current_row_number)].font = title_font
@ -271,7 +333,7 @@ def generate_excel(report,
chart_start_row_number = current_row_number
current_row_number += ca_len * 6 + 1
current_row_number += ca_len * 6 + de_len * 6 + nu_len * 6 + 1
if has_parameters_names_and_timestamps_and_values_data:
current_sheet_parameters_row_number = current_row_number
@ -303,6 +365,26 @@ def generate_excel(report,
reporting_period_data['names'][i] + " (" + reporting_period_data['units'][i] + ")"
col = chr(ord(col) + 1)
for i in range(0, nu_len):
ws[col + str(current_row_number)].fill = table_fill
ws[col + str(current_row_number)].font = title_font
ws[col + str(current_row_number)].alignment = c_c_alignment
ws[col + str(current_row_number)].border = f_border
ws[col + str(current_row_number)] = \
reporting_period_data['numerator_names'][i] + " (" + reporting_period_data['numerator_units'][i] + ")"
col = chr(ord(col) + 1)
for i in range(0, de_len):
ws[col + str(current_row_number)].fill = table_fill
ws[col + str(current_row_number)].font = name_font
ws[col + str(current_row_number)].alignment = c_c_alignment
ws[col + str(current_row_number)].border = f_border
ws[col + str(current_row_number)] = \
reporting_period_data['denominator_names'][i] + " (" + \
reporting_period_data['denominator_units'][i] + ")"
col = chr(ord(col) + 1)
current_row_number += 1
for i in range(0, len(time)):
@ -320,6 +402,22 @@ def generate_excel(report,
if reporting_period_data['values'][j][i] is not None else 0.00
col = chr(ord(col) + 1)
for j in range(0, nu_len):
ws[col + str(current_row_number)].font = title_font
ws[col + str(current_row_number)].alignment = c_c_alignment
ws[col + str(current_row_number)].border = f_border
ws[col + str(current_row_number)] = round(reporting_period_data['numerator_values'][j][i], 2) \
if reporting_period_data['numerator_values'][j][i] is not None else 0.00
col = chr(ord(col) + 1)
for j in range(0, de_len):
ws[col + str(current_row_number)].font = title_font
ws[col + str(current_row_number)].alignment = c_c_alignment
ws[col + str(current_row_number)].border = f_border
ws[col + str(current_row_number)] = round(reporting_period_data['denominator_values'][j][i], 2) \
if reporting_period_data['denominator_values'][j][i] is not None else 0.00
col = chr(ord(col) + 1)
current_row_number += 1
table_end_row_number = current_row_number - 1
@ -338,6 +436,22 @@ def generate_excel(report,
ws[col + str(current_row_number)] = round(reporting_period_data['cumulations'][i], 2)
col = chr(ord(col) + 1)
for i in range(0, nu_len):
ws[col + str(current_row_number)].font = title_font
ws[col + str(current_row_number)].alignment = c_c_alignment
ws[col + str(current_row_number)].border = f_border
ws[col + str(current_row_number)] = round(reporting_period_data['numerator_cumulation'][i], 2)
col = chr(ord(col) + 1)
for i in range(0, de_len):
ws[col + str(current_row_number)].font = title_font
ws[col + str(current_row_number)].alignment = c_c_alignment
ws[col + str(current_row_number)].border = f_border
ws[col + str(current_row_number)] = round(reporting_period_data['denominator_cumulation'][i], 2)
col = chr(ord(col) + 1)
current_row_number += 2
format_time_width_number = 1.0
@ -386,6 +500,58 @@ def generate_excel(report,
chart_start_row_number += 6
ws.add_chart(line, chart_cell)
for i in range(0, nu_len):
line = LineChart()
line.title = 'Reporting Period Cumulative Efficiency - ' + \
reporting_period_data['numerator_names'][i] + " (" + \
reporting_period_data['numerator_units'][i] + ")"
labels = Reference(ws, min_col=2, min_row=table_start_row_number + 1, max_row=table_end_row_number)
line_data = Reference(ws, min_col=3 + i, min_row=table_start_row_number, max_row=table_end_row_number)
line.add_data(line_data, titles_from_data=True)
line.set_categories(labels)
line_data = line.series[0]
line_data.marker.symbol = "circle"
line_data.smooth = True
line.x_axis.crosses = 'min'
line.height = 8.25
line.width = format_time_width_number * len(time) if len(time) > min_len_number else min_width_number
if line.width > 24:
line.width = 24
line.dLbls = DataLabelList()
line.dLbls.dLblPos = 't'
line.dLbls.showVal = True
line.dLbls.showPercent = False
chart_col = 'B'
chart_cell = chart_col + str(chart_start_row_number)
chart_start_row_number += 6
ws.add_chart(line, chart_cell)
for i in range(0, de_len):
line = LineChart()
line.title = 'Reporting Period Cumulative Efficiency - ' + \
reporting_period_data['denominator_names'][i] + " (" + \
reporting_period_data['denominator_units'][i] + ")"
labels = Reference(ws, min_col=2, min_row=table_start_row_number + 1, max_row=table_end_row_number)
line_data = Reference(ws, min_col=3 + i, min_row=table_start_row_number, max_row=table_end_row_number)
line.add_data(line_data, titles_from_data=True)
line.set_categories(labels)
line_data = line.series[0]
line_data.marker.symbol = "circle"
line_data.smooth = True
line.x_axis.crosses = 'min'
line.height = 8.25
line.width = format_time_width_number * len(time) if len(time) > min_len_number else min_width_number
if line.width > 24:
line.width = 24
line.dLbls = DataLabelList()
line.dLbls.dLblPos = 't'
line.dLbls.showVal = True
line.dLbls.showPercent = False
chart_col = 'B'
chart_cell = chart_col + str(chart_start_row_number)
chart_start_row_number += 6
ws.add_chart(line, chart_cell)
####################################################################################################################
if has_parameters_names_and_timestamps_and_values_data:

66
myems-api/reports/equipmentefficiency.py
View File

@ -195,7 +195,7 @@ class Reporting:
################################################################################################################
# get all meters
meter_dict = dict()
query = (" SELECT m.id, m.uuid, ec.unit_of_measure "
query = (" SELECT m.id, m.uuid, ec.unit_of_measure, ec.name "
" FROM tbl_meters m, tbl_energy_categories ec "
" WHERE m.energy_category_id = ec.id ")
cursor_system.execute(query)
@ -203,10 +203,10 @@ class Reporting:
if rows_meters is not None and len(rows_meters) > 0:
for row in rows_meters:
meter_dict[row[1]] = {'id': row[0], 'unit': row[2]}
meter_dict[row[1]] = {'id': row[0], 'unit': row[2], 'name': row[3]}
# get all offline meters
offline_meter_dict = dict()
query = (" SELECT m.id, m.uuid, ec.unit_of_measure "
query = (" SELECT m.id, m.uuid, ec.unit_of_measure, ec.name "
" FROM tbl_offline_meters m, tbl_energy_categories ec "
" WHERE m.energy_category_id = ec.id ")
cursor_system.execute(query)
@ -214,10 +214,10 @@ class Reporting:
if rows_offline_meters is not None and len(rows_offline_meters) > 0:
for row in rows_offline_meters:
offline_meter_dict[row[1]] = {'id': row[0], 'unit': row[2]}
offline_meter_dict[row[1]] = {'id': row[0], 'unit': row[2], 'name': row[3]}
# get all virtual meters
virtual_meter_dict = dict()
query = (" SELECT m.id, m.uuid, ec.unit_of_measure "
query = (" SELECT m.id, m.uuid, ec.unit_of_measure, ec.name "
" FROM tbl_virtual_meters m, tbl_energy_categories ec "
" WHERE m.energy_category_id = ec.id ")
cursor_system.execute(query)
@ -225,32 +225,38 @@ class Reporting:
if rows_virtual_meters is not None and len(rows_virtual_meters) > 0:
for row in rows_virtual_meters:
virtual_meter_dict[row[1]] = {'id': row[0], 'unit': row[2]}
virtual_meter_dict[row[1]] = {'id': row[0], 'unit': row[2], 'name': row[3]}
if fraction_list is not None and len(fraction_list) > 0:
for fraction in fraction_list:
if fraction['numerator_meter_uuid'] in offline_meter_dict:
fraction['numerator_meter_name'] = offline_meter_dict[fraction['numerator_meter_uuid']]['name']
fraction['numerator_meter_id'] = offline_meter_dict[fraction['numerator_meter_uuid']]['id']
fraction['numerator_meter_unit'] = offline_meter_dict[fraction['numerator_meter_uuid']]['unit']
fraction['numerator_meter_type'] = 'offline_meter'
elif fraction['numerator_meter_uuid'] in virtual_meter_dict:
fraction['numerator_meter_name'] = virtual_meter_dict[fraction['numerator_meter_uuid']]['name']
fraction['numerator_meter_id'] = virtual_meter_dict[fraction['numerator_meter_uuid']]['id']
fraction['numerator_meter_unit'] = virtual_meter_dict[fraction['numerator_meter_uuid']]['unit']
fraction['numerator_meter_type'] = 'virtual_meter'
elif fraction['numerator_meter_uuid'] in meter_dict:
fraction['numerator_meter_name'] = meter_dict[fraction['numerator_meter_uuid']]['name']
fraction['numerator_meter_id'] = meter_dict[fraction['numerator_meter_uuid']]['id']
fraction['numerator_meter_unit'] = meter_dict[fraction['numerator_meter_uuid']]['unit']
fraction['numerator_meter_type'] = 'meter'
if fraction['denominator_meter_uuid'] in offline_meter_dict:
fraction['denominator_meter_name'] = offline_meter_dict[fraction['denominator_meter_uuid']]['name']
fraction['denominator_meter_id'] = offline_meter_dict[fraction['denominator_meter_uuid']]['id']
fraction['denominator_meter_unit'] = offline_meter_dict[fraction['denominator_meter_uuid']]['unit']
fraction['denominator_meter_type'] = 'offline_meter'
elif fraction['denominator_meter_uuid'] in virtual_meter_dict:
fraction['denominator_meter_name'] = virtual_meter_dict[fraction['denominator_meter_uuid']]['name']
fraction['denominator_meter_id'] = virtual_meter_dict[fraction['denominator_meter_uuid']]['id']
fraction['denominator_meter_unit'] = virtual_meter_dict[fraction['denominator_meter_uuid']]['unit']
fraction['denominator_meter_type'] = 'virtual_meter'
elif fraction['denominator_meter_uuid'] in meter_dict:
fraction['denominator_meter_name'] = meter_dict[fraction['denominator_meter_uuid']]['name']
fraction['denominator_meter_id'] = meter_dict[fraction['denominator_meter_uuid']]['id']
fraction['denominator_meter_unit'] = meter_dict[fraction['denominator_meter_uuid']]['unit']
fraction['denominator_meter_type'] = 'meter'
@ -406,6 +412,10 @@ class Reporting:
for fraction in fraction_list:
reporting[fraction['id']] = dict()
reporting[fraction['id']]['name'] = fraction['name']
reporting[fraction['id']]['numerator_name'] = fraction['numerator_meter_name']
reporting[fraction['id']]['numerator_unit'] = fraction['numerator_meter_unit']
reporting[fraction['id']]['denominator_name'] = fraction['denominator_meter_name']
reporting[fraction['id']]['denominator_unit'] = fraction['denominator_meter_unit']
reporting[fraction['id']]['unit'] = fraction['numerator_meter_unit'] + '/' + \
fraction['denominator_meter_unit']
reporting[fraction['id']]['numerator_timestamps'] = list()
@ -636,10 +646,23 @@ class Reporting:
result['reporting_period_efficiency'] = dict()
result['reporting_period_efficiency']['names'] = list()
result['reporting_period_efficiency']['units'] = list()
result['reporting_period_efficiency']['numerator_names'] = list()
result['reporting_period_efficiency']['numerator_units'] = list()
result['reporting_period_efficiency']['denominator_names'] = list()
result['reporting_period_efficiency']['denominator_units'] = list()
result['reporting_period_efficiency']['timestamps'] = list()
result['reporting_period_efficiency']['values'] = list()
result['reporting_period_efficiency']['numerator_timestamps'] = list()
result['reporting_period_efficiency']['numerator_values'] = list()
result['reporting_period_efficiency']['denominator_timestamps'] = list()
result['reporting_period_efficiency']['denominator_values'] = list()
result['reporting_period_efficiency']['cumulations'] = list()
result['reporting_period_efficiency']['numerator_cumulation'] = list()
result['reporting_period_efficiency']['denominator_cumulation'] = list()
result['reporting_period_efficiency']['increment_rates'] = list()
result['reporting_period_efficiency']['increment_rates_num'] = list()
result['reporting_period_efficiency']['increment_rates_den'] = list()
if fraction_list is not None and len(fraction_list) > 0:
for fraction in fraction_list:
result['base_period_efficiency']['timestamps'].append(base[fraction['id']]['timestamps'])
@ -647,12 +670,43 @@ class Reporting:
result['base_period_efficiency']['cumulations'].append(base[fraction['id']]['cumulation'])
result['reporting_period_efficiency']['names'].append(reporting[fraction['id']]['name'])
result['reporting_period_efficiency']['units'].append(reporting[fraction['id']]['unit'])
result['reporting_period_efficiency']['numerator_names'].append(
reporting[fraction['id']]['numerator_name'])
result['reporting_period_efficiency']['numerator_units'].append(
reporting[fraction['id']]['numerator_unit'])
result['reporting_period_efficiency']['denominator_names'].append(
reporting[fraction['id']]['denominator_name'])
result['reporting_period_efficiency']['denominator_units'].append(
reporting[fraction['id']]['denominator_unit'])
result['reporting_period_efficiency']['timestamps'].append(reporting[fraction['id']]['timestamps'])
result['reporting_period_efficiency']['values'].append(reporting[fraction['id']]['values'])
result['reporting_period_efficiency']['numerator_timestamps'].append(
reporting[fraction['id']]['numerator_timestamps'])
result['reporting_period_efficiency']['numerator_values'].append(
reporting[fraction['id']]['numerator_values'])
result['reporting_period_efficiency']['denominator_timestamps'].append(
reporting[fraction['id']]['denominator_timestamps'])
result['reporting_period_efficiency']['denominator_values'].append(
reporting[fraction['id']]['denominator_values'])
result['reporting_period_efficiency']['cumulations'].append(reporting[fraction['id']]['cumulation'])
result['reporting_period_efficiency']['numerator_cumulation'].append(
reporting[fraction['id']]['numerator_cumulation'])
result['reporting_period_efficiency']['denominator_cumulation'].append(
reporting[fraction['id']]['denominator_cumulation'])
result['reporting_period_efficiency']['increment_rates'].append(
(reporting[fraction['id']]['cumulation'] - base[fraction['id']]['cumulation']) /
base[fraction['id']]['cumulation'] if base[fraction['id']]['cumulation'] > Decimal(0.0) else None)
result['reporting_period_efficiency']['increment_rates_num'].append(
(reporting[fraction['id']]['numerator_cumulation'] - base[fraction['id']]['numerator_cumulation']) /
base[fraction['id']]['numerator_cumulation'] if base[fraction['id']]['numerator_cumulation'] >
Decimal(0.0) else None)
result['reporting_period_efficiency']['increment_rates_den'].append(
(reporting[fraction['id']]['denominator_cumulation'] -
base[fraction['id']]['denominator_cumulation']) /
base[fraction['id']]['denominator_cumulation'] if base[fraction['id']]['denominator_cumulation'] >
Decimal(0.0) else None)
result['parameters'] = {
"names": parameters_data['names'],

4
web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js
View File

@ -143,7 +143,7 @@ const CombinedEquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -220,7 +220,7 @@ const CombinedEquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCost.js
View File

@ -295,7 +295,7 @@ const CombinedEquipmentCost = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -554,7 +554,7 @@ const CombinedEquipmentCost = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {
toast.error(json.description)

6
web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEfficiency.js
View File

@ -203,7 +203,7 @@ const CombinedEquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
}
// hide export buttion
// hide export button
setExportButtonHidden(true)
} else {
toast.error(json.description)
@ -296,7 +296,7 @@ const CombinedEquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -469,7 +469,7 @@ const CombinedEquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyCategory.js
View File

@ -298,7 +298,7 @@ const CombinedEquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) =>
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -540,7 +540,7 @@ const CombinedEquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) =>
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyItem.js
View File

@ -291,7 +291,7 @@ const CombinedEquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -497,7 +497,7 @@ const CombinedEquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentIncome.js
View File

@ -294,7 +294,7 @@ const CombinedEquipmentIncome = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -518,7 +518,7 @@ const CombinedEquipmentIncome = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentLoad.js
View File

@ -291,7 +291,7 @@ const CombinedEquipmentLoad = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -506,7 +506,7 @@ const CombinedEquipmentLoad = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentOutput.js
View File

@ -290,7 +290,7 @@ const CombinedEquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -464,7 +464,7 @@ const CombinedEquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentSaving.js
View File

@ -297,7 +297,7 @@ const CombinedEquipmentSaving = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -503,7 +503,7 @@ const CombinedEquipmentSaving = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentStatistics.js
View File

@ -291,7 +291,7 @@ const CombinedEquipmentStatistics = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -474,7 +474,7 @@ const CombinedEquipmentStatistics = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Equipment/EquipmentBatch.js
View File

@ -143,7 +143,7 @@ const EquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -220,7 +220,7 @@ const EquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Equipment/EquipmentCost.js
View File

@ -291,7 +291,7 @@ const EquipmentCost = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -495,7 +495,7 @@ const EquipmentCost = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

114
web/src/components/MyEMS/Equipment/EquipmentEfficiency.js
View File

@ -77,6 +77,8 @@ const EquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
//Results
const [cardSummaryList, setCardSummaryList] = useState([]);
const [totalOutput, settotalOutput] = useState({});
const [totalConsumption, settotalConsumption] = useState({});
const [equipmentLineChartLabels, setEquipmentLineChartLabels] = useState([]);
const [equipmentLineChartData, setEquipmentLineChartData] = useState({});
const [equipmentLineChartOptions, setEquipmentLineChartOptions] = useState([]);
@ -197,7 +199,7 @@ const EquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
}
// hide export buttion
// hide export button
setExportButtonHidden(true)
} else {
toast.error(json.description)
@ -290,7 +292,7 @@ const EquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -330,18 +332,49 @@ const EquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
cardSummaryItem['increment_rate'] = parseFloat(json['reporting_period_efficiency']['increment_rates'][index] * 100).toFixed(2) + "%";
cardSummaryArray.push(cardSummaryItem);
});
setCardSummaryList(cardSummaryArray);
let totalOutput = {}
json['reporting_period_efficiency']['numerator_names'].forEach((currentValue, index) => {
totalOutput['name'] = json['reporting_period_efficiency']['numerator_names'][index];
totalOutput['unit'] = json['reporting_period_efficiency']['numerator_units'][index];
totalOutput['cumulation'] = json['reporting_period_efficiency']['numerator_cumulation'][index];
totalOutput['increment_rate'] = parseFloat(json['reporting_period_efficiency']['increment_rates_num'][index] * 100).toFixed(2) + "%";
});
settotalOutput(totalOutput);
let totalConsumption = {}
json['reporting_period_efficiency']['denominator_names'].forEach((currentValue, index) => {
totalConsumption['name'] = json['reporting_period_efficiency']['denominator_names'][index];
totalConsumption['unit'] = json['reporting_period_efficiency']['denominator_units'][index];
totalConsumption['cumulation'] = json['reporting_period_efficiency']['denominator_cumulation'][index];
totalConsumption['increment_rate'] = parseFloat(json['reporting_period_efficiency']['increment_rates_den'][index] * 100).toFixed(2) + "%";
});
settotalConsumption(totalConsumption);
let timestamps = {}
json['reporting_period_efficiency']['timestamps'].forEach((currentValue, index) => {
timestamps['a' + index] = currentValue;
});
json['reporting_period_efficiency']['numerator_timestamps'].forEach((currentValue, index) => {
timestamps['b' + index] = currentValue;
});
json['reporting_period_efficiency']['denominator_timestamps'].forEach((currentValue, index) => {
timestamps['c' + index] = currentValue;
});
setEquipmentLineChartLabels(timestamps);
let values = {}
json['reporting_period_efficiency']['values'].forEach((currentValue, index) => {
values['a' + index] = currentValue;
});
json['reporting_period_efficiency']['numerator_values'].forEach((currentValue, index) => {
values['b' + index] = currentValue;
});
json['reporting_period_efficiency']['denominator_values'].forEach((currentValue, index) => {
values['c' + index] = currentValue;
});
setEquipmentLineChartData(values);
let names = Array();
@ -349,6 +382,14 @@ const EquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
let unit = json['reporting_period_efficiency']['units'][index];
names.push({ 'value': 'a' + index, 'label': currentValue + ' (' + unit + ')'});
});
json['reporting_period_efficiency']['numerator_names'].forEach((currentValue, index) => {
let unit = json['reporting_period_efficiency']['numerator_units'][index];
names.push({ 'value': 'b' + index, 'label': currentValue + ' (' + unit + ')'});
});
json['reporting_period_efficiency']['denominator_names'].forEach((currentValue, index) => {
let unit = json['reporting_period_efficiency']['denominator_units'][index];
names.push({ 'value': 'c' + index, 'label': currentValue + ' (' + unit + ')'});
});
setEquipmentLineChartOptions(names);
timestamps = {}
@ -386,7 +427,20 @@ const EquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
detailed_value['a' + parameterIndex] = null;
};
});
json['reporting_period_efficiency']['numerator_values'].forEach((currentValue, parameterIndex) => {
if (json['reporting_period_efficiency']['numerator_values'][parameterIndex][timestampIndex] != null) {
detailed_value['b' + parameterIndex] = json['reporting_period_efficiency']['numerator_values'][parameterIndex][timestampIndex];
} else {
detailed_value['b' + parameterIndex] = null;
};
});
json['reporting_period_efficiency']['denominator_values'].forEach((currentValue, parameterIndex) => {
if (json['reporting_period_efficiency']['denominator_values'][parameterIndex][timestampIndex] != null) {
detailed_value['c' + parameterIndex] = json['reporting_period_efficiency']['denominator_values'][parameterIndex][timestampIndex];
} else {
detailed_value['c' + parameterIndex] = null;
};
});
detailed_value_list.push(detailed_value);
});
};
@ -397,6 +451,13 @@ const EquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
json['reporting_period_efficiency']['cumulations'].forEach((currentValue, index) => {
detailed_value['a' + index] = currentValue;
});
json['reporting_period_efficiency']['numerator_cumulation'].forEach((currentValue, index) => {
detailed_value['b' + index] = currentValue;
});
json['reporting_period_efficiency']['denominator_cumulation'].forEach((currentValue, index) => {
detailed_value['c' + index] = currentValue;
});
detailed_value_list.push(detailed_value);
setDetailedDataTableData(detailed_value_list);
@ -421,6 +482,37 @@ const EquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
}
})
});
json['reporting_period_efficiency']['numerator_names'].forEach((currentValue, index) => {
let unit = json['reporting_period_efficiency']['numerator_units'][index];
detailed_column_list.push({
dataField: 'b' + index,
text: currentValue + ' (' + unit + ')',
sort: true,
formatter: function (decimalValue) {
if (decimalValue !== null) {
return decimalValue.toFixed(2);
} else {
return null;
}
}
})
});
json['reporting_period_efficiency']['denominator_names'].forEach((currentValue, index) => {
let unit = json['reporting_period_efficiency']['denominator_units'][index];
detailed_column_list.push({
dataField: 'c' + index,
text: currentValue + ' (' + unit + ')',
sort: true,
formatter: function (decimalValue) {
if (decimalValue !== null) {
return decimalValue.toFixed(2);
} else {
return null;
}
}
})
});
setDetailedDataTableColumns(detailed_column_list);
setExcelBytesBase64(json['excel_bytes_base64']);
@ -429,7 +521,7 @@ const EquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {
@ -616,6 +708,20 @@ const EquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
{cardSummaryItem['cumulation'] && <CountUp end={cardSummaryItem['cumulation']} duration={2} prefix="" separator="," decimal="." decimals={2} />}
</CardSummary>
))}
<CardSummary
rate={totalOutput['increment_rate'] || ''}
title={t('Reporting Period Output CATEGORY UNIT', { 'CATEGORY': totalOutput['name'], 'UNIT': '(' + totalOutput['unit'] + ')' })}
color="success" >
{totalOutput['cumulation'] && <CountUp end={totalOutput['cumulation']} duration={2} prefix="" separator="," decimal="." decimals={2} />}
</CardSummary>
<CardSummary
rate={totalConsumption['increment_rate'] || ''}
title={t('Reporting Period Consumption CATEGORY UNIT', { 'CATEGORY': totalConsumption['name'], 'UNIT': '(' + totalConsumption['unit'] + ')' })}
color="success" >
{totalConsumption['cumulation'] && <CountUp end={totalConsumption['cumulation']} duration={2} prefix="" separator="," decimal="." decimals={2} />}
</CardSummary>
</div>
<LineChart reportingTitle={t('Reporting Period Cumulative Efficiency VALUE UNIT', { 'VALUE': null, 'UNIT': null })}
baseTitle=''

4
web/src/components/MyEMS/Equipment/EquipmentEnergyCategory.js
View File

@ -296,7 +296,7 @@ const EquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -498,7 +498,7 @@ const EquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Equipment/EquipmentEnergyItem.js
View File

@ -289,7 +289,7 @@ const EquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -458,7 +458,7 @@ const EquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Equipment/EquipmentIncome.js
View File

@ -291,7 +291,7 @@ const EquipmentIncome = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -460,7 +460,7 @@ const EquipmentIncome = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Equipment/EquipmentLoad.js
View File

@ -287,7 +287,7 @@ const EquipmentLoad = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -440,7 +440,7 @@ const EquipmentLoad = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Equipment/EquipmentOutput.js
View File

@ -287,7 +287,7 @@ const EquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -420,7 +420,7 @@ const EquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Equipment/EquipmentSaving.js
View File

@ -294,7 +294,7 @@ const EquipmentSaving = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -460,7 +460,7 @@ const EquipmentSaving = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Equipment/EquipmentStatistics.js
View File

@ -289,7 +289,7 @@ const EquipmentStatistics = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -433,7 +433,7 @@ const EquipmentStatistics = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

6
web/src/components/MyEMS/Equipment/EquipmentTracking.js
View File

@ -121,7 +121,7 @@ const EquipmentTracking = ({ setRedirect, setRedirectUrl, t }) => {
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {
toast.error(json.description)
@ -214,7 +214,7 @@ const EquipmentTracking = ({ setRedirect, setRedirectUrl, t }) => {
let selectedSpaceID = value[value.length - 1];
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// begin of getting equipment list
let isResponseOK = false;
@ -253,7 +253,7 @@ const EquipmentTracking = ({ setRedirect, setRedirectUrl, t }) => {
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {
toast.error(json.description)

4
web/src/components/MyEMS/FDD/CombinedEquipmentFault.js
View File

@ -345,7 +345,7 @@ const CombinedEquipmentFault = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -373,7 +373,7 @@ const CombinedEquipmentFault = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false)
return response.json();

4
web/src/components/MyEMS/FDD/EquipmentFault.js
View File

@ -345,7 +345,7 @@ const EquipmentFault = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -373,7 +373,7 @@ const EquipmentFault = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false)
return response.json();

4
web/src/components/MyEMS/FDD/ShopfloorFault.js
View File

@ -345,7 +345,7 @@ const ShopfloorFault = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -373,7 +373,7 @@ const ShopfloorFault = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false)
return response.json();

4
web/src/components/MyEMS/FDD/SpaceFault.js
View File

@ -269,7 +269,7 @@ const SpaceFault = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -297,7 +297,7 @@ const SpaceFault = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false)
return response.json();

4
web/src/components/MyEMS/FDD/StoreFault.js
View File

@ -343,7 +343,7 @@ const StoreFault = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -371,7 +371,7 @@ const StoreFault = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false)
return response.json();

4
web/src/components/MyEMS/FDD/TenantFault.js
View File

@ -343,7 +343,7 @@ const TenantFault = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -371,7 +371,7 @@ const TenantFault = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false)
return response.json();

4
web/src/components/MyEMS/Meter/MeterBatch.js
View File

@ -143,7 +143,7 @@ const MeterBatch = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -225,7 +225,7 @@ const MeterBatch = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Meter/MeterCost.js
View File

@ -310,7 +310,7 @@ const MeterCost = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -423,7 +423,7 @@ const MeterCost = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Meter/MeterEnergy.js
View File

@ -312,7 +312,7 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -423,7 +423,7 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Meter/MeterSubmetersBalance.js
View File

@ -251,7 +251,7 @@ const MeterSubmetersBalance = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -360,7 +360,7 @@ const MeterSubmetersBalance = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Meter/MeterTracking.js
View File

@ -236,7 +236,7 @@ const MeterTracking = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
setMeterList([]);
@ -279,7 +279,7 @@ const MeterTracking = ({ setRedirect, setRedirectUrl, t }) => {
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
setSubmitButtonDisabled(false);

4
web/src/components/MyEMS/Meter/MeterTrend.js
View File

@ -240,7 +240,7 @@ const MeterTrend = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -339,7 +339,7 @@ const MeterTrend = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Meter/OfflineMeterCost.js
View File

@ -290,7 +290,7 @@ const OfflineMeterCost = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -401,7 +401,7 @@ const OfflineMeterCost = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Meter/OfflineMeterEnergy.js
View File

@ -290,7 +290,7 @@ const OfflineMeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -401,7 +401,7 @@ const OfflineMeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Meter/VirtualMeterCost.js
View File

@ -290,7 +290,7 @@ const VirtualMeterCost = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -401,7 +401,7 @@ const VirtualMeterCost = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Meter/VirtualMeterEnergy.js
View File

@ -290,7 +290,7 @@ const VirtualMeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -401,7 +401,7 @@ const VirtualMeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Shopfloor/ShopfloorBatch.js
View File

@ -143,7 +143,7 @@ const ShopfloorBatch = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -220,7 +220,7 @@ const ShopfloorBatch = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Shopfloor/ShopfloorCost.js
View File

@ -290,7 +290,7 @@ const ShopfloorCost = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -496,7 +496,7 @@ const ShopfloorCost = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Shopfloor/ShopfloorEnergyCategory.js
View File

@ -294,7 +294,7 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -499,7 +499,7 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Shopfloor/ShopfloorEnergyItem.js
View File

@ -288,7 +288,7 @@ const ShopfloorEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -460,7 +460,7 @@ const ShopfloorEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Shopfloor/ShopfloorLoad.js
View File

@ -286,7 +286,7 @@ const ShopfloorLoad = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -441,7 +441,7 @@ const ShopfloorLoad = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Shopfloor/ShopfloorSaving.js
View File

@ -292,7 +292,7 @@ const ShopfloorSaving = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -461,7 +461,7 @@ const ShopfloorSaving = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Shopfloor/ShopfloorStatistics.js
View File

@ -286,7 +286,7 @@ const ShopfloorStatistics = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -437,7 +437,7 @@ const ShopfloorStatistics = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Space/SpaceCost.js
View File

@ -224,7 +224,7 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -523,7 +523,7 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false)
} else {

4
web/src/components/MyEMS/Space/SpaceEfficiency.js
View File

@ -214,7 +214,7 @@ const SpaceEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -357,7 +357,7 @@ const SpaceEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false)
} else {

4
web/src/components/MyEMS/Space/SpaceEnergyCategory.js
View File

@ -230,7 +230,7 @@ const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -497,7 +497,7 @@ const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false)

4
web/src/components/MyEMS/Space/SpaceEnergyItem.js
View File

@ -219,7 +219,7 @@ const SpaceEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -429,7 +429,7 @@ const SpaceEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false)

4
web/src/components/MyEMS/Space/SpaceIncome.js
View File

@ -221,7 +221,7 @@ const SpaceIncome = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -447,7 +447,7 @@ const SpaceIncome = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false)
} else {

4
web/src/components/MyEMS/Space/SpaceLoad.js
View File

@ -214,7 +214,7 @@ const SpaceLoad = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -369,7 +369,7 @@ const SpaceLoad = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false)

4
web/src/components/MyEMS/Space/SpaceOutput.js
View File

@ -218,7 +218,7 @@ const SpaceOutput = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -392,7 +392,7 @@ const SpaceOutput = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false)
} else {

4
web/src/components/MyEMS/Space/SpaceSaving.js
View File

@ -225,7 +225,7 @@ const SpaceSaving = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -433,7 +433,7 @@ const SpaceSaving = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false)
} else {

4
web/src/components/MyEMS/Space/SpaceStatistics.js
View File

@ -215,7 +215,7 @@ const SpaceStatistics = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -364,7 +364,7 @@ const SpaceStatistics = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false)
} else {

4
web/src/components/MyEMS/Store/StoreBatch.js
View File

@ -143,7 +143,7 @@ const StoreBatch = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -221,7 +221,7 @@ const StoreBatch = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Store/StoreCost.js
View File

@ -291,7 +291,7 @@ const StoreCost = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -497,7 +497,7 @@ const StoreCost = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false)
} else {

4
web/src/components/MyEMS/Store/StoreEnergyCategory.js
View File

@ -294,7 +294,7 @@ const StoreEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -499,7 +499,7 @@ const StoreEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false)
} else {

4
web/src/components/MyEMS/Store/StoreEnergyItem.js
View File

@ -289,7 +289,7 @@ const StoreEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -460,7 +460,7 @@ const StoreEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false)
} else {

4
web/src/components/MyEMS/Store/StoreLoad.js
View File

@ -288,7 +288,7 @@ const StoreLoad = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -443,7 +443,7 @@ const StoreLoad = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false)
} else {

4
web/src/components/MyEMS/Store/StoreSaving.js
View File

@ -292,7 +292,7 @@ const StoreSaving = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -461,7 +461,7 @@ const StoreSaving = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false)
} else {

4
web/src/components/MyEMS/Store/StoreStatistics.js
View File

@ -286,7 +286,7 @@ const StoreStatistics = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -436,7 +436,7 @@ const StoreStatistics = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false)
} else {

4
web/src/components/MyEMS/Tenant/TenantBatch.js
View File

@ -143,7 +143,7 @@ const TenantBatch = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -235,7 +235,7 @@ const TenantBatch = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Tenant/TenantBill.js
View File

@ -270,7 +270,7 @@ const Invoice = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
let isResponseOK = false;
@ -341,7 +341,7 @@ const Invoice = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false)
} else {

4
web/src/components/MyEMS/Tenant/TenantCost.js
View File

@ -291,7 +291,7 @@ const TenantCost = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -497,7 +497,7 @@ const TenantCost = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false)
} else {

4
web/src/components/MyEMS/Tenant/TenantEnergyCategory.js
View File

@ -293,7 +293,7 @@ const TenantEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -498,7 +498,7 @@ const TenantEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false)
} else {

4
web/src/components/MyEMS/Tenant/TenantEnergyItem.js
View File

@ -289,7 +289,7 @@ const TenantEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -460,7 +460,7 @@ const TenantEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false)
} else {

4
web/src/components/MyEMS/Tenant/TenantLoad.js
View File

@ -287,7 +287,7 @@ const TenantLoad = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -442,7 +442,7 @@ const TenantLoad = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Tenant/TenantSaving.js
View File

@ -294,7 +294,7 @@ const TenantSaving = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -463,7 +463,7 @@ const TenantSaving = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {

4
web/src/components/MyEMS/Tenant/TenantStatistics.js
View File

@ -288,7 +288,7 @@ const TenantStatistics = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(true);
// show spinner
setSpinnerHidden(false);
// hide export buttion
// hide export button
setExportButtonHidden(true)
// Reinitialize tables
@ -438,7 +438,7 @@ const TenantStatistics = ({ setRedirect, setRedirectUrl, t }) => {
setSubmitButtonDisabled(false);
// hide spinner
setSpinnerHidden(true);
// show export buttion
// show export button
setExportButtonHidden(false);
} else {