From 670dd03111affebb5f8fc4b9e340eedb87cda0cb Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Sat, 14 May 2022 02:42:18 +0900
Subject: [PATCH] =?UTF-8?q?=EC=95=84=EC=9D=B4=EC=8A=AC=EB=9D=BC=EC=9D=B4?=
 =?UTF-8?q?=EB=93=9C=20=EA=B8=B0=EB=8A=A5=20=EC=A2=8C=EC=9A=B0=20=EC=9D=B4?=
 =?UTF-8?q?=EB=8F=99=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=A0=81=EC=9A=A9-2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 25 ++++++++-----------
 .../WEB-INF/views/ftl/m/index/index.ftl       |  9 +++++--
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 428bd6a..769ac10 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,12 +9,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="기록정보 홈화면 표시오류 수정-2">
+    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="아이슬라이드 기능 좌우 이동되도록 적용">
       <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/index/M_IndexController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/index/M_IndexController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index_20220409.ftl" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index_20220426.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index_20220514.ftl" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -262,13 +259,6 @@
       <workItem from="1652418151986" duration="203000" />
       <workItem from="1652431636439" duration="2013000" />
     </task>
-    <task id="LOCAL-00023" summary="홈&gt;홈메이드 추천 이유식 퍼블리싱작업-1">
-      <created>1649607799069</created>
-      <option name="number" value="00023" />
-      <option name="presentableId" value="LOCAL-00023" />
-      <option name="project" value="LOCAL" />
-      <updated>1649607799069</updated>
-    </task>
     <task id="LOCAL-00024" summary="회원가입 오류 수정">
       <created>1649651774910</created>
       <option name="number" value="00024" />
@@ -605,7 +595,14 @@
       <option name="project" value="LOCAL" />
       <updated>1652340163521</updated>
     </task>
-    <option name="localTasksCounter" value="72" />
+    <task id="LOCAL-00072" summary="아이슬라이드 기능 좌우 이동되도록 적용">
+      <created>1652463194062</created>
+      <option name="number" value="00072" />
+      <option name="presentableId" value="LOCAL-00072" />
+      <option name="project" value="LOCAL" />
+      <updated>1652463194062</updated>
+    </task>
+    <option name="localTasksCounter" value="73" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -636,7 +633,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="계정연동 취소하기 기능적용-1" />
     <MESSAGE value="계정연동 취소하기 기능적용-2" />
     <MESSAGE value="아이정보수정 &gt; 질병기록 오류 수정" />
@@ -661,6 +657,7 @@
     <MESSAGE value="유축수유표시 오류 수정" />
     <MESSAGE value="기록정보 홈화면 표시오류 수정" />
     <MESSAGE value="기록정보 홈화면 표시오류 수정-2" />
-    <option name="LAST_COMMIT_MESSAGE" value="기록정보 홈화면 표시오류 수정-2" />
+    <MESSAGE value="아이슬라이드 기능 좌우 이동되도록 적용" />
+    <option name="LAST_COMMIT_MESSAGE" value="아이슬라이드 기능 좌우 이동되도록 적용" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl b/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
index 4f15270..36c86e9 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
@@ -444,12 +444,17 @@
 						strRecordList += "				<span class='info_time'>" + item.ago + "</span>";
 						strRecordList += "			</div>";
 						strRecordList += "			<div class='info_amount'>";
-						strRecordList += "				<p>소변량 매우많음</p>";
+
+						if(item.time_val != null) {
+							strRecordList += "				<p>" + item.time_val + "</p>";
+						}
 						strRecordList += "			</div>";
 						strRecordList += "			<div class='info_recode' style='border-color: " + item.color_cd + ";' onclick='fncGoViewEdit(" + item.dn_no + ")'>";
 						strRecordList += "				<p style='color: #A1D3E3;'>순간의 기록</p>";
 						strRecordList += "				<span>";
-						strRecordList += item.memo;
+						if(item.memo != null) {
+							strRecordList += item.memo;
+						}
 						strRecordList += "				</span>";
 						strRecordList += "			</div>";
 						strRecordList += "		</div>";