diff --git a/admin/views/settings/costcenter/costcenter.html b/admin/views/settings/costcenter/costcenter.html index 28b717ce..2853bacd 100644 --- a/admin/views/settings/costcenter/costcenter.html +++ b/admin/views/settings/costcenter/costcenter.html @@ -120,12 +120,11 @@ download="{{costfile.file_name}}">{{ costfile.file_name }} {{ costfile.status }} - {{ costfile.upload_datetime | date:'yyyy-MM-dd HH:mm'}} - + {{ costfile.upload_datetime}} {{'SETTING.RESTORE' | translate}} - {{'SETTING.DELETE' | translate}} diff --git a/myems-api/README.md b/myems-api/README.md index efeed06e..8390cb79 100644 --- a/myems-api/README.md +++ b/myems-api/README.md @@ -274,7 +274,7 @@ Result | 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 | +| upload_datetime | string | Upload Datetime in Local Timezone | | status | string | Cost File processing status (new, done, error) | | file_object | BLOB | Cost File Object | diff --git a/myems-api/core/costfile.py b/myems-api/core/costfile.py index 02d710e0..9f85cfcf 100644 --- a/myems-api/core/costfile.py +++ b/myems-api/core/costfile.py @@ -3,7 +3,7 @@ import json import mysql.connector import config import uuid -from datetime import datetime, timezone +from datetime import datetime, timezone, timedelta import os from core.userlogger import user_logger @@ -31,15 +31,18 @@ class CostFileCollection: cursor.close() cnx.disconnect() + timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) + if config.utc_offset[0] == '-': + timezone_offset = -timezone_offset + result = list() if rows is not None and len(rows) > 0: for row in rows: - upload_datetime = row[3] - upload_datetime = upload_datetime.replace(tzinfo=timezone.utc) + upload_datetime_local = row[3].replace(tzinfo=timezone.utc) + timedelta(minutes=timezone_offset) meta_result = {"id": row[0], "file_name": row[1], "uuid": row[2], - "upload_datetime": upload_datetime.timestamp() * 1000, + "upload_datetime": upload_datetime_local.strftime('%Y-%m-%dT%H:%M:%S'), "status": row[4]} result.append(meta_result) @@ -172,14 +175,15 @@ class CostFileItem: if row is None: raise falcon.HTTPError(falcon.HTTP_404, title='API.NOT_FOUND', description='API.COST_FILE_NOT_FOUND') + timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) + if config.utc_offset[0] == '-': + timezone_offset = -timezone_offset - upload_datetime = row[3] - upload_datetime = upload_datetime.replace(tzinfo=timezone.utc) - + upload_datetime_local = row[3].replace(tzinfo=timezone.utc) + timedelta(minutes=timezone_offset) result = {"id": row[0], "file_name": row[1], "uuid": row[2], - "upload_datetime": upload_datetime.timestamp() * 1000, + "upload_datetime": upload_datetime_local.strftime('%Y-%m-%dT%H:%M:%S'), "status": row[4]} resp.body = json.dumps(result)