diff --git a/src/main/resources/sqlmap/m/bf_board/com.backoffice.m.bf_board.xml b/src/main/resources/sqlmap/m/bf_board/com.backoffice.m.bf_board.xml index 64da513..4c6de12 100644 --- a/src/main/resources/sqlmap/m/bf_board/com.backoffice.m.bf_board.xml +++ b/src/main/resources/sqlmap/m/bf_board/com.backoffice.m.bf_board.xml @@ -30,10 +30,10 @@ ,DATE_FORMAT(x.reg_dt,'%H:%i') reg_tm ,tbv.v_content FROM tbl_bf_board x - INNER JOIN tbl_code_item z + LEFT JOIN tbl_code_item z on x.bd_tp = z.val_1 and cg_cd ='BF_COMMUNITY_TP' LEFT JOIN (select bd_no, group_concat(concat (v_content, '♭⊙♭', nvl(v_nt, 0)) separator '♭§♭') v_content - from tbl_bf_board_vote) tbv ON tbv.bd_no = x.bd_no + from tbl_bf_board_vote group by bd_no) tbv ON tbv.bd_no = x.bd_no WHERE DATE_FORMAT(x.reg_dt,'%Y%M%d') = DATE_FORMAT(now(),'%Y%M%d') and x.use_yn ='Y' @@ -43,7 +43,7 @@ AND x.bd_tp = #bd_tp# )x - INNER JOIN tbl_member m ON m.member_id = x.member_id + LEFT JOIN tbl_member m ON m.member_id = x.member_id LEFT JOIN tbl_bf_board_attach tba ON tba.bd_no = x.bd_no and tba.file_seq = ( SELECT file_seq @@ -86,14 +86,14 @@ ,tbv.v_content FROM tbl_bf_board x LEFT JOIN (select bd_no, group_concat(concat (v_content, '♭⊙♭', nvl(v_nt, 0)) separator '♭§♭') v_content - from tbl_bf_board_vote) tbv ON tbv.bd_no = x.bd_no + from tbl_bf_board_vote GROUP BY bd_no) tbv ON tbv.bd_no = x.bd_no INNER JOIN tbl_code_item z on x.bd_tp = z.val_1 and cg_cd ='BF_COMMUNITY_TP' WHERE DATE_FORMAT(x.reg_dt,'%Y%M%d') = DATE_FORMAT(now(),'%Y%M%d') and x.use_yn ='Y' and x.bd_no = #bd_no# )x - INNER JOIN tbl_member m ON m.member_id = x.member_id + LEFT JOIN tbl_member m ON m.member_id = x.member_id LEFT JOIN tbl_bf_board_attach tba ON tba.bd_no = x.bd_no LEFT JOIN tbl_mt_file tmf ON tmf.mt_file_seq = tba.file_seq diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_5.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_5.ftl index fc23b7b..1b8f956 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_5.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_5.ftl @@ -37,7 +37,7 @@ 00:00:00 - + @@ -88,6 +88,27 @@ addHourTime(0); }; + var stopHourTime = function(){ + debugger; + $(".border_btn").removeClass("active"); + $("#btnStop").addClass("active"); + if( $($(".time_tit")[0]).hasClass("active") === true){ + stopTimeLeft(); + return; + } + if( $($(".time_tit")[1]).hasClass("active") === true){ + stopTimeRight(); + return; + } + clearTimeout(timer); + var sleep_time = $("#hourTimer").text(); + $("#iptsleep_h").val(sleep_time.substr(0,2)); + $("#iptsleep_m").val(sleep_time.substr(3,2)); + $("#sleep_h").val($("#iptsleep_h").val()); + $("#sleep_m").val($("#iptsleep_m").val()); + } + + $( document ).ready(function() { $("#iptsleep_h, #iptsleep_m").on("change", function() { changeSlipTime();