-
-
-
+
+
+
-
-
-
-
-
- {{'SETTING.ADD_COSTCENTER' | translate}}
-
-
-
-
- | {{'SETTING.ID' | translate}} | -{{'SETTING.NAME' | translate}} | -{{'COSTCENTER.EXTERNAL_ID' | translate}} | -{{'SETTING.ACTION' | translate}} | -
|---|---|---|---|
| {{ costcenter.id }} | -{{ costcenter.name }} | -{{ costcenter.external_id }} | -- {{'SETTING.EDIT' | translate}} - {{'SETTING.DELETE' | translate}} - - | -
-
-
-
+
+
+
+
-
+
- {{'SETTING.SELECT_COSTCENTER' | translate}}
-
-
-
-
-
-
-
-
-
+ {{'SETTING.ADD_COSTCENTER' | translate}}
+
+
+
+
+ | {{'SETTING.ID' | translate}} | +{{'SETTING.NAME' | translate}} | +{{'COSTCENTER.EXTERNAL_ID' | translate}} | +{{'SETTING.ACTION' | translate}} | +
|---|---|---|---|
| {{ costcenter.id }} | +{{ costcenter.name }} | +{{ costcenter.external_id }} | ++ {{'SETTING.EDIT' | translate}} + {{'SETTING.DELETE' | translate}} + | +
+
+
+
diff --git a/admin/views/settings/meter/offline-meter.model.html b/admin/views/settings/meter/offlinemeter.model.html
similarity index 100%
rename from admin/views/settings/meter/offline-meter.model.html
rename to admin/views/settings/meter/offlinemeter.model.html
diff --git a/database/myems_historical_db.sql b/database/myems_historical_db.sql
index bada59f0..7cba42d6 100644
--- a/database/myems_historical_db.sql
+++ b/database/myems_historical_db.sql
@@ -36,6 +36,20 @@ CREATE TABLE IF NOT EXISTS `myems_historical_db`.`tbl_analog_value_latest` (
CREATE INDEX `tbl_analog_value_latest_index_1` ON `myems_historical_db`.`tbl_analog_value_latest` (`point_id` , `utc_date_time`);
CREATE INDEX `tbl_analog_value_latest_index_2` ON `myems_historical_db`.`tbl_analog_value_latest` (`utc_date_time`);
+-- ---------------------------------------------------------------------------------------------------------------------
+-- Table `myems_historical_db`.`tbl_cost_files`
+-- ---------------------------------------------------------------------------------------------------------------------
+DROP TABLE IF EXISTS `myems_historical_db`.`tbl_cost_files` ;
+
+CREATE TABLE IF NOT EXISTS `myems_historical_db`.`tbl_cost_files` (
+ `id` BIGINT NOT NULL AUTO_INCREMENT,
+ `file_name` VARCHAR(255) NOT NULL,
+ `uuid` CHAR(36) NOT NULL,
+ `upload_datetime_utc` DATETIME NOT NULL,
+ `status` VARCHAR(45) NOT NULL COMMENT 'new, done, error',
+ `file_object` LONGBLOB NOT NULL,
+ PRIMARY KEY (`id`));
+
-- ---------------------------------------------------------------------------------------------------------------------
-- Table `myems_historical_db`.`tbl_digital_value`
-- ---------------------------------------------------------------------------------------------------------------------
@@ -109,18 +123,4 @@ CREATE TABLE IF NOT EXISTS `myems_historical_db`.`tbl_offline_meter_files` (
PRIMARY KEY (`id`));
--- ---------------------------------------------------------------------------------------------------------------------
--- Table `myems_historical_db`.`tbl_offline_cost_files`
--- ---------------------------------------------------------------------------------------------------------------------
-DROP TABLE IF EXISTS `myems_historical_db`.`tbl_offline_cost_files` ;
-
-CREATE TABLE IF NOT EXISTS `myems_historical_db`.`tbl_offline_cost_files` (
- `id` BIGINT NOT NULL AUTO_INCREMENT,
- `file_name` VARCHAR(255) NOT NULL,
- `uuid` CHAR(36) NOT NULL,
- `upload_datetime_utc` DATETIME NOT NULL,
- `status` VARCHAR(45) NOT NULL COMMENT 'new, done, error',
- `file_object` LONGBLOB NOT NULL,
- PRIMARY KEY (`id`));
-
COMMIT;
diff --git a/database/myems_system_db.sql b/database/myems_system_db.sql
index c98de9bc..6c673342 100644
--- a/database/myems_system_db.sql
+++ b/database/myems_system_db.sql
@@ -2250,6 +2250,30 @@ USE `myems_system_db`;
INSERT INTO `myems_system_db`.`tbl_versions`
(`id`, `version`, `release_date`)
VALUES
-(1, '1.1.3', '2021-05-25');
+(1, '1.1.4', '2021-07-19');
+
+COMMIT;
+
+-- ---------------------------------------------------------------------------------------------------------------------
+-- Table `myems_system_db`.`tbl_web_menus`
+-- ---------------------------------------------------------------------------------------------------------------------
+DROP TABLE IF EXISTS `myems_system_db`.`tbl_web_menus` ;
+
+CREATE TABLE IF NOT EXISTS `myems_system_db`.`tbl_web_menus` (
+ `id` BIGINT NOT NULL AUTO_INCREMENT,
+ `version` VARCHAR(256) NOT NULL,
+ `release_date` DATE NOT NULL,
+ PRIMARY KEY (`id`));
+
+-- ---------------------------------------------------------------------------------------------------------------------
+-- Example Data for table `myems_system_db`.`tbl_versions`
+-- ---------------------------------------------------------------------------------------------------------------------
+START TRANSACTION;
+USE `myems_system_db`;
+
+INSERT INTO `myems_system_db`.`tbl_versions`
+(`id`, `version`, `release_date`)
+VALUES
+(1, '1.1.4', '2021-07-19');
COMMIT;
diff --git a/database/upgrade1.1.4.sql b/database/upgrade1.1.4.sql
new file mode 100644
index 00000000..d2f50723
--- /dev/null
+++ b/database/upgrade1.1.4.sql
@@ -0,0 +1,21 @@
+
+DROP TABLE myems_fdd_db.tbl_sms_recipients;
+
+CREATE TABLE IF NOT EXISTS `myems_reporting_db`.`tbl_email_messages` (
+ `id` BIGINT NOT NULL AUTO_INCREMENT,
+ `recipient_name` VARCHAR(128) NOT NULL,
+ `recipient_email` VARCHAR(128) NOT NULL,
+ `subject` VARCHAR(128) NOT NULL,
+ `message` LONGTEXT NOT NULL,
+ `attachment_file_name` VARCHAR(128) NULL,
+ `attachment_file_object` LONGBLOB NULL,
+ `created_datetime_utc` DATETIME NOT NULL,
+ `scheduled_datetime_utc` DATETIME NOT NULL,
+ `status` VARCHAR(32) NOT NULL COMMENT 'new, sent, timeout',
+ PRIMARY KEY (`id`));
+CREATE INDEX `tbl_email_messages_index_1` ON `myems_reporting_db`.`tbl_email_messages` (`status`, `scheduled_datetime_utc`);
+
+RENAME TABLE myems_historical_db.tbl_offline_cost_files TO myems_historical_db.tbl_cost_files;
+
+-- UPDATE VERSION NUMBER
+UPDATE myems_system_db.tbl_versions SET version='1.1.4', release_date='2021-07-19' WHERE id=1;
diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json
index 106b66ce..12178bd1 100644
--- a/myems-api/MyEMS.postman_collection.json
+++ b/myems-api/MyEMS.postman_collection.json
@@ -837,6 +837,121 @@
}
]
},
+ {
+ "name": "Cost File",
+ "item": [
+ {
+ "name": "GET All Cost Files",
+ "request": {
+ "method": "GET",
+ "header": [],
+ "url": {
+ "raw": "{{base_url}}/costfiles",
+ "host": [
+ "{{base_url}}"
+ ],
+ "path": [
+ "costfiles"
+ ]
+ }
+ },
+ "response": []
+ },
+ {
+ "name": "GET a Cost File by ID",
+ "request": {
+ "method": "GET",
+ "header": [],
+ "url": {
+ "raw": "{{base_url}}/costfiles/1",
+ "host": [
+ "{{base_url}}"
+ ],
+ "path": [
+ "costfiles",
+ "1"
+ ]
+ }
+ },
+ "response": []
+ },
+ {
+ "name": "POST Upload a Cost File",
+ "request": {
+ "method": "POST",
+ "header": [
+ {
+ "key": "User_UUID",
+ "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
+ "type": "text"
+ },
+ {
+ "key": "Token",
+ "value": "6b0622f8974b2e6f2d7a7470baf073b78bddffd4",
+ "type": "text"
+ }
+ ],
+ "body": {
+ "mode": "formdata",
+ "formdata": [
+ {
+ "key": "file",
+ "type": "file",
+ "src": "/zh/myems/myems-doc/offlinemeters.xlsx"
+ }
+ ]
+ },
+ "url": {
+ "raw": "{{base_url}}/costfiles",
+ "host": [
+ "{{base_url}}"
+ ],
+ "path": [
+ "costfiles"
+ ]
+ }
+ },
+ "response": []
+ },
+ {
+ "name": "DELETE a Cost File by ID",
+ "request": {
+ "method": "DELETE",
+ "header": [],
+ "url": {
+ "raw": "{{base_url}}/costfiles/1",
+ "host": [
+ "{{base_url}}"
+ ],
+ "path": [
+ "costfiles",
+ "1"
+ ]
+ }
+ },
+ "response": []
+ },
+ {
+ "name": "Rstore a Cost File by ID",
+ "request": {
+ "method": "GET",
+ "header": [],
+ "url": {
+ "raw": "{{base_url}}/costfiles/1/restore",
+ "host": [
+ "{{base_url}}"
+ ],
+ "path": [
+ "costfiles",
+ "1",
+ "restore"
+ ]
+ }
+ },
+ "response": []
+ }
+ ]
+ },
{
"name": "Data Source",
"item": [
@@ -2712,25 +2827,6 @@
},
"response": []
},
- {
- "name": "GET Rstore an Offline Meter File by ID",
- "request": {
- "method": "GET",
- "header": [],
- "url": {
- "raw": "{{base_url}}/offlinemeterfiles/1/restore",
- "host": [
- "{{base_url}}"
- ],
- "path": [
- "offlinemeterfiles",
- "1",
- "restore"
- ]
- }
- },
- "response": []
- },
{
"name": "POST Upload a Knowledge File",
"request": {
@@ -2786,6 +2882,25 @@
}
},
"response": []
+ },
+ {
+ "name": "Rstore a Knowledge File by ID",
+ "request": {
+ "method": "GET",
+ "header": [],
+ "url": {
+ "raw": "{{base_url}}/knowledgefiles/1/restore",
+ "host": [
+ "{{base_url}}"
+ ],
+ "path": [
+ "knowledgefiles",
+ "1",
+ "restore"
+ ]
+ }
+ },
+ "response": []
}
]
},
@@ -3264,25 +3379,6 @@
},
"response": []
},
- {
- "name": "GET Rstore a Knowledge File by ID",
- "request": {
- "method": "GET",
- "header": [],
- "url": {
- "raw": "{{base_url}}/knowledgefiles/1/restore",
- "host": [
- "{{base_url}}"
- ],
- "path": [
- "knowledgefiles",
- "1",
- "restore"
- ]
- }
- },
- "response": []
- },
{
"name": "POST Upload a Offline Meter File",
"request": {
@@ -3338,98 +3434,21 @@
}
},
"response": []
- }
- ]
- },
- {
- "name": "Offline Cost File",
- "item": [
+ },
{
- "name": "GET All Offline Cost Files",
+ "name": "Rstore an Offline Meter File by ID",
"request": {
"method": "GET",
"header": [],
"url": {
- "raw": "{{base_url}}/offlinecostfiles",
+ "raw": "{{base_url}}/offlinemeterfiles/1/restore",
"host": [
"{{base_url}}"
],
"path": [
- "offlinecostfiles"
- ]
- }
- },
- "response": []
- },
- {
- "name": "GET a Offline Cost File by ID",
- "request": {
- "method": "GET",
- "header": [],
- "url": {
- "raw": "{{base_url}}/offlinecostfiles/1",
- "host": [
- "{{base_url}}"
- ],
- "path": [
- "offlinecostfiles",
- "1"
- ]
- }
- },
- "response": []
- },
- {
- "name": "POST Upload a Offline Cost File",
- "request": {
- "method": "POST",
- "header": [
- {
- "key": "User_UUID",
- "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
- "type": "text"
- },
- {
- "key": "Token",
- "value": "6b0622f8974b2e6f2d7a7470baf073b78bddffd4",
- "type": "text"
- }
- ],
- "body": {
- "mode": "formdata",
- "formdata": [
- {
- "key": "file",
- "type": "file",
- "src": "/zh/myems/myems-doc/offlinemeters.xlsx"
- }
- ]
- },
- "url": {
- "raw": "{{base_url}}/offlinecostfiles",
- "host": [
- "{{base_url}}"
- ],
- "path": [
- "offlinecostfiles"
- ]
- }
- },
- "response": []
- },
- {
- "name": "DELETE a Offline Cost File by ID",
- "request": {
- "method": "DELETE",
- "header": [],
- "url": {
- "raw": "{{base_url}}/offlinecostfiles/1",
- "host": [
- "{{base_url}}"
- ],
- "path": [
- "offlinecostfiles",
- "1"
+ "offlinemeterfiles",
+ "1",
+ "restore"
]
}
},
diff --git a/myems-api/README.md b/myems-api/README.md
index 53de1156..1a010be2 100644
--- a/myems-api/README.md
+++ b/myems-api/README.md
@@ -159,7 +159,7 @@ View in Postman: import the file MyEMS.postman_collection.json with Postman
[Data Source](#Data-Source) | [Point](#Point)
-[Tariff](#Tariff) | [Cost Center](#Cost-Center) | [Offline Cost File](#Offline-Cost-File)
+[Tariff](#Tariff) | [Cost Center](#Cost-Center) | [Cost File](#Offline-Cost-File)
[Meter](#Meter) | [Virtual Meter](#Virtual-Meter) | [Offline Meter](#Offline-Meter) | [Offline Meter File](#Offline-Meter-File)
@@ -250,35 +250,39 @@ $ curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"tariff_id":"
$ curl -i -X DELETE {{base_url}}/costcenters/{id}/tariffs/{tid}
```
-### Offline Cost File
-* GET an Offline Cost File by ID
+### Cost File
+* GET an Cost File by ID
```bash
-$ curl -i -X GET {{base_url}}/offlinecostfiles/{id}
+$ curl -i -X GET {{base_url}}/costfiles/{id}
```
Result
| Name | Data Type | Description |
|---------------|-----------|-------------------------------------------|
-| id | integer | Offline Cost File ID |
-| file_name | string | Offline Cost File name |
-| uuid | string | Offline Cost File UUID |
+| id | integer | Cost File ID |
+| file_name | string | Cost File name |
+| uuid | string | Cost File UUID |
| upload_datetime | float | the number of milliseconds since January 1, 1970, 00:00:00, universal time |
-| status | string | Offline Cost File processing status (new, done, error) |
-| file_object | BLOB | Offline Cost File Object |
+| status | string | Cost File processing status (new, done, error) |
+| file_object | BLOB | Cost File Object |
-* GET All Offline Cost Files
+* GET All Cost Files
```bash
-$ curl -i -X GET {{base_url}}/offlinecostfiles
+$ curl -i -X GET {{base_url}}/costfiles
```
-* DELETE an Offline Cost File by ID
+* DELETE a Cost File by ID
```bash
-$ curl -i -X DELETE {{base_url}}/offlinecostfiles/{id}
+$ curl -i -X DELETE {{base_url}}/costfiles/{id}
```
-* POST Upload an Offline Cost File
+* POST Upload a Cost File
(user must login first to get cookie)
```bash
-$ curl -i -H "Content-Type: application/TBD" -X POST -d 'file: (binary)' {{base_url}}/offlinecostfiles
+$ curl -i -H "Content-Type: application/TBD" -X POST -d 'file: (binary)' {{base_url}}/costfiles
+```
+* GET Restore a Cost File by ID from database to disk
+```bash
+$ curl -i -X GET {{base_url}}/costfiles/{id}/restore
```
### Data Source
diff --git a/myems-api/app.py b/myems-api/app.py
index 083a0fed..bab9cb1f 100644
--- a/myems-api/app.py
+++ b/myems-api/app.py
@@ -3,7 +3,7 @@ from falcon_cors import CORS
from falcon_multipart.middleware import MultipartMiddleware
from core import energyflowdiagram, privilege, textmessage, distributioncircuit, virtualmeter, \
costcenter, point, knowledgefile, meter, gsmmodem, tariff, user, storetype, timezone, \
- offlinecostfile, offlinemeterfile, version, contact, emailserver, combinedequipment, datasource, equipment, tenant, shopfloor, \
+ costfile, offlinemeterfile, version, contact, emailserver, combinedequipment, datasource, equipment, tenant, shopfloor, \
webmessage, distributionsystem, store, emailmessage, tenanttype, wechatmessage, space, gateway, offlinemeter, \
rule, energycategory, sensor, energyitem, notification
from reports import advancedreport
@@ -140,10 +140,12 @@ api.add_route('/costcenters/{id_}/tariffs',
api.add_route('/costcenters/{id_}/tariffs/{tid}',
costcenter.CostCenterTariffItem())
-api.add_route('/offlinecostfiles',
- offlinecostfile.OfflineCostFileCollection())
-api.add_route('/offlinecostfiles/{id_}',
- offlinecostfile.OfflineCostFileItem())
+api.add_route('/costfiles',
+ costfile.CostFileCollection())
+api.add_route('/costfiles/{id_}',
+ costfile.CostFileItem())
+api.add_route('/costfiles/{id_}/restore',
+ costfile.CostFileRestore())
api.add_route('/datasources',
datasource.DataSourceCollection())
diff --git a/myems-api/core/offlinecostfile.py b/myems-api/core/costfile.py
similarity index 73%
rename from myems-api/core/offlinecostfile.py
rename to myems-api/core/costfile.py
index 875f5eab..d73f2538 100644
--- a/myems-api/core/offlinecostfile.py
+++ b/myems-api/core/costfile.py
@@ -7,7 +7,7 @@ from datetime import datetime, timezone
import os
-class OfflineCostFileCollection:
+class CostFileCollection:
@staticmethod
def __init__():
pass
@@ -22,7 +22,7 @@ class OfflineCostFileCollection:
cursor = cnx.cursor()
query = (" SELECT id, file_name, uuid, upload_datetime_utc, status "
- " FROM tbl_offline_cost_files "
+ " FROM tbl_cost_files "
" ORDER BY upload_datetime_utc desc ")
cursor.execute(query)
rows = cursor.fetchall()
@@ -68,7 +68,7 @@ class OfflineCostFileCollection:
os.rename(temp_file_path, file_path)
except Exception as ex:
raise falcon.HTTPError(falcon.HTTP_400, title='API.ERROR',
- description='API.FAILED_TO_UPLOAD_OFFLINE_COST_FILE')
+ description='API.FAILED_TO_UPLOAD_COST_FILE')
# Verify User Session
token = req.headers.get('TOKEN')
@@ -124,7 +124,7 @@ class OfflineCostFileCollection:
cnx = mysql.connector.connect(**config.myems_historical_db)
cursor = cnx.cursor()
- add_values = (" INSERT INTO tbl_offline_cost_files "
+ add_values = (" INSERT INTO tbl_cost_files "
" (file_name, uuid, upload_datetime_utc, status, file_object ) "
" VALUES (%s, %s, %s, %s, %s) ")
cursor.execute(add_values, (filename,
@@ -138,10 +138,10 @@ class OfflineCostFileCollection:
cnx.disconnect()
resp.status = falcon.HTTP_201
- resp.location = '/offlinecostfiles/' + str(new_id)
+ resp.location = '/costfiles/' + str(new_id)
-class OfflineCostFileItem:
+class CostFileItem:
@staticmethod
def __init__():
pass
@@ -155,13 +155,13 @@ class OfflineCostFileItem:
if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400,
title='API.BAD_REQUEST',
- description='API.INVALID_OFFLINE_COST_FILE_ID')
+ description='API.INVALID_COST_FILE_ID')
cnx = mysql.connector.connect(**config.myems_historical_db)
cursor = cnx.cursor()
query = (" SELECT id, file_name, uuid, upload_datetime_utc, status "
- " FROM tbl_offline_cost_files "
+ " FROM tbl_cost_files "
" WHERE id = %s ")
cursor.execute(query, (id_,))
row = cursor.fetchone()
@@ -169,7 +169,7 @@ class OfflineCostFileItem:
cnx.disconnect()
if row is None:
raise falcon.HTTPError(falcon.HTTP_404, title='API.NOT_FOUND',
- description='API.OFFLINE_COST_FILE_NOT_FOUND')
+ description='API.COST_FILE_NOT_FOUND')
upload_datetime = row[3]
upload_datetime = upload_datetime.replace(tzinfo=timezone.utc)
@@ -185,20 +185,20 @@ class OfflineCostFileItem:
def on_delete(req, resp, id_):
if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
- description='API.INVALID_OFFLINE_COST_FILE_ID')
+ description='API.INVALID_COST_FILE_ID')
cnx = mysql.connector.connect(**config.myems_historical_db)
cursor = cnx.cursor()
cursor.execute(" SELECT uuid "
- " FROM tbl_offline_cost_files "
+ " FROM tbl_cost_files "
" WHERE id = %s ", (id_,))
row = cursor.fetchone()
if row is None:
cursor.close()
cnx.disconnect()
raise falcon.HTTPError(falcon.HTTP_404, title='API.NOT_FOUND',
- description='API.OFFLINE_COST_FILE_NOT_FOUND')
+ description='API.COST_FILE_NOT_FOUND')
try:
file_uuid = row[0]
@@ -208,14 +208,69 @@ class OfflineCostFileItem:
# remove the file from disk
os.remove(file_path)
except Exception as ex:
- # ignore exception and don't return API.OFFLINE_COST_FILE_NOT_FOUND error
+ # ignore exception and don't return API.COST_FILE_NOT_FOUND error
pass
# Note: the energy data imported from the deleted file will not be deleted
- cursor.execute(" DELETE FROM tbl_offline_cost_files WHERE id = %s ", (id_,))
+ cursor.execute(" DELETE FROM tbl_cost_files WHERE id = %s ", (id_,))
cnx.commit()
cursor.close()
cnx.disconnect()
resp.status = falcon.HTTP_204
+
+
+class CostFileRestore:
+ @staticmethod
+ def __init__():
+ pass
+
+ @staticmethod
+ def on_options(req, resp, id_):
+ resp.status = falcon.HTTP_200
+
+ @staticmethod
+ def on_get(req, resp, id_):
+ if not id_.isdigit() or int(id_) <= 0:
+ raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
+ description='API.INVALID_COST_FILE_ID')
+
+ cnx = mysql.connector.connect(**config.myems_historical_db)
+ cursor = cnx.cursor()
+
+ query = (" SELECT uuid, file_object "
+ " FROM tbl_cost_files "
+ " WHERE id = %s ")
+ cursor.execute(query, (id_,))
+ row = cursor.fetchone()
+ cursor.close()
+ cnx.disconnect()
+
+ if row is None:
+ raise falcon.HTTPError(falcon.HTTP_404, title='API.NOT_FOUND',
+ description='API.COST_FILE_NOT_FOUND')
+
+ result = {"uuid": row[0],
+ "file_object": row[1]}
+ try:
+ raw_blob = result["file_object"]
+ file_uuid = result["uuid"]
+
+ # Define file_path
+ file_path = os.path.join(config.upload_path, file_uuid)
+
+ # Write to a temporary file to prevent incomplete files from
+ # being used.
+ temp_file_path = file_path + '~'
+
+ open(temp_file_path, 'wb').write(raw_blob)
+
+ # Now that we know the file has been fully saved to disk
+ # move it into place.
+ os.replace(temp_file_path, file_path)
+ except Exception as ex:
+ raise falcon.HTTPError(falcon.HTTP_400, title='API.ERROR',
+ description='API.FAILED_TO_RESTORE_COST_FILE')
+ resp.body = 'success'
+ resp.status = falcon.HTTP_200
diff --git a/web/package-lock.json b/web/package-lock.json
index e9502f64..c13bc18c 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "myems",
- "version": "1.1.3",
+ "version": "1.1.4",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/web/package.json b/web/package.json
index 91a6d7fe..7aa98511 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
{
"name": "myems",
- "version": "1.1.3",
+ "version": "1.1.4",
"private": true,
"dependencies": {
"@fortawesome/fontawesome-free": "^5.15.1",
diff --git a/web/src/config.js b/web/src/config.js
index db538afe..7a4c1a0d 100644
--- a/web/src/config.js
+++ b/web/src/config.js
@@ -1,4 +1,4 @@
-export const version = '1.1.3';
+export const version = '1.1.4';
export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint
export const topNavbarBreakpoint = 'lg';
//export const APIBaseURL = 'http://127.0.0.1:8000';
+
+
+ {{'SETTING.SELECT_COSTCENTER' | translate}}
-
-
-
-
-
-
-
+
- {{currentCostCenter.name}}{{'SETTING.N_S_TARIFF' | translate}}
-
-
-
-
+
- {{costcentertariff.name}}
-
+
+
-
+
+
-
+
- {{'SETTING.TRASH' | translate}}
-
-
- 
+
+
+
+
+
+
+
-
+
+
+ {{currentCostCenter.name}}{{'SETTING.N_S_TARIFF' | translate}}
+
+
+
+
{{costcentertariff.name}}
+
+
+ {{'SETTING.TRASH' | translate}}
+
+
+
+
+
+
-
-
+
-
-
- {{'SETTING.TARIFF_LIST' | translate}}
-
-
+
+
-
+ {{'SETTING.TARIFF_LIST' | translate}}
+
+
-
-
{{tariff.name}}
+ x-hjc-draggable="true"> {{tariff.name}}
-
-
-
-
+
+ | {{'SETTING.NAME' | translate}} | -{{'SETTING.STATUS' | translate}} | -{{'SETTING.UPLOAD_TIME' | translate}} | -{{'SETTING.ACTION' | translate}} | -||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ costfile.file_name }} | -{{ costfile.status }} | -{{ costfile.upload_datetime | date:'yyyy-MM-dd HH:mm'}} | +
| {{'SETTING.ID' | translate}} | +{{'SETTING.NAME' | translate}} | +{{'SETTING.STATUS' | translate}} | +{{'SETTING.UPLOAD_TIME' | translate}} | +{{'SETTING.ACTION' | translate}} | +
|---|---|---|---|---|
| {{ costfile.id }} | +{{ costfile.file_name }} + | +{{ costfile.status }} | +{{ costfile.upload_datetime | date:'yyyy-MM-dd HH:mm'}} | -- {{'SETTING.DELETE' | translate}} - - | -