From b58f9291f342f2bab1b3b504bac74ca60f3efd89 Mon Sep 17 00:00:00 2001 From: lucysoo95 Date: Thu, 12 May 2022 14:09:43 +0900 Subject: [PATCH 01/10] =?UTF-8?q?=EB=AC=B8=EA=B5=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/views/ftl/m/login/view_join_member_03.ftl | 2 +- .../webapp/WEB-INF/views/ftl/m/member_env/setting_20220413.ftl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_03.ftl b/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_03.ftl index 22ef2bb..66b8d15 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_03.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_03.ftl @@ -21,7 +21,7 @@
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_20220413.ftl b/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_20220413.ftl index a0ad17a..0db6473 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_20220413.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_20220413.ftl @@ -20,7 +20,7 @@ <#-- -->
- 아이 정보 변경 + 아이 정보 입력/변경
From e09528d4a898f883dac2adb8bd47e4c447b8e48c Mon Sep 17 00:00:00 2001 From: lucysoo95 Date: Thu, 12 May 2022 14:32:46 +0900 Subject: [PATCH 02/10] =?UTF-8?q?=EB=AC=B8=EA=B5=AC=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl index 43d68ea..592320e 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl @@ -5,7 +5,7 @@
-

아기 정보 변경

+

아기 정보 등록

From d2c23a1e733ac56be9964b3a984cf57e0df5b65a Mon Sep 17 00:00:00 2001 From: kyebyungha Date: Thu, 12 May 2022 14:40:01 +0900 Subject: [PATCH 03/10] =?UTF-8?q?=EC=84=B1=EC=9E=A5=EC=9E=85=EB=A0=A5?= =?UTF-8?q?=EC=9D=BC=20=EC=88=98=EC=A0=95=ED=95=98=EC=97=AC=20=EC=9E=85?= =?UTF-8?q?=EB=A0=A5=20=EA=B0=80=EB=8A=A5=20=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view_bf_growth_body_input.ftl | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_growth_body/view_bf_growth_body_input.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_growth_body/view_bf_growth_body_input.ftl index 207abc4..ad423b6 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_growth_body/view_bf_growth_body_input.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_growth_body/view_bf_growth_body_input.ftl @@ -37,11 +37,6 @@

${model['rm_child']['name']} 키체중 입력

-
- - - -
@@ -59,7 +54,10 @@
- + + + +
@@ -239,7 +237,8 @@ var today = moment().format('YYYY.MM.DD'); $("#input_date").val(today) - var input_date = SNUtil.makeAnyPicker('input_date', $("#input_date").val(), -80, '.'); + var input_date = SNUtil.makeAnyPicker('input_date', $("#input_date").val(), -80, '.'); + debugger; }) @@ -252,13 +251,17 @@ showOn: "button", buttonImage: "${URL_STATIC_ROOT}/m/img/growth/growth_cal_ico.png", buttonImageOnly: true, - dateFormat: 'yy-mm-dd', + dateFormat: 'yy.mm.dd', nextText: '다음 달', prevText: '이전 달', monthNames: ['1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월'], monthNamesShort: ['1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월'], dayNamesMin: ['일', '월', '화', '수', '목', '금', '토'], - dayNamesShort: ['일', '월', '화', '수', '목', '금', '토'] + dayNamesShort: ['일', '월', '화', '수', '목', '금', '토'], + onSelect: function (date, obj) + { + $("#input_date").val(date) + }, }); From 3d019eddf87d7c30ab9dc0c116ce36d88b034c73 Mon Sep 17 00:00:00 2001 From: kyebyungha Date: Thu, 12 May 2022 15:54:12 +0900 Subject: [PATCH 04/10] =?UTF-8?q?=EC=84=B1=EC=9E=A5=EB=B6=80=EB=B6=84=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=98=A4=EB=A5=98=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 --- .../views/ftl/m/bf_growth_body/view_bf_growth_body_input.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_growth_body/view_bf_growth_body_input.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_growth_body/view_bf_growth_body_input.ftl index ad423b6..0bc1232 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_growth_body/view_bf_growth_body_input.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_growth_body/view_bf_growth_body_input.ftl @@ -108,8 +108,9 @@
<#--페이지네이션--> +
    - <@b.Paging url="${URL_PATH}/m/bf_growth_body/view_bf_growth_body_input.do" + <@b.Paging url="view_bf_growth_body_input.do" pageCount="${model['page']['pageCount']?c}" rowCount="${model['page']['rowCount']?c}" rowMax="${model['page']['rowMax']?c}" @@ -238,7 +239,6 @@ var today = moment().format('YYYY.MM.DD'); $("#input_date").val(today) var input_date = SNUtil.makeAnyPicker('input_date', $("#input_date").val(), -80, '.'); - debugger; }) From 7f950614bd6bcd1e80280a9ab684b5808995e662 Mon Sep 17 00:00:00 2001 From: jonghwan76 Date: Thu, 12 May 2022 16:22:16 +0900 Subject: [PATCH 05/10] =?UTF-8?q?=EA=B8=B0=EB=A1=9D=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=ED=99=88=ED=99=94=EB=A9=B4=20=ED=91=9C=EC=8B=9C=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 28 +++++++++++-------- src/main/resources/bf.properties | 6 ++-- .../com.backoffice.m.bf_daily_nutrition.xml | 19 ++++--------- .../memory/com.backoffice.m.memory.memory.xml | 5 +++- src/main/webapp/META-INF/context.xml | 4 +-- .../m/bf_family_baby/view_bf_family_baby.ftl | 2 +- .../views/ftl/m/member_env/setting.ftl | 2 +- 7 files changed, 32 insertions(+), 34 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b427870..337e8c1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -9,10 +9,14 @@
@@ -245,43 +245,43 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -479,13 +479,47 @@ console.log(result) var RESULT = result.RESULT if(RESULT == 0){ //0:RESULT_SUCCESS - save_set('', result.dbc_no, $("#menu_nm").val(), 'sf') + save_set('', result.dbc_no, $("#menu_nm").val(), 'sf'); + this.init_self(); Swal.fire({text:"입력되었습니다"}); }else{ Swal.fire({text:"등록되지 않았습니다"}) } }, }) + }, + init_self: function(){ + $('#imgSrc').attr("src", "${URL_STATIC_ROOT}/m/img/main/main_cont_img_camera.png"); + $('#img').val(''); + $('#menu_nm').val(''); + $('#company').val(''); + $('#calorie').val(''); + $('#srv_self').val(''); + $('#srv_unit').val(''); + $('#carbohydrate').val(''); + $('#protein').val(''); + $('#province').val(''); + $('#sugar').val(''); + $('#dietary_fiber').val(''); + $('#dsaturated_fat').val(''); + $('#trans_fat').val(''); + $('#cholesterol').val(''); + $('#salt').val(''); + $('#vitamina').val(''); + $('#vitaminb1').val(''); + $('#vitaminb2').val(''); + $('#niacin').val(''); + $('#vitaminb6').val(''); + $('#vitaminc').val(''); + $('#vitamind').val(''); + $('#vitamine').val(''); + $('#folic_acid').val(''); + $('#steel').val(''); + $('#calcium').val(''); + $('#zinc').val(''); + $('#potassium').val(''); + //$("input:checkbox[class='agree_opt_chk']").attr("checked", false); + $("input:checkbox[class='agree_opt_chk']").prop("checked",false); } }; diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bottom.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bottom.ftl index e6a62e6..0a6850a 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bottom.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bottom.ftl @@ -226,7 +226,6 @@ var RESULT = result.RESULT if(RESULT == 0){ //0:RESULT_SUCCESS var tag = ""; - debugger; for(var idx=0;idx< result.lm_memo_mst.length; idx++){ tag += "
  • "+result.lm_memo_mst[idx].memo+"
    • "; } diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_9.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_9.ftl index a0ac406..1c75a2e 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_9.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_9.ftl @@ -188,7 +188,7 @@
    -

    +

    @@ -369,12 +369,29 @@ $('#popup_self2').removeClass('open'); $("#db_dhb_no").val(result.dhb_no); $("#prd_nm").text($("#prd_nm_sch2").val()); + this.init_self(); Swal.fire({text:"입력되었습니다"}); }else{ Swal.fire({text:"등록되지 않았습니다"}); } }, }) + }, + init_self: function(){ + $('#imgSrc').attr("src", "${URL_STATIC_ROOT}/m/img/main/main_cont_img_camera.png"); + $('#img').val(''); + $('#prd_nm_sch2').val(''); + $("input[name=dbi_no]").each ( function(idx, ele) { + ele.value=""; + }); + + $("input[name=rate_100]").each ( function(idx, ele) { + ele.value=""; + }); + + $("input[name=di_name]").each ( function(idx, ele) { + ele.value=""; + }); } }