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 ed6f9eb..cebd62f 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,7 +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"); + paramMap.put("table","tbl_bf_milk_feed"); int rowMax = bf_foodBO.select_db_lac_milk_list_count(paramMap); initPage(paramMap, ROW_COUNT, PAGE_COUNT, rowMax); // check page count @@ -1314,6 +1314,59 @@ public class M_Bf_foodController extends AbstractControllerManager{ return redirect_url; } + /** + * 자녀 모유수유 리스트 - + * @param model + * @param request + * @param response + * @param redirectAttributes + * @return + */ + @RequestMapping(value="list_bf_breast_milk") + public String list_bf_breast_milk(@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_breast_milk"; + + 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_breast_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; + } /** * 자녀 분유/유축수유 등록 - snut97 * @param model @@ -1356,6 +1409,60 @@ 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="ajax_delete_lac_milk", method=RequestMethod.POST) @ResponseBody public HashMap ajax_delete_lac_milk(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response @@ -1460,60 +1567,6 @@ 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 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 225697f..43978cb 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 @@ -55,10 +55,15 @@

- + 모유

+

+ + 젖병 + +

간식 diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_breast_milk.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_breast_milk.ftl new file mode 100644 index 0000000..c78eee8 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_breast_milk.ftl @@ -0,0 +1,396 @@ +<#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/bf_food/list_bf_milk.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_milk.ftl index 00a8007..d998355 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 @@ -60,7 +60,7 @@
-

${model['rm_child']['name']} 모유

+

${model['rm_child']['name']} 젖병

@@ -266,7 +266,7 @@ data.dm_minute = $('#dm_minute').val(); data.dm_lac = $('#dm_lac').val(); data.memo = $('#memo').val(); - data.table = "tbl_bf_snak_feed"; + data.table = "tbl_bf_milk_feed"; $.ajax({ url:'${URL_ROOT}/m/bf_food/ajax_insert_lac_milk.do?1=1', type:'post', @@ -292,7 +292,7 @@ var data = {} data.dm_no = dm_no; - data.table = "tbl_bf_snak_feed"; + data.table = "tbl_bf_milk_feed"; Swal.fire({ text: "기록을 삭제하시겠습니까?", @@ -389,7 +389,7 @@ dayNamesShort: ['일', '월', '화', '수', '목', '금', '토'] }); ---> + <#include "/m/bf_growth_body/include_return_url.ftl"> 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 index bbe97e7..de900a2 100644 --- 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 @@ -392,7 +392,7 @@ dayNamesShort: ['일', '월', '화', '수', '목', '금', '토'] }); ---> + <#include "/m/bf_growth_body/include_return_url.ftl"> 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 04de415..b9d472c 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,20 +1,20 @@