[수정] 리스트 검색 로직 수정 및 오류 수정

기록 단에서 홈메이드, 시판, 간식, 분유 이유식 리스트 들어가면 요청
홈메이드 이유식, 시판 이유식 스크롤 내렸을 때 추가 요청
젖병 에서 popup 형식 변경

src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_10.ftl

@@ -163,8 +163,63 @@
      <div class="modal_layer"></div>
   </div>
   
-  <script type="text/javascript"> 
+  <script type="text/javascript">
-	 
+
+  	var frmCommerce = {
+		go_popup: function() {
+			$('#popup').addClass('open');
+			$.ajax({
+				url:'${URL_ROOT}/m/bf_daily_nutrition/ajax_list_db_commerce.do',
+				type:'get',
+				data: {
+					"nowPage":nextPage
+				},
+				dataType:'json',
+				error:function(request,status,error){
+					is_stop_more = false;
+				},
+				success:function(result){
+					var html = '';
+
+					nowPage = Number(result.page.nowPage);
+					maxPage = Number(result.page.maxPage);
+
+					$('#nowPage').text(nowPage);
+
+					if(nowPage == maxPage){
+						$('.more_btn_box').remove();
+					}
+
+					if(result.list != null && result.list.length > 0) {
+						for(var i=0;i<result.list.length;i++) {
+							var dbc_no = result.list[i].dbc_no;
+							var prd_nm = result.list[i].prd_nm;
+							var company = result.list[i].company;
+							var barcode = result.list[i].barcode;
+							var imgurl1 = result.list[i].imgurl1;
+							html +='<li><a href="javascript:save_set(\'db_dbc_no\', \'' + dbc_no + '\', \'' + prd_nm + '(' + company + ')' + '\', \'bf\');"><img src="' + imgurl1 + '" alt="섭취량 이미지" onerror="this.onerror=null;this.src=\'${URL_STATIC_ROOT}/m/db/homemade/bowl.png\'" />' + prd_nm + '(' + company + ')' + '</a></li>';
+						}
+
+						var ul_board = $('#ul_board');
+						ul_board.append(html);
+
+						ul_board.on( 'scroll', function(){
+							var top =ul_board.height() + ul_board.prop("scrollTop");
+							var scrolHeight = ul_board.prop("scrollHeight");
+
+							if(top > scrolHeight - 5) {
+								// list_more('N')
+							}
+						});
+					}
+
+					is_loading = false;
+
+				}
+			});
+		}
+	}
+
 	$(function(){
 	 	frmCommerce.init(); 
 	   	$("div.nutrition_kinds_basic02>div").find(".p_input_box>input").bind('input', function(event){ 

src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_2.ftl

@@ -66,7 +66,7 @@
                     <!-- //시간 -->
 
                     <!-- 분유 입력 -->
-                    <div class="milk_input w_div">
+                    <div class="milk_input w_div snack_input">
                         <p class="record_title">* (최근수유)분유를 선택해주세요.</p>
 
                         <#if model['lm_lastest_lac']? has_content>
@@ -75,14 +75,20 @@
                         	</#list>
 						</#if>
 
-                        <div class="milk_search_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;}">
+<#--                            <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>
+<#--                            <button type="button" class="g_search_btn" onclick="frmLacMilk.go_search();" >검색</button>-->
-                        </div>
+<#--                        </div>-->
                       <!--  <div class="milk_sel">분유을 선택 하세요.</div> -->
-                        <ul id="ul_board"> 
+<#--                        <ul id="ul_board"> -->
-                        </ul> 
+<#--                        </ul>-->
- 						 <div class="milk_sel" id="prd_nm" style="background: ${model['rm']['color']!}; color: white;">${model['rm']['prd_nm']!}</div>
+                        <div class="flex">
+                            <div class="snack_sel" onclick="javascript:frmLacMilk.go_milkpopup();" style="width: 100%">
+                                <img src="../img/nutrition/nutrition_subMain_detail_ico.png" alt="">
+                                검색
+                            </div>
+                        </div>
+                        <div class="milk_sel" id="prd_nm" style="background: ${model['rm']['color']!}; color: white;">${model['rm']['prd_nm']!}</div>
                         
                     </div>
                     <!-- //분유 입력 -->
@@ -114,30 +120,92 @@
                 </div>
                 <!-- //분유 // 유축수유량-->
              </div>
- 
+
-		    <div id="milkPopup" class="Pstyle">
+            <!-- modal-wrapper -->
-		 	  <span class="b-close">X</span>
+            <div id="milkPopup" class="modal-wrapper">
-			  <div class="content">
+                <div class="modal_content" style="width: 400px;">
-				<div class="nutrition_kinds_basic">
+                    <div class="head">
-					<h2>분유을 선택해주세요.</h2>
+                        <div class="title">분유</div>
-					<div class="nutrition_kinds_search">
+                        <div class="modal_close_btn"><img src="../img/close_ico.png"></div>
-						 <!-- 이전입력 -->
+                    </div>
-					 	<!-- 검색input -->
+                    <div class="content">
-						<p class="search_input">
+                        <div class="nutrition_memo">
-							<input type="text" id="milk_search" name="snak_search" placeholder="분유 검색창" ><a href="javascript:frmLacMilk.go_search();">검색</a>								
+                            <div class="nutrition_kinds_search">
-						</p>
+                                <!-- 검색input -->
-						<!-- 검색결과 -->
+                                <p class="search_input">
-						<ul id="ul_board_old" class="search_result">				
+                                    <input type="text" id="milk_search" name="milk_search" placeholder="분유 검색창" ><a href="javascript:frmLacMilk.go_search();">검색</a>
-						</ul>
+                                </p>
-					</div>
+                                <!-- 검색결과 -->
-				</div>
+                                <ul id="ul_board" class="search_result">
-			  </div>
+                                </ul>
-		    </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="modal_layer"></div>
+            </div>
+            <!-- //modal-wrapper -->
  	
 <script type="text/javascript">
 	 var frmLacMilk = {
     	go_milkpopup: function() {
-			$('#milkPopup').bPopup();
+			// $('#milkPopup').bPopup();
+            $('#milkPopup').addClass('open');
+            let dqi_cate = '분유';
+            nextPage = (nowPage + 1);
+
+            $.ajax({
+                url:'${URL_ROOT}/m/db/db_nutrient/ajax_list_db_nutrient.do',
+                type:'get',
+                data: {
+                    "dqi_cate" : dqi_cate ,
+                    "nowPage":nextPage
+                },
+                contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+                dataType:'json',
+                error:function(request,status,error){
+                    is_stop_more = false;
+                },
+                success:function(result){
+                    var html = '';
+
+                    nowPage = Number(result.page.nowPage);
+                    maxPage = Number(result.page.maxPage);
+
+                    $('#nowPage').text(nowPage);
+
+                    if(nowPage == maxPage){
+                        $('.more_btn_box').remove();
+                    }
+                    if(result.list != null && result.list.length > 0) {
+                        for(var i=0;i<result.list.length;i++) {
+                            var dn_no = result.list[i].dn_no;
+                            var prd_nm = result.list[i].prd_nm;
+                            var company = result.list[i].company;
+                            var barcode = result.list[i].barcode;
+                            var imgurl1 = result.list[i].imgurl1;
+                            html +='<li><a href="javascript:save_set(\'db_dn_no\', \'' + dn_no + '\', \'' + prd_nm + '(' + company + ')' + '\' ,\'bf\' );"><img src="' + imgurl1 + '" alt="섭취량 이미지" width="200px" onerror="this.onerror=null;this.src=\'${URL_STATIC_ROOT}/m/db/homemade/bowl.png\'" />' + prd_nm + '(' + company + ')' + '</a></li>';
+                        }
+
+                        var ul_board = $('#ul_board');
+                        ul_board.append(html);
+
+                        ul_board.on( 'scroll', function(){
+                            var top =ul_board.height() + ul_board.prop("scrollTop");
+                            var scrolHeight = ul_board.prop("scrollHeight");
+
+                            if(top > scrolHeight - 5) {
+                                // list_more('N')
+                            }
+                        });
+                    }else{
+                        var ul_board = $('#ul_board');
+                        ul_board.append("<li style=\"font-size:15px;\">조회되는 자료가 없습니다.</li>");
+                    }
+
+                    is_loading = false;
+                }
+            });
    		},
    		go_search: function() { 
    			var keyword = $("#milk_search").val();
@@ -282,7 +350,8 @@
 		$('#prd_nm').text(title);
 		$('#db_dn_no').val(val);
 		$('#ul_board').empty();
-	}
+        $('#milkPopup').removeClass('open');
+    }
 	
 	 
  </script>  

src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_3.ftl

@@ -165,6 +165,61 @@
 		var frmLacSnak = { 
 			go_snakpopup: function() {
 				$('#snakPopup').addClass("open");
+				let dqi_cate = '짠과자';
+				nextPage = (nowPage + 1);
+
+				$.ajax({
+					url:'${URL_ROOT}/m/db/db_nutrient/ajax_list_db_nutrient.do',
+					type:'get',
+					data: {
+						"dqi_cate" : dqi_cate ,
+						"nowPage":nextPage
+					},
+					contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+					dataType:'json',
+					error:function(request,status,error){
+						is_stop_more = false;
+					},
+					success:function(result){
+						var html = '';
+
+						nowPage = Number(result.page.nowPage);
+						maxPage = Number(result.page.maxPage);
+
+						$('#nowPage').text(nowPage);
+
+						if(nowPage == maxPage){
+							$('.more_btn_box').remove();
+						}
+						if(result.list != null && result.list.length > 0) {
+							for(var i=0;i<result.list.length;i++) {
+								var dn_no = result.list[i].dn_no;
+								var prd_nm = result.list[i].prd_nm;
+								var company = result.list[i].company;
+								var barcode = result.list[i].barcode;
+								var imgurl1 = result.list[i].imgurl1;
+								html +='<li><a href="javascript:save_set(\'db_dn_no\', \'' + dn_no + '\', \'' + prd_nm + '(' + company + ')' + '\' ,\'bf\' );"><img src="' + imgurl1 + '" alt="섭취량 이미지" width="200px" onerror="this.onerror=null;this.src=\'${URL_STATIC_ROOT}/m/db/homemade/bowl.png\'" />' + prd_nm + '(' + company + ')' + '</a></li>';
+							}
+
+							var ul_board = $('#ul_board');
+							ul_board.append(html);
+
+							ul_board.on( 'scroll', function(){
+								var top =ul_board.height() + ul_board.prop("scrollTop");
+								var scrolHeight = ul_board.prop("scrollHeight");
+
+								if(top > scrolHeight - 5) {
+									// list_more('N')
+								}
+							});
+						}else{
+							var ul_board = $('#ul_board');
+							ul_board.append("<li style=\"font-size:15px;\">조회되는 자료가 없습니다.</li>");
+						}
+
+						is_loading = false;
+					}
+				});
 	   		},
 	   		go_search: function() { 
 	   			var keyword = $("#snak_search").val();

src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_9.ftl

@@ -306,7 +306,62 @@
 		},
 		go_popup: function() {
 			$('#ul_board').empty();
-			$('#popup').addClass('open');
+			// $('#popup').addClass('open');
+			$.ajax({
+				url:'${URL_ROOT}/m/bf_daily_nutrition/ajax_list_db_homemade.do',
+				type:'get',
+				data: {
+					"nowPage": nextPage
+				},
+				dataType:'json',
+				error:function(request,status,error){
+					is_stop_more = false;
+					console.log("error!");
+				},
+				success:function(result){
+					var html = '';
+
+					nowPage = Number(result.page.nowPage);
+					maxPage = Number(result.page.maxPage);
+
+					$('#nowPage').text(nowPage);
+
+					if(nowPage == maxPage){
+						$('.more_btn_box').remove();
+					}
+
+					if(result.list != null && result.list.length > 0) {
+						for(var i=0;i<result.list.length;i++) {
+							var dhb_no = result.list[i].dhb_no;
+							var prd_nm = result.list[i].name;
+							var company = result.list[i].company;
+							var barcode = result.list[i].barcode;
+							var water_qty = (result.list[i].water_qty  ? '('+result.list[i].water_qty +')&nbsp;&nbsp;&nbsp;&nbsp;':'' );
+							var imgurl1 = "<img src=\"${URL_STATIC_ROOT}/m/db/ingre/"+result.list[i].dhb_cd+".png\"  onerror=\"this.src='${URL_STATIC_ROOT}/m/db/homemade/bowl.png';\">";
+
+							html +='<li><a href="javascript:save_set(\'db_dhb_no\', \'' + dhb_no + '\', \'' + prd_nm + '\', \'bf\');">'+ imgurl1 + water_qty + prd_nm + '</a></li>';
+						}
+
+						var ul_board = $('#ul_board');
+						ul_board.append(html);
+
+						ul_board.on( 'scroll', function(){
+							var top =ul_board.height() + ul_board.prop("scrollTop");
+							var scrolHeight = ul_board.prop("scrollHeight");
+
+							if(top > scrolHeight - 5) {
+								// list_more('N')
+							}
+						});
+					}else{
+						var ul_board = $('#ul_board');
+						ul_board.append("<li style=\"font-size:15px;\">조회되는 자료가 없습니다.</li>");
+					}
+
+					$('#popup').addClass('open');
+					is_loading = false;
+				}
+			});
    		},
    		go_popup_search: function() {
 			$('#popup_search').addClass('open');

src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_commerce_popup.ftl

@@ -154,7 +154,8 @@
     }  
 	
 	var ul_board = $('#ul_board');
-	$(window).scroll(function() {
+    var bf_list = $(".bf_search_list");
+	bf_list.scroll(function() {
 		if ($(window).scrollTop() + 500 >= ($(document).height() - $(window).height())){
 			list_more('N');
 		}

src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_popup.ftl

@@ -161,8 +161,9 @@
 	}
 
 	var ul_board = $('#ul_board');
-	$(window).scroll(function() {
+	var bf_list = $('.bf_search_list');
-		if ($(window).scrollTop() + 500 >= ($(document).height() - $(window).height())){
+	bf_list.scroll(function() {
+		if (bf_list.scrollTop() + 500 >=  bf_list.height()){
 			list_more('N');
 		}
 	});