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

가온앤 체크리스트 적용 9

Browse Source 
# D-day 설정 - 완료 alert z-index 조절
# 장바구니 - 완료 alert z-index 조절
# 메모리 타임라인 내, 회색 시간은 제거해 주세요. (혼동 및 불필요한 정보) 해결
# 알레르기(i), 이유식 레시피(i), 아이 건강 신호등(i) : (i) 아이콘 모두 같은 모양으로 수정해주세요. 해결
# 젖병 - 날짜, 시간 변경 안됨 해결
# 홈화면 기록 간 간격 줄이기
# 커뮤니티 - 게시글 컨텐츠 잘리는 현상 해결
# 기록-유축-유축량이 한쪽이 0 이여도 총량이 줄음 해결
# 건강검진 sql 검증
# 아이 프로필 다른 페이지 전환 후 배열 바뀌는 문제 해결
# 예방접종 빈값 유지 문제 해결
# 5개월 이하의 아이에게 영양정보 제공되지 않는 문제 해결
dev_bert
정이솔 3 years ago
parent 52262ee393
commit 127db85455
15 changed files with 89 additions and 72 deletions
Show Stats Download Patch File Download Diff File

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

@ -162,7 +162,7 @@ public class M_Bf_growthController extends AbstractControllerManager{
int m = rm_child.getInt("m");
// 6개뤌 이상 60개월 미만 인경우만
if(m>5 && m<60 ) {
if( m<60 ) {
// 당일 균형 판정
Calendar cal = Calendar.getInstance();
SimpleDateFormat format = new SimpleDateFormat ("yyyy-MM-dd");
@ -268,7 +268,7 @@ public class M_Bf_growthController extends AbstractControllerManager{
// m>5 && m<60 때만 추천
// 60개월 미만 인경우만
if(m>5 && m<60 ) {
if( m<60 ) {
// 식재료 추천
// 전날 섭취 기록 확인
paramMap.put("scope","yday");
@ -351,7 +351,7 @@ public class M_Bf_growthController extends AbstractControllerManager{
int m = rm_child.getInt("m");
// 60개월 미만 인경우만
if(m>5 && m<60 ) {
if( m<60 ) {
// 당일 균형 판정
Calendar cal = Calendar.getInstance();
SimpleDateFormat format = new SimpleDateFormat ("yyyy-MM-dd");

18
src/main/java/com/backoffice/m/index/M_IndexController.java
Unescape View File

@ -209,7 +209,7 @@ public class M_IndexController extends AbstractControllerManager{
List<DataMap> daily = new ArrayList<DataMap>();
//성장점수 및 식품영양점수
if(m>5 && m<60 ) {
if( m<60 ) {
// 당일 균형 판정
Calendar cal = Calendar.getInstance();
SimpleDateFormat format = new SimpleDateFormat ("yyyy-MM-dd");
@ -314,7 +314,7 @@ public class M_IndexController extends AbstractControllerManager{
List<DataMap> daily = new ArrayList<DataMap>();
//성장점수 및 식품영양점수
if(m>5 && m<60 ) {
if( m<60 ) {
// 당일 균형 판정
Calendar cal = Calendar.getInstance();
SimpleDateFormat format = new SimpleDateFormat ("yyyy-MM-dd");
@ -433,22 +433,24 @@ public class M_IndexController extends AbstractControllerManager{
session.setAttribute(ConstantSystem.SESSION_RM_CHILD, null);
rm_child = null;
}
//메인페이지에 아이정보표시를 위해 처리.
if(rm_child != null) {
paramMap.copyFromDataMapByKeys(rm_child, new String[]{"smc_no"});
// 선택된 아이 가장 먼저
List<DataMap> lm_child2 = new ArrayList<DataMap>();
lm_child2.add(rm_child);
smc_no = RenaStringUtil.getData(rm_child, "smc_no");
DataMap smc_no_i = new DataMap();
int i = 0;
for(DataMap rm_child2 : lm_child) {
String smc_no2 = RenaStringUtil.getData(rm_child2, "smc_no");
if(smc_no2.equals(smc_no) == false) lm_child2.add(rm_child2);
if(smc_no2.equals(smc_no) == true) {
smc_no_i.put("smc_no",i);
}
lm_child2.add(rm_child2);
i = i+1;
}
DataMap.putToModel(model,"smc_no_i", smc_no_i);
DataMap.putToModel(model, "lm_child", lm_child2);
}

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

@ -369,7 +369,7 @@
on ci.val_1 = ch.health_tp
and ci.cg_cd ='BF_HEALTH_TP'
where smc_no = #smc_no#
and date_add(fb.birthday,interval ch.from month) >= now()
and not now() > date_add(fb.birthday,interval ch.to month)
order by recmnd_from_dt
</select>
@ -418,7 +418,7 @@
on dvs.dv_no = dv.dv_no
left join tbl_bf_family_baby fb
on fb.smc_no = #smc_no#
where now() > date_add(fb.birthday,interval dvs.end_label month)
where not date_add(fb.birthday,interval dvs.start_label month) >= now()
order by recmnd_from_dt , dvs.dv_no, dvs.round
</select>

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

@ -336,7 +336,6 @@
INNER JOIN tbl_code_item_str c on b.nutirition_cd_no = c.cd_no
WHERE a.member_id = #member_id#
and a.smc_no = #smc_no#
and b.reg_dt between date_add(now(), interval -1 month ) and now()
and b.nutirition_cd_no != ''
) XA
WHERE XA.time_val is not NULL

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

@ -146,9 +146,9 @@
</#if>
<!-- //swiper_wrap -->
<div class="vote_cont" >
<textarea class="b_content" readOnly>${model ['rm']['content']!}</textarea>
</div>
<div class="vote_cont text_cont">
<div class="b_content" readOnly style="white-space: pre-wrap; ">${model ['rm']['content']!}</div>
</div>
</div>
<!-- //community_img -->
@ -819,12 +819,12 @@
$(".community_write_review").hide();
</#if>
var contentHeight = $(".b_content");
if (contentHeight) {
contentHeight.each(function(){
$(this).height(this.scrollHeight);
});
}
// var contentHeight = $(".b_content");
// if (contentHeight) {
// contentHeight.each(function(){
// $(this).height(this.scrollHeight);
// });
// }
});

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

@ -166,23 +166,27 @@
};
var addLeftLac =function(qty) {
console.log("addLeft")
console.log(qty)
console.log(parseInt($.trim($("#tEat_qty").text())))
var eat_qty = parseInt($.trim($("#lEat_qty").val()) == '' ? '0': $.trim($("#lEat_qty").val())) + (qty*1) ;
if(eat_qty <0) eat_qty = 0;
if(eat_qty <0) eat_qty = 0;
else {
$("#tEat_qty").text(parseInt($.trim($("#tEat_qty").text()) == '' ? '0' : $.trim($("#tEat_qty").text())) + (qty*1) );
if(parseInt($.trim($("#tEat_qty").text())) < 0) $("#tEat_qty").text(0);
}
$("#lEat_qty").val(eat_qty);
$("#tEat_qty").text(parseInt($.trim($("#tEat_qty").text()) == '' ? '0' : $.trim($("#tEat_qty").text())) + (qty*1) );
if(parseInt($.trim($("#tEat_qty").text())) < 0) $("#tEat_qty").text(0);
$("#blq").val(eat_qty);
};
var addRightLac =function(qty) {
var eat_qty = parseInt($.trim($("#rEat_qty").val()) == '' ? '0': $.trim($("#rEat_qty").val())) + (qty*1) ;
if(eat_qty <0) eat_qty = 0;
$("#rEat_qty").val(eat_qty);
$("#tEat_qty").text(parseInt($.trim($("#tEat_qty").text()) == '' ? '0' : $.trim($("#tEat_qty").text())) + (qty*1)) ;
if( parseInt($.trim($("#tEat_qty").text())) < 0) $("#tEat_qty").text(0);
if(eat_qty <0) eat_qty = 0;
else{
$("#tEat_qty").text(parseInt($.trim($("#tEat_qty").text()) == '' ? '0' : $.trim($("#tEat_qty").text())) + (qty*1)) ;
if( parseInt($.trim($("#tEat_qty").text())) < 0) $("#tEat_qty").text(0);
}
$("#rEat_qty").val(eat_qty);
$("#brq").val(eat_qty);
};

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

@ -152,11 +152,14 @@
$("#ipteat_qty").val('');
$("#btnPause").removeClass("active");
};
$(function(){
var today = moment().format('YYYY.MM.DD');
$("#input_date").val(today)
var input_date = SNUtil.makeAnyPicker('input_date', $("#input_date").val(), -80, '.');
});
$(function(){
var today = moment().format('YYYY.MM.DD');
$("#input_date").val(today)
//var input_date = SNUtil.makeAnyPicker('input_date', $("#input_date").val(), -80, '.');
$("div.nutrition_kinds_basic02>div").find(".p_input_box>input").bind('input', function(event){
$("#"+event.target.id.replace("ipt","")).val(this.value);
});
})
let dqi_cate = '분유';

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

@ -38,8 +38,8 @@
<div class="circle" style="background-color: #33CC33;"></div>
균형
</div>
<svg id="info_btn" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-info-square-fill" viewBox="0 0 16 16" style="opacity: 0.56;">
<path d="M0 2a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2zm8.93 4.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.808 1.319.545 0 1.178-.252 1.465-.598l.088-.416c-.2.176-.492.246-.686.246-.275 0-.375-.193-.304-.533L8.93 6.588zM8 5.5a1 1 0 1 0 0-2 1 1 0 0 0 0 2z"/>
<svg id="info_btn" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#707070" class="bi bi-info-circle-fill" viewBox="0 0 16 16">
<path d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm.93-9.412-1 4.705c-.07.34.029.533.304.533.194 0 .487-.07.686-.246l-.088.416c-.287.346-.92.598-1.465.598-.703 0-1.002-.422-.808-1.319l.738-3.468c.064-.293.006-.399-.287-.47l-.451-.081.082-.381 2.29-.287zM8 5.5a1 1 0 1 1 0-2 1 1 0 0 1 0 2z"/>
</svg>
</div>

4
src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_nutrition_balance.ftl
Unescape View File

@ -38,8 +38,8 @@
<div class="circle" style="background-color: #33CC33;"></div>
적정
</div>
<svg id="info_btn" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-info-square-fill" viewBox="0 0 16 16" style="opacity: 0.56;">
<path d="M0 2a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2zm8.93 4.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.808 1.319.545 0 1.178-.252 1.465-.598l.088-.416c-.2.176-.492.246-.686.246-.275 0-.375-.193-.304-.533L8.93 6.588zM8 5.5a1 1 0 1 0 0-2 1 1 0 0 0 0 2z"/>
<svg id="info_btn" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#707070" class="bi bi-info-circle-fill" viewBox="0 0 16 16">
<path d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm.93-9.412-1 4.705c-.07.34.029.533.304.533.194 0 .487-.07.686-.246l-.088.416c-.287.346-.92.598-1.465.598-.703 0-1.002-.422-.808-1.319l.738-3.468c.064-.293.006-.399-.287-.47l-.451-.081.082-.381 2.29-.287zM8 5.5a1 1 0 1 1 0-2 1 1 0 0 1 0 2z"/>
</svg>
</div>

7
src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
Unescape View File

@ -351,7 +351,6 @@
<script>
let not_h = '아이 키 성장 기록이 없습니다';
let not_w = '아이 체중 성장 기록이 없습니다';
var arr_smc_no = [
<#if (model['lm_child'])?has_content>
<#list model['lm_child'] as item>
@ -359,6 +358,11 @@
</#list>
</#if>
];
var smc_no_i = [
<#if (model['smc_no_i'])?has_content>
${(model['smc_no_i'])['smc_no']}
</#if>
];
var ajax_child_info = function(idx){
let smc_no = arr_smc_no[idx];
@ -487,6 +491,7 @@
controls: false,
pager:true,
infiniteLoop: false,
startSlide: smc_no_i[0],
onSliderLoad: function(){
try {
$('.bxslider-wrapper').css('visibility', 'visible').animate({opacity: 1});

24
src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl
Unescape View File

@ -64,8 +64,6 @@
<#if item['reg_date'] != pre_date>
<#assign pre_date = item['reg_date']>
<br>
<br>
<div class="timeline_date" style="z-index:999">${item['reg_date']!}</div>
</#if>
@ -73,17 +71,17 @@
<div class="day_in_div">
<ul class="timeline_ul">
<#if item['day_diff'] != '0'>
<div class="time_title">
<p> ${item['day_diff']!}d </p>
</div>
</#if>
<#if item['day_diff'] == '0' && item['time_diff'] != '00:00'>
<div class="time_title">
<p> ${item['time_diff']!} </p>
</div>
</#if>
<#-- <#if item['day_diff'] != '0'>-->
<#-- <div class="time_title">-->
<#-- <p> ${item['day_diff']!}d </p>-->
<#-- </div>-->
<#-- </#if>-->
<#-- <#if item['day_diff'] == '0' && item['time_diff'] != '00:00'>-->
<#-- <div class="time_title">-->
<#-- <p> ${item['time_diff']!} </p>-->
<#-- </div>-->
<#-- </#if>-->
<li>
<div class="time">

22
src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline_share.ftl
Unescape View File

@ -58,8 +58,6 @@
<#if item['reg_date'] != pre_date>
<#assign pre_date = item['reg_date']>
<br>
<br>
<div class="timeline_date" style="z-index:999">${item['reg_date']!}</div>
</#if>
@ -67,17 +65,17 @@
<div class="day_in_div">
<ul class="timeline_ul">
<#if item['day_diff'] != '0'>
<div class="time_title">
<p> ${item['day_diff']!}d </p>
</div>
</#if>
<#-- <#if item['day_diff'] != '0'>-->
<#-- <div class="time_title">-->
<#-- <p> ${item['day_diff']!}d </p>-->
<#-- </div>-->
<#-- </#if>-->
<#if item['day_diff'] == '0' && item['time_diff'] != '00:00'>
<div class="time_title">
<p> ${item['time_diff']!} </p>
</div>
</#if>
<#-- <#if item['day_diff'] == '0' && item['time_diff'] != '00:00'>-->
<#-- <div class="time_title">-->
<#-- <p> ${item['time_diff']!} </p>-->
<#-- </div>-->
<#-- </#if>-->
<li>
<div class="time">

2
src/main/webapp/WEB-INF/web.xml
Unescape View File

@ -102,7 +102,7 @@
</welcome-file-list>
<session-config>
<session-timeout>30</session-timeout>
<session-timeout>1440</session-timeout>
</session-config>
<error-page>

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

@ -5847,7 +5847,7 @@ main {
.main_cont_camera li {
position: relative;
width: 100%;
padding-bottom: 6.5rem;
padding-bottom: 80px;
text-align: center;
background: none;
display: flex;
@ -14252,7 +14252,7 @@ main.sona_cont_measurement {
}
.big_day_div{
margin-top: 20px;
}
.big_day_div .timeline_date{
background: #F4F5F5;
@ -16718,6 +16718,14 @@ main.sona_cont_measurement {
overflow: hidden;
}
.community_view01 .text_cont {
padding: 10px;
}
.community_view01 .text_cont .b_content {
}
/* 13-19.커뮤니티-투표-게시글등록 */
.community_write_vote {
margin-top: 10px;

2
src/main/webapp/m/css/sweetalert2.min.css vendored
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save