diff --git a/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.db_test_milk_input.xml b/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.db_test_milk_input.xml index 6c19b6d..3148b3d 100644 --- a/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.db_test_milk_input.xml +++ b/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.db_test_milk_input.xml @@ -2,216 +2,139 @@ @@ -306,13 +229,13 @@ - DELETE FROM tbl_db_test_milk_input - WHERE mi_no = #mi_no# + DELETE FROM tbl_bf_daily_nutrition_1 + WHERE dn_no = #dn_no# - DELETE FROM tbl_db_test_milk_input - WHERE mi_no IN + DELETE FROM tbl_bf_daily_nutrition_1 + WHERE dn_no IN #list_checked[]# diff --git a/src/main/webapp/WEB-INF/views/ftl/admin/bf/bf_daily_score/view_bf_daily.ftl b/src/main/webapp/WEB-INF/views/ftl/admin/bf/bf_daily_score/view_bf_daily.ftl index 0ca325c..8767c6b 100644 --- a/src/main/webapp/WEB-INF/views/ftl/admin/bf/bf_daily_score/view_bf_daily.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/admin/bf/bf_daily_score/view_bf_daily.ftl @@ -369,7 +369,7 @@
-

영양소 신호등 [ red : 부족 / yellow : 적정 /green : 초과 ]

+

영양소 신호등 [ red : 초과 / yellow : 부족 /green : 적정 ]

diff --git a/src/main/webapp/WEB-INF/views/ftl/admin/bf/db_test_milk_input/list_db_test_milk_input.ftl b/src/main/webapp/WEB-INF/views/ftl/admin/bf/db_test_milk_input/list_db_test_milk_input.ftl index 53b20e8..3d1d5fc 100644 --- a/src/main/webapp/WEB-INF/views/ftl/admin/bf/db_test_milk_input/list_db_test_milk_input.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/admin/bf/db_test_milk_input/list_db_test_milk_input.ftl @@ -15,7 +15,7 @@ @@ -32,15 +32,18 @@
@@ -50,8 +53,22 @@
-
- <#include "/admin/include/include_auth_delwrite.ftl"> +
+<#-- <#include "/admin/include/include_auth_delwrite.ftl">--> +
+ <#if model['map_auth']?exists> + <#if model['map_auth']['auth_d']?exists && model['map_auth']['auth_d'] != 'N'> + + + + <#if model['map_auth']['auth_d']?exists && model['map_auth']['auth_w'] != 'N'> +<#-- --> + + +
+ + 전체 : + ${model['page']['rowMax']?c}
@@ -69,28 +86,15 @@ 순서 PK - 유축기 + 아이번호 생년월일 기준월일 경과일 - 섭취이유 - 섭취전 - 섭취후 - 수유형태 - blm - bls - brm - brs - srv - rem - bl_기준 - bl_섭취량 - br_기준 - br_섭취량 - 총섭취량 + 왼쪽 수유 + 오른쪽 수유 + 총 수유량 가중치 - 등록일시 - 등록자 + 등록일시 @@ -98,32 +102,27 @@ <#if model[ 'lm']? has_content> <#list model[ 'lm'] as item> - - ${item_index} - ${item['mi_no']!} - ${item['fdv_str']!} - ${item['birthday']?string('yyyy.MM.dd')} - ${item['baseday']?string('yyyy.MM.dd')} - ${item['afterbirthday']!} - ${item['fed_rs_str']!} - ${item['emo_pre_str']!} - ${item['emo_post_str']!} - ${item['fed_str']!} - ${item['blm']!} - ${item['bls']!} - ${item['brm']!} - ${item['brs']!} - ${item['srv']!} - ${item['rem']!} - ${item['bl_level']!} - ${item['bl_qty']!} - ${item['br_level']!} - ${item['br_qty']!} - ${item['tot_qty']!} - <#if item['tot_weight']?exists>${item['tot_weight']?string('0.00')} - <#if item['reg_dt']?exists>${item['reg_dt']?string('yyyy.MM.dd HH:mm:ss')} - ${item['sys_member_id']!} - + + ${item_index+1} +<#-- ${item['dn_no']!}--> +<#-- ${item['smc_no']!}--> +<#-- ${item['birthday']?string('yyyy.MM.dd')}--> +<#-- ${item['baseday']?string('yyyy.MM.dd')}--> +<#-- ${item['afterbirthday']!}--> +<#-- ${item['blm']!}분 ${item['bls']!}초--> +<#-- ${item['brm']!}분 ${item['brs']!}초--> +<#-- ${item['eat_qty']!}--> +<#-- <#if item['weight']?exists>${item['weight']?string('0.00')}--> + ${item['dn_no']!} + ${item['smc_no']!} + ${item['birthday']?string('yyyy.MM.dd')} + ${item['baseday']?string('yyyy.MM.dd')} + ${item['afterbirthday']!} + ${item['blm']!}분 ${item['bls']!}초 + ${item['brm']!}분 ${item['brs']!}초 + ${item['eat_qty']!} + <#if item['weight']?exists>${item['weight']?string('0.00')} + <#if item['reg_dt']?exists>${item['reg_dt']?string('yyyy.MM.dd HH:mm:ss')} @@ -202,7 +201,7 @@
- +
@@ -241,9 +240,9 @@ function viewFrm(pk) { if (pk != '') { - $('#frmView').children('#mi_no').val(pk); + $('#frmView').children('#dn_no').val(pk); } else { - $('#frmView').children('#mi_no').remove(); + $('#frmView').children('#dn_no').remove(); } $('#frmView').submit(); diff --git a/src/main/webapp/WEB-INF/views/ftl/admin/bf/db_test_milk_input/view_db_test_milk_input.ftl b/src/main/webapp/WEB-INF/views/ftl/admin/bf/db_test_milk_input/view_db_test_milk_input.ftl index 31568f1..723873e 100644 --- a/src/main/webapp/WEB-INF/views/ftl/admin/bf/db_test_milk_input/view_db_test_milk_input.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/admin/bf/db_test_milk_input/view_db_test_milk_input.ftl @@ -63,28 +63,28 @@
- +
- ${model['rm']['mi_no']!} + ${model['rm']['dn_no']!}
-
- -
- -
-
+<#--
--> +<#-- --> +<#--
--> +<#-- --> +<#--
--> +<#--
-->