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

Merge branch 'devs' of https://gitlab.com/big.imcloud/badyfeed/bf into devs

Browse Source
dev_bert
정이솔 3 years ago
parent df48633ee1 1ae9260de2
commit f7a741cb06
12 changed files with 103 additions and 59 deletions
Show Stats Download Patch File Download Diff File

32
.idea/workspace.xml
Unescape View File

@ -9,13 +9,17 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="아이디 비밀번호 찾기 오류 수정">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="아이디 저장기능 적용">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/index/M_IndexController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/index/M_IndexController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/include_nochild.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/include_nochild.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/m/html/4-4.회원가입-계정연동(ppt20).html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/m/html/4-4.회원가입-계정연동(ppt20).html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -234,7 +238,10 @@
<workItem from="1650687202332" duration="1688000" />
<workItem from="1650693305284" duration="10783000" />
<workItem from="1650722240024" duration="593000" />
<workItem from="1650776418092" duration="21115000" />
<workItem from="1650776418092" duration="22940000" />
<workItem from="1650851675151" duration="3750000" />
<workItem from="1650880342548" duration="16000" />
<workItem from="1650881164110" duration="14717000" />
</task>
<task id="LOCAL-00001" summary="최초 커밋">
<created>1645354476031</created>
@ -544,7 +551,14 @@
<option name="project" value="LOCAL" />
<updated>1650801028670</updated>
</task>
<option name="localTasksCounter" value="45" />
<task id="LOCAL-00045" summary="아이디 저장기능 적용">
<created>1650806994907</created>
<option name="number" value="00045" />
<option name="presentableId" value="LOCAL-00045" />
<option name="project" value="LOCAL" />
<updated>1650806994907</updated>
</task>
<option name="localTasksCounter" value="46" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -564,7 +578,6 @@
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="index_bottom 공유관련 html 스크립트 분리-2" />
<MESSAGE value="D-Day 관리기능 적용" />
<MESSAGE value="D-Day 관리기능 적용-2" />
<MESSAGE value="홈&gt;홈메이드 추천 이유식 퍼블리싱작업-1" />
@ -589,6 +602,7 @@
<MESSAGE value="- 기본음악파일 삭제불가처리" />
<MESSAGE value="소셜회원가입 오류수정" />
<MESSAGE value="아이디 비밀번호 찾기 오류 수정" />
<option name="LAST_COMMIT_MESSAGE" value="아이디 비밀번호 찾기 오류 수정" />
<MESSAGE value="아이디 저장기능 적용" />
<option name="LAST_COMMIT_MESSAGE" value="아이디 저장기능 적용" />
</component>
</project>

23
src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyController.java
Unescape View File

@ -298,7 +298,7 @@ public class M_Bf_family_babyController extends AbstractControllerManager{
// 디폴트 요청한 아이
String smc_no = RenaStringUtil.getData(paramMap, "smc_no");
if(lm_child != null) {
if(lm_child.size() > 0) {
for(DataMap rm_child2 : lm_child) {
String smc_no2 = RenaStringUtil.getData(rm_child2, "smc_no");
@ -326,25 +326,30 @@ public class M_Bf_family_babyController extends AbstractControllerManager{
DataMap.putToModel(model, "rm_child", rm_child);
session.setAttribute(ConstantSystem.SESSION_RM_CHILD, rm_child);
}
}
} else {
session.setAttribute(ConstantSystem.SESSION_RM_CHILD, null);
// List<DataMap> no_child = null;
// DataMap.putToModel(model, "lm_child", no_child);
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");
smc_no = RenaStringUtil.getData(rm_child, "smc_no");
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);
}
DataMap.putToModel(model, "lm_child", lm_child2);
}
return rm_child;
}
}

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

@ -275,7 +275,7 @@ public class M_IndexController extends AbstractControllerManager{
// 디폴트 요청한 아이
String smc_no = RenaStringUtil.getData(paramMap, "smc_no");
if(lm_child != null) {
if(lm_child.size() > 0) {
for(DataMap rm_child2 : lm_child) {
String smc_no2 = RenaStringUtil.getData(rm_child2, "smc_no");
@ -303,25 +303,30 @@ public class M_IndexController extends AbstractControllerManager{
DataMap.putToModel(model, "rm_child", rm_child);
session.setAttribute(ConstantSystem.SESSION_RM_CHILD, rm_child);
}
}
} else {
session.setAttribute(ConstantSystem.SESSION_RM_CHILD, null);
// List<DataMap> no_child = null;
// DataMap.putToModel(model, "lm_child", no_child);
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");
smc_no = RenaStringUtil.getData(rm_child, "smc_no");
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);
}
DataMap.putToModel(model, "lm_child", lm_child2);
}
return rm_child;
}

21
src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
Unescape View File

@ -381,7 +381,10 @@
)
WHEN cis_1.cd_no = 'BF_NU_TP_2' THEN
(
SELECT ifnull(concat(eat_qty, 'ml'),'') FROM tbl_bf_daily_nutrition_2 tn1 WHERE tn1.dn_no = x.dn_no
SELECT ifnull(concat(ifnull(tn.prd_nm,''), ' ', eat_qty, 'ml'),'')
FROM tbl_bf_daily_nutrition_2 tn1
LEFT OUTER JOIN tbl_db_nutrient tn ON tn1.db_dn_no = tn.dn_no
WHERE tn1.dn_no = x.dn_no
)
WHEN cis_1.cd_no = 'BF_NU_TP_3' THEN
(
@ -419,8 +422,18 @@
)
WHEN cis_1.cd_no = 'BF_NU_TP_9' THEN
(
SELECT ifnull(concat(ifnull(tb.name, ''),' ', tn1.eat_qty, 'ml 섭취'), '') FROM tbl_bf_daily_nutrition_9 tn1
LEFT OUTER JOIN tbl_db_home_bf tb on tn1.db_dhb_no = tb.dhb_no
SELECT
concat(
case
when tn1.db_dhb_tp = 'sf' then ifnull(tb.name, '')
when tn1.db_dhb_tp = 'bf' then ifnull(tc.name, '')
end
,
tn1.eat_qty, 'ml 섭취'
)
FROM tbl_bf_daily_nutrition_9 tn1
LEFT OUTER JOIN tbl_db_home_sf tb on tn1.db_dhb_no = tb.dhb_no
LEFT OUTER JOIN tbl_db_home_bf tc on tn1.db_dhb_no = tc.dhb_no
WHERE tn1.dn_no = x.dn_no
)
WHEN cis_1.cd_no = 'BF_NU_TP_10' THEN
@ -447,7 +460,7 @@
)
WHEN cis_1.cd_no = 'BF_NU_TP_15' THEN
(
SELECT ifnull(temperature,'') FROM tbl_bf_daily_nutrition_15 tn1 WHERE tn1.dn_no = x.dn_no
SELECT concat(ifnull(etc_symptom,''), ' ', ifnull(temperature,'')) FROM tbl_bf_daily_nutrition_15 tn1 WHERE tn1.dn_no = x.dn_no
)
END AS time_val
FROM

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

@ -364,7 +364,7 @@
, ci.title
from tbl_db_health_checkup ch
left join tbl_bf_family_baby fb
on fb.smc_no = '82'
on fb.smc_no = #smc_no#
left join tbl_code_item ci
on ci.val_1 = ch.health_tp
and ci.cg_cd ='BF_HEALTH_TP'

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

@ -219,9 +219,10 @@
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_2' THEN
(select concat(eat_qty, 'ml')
(select ifnull(concat(ifnull(tn.prd_nm,''), ' ', eat_qty, 'ml'),'')
from tbl_bf_daily_nutrition_2 tn1
where tn1.dn_no = b.dn_no
left outer join tbl_db_nutrient tn ON tn1.db_dn_no = tn.dn_no
WHERE tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_3' THEN
(select
@ -251,9 +252,17 @@
)
when c.cd_no = 'BF_NU_TP_9' THEN
(select
concat(ifnull(tb.name, ''),' ', tn1.eat_qty, 'ml 섭취')
concat(
case
when tn1.db_dhb_tp = 'sf' then ifnull(tb.name, '')
when tn1.db_dhb_tp = 'bf' then ifnull(tc.name, '')
end
,
tn1.eat_qty, 'ml 섭취'
)
from tbl_bf_daily_nutrition_9 tn1
left outer join tbl_db_home_bf tb on tn1.db_dhb_no = tb.dhb_no
left outer join tbl_db_home_sf tb on tn1.db_dhb_no = tb.dhb_no
left outer join tbl_db_home_bf tc on tn1.db_dhb_no = tc.dhb_no
where tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_10' THEN
@ -289,7 +298,7 @@
)
when c.cd_no = 'BF_NU_TP_15' THEN
(select
temperature
concat(ifnull(etc_symptom,''), ' ', ifnull(temperature,''))
from tbl_bf_daily_nutrition_15 tn1
where tn1.dn_no = b.dn_no
)

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

@ -671,7 +671,7 @@
Swal.fire({text:"등록되지 않았습니다"})
},
success:function(result){
Swal.fire({text:"처리 되었습니다"})
// Swal.fire({text:"처리 되었습니다"})
},
});
});

2
src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl
Unescape View File

@ -193,6 +193,7 @@
// 날짜를 yyyy-mm-dd 형식으로 만들어 줌.
function date_mask(objValue) {
var v = objValue.replace("--", ".");
v = objValue.replace("..", ".");
if (v.match(/^\d{4}$/) !== null) {
v = v + '.';
@ -201,6 +202,7 @@
}
v = v.replace(/[a-zA-Z]/g, "");
v = v.replace( /[\{\}\[\]\/?,;:|\)*~`!^\-_+<>@\#$%&\\\=\(\'\"]/gi, "");
v = v.replace(/ /gi, '');
return v;
}

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

@ -7,23 +7,14 @@
<div class="bxslider-wrapper" style="visibility: hidden; opacity: 0;">
<ul class="main_pofile_slider">
<li>
<div onclick="fncGoRegisterBaby()" style="cursor:pointer" class="main_pofile_txt">
<h2>아이를 등록하세요</h2>
<div style="cursor:pointer" class="main_pofile_txt">
<h2><a style="color:white;" href="${URL_ROOT}/m/bf_family_baby/view_bf_family_baby.do?return_url=list_bf_family_baby">아이를 등록하세요</a></h2>
<p>0세 0개월(남)</p>
</div>
<div class="main_pofile_img">
<p><a href="javascript:fncGoRegisterBaby()"><img src="${URL_STATIC_ROOT}/m/img/main/main_profile_img02.png" alt="프로필 사진" /></a></p>
<p><a href="${URL_ROOT}/m/bf_family_baby/view_bf_family_baby.do?return_url=list_bf_family_baby"><img src="${URL_STATIC_ROOT}/m/img/main/main_profile_img02.png" alt="프로필 사진" /></a></p>
</div>
</li>
<li>
<div onclick="fncGoRegisterBaby()" style="cursor:pointer" class="main_pofile_txt">
<h2>아이를 등록하세요</h2>
<p>0세 0개월(남)</p>
</div>
<div class="main_pofile_img">
<p><a href="javascript:fncGoRegisterBaby()"><img src="${URL_STATIC_ROOT}/m/img/main/main_profile_img02.png" alt="프로필 사진" /></a></p>
</div>
</li>
</ul>
</div>
<!-- //main_pofile_slider -->
@ -130,7 +121,8 @@
</div>
<script>
function fncGoRegisterBaby() {
function fncGoRegisterBaby(e) {
$(e).preventDefault();
location.href = "${URL_ROOT}/m/bf_family_baby/view_bf_family_baby.do?return_url=list_bf_family_baby";
}
</script>

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

@ -2,7 +2,6 @@
<link href="../css/custom.css?2" rel="stylesheet" type="text/css" >
<script src="../js/jquery.bxslider.js"></script>
<script type="text/javascript" src="../js/masonry.pkgd.min.js"></script>
<!-- <#--<script src="../js/jquery.bxslider.js"></script>--> -->
<link rel="stylesheet" href="../css/swiper.min.css">
<script src="../js/swiper.min.js"></script>
@ -111,6 +110,12 @@
<#elseif item['diff_d_day'] gt 0>
${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
</#if>
<#elseif item['day365'] lt 0>
<#if item['diff_d_day'] gt 0>
${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
<#else>
설정된 D-Day가 없습니다.
</#if>
</#if>
</p>

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

@ -185,7 +185,7 @@
$(".set_list_wrap").append("<div class='list_item item_order'>" +
"<div><input type='file' onchange='fn_M_my_fileSave(this);' name='file'></div>" +
"<div class='order_button'>" +
"<button type='button' onclick='fncRemove(this)'>" +
"<button type='button' base='N' onclick='fncRemove(this)'>" +
"<img style='width:18px;height:18px' src='../img/setting/delete_ico.png'/>" +
"</button>&nbsp;" +
"<button type='button' name='mute_yn' value='N'>" +

11
src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl
Unescape View File

@ -52,11 +52,10 @@
<!-- //컬러 박스 -->
<!-- 날짜 -->
<div class="memory_date">
<a href="javascript:fncMoveDay('minus')"><img src="../img/xxxx_sprites/arrow_01_left.png" alt=""></a>
<div class="memory_date" style="height:106px">
<a href="javascript:fncMoveDay('minus')"><img src="../img/xxxx_sprites/arrow_01_left02.png" alt=""></a>
${model['rm_mem']['today']!}(${model['rm_mem']['day']!})
<a href="javascript:fncMoveDay('plus')"><img src="../img/xxxx_sprites/arrow_01_right.png" alt=""></a>
</div>
<a href="javascript:fncMoveDay('plus')"><img src="../img/xxxx_sprites/arrow_01_right.png" alt=""></a></div>
<!-- //날짜 -->
<!-- 그래프 -->
@ -191,7 +190,7 @@
<#-- <div class="time_bar02" style="top:57%;">-->
<#-- <span></span>-->
<#-- <img src="../../img/time_bar.png" alt="">-->
<#-- <img src="../img/time_bar.png" alt="">-->
<#-- </div>-->
</div>
@ -221,7 +220,7 @@
<!--// 그래프 -->
<div class="fix_icon">
<#-- <button type="button"><img src="../img/ico_image_grey_24.png" alt=""></button>-->
<button type="button"><img src="../img/ico_image_grey_24.png" alt=""></button>
<button id="share-list" type="button"><img style="cursor:pointer" src="../img/ico_share_grey_24.png" alt=""></button>
</div>
</div>

Write Preview
Loading…
Cancel
Save