From 87407f37d6d0d68001f1b717a1d34f7a80f63ed5 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, 21 Dec 2022 19:28:37 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8C=80=EC=8B=9C=EB=B3=B4=EB=93=9C=EC=97=90?=
 =?UTF-8?q?=20=ED=8E=B8=EC=A7=91=20=EB=A7=81=ED=81=AC=20=EC=B6=94=EA=B0=80?=
 =?UTF-8?q?.=20=EA=B3=B5=EC=A7=80=EC=82=AC=ED=95=AD=20=EC=A0=9C=EB=AA=A9?=
 =?UTF-8?q?=20=EA=B8=B8=EC=9D=B4=20=EC=A1=B0=EC=A0=95.=20=EA=B5=AD?=
 =?UTF-8?q?=EC=A0=9C=EB=B2=94=EC=A3=84=EA=B2=80=EA=B1=B0=ED=98=84=ED=99=A9?=
 =?UTF-8?q?=20=EC=A1=B0=ED=9A=8C=20=EB=AA=A8=EB=8B=AC=20=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=EC=A4=91.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                              | 3 ++-
 .../com/dbnt/faisp/main/userInfo/MyInfoController.java    | 3 ++-
 src/main/resources/templates/login/dashboard.html         | 7 ++++++-
 .../templates/publicBoard/notice/noticePageDashboard.html | 7 +++++--
 src/main/resources/templates/user/myInfo.html             | 8 ++++----
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 74717ab8..3c536fbd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,7 +47,8 @@ dependencies {
     annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor:2.7.2'
     annotationProcessor 'org.projectlombok:lombok:1.18.24'
 
-    //crosseditor 요구 라이브러리
+    //crossEditor 요구 라이브러리
+    //implementation files('libs/commons-codec-1.15.jar') // 이미 추가되어 있어서 제외.
     implementation files('libs/commons-fileupload-1.4.jar')
     implementation files('libs/commons-io-2.11.0.jar')
     implementation files('libs/java-json.jar')
diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java b/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java
index 57fb9ee6..036b7c68 100644
--- a/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java
+++ b/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java
@@ -27,7 +27,7 @@ public class MyInfoController {
   private final KwmsService kwmsService;
 
   @GetMapping("/myInfoPage")
-  public ModelAndView myInfoPage(@AuthenticationPrincipal UserInfo loginUser){
+  public ModelAndView myInfoPage(@AuthenticationPrincipal UserInfo loginUser, String activeTab){
     ModelAndView mav = new ModelAndView("user/myInfo");
     mav.addObject("userInfo", userInfoService.selectUserInfo(loginUser.getUserSeq()));
     mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG"));
@@ -37,6 +37,7 @@ public class MyInfoController {
     mav.addObject("seriesList", codeMgtService.selectCodeMgtList("SRC"));
     mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG"));
     mav.addObject("statusList", codeMgtService.selectCodeMgtList("USC"));
+    mav.addObject("activeTab", activeTab);
 
     mav.addObject("dashboardConfigList", userInfoService.getDashboardConfigList(loginUser.getUserSeq()));
     return mav;
diff --git a/src/main/resources/templates/login/dashboard.html b/src/main/resources/templates/login/dashboard.html
index 92873476..c3ad2b9c 100644
--- a/src/main/resources/templates/login/dashboard.html
+++ b/src/main/resources/templates/login/dashboard.html
@@ -7,7 +7,12 @@
 </th:block>
 <div layout:fragment="content">
   <main>
-    <h4>대시보드</h4>
+    <div class="row justify-content-between mx-0">
+      <div class="col-auto"><h4>대시보드</h4></div>
+      <div class="col-auto mt-2">
+        <a class="link-dark align-bottom" href="/myInfo/myInfoPage?activeTab=dashboard">대시보드 편집</a>
+      </div>
+    </div>
     <div class="row mx-0">
       <div class="col-12 card bg-light">
         <div class="card-body">
diff --git a/src/main/resources/templates/publicBoard/notice/noticePageDashboard.html b/src/main/resources/templates/publicBoard/notice/noticePageDashboard.html
index 5175615f..35221459 100644
--- a/src/main/resources/templates/publicBoard/notice/noticePageDashboard.html
+++ b/src/main/resources/templates/publicBoard/notice/noticePageDashboard.html
@@ -21,9 +21,12 @@
       <tbody>
       <tr class="noticeTr" th:each="notice:${noticeList}">
         <input type="hidden" class="publicKey" th:value="${notice.publicKey}">
-        <td th:text="${notice.title}"></td>
+        <td>
+          <th:block th:if="${#strings.length(notice.title)>20}" th:text="|${#strings.substring(notice.title, 0, 20)}...|"></th:block>
+          <th:block th:unless="${#strings.length(notice.title)>20}" th:text="${notice.title}"></th:block>
+        </td>
         <td th:text="${notice.wrtUserNm}"></td>
-        <td th:text="${#temporals.format(notice.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
+        <td th:text="${#temporals.format(notice.wrtDt, 'yyyy-MM-dd')}"></td>
       </tr>
       </tbody>
     </table>
diff --git a/src/main/resources/templates/user/myInfo.html b/src/main/resources/templates/user/myInfo.html
index 2db23d42..c786627e 100644
--- a/src/main/resources/templates/user/myInfo.html
+++ b/src/main/resources/templates/user/myInfo.html
@@ -22,14 +22,14 @@
         <div class="card-body">
           <ul class="nav nav-tabs" id="userTab" role="tablist">
             <li class="nav-item" role="presentation">
-              <button class="nav-link active" id="infoTab" data-bs-toggle="tab" data-bs-target="#infoTabPanel" type="button" role="tab" aria-controls="infoTabPanel" aria-selected="true">개인정보</button>
+              <button class="nav-link" th:classappend="${activeTab ne 'dashboard'?'active':''}" id="infoTab" data-bs-toggle="tab" data-bs-target="#infoTabPanel" type="button" role="tab" aria-controls="infoTabPanel" th:aria-selected="${activeTab ne 'dashboard'?'true':'false'}">개인정보</button>
             </li>
             <li class="nav-item" role="presentation">
-              <button class="nav-link" id="dashboardTab" data-bs-toggle="tab" data-bs-target="#dashboardTabPanel" type="button" role="tab" aria-controls="dashboardTabPanel" aria-selected="false">대시보드</button>
+              <button class="nav-link" th:classappend="${activeTab eq 'dashboard'?'active':''}" id="dashboardTab" data-bs-toggle="tab" data-bs-target="#dashboardTabPanel" type="button" role="tab" aria-controls="dashboardTabPanel" th:aria-selected="${activeTab eq 'dashboard'?'true':'false'}">대시보드</button>
             </li>
           </ul>
           <div class="tab-content bg-white border border-top-0 p-2">
-            <div class="tab-pane fade p-2 show active" id="infoTabPanel" role="tabpanel" aria-labelledby="infoTabPanel" tabindex="0">
+            <div class="tab-pane fade p-2" th:classappend="${activeTab ne 'dashboard'?'show active':''}" id="infoTabPanel" role="tabpanel" aria-labelledby="infoTabPanel" tabindex="0">
               <div class="row justify-content-start">
                 <div class="col-7">
                   <form id="userInfoUpdate" action="#" method="post">
@@ -183,7 +183,7 @@
                 </div>
               </div>
             </div>
-            <div class="tab-pane fade p-2" id="dashboardTabPanel" role="tabpanel" aria-labelledby="dashboardTab" tabindex="0">
+            <div class="tab-pane fade p-2" th:classappend="${activeTab eq 'dashboard'?'show active':''}" id="dashboardTabPanel" role="tabpanel" aria-labelledby="dashboardTab" tabindex="0">
               <div class="row justify-content-end">
                 <div class="col-auto">
                   <button type="button" class="btn btn-outline-info" data-bs-toggle="modal" data-bs-target="#questionModal">