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

메모리 > 주간 중복 동일 카테고리 간격제거

Browse Source
dev_bert
jonghwan76 3 years ago
parent 756b73141c
commit 3eb43961ac
2 changed files with 22 additions and 67 deletions
Show Stats Download Patch File Download Diff File

40
.idea/workspace.xml
Unescape View File

@ -9,10 +9,9 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="1. 계정연동하기 &gt; 본인계정 연동해제 하기 막기&#10;2. 음악설정 &gt; 플러스 버튼시 음악파일 첨부 확인되도록.">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="1. 계정연동하기 &gt; 본인계정 연동해제 하기 막기 - 오류수정&#10;2. 음악설정 &gt; 플러스 버튼시 음악파일 첨부 확인되도록. - 오류수정">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl" 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" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -250,14 +249,9 @@
<workItem from="1651626281483" duration="151000" />
<workItem from="1651631474537" duration="12924000" />
<workItem from="1651659992753" duration="18000" />
<workItem from="1651735183816" duration="1069000" />
</task>
<task id="LOCAL-00011" summary="음악설정 수정&#10;부모정보 변경 삭제">
<created>1648822833746</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1648822833746</updated>
<workItem from="1651735183816" duration="1465000" />
<workItem from="1651850876348" duration="8000" />
<workItem from="1651995870891" duration="1488000" />
</task>
<task id="LOCAL-00012" summary="비밀번호 찾기 기능 적용&#10;로그인 회원가입 형식 변경">
<created>1648908705168</created>
@ -595,7 +589,14 @@
<option name="project" value="LOCAL" />
<updated>1651675831475</updated>
</task>
<option name="localTasksCounter" value="60" />
<task id="LOCAL-00060" summary="1. 계정연동하기 &gt; 본인계정 연동해제 하기 막기 - 오류수정&#10;2. 음악설정 &gt; 플러스 버튼시 음악파일 첨부 확인되도록. - 오류수정">
<created>1651736465197</created>
<option name="number" value="00060" />
<option name="presentableId" value="LOCAL-00060" />
<option name="project" value="LOCAL" />
<updated>1651736465197</updated>
</task>
<option name="localTasksCounter" value="61" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -615,7 +616,6 @@
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="회원가입 밸리데이션 및 유효성체크 보완" />
<MESSAGE value="회원가입 밸리데이션 및 유효성체크 보완 - 2" />
<MESSAGE value="공유기능 퍼블리싱 및 기능 적용" />
<MESSAGE value="이유식당 홈 기록이미지 노출변경(최초 등록된것으로), 이후에 대표이미지로 변경해야함." />
@ -640,17 +640,7 @@
<MESSAGE value="앱 네이버소셜로그인 수정" />
<MESSAGE value="카카오 소셜로그인 수정" />
<MESSAGE value="1. 계정연동하기 &gt; 본인계정 연동해제 하기 막기&#10;2. 음악설정 &gt; 플러스 버튼시 음악파일 첨부 확인되도록." />
<option name="LAST_COMMIT_MESSAGE" value="1. 계정연동하기 &gt; 본인계정 연동해제 하기 막기&#10;2. 음악설정 &gt; 플러스 버튼시 음악파일 첨부 확인되도록." />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java</url>
<line>179</line>
<option name="timeStamp" value="1" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
<MESSAGE value="1. 계정연동하기 &gt; 본인계정 연동해제 하기 막기 - 오류수정&#10;2. 음악설정 &gt; 플러스 버튼시 음악파일 첨부 확인되도록. - 오류수정" />
<option name="LAST_COMMIT_MESSAGE" value="1. 계정연동하기 &gt; 본인계정 연동해제 하기 막기 - 오류수정&#10;2. 음악설정 &gt; 플러스 버튼시 음악파일 첨부 확인되도록. - 오류수정" />
</component>
</project>

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

@ -65,14 +65,9 @@
<ul class="gray_box">
<li>
<#assign pre_date = model['dayList']['day1'] + ''>
<#assign idx = 0>
<#assign pre_hour = ''>
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour>
<#-- <#assign idx = idx + 0.5>-->
</#if>
<#assign topP = item['hour'] + idx>
<#assign topP = item['hour']>
<#assign pre_hour = item['hour'] + ''>
<span key="${item['color_cd']?replace("#", "")}" name="p_timeline_color" title="${item.title}" style="top:${topP}%;height:${item['add_degree']!}px;background-color: ${item['color_cd']}"></span>
</#if>
@ -80,14 +75,9 @@
</li>
<li>
<#assign pre_date = model['dayList']['day2'] + ''>
<#assign idx = 0>
<#assign pre_hour = ''>
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour>
<#-- <#assign idx = idx + 0.5>-->
</#if>
<#assign topP = item['hour'] + idx>
<#assign topP = item['hour']>
<#assign pre_hour = item['hour'] + ''>
<span key="${item['color_cd']?replace("#", "")}" name="p_timeline_color" title="${item.title}" style="top:${topP}%;height:${item['add_degree']!}px;background-color: ${item['color_cd']}"></span>
</#if>
@ -95,14 +85,9 @@
</li>
<li>
<#assign pre_date = model['dayList']['day3'] + ''>
<#assign idx = 0>
<#assign pre_hour = ''>
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour>
<#-- <#assign idx = idx + 0.5>-->
</#if>
<#assign topP = item['hour'] + idx>
<#assign topP = item['hour']>
<#assign pre_hour = item['hour'] + ''>
<span key="${item['color_cd']?replace("#", "")}" name="p_timeline_color" title="${item.title}" style="top:${topP}%;height:${item['add_degree']!}px;background-color: ${item['color_cd']}"></span>
</#if>
@ -110,14 +95,9 @@
</li>
<li>
<#assign pre_date = model['dayList']['day4'] + ''>
<#assign idx = 0>
<#assign pre_hour = ''>
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour>
<#-- <#assign idx = idx + 0.5>-->
</#if>
<#assign topP = item['hour'] + idx>
<#assign topP = item['hour']>
<#assign pre_hour = item['hour'] + ''>
<span key="${item['color_cd']?replace("#", "")}" name="p_timeline_color" title="${item.title}" style="top:${topP}%;height:${item['add_degree']!}px;background-color: ${item['color_cd']}"></span>
</#if>
@ -125,14 +105,9 @@
</li>
<li>
<#assign pre_date = model['dayList']['day5'] + ''>
<#assign idx = 0>
<#assign pre_hour = ''>
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour>
<#-- <#assign idx = idx + 0.5>-->
</#if>
<#assign topP = item['hour'] + idx>
<#assign topP = item['hour']>
<#assign pre_hour = item['hour'] + ''>
<span key="${item['color_cd']?replace("#", "")}" name="p_timeline_color" title="${item.title}" style="top:${topP}%;height:${item['add_degree']!}px;background-color: ${item['color_cd']}"></span>
</#if>
@ -140,14 +115,9 @@
</li>
<li>
<#assign pre_date = model['dayList']['day6'] + ''>
<#assign idx = 0>
<#assign pre_hour = ''>
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour>
<#-- <#assign idx = idx + 0.5>-->
</#if>
<#assign topP = item['hour'] + idx>
<#assign topP = item['hour']>
<#assign pre_hour = item['hour'] + ''>
<span key="${item['color_cd']?replace("#", "")}" name="p_timeline_color" title="${item.title}" style="top:${topP}%;height:${item['add_degree']!}px;background-color: ${item['color_cd']}"></span>
</#if>
@ -155,14 +125,9 @@
</li>
<li>
<#assign pre_date = model['dayList']['day7'] + ''>
<#assign idx = 0>
<#assign pre_hour = ''>
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour>
<#-- <#assign idx = idx + 0.5>-->
</#if>
<#assign topP = item['hour'] + idx>
<#assign topP = item['hour']>
<#assign pre_hour = item['hour'] + ''>
<span key="${item['color_cd']?replace("#", "")}" name="p_timeline_color" title="${item.title}" style="top:${topP}%;height:${item['add_degree']!}px;background-color: ${item['color_cd']}"></span>
</#if>

Write Preview
Loading…
Cancel
Save