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

메모리탭 구현-5

Browse Source
dev_bert
jonghwan76 3 years ago
parent b3310458fe
commit db637962b7
5 changed files with 54 additions and 48 deletions
Show Stats Download Patch File Download Diff File

34
src/main/java/com/backoffice/m/memory/M_MemoryController.java
Unescape View File

@ -72,8 +72,8 @@ public class M_MemoryController extends AbstractControllerManager{
@RequestMapping(value="memory_timeline")
public String memory_timeline(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response, RedirectAttributes ra) {
DataMap paramMap = gmUtil.getDataMapFromRequest(request);
String view_nm = RenaStringUtil.getData(paramMap, "view_nm");
String redirect_url = "m/memory/memory_timeline";
try {
@ -84,8 +84,8 @@ public class M_MemoryController extends AbstractControllerManager{
}else{
HttpSession session = request.getSession(false);
DataMap rm_mem = (DataMap) session.getAttribute(ConstantSystem.SESSION_RM_MEMBER);
DataMap rm_child = (DataMap) session.getAttribute(ConstantSystem.SESSION_RM_CHILD);
//세션에 선택된 아이정보가 있을 경우
if(rm_child != null) {
paramMap.put("smc_no", rm_child.get("smc_no"));
@ -164,12 +164,13 @@ public class M_MemoryController extends AbstractControllerManager{
@RequestMapping(value="memory_week")
public String memory_week(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response, RedirectAttributes ra) {
DataMap paramMap = gmUtil.getDataMapFromRequest(request);
String dayFlag = paramMap.getString("dayFlag");
String currDate = paramMap.getString("currDate");
String view_nm = RenaStringUtil.getData(paramMap, "view_nm");
String redirect_url = "m/memory/memory_week";
String today = ""; //날짜선택 화면 표시용 날짜형식
String today2 = ""; //파라미터용 날짜
String day = ""; //해당날짜 요일
try {
boolean is_login = gmUtil.setSessionForMobileMember(request, paramMap);
@ -177,8 +178,23 @@ public class M_MemoryController extends AbstractControllerManager{
ra.addFlashAttribute("call_native_login", "Y");
redirect_url = "redirect:/m/login/view_login.do";
}else{
today = DateUtil.getTodayAddDate(-7,"yyyy-MM-dd(E)");
today2 = DateUtil.getTodayAddDate(-7,"yyyy-MM-dd");
//메모리 > 주간에서 이전일 눌렀을 경우
// today = DateUtil.getTodayAddDate(-7,"yyyy-MM-dd(E)");
// today2 = DateUtil.getTodayAddDate(-7,"yyyy-MM-dd");
log.info("currDate:" + currDate);
if(currDate == null) {
today = DateUtil.getTodayAddDate(-7,"yyyy-MM-dd");
} else {
if(dayFlag.equals("plus")) {
today = DateUtil.getTodayAddDateWithBaseDate(7, currDate,"yyyy-MM-dd");
} else {
today = DateUtil.getTodayAddDateWithBaseDate(-7, currDate,"yyyy-MM-dd");
}
}
// log.info("day:" + DateUtil.getDay(today, "yyyy-MM-dd"));
HttpSession session = request.getSession(false);
DataMap rm_mem = (DataMap) session.getAttribute(ConstantSystem.SESSION_RM_MEMBER);
@ -195,9 +211,9 @@ public class M_MemoryController extends AbstractControllerManager{
}
rm_mem.put("today", today);
paramMap.put("startDate", today2 + " 00:00:00");
paramMap.put("endDate", today2 + " 23:59:59");
rm_mem.put("day", DateUtil.getDay(today, "yyyy-MM-dd"));
paramMap.put("startDate", today + " 00:00:00");
paramMap.put("endDate", today + " 23:59:59");
List<DataMap> time_list = memoryBO.select_week(paramMap);
DataMap dayList = memoryBO.select_day_week(paramMap);

8
src/main/java/com/renastudio/creative/web/util/date/DateUtil.java
Unescape View File

@ -949,4 +949,12 @@ public class DateUtil {
return df.format(date);
}
public static String getDay(String basedat, String format) throws Exception {
Calendar today = getCalendarByDate(basedat, format);
Date date = today.getTime();
DateFormat df = new SimpleDateFormat("E");
return df.format(date);
}
}

6
src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily.ftl
Unescape View File

@ -10,7 +10,7 @@
<!-- header_sub -->
<header class="header_wrapper">
<a href="javascript:history.back()" class="side_Lbtn hidden pre_btn">이전으로</a>
<a href="javascript:back.return_url()" class="side_Lbtn hidden pre_btn">이전으로</a>
<h1 class="header_title">메모리</h1>
<a href="#" class="side_Rbtn hidden"></a>
</header>
@ -136,6 +136,10 @@
});
</script>
<!-- 하단 네비 iyu_nav -->
<#include "/m/include/index_bottom_menu.ftl">
<!-- //iyu_nav -->
<#include "/m/member_env/include_return_url.ftl">
</body>
<#include "/m/include/index_bottom.ftl">
</html>

4
src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl
Unescape View File

@ -106,6 +106,10 @@
</div>
<!-- //wrap -->
<!-- 하단 네비 iyu_nav -->
<#include "/m/include/index_bottom_menu.ftl">
<!-- //iyu_nav -->
<#include "/m/member_env/include_return_url.ftl">
</body>
<#include "/m/include/index_bottom.ftl">
</html>

50
src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl
Unescape View File

@ -10,7 +10,7 @@
<!-- header_sub -->
<header class="header_wrapper">
<a href="javascript:history.back()" class="side_Lbtn hidden pre_btn">이전으로</a>
<a href="javascript:back.return_url()" class="side_Lbtn hidden pre_btn">이전으로</a>
<h1 class="header_title">메모리</h1>
<a href="#" class="side_Rbtn hidden"></a>
</header>
@ -49,9 +49,9 @@
<!-- 날짜 -->
<div class="memory_date">
<button type="button"><img src="../img/xxxx_sprites/arrow_01_left02.png" alt=""></button>
${model['rm_mem']['today']!}
<button type="button"><img src="../img/xxxx_sprites/arrow_01_right.png" alt=""></button>
<a href="javascript:fncMoveDay('minus')"><img src="../img/xxxx_sprites/arrow_01_right.png" alt=""></a>
${model['rm_mem']['today']!}(${model['rm_mem']['day']!})
<a href="javascript:fncMoveDay('plus')"><img src="../img/xxxx_sprites/arrow_01_right.png" alt=""></a>
</div>
<!-- //날짜 -->
@ -182,42 +182,16 @@
<!-- //wrap -->
<!-- 하단 네비 iyu_nav -->
<nav class="iyu_nav">
<ul>
<li class="nav_list01">
<a href="../sn_nutrition/view_sn_nutrition_main.html">
<div class="icon">영양</div>
<div class="tit">영양</div>
</a>
</li>
<li class="nav_list02">
<a href="../sn_growth_body/view_sn_growth_main.html">
<div class="icon">성장</div>
<div class="tit">성장</div>
</a>
</li>
<li class="nav_list03">
<a href="../sn_index/index.html">
<div class="icon">홈</div>
<div class="tit">홈</div>
</a>
</li>
<li class="nav_list04">
<a href="../sn_food_information/view_sn_food_information_main.html">
<div class="icon">식품정보</div>
<div class="tit">식품정보</div>
</a>
</li>
<li class="nav_list05">
<a href="../sn_community/list_sn_community.html">
<div class="icon">커뮤니티</div>
<div class="tit">커뮤니티</div>
</a>
</li>
</ul>
</nav>
<#include "/m/include/index_bottom_menu.ftl">
<!-- //iyu_nav -->
<script>
function fncMoveDay(dayFlag) {
location.href = "${URL_ROOT}/m/memory/memory_week.do?dayFlag=" + dayFlag + "&currDate=" + "${model['rm_mem']['today']!}";
<#--location.href = "${URL_ROOT}/m/memory/memory_week.do";-->
}
</script>
<#include "/m/member_env/include_return_url.ftl">
</body>
<#include "/m/include/index_bottom.ftl">
</html>

Write Preview
Loading…
Cancel
Save