Merge remote-tracking branch 'origin/devs' into devs

dev_bert
정이솔 3 years ago
commit 5a85ddd507

@ -9,16 +9,15 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="닉네임 변경기능 적용">
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04_1.ftl" afterDir="false" />
<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/member_env/M_Member_envBO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envBO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envBOImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envBOImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.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/bf_family_baby/com.backoffice.m.bf_family_baby.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_family_baby/com.backoffice.m.bf_family_baby.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/index/com.backoffice.m.index.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/index/com.backoffice.m.index.xml" 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" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -201,7 +200,9 @@
<workItem from="1648720402622" duration="2770000" />
<workItem from="1648786659469" duration="28242000" />
<workItem from="1648875329000" duration="23079000" />
<workItem from="1648963023291" duration="18348000" />
<workItem from="1648963023291" duration="19862000" />
<workItem from="1649040256227" duration="5551000" />
<workItem from="1649066917331" duration="9694000" />
</task>
<task id="LOCAL-00001" summary="최초 커밋">
<created>1645354476031</created>
@ -294,7 +295,14 @@
<option name="project" value="LOCAL" />
<updated>1648975038077</updated>
</task>
<option name="localTasksCounter" value="14" />
<task id="LOCAL-00014" summary="계정 동기화 기능 수정">
<created>1648986499410</created>
<option name="number" value="00014" />
<option name="presentableId" value="LOCAL-00014" />
<option name="project" value="LOCAL" />
<updated>1648986499410</updated>
</task>
<option name="localTasksCounter" value="15" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -327,6 +335,7 @@
<MESSAGE value="음악설정 수정&#10;부모정보 변경 삭제" />
<MESSAGE value="비밀번호 찾기 기능 적용&#10;로그인 회원가입 형식 변경" />
<MESSAGE value="닉네임 변경기능 적용" />
<option name="LAST_COMMIT_MESSAGE" value="닉네임 변경기능 적용" />
<MESSAGE value="계정 동기화 기능 수정" />
<option name="LAST_COMMIT_MESSAGE" value="계정 동기화 기능 수정" />
</component>
</project>

@ -17,6 +17,10 @@ public interface M_Bf_daily_nutritionBO {
public abstract List<DataMap> select_bf_last_status(DataMap paramMap) throws Exception;
public abstract DataMap select_bf_last_meal_status(DataMap paramMap) throws Exception;
public abstract DataMap select_bf_last_sleep_status(DataMap paramMap) throws Exception;
public abstract DataMap select_bf_last_bedpan_status(DataMap paramMap) throws Exception;
public abstract List<DataMap> select_db_vac_list(DataMap paramMap) throws Exception;
public abstract List<DataMap> select_daily_image_list(DataMap paramMap) throws Exception;

@ -113,7 +113,46 @@ public class M_Bf_daily_nutritionBOImpl extends AbstractBOManager implements M_B
return lm;
}
public DataMap select_bf_last_meal_status(DataMap paramMap) throws Exception{
DataMap lm = null;
try {
generalDAO.setNamespace(SQLMAP_NAMESPACE);
lm = generalDAO.select_item_to_datamap("select_bf_last_meal_status", paramMap);
} catch (SQLException e) {
throw e;
}
return lm;
}
public DataMap select_bf_last_sleep_status(DataMap paramMap) throws Exception{
DataMap lm = null;
try {
generalDAO.setNamespace(SQLMAP_NAMESPACE);
lm = generalDAO.select_item_to_datamap("select_bf_last_sleep_status", paramMap);
} catch (SQLException e) {
throw e;
}
return lm;
}
public DataMap select_bf_last_bedpan_status(DataMap paramMap) throws Exception{
DataMap lm = null;
try {
generalDAO.setNamespace(SQLMAP_NAMESPACE);
lm = generalDAO.select_item_to_datamap("select_bf_last_bedpan_status", paramMap);
} catch (SQLException e) {
throw e;
}
return lm;
}
public List<DataMap> select_daily_image_list(DataMap paramMap) throws Exception{
List<DataMap> lm = null;

@ -164,10 +164,6 @@ public class M_IndexController extends AbstractControllerManager{
// 아이
DataMap rm_child = init_child(model, request, paramMap);
// log.info("아이정보 ----- ");
// log.info(rm_child);
if(rm_child != null) {
// 선택아이 성장 정보 조회
DataMap rm_last_h = init_child_info(model, request, paramMap, "Y", "N");
@ -184,9 +180,18 @@ public class M_IndexController extends AbstractControllerManager{
List<DataMap> lm_nutrition = bf_daily_nutritionBO.select_bf_daily_nutrition_list_by_day(paramMap);
DataMap.putToModel(model, "lm_nutrition", lm_nutrition);
//마지막 식사, 수면, 대소변 현황
List<DataMap> lm_last = bf_daily_nutritionBO.select_bf_last_status(paramMap);
DataMap.putToModel(model, "lm_last", lm_last);
//마지막 식사
DataMap lm_last_meal = bf_daily_nutritionBO.select_bf_last_meal_status(paramMap);
//마지막 수면
DataMap lm_last_sleep = bf_daily_nutritionBO.select_bf_last_sleep_status(paramMap);
//마지막 대소변
DataMap lm_last_bedpan = bf_daily_nutritionBO.select_bf_last_bedpan_status(paramMap);
DataMap.putToModel(model, "lm_last_meal", lm_last_meal);
DataMap.putToModel(model, "lm_last_sleep", lm_last_sleep);
DataMap.putToModel(model, "lm_last_bedpan", lm_last_bedpan);
// 60개월 미만 인경우만 영양점수 계산
int m = rm_child.getInt("m");

@ -367,6 +367,7 @@
,REPLACE(append_300_img_file.mt_file_local_url, '/cdn001/', '') AS append_300_img_file_url
,REPLACE(append_300_img_file.mt_file_nm, '/cdn001/', '') AS append_300_img_file_nm
,cis_1.title AS nutirition_cd_no_title
,(select color_cd from tbl_code_item ts where ts.val_1 = cis_1.cd_no) as color_cd
,CASE
WHEN cis_1.cd_no = 'BF_NU_TP_1' THEN
(
@ -662,6 +663,107 @@
) XA
</select>
<!-- 마지막 식사 현황 -->
<select id="select_bf_last_meal_status" resultClass="dataMap" parameterClass="dataMap">
SELECT
'BF_NU_TP_10' as cd_no,
XA.time_val as time_val,
CASE
WHEN TIMESTAMPDIFF(MINUTE, XA.reg_dt, NOW()) <![CDATA[<=]]> 0 THEN '방금 전'
WHEN TIMESTAMPDIFF(MINUTE, XA.reg_dt, NOW()) <![CDATA[<]]> 60 THEN CONCAT(TIMESTAMPDIFF(MINUTE, XA.reg_dt, NOW()), '분 전')
WHEN TIMESTAMPDIFF(HOUR, XA.reg_dt, NOW()) <![CDATA[<]]> 24 THEN CONCAT(TIMESTAMPDIFF(HOUR, XA.reg_dt, NOW()), '시간 전')
WHEN TIMESTAMPDIFF(DAY, XA.reg_dt, NOW()) <![CDATA[<]]> 30 THEN CONCAT(TIMESTAMPDIFF(DAY, XA.reg_dt, NOW()), '일 전')
ELSE CONCAT(TIMESTAMPDIFF(MONTH, XA.reg_dt, NOW()), '달 전')
END AS ago
FROM
(
SELECT
XS.reg_dt,
concat(
IFNULL(
CASE
WHEN XS.cd_no = 'BF_NU_TP_1' then
(SELECT b.eat_qty FROM tbl_bf_daily_nutrition_1 b where b.dn_no = XS.dn_no)
WHEN XS.cd_no = 'BF_NU_TP_2' then
(SELECT b.eat_qty FROM tbl_bf_daily_nutrition_2 b where b.dn_no = XS.dn_no)
WHEN XS.cd_no = 'BF_NU_TP_3' then
(SELECT b.eat_qty FROM tbl_bf_daily_nutrition_3 b where b.dn_no = XS.dn_no)
WHEN XS.cd_no = 'BF_NU_TP_9' then
(SELECT b.eat_qty FROM tbl_bf_daily_nutrition_9 b where b.dn_no = XS.dn_no)
WHEN XS.cd_no = 'BF_NU_TP_10' then
(SELECT b.eat_qty FROM tbl_bf_daily_nutrition_10 b where b.dn_no = XS.dn_no)
END, 0)
, ' ml') AS time_val
FROM
(
SELECT
x.nutirition_cd_no as cd_no,
x.dn_no,
x.reg_dt
FROM tbl_bf_daily_nutrition x
WHERE 1=1
AND x.smc_no = #smc_no#
AND x.nutirition_cd_no in ('BF_NU_TP_1', 'BF_NU_TP_2', 'BF_NU_TP_3', 'BF_NU_TP_9', 'BF_NU_TP_10')
ORDER BY x.reg_dt desc
LIMIT 1
) XS
) XA
</select>
<!-- 마지막 수면 현황 -->
<select id="select_bf_last_sleep_status" resultClass="dataMap" parameterClass="dataMap">
SELECT
'BF_NU_TP_5' as cd_no,
XA.time_val,
CASE
WHEN TIMESTAMPDIFF(MINUTE, XA.reg_dt, NOW()) <![CDATA[<=]]> 0 THEN '방금 전'
WHEN TIMESTAMPDIFF(MINUTE, XA.reg_dt, NOW()) <![CDATA[<]]> 60 THEN CONCAT(TIMESTAMPDIFF(MINUTE, XA.reg_dt, NOW()), '분 전')
WHEN TIMESTAMPDIFF(HOUR, XA.reg_dt, NOW()) <![CDATA[<]]> 24 THEN CONCAT(TIMESTAMPDIFF(HOUR, XA.reg_dt, NOW()), '시간 전')
WHEN TIMESTAMPDIFF(DAY, XA.reg_dt, NOW()) <![CDATA[<]]> 30 THEN CONCAT(TIMESTAMPDIFF(DAY, XA.reg_dt, NOW()), '일 전')
ELSE CONCAT(TIMESTAMPDIFF(MONTH, XA.reg_dt, NOW()), '달 전')
END AS ago
FROM
(
SELECT
x.reg_dt,
concat( ifnull(sleep_h,0), '시 ', ifnull(sleep_m,0), '분') as time_val
FROM tbl_bf_daily_nutrition x
INNER JOIN tbl_bf_daily_nutrition_5 y on x.dn_no = y.dn_no
WHERE 1=1
AND x.smc_no = #smc_no#
AND x.nutirition_cd_no in ('BF_NU_TP_5')
ORDER BY x.reg_dt desc
LIMIT 1
) XA
</select>
<!-- 마지막 대소변 현황 -->
<select id="select_bf_last_bedpan_status" resultClass="dataMap" parameterClass="dataMap">
SELECT
'BF_NU_TP_6' as cd_no,
XA.time_val,
CASE
WHEN TIMESTAMPDIFF(MINUTE, XA.reg_dt, NOW()) <![CDATA[<=]]> 0 THEN '방금 전'
WHEN TIMESTAMPDIFF(MINUTE, XA.reg_dt, NOW()) <![CDATA[<]]> 60 THEN CONCAT(TIMESTAMPDIFF(MINUTE, XA.reg_dt, NOW()), '분 전')
WHEN TIMESTAMPDIFF(HOUR, XA.reg_dt, NOW()) <![CDATA[<]]> 24 THEN CONCAT(TIMESTAMPDIFF(HOUR, XA.reg_dt, NOW()), '시간 전')
WHEN TIMESTAMPDIFF(DAY, XA.reg_dt, NOW()) <![CDATA[<]]> 30 THEN CONCAT(TIMESTAMPDIFF(DAY, XA.reg_dt, NOW()), '일 전')
ELSE CONCAT(TIMESTAMPDIFF(MONTH, XA.reg_dt, NOW()), '달 전')
END AS ago
FROM
(
SELECT
x.reg_dt,
concat(ifnull(y.rest_qty,0), 'ml') as time_val
FROM tbl_bf_daily_nutrition x
INNER JOIN tbl_bf_daily_nutrition_6 y on x.dn_no = y.dn_no
WHERE 1=1
AND x.smc_no = #smc_no#
AND x.nutirition_cd_no in ('BF_NU_TP_6')
ORDER BY x.reg_dt desc
LIMIT 1
) XA
</select>
<insert id="insert_bf_daily_nutrition" parameterClass="dataMap">
INSERT tbl_bf_daily_nutrition
(

@ -93,6 +93,12 @@
,200 - past_day as day200
,300 - past_day as day300
,365 - past_day as day365
,DATE_FORMAT(ADDDATE(now(), INTERVAL (100 - past_day) DAY),'%Y.%m.%d') as day100date
,DATE_FORMAT(ADDDATE(now(), INTERVAL (200 - past_day) DAY),'%Y.%m.%d') as day200date
,DATE_FORMAT(ADDDATE(now(), INTERVAL (300 - past_day) DAY),'%Y.%m.%d') as day300date
,DATE_FORMAT(ADDDATE(now(), INTERVAL (365 - past_day) DAY),'%Y.%m.%d') as day365date
,REPLACE(append_src_img_file.mt_file_local_url, '/cdn001/', '') AS append_src_img_file_url
,REPLACE(append_src_img_file.mt_file_nm, '/cdn001/', '') AS append_src_img_file_nm
,REPLACE(append_300_img_file.mt_file_local_url, '/cdn001/', '') AS append_300_img_file_url

@ -185,6 +185,7 @@
XA.cd_no,
XA.title,
XA.val_1,
XA.color_cd,
case
when y_order_no is not null then XA.y_order_no
else x_order_no
@ -196,7 +197,8 @@
title,
val_1,
x.order_no as x_order_no,
y.order_no as y_order_no
y.order_no as y_order_no,
x.color_cd
FROM tbl_code_item x
LEFT OUTER JOIN tbl_member_category y on x.cd_no = y.cd_no and y.member_id = #member_id#
WHERE cg_cd = #cg_cd# and x.use_yn = 'Y'

@ -87,6 +87,7 @@
<div class="ch_cont">
<div class="comment_like"><span class="like"></span>${item['l_nt']!}</div>
<div class="comment_like"><span class="comment"></span>${item['c_nt']!}</div>
<div class="comment_like"><button type="button" id="share-list" name="" class="c_btn"><span class="share"></span></button></div>
</div>
</div>

@ -133,7 +133,7 @@
</button>
</li>
<li>
<button type="button" id="" name="" class="c_btn">
<button type="button" id="share-list" name="" class="c_btn">
<span class="hidden">아이콘</span>공유
</button>
</li>
@ -175,7 +175,7 @@
<script>
$(function() {
$(".community_header ul li a").on("click", function() {
$(".community_header ul li a").on("click", function() {
$(this).addClass("active")
.parents(".community_header ul li").siblings().find("a").removeClass("active")
});
@ -423,7 +423,7 @@
html = html + '</button>';
html = html + '</li>';
html = html + '<li>';
html = html + '<button type="button" id="" name="" class="c_btn">';
html = html + '<button type="button" id="share-list" name="" class="c_btn">';
html = html + '<span class="hidden">아이콘</span>공유';
html = html + '</button>';
html = html + '</li>';

@ -127,7 +127,7 @@
</button>
</li>
<li>
<button type="button" id="" name="" class="c_btn">
<button type="button" id="share-list" name="" class="c_btn">
<span class="hidden">아이콘</span>공유
</button>
</li>
@ -309,7 +309,7 @@
<input type="hidden" id="title" name="title" />
<input type="hidden" id="b_no" name="b_no" value="${model['b_no']}" />
</form>
<!-- 하단 네비 iyu_nav -->
<#include "/m/include/index_bottom_menu.ftl">
<!-- //iyu_nav -->
@ -335,6 +335,7 @@
<script>
$(function() {
$(".community_header ul li a").on("click", function() {
$(this).addClass("active")
.parents(".community_header ul li").siblings().find("a").removeClass("active")

@ -1,3 +1,37 @@
<!-- 팝업 : 공유하기 -->
<div id="sharePopup" class="modal-wrapper">
<div class="modal_content" style="width: 320px;">
<div class="head">
<div class="title">공유하기</div>
<div class="modal_close_btn"><img src="../img/close_ico.png"></div>
</div>
<div class="content">
<ul class="share-list">
<li class="kakao" id="linkedKakao" style="padding-left:40px;padding-right:40px;"><a href="#"><img src="/bf/m/img/Icon_Share_Kakao.png" alt="" style="width:40px;" /></a></li> <!-- 카카오톡 -->
<li class="facebook" style="padding-right:40px;"><a href="#"><img src="/bf/m/img/Icon_Share_Facebook.png" style="width:40px;" /></a></li> <!-- facebook -->
<li class="copy">
<a href="#popup-url-copy" class="copy_btn" >
<img src="/bf/m/img/Icon_Share_Clip.png" alt="" style="width:60px;margin-top:-10px;"/>
<input type="hidden" class="copy_text" value=""/>
</a>
</li>
</ul>
</div>
</div>
</div><!-- .popup-wrap -->
<div id="shareCopy" class="modal-wrapper">
<div class="modal_content" style="width: 400px;">
<div class="head">
<div class="title">공유하기</div>
<div class="modal_close_btn"><img src="../img/close_ico.png"></div>
</div>
<div class="content">
<p class="single-txt">URL이 복사 되었습니다. <br />원하는 곳에 붙여넣기 해 주세요.</p>
</div>
</div>
</div>
<script>
$(document).ready(function(){
<#if model['script_msg']?exists>
@ -7,97 +41,116 @@
showConfirmButton: false,
timer: 2000
});
</#if>
// $('#share-popup').popup();
</#if>
$("#share-list").on("click", function() {
$('#sharePopup').addClass('open');
});
$('.modal_close_btn').on('click', function() {
$('.modal-wrapper').removeClass('open');
});
$(".copy .copy_text").val(window.location.href);
var pageTitle = document.title;
var pageUrl = location.href
var shareUrlFB = "https://www.facebook.com/sharer/sharer.php?u="+encodeURIComponent(pageUrl)+"&t="+encodeURI(pageTitle);
var shareUrlTWT = "https://twitter.com/intent/tweet?text="+encodeURIComponent(pageTitle)+"&url="+encodeURI(pageUrl);
var shareUrlNaver = "https://share.naver.com/web/shareView.nhn?url="+encodeURI(pageUrl)+"&title="+encodeURI(pageTitle);
$(".facebook").on("click" , function(e) {
e.preventDefault();
window.open(shareUrlFB, '', 'scrollbars=no, width=584, height=635');
});
$(".twitter").on("click" , function(e) {
e.preventDefault();
window.open(shareUrlTWT, '', 'scrollbars=no, width=584, height=635');
});
$(".kakao").on("click" , function(e) {
e.preventDefault();
});
Kakao.init("41afd760326f3eb50892555cd0b16a8e");
Kakao.Link.createDefaultButton({
container: '#linkedKakao',
objectType: 'feed',
content: {
title: pageTitle,
description: '이유식당 전문가 리뷰',
imageUrl:
'http://mud-kage.kakao.co.kr/dn/NTmhS/btqfEUdFAUf/FjKzkZsnoeE4o19klTOVI1/openlink_640x640s.jpg',
link: {
mobileWebUrl: window.location.href,
androidExecutionParams: window.location.href,
},
},
itemContent: {
profileText: 'Kakao',
profileImageUrl: 'http://mud-kage.kakao.co.kr/dn/Q2iNx/btqgeRgV54P/VLdBs9cvyn8BJXB3o7N8UK/kakaolink40_original.png',
titleImageUrl: 'http://mud-kage.kakao.co.kr/dn/Q2iNx/btqgeRgV54P/VLdBs9cvyn8BJXB3o7N8UK/kakaolink40_original.png',
titleImageText: 'Cheese cake',
titleImageCategory: 'Cake',
items: [
{
item: 'Cake1',
itemOp: '1000원',
},
{
item: 'Cake2',
itemOp: '2000원',
},
{
item: 'Cake3',
itemOp: '3000원',
},
{
item: 'Cake4',
itemOp: '4000원',
},
{
item: 'Cake5',
itemOp: '5000원',
},
],
sum: 'Total',
sumOp: '15000원',
},
social: {
likeCount: 10,
commentCount: 20,
sharedCount: 30,
},
buttons: [
{
title: '웹으로 이동',
link: {
mobileWebUrl: 'https://developers.kakao.com',
},
},
{
title: '앱으로 이동',
link: {
mobileWebUrl: 'https://developers.kakao.com',
},
},
]
});
});
$(".copy").on("click" , function(e) {
e.preventDefault();
var target = $(this);
target.find("input").attr("type" , "text");
target.find("input").get(0).select();
target.find("input").get(0).setSelectionRange(0, 9999); // 추가
var success = document.execCommand("copy");
target.find("input").attr("type" , "hidden");
$('.modal-wrapper').removeClass('open');
$("#shareCopy").addClass('open');
});
Kakao.init("c58d022c1221001970311eda6c640329"); //41afd760326f3eb50892555cd0b16a8e > cheewoo
Kakao.Link.createDefaultButton({
container: '#linkedKakao',
objectType: 'feed',
content: {
title: pageTitle,
description: '이유식당 전문가 리뷰',
imageUrl:
'http://mud-kage.kakao.co.kr/dn/NTmhS/btqfEUdFAUf/FjKzkZsnoeE4o19klTOVI1/openlink_640x640s.jpg',
link: {
mobileWebUrl: window.location.href,
androidExecutionParams: window.location.href,
},
},
/*
itemContent: {
profileText: 'Kakao',
profileImageUrl: 'http://mud-kage.kakao.co.kr/dn/Q2iNx/btqgeRgV54P/VLdBs9cvyn8BJXB3o7N8UK/kakaolink40_original.png',
titleImageUrl: 'http://mud-kage.kakao.co.kr/dn/Q2iNx/btqgeRgV54P/VLdBs9cvyn8BJXB3o7N8UK/kakaolink40_original.png',
titleImageText: 'Cheese cake',
titleImageCategory: 'Cake',
items: [
{
item: 'Cake1',
itemOp: '1000원',
},
{
item: 'Cake2',
itemOp: '2000원',
},
{
item: 'Cake3',
itemOp: '3000원',
},
{
item: 'Cake4',
itemOp: '4000원',
},
{
item: 'Cake5',
itemOp: '5000원',
},
],
sum: 'Total',
sumOp: '15000원',
},
social: {
likeCount: 10,
commentCount: 20,
sharedCount: 30,
}, */
buttons: [
{
title: '웹으로 이동',
link: {
mobileWebUrl: 'https://developers.kakao.com',
},
},
{
title: '앱으로 이동',
link: {
mobileWebUrl: 'https://developers.kakao.com',
},
},
]
});
});
function fncGoRecommend() {
<#--location.href = "${URL_ROOT}/m/bf_food/list_bf_homemade_recommend.do?smc_no=" + $("#smc_no").val() + "&return_url=list_bf_homemade_recommend";-->

@ -34,11 +34,20 @@
<div class="tit">메모리</div>
</a>
</li>
<li class="nav_list05">
<a href="${URL_ROOT}/m/bf_board/list_bf_board.do?return_url=index">
<div class="icon">커뮤니티</div>
<div class="tit">커뮤니티</div>
</a>
</li>
<!--
<li class="nav_list05">
<a href="${URL_ROOT}/m/bf_community/list_bf_community.do?return_url=index">
<div class="icon">커뮤니티</div>
<div class="tit">커뮤니티</div>
</a>
</li>
-->
</ul>
</nav>

@ -17,6 +17,7 @@
<link href="../css/style.css?1" rel="stylesheet" type="text/css" >
<link rel="stylesheet" href="${URL_STATIC_ROOT}/m/css/anypicker-all.min.css" />
<script src="https://developers.kakao.com/sdk/js/kakao.js"></script>
<script src="${URL_STATIC_ROOT}/m/js/jquery-3.3.1.min.js"></script>
<link href="${URL_STATIC_ROOT}/m/css/sweetalert2.min.css" rel="stylesheet" >

@ -80,23 +80,25 @@
<#list model['lm_child'] as item>
<li>
<div class="main_pofile_txt">
<h2><span name="child_nm">${item['name']!}</span></h2>
<p>${(item['m']?number/12)!}세 ${(item['m']?number%12)!}개월 (${item['gender_ko']!})</p>
<p>${(item['past_day'])!}일(${(item['past_day']?number/7)!}주 ${(item['past_day']?number%7)!}일) / (${item['past_month']!}개월 ${(item['past_day']?number%7)!}일)</p>
<#if item['day100'] gt 0>
<p>100일 D-${(item['day100'])!}일</p>
<#elseif item['day200'] gt 0>
<p>200일 D-${(item['day200'])!}일</p>
<#elseif item['day300'] gt 0>
<p>300일 D-${(item['day300'])!}일</p>
<#elseif item['day365'] gt 0>
<p>첫돌 D-${(item['day365'])!}일</p>
</#if>
<h2>${item['name']!} (${item['gender_ko']!})</h2>
<p>${(item['past_day'])!}일 (${(item['past_day']?number/7)!}주 ${(item['past_day']?number%7)!}일/${item['past_month']!}개월 ${(item['past_day']?number%7)!}일)</p>
<p class="d_day">
<#if item['day100'] gt 0>
100일 D-${(item['day100'])!}일,${item['day100date']!}
<#elseif item['day200'] gt 0>
200일 D-${(item['day200'])!}일,${item['day200date']!}
<#elseif item['day300'] gt 0>
300일 D-${(item['day300'])!}일,${item['day300date']!}
<#elseif item['day365'] gt 0>
첫돌 D-${(item['day365'])!}일,${item['day365date']!}
</#if>
</p>
</div>
<div class="main_pofile_img">
<p><a href ="${URL_ROOT}/m/bf_family_baby/view_bf_family_baby.do?smc_no=${item['smc_no']!}" ><img src="<#if item['append_300_img_file']?exists>${URL_ROOT}/file/get_img.do?mt_file_seq=${item['append_300_img_file']}<#else>${URL_STATIC_ROOT}/m/img/main/main_profile_img02.png</#if>" alt="프로필 사진" /></a></p>
<p>
<a href ="${URL_ROOT}/m/bf_family_baby/view_bf_family_baby.do?smc_no=${item['smc_no']!}" ><img src="<#if item['append_300_img_file']?exists>${URL_ROOT}/file/get_img.do?mt_file_seq=${item['append_300_img_file']}<#else>${URL_STATIC_ROOT}/m/img/main/main_profile_img02.png</#if>" alt="프로필 사진" /></a>
</p>
</div>
</li>
</#list>
@ -110,54 +112,49 @@
<!-- main_pofile_info -->
<div class="main_pofile_info main_pofile_info01">
<div class="main_pofile_info_tit">
<span class="p_a">cm</span>
<span class="p_b">kg</span>
</div>
<!-- main_pofile_info_txt -->
<div class="main_pofile_info_txt txt01 active">
<div class="main_pofile_info_txt01"><img src="${URL_STATIC_ROOT}/m/img/main/main_pofile_info_ico01.png" alt="기린 아이콘" /></div>
<div class="main_pofile_info_txt02"><strong><#if model['rm_last_h']['height']?exists>${model['rm_last_h']['height']!}cm<#else>-</#if></strong></div>
<div class="main_pofile_info_txt02"><strong><#if model['rm_last_h']['height']?exists>${model['rm_last_h']['height']!}<#else>-</#if></strong>cm</div>
</div>
<!-- main_pofile_info_txt -->
<#if model['rm_last_w']?exists == true>
<!-- main_pofile_info_txt -->
<div class="main_pofile_info_txt txt02">
<div class="main_pofile_info_txt01"><img src="${URL_STATIC_ROOT}/m/img/main/main_pofile_info_ico01.png" alt="기린 아이콘" /></div>
<div class="main_pofile_info_txt02"><strong><#if model['rm_last_w']['weight']?exists>${model['rm_last_w']['weight']!}kg<#else>-</#if></strong></div>
</div>
<div class="main_pofile_info_txt txt02">
<div class="main_pofile_info_txt02">
<strong><#if model['rm_last_w']['weight']?exists>${model['rm_last_w']['weight']!}kg<#else>-</#if></strong>kg</div>
</div>
</#if>
<div class="main_pofile_info_tit">
<span class="txt01 active">cm</span>
<span class="txt02">kg</span>
</div>
</div>
<!-- main_pofile_info -->
<div class="main_pofile_info main_pofile_info02">
<!-- main_pofile_info_txt -->
<div class="main_pofile_info_txt txt01 active">
<div class="main_pofile_info_txt01"><img src="${URL_STATIC_ROOT}/m/img/main/main_pofile_info_ico02.png" alt="영양 아이콘" /></div>
<#if model['rm_child']['totalNutrition']?exists == true>
<div class="main_pofile_info_txt02"><strong>${model['rm_child']['totalNutrition']}%</strong></div>
</#if>
<#if model['rm_child']['totalNutrition']?exists == false>
<div class="main_pofile_info_txt02"><strong>-</strong></div>
</#if>
<div class="main_pofile_info_txt02">
<#if model['rm_child']['totalNutrition']?exists == true>
<strong>${model['rm_child']['totalNutrition']}</strong>점
</#if>
<#if model['rm_child']['totalNutrition']?exists == false>
<strong>-</strong>
</#if>
</div>
</div>
<!-- main_pofile_info_txt -->
<div class="main_pofile_info_txt txt02">
<div class="main_pofile_info_txt01"><img src="${URL_STATIC_ROOT}/m/img/main/main_pofile_info_ico02.png" alt="영양 아이콘" /></div>
<#if model['rm_child']['totalFood']?exists == true>
<div class="main_pofile_info_txt02"><strong>${model['rm_child']['totalFood']}%</strong></div>
</#if>
<#if model['rm_child']['totalFood']?exists == false>
<div class="main_pofile_info_txt02"><strong>-</strong></div>
</#if>
<div class="main_pofile_info_txt02">
<#if model['rm_child']['totalFood']?exists == true>
<strong>${model['rm_child']['totalFood']}</strong>%
</#if>
<#if model['rm_child']['totalFood']?exists == false>
<strong>-</strong>
</#if>
</div>
</div>
<div class="main_pofile_info_tit">
@ -176,7 +173,7 @@
<div class="swiper-wrapper">
<#list model['category_list'] as item>
<div class="swiper-slide">
<a href="javascript:void(0);" key="${item['val_1']!}"><span>${item['title']!}</span></a>
<a href="javascript:void(0);" style="background-color:${item['color_cd']}" key="${item['val_1']!}"><span>${item['title']!}</span></a>
</div>
</#list>
<div class="swiper-slide">
@ -189,14 +186,34 @@
<!-- main_cont_last_status -->
<div class="main_cont_last_status">
<#if (model['lm_last'])?has_content>
<#list model['lm_last'] as item>
<div>
<p>${item['cd_title']!}</p>
<span>${item['ago']!} / ${item['time_val']!}</span>
</div>
</#list>
</#if>
<div>
<p>마지막 식사</p>
<#if (model['lm_last_meal'])?has_content>
<span>${model['lm_last_meal']['ago']!} / ${model['lm_last_meal']['time_val']!}</span>
</#if>
<#if (model['lm_last_meal'])?has_content == false>
-
</#if>
</div>
<div>
<p>마지막 수면</p>
<#if (model['lm_last_sleep'])?has_content>
<span>${model['lm_last_sleep']['ago']!} / ${model['lm_last_sleep']['time_val']!}</span>
</#if>
<#if (model['lm_last_sleep'])?has_content == false>
-
</#if>
</div>
<div>
<p>마지막 대소변</p>
<#if (model['lm_last_bedpan'])?has_content>
<span>${model['lm_last_bedpan']['ago']!} / ${model['lm_last_bedpan']['time_val']!}</span>
</#if>
<#if (model['lm_last_bedpan'])?has_content == false>
-
</#if>
</div>
</div>
<!-- //main_cont_last_status -->
@ -220,7 +237,7 @@
<div class="main_cont_line"></div>
<!-- 이미지 업로드 main_cont_camera -->
<ul id="ul_photo" class="main_cont_camera" style="overflow-y:auto; height:1200px;">
<ul id="ul_photo" class="main_cont_camera">
<#assign nutirition_cd_no_title = ''>
<#assign ago = ''>
@ -238,17 +255,19 @@
</#if>
<img src="<#if item['append_300_img_file']?exists>${URL_ROOT}/file/get_img.do?mt_file_seq=${item['append_300_img_file']}<#else>${URL_STATIC_ROOT}/m/img/child/child_pic_02.png</#if>" alt="사진영역">
</div>
<div class="main_cont_circle"></div>
<div class="main_cont_circle" style="border-color: ${item['color_cd']};"></div>
<div class="main_cont_info">
<div class="info_title">
<p><#if (model['lm_nutrition'])?has_content>${nutirition_cd_no_title}</#if></p>
<p style="color: ${item['color_cd']};"><#if (model['lm_nutrition'])?has_content>${nutirition_cd_no_title}</#if></p>
<span class="info_time">${ago}</span>
</div>
<div class="info_recode" onclick="location.href='${URL_ROOT}/m/bf_daily_nutrition/view_bf_daily_nutrition.do?dn_no=${item['dn_no']}'">
<p>기록내용</p>
<div class="info_amount">
<p>${time_text}</p>
</div>
<div class="info_recode" style="border-color: ${item['color_cd']};" onclick="location.href='${URL_ROOT}/m/bf_daily_nutrition/view_bf_daily_nutrition.do?dn_no=${item['dn_no']}'">
<p style="color: ${item['color_cd']};">순간의 기록</p>
<span>
${memo}<br/>
${time_text}
</span>
</div>
</div>

@ -5732,7 +5732,7 @@ main {
width: 100%;
min-height: calc(100vh - 300px);
margin-top: 270px;
padding-bottom: 2rem;f
padding-bottom: 2rem;
}
@ -13030,6 +13030,12 @@ main.sona_cont_measurement {
background: url(../img/community/community_collection_comment.png)no-repeat center/15px;
margin-right: 5px;
}
.ca_time .ch_cont .comment_like .share{
padding-right: 18px;
background: url(../img/community/community_collection_share.png)no-repeat center/15px;
margin-right: 5px;
}
.commu_div{
display: flex;

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1006 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

Loading…
Cancel
Save