From b02bee46d75660887099c2785ba9ef79d61d9a68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=9D=B4=EC=86=94?= Date: Fri, 3 Jun 2022 00:50:25 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=9C=A0=EC=8B=9D=EB=8B=B9=20?= =?UTF-8?q?=EC=B2=B4=ED=81=AC=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #알레르기 이모티콘에 대한 설명 문구 추가 #신호등 문구 설명, 위치 --- .../webapp/WEB-INF/views/ftl/m/bf_food/index.ftl | 2 +- .../ftl/m/bf_food/list_bf_commerce_popup.ftl | 13 ++++++++++++- .../ftl/m/bf_food/list_bf_homemade_popup.ftl | 15 +++++++++++++-- .../ftl/m/bf_food/list_bf_homemade_recommend.ftl | 2 +- .../ftl/m/bf_food/view_foodgroup_balance.ftl | 16 ++++++++++++++-- .../ftl/m/bf_food/view_nutrition_balance.ftl | 14 +++++++++++--- .../views/ftl/m/bf_growth/food_balance.ftl | 2 +- 7 files changed, 53 insertions(+), 11 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/index.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/index.ftl index d642411..2726033 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/index.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/index.ftl @@ -148,7 +148,7 @@
  • -

    부정영양소

    +

    부정식품군

    과일, 당 첨가식품, 음료, 과자 등

    <#if model['today']['unhealthyFood']??>${model['today']['unhealthyFood']!}<#else>0%
    diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_commerce_popup.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_commerce_popup.ftl index 04eeb8a..f259e76 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_commerce_popup.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_commerce_popup.ftl @@ -15,7 +15,11 @@
    알레르기 아이콘 - 알레르기 + 알레르기 + + + +
      <#if model['lm']?has_content> @@ -192,4 +196,11 @@ $(this).addClass("active"); } }); + + $("#info_btn").click(function() { + Swal.fire({ + title: '알레르기 안내', + text: '알레르기를 유발할 수 있는 식재료를 포함하고 있으니 주의하세요.', + }) + }); \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_popup.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_popup.ftl index feaae1f..40a4963 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_popup.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_popup.ftl @@ -7,9 +7,13 @@
    -
    +
    알레르기 아이콘 - 알레르기 + 알레르기 + + + +
      <#if model['lm']?has_content> @@ -182,4 +186,11 @@ $(this).addClass("active"); } }); + + $("#info_btn").click(function() { + Swal.fire({ + title: '알레르기 안내', + text: '알레르기를 유발할 수 있는 식재료를 포함하고 있으니 주의하세요.', + }) + }); \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_recommend.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_recommend.ftl index 32584d2..12b1a74 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_recommend.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_recommend.ftl @@ -62,7 +62,7 @@ <#else> - 추천 식재료가 없습니다. + 추천 이유식이 없습니다.
    diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_foodgroup_balance.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_foodgroup_balance.ftl index 3986e05..a0a88cf 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_foodgroup_balance.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_foodgroup_balance.ftl @@ -38,7 +38,7 @@
    균형
    - + @@ -255,7 +255,19 @@ <#include "/m/include/index_bottom_menu.ftl"> - + + 부정식품군을 먹을수록 불균형이에요!!' + <#else> + '영유아의 식품군 섭취의 질을 평가하기 위한 DQIS(Doet Quality Index Score)는 연령별 그룹을 나누어 6개월~ 4세에 대한 기준은 [hamner HC et el., Dietary quality among children from 6 months to 4 years, NHANES 2011–2016, Am J Clin Nutr 2020]에 근거하여 표시하고 있으며, 부정식품군을 먹을수록 불균형이에요!!' + + }) + }); + <#include "/m/bf_coach/include_return_url.ftl"> 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 7becce9..7065018 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 @@
    - 초과 + 과잉
    @@ -38,7 +38,7 @@
    적정
    - +
    @@ -411,7 +411,15 @@ <#include "/m/include/index_bottom_menu.ftl"> - + + <#include "/m/bf_coach/include_return_url.ftl"> 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 9cc9a7b..8e611c7 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 @@ -91,7 +91,7 @@
  • -

    부정영양소

    +

    부정식품군

    과일, 당 첨가식품, 음료, 과자 등

    <#if model['today']['unhealthyFood']??>${model['today']['unhealthyFood']!}<#else>0점