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

add loading when send message

See merge request !53

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

@@ -115,5 +115,6 @@
 "categorySelection":"Category Selection",
 "categorySelection":"Category Selection",
 "categoryAll":"All",
 "categoryAll":"All",
 "reportForm": "Report",
 "reportForm": "Report",
-"periodicInspectionPeriod": "Periodic Inspection Period"
+"periodicInspectionPeriod": "Periodic Inspection Period",
+"msgSendPushMessageSuccess":"we sent a push message"
 }
 }
\ No newline at end of file

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

@@ -113,5 +113,6 @@
 "categorySelection":"カテゴリー選択",
 "categorySelection":"カテゴリー選択",
 "categoryAll":"すべて",
 "categoryAll":"すべて",
 "reportForm": "報告",
 "reportForm": "報告",
-"periodicInspectionPeriod": "定期点検期間"
+"periodicInspectionPeriod": "定期点検期間",
+"msgSendPushMessageSuccess":"プッシュメッセージ送信しました。"
 }
 }
\ No newline at end of file

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

@@ -112,5 +112,6 @@
 "categorySelection":"Category Selection",
 "categorySelection":"Category Selection",
 "categoryAll":"All",
 "categoryAll":"All",
 "reportForm": "보고서",
 "reportForm": "보고서",
-"periodicInspectionPeriod": "정기점검기간"
+"periodicInspectionPeriod": "정기점검기간",
+"msgSendPushMessageSuccess":"푸시메시지를 보냈습니다."
 }
 }
\ No newline at end of file

abweb/js/sendMessage/sendMessage.js

@@ -79,6 +79,7 @@ SendMessage.onClickSend = function () {
  * @param {int} sendType - 0: Group, 1: All
  * @param {int} sendType - 0: Group, 1: All
  */
  */
 SendMessage.postMessage = function (message, operationId, sendType) {
 SendMessage.postMessage = function (message, operationId, sendType) {
+    COMMON.showLoading();
     let param = {
     let param = {
         sid: COMMON.getSid(),
         sid: COMMON.getSid(),
         message: message,
         message: message,
@@ -89,9 +90,13 @@ SendMessage.postMessage = function (message, operationId, sendType) {
         SendMessage.baseApiUrl,
         SendMessage.baseApiUrl,
         param,
         param,
         false,
         false,
-        function (json) {},
+        function (json) {
+            COMMON.closeLoading();
+            alert(I18N.i18nText('msgSendPushMessageSuccess'));
+        },
         function () {
         function () {
             console.log('SendMessage.postMessage error');
             console.log('SendMessage.postMessage error');
+            COMMON.closeLoading();
         },
         },
     );
     );
 };
 };