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

- 아이3명 보기오류 수정

Browse Source 
- 아기정보 변경시 생년월이 형식 체크 추가
- 앱 네이버로그인시 코드 수정
dev_bert
jonghwan76 3 years ago
parent 0241d5d7b7
commit 42edecd74e
6 changed files with 278 additions and 170 deletions
Show Stats Download Patch File Download Diff File

33
.idea/workspace.xml
Unescape View File

@ -9,10 +9,13 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="튜토리얼 기능 적용-2">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="메모리 &gt; 주간 오류 수정">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.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/memory/memory_week.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl" 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_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/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/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/login/view_login.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -243,14 +246,9 @@
<workItem from="1651193694137" duration="12076000" />
<workItem from="1651229947933" duration="3142000" />
<workItem from="1651296949782" duration="12479000" />
<workItem from="1651382880827" duration="4896000" />
</task>
<task id="LOCAL-00006" summary="한글파일명 음악파일 업로드이슈 수정">
<created>1648391088065</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1648391088065</updated>
<workItem from="1651382880827" duration="4947000" />
<workItem from="1651421131462" duration="153000" />
<workItem from="1651457534351" duration="22078000" />
</task>
<task id="LOCAL-00007" summary="이유식레시피, 시판이유식 자동검색 적용">
<created>1648440207179</created>
@ -588,7 +586,14 @@
<option name="project" value="LOCAL" />
<updated>1651309672731</updated>
</task>
<option name="localTasksCounter" value="55" />
<task id="LOCAL-00055" summary="메모리 &gt; 주간 오류 수정">
<created>1651415855453</created>
<option name="number" value="00055" />
<option name="presentableId" value="LOCAL-00055" />
<option name="project" value="LOCAL" />
<updated>1651415855454</updated>
</task>
<option name="localTasksCounter" value="56" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -608,7 +613,6 @@
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="D-Day 설정관련 홈화면 오류 수정" />
<MESSAGE value="추천이유식 - 추천이유식 식재료 팝업 및 카트 팝업 적용." />
<MESSAGE value="추천이유식 - 추천이유식 식재료 팝업 및 카트 팝업 적용.-2" />
<MESSAGE value="아기정보입력 생년월일 형식 수정&#10;추천이유식 &gt; 카트팝업 검색 기능 및 조회 적용" />
@ -633,6 +637,7 @@
<MESSAGE value="디폴트 선택한 아이 유지안되는 버그 수정-2" />
<MESSAGE value="튜토리얼 기능 적용" />
<MESSAGE value="튜토리얼 기능 적용-2" />
<option name="LAST_COMMIT_MESSAGE" value="튜토리얼 기능 적용-2" />
<MESSAGE value="메모리 &gt; 주간 오류 수정" />
<option name="LAST_COMMIT_MESSAGE" value="메모리 &gt; 주간 오류 수정" />
</component>
</project>

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

@ -130,13 +130,12 @@ public class M_IndexController extends AbstractControllerManager{
*/
@RequestMapping(value="index")
public String index(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response, RedirectAttributes ra) {
DataMap paramMap = gmUtil.getDataMapFromRequest(request);
String redirect_url = "m/index/index";
DataMap rm_agent = logAgent.parse(paramMap, request);
String agent = RenaStringUtil.getData(rm_agent, "agent");
// String smc_index = RenaStringUtil.getData(paramMap, "smc_index") == "" ? "0":RenaStringUtil.getData(paramMap, "smc_index");
if(RenaStringUtil.isNullOrEmpty(agent) == false) {
if(agent.contains("iOS") || agent.contains("iPhone")) {
paramMap.put("pt", "200");
@ -175,7 +174,8 @@ public class M_IndexController extends AbstractControllerManager{
DataMap rm_child = init_child(model, request, paramMap);
int recent_notice_cnt = bf_noticeBO.select_recent_notice_count(paramMap);
paramMap.put("recent_notice_cnt", recent_notice_cnt);
paramMap.put("recent_notice_cnt", recent_notice_cnt); //최근 일주일내 공지사항 목록수
if(rm_child != null) {
// 선택아이 성장 정보 조회
@ -311,7 +311,7 @@ public class M_IndexController extends AbstractControllerManager{
}
}
// 디폴트 요청한 아이가 없고 현재 세션에 저장된 아이가 없다면 첫번째 아이정보로 세션 저장찰;
// 디폴트 요청한 아이가 없고 현재 세션에 저장된 아이가 없다면 첫번째 아이정보로 세션 저장;
if((RenaStringUtil.isNullOrEmpty(smc_no) == true && rm_child == null)&& lm_child.size() > 0) {
rm_child = lm_child.get(0);
DataMap.putToModel(model, "rm_child", rm_child);
@ -326,6 +326,34 @@ public class M_IndexController extends AbstractControllerManager{
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");
int smc_index = 0;
for(DataMap rm_child2 : lm_child) {
String smc_no2 = RenaStringUtil.getData(rm_child2, "smc_no");
if(smc_no2.equals(smc_no)) {
rm_child2.put("rep", "Y");
paramMap.put("smc_index", smc_index); //아이 노출 인덱스
} else {
rm_child2.put("rep", "N");
}
smc_index++;
lm_child2.add(rm_child2);
log.info("---------------------- rm_child2 ---------------- ");
log.info(rm_child2);
}
DataMap.putToModel(model, "lm_child", lm_child2);
}
/*
if(rm_child != null) {
paramMap.copyFromDataMapByKeys(rm_child, new String[]{"smc_no"});
// 선택된 아이 가장 먼저
List<DataMap> lm_child2 = new ArrayList<DataMap>();
lm_child2.add(rm_child);
@ -340,6 +368,8 @@ public class M_IndexController extends AbstractControllerManager{
DataMap.putToModel(model, "lm_child", lm_child2);
}
*/
return rm_child;
}

5
src/main/resources/sqlmap/m/bf_family_baby/com.backoffice.m.bf_family_baby.xml
Unescape View File

@ -143,16 +143,13 @@
INNER JOIN tbl_bf_family_match y on x.smc_no = y.smc_no
WHERE 1 =1
AND y.member_id = #member_id#
ORDER BY x.smc_no
) x
LEFT JOIN tbl_mt_file append_src_img_file
ON x.append_src_img_file = append_src_img_file.mt_file_seq
LEFT JOIN tbl_mt_file append_300_img_file
ON x.append_300_img_file = append_300_img_file.mt_file_seq
LEFT JOIN tbl_bf_family_baby_order smco ON x.smc_no = smco.smc_no
ORDER BY smco.smc_order ASC
</select>
<select id="select_bf_family_baby_list_count" resultClass="Integer" parameterClass="dataMap">

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

@ -139,7 +139,7 @@
<h3 class="p_sub_title"><span style="color:#FF9C01">*</span>표시로 되어 있는 칸은 필수 입력칸입니다.</h3>
<div class="profile_btn_box">
<button type="submit" name="submit" id="submit_btn" style="flex: 0 0 100%;" class="btns blue_btn"><#if item??>변경하기<#else>등록하기</#if></button>
<button type="button" onclick="fncSubmit()" style="flex: 0 0 100%;" class="btns blue_btn"><#if item??>변경하기<#else>등록하기</#if></button>
</div>
</div>
@ -204,6 +204,61 @@
return v;
}
function fncSubmit() {
var birthday = $("#birthday").val().replace(/[.]/gi, '');
var today = parseInt(getCalDate(0));
let result = moment(birthday, 'YYYYMMDD',true).isValid();
// console.log(result);
if(!result) {
Swal.fire({text: '날짜 형식을 확인해 주세요.'});
$("birthday").focus();
return;
}
if(birthday > today) {
Swal.fire({text: '생일은 오늘날짜보다 클 수 없습니다.'});
$("birthday").focus();
return;
}
$("#frmChild").submit();
}
/* 현재일로부터 day만큼 증가한 날짜를 리턴
* @author :
* @return : value or ''
*/
function getCalDate(day){
var caledmonth, caledday, caledYear, returnDay;
var loadDt = new Date();
var v = new Date(Date.parse(loadDt) + day*1000*60*60*24);
caledYear = v.getFullYear();
if( v.getMonth() < 9 ){
caledmonth = '0'+(v.getMonth()+1);
}else {
caledmonth = v.getMonth()+1;
}
if( v.getDate() <= 9 ){
caledday = '0'+v.getDate();
}else{
caledday = v.getDate();
}
returnDay = caledYear+""+caledmonth+""+caledday;
return returnDay;
}
</script>
<#include "/m/bf_family_baby/include_return_url.ftl">

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

@ -80,7 +80,9 @@
<div class="bxslider-wrapper" style="visibility: hidden; opacity: 0;">
<ul class="main_pofile_slider">
<#if (model['lm_child'])?has_content>
<!-- 현재 선택한 아이정보만 출력 -->
<#list model['lm_child'] as item>
<#if item['rep'] == "Y">
<li>
<div class="main_pofile_txt">
<h2>${item['name']!} (${item['gender_ko']!})</h2>
@ -136,6 +138,13 @@
</p>
</div>
</li>
<#else>
<li>
<div class="main_pofile_txt">
</div>
</li>
</#if>
</#list>
</#if>
</ul>
@ -350,10 +359,22 @@
</#if>
<script>
let not_h = '아이 키 성장 기록이 없습니다';
let not_w = '아이 체중 성장 기록이 없습니다';
var arr_smc_no = [
<#if (model['lm_child'])?has_content>
<#list model['lm_child'] as item>
${item['smc_no']},
</#list>
</#if>
];
var smc_index = parseInt("${model['smc_index']}");
// main_pofile_slider 프로필 슬라이드
$(document).ready(function(){
// $(".main_cont_kinds").hide();
$('.main_pofile_slider').bxSlider({
auto: false,
speed: 500,
@ -364,15 +385,28 @@
pager:true,
infiniteLoop: false,
onSliderLoad: function(){
try {
$('.bxslider-wrapper').css('visibility', 'visible').animate({opacity: 1});
} catch(e) {}
},
onSlideAfter: function($slideElement, oldIndex, newIndex) {
$(".main_cont_kinds").hide();
// ajax_child_info(newIndex);
location.href = "${URL_ROOT}/m/index/index.do?smc_no=" + arr_smc_no[newIndex];
// alert(oldIndex + "," + newIndex);
//우측으로 슬라이더시
if(newIndex > oldIndex) {
if(smc_index >= arr_smc_no.length-1) {
smc_index = 0;
} else {
smc_index++;
}
location.href = "${URL_ROOT}/m/index/index.do?smc_no=" + arr_smc_no[smc_index];
}
}
});
// $(".bx-pager-link").removeClass("active");
// $(".bx-pager-link").eq(smc_index).addClass("active");
init();
});
@ -393,6 +427,8 @@
window.bxslider_mouse_over_slide=$(this);
});
});
$('.main_pofile_slider ').parent().on('click', function (event) {
//Check if we've got a slide under the mouse
if ((window.bxslider_mouse_over_slide!=null)){
@ -470,22 +506,6 @@
});
</script>
<script>
let not_h = '아이 키 성장 기록이 없습니다';
let not_w = '아이 체중 성장 기록이 없습니다';
let arr_smc_no = [
<#if (model['lm_child'])?has_content>
<#list model['lm_child'] as item>
${item['smc_no']},
</#list>
</#if>
];
$(document).ready(function(){
//if(arr_smc_no.length > 0) ajax_child_info(0);
});
</script>
<!-- 하단 네비 iyu_nav -->
<#include "/m/include/index_bottom_menu.ftl">

3
src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl
Unescape View File

@ -103,7 +103,8 @@
if(l_type == "N") {
var url = $("#naver_id_login_anchor").attr("href");
//네어버의 경우 콜백 URL은 네아로에서 지정
window.open(url, 'naverloginpop', 'titlebar=1, resizable=1, scrollbars=yes, width=600, height=550');
// window.open(url, 'naverloginpop', 'titlebar=1, resizable=1, scrollbars=yes, width=600, height=550');
location.href = url;
} else if(l_type == "K") {
//카카오는 여기로 바로 redirect 한다.
Kakao.Auth.login({

Write Preview
Loading…
Cancel
Save