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

index_bottom 공유관련 html 스크립트 분리-3

Browse Source
dev_bert
jonghwan76 3 years ago
parent 174ded8140
commit 98e1910b06
4 changed files with 44 additions and 23 deletions
Show Stats Download Patch File Download Diff File

21
.idea/workspace.xml
Unescape View File

@ -9,13 +9,8 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="index_bottom 공유관련 html 스크립트 분리">
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily_share.ftl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline_share.ftl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week_share.ftl" afterDir="false" />
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="index_bottom 공유관련 html 스크립트 분리-2">
<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/memory/M_MemoryController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/memory/M_MemoryController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_common.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_common.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.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" />
@ -205,7 +200,7 @@
<workItem from="1649040256227" duration="5551000" />
<workItem from="1649066917331" duration="10378000" />
<workItem from="1649160006499" duration="6876000" />
<workItem from="1649290781944" duration="29204000" />
<workItem from="1649290781944" duration="34201000" />
</task>
<task id="LOCAL-00001" summary="최초 커밋">
<created>1645354476031</created>
@ -340,7 +335,14 @@
<option name="project" value="LOCAL" />
<updated>1649334044809</updated>
</task>
<option name="localTasksCounter" value="20" />
<task id="LOCAL-00020" summary="index_bottom 공유관련 html 스크립트 분리-2">
<created>1649339670142</created>
<option name="number" value="00020" />
<option name="presentableId" value="LOCAL-00020" />
<option name="project" value="LOCAL" />
<updated>1649339670142</updated>
</task>
<option name="localTasksCounter" value="21" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -379,6 +381,7 @@
<MESSAGE value="데이터 연동작업" />
<MESSAGE value="퍼블리싱 기능 적용&#10;1. 설정하기&#10; - 인증코드 확인&#10; - 계정연동 하기&#10; - 기록 카테고리 수정&#10; - 자주쓰는 표현 수정&#10; &#10;2. 로그인화면" />
<MESSAGE value="index_bottom 공유관련 html 스크립트 분리" />
<option name="LAST_COMMIT_MESSAGE" value="index_bottom 공유관련 html 스크립트 분리" />
<MESSAGE value="index_bottom 공유관련 html 스크립트 분리-2" />
<option name="LAST_COMMIT_MESSAGE" value="index_bottom 공유관련 html 스크립트 분리-2" />
</component>
</project>

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

@ -42,7 +42,7 @@
<div class="swiper-container">
<div class="swiper-wrapper">
<#list model['category_list'] as item>
<div class="swiper-slide">
<div id="${item['color_cd']?replace("#", "")}" onclick="fncShowCategory(this)" class="swiper-slide">
<a style="cursor:pointer;background-color: ${item['color_cd']}"><span>${item['title']!}</span></a>
</div>
</#list>
@ -65,7 +65,7 @@
<div class="container">
<!-- conic-gradient(from 시작각도deg, 색상, 범위각도deg, 배경색(투명) 0) -->
<#list model['time_list'] as item>
<div class="data" style="background: conic-gradient(from ${item['start_degree']!}deg,${item['category']!} ${item['add_degree']!}deg, #00ff0000 0)"></div>
<div id="p_${item['category']?replace("#", "")}" name="p_pie_color" class="data" style="background: conic-gradient(from ${item['start_degree']!}deg,${item['category']!} ${item['add_degree']!}deg, #00ff0000 0)"></div>
</#list>
<span class="center"></span>
</div>
@ -94,7 +94,7 @@
<div class="fix_icon">
<#-- <button type="button"><img src="../img/ico_image_grey_24.png" alt=""></button>-->
<button id="share-list" type="button"><img src="../img/ico_share_grey_24.png" alt=""></button>
<button id="share-list" type="button"><img style="cursor:pointer" src="../img/ico_share_grey_24.png" alt=""></button>
</div>
</div>
<!-- //wrap -->
@ -118,8 +118,14 @@
<#include "/m/memory/memory_common.ftl">
<script>
//공유 URL
function fncShowCategory(e) {
var attr_id = $(e).attr("id");
$("div[name='p_pie_color']").hide();
$("#p_" + attr_id).show();
}
//공유 URL
var param = "member_id=${model['rm_mem']['member_id']!}&smc_no=${model['rm_child']['smc_no']}&birthday=${model['rm_child']['birthday']}&dayFlag=${model['rm_mem']['dayFlag']!}&currDate=${model['rm_mem']['currDate']!}";
var shareURL = window.location.protocol + "//" + window.location.host + "${URL_ROOT}" + "/m/memory/memory_daily_share?" + param;
var webURL = window.location.protocol + "//" + window.location.host + "${URL_ROOT}" + "/m/";

2
src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl
Unescape View File

@ -105,7 +105,7 @@
<div class="fix_icon">
<#-- <button type="button"><img src="../img/ico_image_grey_24.png" alt=""></button>-->
<button id="share-list" type="button"><img src="../img/ico_share_grey_24.png" alt=""></button>
<button id="share-list" type="button"><img style="cursor:pointer" src="../img/ico_share_grey_24.png" alt=""></button>
</div>
</div>
<!-- //wrap -->

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

@ -42,7 +42,7 @@
<div class="swiper-container">
<div class="swiper-wrapper">
<#list model['category_list'] as item>
<div class="swiper-slide">
<div id="${item['color_cd']?replace("#", "")}" onclick="fncShowCategory(this)" class="swiper-slide">
<a style="cursor:pointer;background-color: ${item['color_cd']}"><span>${item['title']!}</span></a>
</div>
</#list>
@ -75,7 +75,7 @@
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
<span title="${item.title}" style="top:${topP}%;height:${item['add_degree']!}px;background-color: ${item['color_cd']}"></span>
<span key="${item['color_cd']?replace("#", "")}" name="p_timeline_color" title="${item.title}" style="top:${topP}%;height:${item['add_degree']!}px;background-color: ${item['color_cd']}"></span>
</#if>
</#list>
</li>
@ -90,7 +90,7 @@
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
<span title="${item.title}" style="top:${topP}%;height:${item['add_degree']!}px;background-color: ${item['color_cd']}"></span>
<span key="${item['color_cd']?replace("#", "")}" name="p_timeline_color" title="${item.title}" style="top:${topP}%;height:${item['add_degree']!}px;background-color: ${item['color_cd']}"></span>
</#if>
</#list>
</li>
@ -105,7 +105,7 @@
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
<span title="${item.title}" style="top:${topP}%;height:${item['add_degree']!}px;background-color: ${item['color_cd']}"></span>
<span key="${item['color_cd']?replace("#", "")}" name="p_timeline_color" title="${item.title}" style="top:${topP}%;height:${item['add_degree']!}px;background-color: ${item['color_cd']}"></span>
</#if>
</#list>
</li>
@ -120,7 +120,7 @@
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
<span title="${item.title}" style="top:${topP}%;height:${item['add_degree']!}px;background-color: ${item['color_cd']}"></span>
<span key="${item['color_cd']?replace("#", "")}" name="p_timeline_color" title="${item.title}" style="top:${topP}%;height:${item['add_degree']!}px;background-color: ${item['color_cd']}"></span>
</#if>
</#list>
</li>
@ -135,7 +135,7 @@
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
<span title="${item.title}" style="top:${topP}%;height:${item['add_degree']!}px;background-color: ${item['color_cd']}"></span>
<span key="${item['color_cd']?replace("#", "")}" name="p_timeline_color" title="${item.title}" style="top:${topP}%;height:${item['add_degree']!}px;background-color: ${item['color_cd']}"></span>
</#if>
</#list>
</li>
@ -150,7 +150,7 @@
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
<span title="${item.title}" style="top:${topP}%;height:${item['add_degree']!}px;background-color: ${item['color_cd']}"></span>
<span key="${item['color_cd']?replace("#", "")}" name="p_timeline_color" title="${item.title}" style="top:${topP}%;height:${item['add_degree']!}px;background-color: ${item['color_cd']}"></span>
</#if>
</#list>
</li>
@ -165,7 +165,7 @@
</#if>
<#assign topP = item['hour'] + idx>
<#assign pre_hour = item['hour'] + ''>
<span title="${item.title}" style="top:${topP}%;height:${item['add_degree']!}px;background-color: ${item['color_cd']}"></span>
<span key="${item['color_cd']?replace("#", "")}" name="p_timeline_color" title="${item.title}" style="top:${topP}%;height:${item['add_degree']!}px;background-color: ${item['color_cd']}"></span>
</#if>
</#list>
</li>
@ -222,7 +222,7 @@
<div class="fix_icon">
<#-- <button type="button"><img src="../img/ico_image_grey_24.png" alt=""></button>-->
<button id="share-list" type="button"><img src="../img/ico_share_grey_24.png" alt=""></button>
<button id="share-list" type="button"><img style="cursor:pointer" src="../img/ico_share_grey_24.png" alt=""></button>
</div>
</div>
<!-- //wrap -->
@ -241,6 +241,18 @@
<!-- 공유기능 -->
<#include "/m/memory/memory_common.ftl">
<script>
function fncShowCategory(e) {
var attr_id = $(e).attr("id");
$("span[name='p_timeline_color']").hide();
$("span[name=p_timeline_color]").each(function(index, item){
item_key = $(item).attr("key");
if(item_key == attr_id) {
$(item).show();
}
});
}
//공유 URL
var param = "member_id=${model['rm_mem']['member_id']!}&smc_no=${model['rm_child']['smc_no']}&dayFlag=${model['rm_mem']['dayFlag']!}&currDate=${model['rm_mem']['currDate']!}";
var shareURL = window.location.protocol + "//" + window.location.host + "${URL_ROOT}" + "/m/memory/memory_week_share?" + param;

Write Preview
Loading…
Cancel
Save