Merge branch 'feature/1.0_check_web_dev_son' into 'feature/1.0_check_web_dev'

feature/1.0_check_web_dev_son

See merge request !63

abweb/common/js/common.js

@@ -118,8 +118,8 @@ COMMON.showConfirm = function (messageCode, confirmCallback, options = {}) {
  */
  */
 COMMON.showAlert = function (messageCode, options = {}) {
 COMMON.showAlert = function (messageCode, options = {}) {
     const defaultParams = {
     const defaultParams = {
-        titleCode: 'confirmation',
-        confirmNoCode: 'confirmNo'
+        titleCode: 'error',
+        confirmNoCode: 'close'
     }
     }
     const params = Object.assign(options, defaultParams);
     const params = Object.assign(options, defaultParams);
     let message = '';
     let message = '';

abweb/common/json/lang/lang-en.json

@@ -118,5 +118,6 @@
 "periodicInspectionPeriod": "Periodic Inspection Period",
 "periodicInspectionPeriod": "Periodic Inspection Period",
 "msgSendPushMessageSuccess":"we sent a push message",
 "msgSendPushMessageSuccess":"we sent a push message",
 "error": "Error",
 "error": "Error",
-"msgSendPushMessageConfirm": "Do you want to send message?"
+"msgSendPushMessageConfirm": "Do you want to send message?",
+"close":"Close"
 }
 }
\ No newline at end of file

abweb/common/json/lang/lang-ja.json

@@ -87,10 +87,10 @@
 "txtMessageContent":"メッセージ",
 "txtMessageContent":"メッセージ",
 "buttonTemplateSelection":"テンプレート選択",
 "buttonTemplateSelection":"テンプレート選択",
 "buttonSend":"送信",
 "buttonSend":"送信",
-"msgContentRequired":"Content is required",
-"msgContentInvalidLength":"The content length exceeds the maximum of {0} characters",
-"msgOperationRequired":"Operation is required",
-"msgSendTypeRequired":"Send type is required",
+"msgContentRequired":"メッセージを入力してください。",
+"msgContentInvalidLength":"メッセージの長さが最大文字数({0})を超えています。",
+"msgOperationRequired":"作業を選択してください。",
+"msgSendTypeRequired":"送信先を選択してください。",
 "operationSelection":"作業選択",
 "operationSelection":"作業選択",
 "selection":"選択",
 "selection":"選択",
 "templateSelection":"テンプレート選択",
 "templateSelection":"テンプレート選択",
@@ -116,5 +116,6 @@
 "periodicInspectionPeriod": "定期点検期間",
 "periodicInspectionPeriod": "定期点検期間",
 "msgSendPushMessageSuccess":"プッシュメッセージ送信しました。",
 "msgSendPushMessageSuccess":"プッシュメッセージ送信しました。",
 "error": "エラー",
 "error": "エラー",
-"msgSendPushMessageConfirm": "Do you want to send message?"
+"msgSendPushMessageConfirm": "プッシュメッセージを送信しますか?",
+"close":"閉じる"
 }
 }
\ No newline at end of file

abweb/common/json/lang/lang-ko.json

@@ -115,5 +115,6 @@
 "periodicInspectionPeriod": "정기점검기간",
 "periodicInspectionPeriod": "정기점검기간",
 "msgSendPushMessageSuccess":"푸시메시지를 보냈습니다.",
 "msgSendPushMessageSuccess":"푸시메시지를 보냈습니다.",
 "error": "에러",
 "error": "에러",
-"msgSendPushMessageConfirm": "Do you want to send message?"
+"msgSendPushMessageConfirm": "Do you want to send message?",
+"close":"Close"
 }
 }
\ No newline at end of file

abweb/js/pushMessageList/pushMessageList.js

@@ -18,7 +18,7 @@ PushMessageList.init = function () {
             href: 'dashboard.html',
             href: 'dashboard.html',
         },
         },
         {
         {
-            titleLang: 'messageListTitle',
+            titleLang: 'pushMessageList',
         },
         },
     ];
     ];
     TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'pushMessageList', navs, null);
     TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'pushMessageList', navs, null);
@@ -71,6 +71,12 @@ PushMessageList.generateMessageListHtml = function (messageList) {
         $('#messageList .not-found').removeClass('d-none');
         $('#messageList .not-found').removeClass('d-none');
         return;
         return;
     }
     }
+    //sort message list by send date
+    messageList.sort(function (a, b) {
+        if (a.pushSendDate > b.pushSendDate) return -1;
+        if (a.pushSendDate < b.pushSendDate) return 1;
+        return 0;
+    });
     $('#messageList .not-found').addClass('d-none');
     $('#messageList .not-found').addClass('d-none');
     for (var i = 0; i < messageList.length; i++) {
     for (var i = 0; i < messageList.length; i++) {
         let message = messageList[i];
         let message = messageList[i];