From 0d7c3a67a5d65ce8a374a946fa17bb410eafdf25 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: Tue, 15 Mar 2022 16:04:14 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A7=80=EB=8F=84=EC=82=AC=EC=9A=A9=EC=9D=B4?=
 =?UTF-8?q?=EB=A0=A5=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=20-=20=ED=85=8C?=
 =?UTF-8?q?=EC=9D=B4=EB=B8=94=EC=97=90=20=EB=8F=99=EC=9E=91=20=EC=BB=AC?=
 =?UTF-8?q?=EB=9F=BC=20=EC=B6=94=EA=B0=80.=20=20-=20=EB=B0=98=EC=9D=91?=
 =?UTF-8?q?=ED=98=95=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mca/map/vo/UseHistoryVO.java     |  18 +++
 .../sqlmap/mappers/map/useHistory.xml         |  64 +++++----
 .../webapp/WEB-INF/jsp/admin/fieldData.jsp    |   3 +-
 src/main/webapp/WEB-INF/jsp/admin/history.jsp | 132 +++++++++++++-----
 .../webapp/WEB-INF/jsp/admin/userInfoView.jsp |   2 +-
 5 files changed, 152 insertions(+), 67 deletions(-)

diff --git a/src/main/java/com/mca/map/vo/UseHistoryVO.java b/src/main/java/com/mca/map/vo/UseHistoryVO.java
index f828d42..492a05d 100644
--- a/src/main/java/com/mca/map/vo/UseHistoryVO.java
+++ b/src/main/java/com/mca/map/vo/UseHistoryVO.java
@@ -3,11 +3,29 @@ package com.mca.map.vo;
 public class UseHistoryVO {
 	private String logDate;
 	private String reqArea;
+  private int client_type;
+  private int log_type;
 	// private String content;
 	private String userid;
 	private String name;
 	private String company;
 
+  public int getClient_type() {
+    return client_type;
+  }
+
+  public void setClient_type(int client_type) {
+    this.client_type = client_type;
+  }
+
+  public int getLog_type() {
+    return log_type;
+  }
+
+  public void setLog_type(int log_type) {
+    this.log_type = log_type;
+  }
+
   public String getLogDate() {
     return logDate;
   }
diff --git a/src/main/resources/egovframework/sqlmap/mappers/map/useHistory.xml b/src/main/resources/egovframework/sqlmap/mappers/map/useHistory.xml
index eff892c..78b57ca 100644
--- a/src/main/resources/egovframework/sqlmap/mappers/map/useHistory.xml
+++ b/src/main/resources/egovframework/sqlmap/mappers/map/useHistory.xml
@@ -6,26 +6,29 @@
 	<select id="selectUseHistoryList" parameterType="useHistorySearchVO" resultType="useHistoryVO" >
 		SELECT
 			log_date AS logDate,
-		    req_area AS reqArea,
-		    a.userid,
-		    b.name,
-		    b.company
+		  client_type,
+      log_type,
+      req_area AS reqArea,
+      a.userid,
+      b.name,
+      b.company
 		FROM
 			map_use_history a JOIN t_user b ON a.userid=b.userid
-		WHERE 1 = '1'
-		<if test='searchKeyword != null and searchKeyword != ""'>
-			<choose>
-				<when test='searchCondition eq "all"'>
+		<where>
+      <if test='searchKeyword != null and searchKeyword != ""'>
+        <choose>
+          <when test='searchCondition eq "all"'>
 
-						AND (b.name LIKE CONCAT('%',#{searchKeyword},'%')
-						OR b.company LIKE CONCAT('%',#{searchKeyword},'%')
-						OR a.req_area LIKE CONCAT('%',#{searchKeyword},'%'))
-				</when>
-				<otherwise>
-						AND ${searchCondition} LIKE CONCAT('%',#{searchKeyword},'%')
-				</otherwise>
-			</choose>
-		</if>
+              AND (b.name LIKE CONCAT('%',#{searchKeyword},'%')
+              OR b.company LIKE CONCAT('%',#{searchKeyword},'%')
+              OR a.req_area LIKE CONCAT('%',#{searchKeyword},'%'))
+          </when>
+          <otherwise>
+              AND ${searchCondition} LIKE CONCAT('%',#{searchKeyword},'%')
+          </otherwise>
+        </choose>
+      </if>
+    </where>
 		ORDER BY log_date DESC
 		LIMIT #{recordCountPerPage} OFFSET #{firstIndex}
 	</select>
@@ -35,19 +38,20 @@
 			COUNT(*)
 		FROM
 			map_use_history a JOIN t_user b ON a.userid=b.userid
-		WHERE 1 = 1
-		<if test='searchKeyword != null and searchKeyword != ""'>
-			<choose>
-				<when test='searchCondition eq "all"'>
-						AND (b.name LIKE CONCAT('%',#{searchKeyword},'%')
-						OR b.company LIKE CONCAT('%',#{searchKeyword},'%')
-						OR a.req_area LIKE CONCAT('%',#{searchKeyword},'%'))
-				</when>
-				<otherwise>
-						AND ${searchCondition} LIKE CONCAT('%',#{searchKeyword},'%')
-				</otherwise>
-			</choose>
-		</if>
+		<where>
+      <if test='searchKeyword != null and searchKeyword != ""'>
+        <choose>
+          <when test='searchCondition eq "all"'>
+              AND (b.name LIKE CONCAT('%',#{searchKeyword},'%')
+              OR b.company LIKE CONCAT('%',#{searchKeyword},'%')
+              OR a.req_area LIKE CONCAT('%',#{searchKeyword},'%'))
+          </when>
+          <otherwise>
+              AND ${searchCondition} LIKE CONCAT('%',#{searchKeyword},'%')
+          </otherwise>
+        </choose>
+      </if>
+    </where>
 	</select>
 
   <select id="selectDayMapUseData" parameterType="useHistorySearchVO" resultType="ChartVO" >
diff --git a/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp b/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp
index 6b7845d..492dc4b 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp
@@ -196,8 +196,7 @@
 </div>
 
 
-<div class="modal fade" id="fieldViewModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1"
-     aria-labelledby="fieldViewModalLabel" aria-hidden="true">
+<div class="modal fade" id="fieldViewModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="fieldViewModalLabel" aria-hidden="true">
   <div class="modal-dialog modal-xl">
     <div class="modal-content">
       <div class="modal-header">
diff --git a/src/main/webapp/WEB-INF/jsp/admin/history.jsp b/src/main/webapp/WEB-INF/jsp/admin/history.jsp
index b7aa866..6a5fff2 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/history.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/history.jsp
@@ -15,53 +15,117 @@
     <form:form commandName="UseHistorySearchVO" name="searchForm" action="/admin/history" method="get">
 
     <div class="row justify-content-end bg-white mx-3 py-2">
-        <div class="col-auto row">
-            <div class="col-auto">
-                <select class="form-select" name="searchCondition">
-                    <option value="all" ${UseHistorySearchVO.searchCondition eq 'all'?'selected':''}>통합검색</option>
-                    <option value="name" ${UseHistorySearchVO.searchCondition eq 'name'?'selected':''}>이름</option>
-                    <option value="company" ${UseHistorySearchVO.searchCondition eq 'company'?'selected':''}>소속</option>
-                    <option value="req_area" ${UseHistorySearchVO.searchCondition eq 'req_area'?'selected':''}>위치</option>
-                </select>
-            </div>
-            <div class="col-auto">
-                <input type="text" class="form-control" name="searchKeyword" value="${UseHistorySearchVO.searchKeyword}"/>
-            </div>
-            <div class="col-auto">
-                <input class="btn btn-outline-secondary" type="submit" value="검색"/>
-            </div>
+      <div class="col-12 col-sm-4 row">
+        <div class="col-12 col-sm-4">
+          <select class="form-select" name="searchCondition">
+            <option value="all" ${UseHistorySearchVO.searchCondition eq 'all'?'selected':''}>통합검색</option>
+            <option value="name" ${UseHistorySearchVO.searchCondition eq 'name'?'selected':''}>이름</option>
+            <option value="company" ${UseHistorySearchVO.searchCondition eq 'company'?'selected':''}>소속</option>
+            <option value="req_area" ${UseHistorySearchVO.searchCondition eq 'req_area'?'selected':''}>위치</option>
+          </select>
         </div>
+        <div class="col-8 col-sm-5">
+          <input type="text" class="form-control" name="searchKeyword" value="${UseHistorySearchVO.searchKeyword}"/>
+        </div>
+        <div class="col-4 col-sm-3">
+          <input class="btn btn-outline-secondary w-100" type="submit" value="검색"/>
+        </div>
+      </div>
     </div>
 
 
     <div class="row m-3 p-2 bg-white">
+      <div class="col-12 d-none d-sm-block">
         <table class="table table-hover text-center">
-            <thead>
+          <thead>
+          <tr>
+            <th>소속</th>
+            <th>담당자</th>
+            <th>동작</th>
+            <th>위치</th>
+            <th>날짜</th>
+          </tr>
+          </thead>
+          <tbody>
+          <c:if test="${count >= 1}">
+            <c:forEach var="item" items="${useHistoryList}">
+              <tr>
+                <td><c:out value="${item.company}"/></td>
+                <td><c:out value="${item.name}"/></td>
+                <td>
+                  <c:choose>
+                    <c:when test="${item.log_type eq '0'}">
+                      <span class="status-bar status-success w-50 mx-auto">로그인</span>
+                    </c:when>
+                    <c:when test="${item.log_type eq '1'}">
+                      <span class="status-bar status-danger w-50 mx-auto">로그아웃</span>
+                    </c:when>
+                    <c:when test="${item.log_type eq '2'}">
+                      <span class="status-bar status-warning w-50 mx-auto">지도사용</span>
+                    </c:when>
+                  </c:choose>
+                </td>
+                <td><c:out value="${item.reqArea}"/></td>
+                <td class="td_date"><c:out value="${item.logDate}"/></td>
+              </tr>
+            </c:forEach>
+          </c:if>
+          <c:if test="${count == 0}">
             <tr>
-                <th>위치</th>
-                <th>소속</th>
-                <th>담당자</th>
-                <th>날짜</th>
+              <td colspan="5">요청한 목록이 없습니다.</td>
             </tr>
-            </thead>
-            <tbody>
+          </c:if>
+          </tbody>
+        </table>
+      </div>
+
+      <div class="col-12 d-block d-sm-none">
+        <table class="table table-hover text-center">
+          <tbody class="border-0 border-top border-bottom border-2 border-dark">
             <c:if test="${count >= 1}">
-                <c:forEach var="item" items="${useHistoryList}">
-                    <tr>
-                        <td><c:out value="${item.reqArea}"/></td>
-                        <td><c:out value="${item.company}"/></td>
-                        <td><c:out value="${item.name}"/></td>
-                        <td class="td_date"><c:out value="${item.logDate}"/></td>
-                    </tr>
-                </c:forEach>
+              <c:forEach var="item" items="${useHistoryList}">
+                <tr class="border-bottom">
+                  <th class="bg-secondary" style="--bs-bg-opacity: .5">소속</th>
+                  <td><c:out value="${item.company}"/></td>
+                </tr>
+                <tr class="border-bottom">
+                  <th class="bg-secondary" style="--bs-bg-opacity: .5">담당자</th>
+                  <td><c:out value="${item.name}"/></td>
+                </tr>
+                <tr class="border-bottom">
+                  <th class="bg-secondary" style="--bs-bg-opacity: .5">동작</th>
+                  <td>
+                    <c:choose>
+                      <c:when test="${item.log_type eq '0'}">
+                        <span class="status-bar status-success">로그인</span>
+                      </c:when>
+                      <c:when test="${item.log_type eq '1'}">
+                      <span class="status-bar status-danger">로그아웃</span>
+                      </c:when>
+                      <c:when test="${item.log_type eq '2'}">
+                        <span class="status-bar status-warning">지도사용</span>
+                      </c:when>
+                    </c:choose>
+                  </td>
+                </tr>
+                <tr class="border-bottom">
+                  <th class="bg-secondary" style="--bs-bg-opacity: .5">위치</th>
+                  <td><c:out value="${item.reqArea}"/></td>
+                </tr>
+                <tr class="border-0 border-bottom border-2 border-dark">
+                  <th class="bg-secondary" style="--bs-bg-opacity: .5">날짜</th>
+                  <td class="td_date"><c:out value="${item.logDate}"/></td>
+                </tr>
+              </c:forEach>
             </c:if>
             <c:if test="${count == 0}">
-                <tr>
-                    <td colspan="5">요청한 목록이 없습니다.</td>
-                </tr>
+              <tr>
+                <td colspan="5">요청한 목록이 없습니다.</td>
+              </tr>
             </c:if>
-            </tbody>
+          </tbody>
         </table>
+      </div>
     </div>
     <div class="text-page">
         <form:hidden path="pageIndex"/></form:form>
diff --git a/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp b/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp
index 6e20224..5626bec 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp
@@ -4,7 +4,7 @@
 <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 
-<div class="row justify-content-between bg-white mx-3 py-2">
+<div class="row justify-content-between bg-white py-2">
     <form:form commandName="userVO" name="updateForm" id="updateForm" action="/admin/userUpdate" method="post">
         <div class="section_content">
             <input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>