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

메모리 > 주간 오류 수정

Browse Source
dev_bert
jonghwan76 3 years ago
parent 7541972a28
commit 4186340fa3
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File

30
.idea/workspace.xml
Unescape View File

@ -9,11 +9,10 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="튜토리얼 기능 적용"> <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="튜토리얼 기능 적용-2">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/board_tutorial.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/board_tutorial.ftl" 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/include/memory_tutorial.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/memory_tutorial.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" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/nutrient_tutorial.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/nutrient_tutorial.ftl" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -243,14 +242,8 @@
<workItem from="1651149304746" duration="15131000" /> <workItem from="1651149304746" duration="15131000" />
<workItem from="1651193694137" duration="12076000" /> <workItem from="1651193694137" duration="12076000" />
<workItem from="1651229947933" duration="3142000" /> <workItem from="1651229947933" duration="3142000" />
<workItem from="1651296949782" duration="12133000" /> <workItem from="1651296949782" duration="12479000" />
</task> <workItem from="1651382880827" duration="4896000" />
<task id="LOCAL-00005" summary="SNS 탈퇴 로그인 불가 처리 메시지">
<created>1648370835819</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1648370835819</updated>
</task> </task>
<task id="LOCAL-00006" summary="한글파일명 음악파일 업로드이슈 수정"> <task id="LOCAL-00006" summary="한글파일명 음악파일 업로드이슈 수정">
<created>1648391088065</created> <created>1648391088065</created>
@ -588,7 +581,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1651309230468</updated> <updated>1651309230468</updated>
</task> </task>
<option name="localTasksCounter" value="54" /> <task id="LOCAL-00054" summary="튜토리얼 기능 적용-2">
<created>1651309672731</created>
<option name="number" value="00054" />
<option name="presentableId" value="LOCAL-00054" />
<option name="project" value="LOCAL" />
<updated>1651309672731</updated>
</task>
<option name="localTasksCounter" value="55" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -608,7 +608,6 @@
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" /> <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" /> <option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="아이정보등록 퍼블리싱" />
<MESSAGE value="D-Day 설정관련 홈화면 오류 수정" /> <MESSAGE value="D-Day 설정관련 홈화면 오류 수정" />
<MESSAGE value="추천이유식 - 추천이유식 식재료 팝업 및 카트 팝업 적용." /> <MESSAGE value="추천이유식 - 추천이유식 식재료 팝업 및 카트 팝업 적용." />
<MESSAGE value="추천이유식 - 추천이유식 식재료 팝업 및 카트 팝업 적용.-2" /> <MESSAGE value="추천이유식 - 추천이유식 식재료 팝업 및 카트 팝업 적용.-2" />
@ -633,6 +632,7 @@
<MESSAGE value="디폴트 선택한 아이 유지안되는 버그 수정" /> <MESSAGE value="디폴트 선택한 아이 유지안되는 버그 수정" />
<MESSAGE value="디폴트 선택한 아이 유지안되는 버그 수정-2" /> <MESSAGE value="디폴트 선택한 아이 유지안되는 버그 수정-2" />
<MESSAGE value="튜토리얼 기능 적용" /> <MESSAGE value="튜토리얼 기능 적용" />
<option name="LAST_COMMIT_MESSAGE" value="튜토리얼 기능 적용" /> <MESSAGE value="튜토리얼 기능 적용-2" />
<option name="LAST_COMMIT_MESSAGE" value="튜토리얼 기능 적용-2" />
</component> </component>
</project> </project>

2
src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml
Unescape View File

@ -9,7 +9,7 @@
XA.val_1, XA.val_1,
XA.color_cd, XA.color_cd,
XA.title, XA.title,
CASE WHEN XA.add_degree > 42.5 then 42.5 CASE WHEN (XA.hour * 3.4) + (add_degree * 3.4) > 340 then (100-hour) * 3.4
ELSE XA.add_degree ELSE XA.add_degree
END as add_degree, END as add_degree,
XA.cnt XA.cnt

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

@ -70,7 +70,7 @@
<#list model['time_list'] as item> <#list model['time_list'] as item>
<#if item['day'] == pre_date> <#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour> <#if (item['hour'] + '') == pre_hour>
<#assign idx = idx + 0.5> <#-- <#assign idx = idx + 0.5>-->
</#if> </#if>
<#assign topP = item['hour'] + idx> <#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''> <#assign pre_hour = item['hour'] + ''>
@ -85,7 +85,7 @@
<#list model['time_list'] as item> <#list model['time_list'] as item>
<#if item['day'] == pre_date> <#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour> <#if (item['hour'] + '') == pre_hour>
<#assign idx = idx + 0.5> <#-- <#assign idx = idx + 0.5>-->
</#if> </#if>
<#assign topP = item['hour'] + idx> <#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''> <#assign pre_hour = item['hour'] + ''>
@ -100,7 +100,7 @@
<#list model['time_list'] as item> <#list model['time_list'] as item>
<#if item['day'] == pre_date> <#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour> <#if (item['hour'] + '') == pre_hour>
<#assign idx = idx + 0.5> <#-- <#assign idx = idx + 0.5>-->
</#if> </#if>
<#assign topP = item['hour'] + idx> <#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''> <#assign pre_hour = item['hour'] + ''>
@ -115,7 +115,7 @@
<#list model['time_list'] as item> <#list model['time_list'] as item>
<#if item['day'] == pre_date> <#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour> <#if (item['hour'] + '') == pre_hour>
<#assign idx = idx + 0.5> <#-- <#assign idx = idx + 0.5>-->
</#if> </#if>
<#assign topP = item['hour'] + idx> <#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''> <#assign pre_hour = item['hour'] + ''>
@ -130,7 +130,7 @@
<#list model['time_list'] as item> <#list model['time_list'] as item>
<#if item['day'] == pre_date> <#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour> <#if (item['hour'] + '') == pre_hour>
<#assign idx = idx + 0.5> <#-- <#assign idx = idx + 0.5>-->
</#if> </#if>
<#assign topP = item['hour'] + idx> <#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''> <#assign pre_hour = item['hour'] + ''>
@ -145,7 +145,7 @@
<#list model['time_list'] as item> <#list model['time_list'] as item>
<#if item['day'] == pre_date> <#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour> <#if (item['hour'] + '') == pre_hour>
<#assign idx = idx + 0.5> <#-- <#assign idx = idx + 0.5>-->
</#if> </#if>
<#assign topP = item['hour'] + idx> <#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''> <#assign pre_hour = item['hour'] + ''>
@ -160,7 +160,7 @@
<#list model['time_list'] as item> <#list model['time_list'] as item>
<#if item['day'] == pre_date> <#if item['day'] == pre_date>
<#if (item['hour'] + '') == pre_hour> <#if (item['hour'] + '') == pre_hour>
<#assign idx = idx + 0.5> <#-- <#assign idx = idx + 0.5>-->
</#if> </#if>
<#assign topP = item['hour'] + idx> <#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''> <#assign pre_hour = item['hour'] + ''>

Write Preview
Loading…
Cancel
Save