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
snut97 3 years ago
parent 2ea12600fa 1e75ff45a6
commit 95c2945c12
7 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File

25
src/main/resources/sqlmap/m/bf_growth_body/com.backoffice.m.bf_growth_body.xml
Unescape View File

@ -139,6 +139,22 @@
</isNotEmpty> </isNotEmpty>
</select> </select>
<select id="select_bf_growth_body_list_count" resultClass="Integer" parameterClass="dataMap">
SELECT count(*)
FROM tbl_bf_growth_body x
INNER JOIN tbl_bf_family_match y on x.smc_no = y.smc_no
INNER JOIN tbl_bf_family_baby smc on x.smc_no = smc.smc_no
WHERE 1 =1
AND y.member_id = #member_id#
AND x.smc_no = #smc_no#
AND x.smc_no = smc.smc_no
AND DATE_ADD(smc.birthday, INTERVAL +60 MONTH) <![CDATA[>=]]> x.base_dt
<isNotEmpty property="sgb_no">
AND x.sgb_no = #sgb_no#
</isNotEmpty>
</select>
<select id="select_bf_growth_body_last_by_sgb_no" resultClass="dataMap" parameterClass="dataMap"> <select id="select_bf_growth_body_last_by_sgb_no" resultClass="dataMap" parameterClass="dataMap">
SELECT SELECT
x.sgb_no x.sgb_no
@ -166,15 +182,6 @@
LIMIT 0, 1 LIMIT 0, 1
</select> </select>
<select id="select_bf_growth_body_list_count" resultClass="Integer" parameterClass="dataMap">
SELECT COUNT(*)
FROM tbl_bf_growth_body x
INNER JOIN tbl_bf_family_match y on x.smc_no = y.smc_no
WHERE 1 =1
AND y.member_id = #member_id#
AND x.smc_no = #smc_no#
</select>
<select id="select_bf_growth_body_by_base_dt" resultClass="dataMap" parameterClass="dataMap"> <select id="select_bf_growth_body_by_base_dt" resultClass="dataMap" parameterClass="dataMap">
SELECT x.* SELECT x.*

6
src/main/webapp/WEB-INF/views/ftl/m/bf_board/list_bf_board.ftl
Unescape View File

@ -5,12 +5,6 @@
<script src="${URL_STATIC_ROOT}/m/js/jquery_popupoverlay.js"></script> <script src="${URL_STATIC_ROOT}/m/js/jquery_popupoverlay.js"></script>
<script src="${URL_STATIC_ROOT}/m/js/design.js"></script> <script src="${URL_STATIC_ROOT}/m/js/design.js"></script>
<style media="screen">
body{
background: #F4F5F5;
}
</style>
<body> <body>
<!-- wrap --> <!-- wrap -->

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

@ -21,7 +21,7 @@
<h1 class="header_title">${model['rm']['nutirition_cd_no_title']!}</h1> <h1 class="header_title">${model['rm']['nutirition_cd_no_title']!}</h1>
<div class="side_Rbtn"> <div class="side_Rbtn">
<a onclick="javascript:del_daily_nutrition(${model['rm']['dn_no']!}, ${model['rm']['smc_no']!}, '${model['rm']['nutirition_cd_no']!}')" class="nutrition_subMain_delete"> <a onclick="javascript:del_daily_nutrition(${model['rm']['dn_no']!}, ${model['rm']['smc_no']!}, '${model['rm']['nutirition_cd_no']!}')" class="nutrition_subMain_delete">
<img src="${URL_STATIC_ROOT}/m/img/nutrition/nutrition_subMain_delete_ico.png" alt="휴지통 아이콘"> <img src="${URL_ROOT}/m/img/nutrition/nutrition_subMain_delete_ico.png" alt="휴지통 아이콘">
</a> </a>
</div> </div>
</header> </header>
@ -212,8 +212,8 @@
} }
}); });
/*********Camera 및 사진 업로드*********/
$(function() { $(function() {
/*********Camera 및 사진 업로드*********/
// 사진 삭제 // 사진 삭제
$(document).on('click', '#btn_delImg01, #btn_delImg02, #btn_delImg03', function(){ $(document).on('click', '#btn_delImg01, #btn_delImg02, #btn_delImg03', function(){
var imgSeq = this.id.replace('btn_delImg',''); var imgSeq = this.id.replace('btn_delImg','');

8
src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_6.ftl
Unescape View File

@ -1,4 +1,6 @@
<#include "/m/bf_daily_nutrition/include_top.ftl"> <#include "/m/bf_daily_nutrition/include_top.ftl">
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
<link rel="stylesheet" href="${URL_ROOT}/m/css/jquery-ui.min.css">
<!-- 대소변 --> <!-- 대소변 -->
<!-- nutrition_kinds_basic --> <!-- nutrition_kinds_basic -->
<div class="nutrition_kinds_basic nutrition_kinds_toilet"> <div class="nutrition_kinds_basic nutrition_kinds_toilet">
@ -95,6 +97,7 @@
</div> </div>
<!-- //nutrition_kinds_basic --> <!-- //nutrition_kinds_basic -->
<script> <script>
function init(){ function init(){
if('${model['rm']['rest_tp']!}' =='20'){ // 19 : 대변 , 20: 소변 if('${model['rm']['rest_tp']!}' =='20'){ // 19 : 대변 , 20: 소변
$(".nutrition_kinds_pee").show(); $(".nutrition_kinds_pee").show();
@ -208,7 +211,7 @@
} }
}); });
/*
$('#slider1').slider({ $('#slider1').slider({
// 슬라이더바 이하값 색 강조 // 슬라이더바 이하값 색 강조
range: 'min', // max 로 설정시 이상값 강조 range: 'min', // max 로 설정시 이상값 강조
@ -221,9 +224,8 @@
var slider1 = $("#slider1").slider("value"); var slider1 = $("#slider1").slider("value");
save.set('rest_qty',slider1); save.set('rest_qty',slider1);
} }
}); });
*/
//대변색 //대변색
$('#slider2').slider({ $('#slider2').slider({
// 슬라이더바 이하값 색 강조 // 슬라이더바 이하값 색 강조

4
src/main/webapp/WEB-INF/views/ftl/m/bf_growth_body/view_bf_growth_body_input.ftl
Unescape View File

@ -50,7 +50,7 @@
<div class="p_header_pic"> <div class="p_header_pic">
<div class="pic hidden" style="background: url(${thumb_path})">프로필 사진</div> <div class="pic hidden" style="background: url(${thumb_path})">프로필 사진</div>
<div class="child_tit"> <div class="child_tit">
<div class="name"><a href="javascript:CMD_MEASUREMENT_HEIGHT('${model['rm_child']['smc_no']}');">${model['rm_child']['name']}</a></div> <div class="name">${model['rm_child']['name']}</a></div>
<div class="age">${model['rm_child']['age_y']!}세 ${model['rm_child']['age_m']!}개월</div> <div class="age">${model['rm_child']['age_y']!}세 ${model['rm_child']['age_m']!}개월</div>
</div> </div>
</div> </div>
@ -111,7 +111,7 @@
</div> </div>
<#--페이지네이션--> <#--페이지네이션-->
<ul class="pagination"> <ul class="pagination">
<@b.Paging url="${URL_PATH}/view_bf_growth_body_input.do" <@b.Paging url="${URL_PATH}/m/bf_growth_body/view_bf_growth_body_input.do"
pageCount="${model['page']['pageCount']?c}" pageCount="${model['page']['pageCount']?c}"
rowCount="${model['page']['rowCount']?c}" rowCount="${model['page']['rowCount']?c}"
rowMax="${model['page']['rowMax']?c}" rowMax="${model['page']['rowMax']?c}"

2
src/main/webapp/WEB-INF/views/ftl/m/include/index_top.ftl
Unescape View File

@ -34,7 +34,7 @@
<script src="${URL_ROOT}/m/js/anypicker.min.js"></script> <script src="${URL_ROOT}/m/js/anypicker.min.js"></script>
<style media="screen"> <style media="screen">
body {-webkit-tap-highlight-color:transparent, -webkit-backface-visibility: hidden, overflow: hidden; background: #F4F5F5; } body {-webkit-tap-highlight-color:transparent, -webkit-backface-visibility: hidden, overflow: hidden; }
html { html {
-webkit-touch-callout:none; -webkit-touch-callout:none;
-webkit-user-select:none; -webkit-user-select:none;

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

@ -1385,8 +1385,8 @@ main {
.result_num_box .result_num { .result_num_box .result_num {
color: #004A71; color: #004A71;
font-size: 1.4375rem; font-size: 1.0rem;
line-height: 1.4375rem; line-height: 1.0rem;
font-weight: 500; font-weight: 500;
} }
@ -1451,6 +1451,10 @@ main {
border: 1px solid #ddd; border: 1px solid #ddd;
} }
.m_child_direct_input .profile_wrap {
padding-bottom: 65px;
}
.m_child_direct_input .profile_wrap .p_header_pic .pic { .m_child_direct_input .profile_wrap .p_header_pic .pic {
border: 2px solid #004A71 !important; border: 2px solid #004A71 !important;
} }
@ -9202,9 +9206,11 @@ p.selectbox {
.nutrition_introduce_img_big img { .nutrition_introduce_img_big img {
display: inherit; display: inherit;
width: 100%; width: 70%;
max-width: 500px; max-width: 500px;
margin: 0 auto; margin: 0 auto;
object-fit: contain;
-o-object-fit: contain;
} }
.nutrition_introduce_img_big span { .nutrition_introduce_img_big span {
@ -15261,7 +15267,6 @@ main.sona_cont_measurement {
} }
/* 8-14.설정하기-음악설정 */ /* 8-14.설정하기-음악설정 */
{}
/* 8-15.설정하기-카테고리수정 */ /* 8-15.설정하기-카테고리수정 */
.m_set_recode_order { .m_set_recode_order {

Write Preview
Loading…
Cancel
Save