Merge branch 'feature/1.0_check_web' into feature/1.0_check_web_dev_imai

abweb/common/js/header.js

@@ -60,7 +60,7 @@ HEADER.processLogout = function () {
                 COMMON.userSetting().remove(CONSTANT.KEYS.userInfo_sid_local);
                 COMMON.userSetting().remove(CONSTANT.KEYS.userInfo_sid_local);
                 // Move to login screen
                 // Move to login screen
                 //window.location = COMMON.ScreenIds.Login;
                 //window.location = COMMON.ScreenIds.Login;
-                COMMON.goUrlWithCurrentParams(CONSTANT.PAGE_NAME.LOGIN);
+                COMMON.avwScreenMove(CONSTANT.PAGE_NAME.LOGIN);
             } else {
             } else {
                 if (data.errorMessage) {
                 if (data.errorMessage) {
                     COMMON.showAlert(null, {message: data.errorMessage});
                     COMMON.showAlert(null, {message: data.errorMessage});

abweb/js/sendMessage/sendMessage.js

@@ -94,7 +94,14 @@ SendMessage.postMessage = function (message, operationId, sendType) {
         false,
         false,
         function (json) {
         function (json) {
             COMMON.closeLoading();
             COMMON.closeLoading();
-            COMMON.showAlert('msgSendPushMessageSuccess', 'success');
+            //COMMON.showAlert('msgSendPushMessageSuccess', 'success');
+            COMMON.showConfirm('msgSendPushMessageSuccess', function() {
+                COMMON.avwScreenMove('dashboard.html');
+            }, {
+                titleCode: 'success',
+                confirmYesCode: 'close',
+                confirmNoCode: null,
+            });
         },
         },
         function () {
         function () {
             COMMON.closeLoading();
             COMMON.closeLoading();