From cde50562e9fcb335ed653974f2c736060a7ee6bd Mon Sep 17 00:00:00 2001 From: kyebyungha Date: Wed, 6 Apr 2022 23:24:24 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EA=B8=B0=EB=A1=9D=20=EB=B6=80=EB=B6=84=20?= =?UTF-8?q?=EC=BB=AC=EB=9F=AC=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../M_Bf_daily_nutritionBO.java | 1 + .../M_Bf_daily_nutritionBOImpl.java | 15 ++++++- .../M_Bf_daily_nutritionController.java | 4 +- .../m/member_env/M_Member_envBO.java | 3 +- .../m/member_env/M_Member_envBOImpl.java | 2 +- .../com.backoffice.m.bf_daily_nutrition.xml | 10 ++++- .../ftl/m/bf_daily_nutrition/include_top.ftl | 45 +++++++++++++++++++ .../view_bf_daily_nutrition_12.ftl | 12 ++--- .../view_bf_daily_nutrition_6.ftl | 3 +- 9 files changed, 80 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBO.java b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBO.java index c1f9b5e..e06eaec 100644 --- a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBO.java +++ b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBO.java @@ -14,6 +14,7 @@ public interface M_Bf_daily_nutritionBO { public abstract List select_bf_daily_nutrition_list_by_day(DataMap paramMap) throws Exception; public abstract DataMap select_bf_daily_nutrition_by_dn_no(DataMap paramMap) throws Exception; public abstract List select_lastest_nutrition_list(DataMap paramMap) throws Exception; + public abstract DataMap select_background_color(DataMap paramMap) throws Exception; public abstract List select_bf_last_status(DataMap paramMap) throws Exception; diff --git a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.java b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.java index f518bf3..c235e27 100644 --- a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.java +++ b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.java @@ -48,7 +48,7 @@ public class M_Bf_daily_nutritionBOImpl extends AbstractBOManager implements M_B return lm; } - + public List select_lastest_nutrition_list(DataMap paramMap) throws Exception{ List lm = null; @@ -100,6 +100,19 @@ public class M_Bf_daily_nutritionBOImpl extends AbstractBOManager implements M_B return rm; } + + public DataMap select_background_color(DataMap paramMap) throws Exception{ + DataMap rm = null; + + try { + generalDAO.setNamespace(SQLMAP_NAMESPACE); + rm = generalDAO.select_item_to_datamap("select_background_color", paramMap); + } catch (SQLException e) { + throw e; + } + + return rm; + } public List select_bf_last_status(DataMap paramMap) throws Exception{ List lm = null; diff --git a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionController.java b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionController.java index 14113ac..670e7f4 100644 --- a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionController.java +++ b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionController.java @@ -158,8 +158,8 @@ public class M_Bf_daily_nutritionController extends AbstractControllerManager{ } List music_list = member_envBO.select_music_list(paramMap); DataMap.putToModel(model, "music_list", music_list); - - + DataMap color = bf_daily_nutritionBO.select_background_color(paramMap); + rm.put("color", color.get("color_cd")); DataMap.putToModel(model, "rm", rm); String birthday = RenaStringUtil.getData(rm_child, "birthday"); String baseday = RenaStringUtil.getData(rm, "baseday"); diff --git a/src/main/java/com/backoffice/m/member_env/M_Member_envBO.java b/src/main/java/com/backoffice/m/member_env/M_Member_envBO.java index afc4329..2e69fb2 100644 --- a/src/main/java/com/backoffice/m/member_env/M_Member_envBO.java +++ b/src/main/java/com/backoffice/m/member_env/M_Member_envBO.java @@ -16,7 +16,8 @@ public interface M_Member_envBO { public abstract List select_music_list(DataMap paramMap) throws Exception; public abstract List select_sync_member_list(DataMap paramMap) throws Exception; public abstract DataMap select_sync_member_email(DataMap paramMap) throws Exception; - + + public abstract int select_auth_confirm(DataMap paramMap) throws Exception; public abstract int update_member_env(DataMap paramMap) throws Exception; diff --git a/src/main/java/com/backoffice/m/member_env/M_Member_envBOImpl.java b/src/main/java/com/backoffice/m/member_env/M_Member_envBOImpl.java index beaaa61..c7a650b 100644 --- a/src/main/java/com/backoffice/m/member_env/M_Member_envBOImpl.java +++ b/src/main/java/com/backoffice/m/member_env/M_Member_envBOImpl.java @@ -83,7 +83,7 @@ public class M_Member_envBOImpl extends AbstractBOManager implements M_Member_en return lm; } - + public List select_sync_member_list(DataMap paramMap) throws Exception{ List lm = null; 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 e3697c3..b7ced8b 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 @@ -1777,7 +1777,13 @@ ,reg_dt FROM tbl_bf_daily_nutrition_memo WHERE dn_no = #dn_no# - - + + + + diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_top.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_top.ftl index 05286ad..8140f80 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_top.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_top.ftl @@ -81,8 +81,53 @@ $("#btnMusicPlay").show(); $("#audio_control").get(0).pause(); } + + function changeCSS(theClass, element, value) { + var cssRules; + for (var S = 0; S < document.styleSheets.length; S++) { + try { + document.styleSheets[S].insertRule(theClass + ' { ' + element + ': ' + value + '; }', document.styleSheets[S][cssRules].length); + } catch (err) { + try { + document.styleSheets[S].addRule(theClass, element + ': ' + value + ';'); + + } catch (err) { + try { + if (document.styleSheets[S]['rules']) { + cssRules = 'rules'; + } else if (document.styleSheets[S]['cssRules']) { + cssRules = 'cssRules'; + } else { + //no rules found... browser unknown + } + for (var R = 0; R < document.styleSheets[S][cssRules].length; R++) { + if (document.styleSheets[S][cssRules][R].selectorText == theClass) { + if (document.styleSheets[S][cssRules][R].style[element]) { + document.styleSheets[S][cssRules][R].style[element] = value; + break; + } + } + } + } catch (err) { + } + } + } + } + } + $(document).ready(function(){ $("#btnMusicPause").hide(); + var backgroundColor = '${model['rm']['color']!}'; + changeCSS('.nutrition_header_child_top .proimg img','border', '2px solid ${model['rm']['color']!}'); + changeCSS('.nutrition_kinds_btn a', 'background','${model['rm']['color']!}'); + changeCSS('.take_time .bg_full', 'background','${model['rm']['color']!}'); + changeCSS('.take_time .bg_border', 'border','2px solid ${model['rm']['color']!}'); + changeCSS('.border_b_input input','border-bottom','2px solid ${model['rm']['color']!}'); + changeCSS('.w_div', 'border','1px solid ${model['rm']['color']!}'); + changeCSS('.nutrition_camera .img_preview img', 'background','${model['rm']['color']!}'); + changeCSS('.iyu_nav ul .nav_list03 .icon','background','${model['rm']['color']!} url(../img/main/iyu_nav_ico03.png) no-repeat center/44% auto' ); + changeCSS('.type_tab li.current', 'background-color', '${model['rm']['color']!}'); + changeCSS('.type_tab', 'border','2px solid ${model['rm']['color']!}'); }); \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_12.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_12.ftl index 8a7491f..6dea1dc 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_12.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_12.ftl @@ -22,12 +22,12 @@
- - + +
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_6.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_6.ftl index 2e06cbb..f56a4fe 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_6.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_6.ftl @@ -277,8 +277,7 @@ var slider5 = $("#slider5").slider("value"); save.set('rest_degree',slider5); } - }); - + }); <#include "/m/bf_daily_nutrition/include_bottom.ftl"> \ No newline at end of file From beaea9eec0fc7746aab8a09f0b8f7d51d28d0eb0 Mon Sep 17 00:00:00 2001 From: kyebyungha Date: Wed, 6 Apr 2022 23:31:30 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EA=B8=B0=EB=A1=9D=20=EC=BB=AC=EB=9F=AC=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/views/ftl/m/bf_daily_nutrition/include_top.ftl | 3 ++- src/main/webapp/m/css/style.css | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_top.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_top.ftl index 8140f80..76a9a05 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_top.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_top.ftl @@ -121,9 +121,10 @@ changeCSS('.nutrition_header_child_top .proimg img','border', '2px solid ${model['rm']['color']!}'); changeCSS('.nutrition_kinds_btn a', 'background','${model['rm']['color']!}'); changeCSS('.take_time .bg_full', 'background','${model['rm']['color']!}'); + changeCSS('.take_time .time_tit', 'background','${model['rm']['color']!}'); changeCSS('.take_time .bg_border', 'border','2px solid ${model['rm']['color']!}'); changeCSS('.border_b_input input','border-bottom','2px solid ${model['rm']['color']!}'); - changeCSS('.w_div', 'border','1px solid ${model['rm']['color']!}'); + changeCSS('.w_div', 'border','1px solid ${model['rm']['color']!}'); changeCSS('.nutrition_camera .img_preview img', 'background','${model['rm']['color']!}'); changeCSS('.iyu_nav ul .nav_list03 .icon','background','${model['rm']['color']!} url(../img/main/iyu_nav_ico03.png) no-repeat center/44% auto' ); changeCSS('.type_tab li.current', 'background-color', '${model['rm']['color']!}'); diff --git a/src/main/webapp/m/css/style.css b/src/main/webapp/m/css/style.css index 5833e22..4670e89 100644 --- a/src/main/webapp/m/css/style.css +++ b/src/main/webapp/m/css/style.css @@ -13321,6 +13321,7 @@ main.sona_cont_measurement { .w_div{ background: #fff; padding:20px; + border-radius: 20px; box-sizing: border-box; margin-bottom: 20px; }