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 42c00e2..978adfe 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 @@ -273,6 +273,7 @@ ,x.brs ,x.blq ,x.brq + ,ifnull(x.blq,0) + ifnull(x.brq,0) as eat_qty FROM tbl_bf_daily_nutrition_14 x WHERE 1 = 1 AND x.dn_no = #dn_no# diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_10.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_10.ftl index 8215695..84de786 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_10.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_10.ftl @@ -5,4 +5,9 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_12.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_12.ftl index 90e1e51..0c6bd8d 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_12.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_12.ftl @@ -1,3 +1,8 @@ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_13.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_13.ftl index ef29dc0..b44d41c 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_13.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_13.ftl @@ -1,5 +1,8 @@ - - + diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_14.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_14.ftl index ef29dc0..285b3ad 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_14.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_14.ftl @@ -1,5 +1,8 @@ - - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_15.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_15.ftl index b227478..acbc6ff 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_15.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_15.ftl @@ -1,4 +1,8 @@ - + \ No newline at end of file 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 34a0ff3..64d325a 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 @@ -131,11 +131,7 @@ - - - - - + @@ -437,12 +433,8 @@ str = "0"+str; } return str; - }; + }; - - - - <#include "/m/bf_daily_nutrition/include_bottom.ftl"> \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_13.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_13.ftl index c5dadf6..eeb75ba 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_13.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_13.ftl @@ -1,22 +1,25 @@ <#include "/m/bf_daily_nutrition/include_top.ftl"> - -
+ +
<#include "/m/bf_daily_nutrition/include_bf_nu_tp_13.ftl"> -
- - - - - -
-

성취종류

- -
- -
-
- +
+ + + +
+ +
+ + +
+

성취 종류

+ +
+ + +
+ <#include "/m/bf_daily_nutrition/include_bottom.ftl"> \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_14.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_14.ftl index 5d67cb0..f89bfef 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_14.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_14.ftl @@ -1,81 +1,171 @@ <#include "/m/bf_daily_nutrition/include_top.ftl"> - -
+ +
<#include "/m/bf_daily_nutrition/include_bf_nu_tp_12.ftl"> -
- - - -
-
-

정보입력

-
- -
- -
-
- -
- -
- - -
-
- -
- -
- - -
-
- -
- -
- - -
-
- -
- -
- - -
-
- -
- -
- - ml -
-
-
- -
- - ml -
-
- +
+ + +
+ +
+ +
+
+ + + +
+
+ + +
+ +
+
+

왼쪽

+
+
+ +

+
+
+ +

+
+
+
+ +
+
+

수유시작

+ 00:00 +
+
+ +
+

오른쪽

+ +
+
+ +

+
+
+ +

+
+
+
+
+ +
+ + + + +
+ +
+ + + +
+
+

섭취량

+

<#if model['rm']['eat_qty']?exists > ${model['rm']['eat_qty']!} <#else>0 ml

+

총량 입력

+ + +
+ +
+ +
+

왼쪽

+ +
+
+ + +
+ + ${model['rm']['blq']!} + +
+ + +
+
+
+ + + +
+

오른쪽

+ +
+
+ + +
+ + ${model['rm']['brq']!} + +
+ + +
+
+
+ +
+
+ + + +
+

폐기 D-Day

+
+ (        )년   (        )월   (        )일 +
+
+ +
+ + }); + + <#include "/m/bf_daily_nutrition/include_bottom.ftl"> \ No newline at end of file diff --git a/src/main/webapp/m/css/style.css b/src/main/webapp/m/css/style.css index fdc31c5..5f296b7 100644 --- a/src/main/webapp/m/css/style.css +++ b/src/main/webapp/m/css/style.css @@ -13342,6 +13342,7 @@ main.sona_cont_measurement { height: 40px; color: #6A6A6A; text-align: center; + width: 50px; } .take_time .border_btn{ @@ -13546,6 +13547,7 @@ main.sona_cont_measurement { display: flex; justify-content: center; margin-top: 20px; + margin-bottom:10px; } .stop_ok_div button.active { @@ -13553,8 +13555,8 @@ main.sona_cont_measurement { color: #fff; } - .stop_ok_div button:first-child{ - margin-right:20px; + .stop_ok_div button { + margin-right:20px; } #view_sn_nutrition_powderedmilk .take_time{ diff --git a/src/main/webapp/m/html/test.html b/src/main/webapp/m/html/test.html new file mode 100644 index 0000000..4e1b127 --- /dev/null +++ b/src/main/webapp/m/html/test.html @@ -0,0 +1,91 @@ + + +
+

대변 또는 소변을 선택해주세요.

+
    + <#if model['lm_rest_tp']? has_content> + <#list model['lm_rest_tp'] as item> +
  • class="active">${item['title']}
  • + + +
+
+ + + +
+ + +
+

대변 색을 선택해주세요.

+
+ <#if model['lm_rest_feces_color']? has_content> + <#list model['lm_rest_feces_color'] as item> + ${item['title'!]} + + +
+ + +
+ + +
+ +
+ + + + +
+ +
+

소변 색을 선택해주세요.

+
+ <#if model['lm_rest_pee_color']? has_content> + <#list model['lm_rest_pee_color'] as item> + ${item['title'!]} + + +
+ + +
+ + +
+ +
+ + + +
+

배변량을 선택해주세요.

+
+ <#if model['lm_rest_qty']? has_content> + <#list model['lm_rest_qty'] as item> + ${item['title'!]} + + +
+ +
+ +
+ + + +
+

배변정도를 선택해주세요.

+
+ <#if model['lm_rest_feces_degree']? has_content> + <#list model['lm_rest_feces_degree'] as item> + ${item['title'!]} + + +
+ +
+ +
+ \ No newline at end of file