Merge branch 'master' of https://dev.azure.com/DBNTech/ForeignAffairs/_git/ForeignAffairs

src/main/resources/static/js/faStatistics/asfCov.js

@@ -1,4 +1,10 @@
-
+$(document).on('change', '#pressurizedYn', function (){
+	if($("#pressurizedYn").val() == 'N'){
+		$("#pressurizedN").attr("disabled",true);
+	}else{
+		$("#pressurizedN").removeAttr("disabled");
+ 	}
+})
 
 $("#jqueryBtn").click(function(){
     $(".quiz-text").text("Javascript");
@@ -112,6 +118,11 @@ function getEditModal(asfCovKey){
             $("#asfCovEditModalContent").empty().append(html);
             $("#asfCovEditModal").modal('show');
             $("#editContent").empty().append(html);
+            if($("#pressurizedYn").val() == 'N'){
+				$("#pressurizedN").attr("disabled",true);
+			}else{
+				$("#pressurizedN").removeAttr("disabled");
+		 	}
             setUploadDiv();
         },
       error:function(e){
@@ -178,8 +189,24 @@ $(document).on('click', '#asfCovDownExcel', function (){
 });
 
 $(document).on('click', '#caseNumBtn', function (){
-    searchModalSubmit(1);
-    $("#asfCovSubModal").modal('show');
+	const cdsKey = $("#cdsKey").val();
+	$.ajax({
+    url: $("#modalUrl").val(),
+    data : $("#modalSearchForm").serialize(),
+    type: 'GET',
+    contentType: false,
+    dataType:"html",
+    success: function(html){
+      $("#subModalBody").empty().append(html);
+      if(cdsKey != ""){
+        	$(".crackdownChkbox[value="+cdsKey+"]").prop("checked", true);
+        }
+      $("#asfCovSubModal").modal('show');
+    },
+    error:function(e){
+      ajaxErrorAction(e);
+    }
+  });
 })
 
 $(document).on('click', '#getCrackdownBtn', function (){
@@ -189,7 +216,7 @@ $(document).on('click', '#getCrackdownBtn', function (){
     $("#cdsKey").val(tr.attr("data-key"))
     $("#boatNameKr").val(tr.find(".boatNameKr").val())
     $("#caseNum").val(tr.find(".caseNum").val())
-    $("#caseAgency").val(tr.find(".caseAgency").val())
+    $("#caseAgency").val(tr.find(".caseAgencyNm").val())
     $("#casePoliceOfficer").val(tr.find(".casePoliceOfficer").val())
     $("#crackdownPolice").val(tr.find(".crackdownPolice").val())
     $("#crackdownBoat").val(tr.find(".crackdownBoat").val())

src/main/resources/templates/common/modal/crackdownStatusModal.html

@@ -199,7 +199,10 @@
                       <input type="hidden" class="casePoliceOfficer" th:value="${crackdownStatus.casePoliceOfficer}">
                       <input type="hidden" class="crackdownPolice" th:value="${crackdownStatus.crackdownPolice}">
                       <input type="hidden" class="crackdownBoat" th:value="${crackdownStatus.crackdownBoat}">
-                      <td><input type="checkbox" class="crackdownChkbox"></td>
+                      <th:block th:each="commonCode:${session.commonCode.get('OG')}">
+                      <input type="hidden" class="caseAgencyNm" th:if="${commonCode.itemCd eq crackdownStatus.caseAgency}" th:value="${commonCode.itemValue}">
+                      </th:block>
+                      <td><input type="checkbox" class="crackdownChkbox" th:value="${crackdownStatus.cdsKey}"></td>
                       <!--<td th:text="${crackdownStatus.cdsKey}"></td>-->
                       <td th:text="${crackdownStatus.caseNum}"></td>
                       <td th:text="${crackdownStatus.napoDt}"></td>

src/main/resources/templates/faStatistics/asfCov/asfCov.html

@@ -125,7 +125,12 @@
                       <tr class="tr" th:each="asfcov:${asfCovList}" th:data-key="${asfcov.asfCovKey}">
                         <td th:text="${asfcov.caseNum}"></td>
                         <td th:text="${asfcov.napoDt}"></td>
-                        <td th:text="${asfcov.boatNameKr}"></td>
+                        <th:block th:if="${asfcov.pressurizedN eq 'A'}">
+                        	<td th:text="${asfcov.boatNameKr}" style="color: blue;"></td>
+                        </th:block>
+                        <th:block th:unless="${asfcov.pressurizedN eq 'A'}">
+                        	<td th:text="${asfcov.boatNameKr}"></td>
+                        </th:block>
                         <td th:text="${asfcov.casePoliceOfficer}"></td>
                         <th:block th:each="commonCode:${session.commonCode.get('ATA')}">
                           <td th:if="${asfcov.caseAgency eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>

src/main/resources/templates/faStatistics/asfCov/asfCovEditModal.html

@@ -52,12 +52,17 @@
     <div class="row mb-1">
       <label for="caseAgency" class="col-sm-1 col-form-label col-form-label-sm text-center ps-0 pe-0">사건담당경찰서</label>
       <div class="col-sm-2">
+      <th:block th:if="${asfCov.asfCovKey eq null}">
+      <input type="text" class="form-control form-control-sm cdsInfo" id="caseAgency" name="caseAgency" disabled>
+      </th:block>
+      <th:block th:unless="${asfCov.asfCovKey eq null}">
         <select class="form-select form-select-sm cdsInfo" id="caseAgency" name="caseAgency" disabled>
           <option value=""></option>
           <th:block th:each="commonCode:${session.commonCode.get('ATA')}">
             <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq asfCov.caseAgency}"></option>
           </th:block>
         </select>
+      </th:block>
       </div>
       <label for="casePoliceOfficer" class="col-sm-1 col-form-label col-form-label-sm text-center ps-0 pe-0">사건담당경찰관</label>
       <div class="col-sm-2">