java
/
bf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

가온앤 체크리스트 적용8

Browse Source 
남은 체크리스트
#데이터 베이스 체크
dev_bert
isol2011 3 years ago
parent ba919d1236
commit 52262ee393
6 changed files with 97 additions and 41 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/backoffice/logic/FoodScoreCalculation.java
Unescape View File

@ -245,7 +245,7 @@ public class FoodScoreCalculation {
*/ */
private double get_dqi_food5(double x) { private double get_dqi_food5(double x) {
if( x ==0 ) if( x ==0 )
return 0; return 2.5;
else if(label==1) { else if(label==1) {
if(x<=29.56) return 2.5; if(x<=29.56) return 2.5;
else if(x<=59.15) return 1.25; else if(x<=59.15) return 1.25;

2
src/main/java/com/backoffice/logic/NutrientScoreCalculation.java
Unescape View File

@ -779,7 +779,7 @@ public class NutrientScoreCalculation {
result.put("sugar", getLight(sugar, ARR_INTAKE_FROM[sugar_idx][label])); result.put("sugar", getLight(sugar, ARR_INTAKE_FROM[sugar_idx][label]));
// 12개월 미만 식이섬유는 기준 없음 // 12개월 미만 식이섬유는 기준 없음
if(label<2) if(label<2)
result.put("fibtg", null); result.put("fibtg", Lights.red.name());
else else
result.put("fibtg", getLight(fibtg, ARR_INTAKE_FROM[fibtg_idx][label], ARR_INTAKE_TO[fibtg_idx][label])); 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("na", getLight(na, ARR_INTAKE_FROM[na_idx][label]));

2
src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java
Unescape View File

@ -1744,7 +1744,7 @@ public class M_Bf_foodController extends AbstractControllerManager{
DataMap.putToModel(model, "score", score); DataMap.putToModel(model, "score", score);
DataMap.putToModel(model, "intake", intake); DataMap.putToModel(model, "intake", intake);
} }
} }
}catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();} }catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();}
gmUtil.redirectParam(model, paramMap); gmUtil.redirectParam(model, paramMap);

108
src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_foodgroup_balance.ftl
Unescape View File

@ -60,11 +60,12 @@
</div> </div>
</div> </div>
<!-- //nutrient_box --> <!-- //nutrient_box -->
<!-- nutrient_box --> <#if (5 < model['rm_child']['m'])>
<!-- nutrient_box -->
<div class="nutrient_box"> <div class="nutrient_box">
<p class="tit">통곡물<span>Whole Grains</span></p> <p class="tit">통곡물<span>Whole Grains</span></p>
<#assign dqi_food_4=model['score']['dqi_food_4']?number> <#assign dqi_food_4=model['score']['dqi_food_4']?number>
<p class="per">${dqi_food_4!}점</p> <p class="per">${dqi_food_4?string.number!}점</p>
<div class="nutrient_slider"> <div class="nutrient_slider">
<p class="base"></p> <p class="base"></p>
<p class="move ${model['lights']['dqi_food_4']!}" style="width:${dqi_food_4!*20}%"></p> <p class="move ${model['lights']['dqi_food_4']!}" style="width:${dqi_food_4!*20}%"></p>
@ -73,18 +74,6 @@
</div> </div>
<!-- //nutrient_box --> <!-- //nutrient_box -->
<!-- nutrient_box --> <!-- nutrient_box -->
<div class="nutrient_box">
<p class="tit">정제된곡물<span>Refined Grains</span></p>
<#assign dqi_food_5=model['score']['dqi_food_5']?number>
<p class="per">${dqi_food_5!}점</p>
<div class="nutrient_slider">
<p class="base"></p>
<p class="move ${model['lights']['dqi_food_5']!}" style="width:${dqi_food_5!*20}%"></p>
<span class="point ${model['lights']['dqi_food_5']!}" style="left:${dqi_food_5!*20}%"></span>
</div>
</div>
<!-- //nutrient_box -->
<!-- nutrient_box -->
<div class="nutrient_box"> <div class="nutrient_box">
<p class="tit">단백질<span>Protein</span></p> <p class="tit">단백질<span>Protein</span></p>
<#assign dqi_food_6=model['score']['dqi_food_6']?number> <#assign dqi_food_6=model['score']['dqi_food_6']?number>
@ -120,18 +109,7 @@
</div> </div>
</div> </div>
<!-- //nutrient_box --> <!-- //nutrient_box -->
<!-- nutrient_box --> </#if>
<div class="nutrient_box">
<p class="tit">100% 과일주스<span>100% Fruits Juices</span></p>
<#assign dqi_food_9=model['score']['dqi_food_9']?number>
<p class="per">${dqi_food_9!}점</p>
<div class="nutrient_slider">
<p class="base"></p>
<p class="move ${model['lights']['dqi_food_9']!}" style="width:${dqi_food_9!*20}%"></p>
<span class="point ${model['lights']['dqi_food_9']!}" style="left:${dqi_food_9!*20}%"></span>
</div>
</div>
<!-- //nutrient_box -->
</div> </div>
<!-- //nutrient_list --> <!-- //nutrient_list -->
</div> </div>
@ -142,6 +120,84 @@
<h2>부정 식품군</h2> <h2>부정 식품군</h2>
<!-- nutrient_list --> <!-- nutrient_list -->
<div class="nutrient_list"> <div class="nutrient_list">
<#if (model['rm_child']['m'] <= 5)>
<!-- nutrient_box -->
<div class="nutrient_box">
<p class="tit">통곡물<span>Whole Grains</span></p>
<#assign dqi_food_4=model['score']['dqi_food_4']>
<p class="per">${dqi_food_4?string.number!}점</p>
<div class="nutrient_slider">
<p class="base"></p>
<p class="move ${model['lights']['dqi_food_4']!}" style="width:${dqi_food_4!*20}%"></p>
<span class="point ${model['lights']['dqi_food_4']!}" style="left:${dqi_food_4!*20}%"></span>
</div>
</div>
<!-- //nutrient_box -->
<!-- nutrient_box -->
<div class="nutrient_box">
<p class="tit">단백질<span>Protein</span></p>
<#assign dqi_food_6=model['score']['dqi_food_6']?number>
<p class="per">${dqi_food_6!}점</p>
<div class="nutrient_slider">
<p class="base"></p>
<p class="move ${model['lights']['dqi_food_6']!}" style="width:${dqi_food_6!*20}%"></p>
<span class="point ${model['lights']['dqi_food_6']!}" style="left:${dqi_food_6!*20}%"></span>
</div>
</div>
<!-- //nutrient_box -->
<!-- nutrient_box -->
<div class="nutrient_box">
<p class="tit">채소류<span>Vegitables</span></p>
<#assign dqi_food_7=model['score']['dqi_food_7']?number>
<p class="per">${dqi_food_7!}점</p>
<div class="nutrient_slider">
<p class="base"></p>
<p class="move ${model['lights']['dqi_food_7']!}" style="width:${dqi_food_7!*20}%"></p>
<span class="point ${model['lights']['dqi_food_7']!}" style="left:${dqi_food_7!*20}%"></span>
</div>
</div>
<!-- //nutrient_box -->
<!-- nutrient_box -->
<div class="nutrient_box">
<p class="tit">과일류<span>Fruits</span></p>
<#assign dqi_food_8=model['score']['dqi_food_8']?number>
<p class="per">${dqi_food_8!}점</p>
<div class="nutrient_slider">
<p class="base"></p>
<p class="move ${model['lights']['dqi_food_8']!}" style="width:${dqi_food_8!*20}%"></p>
<span class="point ${model['lights']['dqi_food_8']!}" style="left:${dqi_food_8!*20}%"></span>
</div>
</div>
<!-- //nutrient_box -->
</#if>
<#if (5 < model['rm_child']['m'])>
<!-- nutrient_box -->
<div class="nutrient_box">
<p class="tit">정제된곡물<span>Refined Grains</span></p>
<#assign dqi_food_5=model['score']['dqi_food_5']>
<p class="per">${dqi_food_5?string.number!}점</p>
<div class="nutrient_slider">
<p class="base"></p>
<p class="move ${model['lights']['dqi_food_5']!}" style="width:${dqi_food_5!*40}%"></p>
<span class="point ${model['lights']['dqi_food_5']!}" style="left:${dqi_food_5!*40}%"></span>
</div>
</div>
<!-- //nutrient_box -->
</#if>
<!-- nutrient_box -->
<div class="nutrient_box">
<p class="tit">100% 과일주스<span>100% Fruits Juices</span></p>
<#assign dqi_food_9=model['score']['dqi_food_9']?number>
<p class="per">${dqi_food_9!}점</p>
<div class="nutrient_slider">
<p class="base"></p>
<p class="move ${model['lights']['dqi_food_9']!}" style="width:${dqi_food_9!*20}%"></p>
<span class="point ${model['lights']['dqi_food_9']!}" style="left:${dqi_food_9!*20}%"></span>
</div>
</div>
<!-- //nutrient_box -->
<!-- nutrient_box --> <!-- nutrient_box -->
<div class="nutrient_box"> <div class="nutrient_box">
<p class="tit">당함유 음료<span>Sugar-Sweetened Beverages</span></p> <p class="tit">당함유 음료<span>Sugar-Sweetened Beverages</span></p>

20
src/main/webapp/WEB-INF/views/ftl/m/member_env/view_faq.ftl
Unescape View File

@ -10,7 +10,7 @@
<main class="m_customer_center_faq"> <main class="m_customer_center_faq">
<div class="faq_list_wrap"> <div class="faq_list_wrap">
<div class="faq_list"> <!-- <div class="faq_list">
<div class="title"> <div class="title">
<span class="icon">Q</span> <span class="icon">Q</span>
<h3>누워서 키 재는 방법 &#40;0~23개월&#41;</h3> <h3>누워서 키 재는 방법 &#40;0~23개월&#41;</h3>
@ -67,8 +67,8 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div> -->
<div class="faq_list"> <!-- <div class="faq_list">
<div class="title"> <div class="title">
<span class="icon">Q</span> <span class="icon">Q</span>
<h3>서서 키 재는 방법 &#40;23개월 이상~&#41;</h3> <h3>서서 키 재는 방법 &#40;23개월 이상~&#41;</h3>
@ -133,8 +133,8 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div> -->
<div class="faq_list"> <!-- <div class="faq_list">
<div class="title"> <div class="title">
<span class="icon">Q</span> <span class="icon">Q</span>
<h3> 블루투스 연결하는 방법 </h3> <h3> 블루투스 연결하는 방법 </h3>
@ -166,8 +166,8 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div> -->
<div class="faq_list"> <!-- <div class="faq_list">
<div class="title"> <div class="title">
<span class="icon">Q</span> <span class="icon">Q</span>
<h3>무드등 시간 설정하는 방법</h3> <h3>무드등 시간 설정하는 방법</h3>
@ -198,8 +198,8 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div> -->
<div class="faq_list"> <!-- <div class="faq_list">
<div class="title"> <div class="title">
<span class="icon">Q</span> <span class="icon">Q</span>
<h3>소나 하드웨어 설명</h3> <h3>소나 하드웨어 설명</h3>
@ -218,7 +218,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div> -->
</div> </div>
<#include "/m/include/index_bottom_info.ftl"> <#include "/m/include/index_bottom_info.ftl">

4
src/main/webapp/m/css/style.css
Unescape View File

@ -13669,7 +13669,7 @@ main.sona_cont_measurement {
height: 40px; height: 40px;
color: #6A6A6A; color: #6A6A6A;
text-align: center; text-align: center;
width: 50px; width: 2rem;
} }
.input_btn { .input_btn {
@ -13684,7 +13684,7 @@ main.sona_cont_measurement {
.take_time .border_btn{ .take_time .border_btn{
width: 85px; width: 4.8rem;
} }
.time_div{ .time_div{

Write Preview
Loading…
Cancel
Save