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

[추가] 7/19 오류 수정

Browse Source 
영양 신호등 수정
2. 아기건강의 예방접종 스케줄 에도 mmr처럼 전부 다 나오기 EX) 1차 홍역 -> 1차 홍역(MMR)
5. UI 동그라미 균형 맞추기 : 대소변, 젖병, 수면, 병원 에서 모두
6. 젖병에서 분유, 유축수유에서 전부 수유량->섭취량으로 워딩 변경
7. 유축 에서 시간이 +10, +5 가 아니라 -> +5   +10 으로 커지는 순서로 변경
8. 커뮤니티에서 댓글, 댓글쓰기가 두개여서 헷갈립니다. 댓글 부분에 '댓글쓰기' 로 변경 해주세요.
9. 입력한 제품인지 눈에 명확하게 보이지가 않습니다. 각 해당 색을 넣어주실 수 있을까요?
dev_bert
isol2011 3 years ago
parent 2807901bce
commit 2c121e2c0f
12 changed files with 54 additions and 34 deletions
Show Stats Download Patch File Download Diff File

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

@ -783,7 +783,7 @@ public class NutrientScoreCalculation {
if(x<=from) if(x<=from)
return Lights.green.name(); return Lights.green.name();
else if(x>from) else if(x>from)
return Lights.yellow.name(); return Lights.red.name();
else else
return ""; return "";
} }
@ -817,7 +817,7 @@ public class NutrientScoreCalculation {
result.put("fat", getLight(fat, ARR_INTAKE_FROM[fat_idx][label], ARR_INTAKE_TO[fat_idx][label])); 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])); result.put("sugar", getLight(sugar, ARR_INTAKE_FROM[sugar_idx][label]));
// 12개월 미만 식이섬유는 기준 없음 // 12개월 미만 식이섬유는 기준 없음
if(label<2) if(label<=2)
result.put("fibtg", Lights.red.name()); 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]));

4
src/main/resources/sqlmap/m/bf_growth/com.backoffice.m.bf_growth.xml
Unescape View File

@ -396,7 +396,7 @@
select date_format(date_add(fb.birthday,interval dvs.start_label month),'%Y. %m. %d') recmnd_from_dt select date_format(date_add(fb.birthday,interval dvs.start_label month),'%Y. %m. %d') recmnd_from_dt
, date_format(date_add(date_add(fb.birthday, interval dvs.end_label month), interval -1 day),'%Y. %m. %d') recmnd_to_dt , date_format(date_add(date_add(fb.birthday, interval dvs.end_label month), interval -1 day),'%Y. %m. %d') recmnd_to_dt
, date_format(date_add(fb.birthday,interval dvs.start_label month),'%Y년 %m월') recmnd_month , date_format(date_add(fb.birthday,interval dvs.start_label month),'%Y년 %m월') recmnd_month
, concat (dvs.round, ' 차 ', dv_disease ) as dv_disease , concat (dvs.round, ' 차 ', dv_disease, ' [', dv.dv_type, ']' ) as dv_disease
, dvs.round , dvs.round
from tbl_db_vac_schedule dvs from tbl_db_vac_schedule dvs
inner join tbl_db_vac dv inner join tbl_db_vac dv
@ -411,7 +411,7 @@
select date_format(date_add(fb.birthday,interval dvs.start_label month),'%Y. %m. %d') recmnd_from_dt select date_format(date_add(fb.birthday,interval dvs.start_label month),'%Y. %m. %d') recmnd_from_dt
, date_format(date_add(date_add(fb.birthday, interval dvs.end_label month), interval -1 day),'%Y. %m. %d') recmnd_to_dt , date_format(date_add(date_add(fb.birthday, interval dvs.end_label month), interval -1 day),'%Y. %m. %d') recmnd_to_dt
, date_format(date_add(fb.birthday,interval dvs.start_label month),'%Y년 %m월') recmnd_month , date_format(date_add(fb.birthday,interval dvs.start_label month),'%Y년 %m월') recmnd_month
, concat (dvs.round, ' 차 ', dv_disease ) as dv_disease , concat (dvs.round, ' 차 ', dv_disease, ' [', dv.dv_type, ']') as dv_disease
, dvs.round , dvs.round
from tbl_db_vac_schedule dvs from tbl_db_vac_schedule dvs
inner join tbl_db_vac dv inner join tbl_db_vac dv

27
src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml
Unescape View File

@ -3,6 +3,7 @@
<sqlMap namespace="com.backoffice.m.memory"> <sqlMap namespace="com.backoffice.m.memory">
<select id="select_week" resultClass="dataMap" parameterClass="dataMap"> <select id="select_week" resultClass="dataMap" parameterClass="dataMap">
SELECT SELECT
XA.dn_no,
XA.day, XA.day,
XA.dd, XA.dd,
XA.hour, XA.hour,
@ -214,7 +215,8 @@
FROM tbl_bf_daily_nutrition_15 tn1 FROM tbl_bf_daily_nutrition_15 tn1
WHERE tn1.dn_no = b.dn_no WHERE tn1.dn_no = b.dn_no
) )
END AS time_val END AS time_val,
b.dn_no as dn_no
FROM tbl_bf_family_match a FROM tbl_bf_family_match a
INNER JOIN tbl_bf_daily_nutrition b on a.smc_no = b.smc_no INNER JOIN tbl_bf_daily_nutrition b on a.smc_no = b.smc_no
INNER JOIN tbl_code_item_str c on b.nutirition_cd_no = c.cd_no INNER JOIN tbl_code_item_str c on b.nutirition_cd_no = c.cd_no
@ -222,14 +224,16 @@
a.smc_no = #smc_no# a.smc_no = #smc_no#
and b.nutirition_cd_no != '' and b.nutirition_cd_no != ''
and b.reg_dt between STR_TO_DATE(#startDate#,'%Y-%m-%d %H:%i:%s') and ADDDATE( STR_TO_DATE(#endDate#,'%Y-%m-%d %H:%i:%s'), INTERVAL 7 DAY) and b.reg_dt between STR_TO_DATE(#startDate#,'%Y-%m-%d %H:%i:%s') and ADDDATE( STR_TO_DATE(#endDate#,'%Y-%m-%d %H:%i:%s'), INTERVAL 7 DAY)
group by DATE_FORMAT(b.reg_dt, '%Y-%m-%d %H'), DATE_FORMAT(b.reg_dt, '%H'), DATE_FORMAT(b.reg_dt, '%d'), LPAD(c.val_1, 2, '0') group by dn_no, DATE_FORMAT(b.reg_dt, '%Y-%m-%d %H'), DATE_FORMAT(b.reg_dt, '%H'), DATE_FORMAT(b.reg_dt, '%d'), LPAD(c.val_1, 2, '0')
order by DATE_FORMAT(b.reg_dt, '%Y-%m-%d') asc, DATE_FORMAT(b.reg_dt, '%H') asc, DATE_FORMAT(b.reg_dt, '%d') asc, LPAD(c.val_1, 2, '0') asc order by DATE_FORMAT(b.reg_dt, '%Y-%m-%d') asc, DATE_FORMAT(b.reg_dt, '%H') asc, DATE_FORMAT(b.reg_dt, '%d') asc, LPAD(c.val_1, 2, '0') asc
) XA ) XA
where XA.time_val is not null where XA.time_val is not null
</select> </select>
<select id="select_day" resultClass="dataMap" parameterClass="dataMap"> <select id="select_day" resultClass="dataMap" parameterClass="dataMap">
SELECT start_degree, SELECT
dn_no,
start_degree,
category, category,
title, title,
CASE WHEN add_degree = '0' then '1' else add_degree END as add_degree, CASE WHEN add_degree = '0' then '1' else add_degree END as add_degree,
@ -263,14 +267,14 @@
where tn1.dn_no = b.dn_no where tn1.dn_no = b.dn_no
) )
when c.cd_no = 'BF_NU_TP_6' THEN when c.cd_no = 'BF_NU_TP_6' THEN
(select 1 (select 4
from tbl_bf_daily_nutrition_6 tn1 from tbl_bf_daily_nutrition_6 tn1
inner join tbl_code_item_str tn2 inner join tbl_code_item_str tn2
on tn2.cg_cd = 'BF_FECES_QTY' and tn1.rest_qty = tn2.val_1 on tn2.cg_cd = 'BF_FECES_QTY' and tn1.rest_qty = tn2.val_1
where tn1.dn_no = b.dn_no where tn1.dn_no = b.dn_no
) )
when c.cd_no = 'BF_NU_TP_7' THEN when c.cd_no = 'BF_NU_TP_7' THEN
(select 1 (select 4
from tbl_bf_daily_nutrition_7 tn1 from tbl_bf_daily_nutrition_7 tn1
inner join tbl_db_vac tv on tn1.db_dvs_no = tv.dv_no inner join tbl_db_vac tv on tn1.db_dvs_no = tv.dv_no
where tn1.dn_no = b.dn_no where tn1.dn_no = b.dn_no
@ -288,7 +292,7 @@
where tn1.dn_no = b.dn_no where tn1.dn_no = b.dn_no
) )
when c.cd_no = 'BF_NU_TP_11' THEN when c.cd_no = 'BF_NU_TP_11' THEN
(select 1 (select 4
from tbl_bf_daily_nutrition_11 tn1 from tbl_bf_daily_nutrition_11 tn1
where tn1.dn_no = b.dn_no where tn1.dn_no = b.dn_no
) )
@ -298,17 +302,17 @@
where tn1.dn_no = b.dn_no where tn1.dn_no = b.dn_no
) )
when c.cd_no = 'BF_NU_TP_13' THEN when c.cd_no = 'BF_NU_TP_13' THEN
(select 1 (select 4
from tbl_bf_daily_nutrition_13 tn1 from tbl_bf_daily_nutrition_13 tn1
where tn1.dn_no = b.dn_no where tn1.dn_no = b.dn_no
) )
when c.cd_no = 'BF_NU_TP_14' THEN when c.cd_no = 'BF_NU_TP_14' THEN
(select 1 (select 4
from tbl_bf_daily_nutrition_14 tn1 from tbl_bf_daily_nutrition_14 tn1
where tn1.dn_no = b.dn_no where tn1.dn_no = b.dn_no
) )
when c.cd_no = 'BF_NU_TP_15' THEN when c.cd_no = 'BF_NU_TP_15' THEN
(select 1 (select 4
from tbl_bf_daily_nutrition_15 tn1 from tbl_bf_daily_nutrition_15 tn1
where tn1.dn_no = b.dn_no where tn1.dn_no = b.dn_no
) )
@ -429,7 +433,8 @@
FROM tbl_bf_daily_nutrition_15 tn1 FROM tbl_bf_daily_nutrition_15 tn1
WHERE tn1.dn_no = b.dn_no WHERE tn1.dn_no = b.dn_no
) )
END AS time_val END AS time_val,
b.dn_no as dn_no
FROM tbl_bf_family_match a FROM tbl_bf_family_match a
INNER JOIN tbl_bf_daily_nutrition b on a.smc_no = b.smc_no INNER JOIN tbl_bf_daily_nutrition b on a.smc_no = b.smc_no
INNER JOIN tbl_code_item_str c on b.nutirition_cd_no = c.cd_no INNER JOIN tbl_code_item_str c on b.nutirition_cd_no = c.cd_no
@ -437,7 +442,7 @@
WHERE a.smc_no = #smc_no# WHERE a.smc_no = #smc_no#
and b.reg_dt between STR_TO_DATE(#startDate#, '%Y-%m-%d %H:%i:%s') and STR_TO_DATE(#endDate#, '%Y-%m-%d %H:%i:%s') and b.reg_dt between STR_TO_DATE(#startDate#, '%Y-%m-%d %H:%i:%s') and STR_TO_DATE(#endDate#, '%Y-%m-%d %H:%i:%s')
and b.nutirition_cd_no != '' and b.nutirition_cd_no != ''
GROUP BY DATE_FORMAT(b.reg_dt, '%Y-%m-%d %H:%i:') GROUP BY dn_no
ORDER BY add_degree desc ORDER BY add_degree desc
) XA ) XA
where XA.time_val is not null where XA.time_val is not null

22
src/main/webapp/WEB-INF/views/ftl/m/bf_board/view_bf_detail_board.ftl
Unescape View File

@ -179,7 +179,7 @@
<!-- 댓글 --> <!-- 댓글 -->
<div class="comment_header"> <div class="comment_header">
<p>댓글</p> <!--<p>댓글</p>-->
<button type="button" class="btn_reply" data-ct_no="">댓글쓰기</button> <button type="button" class="btn_reply" data-ct_no="">댓글쓰기</button>
<button type="button" id="" name="" class="refresh" onclick="window.location.reload();"> <button type="button" id="" name="" class="refresh" onclick="window.location.reload();">
<span class="hidden">아이콘</span> <span class="hidden">아이콘</span>
@ -404,7 +404,7 @@
var shareUrlFB = "https://www.facebook.com/sharer/sharer.php?u="+encodeURIComponent(pageUrl)+"&t="+encodeURI(pageTitle); var shareUrlFB = "https://www.facebook.com/sharer/sharer.php?u="+encodeURIComponent(pageUrl)+"&t="+encodeURI(pageTitle);
$(".facebook").on("click" , function(e) { $(".facebook").on("click" , function(e) {
FB.ui({ /*FB.ui({
method : 'share_open_graph', method : 'share_open_graph',
action_type: 'og.shares', action_type: 'og.shares',
action_properties: JSON.stringify({ action_properties: JSON.stringify({
@ -415,11 +415,11 @@
'og:image': $(".main-img").length >0 ? $(".main-img")[0].src : "" , 'og:image': $(".main-img").length >0 ? $(".main-img")[0].src : "" ,
} }
}) })
}); });*/
/*
e.preventDefault(); e.preventDefault();
window.open(shareUrlFB, '', 'scrollbars=no, width=584, height=635'); window.open(shareUrlFB, '', 'scrollbars=no, width=584, height=635');
*/
}); });
@ -700,6 +700,18 @@
}) })
$(".shared_btn").on("click", function() { $(".shared_btn").on("click", function() {
$("#shared").toggleClass("open"); $("#shared").toggleClass("open");
/*if (navigator.share){
navigator.share({
title: '${model ['rm']['title']!}',
description: '${model ['rm']['title']!}',
image: $(".main-img").length >0 ? $(".main-img")[0].src : "" ,
url: '${URL_ROOT}/m/bf_board/view_bf_detail_board.do?bd_no=${model ['rm']['bd_no']!}'
})
.then(() => console.log('Successful share'))
.catch((error) => console.log('Error sharing', error));
}else{
alert("공유하기를 지원하지 않는 환경입니다.");
}*/
}); });
$(".modal_layer").on("click", function() { $(".modal_layer").on("click", function() {
$(".community_option").removeClass("open"); $(".community_option").removeClass("open");

2
src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_10.ftl
Unescape View File

@ -77,7 +77,7 @@
직접입력</a> 직접입력</a>
</div> </div>
</div> </div>
<div class="snack_sel" id="prd_nm">${model['rm']['prd_nm']!}</div> <div class="snack_sel" id="prd_nm" style="background: ${model['rm']['color']!}; padding: 0 15px; font-size: 14px;">${model['rm']['prd_nm']!}</div>
</div> </div>
<!-- //간식 입력 --> <!-- //간식 입력 -->

4
src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_14.ftl
Unescape View File

@ -101,8 +101,8 @@
</span> </span>
<div class="input_flex"> <div class="input_flex">
<button type="button" class="border_btn" onclick="addLeftLac(5);">+5</button>
<button type="button" class="border_btn" onclick="addLeftLac(10);">+10</button> <button type="button" class="border_btn" onclick="addLeftLac(10);">+10</button>
<button type="button" class="border_btn" onclick="addLeftLac(5);">+5</button>
</div> </div>
</div> </div>
</div> </div>
@ -125,8 +125,8 @@
</span> </span>
<div class="input_flex"> <div class="input_flex">
<button type="button" class="border_btn" onclick="addRightLac(5);">+5</button>
<button type="button" class="border_btn" onclick="addRightLac(10);">+10</button> <button type="button" class="border_btn" onclick="addRightLac(10);">+10</button>
<button type="button" class="border_btn" onclick="addRightLac(5);">+5</button>
</div> </div>
</div> </div>
</div> </div>

6
src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_2.ftl
Unescape View File

@ -82,15 +82,15 @@
<!-- <div class="milk_sel">분유을 선택 하세요.</div> --> <!-- <div class="milk_sel">분유을 선택 하세요.</div> -->
<ul id="ul_board"> <ul id="ul_board">
</ul> </ul>
<div class="milk_sel" id="prd_nm">${model['rm']['prd_nm']!}</div> <div class="milk_sel" id="prd_nm" style="background: ${model['rm']['color']!}; color: white;">${model['rm']['prd_nm']!}</div>
</div> </div>
<!-- //분유 입력 --> <!-- //분유 입력 -->
<!-- 수유량 --> <!-- 섭취량 -->
<div class="take_amount w_div"> <div class="take_amount w_div">
<div class="amount_div"> <div class="amount_div">
<p class="record_title">수유량</p> <p class="record_title">섭취량</p>
<div class="po_div"> <div class="po_div">
<div class="border_b_input"> <div class="border_b_input">

2
src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_3.ftl
Unescape View File

@ -74,7 +74,7 @@
직접입력 직접입력
</div> </div>
</div> </div>
<div class="snack_sel" id="prd_nm">${model['rm']['prd_nm']!}</div> <div class="snack_sel" id="prd_nm" style="background: ${model['rm']['color']!}; padding: 0 15px; font-size: 14px;">${model['rm']['prd_nm']!}</div>
</div> </div>
<!-- //간식 입력 --> <!-- //간식 입력 -->

9
src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_9.ftl
Unescape View File

@ -73,7 +73,7 @@
직접입력</a> 직접입력</a>
</div> </div>
</div> </div>
<div class="snack_sel" id="prd_nm">${model['rm']['dhb_name']!}</div> <div class="snack_sel" id="prd_nm" style="background: ${model['rm']['color']!}; padding: 0 15px; font-size: 14px;">${model['rm']['dhb_name']!}</div>
</div> </div>
<!-- //간식 입력 --> <!-- //간식 입력 -->
@ -104,8 +104,11 @@
<!-- //섭취량 --> <!-- //섭취량 -->
</div> </div>
<!-- //홈메이드이유식--> <!-- //홈메이드이유식-->
</div> </div>
<style>
.swal2-container{z-index: 9999999}
</style>
<!-- modal-wrapper --> <!-- modal-wrapper -->
<div id="popup" class="modal-wrapper"> <div id="popup" class="modal-wrapper">

2
src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl
Unescape View File

@ -179,7 +179,7 @@
var name = $(th)[0].files[0].name; var name = $(th)[0].files[0].name;
var ext = name.split('.').pop().toLowerCase(); var ext = name.split('.').pop().toLowerCase();
if($.inArray(ext, ['mp3','mp4']) == -1) { if($.inArray(ext, ['mp3','mp4']) == -1) {
Swal.fire({text: '음약 파일(mp3)을 업로드 해 주세요.'}).then((result)=>{ $(th).parent().remove(); }) Swal.fire({text: '음악 파일(mp3)을 업로드 해 주세요.'}).then((result)=>{ $(th).parent().remove(); })
return; return;
} }

2
src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music_20220426.ftl
Unescape View File

@ -160,7 +160,7 @@
var name = $(th)[0].files[0].name; var name = $(th)[0].files[0].name;
var ext = name.split('.').pop().toLowerCase(); var ext = name.split('.').pop().toLowerCase();
if($.inArray(ext, ['mp3','mp4']) == -1) { if($.inArray(ext, ['mp3','mp4']) == -1) {
Swal.fire({text: '음약 파일(mp3)을 업로드 해 주세요.'}).then((result)=>{ $(th).parent().remove(); }) Swal.fire({text: '음악 파일(mp3)을 업로드 해 주세요.'}).then((result)=>{ $(th).parent().remove(); })
return; return;
} }

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

@ -13590,7 +13590,7 @@ main.sona_cont_measurement {
.type_tab li { .type_tab li {
width:50%; width:50%;
height:40px; height:40px;
border-radius:20px; border-radius:16px;
display:flex; display:flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@ -14324,7 +14324,7 @@ main.sona_cont_measurement {
left: 59px; left: 59px;
content: ''; content: '';
width: 2px; width: 2px;
height: 80px; height: 62px;
z-index:0; z-index:0;
background: #F4F5F5 ; background: #F4F5F5 ;
} }

Write Preview
Loading…
Cancel
Save