junekeunsong преди 4 години
родител
ревизия
3cd64c863a

+ 5 - 3
src/main/java/com/lemon/lifecenter/controller/MobileLoginController.java

@@ -76,14 +76,16 @@ public class MobileLoginController extends LifeCenterController {
             LifeCenterSessionController.setSession(request, "sesMGender", dto.getGender());
             LifeCenterSessionController.setSession(request, "sesMWardNum", dto.getWardNumber());
             LifeCenterSessionController.setSession(request, "sesMRoomNum", dto.getRoomNumber());
-            LifeCenterSessionController.setSession(request, "sesMCenterCode", dto.getCenterCode());
-            
+            LifeCenterSessionController.setSession(request, "sesMCenterCode", String.valueOf(dto.getCenterCode()));
+
+            logger.error("dto.getPw()dto.getPw() -- > " + dto.getPw());
+            object.put("id", dto.getId());
+            object.put("pw", dto.getPw());
             resultCode = "00";
         }
         
         object.put("code", resultCode);
         object.put("message", message);
-        
         return object.toString();
     }
     

+ 2 - 1
src/main/resources/mybatis/mapper/mobile/login.xml

@@ -21,7 +21,8 @@
                    WARD_NUMBER  AS wardNumber,
                    ROOM_NUMBER  AS roomNumber,
                    CENTER_CODE  AS centerCode,
-                   ID           AS id
+                   ID           AS id,
+                   PW           AS pw
               FROM PATIENT_CARE
              WHERE 1 = 1
                AND ID = #{id}

+ 25 - 2
src/main/webapp/WEB-INF/jsp/mobile/login/login.jsp

@@ -4,6 +4,24 @@
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
 <jsp:include page="${data._INCLUDE}/header.jsp"></jsp:include>
 <script type="text/javascript">
+
+function checkMobile(){
+     
+    var varUA = navigator.userAgent.toLowerCase(); //userAgent 값 얻기
+ 
+    if ( varUA.indexOf('android') > -1) {
+        //안드로이드
+        return "android";
+    } else if ( varUA.indexOf("iphone") > -1||varUA.indexOf("ipad") > -1||varUA.indexOf("ipod") > -1 ) {
+        //IOS
+        return "ios";
+    } else {
+        //아이폰, 안드로이드 외
+        return "other";
+    }
+    
+}
+
 $( function(){
     $( "#id" ).focus();
     
@@ -35,6 +53,11 @@ $( function(){
                     var resultMsg  = data.message;
                     
                     if( data.code == "00" ) {
+                        console.log("checkMobile() -- > " + checkMobile());
+                        if (checkMobile() == "android") {
+                            window.android.login(data.id, data.pw);
+                        }
+                        
                         location.href="/mobile/menu";
                     } else {
                     	$("#errMsg").text(resultMsg);
@@ -87,12 +110,12 @@ $( function(){
                         </div>
                         <div class="part">
                             <div class="input">
-                                <input type="text" name="id" class="number1" placeholder="병동번호" tabindex="1" maxlength="20" required>
+                                <input type="text" id="id" name="id" class="number1" placeholder="병동번호" tabindex="1" maxlength="20" required>
                             </div>
                         </div>
                         <div class="part">
                             <div class="input">
-                                <input type="password" name="pw" class="date1" placeholder="생년월일 6자리" autocomplete="off" tabindex="2" maxlength="15" required>
+                                <input type="password" id="pw" name="pw" class="date1" placeholder="생년월일 6자리" autocomplete="off" tabindex="2" maxlength="15" required>
                             </div>
                         </div>
                         <div class="part">

+ 9 - 2
src/main/webapp/WEB-INF/jsp/mobile/nonface/nonface.jsp

@@ -5,13 +5,20 @@
 <jsp:include page="${data._INCLUDE}/header.jsp"></jsp:include>
 <script type="text/javascript">
 $( function() {
-    $("#nonface").submit();
+    var gsWin = window.open('about:blank','nonface');
+    var frm =document.nonface;
+    frm.action = 'https://lemon.medihere.com/app/vc';
+    frm.target ="nonface";
+    frm.method ="post";
+    frm.submit();
+
+    //$("#nonface").submit();
 });
 </script>
 </head>
 <body>
     
-    <form id="nonface" action="https://lemon.medihere.com/app/vc" method="POST">
+    <form id="nonface" name="nonface" action="https://lemon.medihere.com/app/vc">
         <input type="hidden" name="member_name" value="${member_name}" />
         <input type="hidden" name="member_id" value="${member_id}" />
         <input type="hidden" name="room_id" value="${room_id}" />

+ 18 - 4
src/main/webapp/WEB-INF/jsp/mobile/servey/servey.jsp

@@ -18,6 +18,20 @@ $( function(){
         $("#hYmd").val( hYear  + "-" + hMonth  + "-" + hDay );
 
     });
+
+    $( ".select-date" ).on( "change", function(){
+        var $this = $( this );
+        var wrap  = $this.closest( "div.date" );
+        
+        var dateYear  = wrap.find( ".date-year" ).val();
+        var dateMonth = wrap.find( ".date-month" ).val();
+        var dateDay   = wrap.find( ".date-day" ).val();
+        
+        dateMonth = Number(dateMonth) < 10 ? "0" + dateMonth : dateMonth;
+        dateDay   = Number(dateDay) < 10   ? "0" + dateDay   : dateDay;
+        
+        wrap.find( "input.error-box" ).val( dateYear  + "-" + dateMonth  + "-" + dateDay );
+    });
 });
 
 
@@ -46,7 +60,7 @@ $( function(){
                     </div>
                     <div class="date">
                         <div class="year">
-                            <select class="custom-select ymd-date" id="hYear">
+                            <select class="custom-select select-date date-year">
                                   <option value="" selected="">년</option>
                                   <c:forEach var="y" begin="1940" end="${sysYear}" step="1">
                                       <option value="${y}">${y} 년</option>
@@ -58,7 +72,7 @@ $( function(){
                         </div>
                         <div class="month">
 <!--                             <input type="text" name=""> 월 -->
-                            <select class="custom-select ymd-date" id="hMonth" >
+                            <select class="custom-select select-date date-month">
                                   <option value="" selected="">월</option>
                                   <c:forEach var="m" begin="1" end="12" step="1">
                                       <option value="${m}">${m} 월</option>
@@ -67,7 +81,7 @@ $( function(){
                         </div>
                         <div class="day">
 <!--                             <input type="text" name=""> 일 -->
-                            <select class="custom-select ymd-date" id="hDay">
+                            <select class="custom-select select-date date-day">
                                   <option value="" selected="">일</option>
                                   <c:forEach var="d" begin="1" end="31" step="1">
                                       <option value="${d}">${d} 일</option>
@@ -108,7 +122,7 @@ $( function(){
                                   </c:forEach>
                             </select>
                         </div>
-                        <input type="date" class="error-box" id="cvYmd" name="cvYmd" required>
+                        <input type="text" class="error-box" id="cvYmd" name="cvYmd" required>
                     </div>
                 </div>
                 <div class="part">