From 01943656a23431f0765b72fe65e9ea2cb8dedc90 Mon Sep 17 00:00:00 2001 From: kyebyungha Date: Mon, 14 Feb 2022 00:14:04 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AA=A8=EC=9C=A0=20=EB=B0=8F=20=EA=B0=84?= =?UTF-8?q?=EC=8B=9D=20=EC=88=98=EC=A0=95=20=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../m/bf_food/M_Bf_foodController.java | 58 ++- .../m/bf_food/com.backoffice.m.bf_food.xml | 17 +- .../bf_daily_nutrition/include_bf_nu_tp_3.ftl | 4 +- .../WEB-INF/views/ftl/m/bf_food/index.ftl | 6 +- .../views/ftl/m/bf_food/list_bf_milk.ftl | 21 +- .../views/ftl/m/bf_food/list_bf_snak.ftl | 399 ++++++++++++++++++ .../views/ftl/m/include/index_bottom_menu.ftl | 5 +- 7 files changed, 487 insertions(+), 23 deletions(-) create mode 100644 src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_snak.ftl 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 8dd1cb2..ed6f9eb 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 @@ -1293,6 +1293,7 @@ public class M_Bf_foodController extends AbstractControllerManager{ DataMap.putToModel(model, "rm_child", rm_child); // 2. 측정 기록 LIST + paramMap.put("table","tbl_bf_breast_feed"); int rowMax = bf_foodBO.select_db_lac_milk_list_count(paramMap); initPage(paramMap, ROW_COUNT, PAGE_COUNT, rowMax); // check page count @@ -1373,7 +1374,7 @@ public class M_Bf_foodController extends AbstractControllerManager{ if(RenaStringUtil.isNullOrEmpty(dm_no)) { result.put("RESULT", ConstantResultCode.RESULT_NEED_PARAMS); }else { - bf_foodBO.delete_bf_lac_milk_single(paramMap); + bf_foodBO.delete_bf_lac_milk_single(paramMap); result.put("RESULT", ConstantResultCode.RESULT_SUCCESS); } } @@ -1459,6 +1460,61 @@ public class M_Bf_foodController extends AbstractControllerManager{ return result; } + /** + * 자녀 간식 리스트 - + * @param model + * @param request + * @param response + * @param redirectAttributes + * @return + */ + @RequestMapping(value="list_bf_snak") + public String list_bf_snak(@ModelAttribute("model") ModelMap model, HttpServletRequest request, + HttpServletResponse response , RedirectAttributes ra ) { + HttpSession session = request.getSession(false); + DataMap paramMap = gmUtil.getDataMapFromRequest(request); + String redirect_url = "m/bf_food/list_bf_snak"; + + try { + boolean is_login = gmUtil.setSessionForMobileMember(request, paramMap); + if(is_login == false) { + ra.addFlashAttribute("call_native_login", "Y"); + redirect_url = "redirect:/m/login/view_login.do"; + }else{ + // 아이 + DataMap rm_child = init_child(model, request, paramMap); + + rm_child = bf_family_babyBO.select_bf_family_baby(paramMap); + int m = DateUtil.getDistanceByTwoMonth(RenaStringUtil.getData(rm_child, "birthday"), DateUtil.getDateString(DateUtil.F_YYYYMMDDDash), DateUtil.F_YYYYMMDDDash); + 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); + + // 2. 측정 기록 LIST + paramMap.put("table","tbl_bf_snak_feed"); + int rowMax = bf_foodBO.select_db_lac_milk_list_count(paramMap); + initPage(paramMap, ROW_COUNT, PAGE_COUNT, rowMax); // check page count + + List lm_lac_milk = bf_foodBO.select_db_lac_milk_list(paramMap); + DataMap.putToModel(model, "lm_lac_milk", lm_lac_milk); + + paramMap.put("memo_fg_cd", "1"); + List lm_memo = bf_foodBO.select_memo_list(paramMap); + DataMap.putToModel(model, "lm_memo", lm_memo); + + gmUtil.redirectParam(model, paramMap); + + } + }catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();} + + gmUtil.redirectParam(model, paramMap); + + return redirect_url; + } + + @RequestMapping(value="view_bf_home_input") public String view_bf_home_input(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response , RedirectAttributes ra) { diff --git a/src/main/resources/sqlmap/m/bf_food/com.backoffice.m.bf_food.xml b/src/main/resources/sqlmap/m/bf_food/com.backoffice.m.bf_food.xml index 52d8a59..4e69e5b 100644 --- a/src/main/resources/sqlmap/m/bf_food/com.backoffice.m.bf_food.xml +++ b/src/main/resources/sqlmap/m/bf_food/com.backoffice.m.bf_food.xml @@ -389,7 +389,7 @@ ,dm_second ,dm_lac ,reg_dt - FROM tbl_bf_breast_feed + FROM $table$ WHERE 1=1 AND smc_no =#smc_no# )x @@ -399,12 +399,12 @@ - INSERT tbl_bf_breast_feed + INSERT $table$ ( smc_no ,dm_fg_cd ,dm_minute @@ -427,6 +427,12 @@ + + DELETE + FROM $table$ + WHERE dm_no = #dm_no# + + INSERT tbl_db_memo ( member_id @@ -445,11 +451,6 @@ - - DELETE - FROM tbl_bf_breast_feed - WHERE dm_no = #dm_no# - DELETE diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_3.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_3.ftl index d6bf02e..61de82a 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_3.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_3.ftl @@ -32,11 +32,13 @@

제공량을 선택해주세요

    + +
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/index.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/index.ftl index 058f759..225697f 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/index.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/index.ftl @@ -59,7 +59,11 @@ 모유

- +

+ + 간식 + +

시중에파는 이유식 diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_milk.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_milk.ftl index 2eff8c0..00a8007 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_milk.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_milk.ftl @@ -258,15 +258,15 @@ ajax_insert_lac_milk: function(){ var data = {} - data.smc_no = $('#smc_no').val() - data.base_dt = moment( $('#input_date').val(),'YYYY. MM. DD' ).format('YYYYMMDD') - data.dm_fg_cd = $('#dm_fg_cd').val() - data.dm_minute = $('#dm_minute').val() - data.dm_second = $('#dm_second').val() - data.dm_minute = $('#dm_minute').val() - data.dm_lac = $('#dm_lac').val() - data.memo = $('#memo').val() - + data.smc_no = $('#smc_no').val(); + data.base_dt = moment( $('#input_date').val(),'YYYY. MM. DD' ).format('YYYYMMDD'); + data.dm_fg_cd = $('#dm_fg_cd').val(); + data.dm_minute = $('#dm_minute').val(); + data.dm_second = $('#dm_second').val(); + data.dm_minute = $('#dm_minute').val(); + data.dm_lac = $('#dm_lac').val(); + data.memo = $('#memo').val(); + data.table = "tbl_bf_snak_feed"; $.ajax({ url:'${URL_ROOT}/m/bf_food/ajax_insert_lac_milk.do?1=1', type:'post', @@ -291,7 +291,8 @@ if(!dm_no){return} var data = {} - data.dm_no = dm_no + data.dm_no = dm_no; + data.table = "tbl_bf_snak_feed"; Swal.fire({ text: "기록을 삭제하시겠습니까?", diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_snak.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_snak.ftl new file mode 100644 index 0000000..bbe97e7 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_snak.ftl @@ -0,0 +1,399 @@ +<#include "/m/include/index_top.ftl"> + + + + + + + + + + + + +<#assign thumb_path = (model['rm_child']['append_300_img_file'])!> +<#if thumb_path?has_content> + <#assign thumb_path="/file/get_img.do?mt_file_seq="+thumb_path > + <#if thumb_path?index_of("http") != 0><#assign thumb_path = URL_ROOT + thumb_path> +<#else> + <#if (model['rm_child']['gender'])! == 'F'> + <#assign thumb_path = '/bf/m/img/child/child_pic_04.png' > + <#else> + <#assign thumb_path = '/bf/m/img/child/child_pic_03.png' > + + + + + + +

+
+ +

${model['rm_child']['name']} 간식

+
+ + + +
+
+
+
+ +
+
+ +
+
${model['rm_child']['name']}
+
${model['rm_child']['age_y']!}세 ${model['rm_child']['age_m']!}개월
+
+
+
+

정보입력

+
+ +
+ +
+
+ +
+ + +
+ +
+ +
+ + 분 +
+
+ +
+ +
+ + 초 +
+
+ +
+ +
+ + ml +
+
+ +
+ +
+ +
+ + +
+ + +
+

+ ※ 입력하신 내용을 저장하시면 아래 목록에 추가됩니다. + ※ 동일한 날짜에 여러번 측정 혹은 입력하였을 시, 해당 날짜의 마지막 측정기록만 저장됩니다. +

+
+ <#if (model['lm_lac_milk'])??> +
+

간식 섭취 리스트

+
+ <#list model['lm_lac_milk'] as item> +
+
+
+
[${item['dm_fg_nm']}] ${item['dm_minute']?string('0')}분 / ${item['dm_second']?string('0')}초 + ${item['dm_lac']?string('0')}ml +
+
+
+ 입력일${item['reg_dt']?string('yyyy. MM. dd')} +
+
+ +
+ +
+ <#--페이지네이션--> +
    + <@b.Paging url="${URL_PATH}/list_bf_milk.do" + pageCount="${model['page']['pageCount']?c}" + rowCount="${model['page']['rowCount']?c}" + rowMax="${model['page']['rowMax']?c}" + nowPage="${model['page']['nowPage']?c}" + params="smc_no=${model['smc_no']}&is_search=${model['is_search']!}&search_col=${model['search_col']!}&search_text=${model['search_text']!}&search_col_dt=${model['search_col_dt']!}&search_s_dt=${model['search_s_dt']!}&search_e_dt=${model['search_e_dt']!}&return_url=${model['return_url']!}&" + + class_page_active=" active" + + is_prev_first="N" + is_next_end="N" + /> +
+
+ +
+
+
+ +
+ X +
+
+
+ <#if (model['lm_memo'])??> + + +
+
+
+
+ +
+ X +
+
+
+ 자주쓰는 표현을 등록 해보세요.
+ 최대 50자까지 쓸 수 있습니다.
+ 자주쓰는 표현은 설정에서 수정 및 삭제가 가능합니다. +
+
+ +
+
+ + +
+
+
+
+ + + +<#include "/m/include/index_bottom_menu.ftl"> + + + + + +--> + +<#include "/m/bf_growth_body/include_return_url.ftl"> + +<#include "/m/include/index_bottom.ftl"> \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/ftl/m/include/index_bottom_menu.ftl b/src/main/webapp/WEB-INF/views/ftl/m/include/index_bottom_menu.ftl index 0f4a64b..04de415 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/include/index_bottom_menu.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/include/index_bottom_menu.ftl @@ -1,19 +1,20 @@