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

作業一覧の日付エラー

See merge request !68

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

@@ -119,5 +119,6 @@
 "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"
+"close":"Close",
+"dateError": "Set the start date before the end date."
 }
 }
\ No newline at end of file

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

@@ -117,5 +117,6 @@
 "msgSendPushMessageSuccess":"プッシュメッセージ送信しました。",
 "msgSendPushMessageSuccess":"プッシュメッセージ送信しました。",
 "error": "エラー",
 "error": "エラー",
 "msgSendPushMessageConfirm": "プッシュメッセージを送信しますか?",
 "msgSendPushMessageConfirm": "プッシュメッセージを送信しますか?",
-"close":"閉じる"
+"close":"閉じる",
+"dateError": "開始日は終了日の前に設定してください。"
 }
 }
\ No newline at end of file

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

@@ -116,5 +116,6 @@
 "msgSendPushMessageSuccess":"푸시메시지를 보냈습니다.",
 "msgSendPushMessageSuccess":"푸시메시지를 보냈습니다.",
 "error": "에러",
 "error": "에러",
 "msgSendPushMessageConfirm": "Do you want to send message?",
 "msgSendPushMessageConfirm": "Do you want to send message?",
-"close":"Close"
+"close":"Close",
+"dateError": "시작일은 종료일 이전에 설정하십시오."
 }
 }
\ No newline at end of file

abweb/js/operationList/operationList.js

@@ -23,10 +23,10 @@ OL.operationGroupMasterId;
 OL.init = function () {
 OL.init = function () {
     console.log('OperationList start');
     console.log('OperationList start');
     sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.OPERATION_LIST;
     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.loadHeader('#includedHeader');
-    
+
     TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'workList', true, null);
     TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'workList', true, null);
     TEMPLATE.loadConfirmModal('#includedConfirmModal');
     TEMPLATE.loadConfirmModal('#includedConfirmModal');
     //get all data of operation list scene
     //get all data of operation list scene
@@ -311,9 +311,7 @@ OL.createCategoryList = function () {
     if (typeof OL.operationGroupMasterId === 'undefined' || OL.operationGroupMasterId == 0) {
     if (typeof OL.operationGroupMasterId === 'undefined' || OL.operationGroupMasterId == 0) {
         allChecked = ' checked';
         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);
     categoryListElement.append(allCategory);
     //create category(operationGroupMaster) structure
     //create category(operationGroupMaster) structure
     for (let i = 0; i < OL.operationGroupMaster.length; i++) {
     for (let i = 0; i < OL.operationGroupMaster.length; i++) {
@@ -329,7 +327,7 @@ OL.createCategoryList = function () {
         inputLabel.append(inputRadio);
         inputLabel.append(inputRadio);
         inputLabel.append(' ');
         inputLabel.append(' ');
         inputLabel.append(groupSpan);
         inputLabel.append(groupSpan);
-        const isParent = OL.operationGroupMaster.find(function(child) {
+        const isParent = OL.operationGroupMaster.find(function (child) {
             return item.operationGroupMasterId == child.parentOperationGroupMasterId;
             return item.operationGroupMasterId == child.parentOperationGroupMasterId;
         });
         });
         let parentElement = categoryListElement;
         let parentElement = categoryListElement;
@@ -453,7 +451,6 @@ OL.sortOperationList = function (sortNumber) {
  * search operarionList
  * search operarionList
  */
  */
 OL.search = function () {
 OL.search = function () {
-    COMMON.showLoading();
     const searchKeyword = $('#searchTaskName').val();
     const searchKeyword = $('#searchTaskName').val();
     const searchStartDate = $('#searchStartDate').val();
     const searchStartDate = $('#searchStartDate').val();
     const searchEndDate = $('#searchEndDate').val();
     const searchEndDate = $('#searchEndDate').val();
@@ -464,6 +461,7 @@ OL.search = function () {
         return;
         return;
     }
     }
 
 
+    COMMON.showLoading();
     OL.getAllDataWeb(searchKeyword, OL.sortIndex, searchStartDate, searchEndDate, OL.operationGroupMasterId);
     OL.getAllDataWeb(searchKeyword, OL.sortIndex, searchStartDate, searchEndDate, OL.operationGroupMasterId);
     OL.createOperationList(OL.operationList);
     OL.createOperationList(OL.operationList);
     OL.createCategory();
     OL.createCategory();