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 @@
-
+
-
-
-
+
+
@@ -243,14 +242,8 @@
-
-
-
- 1648370835819
-
-
-
- 1648370835819
+
+
1648391088065
@@ -588,7 +581,14 @@
1651309230468
-
+
+ 1651309672731
+
+
+
+ 1651309672731
+
+
@@ -608,7 +608,6 @@
-
@@ -633,6 +632,7 @@
-
+
+
\ 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'] + ''>