Merge branch 'databank' of http://wcollector.idatabank.com:5230/dbs289/LifeCenter into sudden

src/main/resources/messages/message.properties

@@ -40,9 +40,9 @@ login.location.list.경상북도 = 경상북도
 login.location.list.경상남도 = 경상남도
 login.location.list.제주특별자치도 = 제주특별자치도
 login.location.list.중앙사고수습본부 = 중앙사고수습본부
-login.location.list.자가치료자 = 자가치료자
-
+login.location.list.재택치료 = 재택치료
 
+login.location.list.자가치료자 = 자가치료자
 
 
 # # 메인페이지 /mobile/menu
@@ -294,14 +294,14 @@ nonface.btn.end = 종료하기
 
 
 # # 이용약관
-title.accept.terms = 이용약관 (Terms of service)
-title.accept.privacy = 개인정보처리방침 (Privacy Policy)
+title.accept.terms = 이용약관
+title.accept.privacy = 개인정보처리방침
 title.accept.privacy.prev = 이전 개인정보 처리방침
 title.accept.privacy.prev.date = (2020. 12. 1 ~ 2021. 5. 23)
-title.accept = 이용약관 및 개인정보처리방침<br/>(Terms of service and Privacy Policy)
-accept.msg.notice = ※ 서비스 이용을 원하시면 이용약관, 개인정보처리방침에 대한 내용을 확인하신 후 동의해 주시기 바랍니다.<br/>(If you wish to use the service, please confirm and agree to the terms of service and privacy policy.)
+title.accept = 이용약관 및 개인정보처리방침
+accept.msg.notice = ※ 서비스 이용을 원하시면 이용약관, 개인정보처리방침에 대한 내용을 확인하신 후 동의해 주시기 바랍니다.
 accept.necessary.y = (필수)
 accept.btn.view = 보기
 accept.btn.agree = 약관을 충분히 이해했으며 동의 합니다
-accept.btn.agree.all = 모두 동의하였으며 계속 진행합니다<br/>(All agree and continue.)
+accept.btn.agree.all = 모두 동의하였으며 계속 진행합니다
 accept.insert.error = 비정상적인 접근입니다 필수입력값을 확인하세요

src/main/resources/messages/message_ar.properties

@@ -41,6 +41,7 @@ login.location.list.경상남도 = جيونغسانغنام دو
 login.location.list.제주특별자치도 = مقاطعة جيجو الخاصة ذات الحكم الذاتي
 login.location.list.중앙사고수습본부 = المقر الرئيسي لإدارة الكوارث المركزية
 login.location.list.자가치료자 = معالج ذاتي
+login.location.list.재택치료 = معالج ذاتي
 
 
 # 메인페이지 /mobile/menu

src/main/resources/messages/message_en.properties

@@ -39,7 +39,7 @@ login.location.list.경상북도 = Gyeongsangbukdo
 login.location.list.경상남도 = Gyeongsangnamdo
 login.location.list.제주특별자치도 = Jeju Special Self-Governing Province
 login.location.list.중앙사고수습본부 = Central Accident Management Headquarters
-login.location.list.자가치료자 = self therapist
+login.location.list.재택치료 = self therapist
 
 # # 메인페이지 /mobile/menu
 name.sir = Sir

src/main/resources/messages/message_fr.properties

@@ -43,6 +43,7 @@ login.location.list.경상남도 = Gyeongsangnam-do
 login.location.list.제주특별자치도 = Province autonome spéciale de Jeju
 login.location.list.중앙사고수습본부 = Siège central de gestion des catastrophes
 login.location.list.자가치료자 = auto thérapeute
+login.location.list.재택치료 = auto thérapeute
 
 # 메인페이지 /mobile/menu
 name.sir = Monsieur

src/main/resources/messages/message_ko.properties

@@ -40,9 +40,9 @@ login.location.list.경상북도 = 경상북도
 login.location.list.경상남도 = 경상남도
 login.location.list.제주특별자치도 = 제주특별자치도
 login.location.list.중앙사고수습본부 = 중앙사고수습본부
-login.location.list.자가치료자 = 자가치료자
-
+login.location.list.재택치료 = 재택치료
 
+login.location.list.자가치료자 = 자가치료자
 
 
 # # 메인페이지 /mobile/menu

src/main/resources/messages/message_ru.properties

@@ -42,6 +42,7 @@ login.location.list.경상남도 = Кенсаннам-до
 login.location.list.제주특별자치도 = Специальная самоуправляемая провинция Чеджу
 login.location.list.중앙사고수습본부 = Центральный штаб по борьбе со стихийнымибедствиями
 login.location.list.자가치료자 = самотерапевт
+login.location.list.재택치료 = самотерапевт
 
 # 메인페이지 /mobile/menu
 name.sir = сэр

src/main/resources/messages/message_th.properties

@@ -40,6 +40,7 @@ login.location.list.경상남도 = จังหวัดคยองซังใ
 login.location.list.제주특별자치도 = จังหวัดปกครองตนเองพิเศษเชจู
 login.location.list.중앙사고수습본부 = สำนักงานใหญ่การจัดการภัยพิบัติส่วนกลาง
 login.location.list.자가치료자 = นักบำบัดตัวเอง
+login.location.list.재택치료 = นักบำบัดตัวเอง
 
 
 # # 메인페이지 /mobile/menu

src/main/resources/messages/message_vi.properties

@@ -40,6 +40,7 @@ login.location.list.경상남도 = Gyeongsangnam-do
 login.location.list.제주특별자치도 = Tỉnh tự trị đặc biệt Jeju
 login.location.list.중앙사고수습본부 = Trụ sở ủy ban phòng chống thiên tai trung ương Hàn Quốc
 login.location.list.자가치료자 = bác sĩ tự trị liệu
+login.location.list.재택치료 = bác sĩ tự trị liệu
 
 # # 메인페이지 /mobile/menu
 name.sir = Thưa ông

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

@@ -135,6 +135,7 @@ $( function(){
                     <br/>
                     <div class="diagnosis-agree">
                         <p><spring:message code="health.mental.agree.text2" /></p>
+                        <br/>
                         <div>
                             <input type="radio" id="agree-y" name="agree" value="1" required>
                             <label for="agree-y">

src/main/webapp/WEB-INF/jsp/mobile/include/header.jsp

@@ -14,7 +14,7 @@
 <!-- <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" > -->
 <!-- <link rel="stylesheet" type="text/css" href="/resources/css/mobile/bootstrap-datepicker.css" /> -->
 <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-<link rel="stylesheet" type="text/css" href="/resources/css/mobile/style.css?ver=1.5" />
+<link rel="stylesheet" type="text/css" href="/resources/css/mobile/style.css?ver=1.6" />
 <link rel="stylesheet" type="text/css" href="/resources/css/mobile/jquery.modal.css" />
 
 

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

@@ -18,7 +18,9 @@ $( function(){
 
     // native 앱 locale 설정 
     // menu페이지 로딩완료시에 tonative 호출 
-    settingAppLocale();
+    if( setLocale != 'ko' ) {
+        settingAppLocale();
+    }
 });
 
 function searchingDevice() {

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

@@ -587,12 +587,12 @@ button.not-accept{background-color:#CCCCCC !important;}
 .diagnosis-wrap .checkbox input + label {display: flex; align-items: center; justify-content: center; margin: 0 auto 7px; width: 56px; height: 56px; border-radius: 100%; background-color: #fff; font-size: 18px; font-weight: bold; color: #999; user-select: none; cursor: pointer;}
 .diagnosis-wrap .checkbox input[checked] + label, .diagnosis-wrap .checkbox input:checked + label {box-shadow: inset 0px 0px 0px 2px #3A71CB; background-color: #B0DBEC; color: #3A71CB;} 
 .diagnosis-wrap .checkbox span {display: inline-block; font-size: 11px; line-height: 1.28; letter-spacing: -1px; color: #333;padding: 0 8px;word-break: keep-all;}
-.diagnosis-wrap .ar-text-left, .diagnosis-wrap .ar-text-right {padding: 0 36px; height: 40px; background-repeat: no-repeat; background-size: auto 40px; line-height: 39px; user-select: none;}
+.diagnosis-wrap .ar-text-left, .diagnosis-wrap .ar-text-right {padding: 0 36px;background-repeat: no-repeat; background-size: auto 40px; line-height: 39px; user-select: none;}
 .diagnosis-wrap .ar-text-left {margin-bottom: 12px; background-image: url(../../images/mobile/arr-decrease.svg); background-position: left center}
 .diagnosis-wrap .ar-text-right {margin-top: 12px; background-image: url(../../images/mobile/arr-increase.svg); background-position: right center; text-align: right;}
 .diagnosis-desc1 {padding: 12px; line-height: 1.428; background-color: rgba(87,135,201,0.1); color: #325C96;}
 .diagnosis-desc2 {line-height: 1.57; color: #5787C9;}
-.diagnosis-agree {display: flex; align-items: center; justify-content: space-between; margin-top: 12px; color: #5787C9;}
+.diagnosis-agree {align-items: center;margin-top: 12px; color: #5787C9;}
 .diagnosis-agree label {margin-right: 14px; color: #000;}
 .diagnosis-agree label span {margin-right: 6px !important;}
 .diagnosis-agree label:last-child {margin-right: 0;}