From db866dca5295296e434fc7ad69c8de0eda494e72 Mon Sep 17 00:00:00 2001
From: isol2011 <soi2011@naver.com>
Date: Wed, 4 May 2022 14:40:58 +0900
Subject: [PATCH 1/5] =?UTF-8?q?=ED=8D=BC=EB=B8=94=EB=A6=AC=EC=8B=B1=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20-=20=EC=B6=94=EC=B2=9C=20=EC=8B=9D?=
 =?UTF-8?q?=EC=9E=AC=EB=A3=8C=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20style=20?=
 =?UTF-8?q?=EC=9B=90=EB=B3=B5=20=EB=B0=8F=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?=
 =?UTF-8?q?=EC=9E=98=EB=A6=AC=EC=A7=80=20=EC=95=8A=EA=B2=8C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/m/css/style.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/m/css/style.css b/src/main/webapp/m/css/style.css
index 51fc7d5..e25a2ae 100644
--- a/src/main/webapp/m/css/style.css
+++ b/src/main/webapp/m/css/style.css
@@ -9202,9 +9202,11 @@ p.selectbox {
 
 .nutrition_introduce_img_big img {
     display: inherit;
-    width: 100%;
+    width: 70%;
     max-width: 500px;
     margin: 0 auto;
+    object-fit: contain;
+    -o-object-fit: contain;
 }
 
 .nutrition_introduce_img_big span {

From 68d51e80f9228b748cae60ed1c847ec1e13ceec7 Mon Sep 17 00:00:00 2001
From: kyebyungha <kbh@exciform.com>
Date: Wed, 4 May 2022 14:55:05 +0900
Subject: [PATCH 2/5] =?UTF-8?q?05/04=20=20=EC=84=B1=EC=9E=A5=EA=B8=B0?=
 =?UTF-8?q?=EB=A1=9D=20=EB=B6=80=EB=B6=84=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com.backoffice.m.bf_growth_body.xml       | 25 ++++++++++++-------
 .../ftl/m/bf_daily_nutrition/include_top.ftl  |  2 +-
 .../view_bf_growth_body_input.ftl             |  4 +--
 src/main/webapp/m/css/style.css               |  5 ++--
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/main/resources/sqlmap/m/bf_growth_body/com.backoffice.m.bf_growth_body.xml b/src/main/resources/sqlmap/m/bf_growth_body/com.backoffice.m.bf_growth_body.xml
index a0d98fe..5ecc48d 100644
--- a/src/main/resources/sqlmap/m/bf_growth_body/com.backoffice.m.bf_growth_body.xml
+++ b/src/main/resources/sqlmap/m/bf_growth_body/com.backoffice.m.bf_growth_body.xml
@@ -139,6 +139,22 @@
 		</isNotEmpty>
     </select>
     
+    <select id="select_bf_growth_body_list_count"  resultClass="Integer" parameterClass="dataMap">
+		SELECT count(*) 
+		FROM tbl_bf_growth_body x
+		INNER JOIN tbl_bf_family_match y on x.smc_no = y.smc_no
+	 	INNER JOIN tbl_bf_family_baby smc  on x.smc_no = smc.smc_no
+		WHERE 1 =1
+		  AND y.member_id = #member_id#
+		  AND x.smc_no = #smc_no#
+	 	  AND x.smc_no = smc.smc_no
+	 	  AND DATE_ADD(smc.birthday, INTERVAL +60 MONTH) <![CDATA[>=]]> x.base_dt 
+	 	 <isNotEmpty property="sgb_no">
+	 	 	AND x.sgb_no = #sgb_no#
+	 	 </isNotEmpty>	 
+			 
+    </select>
+    
     <select id="select_bf_growth_body_last_by_sgb_no" resultClass="dataMap" parameterClass="dataMap">
 		SELECT 
 			 x.sgb_no
@@ -166,15 +182,6 @@
 		
 		LIMIT 0, 1
     </select>
-    
-    <select id="select_bf_growth_body_list_count" resultClass="Integer" parameterClass="dataMap">
-		SELECT COUNT(*)
-		FROM tbl_bf_growth_body x
-		INNER JOIN tbl_bf_family_match y on x.smc_no = y.smc_no
-		WHERE 1 =1
-		AND y.member_id = #member_id#
-	    AND x.smc_no = #smc_no# 
-    </select>
 
     <select id="select_bf_growth_body_by_base_dt" resultClass="dataMap" parameterClass="dataMap">
 		SELECT x.*
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_top.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_top.ftl
index 21e0be1..1c87f1e 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_top.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_top.ftl
@@ -212,8 +212,8 @@
         }
     });
 
-    /*********Camera 및 사진 업로드*********/
     $(function() {
+  		  /*********Camera 및 사진 업로드*********/
         // 사진 삭제
         $(document).on('click', '#btn_delImg01, #btn_delImg02, #btn_delImg03', function(){
              var imgSeq = this.id.replace('btn_delImg','');
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_growth_body/view_bf_growth_body_input.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_growth_body/view_bf_growth_body_input.ftl
index 659598a..207abc4 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/bf_growth_body/view_bf_growth_body_input.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_growth_body/view_bf_growth_body_input.ftl
@@ -50,7 +50,7 @@
 					<div class="p_header_pic">
 						<div class="pic hidden" style="background: url(${thumb_path})">프로필 사진</div>
 						<div class="child_tit">
-							<div class="name"><a href="javascript:CMD_MEASUREMENT_HEIGHT('${model['rm_child']['smc_no']}');">${model['rm_child']['name']}</a></div>
+							<div class="name">${model['rm_child']['name']}</a></div>
 							<div class="age">${model['rm_child']['age_y']!}세 ${model['rm_child']['age_m']!}개월</div>
 						</div>
 					</div>
@@ -111,7 +111,7 @@
 					</div>
 					<#--페이지네이션-->
 					<ul class="pagination">
-						<@b.Paging url="${URL_PATH}/view_bf_growth_body_input.do"
+						<@b.Paging url="${URL_PATH}/m/bf_growth_body/view_bf_growth_body_input.do"
 						pageCount="${model['page']['pageCount']?c}"
 						rowCount="${model['page']['rowCount']?c}"
 						rowMax="${model['page']['rowMax']?c}"
diff --git a/src/main/webapp/m/css/style.css b/src/main/webapp/m/css/style.css
index 51fc7d5..75c74b5 100644
--- a/src/main/webapp/m/css/style.css
+++ b/src/main/webapp/m/css/style.css
@@ -1385,8 +1385,8 @@ main {
 
 .result_num_box .result_num {
     color: #004A71;
-    font-size: 1.4375rem;
-    line-height: 1.4375rem;
+    font-size: 1.0rem;
+    line-height: 1.0rem;
     font-weight: 500;
 }
 
@@ -15261,7 +15261,6 @@ main.sona_cont_measurement {
 }
 
 /* 8-14.설정하기-음악설정 */
-{}
 
 /* 8-15.설정하기-카테고리수정 */
 .m_set_recode_order {

From 0dbc42ae23c328b9b1918357081ef05030e5ebf1 Mon Sep 17 00:00:00 2001
From: isol2011 <soi2011@naver.com>
Date: Wed, 4 May 2022 14:56:46 +0900
Subject: [PATCH 3/5] =?UTF-8?q?=ED=8D=BC=EB=B8=94=EB=A6=AC=EC=8B=B1=20ftl?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95=20-=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?=
 =?UTF-8?q?=ED=95=98=EB=8B=A8=EC=97=90=20#F4F5F5=20=EC=83=89=EC=83=81?=
 =?UTF-8?q?=EC=9D=B4=20body=20height=20100%=EC=9D=B4=EC=83=81=EC=9D=84=20?=
 =?UTF-8?q?=EC=B0=A8=EC=A7=80=ED=95=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/ftl/m/bf_board/list_bf_board.ftl   | 6 ------
 src/main/webapp/WEB-INF/views/ftl/m/include/index_top.ftl   | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_board/list_bf_board.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_board/list_bf_board.ftl
index 6d14e4d..863f1c0 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/bf_board/list_bf_board.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_board/list_bf_board.ftl
@@ -5,12 +5,6 @@
 <script src="${URL_STATIC_ROOT}/m/js/jquery_popupoverlay.js"></script>
 <script src="${URL_STATIC_ROOT}/m/js/design.js"></script>
 
-<style media="screen">
-  body{
-    background: #F4F5F5;
-  }
-</style>
-
 <body>
 
     <!-- wrap -->
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/include/index_top.ftl b/src/main/webapp/WEB-INF/views/ftl/m/include/index_top.ftl
index 71a37c7..d399122 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/include/index_top.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/include/index_top.ftl
@@ -34,7 +34,7 @@
 	<script src="${URL_ROOT}/m/js/anypicker.min.js"></script>
 
     <style media="screen">
-        body {-webkit-tap-highlight-color:transparent,  -webkit-backface-visibility: hidden, overflow: hidden; background: #F4F5F5; }  
+        body {-webkit-tap-highlight-color:transparent,  -webkit-backface-visibility: hidden, overflow: hidden; }  
 		html {
 		    -webkit-touch-callout:none;
 		    -webkit-user-select:none;

From ebd2cdc512ec23dab1ddb01d9aaa1b47583d2093 Mon Sep 17 00:00:00 2001
From: kyebyungha <kbh@exciform.com>
Date: Wed, 4 May 2022 15:23:39 +0900
Subject: [PATCH 4/5] =?UTF-8?q?=EB=8C=80=EC=86=8C=EB=B3=80=20=ED=91=9C?=
 =?UTF-8?q?=EC=8B=9C=20=EB=B6=80=EB=B6=84=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/ftl/m/bf_daily_nutrition/include_top.ftl        | 2 +-
 .../m/bf_daily_nutrition/view_bf_daily_nutrition_6.ftl    | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_top.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_top.ftl
index 1c87f1e..ce3ecc8 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_top.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_top.ftl
@@ -21,7 +21,7 @@
             <h1 class="header_title">${model['rm']['nutirition_cd_no_title']!}</h1>
 			<div class="side_Rbtn">
                 <a onclick="javascript:del_daily_nutrition(${model['rm']['dn_no']!}, ${model['rm']['smc_no']!}, '${model['rm']['nutirition_cd_no']!}')"  class="nutrition_subMain_delete">
-                    <img src="${URL_STATIC_ROOT}/m/img/nutrition/nutrition_subMain_delete_ico.png" alt="휴지통 아이콘">
+                    <img src="${URL_ROOT}/m/img/nutrition/nutrition_subMain_delete_ico.png" alt="휴지통 아이콘">
                 </a>
             </div>
         </header>
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_6.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_6.ftl
index ea1abbf..2368e9a 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_6.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_6.ftl
@@ -1,4 +1,6 @@
 <#include "/m/bf_daily_nutrition/include_top.ftl">
+<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
+<link rel="stylesheet" href="${URL_ROOT}/m/css/jquery-ui.min.css">
  		<!-- 대소변 --> 
        <!-- nutrition_kinds_basic --> 
         <div class="nutrition_kinds_basic nutrition_kinds_toilet">
@@ -95,6 +97,7 @@
           </div> 
         <!-- //nutrition_kinds_basic --> 
 <script> 
+
 	function init(){
 		if('${model['rm']['rest_tp']!}' =='20'){  // 19 : 대변 , 20: 소변
 			 $(".nutrition_kinds_pee").show();
@@ -208,7 +211,7 @@
         }
     });
 
-
+/*
     $('#slider1').slider({
         // 슬라이더바 이하값 색 강조
         range: 'min', // max 로 설정시 이상값 강조
@@ -221,9 +224,8 @@
         	var slider1 = $("#slider1").slider("value");
         	save.set('rest_qty',slider1);
         }
-
     });
-   
+*/   
     //대변색
     $('#slider2').slider({
         // 슬라이더바 이하값 색 강조

From 1b555af8b372a89bb71fefb540f4ac233adad35a Mon Sep 17 00:00:00 2001
From: isol2011 <soi2011@naver.com>
Date: Wed, 4 May 2022 17:04:14 +0900
Subject: [PATCH 5/5] =?UTF-8?q?=ED=8D=BC=EB=B8=94=EB=A6=AC=EC=8B=B1=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20-=20=ED=82=A4=EC=B2=B4=EC=A4=91=20?=
 =?UTF-8?q?=EC=9E=85=EB=A0=A5=20=EB=B6=80=EB=B6=84=20wrap=20=ED=95=98?=
 =?UTF-8?q?=EB=8B=A8=20padding=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/m/css/style.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/webapp/m/css/style.css b/src/main/webapp/m/css/style.css
index 2dd7fb0..576e2e8 100644
--- a/src/main/webapp/m/css/style.css
+++ b/src/main/webapp/m/css/style.css
@@ -1451,6 +1451,10 @@ main {
     border: 1px solid #ddd;
 }
 
+.m_child_direct_input .profile_wrap {
+    padding-bottom: 65px;
+}
+
 .m_child_direct_input .profile_wrap .p_header_pic .pic {
     border: 2px solid #004A71 !important;
 }