From 4186340fa3e17e04537a8a4b9307bab68c3bbbc1 Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Sun, 1 May 2022 23:37:35 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A9=94=EB=AA=A8=EB=A6=AC=20>=20=EC=A3=BC?=
 =?UTF-8?q?=EA=B0=84=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 30 +++++++++----------
 .../memory/com.backoffice.m.memory.memory.xml |  2 +-
 .../views/ftl/m/memory/memory_week.ftl        | 14 ++++-----
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 880db38..2f2848e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,11 +9,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <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$/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/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/include/nutrient_tutorial.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/nutrient_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/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" />
@@ -243,14 +242,8 @@
       <workItem from="1651149304746" duration="15131000" />
       <workItem from="1651193694137" duration="12076000" />
       <workItem from="1651229947933" duration="3142000" />
-      <workItem from="1651296949782" duration="12133000" />
-    </task>
-    <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>
+      <workItem from="1651296949782" duration="12479000" />
+      <workItem from="1651382880827" duration="4896000" />
     </task>
     <task id="LOCAL-00006" summary="한글파일명 음악파일 업로드이슈 수정">
       <created>1648391088065</created>
@@ -588,7 +581,14 @@
       <option name="project" value="LOCAL" />
       <updated>1651309230468</updated>
     </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 />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -608,7 +608,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="D-Day 설정관련 홈화면 오류 수정" />
     <MESSAGE value="추천이유식 - 추천이유식 식재료 팝업 및 카트 팝업 적용." />
     <MESSAGE value="추천이유식 - 추천이유식 식재료 팝업 및 카트 팝업 적용.-2" />
@@ -633,6 +632,7 @@
     <MESSAGE value="디폴트 선택한 아이 유지안되는 버그 수정" />
     <MESSAGE value="디폴트 선택한 아이 유지안되는 버그 수정-2" />
     <MESSAGE value="튜토리얼 기능 적용" />
-    <option name="LAST_COMMIT_MESSAGE" value="튜토리얼 기능 적용" />
+    <MESSAGE value="튜토리얼 기능 적용-2" />
+    <option name="LAST_COMMIT_MESSAGE" value="튜토리얼 기능 적용-2" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml b/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml
index 8e41c6b..d157d0c 100644
--- a/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml
+++ b/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml
@@ -9,7 +9,7 @@
 			XA.val_1,
 			XA.color_cd,
 			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
 			END as add_degree,
 			XA.cnt
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl b/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl
index b03ffe0..6faae4e 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl
@@ -70,7 +70,7 @@
                   <#list model['time_list'] as item>
                       <#if item['day'] == pre_date>
                           <#if (item['hour'] + '') == pre_hour>
-                            <#assign idx = idx + 0.5>
+<#--                            <#assign idx = idx + 0.5>-->
                           </#if>
                           <#assign topP = item['hour'] + idx>
                           <#assign pre_hour = item['hour'] + ''>
@@ -85,7 +85,7 @@
                   <#list model['time_list'] as item>
                       <#if item['day'] == pre_date>
                           <#if (item['hour'] + '') == pre_hour>
-                              <#assign idx = idx + 0.5>
+<#--                              <#assign idx = idx + 0.5>-->
                           </#if>
                           <#assign topP = item['hour'] + idx>
                           <#assign pre_hour = item['hour'] + ''>
@@ -100,7 +100,7 @@
                   <#list model['time_list'] as item>
                       <#if item['day'] == pre_date>
                           <#if (item['hour'] + '') == pre_hour>
-                              <#assign idx = idx + 0.5>
+<#--                              <#assign idx = idx + 0.5>-->
                           </#if>
                           <#assign topP = item['hour'] + idx>
                           <#assign pre_hour = item['hour'] + ''>
@@ -115,7 +115,7 @@
                   <#list model['time_list'] as item>
                       <#if item['day'] == pre_date>
                           <#if (item['hour'] + '') == pre_hour>
-                              <#assign idx = idx + 0.5>
+<#--                              <#assign idx = idx + 0.5>-->
                           </#if>
                           <#assign topP = item['hour'] + idx>
                           <#assign pre_hour = item['hour'] + ''>
@@ -130,7 +130,7 @@
                   <#list model['time_list'] as item>
                       <#if item['day'] == pre_date>
                           <#if (item['hour'] + '') == pre_hour>
-                              <#assign idx = idx + 0.5>
+<#--                              <#assign idx = idx + 0.5>-->
                           </#if>
                           <#assign topP = item['hour'] + idx>
                           <#assign pre_hour = item['hour'] + ''>
@@ -145,7 +145,7 @@
                   <#list model['time_list'] as item>
                       <#if item['day'] == pre_date>
                           <#if (item['hour'] + '') == pre_hour>
-                              <#assign idx = idx + 0.5>
+<#--                              <#assign idx = idx + 0.5>-->
                           </#if>
                           <#assign topP = item['hour'] + idx>
                           <#assign pre_hour = item['hour'] + ''>
@@ -160,7 +160,7 @@
                   <#list model['time_list'] as item>
                       <#if item['day'] == pre_date>
                           <#if (item['hour'] + '') == pre_hour>
-                              <#assign idx = idx + 0.5>
+<#--                              <#assign idx = idx + 0.5>-->
                           </#if>
                           <#assign topP = item['hour'] + idx>
                           <#assign pre_hour = item['hour'] + ''>