From bd461f29f220969616643300644c728eacd4c2df 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: Fri, 11 Mar 2022 16:54:23 +0900
Subject: [PATCH] =?UTF-8?q?=ED=98=84=EC=9E=A5=EC=88=98=EC=A7=91=20?=
 =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=AA=A8=EB=8B=AC=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=EC=A4=91.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/jsp/admin/fieldData.jsp    | 246 +++++++++---------
 .../webapp/WEB-INF/jsp/admin/fieldView.jsp    |  44 ++--
 src/main/webapp/css/style.css                 |  10 +
 3 files changed, 155 insertions(+), 145 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp b/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp
index dc008fd..39a5e2e 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp
@@ -12,136 +12,136 @@
 
 <script src="<c:url value="/js/admin/fieldData.js"/>"></script>
 <style>
-    .searchList > li {
-        display: inline;
-    }
+  .searchList > li {
+    display: inline;
+  }
 </style>
 <div class="mx-lg-2">
-    <h1 class="h4 m-3"> 현장수집 데이터</h1>
-    <form:form commandName="fieldDataSearchVO" name="searchForm" action="/admin/fieldData" method="get">
-        <div class="row justify-content-between bg-white mx-3 py-2">
-            <div class="col-auto">
-                <ul class="nav">
-                    <li class="nav-item statusTab">
-                        <a class="nav-link ${fieldDataSearchVO.status0 eq 1?'active':'disabled'}" href="#">
-                            <input type="checkbox" class="statusChkBox d-none" name="status0" id="status0"
-                                   value="1" ${fieldDataSearchVO.status0 eq 1?'checked':''}>
-                            <label for="status0">수집</label>
-                        </a>
-                    </li>
-                    <li class="nav-item statusTab">
-                        <a class="nav-link ${fieldDataSearchVO.status1 eq 1?'active':'disabled'}" href="#">
-                            <input type="checkbox" class="statusChkBox d-none" name="status1" id="status1"
-                                   value="1" ${fieldDataSearchVO.status1 eq 1?'checked':''}>
-                            <label for="status1">검증실패</label>
-                        </a>
-                    </li>
-                    <li class="nav-item statusTab">
-                        <a class="nav-link ${fieldDataSearchVO.status2 eq 1?'active':'disabled'}" href="#">
-                            <input type="checkbox" class="statusChkBox d-none" name="status2" id="status2"
-                                   value="1" ${fieldDataSearchVO.status2 eq 1?'checked':''}>
-                            <label for="status2">검증</label>
-                        </a>
-                    </li>
-                    <li class="nav-item statusTab">
-                        <a class="nav-link ${fieldDataSearchVO.status3 eq 1?'active':'disabled'}">
-                            <input type="checkbox" class="statusChkBox d-none" name="status3" id="status3"
-                                   value="1" ${fieldDataSearchVO.status3 eq 1?'checked':''}>
-                            <label for="status3">반영실패</label>
-                        </a>
-                    </li>
-                    <li class="nav-item statusTab">
-                        <a class="nav-link ${fieldDataSearchVO.status4 eq 1?'active':'disabled'}" href="#">
-                            <input type="checkbox" class="statusChkBox d-none" name="status4" id="status4"
-                                   value="1" ${fieldDataSearchVO.status4 eq 1?'checked':''}>
-                            <label for="status4">반영</label>
-                        </a>
-                    </li>
-                </ul>
-            </div>
+  <h1 class="h4 m-3"> 현장수집 데이터</h1>
+  <form:form commandName="fieldDataSearchVO" name="searchForm" action="/admin/fieldData" method="get">
+    <div class="row justify-content-between bg-white mx-3 py-2">
+      <div class="col-auto">
+        <ul class="nav">
+          <li class="nav-item statusTab">
+            <a class="nav-link ${fieldDataSearchVO.status0 eq 1?'active':'disabled'}" href="#">
+              <input type="checkbox" class="statusChkBox d-none" name="status0" id="status0"
+                     value="1" ${fieldDataSearchVO.status0 eq 1?'checked':''}>
+              <label for="status0">수집</label>
+            </a>
+          </li>
+          <li class="nav-item statusTab">
+            <a class="nav-link ${fieldDataSearchVO.status1 eq 1?'active':'disabled'}" href="#">
+              <input type="checkbox" class="statusChkBox d-none" name="status1" id="status1"
+                     value="1" ${fieldDataSearchVO.status1 eq 1?'checked':''}>
+              <label for="status1">검증실패</label>
+            </a>
+          </li>
+          <li class="nav-item statusTab">
+            <a class="nav-link ${fieldDataSearchVO.status2 eq 1?'active':'disabled'}" href="#">
+              <input type="checkbox" class="statusChkBox d-none" name="status2" id="status2"
+                     value="1" ${fieldDataSearchVO.status2 eq 1?'checked':''}>
+              <label for="status2">검증</label>
+            </a>
+          </li>
+          <li class="nav-item statusTab">
+            <a class="nav-link ${fieldDataSearchVO.status3 eq 1?'active':'disabled'}">
+              <input type="checkbox" class="statusChkBox d-none" name="status3" id="status3"
+                     value="1" ${fieldDataSearchVO.status3 eq 1?'checked':''}>
+              <label for="status3">반영실패</label>
+            </a>
+          </li>
+          <li class="nav-item statusTab">
+            <a class="nav-link ${fieldDataSearchVO.status4 eq 1?'active':'disabled'}" href="#">
+              <input type="checkbox" class="statusChkBox d-none" name="status4" id="status4"
+                     value="1" ${fieldDataSearchVO.status4 eq 1?'checked':''}>
+              <label for="status4">반영</label>
+            </a>
+          </li>
+        </ul>
+      </div>
 
-            <div class="col-auto row">
-                <div class="col-auto">
-                    <select class="form-select" name="searchCondition">
-                        <option <c:if test="${fieldDataSearchVO.searchCondition eq 'all'}"><c:out
-                                value="selected"/></c:if> value="all">통합검색
-                        </option>
-                        <option <c:if test="${fieldDataSearchVO.searchCondition eq 'name'}"><c:out
-                                value="selected"/></c:if> value="name">이름
-                        </option>
-                        <option <c:if test="${fieldDataSearchVO.searchCondition eq 'company'}"><c:out value="selected"/></c:if>
-                                value="company">소속
-                        </option>
-                        <option <c:if test="${fieldDataSearchVO.searchCondition eq 'region'}"><c:out value="selected"/></c:if>
-                                value="region">위치
-                        </option>
-                    </select>
-                </div>
-
-                <div class="col-auto">
-                    <input type="text" class="form-control" name="searchKeyword"
-                           value="${fieldDataSearchVO.searchKeyword}"/>
-                </div>
-                <div class="col-auto">
-                    <input class="btn btn-outline-secondary" type="submit" value="검색"/>
-                </div>
-            </div>
+      <div class="col-auto row">
+        <div class="col-auto">
+          <select class="form-select" name="searchCondition">
+            <option <c:if test="${fieldDataSearchVO.searchCondition eq 'all'}"><c:out
+                value="selected"/></c:if> value="all">통합검색
+            </option>
+            <option <c:if test="${fieldDataSearchVO.searchCondition eq 'name'}"><c:out
+                value="selected"/></c:if> value="name">이름
+            </option>
+            <option <c:if test="${fieldDataSearchVO.searchCondition eq 'company'}"><c:out value="selected"/></c:if>
+                value="company">소속
+            </option>
+            <option <c:if test="${fieldDataSearchVO.searchCondition eq 'region'}"><c:out value="selected"/></c:if>
+                value="region">위치
+            </option>
+          </select>
         </div>
 
-        <div class="row m-3 p-2 bg-white">
-            <table class="table table-hover text-center">
-                <thead>
-                <tr>
-                    <th>Data ID</th>
-                    <th>지역</th>
-                    <th>소속</th>
-                    <th>담당자</th>
-                    <th>수집날짜</th>
-                    <th>상태</th>
-                </tr>
-                </thead>
-                <tbody>
-                <c:if test="${count >= 1}">
-                    <c:forEach var="item" items="${fieldDataList}">
-                        <tr class="clickAbleObj fieldDataTr" data-id="${item.id}">
-                          <%--<a href="/admin/fieldData/${item.id}">--%>
-                            <td><c:out value="${item.id}"/></td>
-                            <td><c:out value="${item.region}"/></td>
-                            <td><c:out value="${item.userVO.company}"/></td>
-                            <td><c:out value="${item.userVO.name}"/></td>
-                            <td class="td_date"><c:out value="${item.save_date}"/></td>
-                            <td>
-                                <c:choose>
-                                    <c:when test="${item.status eq '0'}"><span class="card-warning">수집</span> </c:when>
-                                    <c:when test="${item.status eq '1'}"><span
-                                            class="card-default">검증실패</span> </c:when>
-                                    <c:when test="${item.status eq '2'}"><span class="card-warning">검증</span> </c:when>
-                                    <c:when test="${item.status eq '3'}"><span
-                                            class="card-default">반영실패</span> </c:when>
-                                    <c:when test="${item.status eq '4'}"><span class="card-success">반영</span> </c:when>
-                                </c:choose>
-                            </td>
-                        </tr>
-                    </c:forEach>
-                </c:if>
-                <c:if test="${count == 0}">
-                    <tr>
-                        <td colspan="4">요청한 목록이 없습니다.</td>
-                    </tr>
-                </c:if>
-                </tbody>
-            </table>
+        <div class="col-auto">
+          <input type="text" class="form-control" name="searchKeyword"
+                 value="${fieldDataSearchVO.searchKeyword}"/>
         </div>
+        <div class="col-auto">
+          <input class="btn btn-outline-secondary" type="submit" value="검색"/>
+        </div>
+      </div>
+    </div>
 
-        <div class="text-page">
-            <form:hidden path="pageIndex"/>
-            <nav aria-label="Page navigation">
-                <ul class="pagination justify-content-center">
-                    <ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page"/>
-                </ul>
-            </nav>
-        </div>
-    </form:form>
+    <div class="row m-3 p-2 bg-white">
+      <table class="table table-hover text-center">
+        <thead>
+        <tr>
+          <th>Data ID</th>
+          <th>지역</th>
+          <th>소속</th>
+          <th>담당자</th>
+          <th>수집날짜</th>
+          <th>상태</th>
+        </tr>
+        </thead>
+        <tbody>
+        <c:if test="${count >= 1}">
+          <c:forEach var="item" items="${fieldDataList}">
+            <tr class="clickAbleObj fieldDataTr" data-id="${item.id}">
+                <%--<a href="/admin/fieldData/${item.id}">--%>
+              <td><c:out value="${item.id}"/></td>
+              <td><c:out value="${item.region}"/></td>
+              <td><c:out value="${item.userVO.company}"/></td>
+              <td><c:out value="${item.userVO.name}"/></td>
+              <td class="td_date"><c:out value="${item.save_date}"/></td>
+              <td>
+                <c:choose>
+                  <c:when test="${item.status eq '0'}"><span class="card-warning">수집</span> </c:when>
+                  <c:when test="${item.status eq '1'}"><span
+                      class="card-default">검증실패</span> </c:when>
+                  <c:when test="${item.status eq '2'}"><span class="card-warning">검증</span> </c:when>
+                  <c:when test="${item.status eq '3'}"><span
+                      class="card-default">반영실패</span> </c:when>
+                  <c:when test="${item.status eq '4'}"><span class="card-success">반영</span> </c:when>
+                </c:choose>
+              </td>
+            </tr>
+          </c:forEach>
+        </c:if>
+        <c:if test="${count == 0}">
+          <tr>
+            <td colspan="4">요청한 목록이 없습니다.</td>
+          </tr>
+        </c:if>
+        </tbody>
+      </table>
+    </div>
+
+    <div class="text-page">
+      <form:hidden path="pageIndex"/>
+      <nav aria-label="Page navigation">
+        <ul class="pagination justify-content-center">
+          <ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page"/>
+        </ul>
+      </nav>
+    </div>
+  </form:form>
 </div>
 
 
diff --git a/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp b/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp
index af54908..4422e46 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp
@@ -9,38 +9,38 @@
 </script>
 <div class="section_content">
   <div class="row justify-content-end bg-white mx-3 py-2">
-    <h5><i class="bi bi-dot"></i> 작성자 정보</h5>
     <div class="col-4">
-      <div class="row mb-3">
-        <label for="company" class="col-4 col-form-label fw-bold text-end">소속</label>
-        <div class="col-8">
+      <h5><i class="bi bi-dot"></i> 작성자 정보</h5>
+      <div class="row mb-3 border border-dark border-start-0 border-end-0">
+        <label for="company" class="col-4 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">소속</label>
+        <div class="col-8 border-bottom">
           <input type="text" class="form-control bg-white border-0" id="company" placeholder="col-form-label" value="${userVO.company}" readonly>
         </div>
-        <label for="name" class="col-4 col-form-label fw-bold text-end">이름</label>
-        <div class="col-8">
+        <label for="name" class="col-4 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">이름</label>
+        <div class="col-8 border-bottom">
           <input type="text" class="form-control bg-white border-0" id="name" placeholder="col-form-label" value="${userVO.name}" readonly>
         </div>
-        <label for="phonenum" class="col-4 col-form-label fw-bold text-end">연락처</label>
-        <div class="col-8">
+        <label for="phonenum" class="col-4 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">연락처</label>
+        <div class="col-8 border-bottom">
           <input type="text" class="form-control bg-white border-0" id="phonenum" placeholder="col-form-label" value="${userVO.phonenum}" readonly>
         </div>
       </div>
-      <div class="row mb-3">
-        <h5><i class="bi bi-dot"></i> 지도 정보</h5>
-        <label for="layer_id" class="col-4 col-form-label fw-bold text-end">레이어 ID</label>
-        <div class="col-8">
+      <h5><i class="bi bi-dot"></i> 지도 정보</h5>
+      <div class="row mb-3 border border-dark border-start-0 border-end-0">
+        <label for="layer_id" class="col-4 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">레이어 ID</label>
+        <div class="col-8 border-bottom">
           <input type="text" class="form-control bg-white border-0" id="layer_id" placeholder="col-form-label" value="${fieldDataVO.layer_id}" readonly>
         </div>
-        <label for="save_date" class="col-4 col-form-label fw-bold text-end">수집일</label>
-        <div class="col-8">
+        <label for="save_date" class="col-4 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">수집일</label>
+        <div class="col-8 border-bottom">
           <input type="text" class="form-control bg-white border-0" id="save_date" placeholder="col-form-label" value="${fieldDataVO.save_date}" readonly>
         </div>
-        <label for="region" class="col-4 col-form-label fw-bold text-end">지역</label>
-        <div class="col-8">
+        <label for="region" class="col-4 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">지역</label>
+        <div class="col-8 border-bottom">
           <input type="text" class="form-control bg-white border-0" id="region" placeholder="col-form-label" value="${fieldDataVO.region}" readonly>
         </div>
-        <label class="col-4 col-form-label fw-bold text-end">상태</label>
-        <div class="col-8 my-auto">
+        <label class="col-4 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">상태</label>
+        <div class="col-8 border-bottom my-auto">
           <c:choose>
             <c:when test="${fieldDataVO.status eq '0'}">
               <span class="card-warning ms-2 w-50 text-center">수집</span>
@@ -59,12 +59,12 @@
             </c:when>
           </c:choose>
         </div>
-        <label for="description" class="col-4 col-form-label fw-bold text-end">설명</label>
-        <div class="col-8">
+        <label for="description" class="col-4 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">설명</label>
+        <div class="col-8 border-bottom">
           <input type="text" class="form-control bg-white border-0" id="description" readonly>
         </div>
-        <label for="errInfo" class="col-4 col-form-label fw-bold text-end">오류내용</label>
-        <div class="col-8">
+        <label for="errInfo" class="col-4 col-form-label fw-bold text-end bg-secondary" style="--bs-bg-opacity: .5">오류내용</label>
+        <div class="col-8 border-bottom">
           <input type="text" class="form-control bg-white border-0" id="errInfo" readonly>
         </div>
       </div>
diff --git a/src/main/webapp/css/style.css b/src/main/webapp/css/style.css
index eea1dd4..5e32476 100644
--- a/src/main/webapp/css/style.css
+++ b/src/main/webapp/css/style.css
@@ -1,3 +1,10 @@
+
+@import url('https://fonts.googleapis.com/css2?family=Gowun+Dodum&display=swap');
+
+body{
+  font-family: 'Gowun Dodum', serif;
+}
+
 a {
 	text-decoration: none;
 	color: #000;
@@ -727,6 +734,7 @@ input[type=checkbox]:disabled:checked {
   background-clip: border-box;
   border: 1px solid rgba(0, 0, 0, 0.125);
   border-radius: 0.25rem;
+  margin: 0.375rem 0.75rem;
 }
 
 .card-success {
@@ -739,6 +747,7 @@ input[type=checkbox]:disabled:checked {
   background-clip: border-box;
   border: 1px solid rgba(0, 0, 0, 0.125);
   border-radius: 0.25rem;
+  margin: 0.375rem 0.75rem;
 
 }
 
@@ -752,4 +761,5 @@ input[type=checkbox]:disabled:checked {
   background-clip: border-box;
   border: 1px solid rgba(0, 0, 0, 0.125);
   border-radius: 0.25rem;
+  margin: 0.375rem 0.75rem;
 }