[FO] 일계부 작성상태에 따른 버튼 HTML 적용, 다음단계로 이동 오류 수정

This commit is contained in:
김현주
2025-06-25 11:18:47 +09:00
parent 3d7cfc32e8
commit ad746c0136
3 changed files with 51 additions and 41 deletions

View File

@@ -77,7 +77,7 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
}
} else {
if (!DailyTargetStatus.TARGET.equals(findStatus.getIncomeStatus())) {
if (!DailyTargetStatus.NONE.equals(findStatus.getIncomeStatus())) {
childList.add(new CalendarChildren(
DailySort.INCOME.name(),
DailySort.INCOME.getDesc(),

View File

@@ -8511,6 +8511,7 @@ button.swiper-pagination-bullet {
font-size: 1.6rem;
line-height: 140%;
color: #868e96;
word-break: break-all;
}
.regist-item-area .item-list .list-item .detail-list li p::before {
position: absolute;
@@ -8523,7 +8524,8 @@ button.swiper-pagination-bullet {
line-height: 140%;
}
.regist-item-area .item-list .list-item .detail-list li span {
max-width: 80%;
min-width: 40%;
word-break: break-all;
color: #212529;
}
@@ -8667,13 +8669,20 @@ button.swiper-pagination-bullet {
color: #ffffff;
}
.btn-column-list li a {
.btn-column-list li {
position: relative;
display: block;
padding: 2rem 1.6rem;
background-color: #ffffff;
border-radius: 0.8rem;
box-shadow: 0px 1px 8px -2px rgba(16, 24, 40, 0.05);
box-shadow: 0px 1px 4px -2px rgba(16, 24, 40, 0.04), 0px 1px 8px -2px rgba(16, 24, 40, 0.05);
}
.btn-column-list li a {
position: relative;
padding: 2rem 5.2rem 2rem 1.6rem;
display: block;
width: 100%;
height: 100%;
}
.btn-column-list li a::before {
position: absolute;
@@ -8685,8 +8694,19 @@ button.swiper-pagination-bullet {
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
right: 2rem;
}
.btn-column-list li.edit {
padding: 0;
}
.btn-column-list li.edit a::before {
background: url("../images/common/ico_edit.svg") center/contain no-repeat;
}
.btn-column-list li.view {
padding: 0;
}
.btn-column-list li.view a::before {
background: url("../images/common/ico_arr_right_gray.svg") center/contain no-repeat;
}
.btn-column-list li .label {
font-size: 2rem;
line-height: 140%;

View File

@@ -818,11 +818,33 @@
{{include tmpl="#titleTmpl" /}}
<ul class="btn-column-list">
{{if modifiable}}
{{for list tmpl="#basicRowTmpl1" /}}
{{else}}
{{for list tmpl="#basicRowTmpl2" /}}
{{/if}}
{{for list ~edit=modifiable}}
{{if status == null}}
<li>
<p class="label">{{:codeLabel}}</p>
<p class="value">미작성</p>
</li>
{{else}}
<li class="{{if ~edit}}edit{{else}}view{{/if}}">
{{if status == 'TARGET' && total != 0}}
<a href="{{:path}}?type=update">
<p class="label">{{:codeLabel}}</p>
<p class="value"><em>총 <b>{{:total}}</b>건</em></p>
</a>
{{else status == 'TARGET' && total == 0}}
<a href="{{:path}}?type=update">
<p class="label">{{:codeLabel}}</p>
<p class="value">미완료</p>
</a>
{{else status == 'TODAY_NONE'}}
<a href="{{:path}}?type=update">
<p class="label">{{:codeLabel}}</p>
<p class="value">없음</p>
</a>
{{/if}}
</li>
{{/if}}
{{/for}}
</ul>
{{include tmpl="#etcRowTmpl" /}}
@@ -834,38 +856,6 @@
<p class="date">{{:date.start}} ~ {{:date.end}}</p>
{{/if}}
</script>
<script id="basicRowTmpl1" type="text/x-jsrender">
<li>
<a href="{{:path}}?type=update">
<p class="label">{{:codeLabel}}</p>
{{if status == null}}
<p class="value">미작성</p>
{{else status == 'TARGET' && total != 0}}
<p class="value"><em>총 <b>{{:total}}</b>건</em></p>
{{else status == 'TARGET' && total == 0}}
<p class="value">미완료</p>
{{else status == 'TODAY_NONE'}}
<p class="value">없음</p>
{{/if}}
</a>
</li>
</script>
<script id="basicRowTmpl2" type="text/x-jsrender">
<li>
<a href="{{:path}}?type=update">
<p class="label">{{:codeLabel}}, TODO: 수정버튼삭제필요</p>
{{if status == null}}
<p class="value">미작성</p>
{{else status == 'TARGET' && total != 0}}
<p class="value"><em>총 <b>{{:total}}</b>건</em></p>
{{else status == 'TARGET' && total == 0}}
<p class="value">미완료</p>
{{else status == 'TODAY_NONE'}}
<p class="value">없음</p>
{{/if}}
</a>
</li>
</script>
<script id="etcRowTmpl" type="text/x-jsrender">
<div class="regist-btn-area">
{{for monthlyList}}