From 6f678ec2c20ba78e2baee5770c1de22a4dabc2f1 Mon Sep 17 00:00:00 2001
From: Hyung Geun <vndanwl@naver.com>
Date: Fri, 4 Mar 2022 17:10:35 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AA=A8=EB=8B=AC=EC=B0=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mca/cmmn/web/AdminController.java     |  3 +-
 src/main/webapp/WEB-INF/jsp/admin/request.jsp | 38 ++++++++++++-----
 .../webapp/WEB-INF/jsp/admin/requestView.jsp  | 12 ++----
 src/main/webapp/WEB-INF/jsp/map/request.jsp   |  2 +-
 src/main/webapp/css/style.css                 |  6 +++
 src/main/webapp/js/admin/request.js           | 42 +++++++++++++++++++
 src/main/webapp/js/admin/requestView.js       | 17 --------
 src/main/webapp/js/map/request.js             |  3 +-
 8 files changed, 84 insertions(+), 39 deletions(-)
 delete mode 100644 src/main/webapp/js/admin/requestView.js

diff --git a/src/main/java/com/mca/cmmn/web/AdminController.java b/src/main/java/com/mca/cmmn/web/AdminController.java
index 8644880..c2c227f 100644
--- a/src/main/java/com/mca/cmmn/web/AdminController.java
+++ b/src/main/java/com/mca/cmmn/web/AdminController.java
@@ -188,7 +188,8 @@ public class AdminController {
 			model.addAttribute("selectArea", selectArea);
 			model.addAttribute("layers", layers);
 			model.addAttribute("layersVO", layersVO);
-			return "admin/requestView";
+//			return "admin/requestView";
+			return "admin/html/requestView";
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
diff --git a/src/main/webapp/WEB-INF/jsp/admin/request.jsp b/src/main/webapp/WEB-INF/jsp/admin/request.jsp
index f1e2390..32a0b90 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/request.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/request.jsp
@@ -7,8 +7,8 @@
 <script src="<c:url value="/js/admin/request.js"/>"></script>
 
 <div class="section_content">
-<h1 class="h4 m-3">지도사용 요청</h1>
-<form:form commandName="useRequestSearchVO" name="searchForm" action="/admin/request" method="get">
+    <h1 class="h4 m-3">지도사용 요청</h1>
+    <form:form commandName="useRequestSearchVO" name="searchForm" action="/admin/request" method="get">
     <input type="hidden" name="status" value="<c:out value="${useRequestSearchVO.status}" />"/>
 
     <div class="row justify-content-between bg-white mx-3 py-2">
@@ -33,7 +33,7 @@
 
         <div class="col-auto row">
             <div class="col-auto">
-                <select class="form-select" name="searchCondition">
+                <select class="form-select " name="searchCondition">
                     <option <c:if test="${useRequestSearchVO.searchCondition eq 'all'}"><c:out value="selected"/></c:if>
                             value="all">통합검색
                     </option>
@@ -75,8 +75,8 @@
                 <c:forEach var="item" items="${useRequestList}" varStatus="idx">
                     <tr>
                         <td><c:out value="${item.idx}"/></td>
-                        <td><a href="/admin/request/<c:out value='${item.idx}' />"><c:out value="${item.title}"/></a>
-                        </td>
+<%--                        <td ><a href="/admin/request/ <c:out value='${item.idx}' />"><c:out value="${item.title}"/></a>--%>
+                        <td class="title-td" data-idx="${item.idx}">${item.title}</td>
                         <td><c:out value="${item.company}"/></td>
                         <td><c:out value="${item.name}"/></td>
                         <td class="td_date"><c:out value="${item.r_date}"/></td>
@@ -102,15 +102,31 @@
         </table>
     </div>
     <div class="text-page">
-      <form:hidden path="pageIndex"/></form:form>
-      <nav aria-label="Page navigation">
-          <ul class="pagination justify-content-center">
-              <ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page"/>
-          </ul>
-      </nav>
+        <form:hidden path="pageIndex"/></form:form>
+        <nav aria-label="Page navigation">
+            <ul class="pagination justify-content-center">
+                <ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page"/>
+            </ul>
+        </nav>
     </div>
 </div>
 
+
+<div class="modal fade" id="adminRequestModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="adminRequestModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="adminRequestModalLabel">지도 사용 요청</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+            </div>
+            <div class="modal-body" id="adminRequestModalBody">
+
+            </div>
+        </div>
+    </div>
+</div>
+
+
 <div class="section_title">
     <!-- <p>현장 지원 시스템</p> -->
 </div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp b/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp
index 64d3a56..0e310ed 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp
@@ -5,8 +5,6 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 
-<script src="<c:url value="/js/admin/requestView.js"/>"></script>
-
 
 <form:form commandName="useRequestVO" name="frm" method="POST" action="/admin/updateReqConfirm" id="updateFrm">
     <input type="hidden" name="idx" value="<c:out value='${useRequestVO.idx}' />"/>
@@ -77,13 +75,12 @@
                 <th style="width:7%;" rowspan="3">레이어</th>
                 <th><label>지하시설물</label></th>
                 <td>
-                    <div class="facility">
+                    <div class="form-check">
                         <c:forEach var="item" items="${layersVO}" varStatus="status">
                             <c:if test="${item.code eq  'facility'}">
                                 <c:set var="faciltySize" value="${faciltySize+1}"/>
                                 <label class="layer-label">
-                                    <input type="checkbox" name="${item.code}" id="${item.code}" disabled="disabled"
-                                           value="${item.layer}"
+                                    <input type="checkbox" name="${item.code}" id="${item.code}" disabled="disabled" value="${item.layer}"
                                             <c:forEach var="item2" items="${layers}" varStatus="status2">
                                                 <c:if test="${item.layer eq item2}">
                                                     <c:out value='checked'/>
@@ -167,8 +164,7 @@
             <div class="row justify-content-between bg-white mx-3 py-2">
                 <div class="section_btn">
                     <p class="search_p1">
-                        <input class="btn btn-primary" type="button" value="목록"
-                               onclick="location.href='/admin/request'"/>
+                        <input class="btn btn-secondary" type="button" value="닫기"  data-bs-dismiss="modal"/>
                     </p>
                     <p class="search_p2">
                         <input class="btn btn-danger" type="button" value="거절"
@@ -195,7 +191,7 @@
 
             <div class="section_btn">
                 <p class="search_p1">
-                    <input class="btn btn-primary" type="button" value="목록" onclick="location.href='/admin/request'"/>
+                    <input class="btn btn-secondary" type="button" value="닫기"  data-bs-dismiss="modal"/>
                 </p>
             </div>
 
diff --git a/src/main/webapp/WEB-INF/jsp/map/request.jsp b/src/main/webapp/WEB-INF/jsp/map/request.jsp
index b78add8..c410867 100644
--- a/src/main/webapp/WEB-INF/jsp/map/request.jsp
+++ b/src/main/webapp/WEB-INF/jsp/map/request.jsp
@@ -30,7 +30,7 @@
           </tr>
         </thead>
 
-				<tbody>
+        <tbody>
           <c:if test="${count >= 1}">
             <c:forEach var="item" items="${useRequestList}" varStatus="idx">
               <tr>
diff --git a/src/main/webapp/css/style.css b/src/main/webapp/css/style.css
index 59e054f..3221b9b 100644
--- a/src/main/webapp/css/style.css
+++ b/src/main/webapp/css/style.css
@@ -706,4 +706,10 @@ a {
 
 .clickAbleObj:hover{
   cursor:pointer;
+}
+
+input[type=checkbox]:disabled {
+	background: blue;
+	outline-color: blue;
+	color: white;
 }
\ No newline at end of file
diff --git a/src/main/webapp/js/admin/request.js b/src/main/webapp/js/admin/request.js
index f978667..c768aad 100644
--- a/src/main/webapp/js/admin/request.js
+++ b/src/main/webapp/js/admin/request.js
@@ -1,5 +1,47 @@
+let adminRequestModal;
+
+$(function(){
+    adminRequestModal = new bootstrap.Modal(document.getElementById('adminRequestModal'));
+})
+
+$(document).on('click', '.title-td', function (){
+    adminRequestModalOpen('/admin/request/'+$(this).attr("data-idx"));
+})
+
+function adminRequestModalOpen(url){
+    $.ajax({
+        url: url,
+        type: 'GET',
+        dataType:"html",
+        success: function(html){
+            $("#adminRequestModalBody").empty().append(html);
+            adminRequestModal.show();
+        },
+        error:function(){
+            adminRequestModalBody
+        }
+    });
+}
+
 function fn_link_page(pageNo) {
     document.searchForm.pageIndex.value = pageNo;
     document.searchForm.action = '/admin/request';
     document.searchForm.submit();
 }
+
+function confirmReqBtn(val) {
+    $("#status").val(val);
+
+    var msg;
+    if (val == 0) {
+        msg = "승인";
+    } else {
+        msg = "거절";
+    }
+
+    if (confirm("지도사용요청을 " + msg + " 하시겠습니까?")) {
+        $("#updateFrm").submit();
+    } else {
+        return false;
+    }
+}
diff --git a/src/main/webapp/js/admin/requestView.js b/src/main/webapp/js/admin/requestView.js
deleted file mode 100644
index 617c1e3..0000000
--- a/src/main/webapp/js/admin/requestView.js
+++ /dev/null
@@ -1,17 +0,0 @@
-function confirmReqBtn(val) {
-    $("#status").val(val);
-
-    var msg;
-    if (val == 0) {
-        msg = "승인";
-    } else {
-        msg = "거절";
-    }
-
-    if (confirm("지도사용요청을 " + msg + " 하시겠습니까?")) {
-        $("#updateFrm").submit();
-    } else {
-        return false;
-    }
-}
-
diff --git a/src/main/webapp/js/map/request.js b/src/main/webapp/js/map/request.js
index d501f3d..e1a0cfd 100644
--- a/src/main/webapp/js/map/request.js
+++ b/src/main/webapp/js/map/request.js
@@ -1,4 +1,5 @@
 let mapRequestModal;
+
 $(function(){
   viewPaging();
   $(".r_date").each(function(){
@@ -33,7 +34,7 @@ function mapRequestModalOpen(url){
       mapRequestModal.show();
     },
     error:function(){
-
+      mapRequestModalBody
     }
   });
 }