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

fixed bert

Browse Source
dev_bert
zhangjinli 2 years ago
parent fadb2d78c0
commit 919892b7d9
7 changed files with 1146 additions and 942 deletions
Show Stats Download Patch File Download Diff File

1823
src/main/java/com/backoffice/m/bf_growth/M_Bf_growthController.java
View File

File diff suppressed because it is too large Load Diff

76
src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bottom.ftl
Unescape View File

@ -23,7 +23,17 @@
<!-- //메모 -->
<div class="w_div">
<span class="switch_save_board switch_save_board1" onclick="switch_save_board(1)">공개일기</span> / <span class="switch_save_board switch_save_board2" onclick="switch_save_board(2)">성장일기</span>
<div class="share_board">
<span id="switch_save_board1" class="switch_save_board active" onclick="switch_save_board(1)">공개 안함</span>
<span> / </span>
<span id="switch_save_board2" class="switch_save_board" onclick="switch_save_board(2)">공개일기</span>
<span> / </span>
<span id="switch_save_board3" class="switch_save_board" onclick="switch_save_board(3)">성장일기</span>
</div>
<div class="share_board_desc">
<div>작성하신 글은 공개가 가능하며, 공개된 글은 다른 부모들에게 도움을 줄 수 있습니다.</div>
<div>이 글을 커뮤니티에 공개하려면 '전체 공개'로 변경해주세요.</div>
</div>
</div>
<!-- modal-wrapper -->
@ -285,34 +295,24 @@
};
function switch_save_board(i){
let cur_bar1 = $(".switch_save_board1")
let cur_bar2 = $(".switch_save_board2")
let cur_val
let switch_save_board = $(".switch_save_board")
switch_save_board.removeClass("active");
switch (i){
case 1:
cur_val = cur_bar1.hasClass("active")
if(cur_val){
$("#share_tp").val('N');
}else{
$("#share_tp").val('Y');
$("#share_board_kind").val("BF_CT_TP_6");
}
cur_bar1.toggleClass("active");
cur_bar2.removeClass("active");
break;
case 2:
cur_val = cur_bar2.hasClass("active")
if(cur_val){
$("#share_tp").val('N');
}else{
$("#share_tp").val('Y');
$("#share_board_kind").val("BF_CT_TP_7");
}
cur_bar2.toggleClass("active");
cur_bar1.removeClass("active");
case 1:
$("#share_tp").val('N');
$("#share_board_kind").val("");
break;
case 2:
$("#share_tp").val('Y');
$("#share_board_kind").val("BF_CT_TP_6");
break;
case 2:
$("#share_tp").val('Y');
$("#share_board_kind").val("BF_CT_TP_7");
break;
}
};
$("#switch_save_board"+i).addClass("active");
};
$('.modal_close_btn').on('click', function() {
$('.modal-wrapper').removeClass('open');
});
@ -683,16 +683,28 @@
<#include "/m/include/include_return_url.ftl">
<style>
.switch_save_board{
font-size: 14px;
color: #707070;
font-weight: 400;
text-decoration: line-through;
.w_div .share_board{
margin-bottom: 20px;
font-size: 14px;
color: #707070;
font-weight: 400;
}
.w_div .share_board .switch_save_board{
text-decoration: line-through;
}
.w_div .active{
.w_div .share_board .active{
color: #000000;
text-decoration: none;
}
.w_div .share_board_desc{
line-height: 18px;
font-weight: 300;
color: #000000;
font-size: 12px;
}
</style>
</body>

23
src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_sn_nutrition_main_1.ftl
Unescape View File

@ -280,10 +280,31 @@ on: {
caretPadding: 5,
cornerRadius: 10,
caretSize: 5,
}
},
onClick:chart_click
}, //옵션
});
function chart_click(e,arr){
var points = this.chart.getElementAtEvent(e);
if (points.length > 0) {
var index = points[0]._index;
var reg_ymd = ""
<#if model['daily']?has_content>
<#list model['daily']?reverse as item>
if(index == ${item_index}){
var t = ${item['reg_time']!}
t = new Date(t*1000)
var year =t.getFullYear()
var month = (t.getMonth() + 1) > 9 && (t.getMonth() + 1) || ('0' + (t.getMonth() + 1))
var day = t.getDate() > 9 && t.getDate() || ('0' + t.getDate())
var time = year + '-' + month + '-' + day
switch_chart_day(time)
}
</#list>
</#if>
}
};
/* 그래프 myChart2 */
var ctx = document.getElementById("myChart2");
var myChart = new Chart(ctx, {

29
src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_sn_nutrition_main_2.ftl
Unescape View File

@ -151,6 +151,11 @@
nextEl: '.swiper-button-next', // 다음 버튼 클래스명
prevEl: '.swiper-button-prev', // 이번 버튼 클래스명
},
on: {
slideChangeTransitionStart: function(){
show(this.activeIndex)
},
},
});
/* 그래프 myChart4 (일간) */
@ -276,10 +281,32 @@
caretPadding: 5,
cornerRadius: 10,
caretSize: 5,
}
},
onClick:chart_click
}, //옵션
});
function chart_click(e,arr){
var points = this.chart.getElementAtEvent(e);
if (points.length > 0) {
var index = points[0]._index;
var reg_ymd = ""
<#if model['daily']?has_content>
<#list model['daily']?reverse as item>
if(index == ${item_index}){
var t = ${item['reg_time']!}
t = new Date(t*1000)
var year =t.getFullYear()
var month = (t.getMonth() + 1) > 9 && (t.getMonth() + 1) || ('0' + (t.getMonth() + 1))
var day = t.getDate() > 9 && t.getDate() || ('0' + t.getDate())
var time = year + '-' + month + '-' + day
switch_chart_day(time)
}
</#list>
</#if>
}
};
/* 그래프 myChart5 (주간) */
var ctx = document.getElementById("myChart5");
var myChart = new Chart(ctx, {

54
src/main/webapp/WEB-INF/views/ftl/m/bf_growth/food_balance.ftl
Unescape View File

@ -76,10 +76,12 @@
<!-- //nutrition_subMain_iframe -->
<!-- nutrition_subMain_graph_list -->
<div class="nutrition_subMain_graph_list">
<div id="nutrition_subMain_graph_list" class="nutrition_subMain_graph_list">
<#if (model['rm_child']['past_month']<60)>
<h2 style="float: left; margin: 30px 0 15px;font-size: 20px; font-weight: 400;">오늘의 식품군</h2>
<h2 style="float: left; margin: 30px 0 15px;font-size: 20px; font-weight: 400;">
<span id="today_reg_dt">${model['today']['today_reg_dt']!}</span>의 식품군
</h2>
<#if (model['today']['today_recode']==true)>
<a href="${URL_ROOT}/m/bf_food/view_foodgroup_balance.do?return_url=index" class="detail_veiw_btn">자세히 보기 &gt</a>
</#if>
@ -90,14 +92,18 @@
<p class="tit">긍정식품군</p>
<p>모유, 분유, 곡류, 채소, 단백질, 과일 등</p>
</div>
<div class="circleChart circleChart1" data-percent="${model['today']['healthyFood']!}"><span class="title"><#if model['today']['healthyFood']??>${model['today']['healthyFood']!}<#else>0</#if>점</span></div>
<div id="healthyFood_today" class="circleChart circleChart1" data-percent="${model['today']['healthyFood']!}">
<span id="healthyFood_today_data" class="title"><#if model['today']['healthyFood']??>${model['today']['healthyFood']!}<#else>0</#if>점</span>
</div>
</li>
<li>
<div class="txt">
<p class="tit">부정식품군</p>
<p>과일, 당 첨가식품, 음료, 과자 등</p>
</div>
<div class="circleChart circleChart1" data-percent="${model['today']['unhealthyFood']!}"><span class="title"><#if model['today']['unhealthyFood']??>${model['today']['unhealthyFood']!}<#else>0</#if>점</span></div>
<div id="unhealthyFood_today" class="circleChart circleChart1" data-percent="${model['today']['unhealthyFood']!}">
<span id="unhealthyFood_today_data" class="title"><#if model['today']['unhealthyFood']??>${model['today']['unhealthyFood']!}<#else>0</#if>점</span>
</div>
</li>
</ul>
</div>
@ -190,7 +196,13 @@
timer: 2000
});
}
function show(i){
if(i == 0){
document.getElementById('nutrition_subMain_graph_list').style.display = 'block'
}else{
document.getElementById('nutrition_subMain_graph_list').style.display = 'none'
}
};
var swiper = new Swiper('.swiper-container1', {
slidesPerView: 3,
slidesPerGroup: 3,
@ -217,7 +229,8 @@
onStart: $.noop,
onStop: $.noop
});
chart1 = window.chart = $('#healthyFood_today').data('easyPieChart');
chart2 = window.chart = $('#unhealthyFood_today').data('easyPieChart');
// 높이 똑같게 맞추기
var equalHeight = function(element) {
var maxHeight = 0;
@ -241,6 +254,35 @@
var list = $(".nutrition_subMain_swiper .swiper-slide");
list.height(equalHeight(list));
})
function switch_chart_day(reg_dt) {
var data = {
reg_dt
}
$.ajax({
url:'${URL_ROOT}/m/bf_growth/ajax_switch_daily_count.do?1=1',
type:'post',
data: data,
dataType:'json',
error:function(request,status,error){
Swal.fire({text:"등록되지 않았습니다"})
},
success:function(result){
console.log(result)
let healthyFood = result.result.healthyFood
let unhealthyFood = result.result.unhealthyFood
$('#today_reg_dt').html(reg_dt)
$('#healthyFood_today').attr("data-percent",healthyFood);
$('#unhealthyFood_today').attr("data-percent",unhealthyFood);
chart1.update(healthyFood);
chart2.update(unhealthyFood);
$('#healthyFood_today_data').html(healthyFood)
$('#unhealthyFood_today_data').html(unhealthyFood)
// Swal.fire({text:"처리 되었습니다"})
},
});
};
</script>
<!-- 하단 네비 iyu_nav -->

53
src/main/webapp/WEB-INF/views/ftl/m/bf_growth/nutrient_balance.ftl
Unescape View File

@ -77,7 +77,9 @@
<!-- nutrition_subMain_graph_list -->
<div id="nutrition_subMain_graph_list" class="nutrition_subMain_graph_list">
<#if (model['rm_child']['m']<60)>
<h2 style="float: left; margin: 30px 0 15px;font-size: 20px; font-weight: 400;">오늘의 영양소</h2>
<h2 style="float: left; margin: 30px 0 15px;font-size: 20px; font-weight: 400;">
<span id="today_reg_dt">${model['today']['today_reg_dt']!}</span>의 영양소
</h2>
<#if (model['today']['today_recode']==true)>
<a href="${URL_ROOT}/m/bf_food/view_nutrition_balance.do?return_url=index" class="detail_veiw_btn">자세히 보기 &gt</a>
</#if>
@ -88,21 +90,27 @@
<p class="tit">기초영양소</p>
<p>에너지, 탄수화물, 단백질, 지방 등</p>
</div>
<div class="circleChart circleChart1" data-percent="${model['today']['basicNutrition']!}"><span class="title"><#if model['today']['basicNutrition']??>${model['today']['basicNutrition']!}<#else>0</#if>점</span></div>
<div id="basicNutrition_today" class="circleChart circleChart1" data-percent="${model['today']['basicNutrition']!}">
<span id="basicNutrition_today_data" class="title"><#if model['today']['basicNutrition']??>${model['today']['basicNutrition']!}<#else>0</#if>점</span>
</div>
</li>
<li>
<div class="txt">
<p class="tit">성장영양소</p>
<p>비타민 B1/B2, 나이아신, 칼륨, 칼슘 등</p>
</div>
<div class="circleChart circleChart1" data-percent="${model['today']['growthNutrition']!}"><span class="title"><#if model['today']['growthNutrition']??>${model['today']['growthNutrition']!}<#else>0</#if>점</span></div>
<div id="growthNutrition_today" class="circleChart circleChart1" data-percent="${model['today']['growthNutrition']!}">
<span id="growthNutrition_today_data" class="title"><#if model['today']['growthNutrition']??>${model['today']['growthNutrition']!}<#else>0</#if>점</span>
</div>
</li>
<li>
<div class="txt">
<p class="tit">면역영양소</p>
<p>비타민 A/C/D/E, 아연</p>
</div>
<div class="circleChart circleChart1" data-percent="${model['today']['immuneNutrition']!}"><span class="title"><#if model['today']['immuneNutrition']??>${model['today']['immuneNutrition']!}<#else>0</#if>점</span></div>
<div id="immuneNutrition_today" class="circleChart circleChart1" data-percent="${model['today']['immuneNutrition']!}">
<span id="immuneNutrition_today_data" class="title"><#if model['today']['immuneNutrition']??>${model['today']['immuneNutrition']!}<#else>0</#if>점</span>
</div>
</li>
</ul>
</div>
@ -161,7 +169,9 @@
onStart: $.noop,
onStop: $.noop
});
chart1 = window.chart = $('#basicNutrition_today').data('easyPieChart');
chart2 = window.chart = $('#growthNutrition_today').data('easyPieChart');
chart3 = window.chart = $('#immuneNutrition_today').data('easyPieChart');
// 높이 똑같게 맞추기
var equalHeight = function(element) {
var maxHeight = 0;
@ -221,6 +231,39 @@ function frmview(nr_no){
$('#frmView').children('#nr_no').val(nr_no);
$('#frmView').submit();
}
function switch_chart_day(reg_dt) {
var data = {
reg_dt
}
$.ajax({
url:'${URL_ROOT}/m/bf_growth/ajax_switch_daily_count.do?1=1',
type:'post',
data: data,
dataType:'json',
error:function(request,status,error){
Swal.fire({text:"등록되지 않았습니다"})
},
success:function(result){
console.log(result)
let basicNutrition = result.result.basicNutrition
let growthNutrition = result.result.growthNutrition
let immuneNutrition = result.result.immuneNutrition
$('#today_reg_dt').html(reg_dt)
$('#basicNutrition_today').attr("data-percent",basicNutrition);
$('#growthNutrition_today').attr("data-percent",growthNutrition);
$('#immuneNutrition_today').attr("data-percent",immuneNutrition);
chart1.update(basicNutrition);
chart2.update(growthNutrition);
chart3.update(immuneNutrition);
$('#basicNutrition_today_data').html(basicNutrition)
$('#growthNutrition_today_data').html(growthNutrition)
$('#immuneNutrition_today_data').html(immuneNutrition)
// Swal.fire({text:"처리 되었습니다"})
},
});
};
</script>
<#include "/m/include/index_bottom.ftl">

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

@ -13898,6 +13898,7 @@ main.sona_cont_measurement {
display: flex;
flex-direction: row;
flex-wrap: wrap;
margin-bottom: -5px;
}
.vac_btn{
display: flex;
@ -13913,6 +13914,7 @@ main.sona_cont_measurement {
padding:0 10px 0 15px;
border-radius: 20px;
margin-right:5px;
margin-bottom: 5px;
display: flex;
justify-content: space-between;
align-items: center;
@ -13934,6 +13936,10 @@ main.sona_cont_measurement {
font-size: 12pt;
}
.memo_btn_div .img_btn{
display:flex;
}
.memo_btn_div .img_btn img{
width: 24px;
}

Write Preview
Loading…
Cancel
Save