4/26 체크리스트 오류 수정

dev_bert
kyebyungha 3 years ago
parent 02d86895db
commit 1b3e0ff55e

@ -49,7 +49,7 @@
SELECT
x.db_dn_no
,dn.prd_nm
,x.reg_dt
,DATE_FORMAT(x.reg_dt, '%Y.%m.%d %h:%i') reg_dt
FROM tbl_bf_daily_nutrition_2 x
INNER JOIN tbl_db_nutrient dn ON dn.dn_no = x.db_dn_no
WHERE x.milk_tp = '87'
@ -92,7 +92,7 @@
SELECT
x.db_dn_no
,dn.prd_nm
,x.reg_dt
,DATE_FORMAT(x.reg_dt, '%Y.%m.%d %h:%i') reg_dt
FROM tbl_bf_daily_nutrition_3 x
INNER JOIN tbl_db_nutrient dn ON dn.dn_no = x.db_dn_no
WHERE x.smc_no = #smc_no#
@ -237,7 +237,7 @@
sf.name
end ) prd_nm
,x.db_dhb_tp
,x.reg_dt
,DATE_FORMAT(x.reg_dt, '%Y.%m.%d %h:%i') reg_dt
FROM tbl_bf_daily_nutrition_9 x
LEFT JOIN tbl_db_home_bf bf ON bf.dhb_no = x.db_dhb_no
LEFT JOIN tbl_db_home_sf sf ON sf.dhb_no = x.db_dhb_no
@ -287,7 +287,7 @@
df.prd_nm
end ) prd_nm
,x.db_dbc_tp
,x.reg_dt
,DATE_FORMAT(x.reg_dt, '%Y.%m.%d %h:%i') reg_dt
from tbl_bf_daily_nutrition_10 x
left join tbl_db_bf_commerce dn
on dn.dbc_no = x.db_dbc_no

@ -74,7 +74,7 @@
<#if model['lm']?has_content >
<#list model['lm'] as item>
<!-- 태그에 hot 클래스 추가시 노란테두리 생성 -->
<div class="write_box <#if item?index == 0>hot </#if>">
<div class="write_box <#if item?index == 0>hot </#if>" onclick="fncDetail('${item['bd_no']!}')" >
<div class="ca_time">
<div class="ca_cont" >
<div class="write_ca <#if item['bd_tp']?contains("BF_CT_TP_5")> red <#else> yellow </#if>">${item['bd_tp_nm']!}</div>

@ -145,7 +145,7 @@
<#list model['lm_vote_list'] as item>
<div class="vote_box" data-vtno ='${item['vt_no']!}' data-vote ='${item['vote_tp']!}' data-result ='${item['v_nt']!}'>
<p>${item['v_content']!}</p>
<div class="result">
<div class="result active">
<p>${item['v_nt']!}개</p>
</div>
</div>
@ -421,15 +421,15 @@
});
$(".copy").on("click" , function(e) {
debugger;
e.preventDefault();
var target = $("#copy");
target.val("${model ['rm']['title']!}");
target.val($(".cont_txt").text());
var urlbox = document.getElementById( 'copy' );
urlbox.select();
document.execCommand('copy');
$("#shared").removeClass("open");
Swal.fire({text:"댓글 이 복사 되었습니다."});
Swal.fire({text:"게시글이 복사 되었습니다."});
});
@ -459,41 +459,49 @@
$(".vote_box").on("click", function() {
$(".result").toggleClass("active")
$(".result").children(".result_img").remove();
$(this).children(".result").append(
"<img class='result_img' src='${URL_ROOT}/m/img/community/check_icon.png'>"
)
if( this.dataset.vote ==0){
var data = {
var data = {
bd_no : ${model ['rm']['bd_no']!}
,vt_no : this.dataset.vtno
};
this.dataset.result = Number(this.dataset.result) +1;
this.children[1].innerText = this.dataset.result +"개";
$(".vote_box").each( function(idx,ele) {
ele.dataset.vote = Number(ele.dataset.vote) +1;
});
$.ajax({
url:'${URL_ROOT}/m/bf_board/ajax_insert_bf_board_vote.do?1=1',
type:'post',
data: data,
dataType:'json',
error:function(request,status,error){
Swal.fire({text:"등록되지 않았습니다"});
},
success:function(result){
Swal.fire({text:"처리 되었습니다"}) ;
},
});
}else {
Swal.fire({text:"이미 투표를 하였습니다."});
}
})
Swal.fire({
text: "투표 하시겠습니까? 투표하시면 취소할 수 없습니다.",
showCancelButton: true,
confirmButtonText: '네',
cancelButtonText: '취소'
}).then((result) => {
if(result.value){
this.dataset.result = Number(this.dataset.result) +1;
this.children[1].innerText = this.dataset.result +"개";
$(".vote_box").each( function(idx,ele) {
ele.dataset.vote = Number(ele.dataset.vote) +1;
});
$.ajax({
url:'${URL_ROOT}/m/bf_board/ajax_insert_bf_board_vote.do?1=1',
type:'post',
data: data,
dataType:'json',
error:function(request,status,error){
Swal.fire({text:"투표되지 않았습니다"});
},
success:function(result){
Swal.fire({text:"투표처리 되었습니다"}) ;
$(".result").toggleClass("active")
$(".result").children(".result_img").remove();
$(this).children(".result").append(
"<img class='result_img' src='${URL_ROOT}/m/img/community/check_icon.png'>"
);
},
});
}
});
}else {
Swal.fire({text:"이미 투표를 하였습니다."});
}
});
var swiper = new Swiper('.swiper-container', {
spaceBetween: 20,
@ -719,7 +727,7 @@
var urlbox = document.getElementById( 'copy' );
urlbox.select();
document.execCommand('copy');
Swal.fire({text:"댓글 이 복사 되었습니다."});
Swal.fire({text:"댓글이 복사 되었습니다."});
$("#option2").removeClass("open");
});
@ -773,7 +781,7 @@
$(".btn_reply").on("click", function() {
$(".comment_input_cont").show();
var nickName = this.parentNode.parentNode.childNodes[1].textContent;
$(".reply_to").text(nickName+'에게 답글을 쓰는중...');
$(".reply_to").text(nickName+'에게 댓()글을 쓰는중...');
$(".reply_cont").addClass("active");
$reply_new_yn ="Y";
$ct_no = this.dataset.ct_no;

@ -205,15 +205,15 @@
function add_pick_file(){
var add_pic_tags = '<div class="add_pic_list_item">' +
'<div class="input_file_upload">' +
'<input type="file" id="append_src_img_file_' + pick_img_index + '" name="append_src_img_file_' + pick_img_index + '" accept="image/*;capture=camera" class="upfile">' +
'<button type="button" class="btn_upfile"></button>' +
'<div id="add_thumb" class="add_thumb">' +
'<img src="${URL_STATIC_ROOT}/m/img/community/upload_img.jpg" alt="사진추가하기">' +
'</div>'+
'<button type="button" id="" class="ibtn_x off">삭제</button> ' +
'</div>' +
'</div>';
' <div class="input_file_upload">' +
' <input type="file" id="append_src_img_file_' + pick_img_index + '" name="append_src_img_file_' + pick_img_index + '" accept="image/*;capture=camera" class="upfile">' +
' <button type="button" class="btn_upfile"></button>' +
' <div id="add_thumb" class="add_thumb">' +
' <img src="${URL_STATIC_ROOT}/m/img/community/upload_img.jpg" alt="사진추가하기">' +
' </div>'+
' <button type="button" id="" class="ibtn_x off">삭제</button> ' +
' </div>' +
'</div>';
$(".add_pic_list_box").append(add_pic_tags);
$('#pick_img_index').val(++pick_img_index);
@ -240,14 +240,13 @@
});
$(document).on('change', ".input_file_upload input[type=file]", function(){
var file = $(this)[0].files[0];
//console.log(file.name + "\n" + file.type + "\n" + file.size + "\n" + file.lastModifiedDate); // upfile var
if ($(this).hasClass('file_mypage')) {
$(this).talkImage(file, '.add_thumb');
}else{
$(this).displayImage(file, '.add_thumb');
} $(this).siblings('.add_thumb').removeClass('off').siblings('.ibtn_x').removeClass('off');
});
var file = $(this)[0].files[0];
if ($(this).hasClass('file_mypage')) {
$(this).talkImage(file, '.add_thumb');
}else{
$(this).displayImage(file, '.add_thumb');
} $(this).siblings('.add_thumb').removeClass('off').siblings('.ibtn_x').removeClass('off');
});
$.fn.extend({
@ -370,7 +369,7 @@
$(".community_write_basic").show();
<#else>
$(".community_write_basic").hide();
</#if>
</#if>
});

@ -269,8 +269,12 @@
var timer ;
// 타이머 시작
var startTime =function (min){
initMinute = min;
var startTime =function (min){
initMinute = min;
var remainMinute_ = parseInt(initMinute/60);
var remainSecond_ = initMinute%60;
$("#timer").empty();
$("#timer").text(Lpad(remainMinute_,2) + ":" + Lpad(remainSecond_,2) ); // mm:ss 표기
};
// 타이머 중지
@ -285,6 +289,7 @@
$(obj).addClass("active");
};
var stopTime = function() {
$(".border_btn").removeClass("active");
$("#btnStop").addClass("active");
if( $($(".time_tit")[0]).hasClass("active") === true){
@ -310,6 +315,8 @@
$("#iptbls").val(eat_time.substr(3,5));
$("#blm").val(eat_time.substr(0,2));
$("#bls").val(eat_time.substr(3,5));
$("#timer").text("00:00");
initMinute =0;
};
var stopTimeRight =function() {
@ -319,6 +326,8 @@
$("#iptbrs").val(eat_time.substr(3,5));
$("#brm").val(eat_time.substr(0,2));
$("#brs").val(eat_time.substr(3,5));
$("#timer").text("00:00");
initMinute =0;
};
var changeTime =function() {
@ -337,7 +346,10 @@
var addTime =function(min) {
var eat_time = parseInt($("#timer").text().substr(0,2)) + (min*1) ;
if(eat_time <0) eat_time = 0;
if(eat_time <0) {
eat_time = 0;
$("#timer").text("00:00");
}
$("#iptbm").val(Lpad(eat_time,2));
$("#iptbs").val(Lpad(parseInt($("#timer").text().substr(3,2)),2));

@ -11,6 +11,9 @@
<div>
<!-- 섭취시간 -->
<div class="take_time w_div">
<div class="stop_ok_div">
<button type="button" id="btnStart" class="border_btn" onclick="pauseTime();startTime(0);setTimer();">다시시작</button>
</div>
<div class="sound_icon">
<button type="button" id="btnMusicPlay">
<img src="../img/nutrition/ico_sound_on_black_18.png" alt="" onclick="fncMusicPlay();">
@ -57,11 +60,11 @@
<!-- 이유식 입력 -->
<div class="snack_input w_div">
<p class="record_title">* (최근수유)이유식 종류</p>
<p class="record_title">* (최근)이유식 종류</p>
<#if model['lm_lastest_lac']? has_content>
<#list model['lm_lastest_lac'] as item>
<div class="milk_sel"><a onclick="javascript:save_set('db_dbc_no', '${item['db_dbc_no']!}', '${item['prd_nm']!}')"> ${item['prd_nm']!}</a></div>
<div class="milk_sel"><a onclick="javascript:save_set('db_dbc_no', '${item['db_dbc_no']!}', '${item['prd_nm']!}')"> ${item['prd_nm']!}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[${item['reg_dt']!}]</a></div>
</#list>
</#if>

@ -16,7 +16,7 @@
<ul class="type_tab">
<#if model['lm_hosp_tp']? has_content>
<#list model['lm_hosp_tp'] as item>
<li data-tab="tab${item?counter}" onclick="javascript:save.set('hosp_tp', '${item['cd_no']}');" <#if (model['rm']['hosp_tp']?exists && model['rm']['hosp_tp'] == item['cd_no']?c ) >class="current"</#if>><a href="javascript:void(0);">${item['title']}</a></li>
<li data-tab="tab${item?counter}" onclick="javascript:save.set('hosp_tp', '${item['cd_no']}');reset()" <#if (model['rm']['hosp_tp']?exists && model['rm']['hosp_tp'] == item['cd_no']?c ) >class="current"</#if>><a href="javascript:void(0);">${item['title']}</a></li>
<!--
<label onclick="javascript:save.set('hosp_tp', '${item['cd_no']}');" class="box-radio-input"><input type="radio" name="방문유형" value="옵션1" <#if model['rm']['hosp_tp']?exists && model['rm']['hosp_tp'] == item['cd_no']?c >checked</#if>><span>${item['title']}</span></label>
-->
@ -102,6 +102,14 @@
<!-- //검진 기록/처방전 첨부 -->
<script type="text/javascript">
var reset =function() {
$("#hosp_nm").val('');
$("#doctor_nm").val('');
$("#checkup").val('');
$(".add_pic_list_item").remove();
add_hosp_file();
};
$(function(){
$("div.nutrition_kinds_basic02>div").find(".p_input_box>input").bind('input', function(event){

@ -14,7 +14,7 @@
<ul class="type_tab">
<#if model['lm_lac_tp']? has_content>
<#list model['lm_lac_tp'] as item>
<li data-tab="tab${item?counter}" onclick="javascript:save.set('milk_tp', '${item['cd_no']}');pauseTime();startTime(0);setTimer();" <#if (model['rm']['milk_tp']?exists && model['rm']['milk_tp'] == item['cd_no'] ) >class="current"</#if>><a href="javascript:void(0);">${item['title']}</a></li>
<li data-tab="tab${item?counter}" onclick="javascript:save.set('milk_tp', '${item['cd_no']}');pauseTime();startTime(0);reset()" <#if (model['rm']['milk_tp']?exists && model['rm']['milk_tp'] == item['cd_no'] ) >class="current"</#if>><a href="javascript:void(0);">${item['title']}</a></li>
</#list>
</#if>
</ul>
@ -75,7 +75,7 @@
<#if model['lm_lastest_lac']? has_content>
<#list model['lm_lastest_lac'] as item>
<div class="milk_sel"><a onclick="javascript:save_set('db_dn_no', '${item['db_dn_no']!}', '${item['prd_nm']!}')" > ${item['prd_nm']!}</a></div>
<div class="milk_sel"><a onclick="javascript:save_set('db_dn_no', '${item['db_dn_no']!}', '${item['prd_nm']!}')" > ${item['prd_nm']!}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[${item['reg_dt']!}]</a></div>
</#list>
</#if>
@ -150,7 +150,11 @@
ajax_data(keyword);
}
};
var reset =function() {
$("#iptbm").val('');
$("#iptbs").val('');
$("#ipteat_qty").val('');
};
$(function(){
var today = moment().format('YYYY.MM.DD');
$("#input_date").val(today)

@ -58,11 +58,11 @@
<!-- 간식 입력 -->
<div class="snack_input w_div">
<p class="record_title">간식 종류</p>
<p class="record_title">* (최근)간식을 선택해주세요.</p>
<#if model['lm_lastest_lac']? has_content>
<#list model['lm_lastest_lac'] as item>
<div class="milk_sel"><a onclick="javascript:save_set('db_dn_no', '${item['db_dn_no']!}', '${item['prd_nm']!}')" > ${item['prd_nm']!}</a></div>
<div class="milk_sel"><a onclick="javascript:save_set('db_dn_no', '${item['db_dn_no']!}', '${item['prd_nm']!}')" > ${item['prd_nm']!}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[${item['reg_dt']!}]</a></div>
</#list>
</#if>

@ -20,6 +20,9 @@
<!-- 수면시간 -->
<div class="take_time w_div">
<div class="stop_ok_div">
<button type="button" id="btnStart" class="border_btn" onclick="pauseTime();startHourTime(0);setHourTimer();">다시시작</button>
</div>
<div class="sound_icon">
<button type="button" id="btnMusicPlay">
<img src="../img/nutrition/ico_sound_on_black_18.png" alt="" onclick="fncMusicPlay();">
@ -88,8 +91,16 @@
addHourTime(0);
};
var stopHourTime = function(){
debugger;
// 타이머 시작
var startHourTime =function (min){
initMinute = min;
$("#timer").empty();
$("#iptsleep_h").val('');
$("#iptsleep_m").val('');
$("#timer").text("00:00:00"); // mm:ss 표기
};
var stopHourTime = function(){
$(".border_btn").removeClass("active");
$("#btnStop").addClass("active");
if( $($(".time_tit")[0]).hasClass("active") === true){
@ -111,7 +122,7 @@
$( document ).ready(function() {
$("#iptsleep_h, #iptsleep_m").on("change", function() {
changeSlipTime();
changeSlipTime();
});
});

@ -57,11 +57,11 @@
<!-- 이유식 입력 -->
<div class="snack_input w_div">
<p class="record_title"> (최근수유)홈메이드 이유식 종류</p>
<p class="record_title"> (최근)홈메이드 이유식 종류</p>
<#if model['lm_lastest_lac']? has_content>
<#list model['lm_lastest_lac'] as item>
<div class="milk_sel"><a onclick="javascript:save_set('db_dhb_no', '${item['db_dhb_no']!}', '${item['prd_nm']!}')" > ${item['prd_nm']!}</a></div>
<div class="milk_sel"><a onclick="javascript:save_set('db_dhb_no', '${item['db_dhb_no']!}', '${item['prd_nm']!}')" > ${item['prd_nm']!}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[${item['reg_dt']!}]</a></div>
</#list>
</#if>
@ -92,7 +92,7 @@
<div class="po_div">
<div class="border_b_input">
<input type="number" id="ipteat_qty" name="ipteat_qty" value="${model['rm']['eat_qty']!}" step="1" />
<p>ml</p>
<p>ml(g)</p>
</div>
</div>
</div>

Loading…
Cancel
Save