From d775986a9387243176ef034f49db7b96050e7c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=9D=B4=EC=86=94?= Date: Tue, 7 Jun 2022 23:49:33 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B0=80=EC=98=A8=EC=95=A4=20=EC=B2=B4?= =?UTF-8?q?=ED=81=AC=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=A0=81=EC=9A=A94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 남은 체크리스트 #타임라인, 일간, 주간 - ooo 모두 똑같이 보이게 수정 #커뮤니티 내 투표칸 글자 제한이 없어, 긴 글 입력 시 배열이 망가짐(18글자 제한) #분석 -> 아기건강 변경 (PPT 참고해주세요), % 표기 모두 점수로 변경 #챗봇 플로팅 버튼 모든 카테고리에서 보이도록 수정 #장바구니 플로팅 버튼은 커뮤니티 외 모든 곳에서 보이도록 수정 --- .../backoffice/constants/ConstantCode.java | 2 +- .../logic/NutrientScoreCalculation.java | 69 +++++++++-------- .../m/bf_food/M_Bf_foodController.java | 2 + .../bf/com.backoffice.admin.bf.bf_score.xml | 4 +- .../ftl/m/bf_food/list_bf_ingre_recommend.ftl | 6 +- .../ftl/m/bf_food/view_nutrition_balance.ftl | 2 +- .../m/bf_food/view_sn_nutrition_main_1.ftl | 10 +-- .../views/ftl/m/bf_growth/food_balance.ftl | 4 + .../views/ftl/m/bf_growth/growth_balance.ftl | 4 + .../views/ftl/m/bf_growth/health_checkup.ftl | 4 + .../ftl/m/bf_growth/nutrient_balance.ftl | 6 +- .../views/ftl/m/bf_growth/vac_schedule.ftl | 4 + .../views/ftl/m/include/cart_script.ftl | 75 ++++++++++++++++++ .../views/ftl/m/include/cart_script2.ftl | 77 +++++++++++++++++++ .../WEB-INF/views/ftl/m/index/index.ftl | 5 +- .../views/ftl/m/memory/memory_daily.ftl | 2 +- .../views/ftl/m/memory/memory_week.ftl | 4 + src/main/webapp/m/css/style.css | 12 +-- 18 files changed, 242 insertions(+), 50 deletions(-) create mode 100644 src/main/webapp/WEB-INF/views/ftl/m/include/cart_script.ftl create mode 100644 src/main/webapp/WEB-INF/views/ftl/m/include/cart_script2.ftl diff --git a/src/main/java/com/backoffice/constants/ConstantCode.java b/src/main/java/com/backoffice/constants/ConstantCode.java index 55c6795..859c39d 100644 --- a/src/main/java/com/backoffice/constants/ConstantCode.java +++ b/src/main/java/com/backoffice/constants/ConstantCode.java @@ -13,7 +13,7 @@ public class ConstantCode { public static final String R_RETRY = "RETRY"; public static final String DIR_WATERMARK_IMG = ""; - public static final String DIR_WATERMARK_TXT = "Copyright © RenaStudio.\nAll Rights Reserved."; + public static final String DIR_WATERMARK_TXT = ""; public static final String AUTH_LIST = "LIST"; public static final String AUTH_INSERT = "INSERT"; diff --git a/src/main/java/com/backoffice/logic/NutrientScoreCalculation.java b/src/main/java/com/backoffice/logic/NutrientScoreCalculation.java index 13934a4..e6baaef 100644 --- a/src/main/java/com/backoffice/logic/NutrientScoreCalculation.java +++ b/src/main/java/com/backoffice/logic/NutrientScoreCalculation.java @@ -122,30 +122,37 @@ public class NutrientScoreCalculation { public static void main(String[] args) { DataMap data = new DataMap(); - data.put("month", 4); - data.put("enerc", 349.91); - data.put("chotdf", 60.94); - data.put("procnp", 0); - data.put("fat", 7.72); - data.put("sugar", 9.38); - data.put("fibtg", 2.36); - data.put("na", 119.44); - data.put("vitaminb1", 0.12); - data.put("vitaminb2", 0.07); - data.put("niacin", 0); - data.put("ca", 15.51); - data.put("k", 299.4); - data.put("fe", 0.88); - data.put("vitamina", 0); - data.put("vitaminc", 8.47); - data.put("vitamind", 0); - data.put("vitamine", 0); - data.put("zn", 0.32); + data.put("month", 24); + data.put("enerc", 855.44); + data.put("chotdf", 110.99); + data.put("procnp", 27.25); + data.put("fat", 32.7); + data.put("sugar", 53.8); + data.put("fibtg", 0.68); + data.put("na", 227.31); + data.put("vitaminb1", 0.45); + data.put("vitaminb2", 1.18); + data.put("niacin", 4.98); + data.put("ca", 552.66); + data.put("k", 465.39); + data.put("fe", 402.9); + data.put("vitamina", 372.76); + data.put("vitaminc", 64.33); + data.put("vitamind", 7.02); + data.put("vitamine", 5.68); + data.put("zn", 4.73); NutrientScoreCalculation cal = new NutrientScoreCalculation(data); DataMap score = cal.getScore(); DataMap intake = cal.getIntakeComparedToTheRecommendedAmount(); DataMap light = cal.getLights(); + + System.out.println("■■■■■■■■■■■■■■■■■■■■■■■■■■■■■ 권장량대비섭취량"); + DataMap.printDataMap(intake); + System.out.println("■■■■■■■■■■■■■■■■■■■■■■■■■■■■■ 스코어"); + DataMap.printDataMap(score); + System.out.println("■■■■■■■■■■■■■■■■■■■■■■■■■■■■■ 신호등"); + DataMap.printDataMap(light); DataMap result = new DataMap(); result.put("enerc", 1); @@ -417,8 +424,8 @@ public class NutrientScoreCalculation { */ private double getSugarValue(double x, double from) { double result = 0; - //if(x<=from) - if(x>=from) + if(x<=from) +// if(x>=from) result = 100; else if (from=from) + if(x<=from) +// if(x>=from) result = 100; else if (fromto) + else if(from<=x && x<=to) return Lights.green.name(); + else if(x>to) + return Lights.red.name(); else return ""; } private String getLight(double x, double from) { if(x<=from) - return Lights.yellow.name(); - else if(x>from) return Lights.green.name(); + else if(x>from) + return Lights.yellow.name(); else return ""; } @@ -771,8 +778,10 @@ public class NutrientScoreCalculation { result.put("fat", getLight(fat, ARR_INTAKE_FROM[fat_idx][label], ARR_INTAKE_TO[fat_idx][label])); result.put("sugar", getLight(sugar, ARR_INTAKE_FROM[sugar_idx][label])); // 12개월 미만 식이섬유는 기준 없음 - if(label<2) result.put("fibtg", null); - else result.put("fibtg", getLight(fibtg, ARR_INTAKE_FROM[fibtg_idx][label], ARR_INTAKE_TO[fibtg_idx][label])); + if(label<2) + result.put("fibtg", null); + else + result.put("fibtg", getLight(fibtg, ARR_INTAKE_FROM[fibtg_idx][label], ARR_INTAKE_TO[fibtg_idx][label])); result.put("na", getLight(na, ARR_INTAKE_FROM[na_idx][label])); result.put("vitaminb1", getLight(vitaminb1, ARR_INTAKE_FROM[vitaminb1_idx][label], ARR_INTAKE_TO[vitaminb1_idx][label])); result.put("vitaminb2", getLight(vitaminb2, ARR_INTAKE_FROM[vitaminb2_idx][label], ARR_INTAKE_TO[vitaminb2_idx][label])); diff --git a/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java b/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java index c27aeb4..54dc6a1 100644 --- a/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java +++ b/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java @@ -1779,9 +1779,11 @@ public class M_Bf_foodController extends AbstractControllerManager{ NutrientScoreCalculation nutrient = new NutrientScoreCalculation(today_dm); DataMap lights = nutrient.getLights(); + DataMap score = nutrient.getScore(); DataMap intake = nutrient.getIntakeComparedToTheRecommendedAmount(); DataMap.putToModel(model, "lights", lights); + DataMap.putToModel(model, "score", score); DataMap.putToModel(model, "intake", intake); } } diff --git a/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_score.xml b/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_score.xml index 4416e43..810ca35 100644 --- a/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_score.xml +++ b/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_score.xml @@ -210,7 +210,7 @@ )x GROUP BY DATE(x.reg_dt) ORDER BY x.reg_dt DESC - LIMIT 7 + LIMIT 15 diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_ingre_recommend.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_ingre_recommend.ftl index 022addd..9e02c38 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_ingre_recommend.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_ingre_recommend.ftl @@ -92,8 +92,10 @@
- - + +
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_nutrition_balance.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_nutrition_balance.ftl index 7065018..05b62c6 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_nutrition_balance.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_nutrition_balance.ftl @@ -28,7 +28,7 @@
- 과잉 + 초과
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_sn_nutrition_main_1.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_sn_nutrition_main_1.ftl index 867d11a..cbd16b8 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_sn_nutrition_main_1.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_sn_nutrition_main_1.ftl @@ -177,9 +177,9 @@ borderColor: '#e7e7e7', cubicInterpolationMode: true, pointRadius: '5', - pointBackgroundColor: [ '#fff', '#fff', '#fff', '#fff', '#fff', '#fff', '#fff' ], + pointBackgroundColor: [ '#fff', '#fff', '#fff', '#fff', '#fff', '#fff', '#fff', '#fff', '#fff', '#fff', '#fff', '#fff', '#fff', '#fff', '#fff' ], pointBorderWidth: '3', - pointBorderColor: ['#33CC33', '#33CC33', '#33CC33', '#33CC33', '#33CC33', '#33CC33', '#33CC33'], + pointBorderColor: ['#33CC33', '#33CC33', '#33CC33', '#33CC33', '#33CC33', '#33CC33', '#33CC33', '#33CC33', '#33CC33', '#33CC33', '#33CC33', '#33CC33', '#33CC33', '#33CC33', '#33CC33'], borderWidth: '3', lineTension: 0, /*pointHoverBorderColor: "#30a9d7",*/ @@ -231,7 +231,7 @@ xAxes: [{ display: true, //세로선 gridLines: { - color: ['#ddd', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#ddd'], + color: ['#ddd', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#ddd'], drawTicks: true, drawBorder: true, tickMarkLength: 3, @@ -306,7 +306,7 @@ pointRadius: '5', pointBackgroundColor: ['#fff', '#fff', '#fff', '#fff'], pointBorderWidth: '3', - pointBorderColor: ['#33CC33', '#33CC33', '#33CC33', '#33CC33'], + pointBorderColor: ['#33CC33', '#33CC33', '#33CC33', '#33CC33', '#33CC33', '#33CC33', '#33CC33', '#33CC33', '#33CC33', '#33CC33'], borderWidth: '3', lineTension: 0, /*pointHoverBorderColor: "#30a9d7",*/ @@ -358,7 +358,7 @@ xAxes: [{ display: true, gridLines: { - color: ['#ddd', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#ddd'], + color: ['#ddd', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#f2f2f2', '#ddd'], drawTicks: true, drawBorder: true, tickMarkLength: 3, diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/food_balance.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/food_balance.ftl index 8e611c7..908c242 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/food_balance.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/food_balance.ftl @@ -173,6 +173,10 @@
+ +
+<#include "/m/include/cart_script.ftl"> + + + +
+<#include "/m/include/cart_script.ftl"> <#include "/m/include/index_bottom_menu.ftl"> @@ -209,4 +213,4 @@ function frmview(nr_no){ } -<#include "/m/include/index_bottom.ftl"> \ No newline at end of file +<#include "/m/include/index_bottom.ftl"> \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/vac_schedule.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/vac_schedule.ftl index 4f343c7..4b6badf 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/vac_schedule.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_growth/vac_schedule.ftl @@ -125,6 +125,10 @@
+ + +
+<#include "/m/include/cart_script.ftl"> <#include "/m/include/index_bottom_menu.ftl"> diff --git a/src/main/webapp/WEB-INF/views/ftl/m/include/cart_script.ftl b/src/main/webapp/WEB-INF/views/ftl/m/include/cart_script.ftl new file mode 100644 index 0000000..d5fc8d2 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/ftl/m/include/cart_script.ftl @@ -0,0 +1,75 @@ + + + +
+ + +
+
+
+
 
+
+
+
+
+
+
+
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/ftl/m/include/cart_script2.ftl b/src/main/webapp/WEB-INF/views/ftl/m/include/cart_script2.ftl new file mode 100644 index 0000000..e688fb0 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/ftl/m/include/cart_script2.ftl @@ -0,0 +1,77 @@ + +
+ + + +
+ + +
+
+
+
 
+
+
+
+
+
+
+
+ + + \ No newline at end of file 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 b7b2121..6b0d4db 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 @@ -348,14 +348,17 @@
- +<#include "/m/include/cart_script2.ftl"> + <#if model['tutorial_cnt'] == 0> <#include "/m/include/index_tutorial.ftl"> + +