각페이지수정, validate수정적용

src/main/java/com/lemon/lifecenter/controller/CenterController.java

@@ -48,7 +48,7 @@ public class CenterController extends LifeCenterController {
         return mv;
     }
     
-    @RequestMapping("/newRegist")
+    @RequestMapping("/new/regist")
     @Transactional(propagation=Propagation.REQUIRED)
     public String centerNewRegist(
             @ModelAttribute("dto") final CenterInfoDTO dto,
@@ -68,7 +68,7 @@ public class CenterController extends LifeCenterController {
         mDto.setPassword(LifeCenterFunction.aesEncrypt(config.aesKey, config.IV, staffPw));
         mDto.setName(staffName);
         mDto.setPhoneNumber(staffPhoneNumber);
-        mDto.setGroupIdx("2");
+        mDto.setGroupIdx( 2 ); // 1: 시스템관리자 2:관리자 3:일반사용자,  센터신규등록시 아이디생성은 관리자 권한으로 생성
         memberService.inserMember(mDto);
         
         return "redirect:./info?centerCode=" + dto.getCenterCode();

src/main/resources/mybatis/mapper/center/center.xml

@@ -25,6 +25,16 @@
         ]]>
     </insert>
     
+    <!--  select id="selectCenterOneCount" parameterType="CenterInfoDTO" resultType="CenterInfoDTO">
+        <![CDATA[
+            SELECT COUNT(*) total
+              FROM CENTER_INFO CI
+              LEFT OUTER JOIN MEMBER M
+                ON CI.CENTER_CODE = M.CENTER_CODE
+             WHERE CI.CENTER_CODE = #{centerCode}
+        ]]>
+    </select -->
+    
     <select id="selectCenterInfo" parameterType="CenterInfoDTO" resultType="CenterInfoDTO">
         <![CDATA[
             SELECT CI.CENTER_CODE                                AS centerCode,
@@ -83,6 +93,7 @@
                       FROM LOCATION_INFO LI
                      WHERE LI.LOCATION_CODE = CI.LOCATION_CODE)  AS locationName,
                    M.NAME                                        AS staffName,
+                   M.ID                                          AS staffId,
                    M.PHONE_NUMBER                                AS staffPhoneNumber,
                    CI.CENTER_NUMBER                              AS centerNumber,
                    CI.TOTAL_PATIENT                              AS totalPatient,

src/main/webapp/WEB-INF/jsp/center/list.jsp

@@ -213,7 +213,7 @@
                                             <thead>
                                                 <tr>
                                                     <th>번호</th>
-                                                    <th>치료세넡명</th>
+                                                    <th>치료센터명</th>
                                                     <th>지역</th>
                                                     <th>담당자</th>
                                                     <th>전화번호</th>
@@ -233,7 +233,7 @@
                                                                     <a href="./info?centerCode=${l.centerCode}"><c:out value="${l.centerName}" /></a>
                                                                 </td>
                                                                 <td><c:out value="${l.locationName}" /></td>
-                                                                <td><c:out value="${l.staffName}" /></td>
+                                                                <td><c:out value="${l.staffName}(${l.staffId})" /></td>
                                                                 <td><c:out value="${l.staffPhoneNumber}"></c:out></td>
                                                                 <td><c:out value="${l.totalPatient}" /></td>
                                                                 <td><c:out value="${l.totalCapacity}" /></td>

src/main/webapp/WEB-INF/jsp/center/new.jsp

@@ -38,6 +38,9 @@ $( function(){
                 maxlength : 15,
                 passwordValid : true
             },
+            staffPwConfirm : {
+                equalTo: "#staffPw",
+            },
             totalCapacity :{
                 number:true
             },
@@ -52,6 +55,9 @@ $( function(){
             staffPw : {
                 minlength : "비밀번호를 확인하세요 (영문, 숫자, 특수문자를 혼합하여 8 ~ 15자 이내)",
                 maxlength : "비밀번호를 확인하세요 (영문, 숫자, 특수문자를 혼합하여 8 ~ 15자 이내)"
+            },
+            staffPwConfirm : {
+                equalTo: "비밀번호가 일치하지 않습니다.",
             }
         },
         onkeyup: function( element, event ) {
@@ -99,7 +105,7 @@ $( function(){
                     <div class="row">
                         <div class="col-12">
                             <div class="card">
-                                <form action="./newRegist" method="post" id="newForm">
+                                <form action="./new/regist" method="post" id="newForm">
                                     <div class="card-body">
                                         <table class="table mobile-table">
                                             <colgroup>
@@ -156,25 +162,33 @@ $( function(){
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <th><span class="fix">*</span>아이디</th>
+                                                <th><span class="fix">*</span>담당자 아이디</th>
                                                 <td>
                                                     <input type="text" class="form-control" name="staffId" autocomplete="off" maxlength="20" required>
                                                 </td>
-                                                <th><span class="fix">*</span>비밀번호</th>
-                                                <td>
-                                                    <input type="password" class="form-control" name="staffPw" placeholder="숫자, 영문, 특수문자 조합 8~15자 이내" maxlength="15" required>
-                                                </td>
-                                            </tr>
-                                            <tr>
                                                 <th><span class="fix">*</span>담당자 이름</th>
                                                 <td>
                                                     <input type="text" class="form-control" name="staffName" required>
                                                 </td>
-                                                <th><span class="fix">*</span>담당자 휴대전화번호</th>
-                                                <td>
+                                            </tr>
+                                            <tr>
+                                                <th><span class="fix">*</span>담당자 전화번호</th>
+                                                <td colspan="3">
                                                     <input type="text" class="form-control" name="staffPhoneNumber"  placeholder="'-'를 제외한 숫자만 입력하세요" required onkeypress="onlyNumber();">
                                                 </td>
                                             </tr>
+                                            <tr>
+                                                <th><span class="fix">*</span>비밀번호</th>
+                                                <td colspan="3">
+                                                    <input type="password" class="form-control" name="staffPw" id="staffPw" placeholder="숫자, 영문, 특수문자 조합 8~15자 이내" maxlength="15" required>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th><span class="fix">*</span>비밀번호 확인</th>
+                                                <td colspan="3">
+                                                    <input type="password" class="form-control" name="staffPwConfirm"  placeholder="비밀번호 확인을 위해 비밀번호를 한번 더 입력하세요." maxlength="15" required>
+                                                </td>
+                                            </tr>
                                         </table>
                                         <div class="row mt-3">
                                             <div class="col-12">

src/main/webapp/WEB-INF/jsp/include/sidebar.jsp

@@ -34,7 +34,7 @@
         <div class="sidebar-bottom d-none d-lg-block">
             <div class="media">
                 <div class="media-body">
-                    <h5 class="mb-1">홍길동</h5>
+                    <h5 class="mb-1"><c:out value="${data._SES_NAME}(${data._SES_ID})"/></h5>
                     <div>
                         <i class="fas fa-circle text-success"></i>
                         Online

src/main/webapp/WEB-INF/jsp/patient/new.jsp

@@ -134,6 +134,15 @@
                         <div class="col-12">
                             <div class="card">
                                 <div class="card-body">
+                                    <c:if test="${centerCount eq 0}">
+                                        <table class="table mobile-table">
+                                            <tr>
+                                              <th>치료센터</th>
+                                              <td class="text-danger">등록된 생활치료센터가 없습니다. <br/>생활치료센터 신규 등록을 해주세요. </td>
+                                            </tr>
+                                        </table>
+                                    </c:if>
+                                    <c:if test="${centerCount > 0}">
                                     <table class="table mobile-table">
                                         <colgroup>
                                             <col style="width:15%">
@@ -743,6 +752,7 @@
                                             </div>
                                         </div>
                                     </div>
+                                    </c:if>
                                 </div>
                             </div>
                         </div>