From 5ac156fe83e768ce0f8f39f8dcdc6988ae62a033 Mon Sep 17 00:00:00 2001
From: isol <isol2011@imcloud.co.kr>
Date: Thu, 2 Feb 2023 11:00:13 +0900
Subject: [PATCH] [update] xlsx 27~30 line commit

---
 .../com/backoffice/m/index/M_IndexController.java   |  2 +-
 .../com.backoffice.m.bf_daily_nutrition.xml         |  4 ++--
 src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl |  8 +++++++-
 src/main/webapp/m/css/style.css                     | 13 ++++++++++++-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/backoffice/m/index/M_IndexController.java b/src/main/java/com/backoffice/m/index/M_IndexController.java
index f43a2f3..5b1f442 100644
--- a/src/main/java/com/backoffice/m/index/M_IndexController.java
+++ b/src/main/java/com/backoffice/m/index/M_IndexController.java
@@ -188,7 +188,7 @@ public class M_IndexController extends AbstractControllerManager{
 					List<DataMap> category_list = indexBO.select_code_list(paramMap);
 					DataMap.putToModel(model, "category_list", category_list);
 
-					// 오늘 영양입력 조회
+					// 이번 달 영양입력 조회
 					List<DataMap> lm_nutrition = bf_daily_nutritionBO.select_bf_daily_nutrition_list_by_day(paramMap);
 					DataMap.putToModel(model, "lm_nutrition", lm_nutrition);
 
diff --git a/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml b/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
index 01a64ea..b86791c 100644
--- a/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
+++ b/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
@@ -522,8 +522,8 @@
 						WHEN TIMESTAMPDIFF(MINUTE, x.reg_dt, NOW()) <![CDATA[<=]]> 0 THEN '방금 전'
 						WHEN TIMESTAMPDIFF(MINUTE, x.reg_dt, NOW()) <![CDATA[<]]> 60 THEN CONCAT(TIMESTAMPDIFF(MINUTE, x.reg_dt, NOW()), '분 전')
 						WHEN TIMESTAMPDIFF(HOUR, x.reg_dt, NOW()) <![CDATA[<]]> 24 THEN CONCAT(TIMESTAMPDIFF(HOUR, x.reg_dt, NOW()), '시간 전')
-						WHEN TIMESTAMPDIFF(DAY, x.reg_dt, NOW()) <![CDATA[<]]> 30 THEN CONCAT(TIMESTAMPDIFF(DAY, x.reg_dt, NOW()), '일 전')
-						ELSE CONCAT(TIMESTAMPDIFF(MONTH, x.reg_dt, NOW()), '달 전')
+						WHEN TIMESTAMPDIFF(DAY, x.reg_dt, NOW()) <![CDATA[<]]> 30 THEN ""
+						ELSE ""
 					END AS ago
 				FROM tbl_bf_daily_nutrition x
 				WHERE 1 =1
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 acb313d..de06d10 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
@@ -17,7 +17,7 @@
 
 	/* 퍼블리싱 수정 css */
 	.main_cont_camera { padding-top:50px; background: none; padding-bottom: 100px; }
-	.main_cont_camera li { position:relative; width:100%; padding-bottom:125px; text-align:center; background: none; display: flex; }
+	.main_cont_camera li { position:relative; width:100%; padding-bottom:5rem; text-align:center; background: none; display: flex; }
 	.main_cont_camera li:last-child { padding-bottom:50px; background: none; }
 	.main_cont_camera .img_preview { position:relative; overflow:hidden; width: 70px; height: 70px; margin: 0 43px 0 20px; background:#fff; border:5px solid #fff; border-radius:20px; box-shadow: 0 0 6px rgba(0, 0, 0, 0.2); }
 	.main_cont_camera .img_preview:after {
@@ -282,12 +282,18 @@
 					<ul id="ul_photo" class="main_cont_camera">
 						<#assign nutirition_cd_no_title = ''>
 						<#assign ago = ''>
+						<#assign pre_date = ''>
 
 						<#if (model['lm_nutrition'])?has_content>
 							<#list model['lm_nutrition'] as item>
 								<#assign nutirition_cd_no_title = ''>
 								<#assign ago = item['ago']>
 
+								<#if item['mod_dt']?substring(0, 11)! != pre_date>
+									<#assign pre_date = item['mod_dt']?substring(0, 11)!>
+									<div class="timeline_bar">${item['mod_dt']?substring(0, 11)!}</div>
+								</#if>
+
 								<li name="li_img_preview" onclick="location.href='${URL_ROOT}/m/bf_daily_nutrition/view_bf_daily_nutrition.do?dn_no=${item['dn_no']}'" >
 									<div class="img_preview">
 										<#if (item['nutirition_cd_no_title'])?has_content>
diff --git a/src/main/webapp/m/css/style.css b/src/main/webapp/m/css/style.css
index 6429572..a6a9262 100644
--- a/src/main/webapp/m/css/style.css
+++ b/src/main/webapp/m/css/style.css
@@ -5850,7 +5850,7 @@ main {
 .main_cont_camera li {
     position: relative;
     width: 100%;
-    padding-bottom: 80px;
+    padding-bottom: 5rem;
     text-align: center;
     background: none;
     display: flex;
@@ -5912,6 +5912,15 @@ main {
     object-fit: cover;
 }
 
+.main_cont_camera .timeline_bar {
+    display: flex;
+    background: #F4F5F5;
+    padding:8px 20px;
+    font-size: 14px;
+    color: #7A7A7A;
+    margin-bottom: 10px;
+}
+
 
 /* main_cont_result */
 
@@ -15112,6 +15121,7 @@ main.sona_cont_measurement {
     justify-content: center;
     align-items: center;
     background-color: #FFF;
+    opacity: 0.6;
 }
 
 .float_chatbot img {
@@ -15708,6 +15718,7 @@ main.sona_cont_measurement {
     border-radius: 50%;
     box-shadow: 0 0 10px rgb(0 0 0 / 25%);
     cursor: pointer;
+    opacity: 0.6;
 }
 
 .bf_food_modal {