From 84c446ec0d129d89f613c4cb8ce2aba8b63e7c83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Thu, 2 Mar 2023 15:39:27 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=94=EB=A1=9C=EB=82=98=20=ED=98=84?= =?UTF-8?q?=ED=99=A9=20=EB=93=B1=EB=A1=9D=EB=AA=A8=EB=8B=AC=20=EB=AF=B8?= =?UTF-8?q?=EC=95=95=EC=86=A1=EC=8B=9C=20=EC=84=A0=ED=83=9D=EB=B0=95?= =?UTF-8?q?=EC=8A=A4=20=EB=8F=99=EC=9E=91=20=EC=88=98=EC=A0=95.=20?= =?UTF-8?q?=EB=B6=88=EB=B2=95=EC=A1=B0=EC=97=85=20=EC=99=B8=EA=B5=AD?= =?UTF-8?q?=EC=96=B4=EC=84=A0=20=EC=A0=95=EB=B3=B4=20=EB=93=B1=EB=A1=9D,?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=20=EB=AA=A8=EB=8B=AC=20=EC=88=98=EC=82=AC?= =?UTF-8?q?=EC=A4=91=EC=A7=80=EC=97=AC=EB=B6=80=20=EC=84=A0=ED=83=9D?= =?UTF-8?q?=EB=B0=95=EC=8A=A4=20=EB=8F=99=EC=9E=91=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/js/faStatistics/asfCov.js | 360 +++++++++--------- .../faStatistics/asfCov/asfCovEditModal.html | 2 +- .../fishingBoat/fishingBoatEditModal.html | 18 +- 3 files changed, 188 insertions(+), 192 deletions(-) diff --git a/src/main/resources/static/js/faStatistics/asfCov.js b/src/main/resources/static/js/faStatistics/asfCov.js index ac5b55ef..e590943b 100644 --- a/src/main/resources/static/js/faStatistics/asfCov.js +++ b/src/main/resources/static/js/faStatistics/asfCov.js @@ -1,61 +1,61 @@ $(document).on('change', '#pressurizedYn', function (){ - if($("#pressurizedYn").val() == 'Y'){ - $("#pressurizedN").attr("disabled",true); - $("#pressurizedN").val(""); - }else{ - $("#pressurizedN").removeAttr("disabled"); - } + if($("#pressurizedYn").val() == 'Y'){ + $("#pressurizedN").attr("disabled",true); + $("#pressurizedN").val(""); + }else{ + $("#pressurizedN").removeAttr("disabled"); + } }) $("#jqueryBtn").click(function(){ - $(".quiz-text").text("Javascript"); - $(".quiz-text").css('color', 'blue'); + $(".quiz-text").text("Javascript"); + $(".quiz-text").css('color', 'blue'); }); $(document).on('click', '#saveBtn', function (){ - if(confirm("저장하시겠습니까?")){ - // if($('#contentTitle').val() == ''){ - // alert("제목을 입력해주세요."); - // $('#contentTitle').focus(); - // return false; - // } - // if($('#majorType').val() == ''){ - // alert("종류를 선택해주세요."); - // $('#majorType').focus(); - // return false; - // } - saveContent('DST007'); - } + if(confirm("저장하시겠습니까?")){ + // if($('#contentTitle').val() == ''){ + // alert("제목을 입력해주세요."); + // $('#contentTitle').focus(); + // return false; + // } + // if($('#majorType').val() == ''){ + // alert("종류를 선택해주세요."); + // $('#majorType').focus(); + // return false; + // } + saveContent('DST007'); + } }) $(document).on('click', '#saveTempBtn', function (){ - if(confirm("임시저장 하시겠습니까?")){ - // if($('#contentTitle').val() == ''){ - // alert("제목을 입력해주세요."); - // $('#contentTitle').focus(); - // return false; - // } - // if($('#majorType').val() == ''){ - // alert("종류를 선택해주세요."); - // $('#majorType').focus(); - // return false; - // } - saveContent('DST001'); - } + if(confirm("임시저장 하시겠습니까?")){ + // if($('#contentTitle').val() == ''){ + // alert("제목을 입력해주세요."); + // $('#contentTitle').focus(); + // return false; + // } + // if($('#majorType').val() == ''){ + // alert("종류를 선택해주세요."); + // $('#majorType').focus(); + // return false; + // } + saveContent('DST001'); + } }) $(document).on('click', '#addAsfCovBtn', function (){ - getEditModal(null) + getEditModal(null) }) $(document).on('click', '.tr', function (){ - $(".trChkBox").prop("checked", false); - $(this).find(".trChkBox").prop("checked", true); - getViewModal($(this).attr("data-key")); + $(".trChkBox").prop("checked", false); + $(this).find(".trChkBox").prop("checked", true); + getViewModal($(this).attr("data-key")); }) @@ -64,8 +64,8 @@ $(document).on('click', '.tr', function (){ // }) $(document).on('click', '#editBtn', function (){ - $("#asfCovViewModal").modal('hide') - getEditModal($(this).attr("data-asfCovKey")); + $("#asfCovViewModal").modal('hide') + getEditModal($(this).attr("data-asfCovKey")); }) @@ -73,125 +73,119 @@ $(document).on('click', '#editBtn', function (){ $(function(){ - $("#dateSelectorDiv").datepicker({ - format: "yyyy-mm-dd", - language: "ko", - autoclose: true - }); + $("#dateSelectorDiv").datepicker({ + format: "yyyy-mm-dd", + language: "ko", + autoclose: true + }); }) $(document).on('click', '#deleteMajorBtn', function (){ - const asfCovKey = $('#asfCovEditModalContent').find(".asfCovKey").val(); - console.log(asfCovKey); - if(confirm("삭제하시겠습니까?")){ - //contentFade("in"); - $.ajax({ - type : 'POST', - url : "/faStatistics/deleteContent", - data : JSON.stringify({asfCovKey:asfCovKey}), - contentType: 'application/json', - beforeSend: function (xhr){ - xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); - }, - success : function(data) { - alert("삭제 처리되었습니다."); - //contentFade("out"); - location.reload(); - }, - error : function(xhr, status) { - alert("삭제 처리에 실패하였습니다"); - //contentFade("out"); - } - }) - } + const asfCovKey = $('#asfCovEditModalContent').find(".asfCovKey").val(); + console.log(asfCovKey); + if(confirm("삭제하시겠습니까?")){ + //contentFade("in"); + $.ajax({ + type : 'POST', + url : "/faStatistics/deleteContent", + data : JSON.stringify({asfCovKey:asfCovKey}), + contentType: 'application/json', + beforeSend: function (xhr){ + xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); + }, + success : function(data) { + alert("삭제 처리되었습니다."); + //contentFade("out"); + location.reload(); + }, + error : function(xhr, status) { + alert("삭제 처리에 실패하였습니다"); + //contentFade("out"); + } + }) + } }) function getEditModal(asfCovKey){ - $.ajax({ - url: '/faStatistics/asfCovEditModal', - data: {asfCovKey: asfCovKey}, - type: 'GET', - dataType:"html", - success: function(html){ - $("#asfCovEditModalContent").empty().append(html); - $("#asfCovEditModal").modal('show'); - $("#editContent").empty().append(html); - if($("#pressurizedYn").val() == 'Y'){ - $("#pressurizedN").attr("disabled",true); - }else{ - $("#pressurizedN").removeAttr("disabled"); - } - setUploadDiv(); - }, - error:function(e){ - ajaxErrorAction(e); - } - }); + $.ajax({ + url: '/faStatistics/asfCovEditModal', + data: {asfCovKey: asfCovKey}, + type: 'GET', + dataType:"html", + success: function(html){ + $("#asfCovEditModalContent").empty().append(html); + $("#asfCovEditModal").modal('show'); + $("#editContent").empty().append(html); + }, + error:function(e){ + ajaxErrorAction(e); + } + }); } function getViewModal(asfCovKey,versionNo){ - $.ajax({ - url: '/faStatistics/asfCovViewModal', - data: { - versionNo : versionNo, - asfCovKey : asfCovKey - }, - type: 'GET', - dataType:"html", - success: function(html){ - $("#asfCovViewModalContent").empty().append(html) - $("#asfCovViewModal").modal('show'); - }, - error:function(e){ - ajaxErrorAction(e); - } - }); + $.ajax({ + url: '/faStatistics/asfCovViewModal', + data: { + versionNo : versionNo, + asfCovKey : asfCovKey + }, + type: 'GET', + dataType:"html", + success: function(html){ + $("#asfCovViewModalContent").empty().append(html) + $("#asfCovViewModal").modal('show'); + }, + error:function(e){ + ajaxErrorAction(e); + } + }); } function saveContent(contentStatus){ - const formData = new FormData($("#asfCovEditForm")[0]); - formData.append('contentStatus', contentStatus); - $.ajax({ - type : 'POST', - data : formData, - url : "/faStatistics/saveContent", - processData: false, - contentType: false, - success : function(result) { - alert("저장되었습니다."); - contentFade("out"); - location.reload(); - }, - error : function(xhr, status) { - alert("저장에 실패하였습니다.") - contentFade("out"); - } - }) + const formData = new FormData($("#asfCovEditForm")[0]); + formData.append('contentStatus', contentStatus); + $.ajax({ + type : 'POST', + data : formData, + url : "/faStatistics/saveContent", + processData: false, + contentType: false, + success : function(result) { + alert("저장되었습니다."); + contentFade("out"); + location.reload(); + }, + error : function(xhr, status) { + alert("저장에 실패하였습니다.") + contentFade("out"); + } + }) } function contentCheck(formId){ - let flag = true; - // if(!$("#contentTitle").val()){ - // alert("제목을 입력해주세요.") - // flag = false; - // } + let flag = true; + // if(!$("#contentTitle").val()){ + // alert("제목을 입력해주세요.") + // flag = false; + // } - flag = fileCheck(flag, files); - return flag; + flag = fileCheck(flag, files); + return flag; } $(document).on('click', '#asfCovDownExcel', function (){ - exportExcel('ASF 및 코로나19 관련 조치현황', 'asfCovTable'); + exportExcel('ASF 및 코로나19 관련 조치현황', 'asfCovTable'); }); $(document).on('click', '#caseNumBtn', function (){ - const cdsKey = $("#cdsKey").val(); - $.ajax({ + const cdsKey = $("#cdsKey").val(); + $.ajax({ url: $("#modalUrl").val(), data : $("#modalSearchForm").serialize(), type: 'GET', @@ -200,8 +194,8 @@ $(document).on('click', '#caseNumBtn', function (){ success: function(html){ $("#subModalBody").empty().append(html); if(cdsKey != ""){ - $(".crackdownChkbox[value="+cdsKey+"]").prop("checked", true); - } + $(".crackdownChkbox[value="+cdsKey+"]").prop("checked", true); + } $("#asfCovSubModal").modal('show'); }, error:function(e){ @@ -211,43 +205,43 @@ $(document).on('click', '#caseNumBtn', function (){ }) $(document).on('click', '#getCrackdownBtn', function (){ - getEditModal($(".crackdownChkbox:checked").parents(".crackdownTr").attr("data-key")); - const tr= $(".crackdownChkbox:checked").parents(".crackdownTr") - $(".cdsInfo").removeAttr("disable") - $("#cdsKey").val(tr.attr("data-key")) - $("#boatNameKr").val(tr.find(".boatNameKr").val()) - $("#caseNum").val(tr.find(".caseNum").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()) - $("#asfCovSubModal").modal('hide'); - $(".cdsInfo").attr("disable", "disable") + getEditModal($(".crackdownChkbox:checked").parents(".crackdownTr").attr("data-key")); + const tr= $(".crackdownChkbox:checked").parents(".crackdownTr") + $(".cdsInfo").removeAttr("disable") + $("#cdsKey").val(tr.attr("data-key")) + $("#boatNameKr").val(tr.find(".boatNameKr").val()) + $("#caseNum").val(tr.find(".caseNum").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()) + $("#asfCovSubModal").modal('hide'); + $(".cdsInfo").attr("disable", "disable") }) $(function(){ - const searchFormBoat = $("#searchFormBoat") - if(searchFormBoat.val()!==""){ - searchFormBoat.find("."+$("#searchFormPolice").val()).show(); - searchFormBoat.removeAttr("disabled"); - } - $("#dateSelectorDiv").datepicker({ - format: "yyyy-mm-dd", - language: "ko", - autoclose: true - }); + const searchFormBoat = $("#searchFormBoat") + if(searchFormBoat.val()!==""){ + searchFormBoat.find("."+$("#searchFormPolice").val()).show(); + searchFormBoat.removeAttr("disabled"); + } + $("#dateSelectorDiv").datepicker({ + format: "yyyy-mm-dd", + language: "ko", + autoclose: true + }); }); $(document).on('change', '#searchFormPolice', function (){ - const searchFormBoat = $("#searchFormBoat") - searchFormBoat.find("option").hide() - if(this.value !== ""){ - searchFormBoat.removeAttr("disabled") - searchFormBoat.find("."+this.value).show(); - }else{ - searchFormBoat.attr("disabled", "disabled") - } + const searchFormBoat = $("#searchFormBoat") + searchFormBoat.find("option").hide() + if(this.value !== ""){ + searchFormBoat.removeAttr("disabled") + searchFormBoat.find("."+this.value).show(); + }else{ + searchFormBoat.attr("disabled", "disabled") + } }) // $(function(){ @@ -271,28 +265,28 @@ $(document).on('change', '#searchFormPolice', function (){ // }) $(document).on('click', '.versionInfoTr', function (){ - $(this).find(".versionNo").prop('checked', true); - const versionNo = $(this).find(".versionNo").val(); - const asfCovKey = $(this).find(".asfCovKey").val(); - getHistoryDetail(versionNo, asfCovKey); + $(this).find(".versionNo").prop('checked', true); + const versionNo = $(this).find(".versionNo").val(); + const asfCovKey = $(this).find(".asfCovKey").val(); + getHistoryDetail(versionNo, asfCovKey); }); function getHistoryDetail(versionNo, asfCovKey){ - $.ajax({ - url: '/faStatistics/asfCovHistoryDetail', - data: { - versionNo : versionNo, - asfCovKey : asfCovKey - }, - type: 'GET', - dataType:"html", - success: function(html){ - $("#asfcovVersionInfoDiv").empty().append(html); - }, - error:function(e){ - ajaxErrorAction(e); - } - }); + $.ajax({ + url: '/faStatistics/asfCovHistoryDetail', + data: { + versionNo : versionNo, + asfCovKey : asfCovKey + }, + type: 'GET', + dataType:"html", + success: function(html){ + $("#asfcovVersionInfoDiv").empty().append(html); + }, + error:function(e){ + ajaxErrorAction(e); + } + }); } diff --git a/src/main/resources/templates/faStatistics/asfCov/asfCovEditModal.html b/src/main/resources/templates/faStatistics/asfCov/asfCovEditModal.html index e8a78b79..21fdbea8 100644 --- a/src/main/resources/templates/faStatistics/asfCov/asfCovEditModal.html +++ b/src/main/resources/templates/faStatistics/asfCov/asfCovEditModal.html @@ -100,7 +100,7 @@
- diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html index a765b770..556a8cb9 100644 --- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html +++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html @@ -630,14 +630,16 @@
- + + +
+ +
+