From fb8285c8dff86a217944524f410db663758972b9 Mon Sep 17 00:00:00 2001 From: YangZhang-GitHub <2533471770@qq.com> Date: Wed, 19 May 2021 15:57:13 +0800 Subject: [PATCH 1/4] Added shopfloorbatch API --- myems-api/app.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/myems-api/app.py b/myems-api/app.py index 1db5de6b..b799e8ca 100644 --- a/myems-api/app.py +++ b/myems-api/app.py @@ -49,6 +49,7 @@ from reports import shopfloorenergyitem from reports import shopfloorload from reports import shopfloorsaving from reports import shopfloorstatistics +from reports import shopfloorbatch from reports import spaceefficiency from reports import spacecost from reports import spaceenergycategory @@ -561,6 +562,8 @@ api.add_route('/reports/shopfloorsaving', shopfloorsaving.Reporting()) api.add_route('/reports/shopfloorstatistics', shopfloorstatistics.Reporting()) +api.add_route('/reports/shopfloorbatch', + shopfloorbatch.Reporting()) api.add_route('/reports/spacecost', spacecost.Reporting()) api.add_route('/reports/spaceefficiency', From eda0cd7fd099470dccd5fc49ee31246addbdfd81 Mon Sep 17 00:00:00 2001 From: YangZhang-GitHub <2533471770@qq.com> Date: Wed, 19 May 2021 15:58:36 +0800 Subject: [PATCH 2/4] The shopfloorbatch API has been completed --- myems-api/reports/shopfloorbatch.py | 240 ++++++++++++++++++++++++++++ 1 file changed, 240 insertions(+) create mode 100644 myems-api/reports/shopfloorbatch.py diff --git a/myems-api/reports/shopfloorbatch.py b/myems-api/reports/shopfloorbatch.py new file mode 100644 index 00000000..4c8be4b7 --- /dev/null +++ b/myems-api/reports/shopfloorbatch.py @@ -0,0 +1,240 @@ +import falcon +import simplejson as json +import mysql.connector +import config +from anytree import Node, AnyNode, LevelOrderIter +from datetime import datetime, timedelta, timezone +from decimal import Decimal +import excelexporters.shopfloorbatch + + +class Reporting: + @staticmethod + def __init__(): + pass + + @staticmethod + def on_options(req, resp): + resp.status = falcon.HTTP_200 + + #################################################################################################################### + # PROCEDURES + # Step 1: valid parameters + # Step 2: build a space tree + # Step 3: query all shopfloors in the space tree + # Step 4: query energy categories + # Step 5: query reporting period energy input + # Step 6: construct the report + #################################################################################################################### + @staticmethod + def on_get(req, resp): + print(req.params) + space_id = req.params.get('spaceid') + reporting_period_start_datetime_local = req.params.get('reportingperiodstartdatetime') + reporting_period_end_datetime_local = req.params.get('reportingperiodenddatetime') + + ################################################################################################################ + # Step 1: valid parameters + ################################################################################################################ + if space_id is None: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SPACE_ID') + else: + space_id = str.strip(space_id) + if not space_id.isdigit() or int(space_id) <= 0: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SPACE_ID') + else: + space_id = int(space_id) + + timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) + if config.utc_offset[0] == '-': + timezone_offset = -timezone_offset + + if reporting_period_start_datetime_local is None: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description="API.INVALID_REPORTING_PERIOD_START_DATETIME") + else: + reporting_period_start_datetime_local = str.strip(reporting_period_start_datetime_local) + try: + reporting_start_datetime_utc = datetime.strptime(reporting_period_start_datetime_local, + '%Y-%m-%dT%H:%M:%S') + except ValueError: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description="API.INVALID_REPORTING_PERIOD_START_DATETIME") + reporting_start_datetime_utc = reporting_start_datetime_utc.replace(tzinfo=timezone.utc) - \ + timedelta(minutes=timezone_offset) + + if reporting_period_end_datetime_local is None: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description="API.INVALID_REPORTING_PERIOD_END_DATETIME") + else: + reporting_period_end_datetime_local = str.strip(reporting_period_end_datetime_local) + try: + reporting_end_datetime_utc = datetime.strptime(reporting_period_end_datetime_local, + '%Y-%m-%dT%H:%M:%S') + except ValueError: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description="API.INVALID_REPORTING_PERIOD_END_DATETIME") + reporting_end_datetime_utc = reporting_end_datetime_utc.replace(tzinfo=timezone.utc) - \ + timedelta(minutes=timezone_offset) + + if reporting_start_datetime_utc >= reporting_end_datetime_utc: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_REPORTING_PERIOD_END_DATETIME') + + cnx_system_db = mysql.connector.connect(**config.myems_system_db) + cursor_system_db = cnx_system_db.cursor(dictionary=True) + + cursor_system_db.execute(" SELECT name " + " FROM tbl_spaces " + " WHERE id = %s ", (space_id,)) + row = cursor_system_db.fetchone() + + if row is None: + if cursor_system_db: + cursor_system_db.close() + if cnx_system_db: + cnx_system_db.disconnect() + raise falcon.HTTPError(falcon.HTTP_404, title='API.NOT_FOUND', + description='API.SPACE_NOT_FOUND') + else: + space_name = row['name'] + + ################################################################################################################ + # Step 2: build a space tree + ################################################################################################################ + + query = (" SELECT id, name, parent_space_id " + " FROM tbl_spaces " + " ORDER BY id ") + cursor_system_db.execute(query) + rows_spaces = cursor_system_db.fetchall() + node_dict = dict() + if rows_spaces is not None and len(rows_spaces) > 0: + for row in rows_spaces: + parent_node = node_dict[row['parent_space_id']] if row['parent_space_id'] is not None else None + node_dict[row['id']] = AnyNode(id=row['id'], parent=parent_node, name=row['name']) + + ################################################################################################################ + # Step 3: query all shopfloors in the space tree + ################################################################################################################ + shopfloor_dict = dict() + space_dict = dict() + + for node in LevelOrderIter(node_dict[space_id]): + space_dict[node.id] = node.name + + cursor_system_db.execute(" SELECT shopfloor.id, shopfloor.name AS shopfloor_name, s.name AS space_name, " + " cc.name AS cost_center_name, shopfloor.description " + " FROM tbl_spaces s, tbl_spaces_shopfloors ss," + " tbl_shopfloors shopfloor, tbl_cost_centers cc " + " WHERE s.id IN ( " + ', '.join(map(str, space_dict.keys())) + ") " + " AND ss.space_id = s.id AND ss.shopfloor_id = shopfloor.id " + " AND shopfloor.cost_center_id = cc.id ", ) + rows_shopfloors = cursor_system_db.fetchall() + if rows_shopfloors is not None and len(rows_shopfloors) > 0: + for row in rows_shopfloors: + shopfloor_dict[row['id']] = {"shopfloor_name": row['shopfloor_name'], + "space_name": row['space_name'], + "cost_center_name": row['cost_center_name'], + "description": row['description'], + "values": list()} + + ################################################################################################################ + # Step 4: query energy categories + ################################################################################################################ + cnx_energy_db = mysql.connector.connect(**config.myems_energy_db) + cursor_energy_db = cnx_energy_db.cursor() + + # query energy categories in reporting period + energy_category_set = set() + cursor_energy_db.execute(" SELECT DISTINCT(energy_category_id) " + " FROM tbl_shopfloor_input_category_hourly " + " WHERE start_datetime_utc >= %s AND start_datetime_utc < %s ", + (reporting_start_datetime_utc, reporting_end_datetime_utc)) + rows_energy_categories = cursor_energy_db.fetchall() + if rows_energy_categories is not None or len(rows_energy_categories) > 0: + for row_energy_category in rows_energy_categories: + energy_category_set.add(row_energy_category[0]) + + # query all energy categories + cursor_system_db.execute(" SELECT id, name, unit_of_measure " + " FROM tbl_energy_categories " + " ORDER BY id ", ) + rows_energy_categories = cursor_system_db.fetchall() + if rows_energy_categories is None or len(rows_energy_categories) == 0: + if cursor_system_db: + cursor_system_db.close() + if cnx_system_db: + cnx_system_db.disconnect() + + if cursor_energy_db: + cursor_energy_db.close() + if cnx_energy_db: + cnx_energy_db.disconnect() + + raise falcon.HTTPError(falcon.HTTP_404, + title='API.NOT_FOUND', + description='API.ENERGY_CATEGORY_NOT_FOUND') + energy_category_list = list() + for row_energy_category in rows_energy_categories: + if row_energy_category['id'] in energy_category_set: + energy_category_list.append({"id": row_energy_category['id'], + "name": row_energy_category['name'], + "unit_of_measure": row_energy_category['unit_of_measure']}) + + ################################################################################################################ + # Step 5: query reporting period energy input + ################################################################################################################ + for shopfloor_id in shopfloor_dict: + + cursor_energy_db.execute(" SELECT energy_category_id, SUM(actual_value) " + " FROM tbl_shopfloor_input_category_hourly " + " WHERE shopfloor_id = %s " + " AND start_datetime_utc >= %s " + " AND start_datetime_utc < %s " + " GROUP BY energy_category_id ", + (shopfloor_id, + reporting_start_datetime_utc, + reporting_end_datetime_utc)) + rows_shopfloor_energy = cursor_energy_db.fetchall() + for energy_category in energy_category_list: + subtotal = Decimal(0.0) + for row_shopfloor_energy in rows_shopfloor_energy: + if energy_category['id'] == row_shopfloor_energy[0]: + subtotal = row_shopfloor_energy[1] + break + shopfloor_dict[shopfloor_id]['values'].append(subtotal) + + if cursor_system_db: + cursor_system_db.close() + if cnx_system_db: + cnx_system_db.disconnect() + + if cursor_energy_db: + cursor_energy_db.close() + if cnx_energy_db: + cnx_energy_db.disconnect() + + ################################################################################################################ + # Step 6: construct the report + ################################################################################################################ + shopfloor_list = list() + for shopfloor_id, shopfloor in shopfloor_dict.items(): + shopfloor_list.append({ + "id": shopfloor_id, + "shopfloor_name": shopfloor['shopfloor_name'], + "space_name": shopfloor['space_name'], + "cost_center_name": shopfloor['cost_center_name'], + "description": shopfloor['description'], + "values": shopfloor['values'], + }) + + result = {'shopfloors': shopfloor_list, + 'energycategories': energy_category_list} + + # export result to Excel file and then encode the file to base64 string + result['excel_bytes_base64'] = excelexporters.shopfloorbatch.export(result, + space_name, + reporting_period_start_datetime_local, + reporting_period_end_datetime_local) + resp.body = json.dumps(result) From ca6ab5af3da535d9ace920ac51ba6eab37578375 Mon Sep 17 00:00:00 2001 From: YangZhang-GitHub <2533471770@qq.com> Date: Wed, 19 May 2021 15:59:46 +0800 Subject: [PATCH 3/4] Implemented the shopfloorbatch Excel Exporter --- myems-api/excelexporters/shopfloorbatch.py | 188 +++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 myems-api/excelexporters/shopfloorbatch.py diff --git a/myems-api/excelexporters/shopfloorbatch.py b/myems-api/excelexporters/shopfloorbatch.py new file mode 100644 index 00000000..f24d7485 --- /dev/null +++ b/myems-api/excelexporters/shopfloorbatch.py @@ -0,0 +1,188 @@ +import base64 +import uuid +import os +from openpyxl.styles import PatternFill, Border, Side, Alignment, Protection, Font +from openpyxl.drawing.image import Image +from openpyxl import Workbook + + +#################################################################################################################### +# PROCEDURES +# Step 1: Validate the report data +# Step 2: Generate excelexporters file +# Step 3: Encode the excelexporters file to Base64 +#################################################################################################################### + +def export(result, space_name, reporting_start_datetime_local, reporting_end_datetime_local): + #################################################################################################################### + # Step 1: Validate the report data + #################################################################################################################### + if result is None: + return None + + #################################################################################################################### + # Step 2: Generate excel file from the report data + #################################################################################################################### + filename = generate_excel(result, + space_name, + reporting_start_datetime_local, + reporting_end_datetime_local) + #################################################################################################################### + # Step 3: Encode the excel file to Base64 + #################################################################################################################### + try: + with open(filename, 'rb') as binary_file: + binary_file_data = binary_file.read() + except IOError as ex: + pass + + # Base64 encode the bytes + base64_encoded_data = base64.b64encode(binary_file_data) + # get the Base64 encoded data using human-readable characters. + base64_message = base64_encoded_data.decode('utf-8') + # delete the file from server + try: + os.remove(filename) + except NotImplementedError as ex: + pass + return base64_message + + +def generate_excel(report, space_name, reporting_start_datetime_local, reporting_end_datetime_local): + + wb = Workbook() + ws = wb.active + + # Row height + ws.row_dimensions[1].height = 102 + for i in range(2, 5 + 1): + ws.row_dimensions[i].height = 42 + + for i in range(6, len(report['shopfloors']) + 15): + ws.row_dimensions[i].height = 60 + + # Col width + ws.column_dimensions['A'].width = 1.5 + + ws.column_dimensions['B'].width = 25.0 + + for i in range(ord('C'), ord('L')): + ws.column_dimensions[chr(i)].width = 15.0 + + # Font + name_font = Font(name='Constantia', size=15, bold=True) + title_font = Font(name='宋体', size=15, bold=True) + data_font = Font(name='Franklin Gothic Book', size=11) + + table_fill = PatternFill(fill_type='solid', fgColor='1F497D') + f_border = Border(left=Side(border_style='medium', color='00000000'), + right=Side(border_style='medium', color='00000000'), + bottom=Side(border_style='medium', color='00000000'), + top=Side(border_style='medium', color='00000000') + ) + b_border = Border( + bottom=Side(border_style='medium', color='00000000'), + ) + + b_c_alignment = Alignment(vertical='bottom', + horizontal='center', + text_rotation=0, + wrap_text=True, + shrink_to_fit=False, + indent=0) + c_c_alignment = Alignment(vertical='center', + horizontal='center', + text_rotation=0, + wrap_text=True, + shrink_to_fit=False, + indent=0) + b_r_alignment = Alignment(vertical='bottom', + horizontal='right', + text_rotation=0, + wrap_text=True, + shrink_to_fit=False, + indent=0) + c_r_alignment = Alignment(vertical='bottom', + horizontal='center', + text_rotation=0, + wrap_text=True, + shrink_to_fit=False, + indent=0) + + # Img + img = Image("excelexporters/myems.png") + img.width = img.width * 0.85 + img.height = img.height * 0.85 + ws.add_image(img, 'B1') + + # Title + ws.row_dimensions[3].height = 60 + + ws['B3'].font = name_font + ws['B3'].alignment = b_r_alignment + ws['B3'] = '空间:' + ws['C3'].border = b_border + ws['C3'].alignment = b_c_alignment + ws['C3'].font = name_font + ws['C3'] = space_name + + ws['F3'].font = name_font + ws['F3'].alignment = b_r_alignment + ws['F3'] = '日期:' + ws['G3'].border = b_border + ws['G3'].alignment = b_c_alignment + ws['G3'].font = name_font + ws['G3'] = reporting_start_datetime_local + "~" + reporting_end_datetime_local + ws.merge_cells("G3:H3") + + # Title + ws['B6'].border = f_border + ws['B6'].font = name_font + ws['B6'].alignment = c_c_alignment + ws['B6'].fill = table_fill + ws['B6'] = '名称' + + ws['C6'].border = f_border + ws['C6'].alignment = c_c_alignment + ws['C6'].font = name_font + ws['C6'].fill = table_fill + ws['C6'] = '空间' + + ca_len = len(report['energycategories']) + + for i in range(0, ca_len): + col = chr(ord('D') + i) + ws[col + '6'].fill = table_fill + ws[col + '6'].font = name_font + ws[col + '6'].alignment = c_c_alignment + ws[col + '6'] = report['energycategories'][i]['name'] + \ + " (" + report['energycategories'][i]['unit_of_measure'] + ")" + ws[col + '6'].border = f_border + + current_row_number = 7 + for i in range(0, len(report['shopfloors'])): + + ws['B' + str(current_row_number)].font = title_font + ws['B' + str(current_row_number)].border = f_border + ws['B' + str(current_row_number)].alignment = c_c_alignment + ws['B' + str(current_row_number)] = report['shopfloors'][i]['shopfloor_name'] + + ws['C' + str(current_row_number)].font = title_font + ws['C' + str(current_row_number)].border = f_border + ws['C' + str(current_row_number)].alignment = c_c_alignment + ws['C' + str(current_row_number)] = report['shopfloors'][i]['space_name'] + + ca_len = len(report['shopfloors'][i]['values']) + for j in range(0, ca_len): + col = chr(ord('D') + j) + ws[col + str(current_row_number)].font = data_font + ws[col + str(current_row_number)].border = f_border + ws[col + str(current_row_number)].alignment = c_c_alignment + ws[col + str(current_row_number)] = round(report['shopfloors'][i]['values'][j], 2) + + current_row_number += 1 + + filename = str(uuid.uuid4()) + '.xlsx' + wb.save(filename) + + return filename From ce569d786070aa3dce5512e72662448ccb52ea12 Mon Sep 17 00:00:00 2001 From: YangZhang-GitHub <2533471770@qq.com> Date: Wed, 19 May 2021 16:19:50 +0800 Subject: [PATCH 4/4] The ShopfloorBatch page display function is completed --- .../MyEMS/Shopfloor/ShopfloorBatch.js | 330 ++++++++++++++++++ web/src/layouts/MyEMSRoutes.js | 4 +- web/src/routes.js | 1 + 3 files changed, 334 insertions(+), 1 deletion(-) create mode 100644 web/src/components/MyEMS/Shopfloor/ShopfloorBatch.js diff --git a/web/src/components/MyEMS/Shopfloor/ShopfloorBatch.js b/web/src/components/MyEMS/Shopfloor/ShopfloorBatch.js new file mode 100644 index 00000000..418b9d89 --- /dev/null +++ b/web/src/components/MyEMS/Shopfloor/ShopfloorBatch.js @@ -0,0 +1,330 @@ +import React, { Fragment, useEffect, useState } from 'react'; +import { + Breadcrumb, + BreadcrumbItem, + Row, + Col, + Card, + CardBody, + Button, + ButtonGroup, + Form, + FormGroup, + Input, + Label, + CustomInput, + Spinner, +} from 'reactstrap'; +import Datetime from 'react-datetime'; +import moment from 'moment'; +import loadable from '@loadable/component'; +import Cascader from 'rc-cascader'; +import { getCookieValue, createCookie } from '../../../helpers/utils'; +import withRedirect from '../../../hoc/withRedirect'; +import { withTranslation } from 'react-i18next'; +import { toast } from 'react-toastify'; +import ButtonIcon from '../../common/ButtonIcon'; +import { APIBaseURL } from '../../../config'; + + +const DetailedDataTable = loadable(() => import('../common/DetailedDataTable')); + + +const ShopfloorBatch = ({ setRedirect, setRedirectUrl, t }) => { + let current_moment = moment(); + useEffect(() => { + let is_logged_in = getCookieValue('is_logged_in'); + let user_name = getCookieValue('user_name'); + let user_display_name = getCookieValue('user_display_name'); + let user_uuid = getCookieValue('user_uuid'); + let token = getCookieValue('token'); + if (is_logged_in === null || !is_logged_in) { + setRedirectUrl(`/authentication/basic/login`); + setRedirect(true); + } else { + //update expires time of cookies + createCookie('is_logged_in', true, 1000 * 60 * 60 * 8); + createCookie('user_name', user_name, 1000 * 60 * 60 * 8); + createCookie('user_display_name', user_display_name, 1000 * 60 * 60 * 8); + createCookie('user_uuid', user_uuid, 1000 * 60 * 60 * 8); + createCookie('token', token, 1000 * 60 * 60 * 8); + } + }); + // State + // Query Parameters + const [selectedSpaceName, setSelectedSpaceName] = useState(undefined); + const [selectedSpaceID, setSelectedSpaceID] = useState(undefined); + const [shopfloorList, setShopfloorList] = useState([]); + const [reportingPeriodBeginsDatetime, setReportingPeriodBeginsDatetime] = useState(current_moment.clone().startOf('month')); + const [reportingPeriodEndsDatetime, setReportingPeriodEndsDatetime] = useState(current_moment); + const [cascaderOptions, setCascaderOptions] = useState(undefined); + + // buttons + const [submitButtonDisabled, setSubmitButtonDisabled] = useState(false); + const [spinnerHidden, setSpinnerHidden] = useState(true); + const [exportButtonHidden, setExportButtonHidden] = useState(true); + + //Results + const [detailedDataTableColumns, setDetailedDataTableColumns] = useState( + [{dataField: 'name', text: t('Name'), sort: true}, {dataField: 'space', text: t('Space'), sort: true}]); + const [excelBytesBase64, setExcelBytesBase64] = useState(undefined); + + useEffect(() => { + let isResponseOK = false; + fetch(APIBaseURL + '/spaces/tree', { + method: 'GET', + headers: { + "Content-type": "application/json", + "User-UUID": getCookieValue('user_uuid'), + "Token": getCookieValue('token') + }, + body: null, + + }).then(response => { + console.log(response); + if (response.ok) { + isResponseOK = true; + } + return response.json(); + }).then(json => { + console.log(json); + if (isResponseOK) { + // rename keys + json = JSON.parse(JSON.stringify([json]).split('"id":').join('"value":').split('"name":').join('"label":')); + setCascaderOptions(json); + // set the default selected space + setSelectedSpaceName([json[0]].map(o => o.label)); + setSelectedSpaceID([json[0]].map(o => o.value)); + + setSubmitButtonDisabled(false); + setSpinnerHidden(true); + } else { + toast.error(json.description); + } + }).catch(err => { + console.log(err); + }); + + }, []); + + const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0'; + + let onSpaceCascaderChange = (value, selectedOptions) => { + setSelectedSpaceName(selectedOptions.map(o => o.label).join('/')); + setSelectedSpaceID(value[value.length - 1]); + setShopfloorList([]); + setExportButtonHidden(true); + setSubmitButtonDisabled(false); + } + let onReportingPeriodBeginsDatetimeChange = (newDateTime) => { + setReportingPeriodBeginsDatetime(newDateTime); + } + + let onReportingPeriodEndsDatetimeChange = (newDateTime) => { + setReportingPeriodEndsDatetime(newDateTime); + } + + var getValidReportingPeriodBeginsDatetimes = function (currentDate) { + return currentDate.isBefore(moment(reportingPeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a')); + } + + var getValidReportingPeriodEndsDatetimes = function (currentDate) { + return currentDate.isAfter(moment(reportingPeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a')); + } + + // Handler + const handleSubmit = e => { + e.preventDefault(); + console.log('handleSubmit'); + console.log(selectedSpaceID); + console.log(reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss')); + console.log(reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss')); + + // disable submit button + setSubmitButtonDisabled(true); + // show spinner + setSpinnerHidden(false); + // hide export buttion + setExportButtonHidden(true) + + // Reinitialize tables + setShopfloorList([]); + + let isResponseOK = false; + fetch(APIBaseURL + '/reports/shopfloorbatch?' + + 'spaceid=' + selectedSpaceID + + '&reportingperiodstartdatetime=' + reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') + + '&reportingperiodenddatetime=' + reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'), { + method: 'GET', + headers: { + "Content-type": "application/json", + "User-UUID": getCookieValue('user_uuid'), + "Token": getCookieValue('token') + }, + body: null, + + }).then(response => { + if (response.ok) { + isResponseOK = true; + }; + return response.json(); + }).then(json => { + if (isResponseOK) { + console.log(json) + let shopfloors = []; + if (json['shopfloors'].length > 0) { + json['shopfloors'].forEach((currentShopfloor, index) => { + let detailed_value = {}; + detailed_value['id'] = currentShopfloor['id']; + detailed_value['name'] = currentShopfloor['shopfloor_name']; + detailed_value['space'] = currentShopfloor['space_name']; + detailed_value['costcenter'] = currentShopfloor['cost_center_name']; + currentShopfloor['values'].forEach((currentValue, energyCategoryIndex) => { + detailed_value['a' + energyCategoryIndex] = currentValue.toFixed(2); + }); + shopfloors.push(detailed_value); + }); + }; + + setShopfloorList(shopfloors); + + let detailed_column_list = []; + detailed_column_list.push({ + dataField: 'name', + text: t('Name'), + sort: true + }); + detailed_column_list.push({ + dataField: 'space', + text: t('Space'), + sort: true + }); + json['energycategories'].forEach((currentValue, index) => { + detailed_column_list.push({ + dataField: 'a' + index, + text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')', + sort: true + }) + }); + setDetailedDataTableColumns(detailed_column_list); + + setExcelBytesBase64(json['excel_bytes_base64']); + + // enable submit button + setSubmitButtonDisabled(false); + // hide spinner + setSpinnerHidden(true); + // show export buttion + setExportButtonHidden(false); + + } else { + toast.error(json.description) + } + }).catch(err => { + console.log(err); + }); + }; + + const handleExport = e => { + e.preventDefault(); + const mimeType='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' + const fileName = 'shopfloorbatch.xlsx' + var fileUrl = "data:" + mimeType + ";base64," + excelBytesBase64; + fetch(fileUrl) + .then(response => response.blob()) + .then(blob => { + var link = window.document.createElement("a"); + link.href = window.URL.createObjectURL(blob, { type: mimeType }); + link.download = fileName; + document.body.appendChild(link); + link.click(); + document.body.removeChild(link); + }); + }; + + + + return ( + +
+ + {t('Shopfloor Data')}{t('Batch Analysis')} + +
+ + +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + +

+ + + + + + + +

+ + + +

+ + + +
+ + + + + + + ); +}; + +export default withTranslation()(withRedirect(ShopfloorBatch)); diff --git a/web/src/layouts/MyEMSRoutes.js b/web/src/layouts/MyEMSRoutes.js index f1429c54..6d927bea 100644 --- a/web/src/layouts/MyEMSRoutes.js +++ b/web/src/layouts/MyEMSRoutes.js @@ -150,7 +150,7 @@ import StoreCost from '../components/MyEMS/Store/StoreCost'; import StoreLoad from '../components/MyEMS/Store/StoreLoad'; import StoreStatistics from '../components/MyEMS/Store/StoreStatistics'; import StoreSaving from '../components/MyEMS/Store/StoreSaving'; -import StoreBatch from "../components/MyEMS/Store/StoreBatch"; +import StoreBatch from '../components/MyEMS/Store/StoreBatch'; // Shopfloor import ShopfloorEnergyCategory from '../components/MyEMS/Shopfloor/ShopfloorEnergyCategory'; import ShopfloorEnergyItem from '../components/MyEMS/Shopfloor/ShopfloorEnergyItem'; @@ -158,6 +158,7 @@ import ShopfloorCost from '../components/MyEMS/Shopfloor/ShopfloorCost'; import ShopfloorLoad from '../components/MyEMS/Shopfloor/ShopfloorLoad'; import ShopfloorStatistics from '../components/MyEMS/Shopfloor/ShopfloorStatistics'; import ShopfloorSaving from '../components/MyEMS/Shopfloor/ShopfloorSaving'; +import ShopfloorBatch from '../components/MyEMS/Shopfloor/ShopfloorBatch'; // CombinedEquipment import CombinedEquipmentEnergyCategory from '../components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyCategory'; import CombinedEquipmentEnergyItem from '../components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyItem'; @@ -395,6 +396,7 @@ const MyEMSRoutes = () => ( + {/*CombinedEquipment*/} diff --git a/web/src/routes.js b/web/src/routes.js index c8953f7b..9af983f9 100644 --- a/web/src/routes.js +++ b/web/src/routes.js @@ -405,6 +405,7 @@ export const shopfloorRoutes = { { to: '/shopfloor/load', name: 'Load' }, { to: '/shopfloor/statistics', name: 'Statistics' }, { to: '/shopfloor/saving', name: 'Saving' }, + { to: '/shopfloor/batch', name: 'Batch Analysis'}, ] };