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

Feature/1.0 check web dev

See merge request !120

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

@@ -123,5 +123,6 @@
 "dateError": "Set the start date before the end date.",
 "dateError": "Set the start date before the end date.",
 "onlyRfid":"RFID or barcode is set.\nPlease scan the code.",
 "onlyRfid":"RFID or barcode is set.\nPlease scan the code.",
 "errorOccured": "Communication error.",
 "errorOccured": "Communication error.",
-"selectData": "Choice"
+"selectData": "Choice",
+"errorSendMsg": "Send failed."
 }
 }
\ No newline at end of file

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

@@ -121,5 +121,6 @@
 "dateError": "開始日は終了日の前に設定してください。",
 "dateError": "開始日は終了日の前に設定してください。",
 "onlyRfid":"RFID又はバーコードが設定されています。\n該当コードを読み込んでください。",
 "onlyRfid":"RFID又はバーコードが設定されています。\n該当コードを読み込んでください。",
 "errorOccured": "通信エラーです。",
 "errorOccured": "通信エラーです。",
-"selectData": "選択"
+"selectData": "選択",
+"errorSendMsg": "送信に失敗しました。"
 }
 }
\ No newline at end of file

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

@@ -115,10 +115,11 @@
 "periodicInspectionPeriod": "정기점검기간",
 "periodicInspectionPeriod": "정기점검기간",
 "msgSendPushMessageSuccess":"푸시메시지를 보냈습니다.",
 "msgSendPushMessageSuccess":"푸시메시지를 보냈습니다.",
 "error": "에러",
 "error": "에러",
-"msgSendPushMessageConfirm": "Do you want to send message?",
-"close":"Close",
+"msgSendPushMessageConfirm": "메시지를 보내시겠습니까.",
+"close":"닫다",
 "dateError": "시작일은 종료일 이전에 설정하십시오.",
 "dateError": "시작일은 종료일 이전에 설정하십시오.",
 "onlyRfid":"RFID또는 바코드가 설정되어있습니다.\n해당코드를 스캔해주십시오.",
 "onlyRfid":"RFID또는 바코드가 설정되어있습니다.\n해당코드를 스캔해주십시오.",
 "errorOccured": "통신 오류입니다.",
 "errorOccured": "통신 오류입니다.",
-"selectData": "선택"
+"selectData": "선택",
+"errorSendMsg": "전송에 실패했습니다."
 }
 }
\ No newline at end of file

abweb/js/operationList/operationList.js

@@ -36,7 +36,7 @@ OL.init = function () {
     OL.createOperationList(OL.operationList);
     OL.createOperationList(OL.operationList);
 
 
     //show category(operationGroupMaster)
     //show category(operationGroupMaster)
-    $('#includedCategoryModal').load('../common/category-modal.html', function () {
+    $('#includedCategoryModal').load('../common/html/category-modal.html', function () {
         OL.createCategory();
         OL.createCategory();
         I18N.initi18n();
         I18N.initi18n();
     });
     });
@@ -507,11 +507,11 @@ OL.sendOperation = function (operationId, operationType, reportType, enableAddRe
     //save operation logs. needed for sorting
     //save operation logs. needed for sorting
     OL.saveOperationReadingLog(operationId, operationType, reportType);
     OL.saveOperationReadingLog(operationId, operationType, reportType);
     //Transition to the report form or operation list screen
     //Transition to the report form or operation list screen
-    sessionStorage.setItem("operationId", operationId);
+    sessionStorage.setItem('operationId', operationId);
     if (enableAddReport == '1' || reportType == CONSTANT.REPORT_TYPE.ROUTINE) {
     if (enableAddReport == '1' || reportType == CONSTANT.REPORT_TYPE.ROUTINE) {
         COMMON.avwScreenMove('reportList.html');
         COMMON.avwScreenMove('reportList.html');
     } else {
     } else {
-        const url = 'reportForm.html?operationId=' + operationId + "&addReport=" + enableAddReport;
+        const url = 'reportForm.html?operationId=' + operationId + '&addReport=' + enableAddReport;
         COMMON.avwScreenMove(url);
         COMMON.avwScreenMove(url);
     }
     }
 };
 };

abweb/js/sendMessage/sendMessage.js

@@ -69,7 +69,7 @@ SendMessage.onClickSend = function () {
     const message = SendMessage.getCurrentMessageContent();
     const message = SendMessage.getCurrentMessageContent();
     const operationId = SendMessage.getCurrentOperationId();
     const operationId = SendMessage.getCurrentOperationId();
     const sendType = SendMessage.getCurrentSendType();
     const sendType = SendMessage.getCurrentSendType();
-    COMMON.showConfirm('msgSendPushMessageConfirm', function() {
+    COMMON.showConfirm('msgSendPushMessageConfirm', function () {
         SendMessage.postMessage(message, operationId, sendType);
         SendMessage.postMessage(message, operationId, sendType);
     });
     });
 };
 };
@@ -104,8 +104,8 @@ SendMessage.postMessage = function (message, operationId, sendType) {
             });
             });
         },
         },
         function () {
         function () {
-            console.log('SendMessage.postMessage error');
             COMMON.closeLoading();
             COMMON.closeLoading();
+            COMMON.showAlert('errorSendMsg');
         },
         },
     );
     );
 };
 };