@@ -619,7 +621,6 @@
-
@@ -644,6 +645,7 @@
-
+
+
\ No newline at end of file
diff --git a/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml b/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
index ddeae49..e0e69dd 100644
--- a/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
+++ b/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
@@ -391,9 +391,18 @@
)
WHEN cis_1.cd_no = 'BF_NU_TP_3' THEN
(
- SELECT ifnull(concat(ifnull(tn.prd_nm, ''),' ', tn1.eat_qty, 'ml 섭취'),'')
+ SELECT
+ concat(
+ case
+ when tn1.db_dn_tp = 'bf' then ifnull(tb.prd_nm, '')
+ when tn1.db_dn_tp = 'sf' then ifnull(tc.prd_nm, '')
+ end
+ ,' '
+ ,tn1.eat_qty, 'ml 섭취'
+ )
FROM tbl_bf_daily_nutrition_3 tn1
- INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
+ LEFT OUTER JOIN tbl_db_nutrient tb ON tn1.db_dn_no = tb.dn_no
+ LEFT OUTER JOIN tbl_db_sf_commerce tc on tn1.db_dn_no = tc.dbc_no
WHERE tn1.dn_no = x.dn_no
)
WHEN cis_1.cd_no = 'BF_NU_TP_5' THEN
diff --git a/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml b/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml
index d157d0c..4312c2c 100644
--- a/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml
+++ b/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml
@@ -242,9 +242,17 @@
)
when c.cd_no = 'BF_NU_TP_3' THEN
(select
- concat(ifnull(tn.prd_nm, ''),' ', tn1.eat_qty, 'ml 섭취')
+ concat(
+ case
+ when tn1.db_dn_tp = 'bf' then ifnull(tb.prd_nm, '')
+ when tn1.db_dn_tp = 'sf' then ifnull(tc.prd_nm, '')
+ end
+ ,' '
+ ,tn1.eat_qty, 'ml 섭취'
+ )
from tbl_bf_daily_nutrition_3 tn1
- left outer join tbl_db_nutrient tn on tn1.db_dn_no = tn.dn_no
+ left outer join tbl_db_nutrient tb on tn1.db_dn_no = tb.dn_no
+ left outer join tbl_db_sf_commerce tc on tn1.db_dn_no = tc.dbc_no
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_5' THEN
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl b/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
index ac09378..9f2ff63 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
@@ -88,48 +88,45 @@
${item['name']!} (${item['gender_ko']!})
${(item['past_day'])!}일 (${(item['past_day']?number/7)!}주 ${(item['past_day']?number%7)!}일/${item['past_month']!}개월 ${(item['past_day']?number%7)!}일)
+
+ <#if item['d_day_year']? has_content>
+
+ <#else>
+
+ #if>
+
<#if item['day100'] gt 0>
<#if item['diff_d_day'] gt item['day100'] || item['diff_d_day'] lt 0>
100일 D-${(item['day100'])!}일,${item['day100date']!}
<#elseif item['diff_d_day'] gt 0>
-
- ${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
-
+ ${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
#if>
<#elseif item['day200'] gt 0>
<#if item['diff_d_day'] gt item['day200'] || item['diff_d_day'] lt 0>
200일 D-${(item['day200'])!}일,${item['day200date']!}
<#elseif item['diff_d_day'] gt 0>
-
- ${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
-
+ ${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
#if>
<#elseif item['day300'] gt 0>
<#if item['diff_d_day'] gt item['day300'] || item['diff_d_day'] lt 0>
300일 D-${(item['day300'])!}일,${item['day300date']!}
<#elseif item['diff_d_day'] gt 0>
-
- ${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
-
+ ${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
#if>
<#elseif item['day365'] gt 0>
<#if item['diff_d_day'] gt item['day365'] || item['diff_d_day'] lt 0>
첫돌 D-${(item['day365'])!}일,${item['day365date']!}
<#elseif item['diff_d_day'] gt 0>
-
- ${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
-
+ ${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
#if>
<#elseif item['day365'] lt 0>
<#if item['diff_d_day'] gt 0>
-
- ${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
-
+ ${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
<#else>
설정된 D-Day가 없습니다.
#if>
#if>
-
+
@@ -373,7 +370,7 @@
var smc_index = 0;
<#if (model['lm_child'])?has_content>
- smc_index = parseInt("${model['smc_index']}");
+ smc_index = parseInt("${model['smc_index']}");
#if>
// main_pofile_slider 프로필 슬라이드
@@ -508,6 +505,15 @@
clickable: true
},
});
+
+ function fncGoDday(d_day_year, d_day_month) {
+ if(d_day_year == null) {
+ location.href = "${URL_ROOT}/m/member_env/setting_env_viewnm.do?return_url=setting&view_nm=view_d_day";
+ } else {
+ location.href = "${URL_ROOT}/m/member_env/setting_env_viewnm.do?return_url=setting&view_nm=view_d_day&viewYear=" + d_day_year + "&viewMonth=" + d_day_month;
+ }
+
+ }