Merge remote-tracking branch 'origin/databank'

src/main/java/com/lemon/lifecenter/common/LifeCenterController.java

@@ -31,11 +31,13 @@ public class LifeCenterController {
           String sesId         = LifeCenterSessionController.getSession( request, "sesId" );
           String sesName       = LifeCenterSessionController.getSession( request, "sesName" );
           String sesCenterCode = LifeCenterSessionController.getSession( request, "sesCenterCode" );
+          String sesCenterName = LifeCenterSessionController.getSession( request, "sesCenterName" );
           String sesGroupIdx   = LifeCenterSessionController.getSession( request, "sesGroupIdx" );
 
           hashMap.put( "_SES_ID", sesId );
           hashMap.put( "_SES_NAME", sesName );
           hashMap.put( "_SES_CENTER_CODE", sesCenterCode );
+          hashMap.put( "_SES_CENTER_NAME", sesCenterName );
           hashMap.put( "_SES_GROUP_IDX", sesGroupIdx );
           
         } catch (NullPointerException e) {

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

@@ -127,6 +127,7 @@ public class LoginController extends LifeCenterController {
                 LifeCenterSessionController.setSession( request, "sesId",   memberData.getId() );
                 LifeCenterSessionController.setSession( request, "sesName", memberData.getName() );
                 LifeCenterSessionController.setSession( request, "sesCenterCode", memberData.getCenterCode() );
+                LifeCenterSessionController.setSession( request, "sesCenterName", memberData.getCenterName() );
                 LifeCenterSessionController.setSession( request, "sesGroupIdx", String.valueOf( memberData.getGroupIdx() ) );
                 
                 url = "/patient/list";

src/main/java/com/lemon/lifecenter/dto/LoginDTO.java

@@ -15,6 +15,15 @@ public class LoginDTO {
     public String useYn;
     public int groupIdx;
     public String centerCode;
+    public String centerName;
+    public String getCenterName() {
+        return centerName;
+    }
+
+    public void setCenterName(String centerName) {
+        this.centerName = centerName;
+    }
+
     public String updateById;
     public String resultCode;
     

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

@@ -22,17 +22,20 @@
   
     <select id="selectMemberData" parameterType="LoginDTO"  resultType="LoginDTO">
         <![CDATA[
-            SELECT id AS id,
-                   create_date AS createDate,
-                   update_date AS updateDate,
-                   name AS name,
-                   phone_number AS phoneNumber,
-                   last_login_time AS lastLoginTime,
-                   fail_count AS failCount,
-                   use_yn AS useYn,
-                   group_idx AS groupIdx,
-                   center_code AS centerCode
-              FROM member
+            SELECT m.id AS id,
+                   m.create_date AS createDate,
+                   m.update_date AS updateDate,
+                   m.name AS name,
+                   m.phone_number AS phoneNumber,
+                   m.last_login_time AS lastLoginTime,
+                   m.fail_count AS failCount,
+                   m.use_yn AS useYn,
+                   m.group_idx AS groupIdx,
+                   m.center_code AS centerCode,
+                   (select center_name
+                      from center_info ci
+                     where ci.center_code = m.center_code) AS centerName
+              FROM member m
              WHERE id = #{id}
                AND password = #{password}
         ]]>

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

@@ -10,7 +10,10 @@
         </a>
 
         <ul class="sidebar-nav">
-            <li class="sidebar-header">관리자</li>
+            <li class="sidebar-header">
+                <c:if test="${data._SES_CENTER_NAME ne ''}"><c:out value="${data._SES_CENTER_NAME}" /></c:if>
+                <c:if test="${data._SES_CENTER_NAME eq ''}">관리자</c:if>
+            </li>
             <li class="sidebar-item active">
                 <ul id="dashboards" class="sidebar-dropdown list-unstyled collapse show" data-parent="#sidebar">
 <%--                     <c:if test="${data._SES_GROUP_IDX ne 1}"> --%>

src/main/webapp/WEB-INF/jsp/mobile/health/health1.jsp

@@ -66,7 +66,7 @@ $( function(){
                         <a href="./1" class="one active">체온<span class="eng">body temperature</span></a>
                     </li>
                     <li>
-                        <a href="./2" class="two">맥박수/혈압<span class="eng">heart rate/blood pressure</span></a>
+                        <a href="./2" class="two">혈압/맥박수<span class="eng">blood pressure/heart rate</span></a>
                     </li>
                     <li>
                         <a href="./3" class="three">산소포화도<span class="eng">oxygen</span></a>
@@ -106,7 +106,7 @@ $( function(){
                     
                     <div class="data unlink">
                         <div class="point">
-                            <input type="text" class="" name="temperature" placeholder="--"> ℃
+                            <input type="number" class="" name="temperature" placeholder="--"> ℃
                         </div>
                     </div>
                     

src/main/webapp/WEB-INF/jsp/mobile/health/health2.jsp

@@ -140,15 +140,15 @@ $( function(){
                                 </thead>
                                 <tbody>
                                     <tr>
-                                        <td><input type="text" name="bloodPressure" placeholder="--"><span class="mini">mmHg</span></td>
-                                        <td><input type="text" name="bloodPressure2" placeholder="--"><span class="mini">mmHg</span></td>
+                                        <td><input type="number" name="bloodPressure" placeholder="--"><span class="mini">mmHg</span></td>
+                                        <td><input type="number" name="bloodPressure2" placeholder="--"><span class="mini">mmHg</span></td>
                                     </tr>
                                 </tbody>
                             </table>
                         </div>
                         <div class="point">
                             <div style="font-size:13px;color:#8EB8FF;font-weight:600;">맥박수 (heart rate)</div>
-                            <input type="text" name="pulseRate" placeholder="--"><span class="mini">bpm</span>
+                            <input type="number" name="pulseRate" placeholder="--"><span class="mini">bpm</span>
                         </div>
 
                     </div>

src/main/webapp/WEB-INF/jsp/mobile/health/health3.jsp

@@ -62,7 +62,7 @@ $( function(){
                         <a href="./1" class="one">체온<span class="eng">body temperature</span></a>
                     </li>
                     <li>
-                        <a href="./2" class="two">맥박수/혈압<span class="eng">heart rate/blood pressure</span></a>
+                        <a href="./2" class="two">혈압/맥박수<span class="eng">blood pressure/heart rate</span></a>
                     </li>
                     <li>
                         <a href="./3" class="three active">산소포화도<span class="eng">oxygen</span></a>
@@ -103,7 +103,7 @@ $( function(){
                     <div class="data unlink">
                         <div class="point">
                             <span>
-                                <input type="text" name="oxygenSaturation" placeholder="--"> %
+                                <input type="number" name="oxygenSaturation" placeholder="--"> %
                             </span>
                         </div>
                     </div>

src/main/webapp/WEB-INF/jsp/mobile/health/health4.jsp

@@ -61,7 +61,7 @@ $( function(){
                         <a href="./1" class="one">체온<span class="eng">body temperature</span></a>
                     </li>
                     <li>
-                        <a href="./2" class="two">맥박수/혈압<span class="eng">heart rate/blood pressure</span></a>
+                        <a href="./2" class="two">혈압/맥박수<span class="eng">blood pressure/heart rate</span></a>
                     </li>
                     <li>
                         <a href="./3" class="three">산소포화도<span class="eng">oxygen</span></a>
@@ -101,7 +101,7 @@ $( function(){
                     
                     <div class="data unlink">
                         <div class="point">
-                            <input type="text" name="bloodSugar" placeholder="--"><span class="mini">mg/dL</span>
+                            <input type="number" name="bloodSugar" placeholder="--"><span class="mini">mg/dL</span>
                         </div>
                     </div>
                     

src/main/webapp/WEB-INF/jsp/mobile/health/health5.jsp

@@ -36,7 +36,7 @@ $( function(){
                         <a href="./1" class="one">체온<span class="eng">body temperature</span></a>
                     </li>
                     <li>
-                        <a href="./2" class="two">맥박수/혈압<span class="eng">heart rate/blood pressure</span></a>
+                        <a href="./2" class="two">혈압/맥박수<span class="eng">blood pressure/heart rate</span></a>
                     </li>
                     <li>
                         <a href="./3" class="three">산소포화도<span class="eng">oxygen</span></a>

src/main/webapp/WEB-INF/jsp/mobile/menu/menu.jsp

@@ -75,7 +75,13 @@ $(function(){
             <div class="banner">
                 <div class="name">
                     <c:out value="${sesMCenterName}" />
+                    <div class="mt10">
+                        <span><c:out value="${name}" /></span> 님
+                    </div>
                 </div>
+<!--                 <div class="name"> -->
+<%--                     <span><c:out value="${name}" /></span> 님 --%>
+<!--                 </div> -->
                 <div class="caption">
                     <div class="title">
                          생활치료센터 비대면진료 서비스

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

@@ -171,6 +171,7 @@ $( function(){
             form.submit();
         }
     });
+    
 });
 </script>
 </head>
@@ -215,7 +216,7 @@ $( function(){
                                         <c:set var="now" value="<%=new java.util.Date()%>" />
                                         <c:set var="action" value="/patient/edit/update" />
                                         
-                                        <form id="patientForm" action="${action}" method="post">
+                                        <form id="patientForm" action="${action}" method="post" onsubmit="return false">
                                             <input type="hidden" value="${patientIdx}" name="patientIdx">
                                             <table class="table mobile-table">
                                                 <colgroup>

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

@@ -212,7 +212,7 @@ $( function(){
                                         <c:set var="now" value="<%=new java.util.Date()%>" />
                                         <c:set var="action" value="/patient/new/insert" />
                                         
-                                        <form id="patientForm" action="${action}" method="post">
+                                        <form id="patientForm" action="${action}" method="post" onsubmit="return false">
                                             <table class="table mobile-table">
                                                 <colgroup>
                                                     <col style="width:15%">

src/main/webapp/resources/css/mobile/style.css

@@ -324,6 +324,8 @@ input[type="radio"]:checked + label span {  background-image:url('../../images/m
 .health .data.unlink{ color:#FFFFFF; }
 .health .data .point { font-size: 18px;  }
 .health .data input[type="text"] { background-color: inherit; max-width: 80px; color: #FFFFFF; height: 40px; line-height: 30px; text-align: center; padding: 0px 4px; font-size: 27px; border: 1px solid #999999; border-top:0;border-left:0;border-right:0; outline:none;}
+.health .data input[type="number"] { background-color: inherit; max-width: 80px; color: #FFFFFF; height: 40px; line-height: 30px; text-align: center; padding: 0px 4px; font-size: 27px; border: 1px solid #999999; border-top:0;border-left:0;border-right:0; outline:none;}
+.health .data input[type="number"]::-webkit-inner-spin-button{-webkit-appearance: none; margin: 0;}
 .health .data input[type="tel"] { background-color: inherit; max-width: 50px; color: #FFFFFF; height: 40px; line-height: 30px; text-align: center; padding: 0px 4px; font-size: 27px; border: 1px solid #999999; border-top:0;border-left:0;border-right:0; outline:none;}
 .health .data span.dot{line-height: 40px;margin-bottom: -5px;display: inline-block;width: 2px;border-bottom: 2px solid #ffffff;}
 .health .data input.prev{margin-right:-7px;text-align:right;padding-right:10px;}

src/main/webapp/resources/js/common/common.js

@@ -26,6 +26,12 @@ $(function(){
     $.validator.addMethod( "date",  function( value, element ) {
         return this.optional(element) || !/Invalid|NaN/.test(new Date(value).toString());
     }, "날짜형식을 올바르게 입력해주세요  yyyy-mm-dd" );
+    
+    $("form input:text").keydown(function(evt) {
+        if (evt.keyCode == 13) {
+            return false;
+        }
+    });
 });
 
 function getAjax( url, vv, success, error, done ){