diff --git a/src/main/resources/static/js/faStatistics/asfCov.js b/src/main/resources/static/js/faStatistics/asfCov.js index c56ea857..2afc922a 100644 --- a/src/main/resources/static/js/faStatistics/asfCov.js +++ b/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()) diff --git a/src/main/resources/templates/common/modal/crackdownStatusModal.html b/src/main/resources/templates/common/modal/crackdownStatusModal.html index 65c15415..51a4c330 100644 --- a/src/main/resources/templates/common/modal/crackdownStatusModal.html +++ b/src/main/resources/templates/common/modal/crackdownStatusModal.html @@ -199,7 +199,10 @@ - + + + + diff --git a/src/main/resources/templates/faStatistics/asfCov/asfCov.html b/src/main/resources/templates/faStatistics/asfCov/asfCov.html index da1b0b9d..50525066 100644 --- a/src/main/resources/templates/faStatistics/asfCov/asfCov.html +++ b/src/main/resources/templates/faStatistics/asfCov/asfCov.html @@ -125,7 +125,12 @@ - + + + + + + diff --git a/src/main/resources/templates/faStatistics/asfCov/asfCovEditModal.html b/src/main/resources/templates/faStatistics/asfCov/asfCovEditModal.html index 431f4deb..c1747192 100644 --- a/src/main/resources/templates/faStatistics/asfCov/asfCovEditModal.html +++ b/src/main/resources/templates/faStatistics/asfCov/asfCovEditModal.html @@ -52,12 +52,17 @@
+ + + + +