From 8c6c48c5f3ce1be97317598702ba685343ac2b29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Mon, 10 Jul 2023 18:00:35 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B6=88=EB=B2=95=EC=A1=B0=EC=97=85=20?=
 =?UTF-8?q?=EC=99=B8=EA=B5=AD=EC=96=B4=EC=84=A0=20=EC=84=A0=EC=9B=90?=
 =?UTF-8?q?=ED=98=84=ED=99=A9=20=EC=9E=91=EC=97=85=EC=A4=91.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unlawfulFishing/illegalShipSelectModal.js |  6 ++---
 .../illegalShipSailorPage.html                | 25 +++++++++++++++++++
 .../illegalShipSailor/issAddModal.html        |  6 ++---
 .../shipProcessInfo/spiEditModal.html         |  2 +-
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipSelectModal.js b/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipSelectModal.js
index 8229e7a4..68d06aa0 100644
--- a/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipSelectModal.js
+++ b/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipSelectModal.js
@@ -11,9 +11,9 @@ $(document).on('click', '.isiTr', function (){
 $(document).on('click', '#isiSelectBtn', function (){
   const selectedCheckbox = $(".isiCheckbox:checked")
   if(selectedCheckbox.length>0){
-    const editForm = $("#spiEditForm")
-    editForm.find("#fbKey").val(selectedCheckbox.attr('data-fbkey'))
-    editForm.find("#boatNameKr").val(selectedCheckbox.attr('data-boatnamekr'))
+    const editModalBody = $("#editModalBody")
+    editModalBody.find("#fbKey").val(selectedCheckbox.attr('data-fbkey'))
+    editModalBody.find("#boatNameKr").val(selectedCheckbox.attr('data-boatnamekr'))
     $("#isiSelectModal").modal('hide');
   }else{
     alert("대상을 선택해주세요.")
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html
index 7f4a7c1d..9477d2bd 100644
--- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html
+++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html
@@ -156,6 +156,31 @@
                 <div class="col-auto">
                   <button class="btn btn-success" id="cdsDownExcel">엑셀 다운로드</button>
                 </div>
+                <div class="col-auto">
+                  <nav aria-label="Page navigation">
+                    <ul class="pagination mb-0">
+                      <th:block th:if="${searchParams.pageIndex>3}">
+                        <li class="page-item" th:data-pageindex="${(searchParams.pageIndex)-3}">
+                          <a class="page-link" href="#" aria-label="Previous">
+                            <span aria-hidden="true">&laquo;</span>
+                          </a>
+                        </li>
+                      </th:block>
+                      <th:block th:each="num : ${#numbers.sequence(searchParams.startNum, searchParams.endNum)}">
+                        <li class="page-item" th:data-pageindex="${num}" th:classappend="${searchParams.pageIndex eq num?'active':''}">
+                          <a class="page-link" href="#" th:text="${num}"></a>
+                        </li>
+                      </th:block>
+                      <th:block th:if="${searchParams.maxNum>searchParams.endNum+2}">
+                        <li class="page-item" th:data-pageindex="${(searchParams.pageIndex)+3}">
+                          <a class="page-link" href="#" aria-label="Next">
+                            <span aria-hidden="true">&raquo;</span>
+                          </a>
+                        </li>
+                      </th:block>
+                    </ul>
+                  </nav>
+                </div>
                 <div class="col-auto">
                   <button class="btn btn-primary" id="addIllegalShipSailorBtn">등록</button>
                 </div>
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issAddModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issAddModal.html
index 3cf6f2d5..9ea79981 100644
--- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issAddModal.html
+++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issAddModal.html
@@ -4,7 +4,7 @@
   <h5 class="modal-title text-white" id="issEditModalLabel">선원 세부 현황 작성</h5>
   <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
 </div>
-<div class="modal-body">
+<div class="modal-body" id="editModalBody">
   <form action="#" method="post" id="issAddForm">
     <div class="row px-2 mb-1">
       <label for="boatNameKr" class="col-sm-2 col-form-label col-form-label-sm text-center">선명</label>
@@ -28,7 +28,7 @@
     <div class="tab-content bg-white border border-top-0" id="sailorTabContent">
       <div class="tab-pane fade p-2 show active" id="sailor1TabPanel" role="tabpanel" aria-labelledby="sailor1Tab" tabindex="0">
         <div class="row justify-content-end mb-1">
-          <input type="button" class="btn btn-sm btn-danger col-auto deleteTab" value="삭제">
+          <input type="button" class="btn btn-sm btn-danger col-1 mx-2 deleteTab" value="삭제">
         </div>
         <div class="row mb-1">
           <label class="col-sm-2 col-form-label col-form-label-sm text-center">선원명(한글)</label>
@@ -152,7 +152,7 @@
 <div class="d-none" id="sailorTabEmptyDiv">
   <div class="tab-pane fade p-2" role="tabpanel" tabindex="0">
     <div class="row justify-content-end mb-1">
-      <input type="button" class="btn btn-danger col-1 deleteTab" value="삭제">
+      <input type="button" class="btn btn-sm btn-danger col-1 mx-2 deleteTab" value="삭제">
     </div>
     <div class="row mb-1">
       <label class="col-sm-2 col-form-label col-form-label-sm text-center">선원명(한글)</label>
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiEditModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiEditModal.html
index 1c002e32..6c2ed735 100644
--- a/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiEditModal.html
+++ b/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiEditModal.html
@@ -4,7 +4,7 @@
   <h5 class="modal-title text-white" id="spiEditModalLabel" th:text="|불법조업 외국어선 처리 현황 ${shipProcessInfo.prKey eq null?'작성':'수정'}|"></h5>
   <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
 </div>
-<div class="modal-body">
+<div class="modal-body" id="editModalBody">
   <form action="#" method="post" id="spiEditForm">
     <input type="hidden" name="prKey" id="prKey" th:value="${shipProcessInfo.prKey}">
     <input type="hidden" class="status" name="status" id="infoStatus" th:value="${shipProcessInfo.status}">