dev_bert
jonghwan76 3 years ago
commit 08b7eae7de

@ -301,6 +301,7 @@ public class M_Bf_daily_nutritionController extends AbstractControllerManager{
paramMap.put("weight", cal.gettot_weight());
}
String dn_no = RenaStringUtil.getData(paramMap, "dn_no");
if(RenaStringUtil.isNullOrEmpty(RenaStringUtil.getData(paramMap, "dn_no")) == true){
@ -310,9 +311,7 @@ public class M_Bf_daily_nutritionController extends AbstractControllerManager{
paramMap.put("ERROR_MSG", "저장되었습니다");
}else{
redirect_url = "redirect:/m/index/index.do";
int result = bf_daily_nutritionBO.update_bf_daily_nutrition(paramMap);
if(result == 1) {
result = bf_daily_nutritionBO.insert_bf_daily_nutrition_memo(paramMap);
paramMap.put("ERROR_MSG", "반영되었습니다:" + result);
@ -320,7 +319,7 @@ public class M_Bf_daily_nutritionController extends AbstractControllerManager{
paramMap.put("ERROR_MSG", "반영되지 못했습니다:" + result);
}
}
}
}
}
}catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();}

@ -215,7 +215,11 @@
,x.db_dhb_no
,x.db_dhb_tp
,x.weight
,ifnull(bf.name,sf.name) as dhb_name
,(case when nvl(db_dhb_tp,'bf') = 'bf' then
bf.name
when db_dhb_tp = 'sf' then
sf.name
end ) as dhb_name
FROM tbl_bf_daily_nutrition_9 x
LEFT JOIN tbl_db_home_bf bf ON bf.dhb_no = x.db_dhb_no
LEFT JOIN tbl_db_home_sf sf ON sf.dhb_no = x.db_dhb_no
@ -227,7 +231,11 @@
<select id="select_lastest_nutrition_list_9" resultClass="dataMap" parameterClass="dataMap">
SELECT
x.db_dhb_no
,ifnull(bf.name,sf.name) as prd_nm
,(case when nvl(db_dhb_tp,'bf') = 'bf' then
bf.name
when db_dhb_tp = 'sf' then
sf.name
end ) prd_nm
,x.db_dhb_tp
,x.reg_dt
FROM tbl_bf_daily_nutrition_9 x
@ -252,6 +260,7 @@
,x.allergy
,x.allergy_cd_no
,x.db_dbc_no
,x.db_dbc_tp
,(case when nvl(db_dbc_tp,'bf') = 'bf' then
dn.prd_nm
when db_dbc_tp = 'sf' then
@ -1507,7 +1516,7 @@
SELECT x.*
,dv.dv_disease AS disease
,dv.dv_type AS type
,DATE_FORMAT(dn.reg_dt,'%Y.%m.%d') AS reg_dt
,DATE_FORMAT(max(dn.reg_dt),'%Y.%m.%d') AS reg_dt
FROM(
SELECT dvs_no
,dv_no
@ -1517,6 +1526,7 @@
)x
LEFT JOIN tbl_db_vac dv ON dv.dv_no = x.dv_no
LEFT JOIN tbl_bf_daily_nutrition_7 dn ON dn.db_dvs_no = x.dvs_no
group by dvs_no , dv_no , round , dv_disease , dv_type
</select>
<select id="select_homemade_list" resultClass="dataMap" parameterClass="dataMap">

@ -89,7 +89,7 @@ function ajax_data(keyword){
});
}else{
var ul_board = $('#ul_board');
ul_board.append("<li style=\"font-size:12px;\">조회되는 자료가 없습니다.</li>");
ul_board.append("<li style=\"font-size:15px;\">조회되는 자료가 없습니다.</li>");
}
is_loading = false;

@ -365,6 +365,9 @@
go_popup: function() {
$('#popup').addClass('open');
},
go_popup_search: function() {
$('#popup_search').addClass('open');
},
go_popup_self: function() {
$('#popup_self').addClass('open');
},

@ -73,7 +73,7 @@
<!-- nutrition_kinds_btn -->
<div class="nutrition_kinds_btn nutrition_common">
<a href="javascript:save.submit();" name="btnSave">기록하기</a>
<a href="javascript:save.submit();" name="btnSave">기록완료</a>
</div>
<!-- //nutrition_kinds_btn -->

@ -129,6 +129,18 @@
changeCSS('.iyu_nav ul .nav_list03 .icon','background','${model['rm']['color']!} url(../img/main/iyu_nav_ico03.png) no-repeat center/44% auto' );
changeCSS('.type_tab li.current', 'background-color', '${model['rm']['color']!}');
changeCSS('.type_tab', 'border','2px solid ${model['rm']['color']!}');
changeCSS('button.active','background', '${model['rm']['color']!}');
changeCSS('.blue_btn', 'background-color', '${model['rm']['color']!}');
// 대소변
changeCSS('.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default, .ui-button, html .ui-button.ui-state-disabled:hover, html .ui-button.ui-state-disabled:active',
'border','5px solid ${model['rm']['color']!}');
changeCSS('.nutrition_list_reason li.active', 'border','1px solid ${model['rm']['color']!}');
changeCSS('.nutrition_list_reason li.active', 'color','${model['rm']['color']!}');
changeCSS('.search_pre_input a.active','background', '${model['rm']['color']!}');
changeCSS('.stop_ok_div button.active','background', '${model['rm']['color']!}');
});
</script>

@ -70,6 +70,10 @@
<img src="../img/nutrition/nutrition_subMain_detail_ico.png" alt="">
검색
</div>
<div class="snack_sel" onclick="javascript:frmCommerce.go_popup_search();">
<img src="../img/nutrition/nutrition_subMain_detail_ico.png" alt="">
직접입력 시판이유식</a>
</div>
<div class="snack_sel" onclick="javascript:frmCommerce.go_popup_self();">
직접입력</a>
</div>
@ -143,12 +147,12 @@
<div class="modal_close_btn"><img src="../img/close_ico.png"></div>
</div>
<div class="content">
<div class="nutrition_kinds_basic">
<h2>시판이유식을 선택해주세요.</h2>
<div class="nutrition_memo">
<h2>직접입력 시판이유식을 선택해주세요.</h2>
<div class="nutrition_kinds_search">
<!-- 검색input -->
<p class="search_input">
<input type="text" id="prd_nm_search2" name="prd_nm_search2" placeholder="시판이유식 검색창" onkeydown="JavaScript:if(event.keyCode == 13){list_more2('Y');return;}" ><a href="javascript:list_more2('Y');">검색</a>
<input type="text" id="prd_nm_search2" name="prd_nm_search2" placeholder="직접입력 시판이유식 검색창" onkeydown="JavaScript:if(event.keyCode == 13){list_more2('Y');return;}" ><a href="javascript:list_more2('Y');">검색</a>
</p>
<!-- 검색결과 -->
<ul id="ul_board2" class="search_result">
@ -157,6 +161,7 @@
</div>
</div>
</div>
<div class="modal_layer"></div>
</div>
<script type="text/javascript">
@ -310,7 +315,10 @@
if(top > scrolHeight - 5) {
list_more2('N')
}
});
});
}else{
var ul_board = $('#ul_board2');
ul_board.append("<li style=\"font-size:15px;\">조회되는 자료가 없습니다.</li>");
}
is_loading = false;
@ -357,6 +365,7 @@
});
$("#selectbox01").text('g');
$("#srv_unit").val('g');
changeCSS('.snack_input .flex .snack_sel','width', '32%');
</script>

@ -71,6 +71,10 @@
<img src="../img/nutrition/nutrition_subMain_detail_ico.png" alt="">
검색
</div>
<div class="snack_sel" onclick="javascript:frmCommerce.go_popup_search();">
<img src="../img/nutrition/nutrition_subMain_detail_ico.png" alt="">
직접입력 간식</a>
</div>
<div class="snack_sel" onclick="javascript:frmCommerce.go_popup_self();">
직접입력
</div>
@ -136,6 +140,30 @@
<div class="modal_layer"></div>
</div>
<!-- //modal-wrapper -->
<div id="popup_search" class="modal-wrapper">
<div class="modal_content" style="width: 400px;">
<div class="head">
<div class="title"></div>
<div class="modal_close_btn"><img src="../img/close_ico.png"></div>
</div>
<div class="content">
<div class="nutrition_memo">
<h2>직접입력 간식을 선택해주세요.</h2>
<div class="nutrition_kinds_search">
<!-- 검색input -->
<p class="search_input">
<input type="text" id="prd_nm_search2" name="prd_nm_search2" placeholder="직접입력 간식 검색창" onkeydown="JavaScript:if(event.keyCode == 13){list_more2('Y');return;}" ><a href="javascript:list_more2('Y');">검색</a>
</p>
<!-- 검색결과 -->
<ul id="ul_board2" class="search_result">
</ul>
</div>
</div>
</div>
</div>
<div class="modal_layer"></div>
</div>
<script type="text/javascript">
@ -163,6 +191,87 @@
let dqi_cate = '짠과자';
<#include "/m/bf_daily_nutrition/include_ajax_data.ftl">
function list_more2(is_new) {
if(is_new == 'Y'){
nowPage = 0;
$('#ul_board2').empty();
}
var prd_nm_search2 = $('#prd_nm_search2').val();
ajax_data_self(prd_nm_search2);
}
function ajax_data_self(keyword){
if(keyword == ''){
Swal.fire({text: '검색어를 입력해주세요'});
}else{
if (is_loading == false) {
is_loading = true;
nextPage = (nowPage + 1);
$.ajax({
url:'${URL_ROOT}/m/bf_daily_nutrition/ajax_list_db_commerce_self.do',
type:'get',
data: {
"prd_nm" : keyword ,
"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 + '\', \'sf\' );">' + prd_nm + '</a></li>';
}
var ul_board2 = $('#ul_board2');
ul_board2.append(html);
ul_board2.on( 'scroll', function(){
var top =ul_board2.height() + ul_board2.prop("scrollTop");
var scrolHeight = ul_board2.prop("scrollHeight");
if(top > scrolHeight - 5) {
list_more2('N')
}
});
}else{
var ul_board = $('#ul_board2');
ul_board.append("<li style=\"font-size:15px;\">조회되는 자료가 없습니다.</li>");
}
is_loading = false;
}
});
}
}
}
function save_set(col, val, title, tp){
$('#prd_nm').text(title);
$('#db_dn_tp').val(tp);
@ -201,6 +310,7 @@
});
$("#selectbox01").text('g');
$("#srv_unit").val('g');
changeCSS('.snack_input .flex .snack_sel','width', '32%');
</script>
<#include "/m/bf_daily_nutrition/include_bottom.ftl">

@ -7,13 +7,17 @@
<!-- 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 class="milk_type">
<ul class="type_tab">
<#if model['lm_rest_tp']? has_content>
<#list model['lm_rest_tp'] as item>
<li data-tab="tab${item?counter}" onclick="javascript:save.set('rest_tp', '${item['cd_no']}');" <#if (model['rm']['rest_tp']?exists && model['rm']['rest_tp'] == item['cd_no'] ) >class="current"</#if>><a href="javascript:void(0);">${item['title']}</a></li>
</#list>
</#if>
</ul>
</div>
</div>
<!-- //nutrition_kinds_basic -->
@ -96,12 +100,20 @@
<!-- //nutrition_kinds_basic -->
<script>
function init(){
var active = $("#rest_type").children("[class=active]").html();
if(active=='소변'){ // 19 : 대변 , 20: 소변
if('${model['rm']['rest_tp']!}' =='20'){ // 19 : 대변 , 20: 소변
$(".nutrition_kinds_pee").show();
$(".nutrition_kinds_feces").hide();
$(".nutrition_kinds_degree").hide();
}
$(".type_tab>li").click(function (e) {
e.stopPropagation();
if (!$(this).hasClass("current")) {
$(this).siblings().removeClass("current");
$(this).addClass("current");
}
});
}
init();

@ -72,6 +72,10 @@
검색
</div>
<div class="snack_sel" onclick="javascript:frmCommerce.go_popup_search();">
<img src="../img/nutrition/nutrition_subMain_detail_ico.png" alt="">
내가만든 이유식</a>
</div>
<div class="snack_sel" onclick="javascript:frmCommerce.go_popup_self2();">
직접입력</a>
</div>
</div>
@ -153,10 +157,12 @@
<!-- 검색결과 -->
<ul id="ul_board1" class="search_result">
</ul>
<!--
<div class="no_list" onclick ="javascript:frmCommerce.go_popup_self2();">
<img src="../img/setting/add_circle_ico.png">
<p>새로등록 + 재료 추가</p>
</div>
-->
</div>
</div>
</div>
@ -166,51 +172,6 @@
<!-- modal-wrapper -->
<div id="popup_self" class="modal-wrapper">
<div class="modal_content" style="width: 400px;">
<div class="head">
<div class="title">홈메이드 이유식 명</div>
<div class="modal_close_btn"><img src="../img/close_ico.png"></div>
</div>
<div class="content">
<form id="frmUpdate" name="frmUpdate" method="post">
<input type="text" id="prd_nm_sch" name="prd_nm_sch" class="input_box" placeholder="이유식을 입력하세요">
<div class="con_margin">
<!-- 재료 있을 때 -->
<ul class="introduce_list_shopping">
<li>
<img src="../img/nutrition/homemade_img_ingredients_01.png" alt="식재료 이미지" />
<span class="tit">불린 쌀</span>
<div class="basket">
<span>20g</span>
<a href="javascript:void(0)" class="hidden">재료 담기</a>
</div>
</li>
<li>
<img src="../img/nutrition/homemade_img_ingredients_02.png" alt="식재료 이미지" />
<span class="tit">이름이길다길다길다</span>
<div class="basket">
<span>120g</span>
<a href="javascript:void(0)" class="hidden">재료 담기</a>
</div>
</li>
<li>
<div class="btn_add" onclick="fncAddItem(this)"><img src="../img/setting/add_circle_ico.png" /></div>
</li>
</ul>
<!-- 재료 없을 때 -->
<!-- <div class="no_list">
<img src="../img/setting/add_circle_ico.png">
<p>재료 추가</p>
</div> -->
</div>
<button type="button" id="" class="btns blue_btn" style="width: 100%">등록</button>
</form>
</div>
</div>
<div class="modal_layer"></div>
</div>
<!-- //modal-wrapper -->
<div id="popup_self2" class="modal-wrapper">
<div class="modal_content" style="width: 400px;">
@ -231,7 +192,7 @@
<input type="text" id="prd_nm_search2" name="prd_nm_search2" placeholder="식재료 검색창" onkeydown="JavaScript:if(event.keyCode == 13){list_more2('Y');return;}"><a href="javascript:list_more2('Y');">검색</a>
</p>
<!-- 검색결과 -->
<ul id="ul_board2" class="search_result introduce_list_shopping">
<ul id="ul_board2" class="search_result introduce_list_shopping" style="height:200px;">
</ul>
</div>
@ -475,7 +436,7 @@
});
}else{
var ul_board = $('#ul_board');
ul_board.append("<li style=\"font-size:12px;\">조회되는 자료가 없습니다.</li>");
ul_board.append("<li style=\"font-size:15px;\">조회되는 자료가 없습니다.</li>");
}
is_loading = false;
@ -548,7 +509,7 @@
});
}else{
var ul_board = $('#ul_board1');
ul_board.append("<li style=\"font-size:12px;\">조회되는 자료가 없습니다.</li>");
ul_board.append("<li style=\"font-size:15px;\">조회되는 자료가 없습니다.</li>");
}
is_loading = false;
@ -626,7 +587,7 @@
});
}else{
var ul_board = $('#ul_board2');
ul_board.append("<li style=\"font-size:12px;\">조회되는 자료가 없습니다.</li>");
ul_board.append("<li style=\"font-size:15px;\">조회되는 자료가 없습니다.</li>");
}
is_loading = false;
@ -688,6 +649,7 @@
});
$("#selectbox01").text('g');
$("#srv_unit").val('g');
changeCSS('.snack_input .flex .snack_sel','width', '32%');
</script>

@ -6913,7 +6913,7 @@ p.selectbox {
.nutrition_kinds_search .search_result {
overflow: auto;
height: 200px;
height: 400px;
border-radius: 5px;
box-shadow: 0 0 6px rgba(0, 0, 0, 0.2);
scrollbar-width: thin;

Loading…
Cancel
Save