From 1a995eb75b10fff63d654447abae39e7618f91b5 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, 22 Feb 2023 11:08:28 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=ED=9A=8C?=
 =?UTF-8?q?=EC=9B=90=EC=A0=95=EB=B3=B4=20=EC=88=98=EC=A0=95=20=EC=96=91?=
 =?UTF-8?q?=EC=8B=9D=20=EB=B3=80=EA=B2=BD.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dbnt/faisp/kwms/KwmsController.java   |   2 +-
 .../main/userInfo/UserMgtController.java      |   8 --
 .../resources/static/js/userMgt/userMgt.js    |   4 +-
 .../adminPage/userMgt/userEditModal.html      | 111 +++++++++++-------
 4 files changed, 74 insertions(+), 51 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/kwms/KwmsController.java b/src/main/java/com/dbnt/faisp/kwms/KwmsController.java
index 3a7c072b..3650a82a 100644
--- a/src/main/java/com/dbnt/faisp/kwms/KwmsController.java
+++ b/src/main/java/com/dbnt/faisp/kwms/KwmsController.java
@@ -61,7 +61,7 @@ public class KwmsController {
           mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC"));
           mav.addObject("seriesList", codeMgtService.selectCodeMgtList(userInfo.getOutturnCd()));
           mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG"));
-          mav.addObject("eduGrdList", codeMgtService.selectCodeMgtList("EDU"));
+          mav.addObject("eduGrdList", codeMgtService.selectCodeMgtList("UED"));
         }else{
           mav.addObject("joinFlag", "F");
           mav.addObject("userInfo", empInfo);
diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java b/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java
index cfadcb95..86637ec2 100644
--- a/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java
+++ b/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java
@@ -51,14 +51,6 @@ public class UserMgtController {
   @GetMapping("/userEditModal")
   public ModelAndView userEditModal(UserInfo userInfo){
     ModelAndView mav = new ModelAndView("adminPage/userMgt/userEditModal");
-    mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG"));
-    mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC"));
-    mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT"));
-    mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC"));
-    mav.addObject("seriesList", codeMgtService.selectCodeMgtList("SRC"));
-    mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG"));
-    mav.addObject("statusList", codeMgtService.selectCodeMgtList("USC"));
-
     mav.addObject("userInfo", userInfoService.selectUserInfo(userInfo.getUserSeq()));
     return mav;
   }
diff --git a/src/main/resources/static/js/userMgt/userMgt.js b/src/main/resources/static/js/userMgt/userMgt.js
index 56497068..6b23930f 100644
--- a/src/main/resources/static/js/userMgt/userMgt.js
+++ b/src/main/resources/static/js/userMgt/userMgt.js
@@ -169,7 +169,9 @@ function saveUserInfo(){
   }
   if(confirm(actionMsg+"하시겠습니까?")){
     contentFade("in");
-    const formData = new FormData($("#userInfoUpdate")[0]);
+    const form = $("#userInfoUpdate")
+    form.find('input, select').removeAttr("disabled");
+    const formData = new FormData(form[0]);
     $.ajax({
       type : 'POST',
       data : formData,
diff --git a/src/main/resources/templates/adminPage/userMgt/userEditModal.html b/src/main/resources/templates/adminPage/userMgt/userEditModal.html
index 47170927..aa9d26c4 100644
--- a/src/main/resources/templates/adminPage/userMgt/userEditModal.html
+++ b/src/main/resources/templates/adminPage/userMgt/userEditModal.html
@@ -29,148 +29,177 @@
     </div>
     <div class="mb-3 mt-3 row">
       <label for="dicCode" class="col-sm-2 col-form-label col-form-label-sm text-center ">디지털식별코드</label>
-      <div class="col-sm-4">
+      <div class="col-sm-2">
         <input type="text" class="form-control form-control-sm" id="dicCode" name="dicCode" autocomplete="off" th:value="${userInfo.dicCode}" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
       </div>
     </div>
     <div class="row mb-1">
       <label for="userId" class="col-sm-2 col-form-label col-form-label-sm text-center ">아이디</label>
-      <div class="col-sm-4">
+      <div class="col-sm-2">
         <input type="text" class="form-control form-control-sm" id="userId" name="userId" autocomplete="off" th:value="${userInfo.userId}" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
       </div>
       <label for="userNm" class="col-sm-2 col-form-label col-form-label-sm text-center">이름</label>
-      <div class="col-sm-4">
+      <div class="col-sm-2">
         <input type="text" class=" form-control form-control-sm" id="userNm" name="userNm" autocomplete="off" th:value="${userInfo.userNm}" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
       </div>
     </div>
-    <div class="row mb-1">
+    <div class="row">
       <label for="modalPassword" class="col-sm-2 col-form-label col-form-label-sm text-center">비밀번호</label>
-      <div class="col-sm-4">
+      <div class="col-sm-2">
         <input type="password" class="form-control form-control-sm" id="modalPassword" name="password" autocomplete="new-password">
-        <label for="userId" style="font-size: 12px">8~16자 사이의 알파벳, 숫자, 특수문자 조합</label>
       </div>
       <label for="passwordConfirm" class="col-sm-2 col-form-label col-form-label-sm text-center">비밀번호 확인</label>
-      <div class="col-sm-4">
+      <div class="col-sm-2">
         <input type="password" class="form-control form-control-sm" id="passwordConfirm">
       </div>
     </div>
     <div class="row mb-1">
-      <label for="phoneNo" class="col-sm-2 col-form-label col-form-label-sm text-center">휴대전화</label>
-      <div class="col-sm-4">
-        <input type="tel" class="form-control form-control-sm" id="phoneNo" name="phoneNo" th:value="${userInfo.phoneNo}">
-      </div>
-      <label for="email" class="col-sm-2 col-form-label col-form-label-sm text-center">이메일</label>
-      <div class="col-sm-4">
-        <input type="email" class="form-control form-control-sm" id="email" name="email" autocomplete="off" th:value="${userInfo.email}">
-      </div>
+      <div class="col-sm-2"></div>
+      <label for="modalPassword" class="col-sm-4 col-form-label col-form-label-sm" style="font-size: 12px">8~16자 사이의 알파벳, 숫자, 특수문자 조합</label>
     </div>
     <div class="row mb-1">
       <label for="sex" class="col-sm-2 col-form-label col-form-label-sm text-center">성별</label>
-      <div class="col-sm-4">
+      <div class="col-sm-2">
         <select class="form-select form-select-sm" id="sex" name="sex" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
           <option value="SEX002" th:selected="${userInfo.sex eq 'SEX002'}">남</option>
           <option value="SEX001" th:selected="${userInfo.sex eq 'SEX001'}">여</option>
         </select>
       </div>
+      <label for="phoneNo" class="col-sm-2 col-form-label col-form-label-sm text-center">휴대전화</label>
+      <div class="col-sm-2">
+        <input type="tel" class="form-control form-control-sm" id="phoneNo" name="phoneNo" th:value="${userInfo.phoneNo}" placeholder="-없이 숫자만 입력">
+      </div>
+      <label for="email" class="col-sm-2 col-form-label col-form-label-sm text-center">이메일</label>
+      <div class="col-sm-2">
+        <input type="email" class="form-control form-control-sm" id="email" name="email" autocomplete="off" th:value="${userInfo.email}">
+      </div>
     </div>
     <div class="row mb-1">
       <label for="birthDate" class="col-sm-2 col-form-label col-form-label-sm text-center">생년월일</label>
-      <div class="col-sm-4">
+      <div class="col-sm-2">
         <input type="text" class="form-control form-control-sm dateSelector" id="birthDate" name="birthDate" th:value="${userInfo.birthDate}" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
       </div>
       <label for="policeInDate" class="col-sm-2 col-form-label col-form-label-sm text-center">해양경찰배명일</label>
-      <div class="col-sm-4">
+      <div class="col-sm-2">
         <input type="text" class="form-control form-control-sm dateSelector" id="policeInDate" name="policeInDate" th:value="${userInfo.policeInDate}" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
       </div>
     </div>
     <div class="row mb-1">
       <label for="ogCd" class="col-sm-2 col-form-label col-form-label-sm text-center">관서</label>
-      <div class="col-sm-4">
+      <div class="col-sm-2">
         <select class="form-select form-select-sm" id="ogCd" name="ogCd" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
           <option value="">--선택--</option>
-          <th:block th:each="code:${ogList}">
+          <th:block th:each="code:${session.commonCode.get('OG')}">
             <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.ogCd}"></option>
           </th:block>
         </select>
       </div>
       <label for="organInDate" class="col-sm-2 col-form-label col-form-label-sm text-center">현관서전입일</label>
-      <div class="col-sm-4">
+      <div class="col-sm-2">
         <input type="text" class="form-control form-control-sm dateSelector" id="organInDate" name="organInDate" th:value="${userInfo.organInDate}" readonly>
       </div>
     </div>
     <div class="row mb-1">
       <label for="ofcCd" class="col-sm-2 col-form-label col-form-label-sm text-center">부서</label>
-      <div class="col-sm-4">
+      <div class="col-sm-2">
         <select class="form-select form-select-sm" id="ofcCd" name="ofcCd" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
           <option value="">--선택--</option>
-          <th:block th:each="code:${ofcList}">
+          <th:block th:each="code:${session.commonCode.get('OFC')}">
             <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.ofcCd}"></option>
           </th:block>
         </select>
       </div>
       <label for="ofcInDate" class="col-sm-2 col-form-label col-form-label-sm text-center">현부서임용일</label>
-      <div class="col-sm-4">
+      <div class="col-sm-2">
         <input type="text" class="form-control form-control-sm dateSelector" id="ofcInDate" name="ofcInDate" th:value="${userInfo.ofcInDate}" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
       </div>
     </div>
     <div class="row mb-1">
       <label for="ogCd" class="col-sm-2 col-form-label col-form-label-sm text-center">계급</label>
-      <div class="col-sm-4">
+      <div class="col-sm-2">
         <select class="form-select form-select-sm" id="titleCd" name="titleCd" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
           <option value="">--선택--</option>
-          <th:block th:each="code:${titleList}">
+          <th:block th:each="code:${session.commonCode.get('JT')}">
             <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.titleCd}"></option>
           </th:block>
         </select>
       </div>
       <label for="titleInDate" class="col-sm-2 col-form-label col-form-label-sm text-center">현계급임용일</label>
-      <div class="col-sm-4">
+      <div class="col-sm-2">
         <input type="text" class="form-control form-control-sm dateSelector" id="titleInDate" name="titleInDate" th:value="${userInfo.titleInDate}" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
       </div>
     </div>
     <div class="row mb-1">
-      <label for="outturnCd" class="col-sm-2 col-form-label col-form-label-sm text-center">직책</label>
-      <div class="col-sm-4">
+      <label for="dutyCd" class="col-sm-2 col-form-label col-form-label-sm text-center">직책</label>
+      <div class="col-sm-2">
         <select class="form-select form-select-sm" id="dutyCd" name="dutyCd">
           <option value="">--선택--</option>
           <th:block th:each="code:${session.commonCode.get('DT')}">
-            <th:block th:if="${code.useChk eq 'T'}">
-              <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.dutyCd}"></option>
-            </th:block>
+            <option th:if="${code.useChk eq 'T'}" th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.dutyCd}"></option>
           </th:block>
         </select>
       </div>
-    </div>
-    <div class="row mb-1">
       <label for="outturnCd" class="col-sm-2 col-form-label col-form-label-sm text-center">경과</label>
-      <div class="col-sm-4">
+      <div class="col-sm-2">
         <select class="form-select form-select-sm" id="outturnCd" name="outturnCd" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
           <option value="">--선택--</option>
-          <th:block th:each="code:${outturnList}">
+          <th:block th:each="code:${session.commonCode.get('OTC')}">
             <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.outturnCd}"></option>
           </th:block>
         </select>
       </div>
       <label for="seriesCd" class="col-sm-2 col-form-label col-form-label-sm text-center">직별</label>
-      <div class="col-sm-4">
+      <div class="col-sm-2">
         <select class="form-select form-select-sm" id="seriesCd" name="seriesCd">
           <option value="">--선택--</option>
           <th:block th:each="code:${session.commonCode.get(userInfo.outturnCd)}">
-            <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.seriesCd}"></option>
+            <option th:if="${code.useChk eq 'T'}" th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.seriesCd}"></option>
           </th:block>
         </select>
       </div>
     </div>
     <div class="row mb-1">
       <label for="languageCd" class="col-sm-2 col-form-label col-form-label-sm text-center">외국어특채</label>
-      <div class="col-sm-4">
+      <div class="col-sm-2">
         <select class="form-select form-select-sm" id="languageCd" name="languageCd">
           <option value="">--선택--</option>
-          <th:block th:each="code:${languageList}">
-            <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.languageCd}"></option>
+          <th:block th:each="code:${session.commonCode.get('LNG')}">
+            <option th:if="${code.useChk eq 'T'}" th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.languageCd}"></option>
           </th:block>
         </select>
       </div>
+      <label for="languageCd" class="col-sm-2 col-form-label col-form-label-sm text-center">구사 외국어</label>
+      <div class="col-sm-2">
+        <input type="text" class="form-control form-control-sm" name="useLanguage" th:value="${userInfo.useLanguage}">
+      </div>
+      <label for="languageCd" class="col-sm-2 col-form-label col-form-label-sm text-center">수준</label>
+      <div class="col-sm-2">
+        <select class="form-select form-select-sm" name="languageGrd">
+          <option value="">해당없음</option>
+          <option value="1" th:selected="${userInfo.languageGrd eq '1'}">상</option>
+          <option value="2" th:selected="${userInfo.languageGrd eq '2'}">중</option>
+          <option value="3" th:selected="${userInfo.languageGrd eq '3'}">하</option>
+        </select>
+      </div>
+    </div>
+    <div class="row mb-1">
+      <label for="languageCd" class="col-sm-2 col-form-label col-form-label-sm text-center">학력사항</label>
+      <div class="col-sm-2">
+        <select class="form-select form-select-sm" name="educationGrd">
+          <option value="">해당없음</option>
+          <th:block th:each="code:${session.commonCode.get('UED')}">
+            <option th:if="${code.useChk eq 'T'}" th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.educationGrd}"></option>
+          </th:block>
+        </select>
+      </div>
+      <label for="languageCd" class="col-sm-2 col-form-label col-form-label-sm text-center">학교</label>
+      <div class="col-sm-2">
+        <input type="text" class="form-control form-control-sm" name="school" th:value="${userInfo.school}">
+      </div>
+      <label for="languageCd" class="col-sm-2 col-form-label col-form-label-sm text-center">전공</label>
+      <div class="col-sm-2">
+        <input type="text" class="form-control form-control-sm" name="specialism" th:value="${userInfo.specialism}">
+      </div>
     </div>
   </form>
 </div>