diff --git a/myems-api/core/webmessage.py b/myems-api/core/webmessage.py
index 671aa0c8..70a984f7 100644
--- a/myems-api/core/webmessage.py
+++ b/myems-api/core/webmessage.py
@@ -127,7 +127,7 @@ class WebMessageCollection:
meta_result = {"id": row[0],
"subject": row[1],
"message": row[2].replace("
", ""),
- "created_datetime": row[3].timestamp() * 1000 if isinstance(row[4], datetime) else None,
+ "created_datetime": row[3].timestamp() * 1000 if isinstance(row[3], datetime) else None,
"status": row[4],
"reply": row[5]}
result.append(meta_result)
@@ -228,7 +228,7 @@ class WebMessageStatusNewCollection:
meta_result = {"id": row[0],
"subject": row[1],
"message": row[2].replace("
", ""),
- "created_datetime": row[3].timestamp() * 1000 if isinstance(row[4], datetime) else None,
+ "created_datetime": row[3].timestamp() * 1000 if isinstance(row[3], datetime) else None,
"status": row[4],
"reply": row[5]}
result.append(meta_result)
@@ -333,7 +333,7 @@ class WebMessageItem:
meta_result = {"id": row[0],
"subject": row[1],
"message": row[2].replace("
", ""),
- "created_datetime": row[3].timestamp() * 1000 if isinstance(row[4], datetime) else None,
+ "created_datetime": row[3].timestamp() * 1000 if isinstance(row[3], datetime) else None,
"status": row[4],
"reply": row[5]}
diff --git a/web/Dockerfile b/web/Dockerfile
index efdeac9d..0df5fdd6 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -1,8 +1,7 @@
FROM nginx:1.21.1
# remove the default config
-RUN rm /etc/nginx/conf.d/default.conf && \
- rm /etc/nginx/nginx.conf && \
+RUN rm /etc/nginx/conf.d/default.conf && rm /etc/nginx/nginx.conf
# create new root folder
RUN mkdir -p /var/www/html/web
diff --git a/web/src/components/MyEMS/Notification/Notification.js b/web/src/components/MyEMS/Notification/Notification.js
index 62aa3a62..1b8ad793 100644
--- a/web/src/components/MyEMS/Notification/Notification.js
+++ b/web/src/components/MyEMS/Notification/Notification.js
@@ -62,9 +62,9 @@ const Notification = ({ setRedirect, setRedirectUrl, t }) => {
let isResponseOK = false;
if (!fetchSuccess) {
- fetch(APIBaseURL + '/webmessagesnew?' +
- 'startdatetime=' + startDatetime.format('YYYY-MM-DDTHH:mm:ss') +
- '&enddatetime=' + endDatetime.format('YYYY-MM-DDTHH:mm:ss'), {
+ fetch(APIBaseURL + '/webmessages' +
+ '/from/' + startDatetime.format('YYYY-MM-DD') +
+ '/to/' + endDatetime.format('YYYY-MM-DD'), {
method: 'GET',
headers: {
"Content-type": "application/json",