From 6b0e524ac485fc1a1c0544d824c6b978ed463295 Mon Sep 17 00:00:00 2001
From: kyebyungha <kbh@exciform.com>
Date: Tue, 8 Mar 2022 13:04:28 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8C=80=EC=86=8C=EB=B3=80=20=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

---
 .../bf_daily_nutrition/include_bf_nu_tp_6.ftl |   6 +-
 .../view_bf_daily_nutrition_2.ftl             | 186 ++++++++--------
 .../view_bf_daily_nutrition_6.ftl             | 208 +++++++++---------
 3 files changed, 200 insertions(+), 200 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_6.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_6.ftl
index 58e215e..4c06934 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_6.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_6.ftl
@@ -1,4 +1,8 @@
  <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
  <script type="text/javascript" src="/bf/m/js/jquery.bpopup.min.js"></script>
  <link rel="stylesheet" href="${URL_STATIC_ROOT}/m/css/jquery-ui.min.css">
-  
\ No newline at end of file
+<style media="screen">
+    body {
+        background: #F4F5F5;
+    }
+</style>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_2.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_2.ftl
index feee9b6..8d18511 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_2.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_2.ftl
@@ -6,111 +6,111 @@
 				</div>			
 				<!-- //젖병 -->
 				<!-- nutrition_kinds -->
-            		<div id="nutrition_kinds" class="nutrition_kinds"> 
-            			<input type="hidden" id="input_date" name="input_date" placeholder="수유일자 입력" data-tit="수유일자">
-						<!-- 분유, 유축수유 탭 -->
-	                    <div class="milk_type">
-	                        <ul class="type_tab">
-	                         	<#if model['lm_lac_tp']? has_content>
-								    <#list model['lm_lac_tp'] as item>
-	                            	 	<li  data-tab="tab${item?counter}"  onclick="javascript:save.set('milk_tp', '${item['cd_no']}');" <#if (model['rm']['milk_tp']?exists && model['rm']['milk_tp'] == item['cd_no'] )  >class="current"</#if>><a href="javascript:void(0);">${item['title']}</a></li>
-	                            	</#list>
-								</#if>
-	                        </ul>
-	                    </div>
-	                    <!-- //분유, 유축수유 탭 -->
+        		<div id="nutrition_kinds" class="nutrition_kinds"> 
+        			<input type="hidden" id="input_date" name="input_date" placeholder="수유일자 입력" data-tit="수유일자">
+					<!-- 분유, 유축수유 탭 -->
+                    <div class="milk_type">
+                        <ul class="type_tab">
+                         	<#if model['lm_lac_tp']? has_content>
+							    <#list model['lm_lac_tp'] as item>
+                            	 	<li  data-tab="tab${item?counter}"  onclick="javascript:save.set('milk_tp', '${item['cd_no']}');" <#if (model['rm']['milk_tp']?exists && model['rm']['milk_tp'] == item['cd_no'] )  >class="current"</#if>><a href="javascript:void(0);">${item['title']}</a></li>
+                            	</#list>
+							</#if>
+                        </ul>
+                 </div>
+                 <!-- //분유, 유축수유 탭 -->
                     	
-                    <!-- 분유 / 유축수유 -->
-                    <div>
-                        <!-- 섭취시간 -->
-                        <div class="take_time w_div">
-                            <div class="sound_icon">
-                                <button type="button">
-                                    <img src="../img/nutrition/ico_sound_on_black_18.png" alt="">
-                                </button>
-                                <button type="button">
-                                    <img src="../img/nutrition/ico_sound_off_black_18.png" alt="">
-                                </button>
-                            </div>
-    
-                            <div class="flex">
-                                <button type="button" class="border_btn" onclick="pauseTime();" >잠시멈춤</button>
-                                <div class="bg_border" onclick="pauseTime();setTimer();">
-                                    <div class="bg_full">
-                                        <p>섭취시작</p>
-                                        <span id="timer">00:00</span>
-                                    </div>
+                 <!-- 분유 / 유축수유 -->
+                 <div>
+                    <!-- 섭취시간 -->
+                    <div class="take_time w_div">
+                        <div class="sound_icon">
+                            <button type="button">
+                                <img src="../img/nutrition/ico_sound_on_black_18.png" alt="">
+                            </button>
+                            <button type="button">
+                                <img src="../img/nutrition/ico_sound_off_black_18.png" alt="">
+                            </button>
+                        </div>
+
+                        <div class="flex">
+                            <button type="button" class="border_btn" onclick="pauseTime();" >잠시멈춤</button>
+                            <div class="bg_border" onclick="pauseTime();setTimer();">
+                                <div class="bg_full">
+                                    <p>섭취시작</p>
+                                    <span id="timer">00:00</span>
                                 </div>
-                                <button type="button" class="border_btn" onclick="stopTime();" >완료</button>
                             </div>
+                            <button type="button" class="border_btn" onclick="stopTime();" >완료</button>
                         </div>
-                        <!-- //섭취시간 -->
-    
-                        <!-- 시간 -->
-                        <div class="time_result w_div">
-                            <div class="time_div">
-                                <div class="border_b_input">
-                                    <input type="text" id="iptbm" name="iptbm" value="${model['rm']['bm']!}" readonly />
-                                    <p>분</p>
-                                </div>
-                                <div class="border_b_input">
-                                    <input type="text" id="iptbs" name="iptbs" value="${model['rm']['bs']!}" readonly />
-                                    <p>초</p>
-                                </div>
+                    </div>
+                    <!-- //섭취시간 -->
+
+                    <!-- 시간 -->
+                    <div class="time_result w_div">
+                        <div class="time_div">
+                            <div class="border_b_input">
+                                <input type="text" id="iptbm" name="iptbm" value="${model['rm']['bm']!}" readonly />
+                                <p>분</p>
                             </div>
-    
-                            <div class="time_btn_div">
-                                <button type="button" class="border_btn" onclick="addTime(-5);">-5분</button>
-                                <button type="button" class="border_btn" onclick="addTime(-1);">-1분</button>
-                                <button type="button" class="border_btn" onclick="addTime(1);">1분</button>
-                                <button type="button" class="border_btn" onclick="addTime(5);">5분</button>
+                            <div class="border_b_input">
+                                <input type="text" id="iptbs" name="iptbs" value="${model['rm']['bs']!}" readonly />
+                                <p>초</p>
                             </div>
                         </div>
-                        <!-- //시간 -->
-    
-                        <!-- 분유 입력 -->
-                        <div class="milk_input w_div">
-                            <p class="record_title">* 분유를 입력해주세요.</p>
-                            <div class="milk_sel" id="prd_nm">${model['rm']['prd_nm']!}</div>
-                            <div class="milk_search_div">
-                                <input type="text" id="milk_search" name="milk_search" placeholder="분유 검색창" onkeydown="JavaScript:if(event.keyCode == 13){frmLacMilk.go_search();return;}">
-                                <button type="button" class="g_search_btn" onclick="frmLacMilk.go_search();" >검색</button>
-                            </div>
-                            <div class="milk_sel">분유을 선택 하세요.</div>
-                            <ul id="ul_board">
-                            
-                            </ul>
-                            
+
+                        <div class="time_btn_div">
+                            <button type="button" class="border_btn" onclick="addTime(-5);">-5분</button>
+                            <button type="button" class="border_btn" onclick="addTime(-1);">-1분</button>
+                            <button type="button" class="border_btn" onclick="addTime(1);">1분</button>
+                            <button type="button" class="border_btn" onclick="addTime(5);">5분</button>
                         </div>
-                        <!-- //분유 입력 -->
-    
-                        <!-- 수유량 -->
-                        <div class="take_amount w_div">
-                            <div class="amount_div">
-                                <p class="record_title">수유량</p>
-    
-                                <div class="po_div">
-                                    <div class="border_b_input">
-                                        <input type="text" id="ipteat_qty" name="ipteat_qty" value="${model['rm']['eat_qty']!}" readonly />
-                                        <p>ml</p>
-                                    </div>
+                    </div>
+                    <!-- //시간 -->
+
+                    <!-- 분유 입력 -->
+                    <div class="milk_input w_div">
+                        <p class="record_title">* 분유를 입력해주세요.</p>
+                        <div class="milk_sel" id="prd_nm">${model['rm']['prd_nm']!}</div>
+                        <div class="milk_search_div">
+                            <input type="text" id="milk_search" name="milk_search" placeholder="분유 검색창" onkeydown="JavaScript:if(event.keyCode == 13){frmLacMilk.go_search();return;}">
+                            <button type="button" class="g_search_btn" onclick="frmLacMilk.go_search();" >검색</button>
+                        </div>
+                        <div class="milk_sel">분유을 선택 하세요.</div>
+                        <ul id="ul_board">
+                        
+                        </ul>
+                        
+                    </div>
+                    <!-- //분유 입력 -->
+
+                    <!-- 수유량 -->
+                    <div class="take_amount w_div">
+                        <div class="amount_div">
+                            <p class="record_title">수유량</p>
+
+                            <div class="po_div">
+                                <div class="border_b_input">
+                                    <input type="text" id="ipteat_qty" name="ipteat_qty" value="${model['rm']['eat_qty']!}" readonly />
+                                    <p>ml</p>
                                 </div>
                             </div>
-    
-                            <div class="time_btn_div">
-                                <button type="button" class="border_btn" onclick="addLac(-10);">-10ml</button>
-                                <button type="button" class="border_btn" onclick="addLac(-5);">-5ml</button>
-                                <button type="button" class="border_btn" onclick="addLac(5);">5ml</button>
-                                <button type="button" class="border_btn" onclick="addLac(10);">10ml</button>
-                                <button type="button" class="border_btn" onclick="addLac(20);">20ml</button>
-                            </div>
-    
-                            <p class="small_note">* 섭취량 미 입력 시 영양점수에 반영되지 않습니다.</p>
                         </div>
-                        <!-- //수유량 -->
+
+                        <div class="time_btn_div">
+                            <button type="button" class="border_btn" onclick="addLac(-10);">-10ml</button>
+                            <button type="button" class="border_btn" onclick="addLac(-5);">-5ml</button>
+                            <button type="button" class="border_btn" onclick="addLac(5);">5ml</button>
+                            <button type="button" class="border_btn" onclick="addLac(10);">10ml</button>
+                            <button type="button" class="border_btn" onclick="addLac(20);">20ml</button>
+                        </div>
+
+                        <p class="small_note">* 섭취량 미 입력 시 영양점수에 반영되지 않습니다.</p>
                     </div>
-                    <!-- //분유 // 유축수유량-->
-                 </div>
+                    <!-- //수유량 -->
+                </div>
+                <!-- //분유 // 유축수유량-->
+             </div>
  
     <div id="milkPopup" class="Pstyle">
  	  <span class="b-close">X</span>
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 45a8561..fdcd44b 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,103 +1,101 @@
 <#include "/m/bf_daily_nutrition/include_top.ftl">
-  				
-				<!-- 대소변 -->
-				<div class="kinds_tabcont">
+ 		<!-- 대소변 -->
+		<div class="kinds_tabcont">
 <#include "/m/bf_daily_nutrition/include_bf_nu_tp_6.ftl">
-				</div>			
-				<!-- //대소변 -->
-  				
-  				  <!-- nutrition_kinds_basic -->
-                         <!-- nutrition_kinds_basic -->
-                        <div class="nutrition_kinds_basic nutrition_kinds_toilet">
-                            <h2>대변 또는 소변을 선택해주세요.</h2>
-                            <ul class="nutrition_list_reason nutrition_list_reason_half li_check" id="rest_type">
-								<#if model['lm_rest_tp']? has_content>
-								    <#list model['lm_rest_tp'] as item>
-										<li onclick="javascript:save.set('rest_tp', '${item['cd_no']}');" <#if model['rm']['rest_tp']?exists && model['rm']['rest_tp'] == item['cd_no']>class="active"</#if>>${item['title']}</li>
-									</#list>
-								</#if>
-                            </ul>
-                        </div>
-                        <!-- //nutrition_kinds_basic -->
+		</div>			
+		<!-- //대소변 --> 
+       <!-- nutrition_kinds_basic -->
+         <!-- nutrition_kinds_basic -->
+        <div class="nutrition_kinds_basic nutrition_kinds_toilet">
+            <h2>대변 또는 소변을 선택해주세요.</h2>
+            <ul class="nutrition_list_reason nutrition_list_reason_half li_check" id="rest_type">
+				<#if model['lm_rest_tp']? has_content>
+				    <#list model['lm_rest_tp'] as item>
+						<li onclick="javascript:save.set('rest_tp', '${item['cd_no']}');" <#if model['rm']['rest_tp']?exists && model['rm']['rest_tp'] == item['cd_no']>class="active"</#if>>${item['title']}</li>
+					</#list>
+				</#if>
+            </ul>
+        </div>
+        <!-- //nutrition_kinds_basic -->
 
-                        <!-- nutrition_kinds_feces 대변 -->
-                        <div class="nutrition_kinds_feces">
+        <!-- nutrition_kinds_feces 대변 -->
+        <div class="nutrition_kinds_feces">
 
-                            <!-- nutrition_kinds_basic -->
-                            <div class="nutrition_kinds_basic nutrition_kinds_toilet">
-                                <h2>대변 색을 선택해주세요.</h2>
-                                <div class="graph_txt_color_feces">
-                                <#if model['lm_rest_feces_color']? has_content>
-								    <#list model['lm_rest_feces_color'] as item>
-										 <span class="graph_txt_${item['val_1']!}">${item['title'!]}</span>
-									</#list>
-								</#if>
-                                </div>
+            <!-- nutrition_kinds_basic -->
+            <div class="nutrition_kinds_basic nutrition_kinds_toilet">
+                <h2>대변 색을 선택해주세요.</h2>
+                <div class="graph_txt_color_feces">
+                <#if model['lm_rest_feces_color']? has_content>
+				    <#list model['lm_rest_feces_color'] as item>
+						 <span class="graph_txt_${item['val_1']!}">${item['title'!]}</span>
+					</#list>
+				</#if>
+                </div>
 
-                                <!-- 배변량 slider-->
-                                <div id="slider2"></div>
-                                <!-- //배변량 slider -->
+                <!-- 배변량 slider-->
+                <div id="slider2"></div>
+                <!-- //배변량 slider -->
 
-                            </div>
-                            <!-- //nutrition_kinds_basic -->
-						</div>
-                        <!-- //nutrition_kinds_feces 대변 --> 
-                        
-                        
-                        <!-- nutrition_kinds_pee 소변 -->
-                        <div class="nutrition_kinds_pee">
-                            <!-- nutrition_kinds_basic -->
-                            <div class="nutrition_kinds_basic">
-                                <h2>소변 색을 선택해주세요.</h2>
-                                <div class="graph_txt_color_pee">
-                                    <#if model['lm_rest_pee_color']? has_content>
-									    <#list model['lm_rest_pee_color'] as item>
-											 <span class="graph_txt_${item['val_1']!}">${item['title'!]}</span>
-										</#list>
-									</#if>
-                                </div>
+            </div>
+            <!-- //nutrition_kinds_basic -->
+		</div>
+        <!-- //nutrition_kinds_feces 대변 --> 
+        
+        
+        <!-- nutrition_kinds_pee 소변 -->
+        <div class="nutrition_kinds_pee">
+            <!-- nutrition_kinds_basic -->
+            <div class="nutrition_kinds_basic">
+                <h2>소변 색을 선택해주세요.</h2>
+                <div class="graph_txt_color_pee">
+                    <#if model['lm_rest_pee_color']? has_content>
+					    <#list model['lm_rest_pee_color'] as item>
+							 <span class="graph_txt_${item['val_1']!}">${item['title'!]}</span>
+						</#list>
+					</#if>
+                </div>
 
-                                <!-- 배변량 slider-->
-                                <div id="slider3"></div>
-                                <!-- //배변량 slider -->
+                <!-- 배변량 slider-->
+                <div id="slider3"></div>
+                <!-- //배변량 slider -->
 
-                            </div>
-                            <!-- //nutrition_kinds_basic -->
-                        </div>
-                        <!-- //nutrition_kinds_pee -->
-                        
-                        <!-- nutrition_kinds_basic --> 
-                         <div class="nutrition_kinds_basic">
-                                <h2>배변량을 선택해주세요.</h2>
-                                <div class="graph_txt_amount">
-                                <#if model['lm_rest_qty']? has_content>
-								    <#list model['lm_rest_qty'] as item>
-										 <span class="graph_txt_${item['val_1']!}">${item['title'!]}</span>
-									</#list>
-								</#if>
-                                </div>  
-                                <!-- 배변량 slider-->
-                                <div id="slider4"></div>   
-                                <!-- //배변량 slider -->  
-                          </div> 
-                        <!-- //nutrition_kinds_basic -->
-                  
-                      <!-- nutrition_kinds_basic --> 
-                     <div class="nutrition_kinds_basic nutrition_kinds_degree">
-                        <h2>배변정도를 선택해주세요.</h2>
-                        <div class="graph_txt_amount">
-                        <#if model['lm_rest_feces_degree']? has_content>
-						    <#list model['lm_rest_feces_degree'] as item>
-								 <span class="graph_txt_${item['val_1']!}">${item['title'!]}</span>
-							</#list>
-						</#if>
-                        </div>  
-                        <!-- 배변정도 slider-->
-                        <div id="slider5"></div>   
-                        <!-- //배변정도 slider -->  
-                      </div> 
-                    <!-- //nutrition_kinds_basic --> 
-<script>
+            </div>
+            <!-- //nutrition_kinds_basic -->
+        </div>
+        <!-- //nutrition_kinds_pee -->
+        
+        <!-- nutrition_kinds_basic --> 
+         <div class="nutrition_kinds_basic">
+                <h2>배변량을 선택해주세요.</h2>
+                <div class="graph_txt_amount">
+                <#if model['lm_rest_qty']? has_content>
+				    <#list model['lm_rest_qty'] as item>
+						 <span class="graph_txt_${item['val_1']!}">${item['title'!]}</span>
+					</#list>
+				</#if>
+                </div>  
+                <!-- 배변량 slider-->
+                <div id="slider4"></div>   
+                <!-- //배변량 slider -->  
+          </div> 
+        <!-- //nutrition_kinds_basic -->
+  
+          <!-- nutrition_kinds_basic --> 
+         <div class="nutrition_kinds_basic nutrition_kinds_degree">
+            <h2>배변정도를 선택해주세요.</h2>
+            <div class="graph_txt_amount">
+            <#if model['lm_rest_feces_degree']? has_content>
+			    <#list model['lm_rest_feces_degree'] as item>
+					 <span class="graph_txt_${item['val_1']!}">${item['title'!]}</span>
+				</#list>
+			</#if>
+            </div>  
+            <!-- 배변정도 slider-->
+            <div id="slider5"></div>   
+            <!-- //배변정도 slider -->  
+          </div> 
+        <!-- //nutrition_kinds_basic --> 
+<script> 
 	function init(){
 		var active = $("#rest_type").children("[class=active]").html();
 		if(active=='소변'){  // 19 : 대변 , 20: 소변
@@ -128,7 +126,7 @@
         $(".nutrition_kinds_feces").hide();
          $(".nutrition_kinds_degree").hide();
     });
-    
+   
     // 클래스 추가 삭제시
     $(".li_check>li").click(function(e) {
         e.stopPropagation();
@@ -147,7 +145,7 @@
             $(this).addClass("active");
         }
     });
-
+ 
     // 이미지 변경시
     $(".li_check_img>li").click(function(e) {
         e.stopPropagation();
@@ -178,7 +176,6 @@
     // 상단시계 am&pm on,off 효과
     $(".nutrition_time_ampm span").click(function(e) {
         e.stopPropagation();
-
         if (!$(this).hasClass("active")) {
             $(".nutrition_time_ampm span.active").removeClass("active");
             $(this).addClass("active");
@@ -203,13 +200,13 @@
         }
     });
 
+
     $('#slider1').slider({
         // 슬라이더바 이하값 색 강조
         range: 'min', // max 로 설정시 이상값 강조
-
         min: 0,
-        max: 100,
-        value: ${model['rm']['rest_qty']!},
+        max: 100, 
+        value: <#if model['rm']['rest_qty']?exists> ${model['rm']['rest_qty']!}<#else>0</#if>,
         step: 25,
         animate: true,
         change: function(event,ui){
@@ -218,8 +215,7 @@
         }
 
     });
-    
-    
+   
     //대변색
     $('#slider2').slider({
         // 슬라이더바 이하값 색 강조
@@ -227,7 +223,7 @@
 
         min: 0,
         max: 100,
-        value: <#if model['rm']['rest_tp']?exists && model['rm']['rest_tp'] == 19>${model['rm']['rest_color']!}<#else>0</#if>,
+        value: <#if model['rm']['rest_color']?exists>${model['rm']['rest_color']!}<#else>0</#if>,
         step: 25,
         animate: true,
         change: function(event,ui){
@@ -244,7 +240,7 @@
 
         min: 0,
         max: 100,
-        value: <#if model['rm']['rest_tp']?exists && model['rm']['rest_tp'] == 20>${model['rm']['rest_color']!}<#else>0</#if>,
+        value: <#if model['rm']['rest_color']?exists>${model['rm']['rest_color']!}<#else>0</#if>,
         step: 33.3333,
         animate: true,
         change: function(event,ui){
@@ -260,7 +256,7 @@
 
         min: 0,
         max: 100,
-        value: <#if model['rm']['rest_tp']?exists>${model['rm']['rest_qty']!}<#else>0</#if>,
+        value: <#if model['rm']['rest_qty']?exists>${model['rm']['rest_qty']!}<#else>0</#if>,
         step: 25,
         animate: true,
         change: function(event,ui){
@@ -275,15 +271,15 @@
 
         min: 0,
         max: 100,
-        value: <#if model['rm']['rest_tp']?exists && model['rm']['rest_tp'] == 19>${model['rm']['rest_degree']!}<#else>0</#if>,
+        value: <#if model['rm']['rest_degree']?exists>${model['rm']['rest_degree']!}<#else>0</#if>,
         step: 25,
         animate: true,
         change: function(event,ui){
         	var slider5 = $("#slider5").slider("value");
         	save.set('rest_degree',slider5);
         } 
-    }); 
-	
+    });  
+    
 </script>				 
 				
 <#include "/m/bf_daily_nutrition/include_bottom.ftl">
\ No newline at end of file