diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ecbcad7..d966a3e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,13 +9,17 @@
-
+
-
+
+
+
+
+
-
-
-
+
+
+
@@ -234,7 +238,10 @@
-
+
+
+
+
1645354476031
@@ -544,7 +551,14 @@
1650801028670
-
+
+ 1650806994907
+
+
+
+ 1650806994907
+
+
@@ -564,7 +578,6 @@
-
@@ -589,6 +602,7 @@
-
+
+
\ No newline at end of file
diff --git a/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyController.java b/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyController.java
index b7627df..65bc5ce 100644
--- a/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyController.java
+++ b/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyController.java
@@ -298,7 +298,7 @@ public class M_Bf_family_babyController extends AbstractControllerManager{
// 디폴트 요청한 아이
String smc_no = RenaStringUtil.getData(paramMap, "smc_no");
- if(lm_child != null) {
+ if(lm_child.size() > 0) {
for(DataMap rm_child2 : lm_child) {
String smc_no2 = RenaStringUtil.getData(rm_child2, "smc_no");
@@ -326,25 +326,30 @@ public class M_Bf_family_babyController extends AbstractControllerManager{
DataMap.putToModel(model, "rm_child", rm_child);
session.setAttribute(ConstantSystem.SESSION_RM_CHILD, rm_child);
}
- }
-
+ } else {
+ session.setAttribute(ConstantSystem.SESSION_RM_CHILD, null);
+// List no_child = null;
+// DataMap.putToModel(model, "lm_child", no_child);
+ rm_child = null;
+ }
+
if(rm_child != null) {
paramMap.copyFromDataMapByKeys(rm_child, new String[]{"smc_no"});
-
+
// 선택된 아이 가장 먼저
List lm_child2 = new ArrayList();
lm_child2.add(rm_child);
-
- smc_no = RenaStringUtil.getData(rm_child, "smc_no");
+
+ smc_no = RenaStringUtil.getData(rm_child, "smc_no");
for(DataMap rm_child2 : lm_child) {
String smc_no2 = RenaStringUtil.getData(rm_child2, "smc_no");
-
+
if(smc_no2.equals(smc_no) == false) lm_child2.add(rm_child2);
}
-
+
DataMap.putToModel(model, "lm_child", lm_child2);
}
-
+
return rm_child;
}
}
diff --git a/src/main/java/com/backoffice/m/index/M_IndexController.java b/src/main/java/com/backoffice/m/index/M_IndexController.java
index caaac72..66ddb9c 100644
--- a/src/main/java/com/backoffice/m/index/M_IndexController.java
+++ b/src/main/java/com/backoffice/m/index/M_IndexController.java
@@ -275,7 +275,7 @@ public class M_IndexController extends AbstractControllerManager{
// 디폴트 요청한 아이
String smc_no = RenaStringUtil.getData(paramMap, "smc_no");
- if(lm_child != null) {
+ if(lm_child.size() > 0) {
for(DataMap rm_child2 : lm_child) {
String smc_no2 = RenaStringUtil.getData(rm_child2, "smc_no");
@@ -303,25 +303,30 @@ public class M_IndexController extends AbstractControllerManager{
DataMap.putToModel(model, "rm_child", rm_child);
session.setAttribute(ConstantSystem.SESSION_RM_CHILD, rm_child);
}
- }
-
+ } else {
+ session.setAttribute(ConstantSystem.SESSION_RM_CHILD, null);
+// List no_child = null;
+// DataMap.putToModel(model, "lm_child", no_child);
+ rm_child = null;
+ }
+
if(rm_child != null) {
paramMap.copyFromDataMapByKeys(rm_child, new String[]{"smc_no"});
-
+
// 선택된 아이 가장 먼저
List lm_child2 = new ArrayList();
lm_child2.add(rm_child);
-
- smc_no = RenaStringUtil.getData(rm_child, "smc_no");
+
+ smc_no = RenaStringUtil.getData(rm_child, "smc_no");
for(DataMap rm_child2 : lm_child) {
String smc_no2 = RenaStringUtil.getData(rm_child2, "smc_no");
-
+
if(smc_no2.equals(smc_no) == false) lm_child2.add(rm_child2);
}
-
+
DataMap.putToModel(model, "lm_child", lm_child2);
}
-
+
return rm_child;
}
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 ff107b8..e9cb29f 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
@@ -381,7 +381,10 @@
)
WHEN cis_1.cd_no = 'BF_NU_TP_2' THEN
(
- SELECT ifnull(concat(eat_qty, 'ml'),'') FROM tbl_bf_daily_nutrition_2 tn1 WHERE tn1.dn_no = x.dn_no
+ SELECT ifnull(concat(ifnull(tn.prd_nm,''), ' ', eat_qty, 'ml'),'')
+ FROM tbl_bf_daily_nutrition_2 tn1
+ LEFT OUTER JOIN tbl_db_nutrient tn ON tn1.db_dn_no = tn.dn_no
+ WHERE tn1.dn_no = x.dn_no
)
WHEN cis_1.cd_no = 'BF_NU_TP_3' THEN
(
@@ -419,8 +422,18 @@
)
WHEN cis_1.cd_no = 'BF_NU_TP_9' THEN
(
- SELECT ifnull(concat(ifnull(tb.name, ''),' ', tn1.eat_qty, 'ml 섭취'), '') FROM tbl_bf_daily_nutrition_9 tn1
- LEFT OUTER JOIN tbl_db_home_bf tb on tn1.db_dhb_no = tb.dhb_no
+ SELECT
+ concat(
+ case
+ when tn1.db_dhb_tp = 'sf' then ifnull(tb.name, '')
+ when tn1.db_dhb_tp = 'bf' then ifnull(tc.name, '')
+ end
+ ,
+ tn1.eat_qty, 'ml 섭취'
+ )
+ FROM tbl_bf_daily_nutrition_9 tn1
+ LEFT OUTER JOIN tbl_db_home_sf tb on tn1.db_dhb_no = tb.dhb_no
+ LEFT OUTER JOIN tbl_db_home_bf tc on tn1.db_dhb_no = tc.dhb_no
WHERE tn1.dn_no = x.dn_no
)
WHEN cis_1.cd_no = 'BF_NU_TP_10' THEN
@@ -447,7 +460,7 @@
)
WHEN cis_1.cd_no = 'BF_NU_TP_15' THEN
(
- SELECT ifnull(temperature,'') FROM tbl_bf_daily_nutrition_15 tn1 WHERE tn1.dn_no = x.dn_no
+ SELECT concat(ifnull(etc_symptom,''), ' ', ifnull(temperature,'')) FROM tbl_bf_daily_nutrition_15 tn1 WHERE tn1.dn_no = x.dn_no
)
END AS time_val
FROM
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 5953a17..39ae3e1 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
@@ -219,9 +219,10 @@
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_2' THEN
- (select concat(eat_qty, 'ml')
+ (select ifnull(concat(ifnull(tn.prd_nm,''), ' ', eat_qty, 'ml'),'')
from tbl_bf_daily_nutrition_2 tn1
- where tn1.dn_no = b.dn_no
+ left outer join tbl_db_nutrient tn ON tn1.db_dn_no = tn.dn_no
+ WHERE tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_3' THEN
(select
@@ -251,9 +252,17 @@
)
when c.cd_no = 'BF_NU_TP_9' THEN
(select
- concat(ifnull(tb.name, ''),' ', tn1.eat_qty, 'ml 섭취')
+ concat(
+ case
+ when tn1.db_dhb_tp = 'sf' then ifnull(tb.name, '')
+ when tn1.db_dhb_tp = 'bf' then ifnull(tc.name, '')
+ end
+ ,
+ tn1.eat_qty, 'ml 섭취'
+ )
from tbl_bf_daily_nutrition_9 tn1
- left outer join tbl_db_home_bf tb on tn1.db_dhb_no = tb.dhb_no
+ left outer join tbl_db_home_sf tb on tn1.db_dhb_no = tb.dhb_no
+ left outer join tbl_db_home_bf tc on tn1.db_dhb_no = tc.dhb_no
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_10' THEN
@@ -289,7 +298,7 @@
)
when c.cd_no = 'BF_NU_TP_15' THEN
(select
- temperature
+ concat(ifnull(etc_symptom,''), ' ', ifnull(temperature,''))
from tbl_bf_daily_nutrition_15 tn1
where tn1.dn_no = b.dn_no
)
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 aa6f514..d4657b1 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
@@ -193,6 +193,7 @@
// 날짜를 yyyy-mm-dd 형식으로 만들어 줌.
function date_mask(objValue) {
var v = objValue.replace("--", ".");
+ v = objValue.replace("..", ".");
if (v.match(/^\d{4}$/) !== null) {
v = v + '.';
@@ -201,6 +202,7 @@
}
v = v.replace(/[a-zA-Z]/g, "");
v = v.replace( /[\{\}\[\]\/?,;:|\)*~`!^\-_+<>@\#$%&\\\=\(\'\"]/gi, "");
+ v = v.replace(/ /gi, '');
return v;
}
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/index/include_nochild.ftl b/src/main/webapp/WEB-INF/views/ftl/m/index/include_nochild.ftl
index b77819e..c45f5fb 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/index/include_nochild.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/index/include_nochild.ftl
@@ -7,23 +7,14 @@
-
-
-
아이를 등록하세요
+
-

+

-
-
-
-
아이를 등록하세요
-
0세 0개월(남)
-
-
-

-
-
@@ -130,7 +121,8 @@
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 8e90ef6..dce6abb 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
@@ -2,7 +2,6 @@
- -->
@@ -111,6 +110,12 @@
<#elseif item['diff_d_day'] gt 0>
${(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']!}
+ <#else>
+ 설정된 D-Day가 없습니다.
+ #if>
#if>
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl
index b407bf5..cf11b7e 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl
@@ -185,7 +185,7 @@
$(".set_list_wrap").append("" +
"
" +
"
@@ -221,7 +220,7 @@