Merge branch 'feature/1.4.0_kim-ec' into 'feature/1.4.0'

#43864 【Check CMS 1.4.0】パフォーマンス改善依頼2（カテゴリー）

See merge request !7

app/css/app.css

@@ -20013,7 +20013,7 @@ button {
 }
 }
 
 
 .drawer-menu dt {
 .drawer-menu dt {
-    padding: 10px 0 10px 30px;
+    padding: 10px 0 10px 40px;
     font-weight: 400
     font-weight: 400
 }
 }
 
 
@@ -20038,51 +20038,51 @@ button {
 }
 }
 
 
 .category-a {
 .category-a {
-    margin-left: 8px;
+    margin-left: 18px;
 }
 }
 
 
 .group-level-1 {
 .group-level-1 {
-    padding-left: 30px !important;
+    padding-left: 40px !important;
 }
 }
 
 
 .group-level-2 {
 .group-level-2 {
-    padding-left: 50px !important;
+    padding-left: 60px !important;
 }
 }
 
 
 .group-level-3 {
 .group-level-3 {
-    padding-left: 70px !important;
+    padding-left: 80px !important;
 }
 }
 
 
 .group-level-4 {
 .group-level-4 {
-    padding-left: 90px !important;
+    padding-left: 100px !important;
 }
 }
 
 
 .group-level-5 {
 .group-level-5 {
-    padding-left: 110px !important;
+    padding-left: 120px !important;
 }
 }
 
 
 .group-level-6 {
 .group-level-6 {
-    padding-left: 130px !important;
+    padding-left: 140px !important;
 }
 }
 
 
 .group-level-7 {
 .group-level-7 {
-    padding-left: 150px !important;
+    padding-left: 160px !important;
 }
 }
 
 
 .group-level-8 {
 .group-level-8 {
-    padding-left: 170px !important;
+    padding-left: 180px !important;
 }
 }
 
 
 .group-level-9 {
 .group-level-9 {
-    padding-left: 190px !important;
+    padding-left: 200px !important;
 }
 }
 
 
 .group-level-10 {
 .group-level-10 {
-    padding-left: 210px !important;
+    padding-left: 220px !important;
 }
 }
 
 
 .group-level-11 {
 .group-level-11 {
-    padding-left: 230px !important;
+    padding-left: 240px !important;
 }
 }
 
 
 .drawer-menu .drawer-menu3 li {
 .drawer-menu .drawer-menu3 li {

app/script/check.js

@@ -2977,7 +2977,7 @@ CHK.search = function() {
     var operationGroupMasterId = CHK.operationGroupMasterId;
     var operationGroupMasterId = CHK.operationGroupMasterId;
     var searchResult;
     var searchResult;
 
 
-	if(searchStartDate > searchEndDate){
+	if((searchStartDate && searchEndDate) && (searchStartDate > searchEndDate)){
 		CHK.displayAlert("dateError");
 		CHK.displayAlert("dateError");
 		return;
 		return;
 	}
 	}
@@ -2987,12 +2987,16 @@ CHK.search = function() {
         if (searchKeyword.length) {
         if (searchKeyword.length) {
             result = result * operation.operationName.includes(searchKeyword);
             result = result * operation.operationName.includes(searchKeyword);
         }
         }
-        if (searchStartDate.length) {
+        if (searchStartDate.length && !searchEndDate.length) {
             result = result * (operation.operationStartDate >= searchStartDate);
             result = result * (operation.operationStartDate >= searchStartDate);
         }
         }
-        if (searchEndDate.length) {
+        if (searchEndDate.length && !searchStartDate.length) {
             result = result * (operation.operationEndDate <= searchEndDate);
             result = result * (operation.operationEndDate <= searchEndDate);
         }
         }
+        if (searchStartDate.length && searchEndDate.length) {
+            result = result * ((operation.operationStartDate <= searchEndDate) && (operation.operationEndDate >= searchStartDate));
+        }
+
         if (operationGroupMasterId != 0) {
         if (operationGroupMasterId != 0) {
             var operationGroupMasterIdList = CHK.operationGroupMasterRelation.operationGroupMasterRelationList.filter(function(operationGroupMasterRelation) {
             var operationGroupMasterIdList = CHK.operationGroupMasterRelation.operationGroupMasterRelationList.filter(function(operationGroupMasterRelation) {
                 return operationGroupMasterRelation.operationId == operation.operationId;
                 return operationGroupMasterRelation.operationId == operation.operationId;