From 0b3f52f25fd7411c4afa80110c92d10fe2cc110d 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: Wed, 2 Mar 2022 14:55:49 +0900
Subject: [PATCH] =?UTF-8?q?=ED=98=84=EC=9E=A5=EC=88=98=EC=A7=91=EB=8D=B0?=
 =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/jsp/admin/fieldData.jsp    | 185 +++++++++---------
 .../WEB-INF/jsp/layout/template_main.jsp      |   2 +-
 src/main/webapp/css/style.css                 |   6 +-
 3 files changed, 95 insertions(+), 98 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp b/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp
index 416c31c..fc6dd6f 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp
@@ -12,114 +12,111 @@
 		display: inline;
 	}
 </style>
-
-		<%--<div class="section_title">
-			<!-- <p>현장 지원 시스템</p> -->
-		</div>--%>
-
 <div class="mx-lg-2">
-  <h1 class="h4"><i class="bi bi-flag"></i> 현장수집 데이터</h1>
+  <h1 class="h4 m-3"> 현장수집 데이터(${count})</h1>
   <form:form commandName="fieldDataSearchVO" name="searchForm" action="/admin/fieldData" method="get">
-  <div class="row justify-content-between">
-    <div class="col-auto row">
-      <ul class="nav">
-        <li class="nav-item">
-          <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">
-          <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">
-          <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">
-          <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">
-          <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="row justify-content-between bg-white mx-3 py-2">
       <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>
+        <ul class="nav">
+          <li class="nav-item">
+            <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">
+            <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">
+            <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">
+            <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">
+            <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">
-        <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 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>
-  </div>
 
-
-    <table class="list-table">
-      <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>
-              <td><a href="/admin/fieldData/${item.id}"><c:out value="${item.id}" /></a></td>
-              <td><a href="/admin/fieldData/${item.id}"><c:out value="${item.region}" /></a></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="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>
+                <td><a href="/admin/fieldData/${item.id}"><c:out value="${item.id}" /></a></td>
+                <td><a href="/admin/fieldData/${item.id}"><c:out value="${item.region}" /></a></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" /></form:form>
+      <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/layout/template_main.jsp b/src/main/webapp/WEB-INF/jsp/layout/template_main.jsp
index 9b90522..f7a9899 100644
--- a/src/main/webapp/WEB-INF/jsp/layout/template_main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/layout/template_main.jsp
@@ -23,7 +23,7 @@
 	<script src="<c:url value='/js/jquery-ui.min.js' />"></script>
 	<script src="<c:url value="/js/bootstrap-5.1.3.min.js"/>"></script>
 </head>
-<body class="">
+<body class="overflow-hidden">
 	<div id="wrap">
 		<tiles:insertAttribute name="header"/>
     <tiles:insertAttribute name="left"/>
diff --git a/src/main/webapp/css/style.css b/src/main/webapp/css/style.css
index 1fe2256..b4bbd05 100644
--- a/src/main/webapp/css/style.css
+++ b/src/main/webapp/css/style.css
@@ -72,11 +72,12 @@ a {
 .section {
 	margin-top: 90px;
 	margin-left: 200px;
-	padding-bottom: 100px;
 	min-width: 1160px;
 	min-height: 100px;
 	overflow: hidden;
 	padding-top: 20px;
+  height: 100vh;
+  background-color: rgb(247, 247, 247);
 }
 
 .loginWrap {
@@ -180,7 +181,7 @@ a {
 
 .fieldDataTable{
 	width:100%;
-	box-sizing: border-box;	
+	box-sizing: border-box;
 }
 
 .fieldDataTable>thead>tr:first-child>th {
@@ -622,7 +623,6 @@ a {
 	border: 1px solid #ccc;
 	background-color: #337ab7;
 	padding: 10px 5px;
-	text-align: left;
 	color: #fff;
 }