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

# Conflicts:
#	abweb/common/json/lang/lang-en.json
#	abweb/common/json/lang/lang-ja.json
#	abweb/common/json/lang/lang-ko.json

abweb/common/js/common.js

@@ -58,12 +58,10 @@ COMMON.avwScreenMove = function (url) {
  * @param {String} key
  */
 COMMON.showLoading = function () {
-    // $(window).resize(function() {
     $('#loader').css( {
         'width': $(window).width(),
         'height': $(window).height()
     });
-    // });
     document.getElementById('loader').style.display = 'block';
 };
 

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

@@ -120,5 +120,6 @@
 "error": "Error",
 "msgSendPushMessageConfirm": "Do you want to send message?",
 "close":"Close",
-"success":"Success"
+"success":"Success",
+"dateError": "Set the start date before the end date."
 }
\ No newline at end of file

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

@@ -7,7 +7,7 @@
 "txtLastLoginTime":"最終ログイン時間:",
 
 "msgPwdEmpty":"パスワードを入力してください",
-"msgPwdOldWrong":"現在のパスワードに誤りがあります",
+"msgPwdOldWrong":"現在のパスワードに誤りがあります。",
 "msgPwdNotMatch":"新しいパスワードと新しいパスワード（確認）が一致しません。",
 "msgInvaildLength":"パスワードの長さは6文字以上16文字以下の間でなければいけません。",
 "msgHasSeqChar":"新しいパスワードに同じ文字を3文字以上連続して使えません。",
@@ -118,5 +118,6 @@
 "error": "エラー",
 "msgSendPushMessageConfirm": "プッシュメッセージを送信しますか?",
 "close":"閉じる",
-"success":"成功"
+"success":"成功",
+"dateError": "開始日は終了日の前に設定してください。"
 }
\ No newline at end of file

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

@@ -117,5 +117,6 @@
 "error": "에러",
 "msgSendPushMessageConfirm": "Do you want to send message?",
 "close":"Close",
-"success":"Success"
+"success":"Success",
+"dateError": "시작일은 종료일 이전에 설정하십시오."
 }
\ No newline at end of file

abweb/js/login/login.js

@@ -113,45 +113,44 @@ LOGIN.checkDialogValidation = function () {
 
     if (!ValidationUtil.CheckRequiredForText(currentPass)) {
         LOGIN.login_errorMessage = '';
+        msgError.html(COMMON.format(I18N.i18nText('msgEssential'), I18N.i18nText('txtPwdCurr')).toString());
         msgError.html(I18N.i18nText('msgPwdEmpty'));
-        msgError.attr('lang', 'msgPwdEmpty');
         msgError.show();
         return false;
     } else if (!ValidationUtil.CheckRequiredForText(newPass)) {
         LOGIN.login_errorMessage = '';
-        msgError.html(I18N.i18nText('msgPwdEmpty'));
-        msgError.attr('lang', 'msgPwdEmpty');
+        msgError.html(COMMON.format(I18N.i18nText('msgEssential'), I18N.i18nText('txtPwdNew')).toString());
+        msgError.show();
+        return false;
+    } else if (!ValidationUtil.CheckRequiredForText(confirmPass)) {
+        LOGIN.login_errorMessage = '';
+        msgError.html(COMMON.format(I18N.i18nText('msgEssential'), I18N.i18nText('txtPwdNewRe')).toString());
         msgError.show();
         return false;
     } else {
         if (newPass != confirmPass) {
             LOGIN.login_errorMessage = '';
             msgError.html(I18N.i18nText('msgPwdNotMatch'));
-            msgError.attr('lang', 'msgPwdNotMatch');
             msgError.show();
             return false;
         } else if (!ValidationUtil.CheckMinLengthForByte(newPass, 6)) {
             LOGIN.login_errorMessage = '';
             msgError.html(I18N.i18nText('msgInvaildLength'));
-            msgError.attr('lang', 'msgInvaildLength');
             msgError.show();
             return false;
         } else if (!ValidationUtil.CheckMaxLengthForByte(newPass, 16)) {
             LOGIN.login_errorMessage = '';
             msgError.html(I18N.i18nText('msgInvaildLength'));
-            msgError.attr('lang', 'msgInvaildLength');
             msgError.show();
             return false;
         } else if (ValidationUtil.HasSeqChar(newPass, 3)) {
             LOGIN.login_errorMessage = '';
             msgError.html(I18N.i18nText('msgHasSeqChar'));
-            msgError.attr('lang', 'msgHasSeqChar');
             msgError.show();
             return false;
         } else if (ValidationUtil.ContainSameSeqChar(newPass, currentPass, 4)) {
             LOGIN.login_errorMessage = '';
             msgError.html(I18N.i18nText('msgContainSameSeqChar'));
-            msgError.attr('lang', 'msgContainSameSeqChar');
             msgError.show();
             return false;
         } else {

abweb/js/operationList/operationList.js

@@ -23,8 +23,8 @@ OL.operationGroupMasterId;
 OL.init = function () {
     console.log('OperationList start');
     sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.OPERATION_LIST;
-    sessionStorage.removeItem("operationId");
-    sessionStorage.removeItem("RL_searchWord");
+    sessionStorage.removeItem('operationId');
+    sessionStorage.removeItem('RL_searchWord');
     TEMPLATE.loadHeader('#includedHeader');
 
     TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'workList', true, null);
@@ -311,9 +311,7 @@ OL.createCategoryList = function () {
     if (typeof OL.operationGroupMasterId === 'undefined' || OL.operationGroupMasterId == 0) {
         allChecked = ' checked';
     }
-    const allCategory = $(
-        '<ul><li><label><input type="radio" name="category" value="0"' + allChecked + '> <span>' + I18N.i18nText('categoryAll') + '</span></label></li></ul>',
-    );
+    const allCategory = $('<ul><li><label><input type="radio" name="category" value="0"' + allChecked + '> <span>' + I18N.i18nText('categoryAll') + '</span></label></li></ul>');
     categoryListElement.append(allCategory);
     //create category(operationGroupMaster) structure
     for (let i = 0; i < OL.operationGroupMaster.length; i++) {
@@ -329,7 +327,7 @@ OL.createCategoryList = function () {
         inputLabel.append(inputRadio);
         inputLabel.append(' ');
         inputLabel.append(groupSpan);
-        const isParent = OL.operationGroupMaster.find(function(child) {
+        const isParent = OL.operationGroupMaster.find(function (child) {
             return item.operationGroupMasterId == child.parentOperationGroupMasterId;
         });
         let parentElement = categoryListElement;
@@ -453,7 +451,6 @@ OL.sortOperationList = function (sortNumber) {
  * search operarionList
  */
 OL.search = function () {
-    COMMON.showLoading();
     const searchKeyword = $('#searchTaskName').val();
     const searchStartDate = $('#searchStartDate').val();
     const searchEndDate = $('#searchEndDate').val();
@@ -464,6 +461,7 @@ OL.search = function () {
         return;
     }
 
+    COMMON.showLoading();
     OL.getAllDataWeb(searchKeyword, OL.sortIndex, searchStartDate, searchEndDate, OL.operationGroupMasterId);
     OL.createOperationList(OL.operationList);
     OL.createCategory();

abweb/js/pdfPrint/pdfPrint.js

@@ -16,8 +16,6 @@ PP.init = function () {
     console.log('PP.init');
     PP.loadCommon();
 
-    PP.initPdfList();
-
     COMMON.closeLoading();
 };
 
@@ -40,7 +38,7 @@ PP.loadCommon = function () {
             titleLang: CONSTANT.PAGE_NAME.PDF_PRINT,
         }
     ];
-    TEMPLATE.loadMainNavsTitle('#includedMainTitle', CONSTANT.PAGE_NAME.PDF_PRINT, navs, null);
+    TEMPLATE.loadMainNavsTitle('#includedMainTitle', CONSTANT.PAGE_NAME.PDF_PRINT, navs, PP.initPdfList);
 };
 
 /**