From 05c672401960ef2f36fcf695b7a60126d6f6efea Mon Sep 17 00:00:00 2001 From: kyebyungha Date: Tue, 10 May 2022 12:12:43 +0900 Subject: [PATCH] =?UTF-8?q?=EC=8B=9D=ED=92=88=EA=B5=B0=20=EC=A0=90?= =?UTF-8?q?=EC=88=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bf/com.backoffice.admin.bf.bf_score.xml | 41 +++++++++---------- .../include_bf_nutrition.ftl | 10 ++++- .../view_bf_daily_nutrition_2.ftl | 8 +++- .../view_bf_daily_nutrition_9.ftl | 1 - .../views/ftl/m/bf_growth/food_balance.ftl | 2 + 5 files changed, 37 insertions(+), 25 deletions(-) diff --git a/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_score.xml b/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_score.xml index 5f06569..4416e43 100644 --- a/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_score.xml +++ b/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_score.xml @@ -1066,15 +1066,15 @@ ,ROUND(dbc.vitamind*x.weight,2) AS vitamind ,ROUND(dbc.vitamine*x.weight,2) AS vitamine ,ROUND(dbc.zinc*x.weight,2) AS zn - ,IF(dbc.grain IS NULL, 0, ROUND(dbc.grain*x.weight,2)) AS dqi_food_1 - ,IF(dbc.vegetable IS NULL, 0, ROUND(dbc.vegetable*x.weight,2)) AS dqi_food_2 - ,IF(dbc.fruit IS NULL, 0, ROUND(dbc.fruit*x.weight,2)) AS dqi_food_3 - ,IF(dbc.meat IS NULL, 0, ROUND(dbc.meat*x.weight,2)) AS dqi_food_4 - ,IF(dbc.poultry IS NULL, 0, ROUND(dbc.poultry*x.weight,2)) AS dqi_food_5 - ,IF(dbc.seafood IS NULL, 0, ROUND(dbc.seafood*x.weight,2)) AS dqi_food_6 - ,IF(dbc.turbulence IS NULL, 0, ROUND(dbc.turbulence*x.weight,2)) AS dqi_food_7 - ,IF(dbc.dairy IS NULL, 0, ROUND(dbc.dairy*x.weight,2)) AS dqi_food_8 - ,IF(dbc.bean IS NULL, 0, ROUND(dbc.bean*x.weight,2)) AS dqi_food_9 + ,IF(dbc.grain = 'Y', ROUND(dbc.srv*x.weight,2),0) AS dqi_food_1 + ,IF(dbc.vegetable = 'Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_2 + ,IF(dbc.fruit = 'Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_3 + ,IF(dbc.meat = 'Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_4 + ,IF(dbc.poultry = 'Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_5 + ,IF(dbc.seafood = 'Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_6 + ,IF(dbc.turbulence = 'Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_7 + ,IF(dbc.dairy = 'Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_8 + ,IF(dbc.bean = 'Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_9 ,0 AS dqi_food_10 ,0 AS dqi_food_11 ,0 AS dqi_food_12 @@ -1360,7 +1360,7 @@ ,ROUND(dn2.vitd*x.weight,2) AS vitamind ,ROUND(dn2.vite*x.weight,2) AS vitamine ,ROUND(dn2.zn*x.weight,2) AS zn - ,IFNULL(x.srv-x.rem,0) AS dqi_food_1 + ,IFNULL(x.eat_qty,0) AS dqi_food_1 ,0 AS dqi_food_2 ,0 AS dqi_food_3 ,0 AS dqi_food_4 @@ -1375,8 +1375,7 @@ FROM ( SELECT t.dn_no ,b.weight - ,t.srv - ,t.rem + ,t.eat_qty ,t.reg_dt FROM tbl_bf_daily_nutrition_1 t left join tbl_bf_growth_body b @@ -1621,15 +1620,15 @@ ,ROUND(dbc.vitamind*x.weight,2) AS vitamind ,ROUND(dbc.vitamine*x.weight,2) AS vitamine ,ROUND(dbc.zinc*x.weight,2) AS zn - ,IF(dbc.grain IS NULL, 0, ROUND(dbc.grain*x.weight,2)) AS dqi_food_1 - ,IF(dbc.vegetable IS NULL, 0, ROUND(dbc.vegetable*x.weight,2)) AS dqi_food_2 - ,IF(dbc.fruit IS NULL, 0, ROUND(dbc.fruit*x.weight,2)) AS dqi_food_3 - ,IF(dbc.meat IS NULL, 0, ROUND(dbc.meat*x.weight,2)) AS dqi_food_4 - ,IF(dbc.poultry IS NULL, 0, ROUND(dbc.poultry*x.weight,2)) AS dqi_food_5 - ,IF(dbc.seafood IS NULL, 0, ROUND(dbc.seafood*x.weight,2)) AS dqi_food_6 - ,IF(dbc.turbulence IS NULL, 0, ROUND(dbc.turbulence*x.weight,2)) AS dqi_food_7 - ,IF(dbc.dairy IS NULL, 0, ROUND(dbc.dairy*x.weight,2)) AS dqi_food_8 - ,IF(dbc.bean IS NULL, 0, ROUND(dbc.bean*x.weight,2)) AS dqi_food_9 + ,IF(dbc.grain ='Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_1 + ,IF(dbc.vegetable ='Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_2 + ,IF(dbc.fruit ='Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_3 + ,IF(dbc.meat ='Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_4 + ,IF(dbc.poultry ='Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_5 + ,IF(dbc.seafood ='Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_6 + ,IF(dbc.turbulence ='Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_7 + ,IF(dbc.dairy ='Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_8 + ,IF(dbc.bean ='Y', ROUND(dbc.srv*x.weight,2), 0) AS dqi_food_9 ,0 AS dqi_food_10 ,0 AS dqi_food_11 ,0 AS dqi_food_12 diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nutrition.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nutrition.ftl index eb8fcd1..1d688a2 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nutrition.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nutrition.ftl @@ -390,7 +390,7 @@ }, go_popup_self4: function() { $('#popup_self3').removeClass('open'); - this.ajax_insert_self() + this.ajax_insert_self(); }, ajax_insert_self: function(){ var self = {} @@ -456,6 +456,14 @@ // form Data 객체 생성 formData.append("attachedImage",img.files[0]); formData.append('fileData',JSON.stringify(self)); + if($('#menu_nm').val() =="") { + Swal.fire({text:"이유식명이 입력되지 않았습니다"}); + return; + } + if($('#srv_self').val() =="") { + Swal.fire({text:"몇 인분인지? 입력되지 않았습니다"}); + return; + } $.ajax({ url:'${URL_ROOT}/m/bf_daily_nutrition/ajax_insert_self.do?1=1', diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_2.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_2.ftl index 502359f..82d7bf5 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_2.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_2.ftl @@ -267,8 +267,12 @@ console.log("last-child select"); }); - <#if model['rm']['milk_tp'] == 88> - $(".milk_input").hide(); + <#if model['rm']['milk_tp']? has_content > + <#if model['rm']['milk_tp']! == 88> + $(".milk_input").hide(); + + <#else> + function save_set(col, val, title){ 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 6f3cead..a0ac406 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 @@ -223,7 +223,6 @@