From 1ae9260de2987fcc8712b14e5c6e1bced7485e03 Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Mon, 25 Apr 2022 23:30:43 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EC=B2=B4=ED=81=AC=EB=A6=AC=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=98=A4=EB=A5=98=EC=82=AC=ED=95=AD=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

---
 .idea/workspace.xml                           | 32 +++++++++++++------
 .../M_Bf_family_babyController.java           | 23 +++++++------
 .../backoffice/m/index/M_IndexController.java | 23 +++++++------
 .../com.backoffice.m.bf_daily_nutrition.xml   | 21 +++++++++---
 .../memory/com.backoffice.m.memory.memory.xml | 19 ++++++++---
 .../m/bf_family_baby/view_bf_family_baby.ftl  |  2 ++
 .../views/ftl/m/index/include_nochild.ftl     | 18 +++--------
 .../WEB-INF/views/ftl/m/index/index.ftl       |  7 +++-
 .../views/ftl/m/member_env/view_set_music.ftl |  2 +-
 .../views/ftl/m/memory/memory_week.ftl        | 11 +++----
 10 files changed, 101 insertions(+), 57 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ecbcad7..d966a3e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,13 +9,17 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="아이디 비밀번호 찾기 오류 수정">
+    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="아이디 저장기능 적용">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/index/M_IndexController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/index/M_IndexController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/include_nochild.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/include_nochild.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/m/html/4-4.회원가입-계정연동(ppt20).html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/m/html/4-4.회원가입-계정연동(ppt20).html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -234,7 +238,10 @@
       <workItem from="1650687202332" duration="1688000" />
       <workItem from="1650693305284" duration="10783000" />
       <workItem from="1650722240024" duration="593000" />
-      <workItem from="1650776418092" duration="21115000" />
+      <workItem from="1650776418092" duration="22940000" />
+      <workItem from="1650851675151" duration="3750000" />
+      <workItem from="1650880342548" duration="16000" />
+      <workItem from="1650881164110" duration="14717000" />
     </task>
     <task id="LOCAL-00001" summary="최초 커밋">
       <created>1645354476031</created>
@@ -544,7 +551,14 @@
       <option name="project" value="LOCAL" />
       <updated>1650801028670</updated>
     </task>
-    <option name="localTasksCounter" value="45" />
+    <task id="LOCAL-00045" summary="아이디 저장기능 적용">
+      <created>1650806994907</created>
+      <option name="number" value="00045" />
+      <option name="presentableId" value="LOCAL-00045" />
+      <option name="project" value="LOCAL" />
+      <updated>1650806994907</updated>
+    </task>
+    <option name="localTasksCounter" value="46" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -564,7 +578,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="index_bottom 공유관련 html 스크립트 분리-2" />
     <MESSAGE value="D-Day 관리기능 적용" />
     <MESSAGE value="D-Day 관리기능 적용-2" />
     <MESSAGE value="홈&gt;홈메이드 추천 이유식 퍼블리싱작업-1" />
@@ -589,6 +602,7 @@
     <MESSAGE value="- 기본음악파일 삭제불가처리" />
     <MESSAGE value="소셜회원가입 오류수정" />
     <MESSAGE value="아이디 비밀번호 찾기 오류 수정" />
-    <option name="LAST_COMMIT_MESSAGE" value="아이디 비밀번호 찾기 오류 수정" />
+    <MESSAGE value="아이디 저장기능 적용" />
+    <option name="LAST_COMMIT_MESSAGE" value="아이디 저장기능 적용" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyController.java b/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyController.java
index b7627df..65bc5ce 100644
--- a/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyController.java
+++ b/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyController.java
@@ -298,7 +298,7 @@ public class M_Bf_family_babyController extends AbstractControllerManager{
 		// 디폴트 요청한 아이
 		String smc_no = RenaStringUtil.getData(paramMap, "smc_no");
 	
-		if(lm_child != null) {
+		if(lm_child.size() > 0) {
 			for(DataMap rm_child2 : lm_child) {
 				String smc_no2 = RenaStringUtil.getData(rm_child2, "smc_no");
 				
@@ -326,25 +326,30 @@ public class M_Bf_family_babyController extends AbstractControllerManager{
 				DataMap.putToModel(model, "rm_child", rm_child);
 				session.setAttribute(ConstantSystem.SESSION_RM_CHILD, rm_child);
 			}
-		}	
-		
+		} else {
+			session.setAttribute(ConstantSystem.SESSION_RM_CHILD, null);
+//			List<DataMap> no_child = null;
+//			DataMap.putToModel(model, "lm_child", no_child);
+			rm_child = null;
+		}
+
 		if(rm_child != null) {
 			paramMap.copyFromDataMapByKeys(rm_child, new String[]{"smc_no"});
-			
+
 			// 선택된 아이 가장 먼저
 			List<DataMap> lm_child2 = new ArrayList<DataMap>();
 			lm_child2.add(rm_child);
-			
-			smc_no = RenaStringUtil.getData(rm_child, "smc_no");			
+
+			smc_no = RenaStringUtil.getData(rm_child, "smc_no");
 			for(DataMap rm_child2 : lm_child) {
 				String smc_no2 = RenaStringUtil.getData(rm_child2, "smc_no");
-				
+
 				if(smc_no2.equals(smc_no) == false) lm_child2.add(rm_child2);
 			}
-			
+
 			DataMap.putToModel(model, "lm_child", lm_child2);
 		}
-		
+
 		return rm_child;
 	}
 }
diff --git a/src/main/java/com/backoffice/m/index/M_IndexController.java b/src/main/java/com/backoffice/m/index/M_IndexController.java
index caaac72..66ddb9c 100644
--- a/src/main/java/com/backoffice/m/index/M_IndexController.java
+++ b/src/main/java/com/backoffice/m/index/M_IndexController.java
@@ -275,7 +275,7 @@ public class M_IndexController extends AbstractControllerManager{
 		// 디폴트 요청한 아이
 		String smc_no = RenaStringUtil.getData(paramMap, "smc_no");
 
-		if(lm_child != null) {
+		if(lm_child.size() > 0) {
 			for(DataMap rm_child2 : lm_child) {
 				String smc_no2 = RenaStringUtil.getData(rm_child2, "smc_no");
 				
@@ -303,25 +303,30 @@ public class M_IndexController extends AbstractControllerManager{
 				DataMap.putToModel(model, "rm_child", rm_child);
 				session.setAttribute(ConstantSystem.SESSION_RM_CHILD, rm_child);
 			}
-		}	
-		
+		} else {
+			session.setAttribute(ConstantSystem.SESSION_RM_CHILD, null);
+//			List<DataMap> no_child = null;
+//			DataMap.putToModel(model, "lm_child", no_child);
+			rm_child = null;
+		}
+
 		if(rm_child != null) {
 			paramMap.copyFromDataMapByKeys(rm_child, new String[]{"smc_no"});
-			
+
 			// 선택된 아이 가장 먼저
 			List<DataMap> lm_child2 = new ArrayList<DataMap>();
 			lm_child2.add(rm_child);
-			
-			smc_no = RenaStringUtil.getData(rm_child, "smc_no");			
+
+			smc_no = RenaStringUtil.getData(rm_child, "smc_no");
 			for(DataMap rm_child2 : lm_child) {
 				String smc_no2 = RenaStringUtil.getData(rm_child2, "smc_no");
-				
+
 				if(smc_no2.equals(smc_no) == false) lm_child2.add(rm_child2);
 			}
-			
+
 			DataMap.putToModel(model, "lm_child", lm_child2);
 		}
-		
+
 		return rm_child;
 	}
 	
diff --git a/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml b/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
index ff107b8..e9cb29f 100644
--- a/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
+++ b/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
@@ -381,7 +381,10 @@
 				 )
 				 WHEN cis_1.cd_no = 'BF_NU_TP_2' THEN
 				 (
-				     SELECT ifnull(concat(eat_qty, 'ml'),'') FROM tbl_bf_daily_nutrition_2 tn1 WHERE tn1.dn_no = x.dn_no
+					 SELECT ifnull(concat(ifnull(tn.prd_nm,''), ' ', eat_qty, 'ml'),'')
+					 FROM  tbl_bf_daily_nutrition_2 tn1
+					 LEFT OUTER JOIN tbl_db_nutrient tn ON tn1.db_dn_no = tn.dn_no
+					 WHERE   tn1.dn_no = x.dn_no
 				 )
 				 WHEN cis_1.cd_no = 'BF_NU_TP_3' THEN
 				 (
@@ -419,8 +422,18 @@
 				 )
 				 WHEN cis_1.cd_no = 'BF_NU_TP_9' THEN
 				 (
-					SELECT ifnull(concat(ifnull(tb.name, ''),' ', tn1.eat_qty, 'ml 섭취'), '') FROM tbl_bf_daily_nutrition_9 tn1
-					LEFT OUTER JOIN tbl_db_home_bf tb on tn1.db_dhb_no = tb.dhb_no
+					SELECT
+						concat(
+								case
+									when tn1.db_dhb_tp = 'sf' then ifnull(tb.name, '')
+									when tn1.db_dhb_tp = 'bf' then ifnull(tc.name, '')
+									end
+								,
+								tn1.eat_qty, 'ml 섭취'
+							)
+					FROM tbl_bf_daily_nutrition_9 tn1
+					LEFT OUTER JOIN tbl_db_home_sf tb on tn1.db_dhb_no = tb.dhb_no
+					LEFT OUTER JOIN tbl_db_home_bf tc on tn1.db_dhb_no = tc.dhb_no
 					WHERE tn1.dn_no = x.dn_no
 				 )
 				 WHEN cis_1.cd_no = 'BF_NU_TP_10' THEN
@@ -447,7 +460,7 @@
 				 )
 				 WHEN cis_1.cd_no = 'BF_NU_TP_15' THEN
 				 (
-					SELECT ifnull(temperature,'') FROM tbl_bf_daily_nutrition_15 tn1 WHERE tn1.dn_no = x.dn_no
+					SELECT concat(ifnull(etc_symptom,''), ' ', ifnull(temperature,'')) FROM tbl_bf_daily_nutrition_15 tn1 WHERE tn1.dn_no = x.dn_no
 				 )
 		END AS time_val
 		FROM
diff --git a/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml b/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml
index 5953a17..39ae3e1 100644
--- a/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml
+++ b/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml
@@ -219,9 +219,10 @@
 					 where tn1.dn_no = b.dn_no
 					)
 				when c.cd_no = 'BF_NU_TP_2' THEN
-					(select concat(eat_qty, 'ml')
+					(select ifnull(concat(ifnull(tn.prd_nm,''), ' ', eat_qty, 'ml'),'')
 					 from tbl_bf_daily_nutrition_2 tn1
-					 where tn1.dn_no = b.dn_no
+					 left outer join tbl_db_nutrient tn ON tn1.db_dn_no = tn.dn_no
+					 WHERE tn1.dn_no = b.dn_no
 					)
 				when c.cd_no = 'BF_NU_TP_3' THEN
 					(select
@@ -251,9 +252,17 @@
 					)
 				when c.cd_no = 'BF_NU_TP_9' THEN
 					(select
-						 concat(ifnull(tb.name, ''),' ', tn1.eat_qty, 'ml 섭취')
+						 concat(
+								 case
+									 when tn1.db_dhb_tp = 'sf' then ifnull(tb.name, '')
+									 when tn1.db_dhb_tp = 'bf' then ifnull(tc.name, '')
+									 end
+							 ,
+								 tn1.eat_qty, 'ml 섭취'
+							 )
 					 from tbl_bf_daily_nutrition_9 tn1
-							  left outer join tbl_db_home_bf tb on tn1.db_dhb_no = tb.dhb_no
+					 left outer join tbl_db_home_sf tb on tn1.db_dhb_no = tb.dhb_no
+					 left outer join tbl_db_home_bf tc on tn1.db_dhb_no = tc.dhb_no
 					 where tn1.dn_no = b.dn_no
 					)
 				when c.cd_no = 'BF_NU_TP_10' THEN
@@ -289,7 +298,7 @@
 					)
 				when c.cd_no = 'BF_NU_TP_15' THEN
 					(select
-						 temperature
+						 concat(ifnull(etc_symptom,''), ' ', ifnull(temperature,''))
 					 from tbl_bf_daily_nutrition_15 tn1
 					 where tn1.dn_no = b.dn_no
 					)
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl
index aa6f514..d4657b1 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl
@@ -193,6 +193,7 @@
 	// 날짜를 yyyy-mm-dd 형식으로 만들어 줌.
 	function date_mask(objValue) {
 		var v = objValue.replace("--", ".");
+			v = objValue.replace("..", ".");
 
 		if (v.match(/^\d{4}$/) !== null) {
 			v = v + '.';
@@ -201,6 +202,7 @@
 		}
 		v = v.replace(/[a-zA-Z]/g, "");
 		v = v.replace( /[\{\}\[\]\/?,;:|\)*~`!^\-_+<>@\#$%&\\\=\(\'\"]/gi, "");
+		v = v.replace(/ /gi, '');
 
 		return v;
 	}
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/index/include_nochild.ftl b/src/main/webapp/WEB-INF/views/ftl/m/index/include_nochild.ftl
index b77819e..c45f5fb 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/index/include_nochild.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/index/include_nochild.ftl
@@ -7,23 +7,14 @@
 						<div class="bxslider-wrapper" style="visibility: hidden; opacity: 0;">
 							<ul class="main_pofile_slider">
 								<li>
-									<div onclick="fncGoRegisterBaby()" style="cursor:pointer" class="main_pofile_txt">
-										<h2>아이를 등록하세요</h2>
+									<div style="cursor:pointer" class="main_pofile_txt">
+										<h2><a style="color:white;" href="${URL_ROOT}/m/bf_family_baby/view_bf_family_baby.do?return_url=list_bf_family_baby">아이를 등록하세요</a></h2>
 										<p>0세 0개월(남)</p>
 									</div>
 									<div class="main_pofile_img">
-										<p><a href="javascript:fncGoRegisterBaby()"><img src="${URL_STATIC_ROOT}/m/img/main/main_profile_img02.png" alt="프로필 사진" /></a></p>
+										<p><a href="${URL_ROOT}/m/bf_family_baby/view_bf_family_baby.do?return_url=list_bf_family_baby"><img src="${URL_STATIC_ROOT}/m/img/main/main_profile_img02.png" alt="프로필 사진" /></a></p>
 									</div>
 								</li>
-								<li>
-								<div onclick="fncGoRegisterBaby()" style="cursor:pointer"  class="main_pofile_txt">
-									<h2>아이를 등록하세요</h2>
-									<p>0세 0개월(남)</p>
-								</div>
-								<div class="main_pofile_img">
-									<p><a href="javascript:fncGoRegisterBaby()"><img src="${URL_STATIC_ROOT}/m/img/main/main_profile_img02.png" alt="프로필 사진" /></a></p>
-								</div>
-							</li>
 							</ul>
 						</div>
 						<!-- //main_pofile_slider -->
@@ -130,7 +121,8 @@
 
 </div>
 <script>
-	function fncGoRegisterBaby() {
+	function fncGoRegisterBaby(e) {
+		$(e).preventDefault();
 		location.href = "${URL_ROOT}/m/bf_family_baby/view_bf_family_baby.do?return_url=list_bf_family_baby";
 	}
 </script>
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl b/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
index 8e90ef6..dce6abb 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
@@ -2,7 +2,6 @@
 <link href="../css/custom.css?2" rel="stylesheet"  type="text/css" >
 <script src="../js/jquery.bxslider.js"></script>
 <script type="text/javascript" src="../js/masonry.pkgd.min.js"></script>
-<!-- <#--<script src="../js/jquery.bxslider.js"></script>--> -->
 <link rel="stylesheet" href="../css/swiper.min.css">
 <script src="../js/swiper.min.js"></script>
 
@@ -111,6 +110,12 @@
 														<#elseif item['diff_d_day'] gt 0>
 															${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
 														</#if>
+													<#elseif item['day365'] lt 0>
+														<#if item['diff_d_day'] gt 0>
+															${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
+														<#else>
+															설정된 D-Day가 없습니다.
+														</#if>
 													</#if>
 
 												</p>
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl
index b407bf5..cf11b7e 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl
@@ -185,7 +185,7 @@
 		$(".set_list_wrap").append("<div class='list_item item_order'>" +
 				"<div><input type='file' onchange='fn_M_my_fileSave(this);' name='file'></div>" +
 				"<div class='order_button'>" +
-					"<button type='button' onclick='fncRemove(this)'>" +
+					"<button type='button' base='N' onclick='fncRemove(this)'>" +
 						"<img style='width:18px;height:18px' src='../img/setting/delete_ico.png'/>" +
 					"</button>&nbsp;" +
 				    "<button type='button' name='mute_yn' value='N'>" +
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl b/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl
index a4ee208..7ea39d2 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl
@@ -52,11 +52,10 @@
         <!-- //컬러 박스 -->
 
         <!-- 날짜 -->
-        <div class="memory_date">
-          <a href="javascript:fncMoveDay('minus')"><img src="../img/xxxx_sprites/arrow_01_left.png" alt=""></a>
+        <div class="memory_date" style="height:106px">
+            <a href="javascript:fncMoveDay('minus')"><img src="../img/xxxx_sprites/arrow_01_left02.png" alt=""></a>
             ${model['rm_mem']['today']!}(${model['rm_mem']['day']!})
-          <a href="javascript:fncMoveDay('plus')"><img src="../img/xxxx_sprites/arrow_01_right.png" alt=""></a>
-        </div>
+            <a href="javascript:fncMoveDay('plus')"><img src="../img/xxxx_sprites/arrow_01_right.png" alt=""></a></div>
         <!-- //날짜 -->
 
         <!-- 그래프 -->
@@ -191,7 +190,7 @@
 
 <#--            <div class="time_bar02" style="top:57%;">-->
 <#--              <span></span>-->
-<#--              <img src="../../img/time_bar.png" alt="">-->
+<#--              <img src="../img/time_bar.png" alt="">-->
 <#--            </div>-->
           </div>
 
@@ -221,7 +220,7 @@
         <!--// 그래프 -->
 
         <div class="fix_icon">
-            <#--          <button type="button"><img src="../img/ico_image_grey_24.png" alt=""></button>-->
+                      <button type="button"><img src="../img/ico_image_grey_24.png" alt=""></button>
             <button id="share-list" type="button"><img style="cursor:pointer" src="../img/ico_share_grey_24.png" alt=""></button>
         </div>
     </div>

From df48633ee1b0ff58621de539f9f78eed4691df3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=A0=95=EC=9D=B4=EC=86=94?= <isol2011@imcloud.co.kr>
Date: Mon, 25 Apr 2022 23:44:03 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=ED=8D=BC=EB=B8=94=EB=A6=AC=EC=8B=B1=208-14?=
 =?UTF-8?q?.=EC=84=A4=EC=A0=95=ED=95=98=EA=B8=B0-=EC=9D=8C=EC=95=85?=
 =?UTF-8?q?=EC=84=A4=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               | 33 +++++++
 .../8-14.설정하기-음악설정.html       | 92 +++++++++++++++++++
 2 files changed, 125 insertions(+)
 create mode 100644 src/main/webapp/m/html/setting/8-14.설정하기-음악설정.html

diff --git a/src/main/webapp/m/css/style.css b/src/main/webapp/m/css/style.css
index 2c764ee..8341ca9 100644
--- a/src/main/webapp/m/css/style.css
+++ b/src/main/webapp/m/css/style.css
@@ -4693,6 +4693,10 @@ main {
     align-items: center;
 }
 
+.item_order .select_music {
+    width: 15rem;
+}
+
 .item_add {
     position: relative;
     height: 45px;
@@ -15172,6 +15176,23 @@ main.sona_cont_measurement {
     margin-bottom: 20px;
 }
 
+.m_set_recode_order .list_cont01 {
+    width: 100%;
+    border: 0.12rem solid #FF9C01;
+    border-radius: 7px;
+    margin-bottom: 20px;
+}
+
+.m_set_recode_order .list_cont01 .item_add {
+    position: relative;
+    height: 45px;
+    line-height: 45px;
+    padding: 0;
+    margin-bottom: 0;
+    display: flex;
+    justify-content: center;
+}
+
 .m_set_recode_order .list {
     border-bottom: 1px solid #7070703b;
 }
@@ -15225,6 +15246,18 @@ main.sona_cont_measurement {
     border-radius: 7px;
 }
 
+.favorite_word .btn_cont {
+    display: flex;
+    min-width: 150px;
+}
+
+.favorite_word .btn {
+    padding: 7px 12px;
+    border: 1px solid #999;
+    border-radius: 7px;
+    margin-left: 10px;
+}
+
 /* 10.이유식 */
 .main_bf_food {
     display: flex;
diff --git a/src/main/webapp/m/html/setting/8-14.설정하기-음악설정.html b/src/main/webapp/m/html/setting/8-14.설정하기-음악설정.html
new file mode 100644
index 0000000..613afb7
--- /dev/null
+++ b/src/main/webapp/m/html/setting/8-14.설정하기-음악설정.html
@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<!--[if IE 8]> <html lang="ko" class="ie8"> <![endif]-->
+<!--[if !IE]><!-->
+<html lang="ko">
+<!--<![endif]-->
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover" /> 
+
+    <title>이유식당</title>
+    
+    <link href="../../css/style.css?1" rel="stylesheet"  type="text/css" >
+    <script src="../../js/jquery-3.3.1.min.js"></script>
+</head>
+
+<body><!--grey_bg / blue_w_bg /blue_g_bg-->
+
+    <div class="wrap">
+		<header class="header_wrapper">
+			<a href="javascript:back.return_url()" class="side_Lbtn hidden pre_btn">이전으로</a>
+			<h1 class="header_title">음악 설정</h1>
+			<a href="#" class="side_Rbtn hidden"></a>
+		</header>
+		<main class="m_set_recode_order favorite_word">
+			<div class="cont">
+			    <form id="frmUpdate" name="frmUpdate" method="post" onsubmit="return false">
+                    <div class="list_cont" id="list_cont">
+                        <div id="word_list">
+                            <div class="set_list_wrap list">
+                                <div name="list_item" class="item_order flex_box">
+                                    <div>기본음악 1</div>
+                                    <input type="hidden" name="record_list" value="${item['cd_no']!}">
+                                    <div class="btn" onclick="">음소거</div>
+                                </div>
+                                <div name="list_item" class="item_order flex_box">
+                                    <div>기본음악 2</div>
+                                    <input type="hidden" name="record_list" value="${item['cd_no']!}">
+                                    <div class="btn" onclick="">음소거</div>
+                                </div>
+                                <div name="list_item" class="item_order flex_box">
+                                    <div>기본음악 3</div>
+                                    <input type="hidden" name="record_list" value="${item['cd_no']!}">
+                                    <div class="btn" onclick="">음소거</div>
+                                </div>
+                                <div name="list_item" class="item_order flex_box">
+                                    <div>기본음악 4</div>
+                                    <input type="hidden" name="record_list" value="${item['cd_no']!}">
+                                    <div class="btn" onclick="">음소거</div>
+                                </div>
+                                <div name="list_item" class="item_order flex_box">
+                                    <div>기본음악 5</div>
+                                    <input type="hidden" name="record_list" value="${item['cd_no']!}">
+                                    <div class="btn" onclick="">음소거</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="list_cont01">
+                        <div class="item_add" onclick="fncAddItem(this)"><img src="../../img/setting/add_circle_ico.png" /></div>
+                    </div>
+                    <div class="info">
+                        * 텍스트를 눌러 표현을 수정하거나 버튼을 눌러 삭제할 수 있습니다.
+                    </div>
+					<button type="submit" id="" name="" class="btns blue_btn save">저장</button>
+				</form>
+			</div>		
+		</main>
+	</div>
+    <script>
+    
+        function fncAddItem() {
+            $(".list").append(
+                "<div name='list_item' class='item_order flex_box'>" +
+                    "<div class='select_music'><input type='file' accept='audio/*'' onchange='fn_M_my_fileSave(this);' name='file'></div>" +
+                    "<input type='hidden' name='record_list' value='${item['cd_no']!}'>" +
+                    "<div class='btn_cont'>" +
+                        "<div class='btn' onclick='fncRemove(this)'>삭제</div>" +
+                        "<div class='btn' onclick=''>음소거</div>" +
+                    "</div>" +
+                "</div>"
+            );
+        }
+    
+        function fncRemove(e) {
+            $(e).parent().parent().remove();
+        }
+    </script>
+</body>
+
+</html> 
\ No newline at end of file