From 88c30ee8762453b85d78bcda133eccbee68f5a13 Mon Sep 17 00:00:00 2001
From: isol2011 <soi2011@naver.com>
Date: Mon, 4 Jul 2022 14:07:47 +0900
Subject: [PATCH] =?UTF-8?q?[=EC=B6=94=EA=B0=80]=20=EC=9E=A5=EB=B0=94?=
 =?UTF-8?q?=EA=B5=AC=EB=8B=88&=EC=B1=97=EB=B4=87=20=ED=94=8C=EB=A1=9C?=
 =?UTF-8?q?=ED=8C=85=20=EB=B2=84=ED=8A=BC:=20=EC=95=84=EA=B8=B0=EA=B1=B4?=
 =?UTF-8?q?=EA=B0=95=20->=20=EC=9E=90=EC=84=B8=ED=9E=88=EB=B3=B4=EA=B8=B0,?=
 =?UTF-8?q?=20=EC=84=B1=EC=9E=A5=EC=A0=90=EC=88=98=20=EC=9E=85=EB=A0=A5?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80,=20=EC=BB=A4=EB=AE=A4=EB=8B=88?=
 =?UTF-8?q?=ED=8B=B0=20=EA=B2=8C=EC=8B=9C=EA=B8=80=20=EB=82=B4=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=ED=91=9C=EC=8B=9C=EB=90=98=EC=A7=80=20=EC=95=8A?=
 =?UTF-8?q?=EC=9D=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../m/bf_board/M_Bf_boardController.java           | 10 ++++++++--
 .../backoffice/m/bf_food/M_Bf_foodController.java  |  8 ++++++++
 .../bf_growth_body/M_Bf_growth_bodyController.java | 14 ++++++++++----
 .../views/ftl/m/bf_board/view_bf_detail_board.ftl  |  2 ++
 .../views/ftl/m/bf_food/view_foodgroup_balance.ftl |  7 ++++++-
 .../views/ftl/m/bf_food/view_nutrition_balance.ftl |  5 +++++
 .../m/bf_growth_body/view_bf_growth_body_input.ftl |  5 +++++
 .../WEB-INF/views/ftl/m/include/cart_script.ftl    |  4 ++++
 8 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/backoffice/m/bf_board/M_Bf_boardController.java b/src/main/java/com/backoffice/m/bf_board/M_Bf_boardController.java
index 1831846..77fb306 100644
--- a/src/main/java/com/backoffice/m/bf_board/M_Bf_boardController.java
+++ b/src/main/java/com/backoffice/m/bf_board/M_Bf_boardController.java
@@ -234,6 +234,10 @@ public class M_Bf_boardController extends AbstractControllerManager {
 				ra.addFlashAttribute("call_native_login", "Y");
 				redirect_url = "redirect:/m/login/view_login.do";								
 			}else{
+				HttpSession session = request.getSession(false);
+				DataMap rm_mem = (DataMap) session.getAttribute(ConstantSystem.SESSION_RM_MEMBER);
+				DataMap rm_child = init_child(model, request, paramMap);
+
 				DataMap rm = bf_boardBo.select_bf_view_board(paramMap);
 		 		DataMap.putToModel(model, "rm", rm);
 		 		
@@ -244,8 +248,10 @@ public class M_Bf_boardController extends AbstractControllerManager {
 				DataMap.putToModel(model, "lm_pick_img", lm_pick_img); 
 				
 				List<DataMap> lm_comment = bf_boardBo.select_bf_board_comment_by_b_no(paramMap);	
-				DataMap.putToModel(model, "lm_comment", lm_comment); 
-				
+				DataMap.putToModel(model, "lm_comment", lm_comment);
+
+				DataMap.putToModel(model, "rm_mem", rm_mem);
+				DataMap.putToModel(model, "rm_child", rm_child);
 			}			
 		}catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();}
 
diff --git a/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java b/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java
index 114ebf7..b977f2a 100644
--- a/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java
+++ b/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java
@@ -1714,6 +1714,8 @@ public class M_Bf_foodController extends AbstractControllerManager{
 				ra.addFlashAttribute("call_native_login", "Y");
 				redirect_url = "redirect:/m/login/view_login.do";								
 			}else{
+				HttpSession session = request.getSession(false);
+				DataMap rm_mem = (DataMap) session.getAttribute(ConstantSystem.SESSION_RM_MEMBER);
 				// 아이
 				DataMap rm_child = init_child(model, request, paramMap);
 				DataMap.putToModel(model, "rm_child", rm_child);
@@ -1743,6 +1745,8 @@ public class M_Bf_foodController extends AbstractControllerManager{
 					DataMap.putToModel(model, "lights", lights);
 					DataMap.putToModel(model, "score", score);
 					DataMap.putToModel(model, "intake", intake);
+
+					DataMap.putToModel(model, "rm_mem", rm_mem);
 				}
 			}
 		}catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();}
@@ -1765,6 +1769,8 @@ public class M_Bf_foodController extends AbstractControllerManager{
 				ra.addFlashAttribute("call_native_login", "Y");
 				redirect_url = "redirect:/m/login/view_login.do";								
 			}else{
+				HttpSession session = request.getSession(false);
+				DataMap rm_mem = (DataMap) session.getAttribute(ConstantSystem.SESSION_RM_MEMBER);
 				// 아이
 				DataMap rm_child = init_child(model, request, paramMap);
 				DataMap.putToModel(model, "rm_child", rm_child);
@@ -1794,6 +1800,8 @@ public class M_Bf_foodController extends AbstractControllerManager{
 					DataMap.putToModel(model, "lights", lights);
 					DataMap.putToModel(model, "score", score);
 					DataMap.putToModel(model, "intake", intake);
+
+					DataMap.putToModel(model, "rm_mem", rm_mem);
 				}
 			}			
 		}catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();}
diff --git a/src/main/java/com/backoffice/m/bf_growth_body/M_Bf_growth_bodyController.java b/src/main/java/com/backoffice/m/bf_growth_body/M_Bf_growth_bodyController.java
index ce461c9..d667bf9 100644
--- a/src/main/java/com/backoffice/m/bf_growth_body/M_Bf_growth_bodyController.java
+++ b/src/main/java/com/backoffice/m/bf_growth_body/M_Bf_growth_bodyController.java
@@ -75,9 +75,13 @@ public class M_Bf_growth_bodyController extends AbstractControllerManager{
 				ra.addFlashAttribute("call_native_login", "Y");
 				redirect_url = "redirect:/m/login/view_login.do";
 			}else{
+				HttpSession session = request.getSession(false);
+				DataMap rm_mem_ = (DataMap) session.getAttribute(ConstantSystem.SESSION_RM_MEMBER);
+
 				// 아이
 				DataMap rm_child = init_child(model, request, paramMap);
-				
+				DataMap rm_child_ = init_child(model, request, paramMap);
+
 				if(RenaStringUtil.isNullOrEmpty(rm_child,"smc_no")) {
 					ra.addFlashAttribute("script_msg", "아이를 선택하세요");
 					redirect_url = "redirect:/m/index.do";
@@ -89,9 +93,11 @@ public class M_Bf_growth_bodyController extends AbstractControllerManager{
 					rm_child.put("age_y", (m / 12));
 					rm_child.put("age_m", (m % 12));
 					rm_child.put("m", m);
-					
-					DataMap.putToModel(model, "rm_child", rm_child);
-					
+
+					DataMap.putToModel(model, "rm_child_", rm_child_);
+					DataMap.putToModel(model, "rm_mem_", rm_mem_);
+
+
 					// 2. 측정 기록 LIST
 					int rowMax = bf_growth_bodyBO.select_bf_growth_body_list_count(paramMap);
 					initPage(paramMap, ROW_COUNT, PAGE_COUNT, rowMax); // check page count
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_board/view_bf_detail_board.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_board/view_bf_detail_board.ftl
index 44f4a10..50ac3e2 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/bf_board/view_bf_detail_board.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_board/view_bf_detail_board.ftl
@@ -829,6 +829,8 @@
         
     		  
    </script>
+	<#include "/m/include/chatbot_script.ftl">
+
 	<!-- 하단 네비 iyu_nav -->
 	<#include "/m/include/index_bottom_menu.ftl"> 
 	<!-- //iyu_nav -->
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_foodgroup_balance.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_foodgroup_balance.ftl
index 3104efc..dbc08df 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_foodgroup_balance.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_foodgroup_balance.ftl
@@ -261,7 +261,12 @@
 	        <!-- //main_nutrition -->
 	
 	    </div>
-	    <!-- //wrap -->   
+	    <!-- //wrap -->
+
+		<!-- float_cart -->
+		<div class="float_cart">
+		<#include "/m/include/cart_script.ftl">
+		<#include "/m/include/chatbot_script.ftl">
 	
 	    	<!-- 하단 네비 iyu_nav -->
 		<#include "/m/include/index_bottom_menu.ftl"> 
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_nutrition_balance.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_nutrition_balance.ftl
index 06a5aa0..4f5710f 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_nutrition_balance.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_nutrition_balance.ftl
@@ -300,6 +300,11 @@
     </div>
     <!-- //wrap -->
 
+    <!-- float_cart -->
+    <div class="float_cart">
+    <#include "/m/include/cart_script.ftl">
+    <#include "/m/include/chatbot_script.ftl">
+
     	<!-- 하단 네비 iyu_nav -->
 	<#include "/m/include/index_bottom_menu.ftl"> 
 		<!-- //iyu_nav -->
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 5a61761..21cc61d 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
@@ -128,6 +128,11 @@
 			</div>
 		</main>
 	</div>
+
+	<!-- float_cart -->
+	<div class="float_cart">
+	<#include "/m/include/cart_script.ftl">
+	<#include "/m/include/chatbot_script_.ftl">
 	
 		<!-- 하단 네비 iyu_nav -->
 <#include "/m/include/index_bottom_menu.ftl"> 
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/include/cart_script.ftl b/src/main/webapp/WEB-INF/views/ftl/m/include/cart_script.ftl
index d5fc8d2..5f9d900 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/include/cart_script.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/include/cart_script.ftl
@@ -19,6 +19,10 @@
 </div>
 <!-- //modal-wrapper -->
 
+<style>
+    .swal2-container{z-index: 9999999}
+</style>
+
 <script>
     //카트 상세 정보 팝업
     function fncCartPop() {