Merge branch 'bugfix_kim' into 'first_dev'
[1차][FO] 15일전까지 데이터 수정 가능, 수입외 항목에서 수정불가기간에 추가등록이 가능한 오류 수정 See merge request korea-research/korea-research!70
This commit is contained in:
@@ -87,8 +87,7 @@ public class DailyUtil {
|
|||||||
* @return true=수정 가능, false=수정 불가
|
* @return true=수정 가능, false=수정 불가
|
||||||
*/
|
*/
|
||||||
public boolean isModifiable(LocalDate startDate, LocalDate endDate) {
|
public boolean isModifiable(LocalDate startDate, LocalDate endDate) {
|
||||||
// TODO : 15일로 변경, 테스트를 위해 30일로 진행중
|
LocalDate limitStart = LocalDate.now().minusDays(15);
|
||||||
LocalDate limitStart = LocalDate.now().minusDays(30);
|
|
||||||
log.debug("isModifiable @@limitStart: {}, startDate: {}, endDate: {}", limitStart, startDate, endDate);
|
log.debug("isModifiable @@limitStart: {}, startDate: {}, endDate: {}", limitStart, startDate, endDate);
|
||||||
|
|
||||||
return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate) || limitStart.isEqual(endDate));
|
return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate) || limitStart.isEqual(endDate));
|
||||||
@@ -101,8 +100,7 @@ public class DailyUtil {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public boolean isRegisterPossible(LocalDate startDate, LocalDate endDate) {
|
public boolean isRegisterPossible(LocalDate startDate, LocalDate endDate) {
|
||||||
// TODO : 15일로 변경, 테스트를 위해 60일로 진행중
|
LocalDate limitStart = LocalDate.now().minusDays(15);
|
||||||
LocalDate limitStart = LocalDate.now().minusDays(60);
|
|
||||||
log.debug("isRegisterPossible @@limitStart: {}, startDate: {}, endDate: {}", limitStart, startDate, endDate);
|
log.debug("isRegisterPossible @@limitStart: {}, startDate: {}, endDate: {}", limitStart, startDate, endDate);
|
||||||
|
|
||||||
return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate));
|
return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate));
|
||||||
|
|||||||
@@ -89,7 +89,8 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01">
|
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
|
||||||
|
th:if="${btnActive}">
|
||||||
<i class="ico-add ico-small" aria-hidden="true"></i>
|
<i class="ico-add ico-small" aria-hidden="true"></i>
|
||||||
<span class="btn-txt">추가 등록</span>
|
<span class="btn-txt">추가 등록</span>
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -87,7 +87,8 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01">
|
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
|
||||||
|
th:if="${btnActive}">
|
||||||
<i class="ico-add ico-small" aria-hidden="true"></i>
|
<i class="ico-add ico-small" aria-hidden="true"></i>
|
||||||
<span class="btn-txt">추가 등록</span>
|
<span class="btn-txt">추가 등록</span>
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -87,7 +87,8 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01">
|
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
|
||||||
|
th:if="${btnActive}">
|
||||||
<i class="ico-add ico-small" aria-hidden="true"></i>
|
<i class="ico-add ico-small" aria-hidden="true"></i>
|
||||||
<span class="btn-txt">추가 등록</span>
|
<span class="btn-txt">추가 등록</span>
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -77,7 +77,8 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01">
|
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
|
||||||
|
th:if="${btnActive}">
|
||||||
<i class="ico-add ico-small" aria-hidden="true"></i>
|
<i class="ico-add ico-small" aria-hidden="true"></i>
|
||||||
<span class="btn-txt">추가 등록</span>
|
<span class="btn-txt">추가 등록</span>
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -129,7 +129,8 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01">
|
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
|
||||||
|
th:if="${btnActive}">
|
||||||
<i class="ico-add ico-small" aria-hidden="true"></i>
|
<i class="ico-add ico-small" aria-hidden="true"></i>
|
||||||
<span class="btn-txt">추가 등록</span>
|
<span class="btn-txt">추가 등록</span>
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
Reference in New Issue
Block a user