Merge branch 'dev' into 'deploy-dev-front'

Dev

See merge request korea-research/korea-research!42
This commit is contained in:
김현주 개발
2025-06-25 03:30:04 +00:00
47 changed files with 595 additions and 560 deletions

View File

@@ -74,16 +74,9 @@
-- 이전월 마지막 DAY 로 시작, 종료일이 같은지 여부
or start_day = DATE_PART('day', date_trunc('month', CURRENT_DATE) - INTERVAL '1 days')
or end_day = DATE_PART('day', date_trunc('month', CURRENT_DATE) - INTERVAL '1 days')
/*
-- 현재 DAY 로 시작, 종료일이 같은지 여부
or start_day = DATE_PART('day', CURRENT_DATE - INTERVAL '3 days')
*/
)
)
--select count(tdg.group_no), count(dr.id)
select case when count(tdg.group_no) = count(dr.id) then 0 else count(tdg.group_no) - count(dr.id) end
--select *
from temp_day_group tdg
left join
daily_record dr on dr.record_month = tdg.current_month and dr.day_group_no = tdg.group_no

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

@@ -1,37 +1,33 @@
<!DOCTYPE html>
<html layout:decorate="~{layout/layout-error}"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
xmlns:th="http://www.w3.org/1999/xhtml">
<html layout:decorate="~{layout/layout-error}" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
xmlns:th="http://www.thymeleaf.org" lang="ko">
<head>
<title>404</title>
</head>
<body>
<section layout:fragment="content">
<div class="container">
<div class="row">
<div class="p-5 mb-4 bg-light rounded-3">
<div class="container-fluid py-5">
<h1 class="display-5 fw-bold"><i class="bi bi-eye-slash-fill"></i>
Oops, 404 Not Found :-(</h1>
<p class="col-md-8 fs-4">
존재하지 않는 URI 주소로 접근했습니다. 다시 확인해주세요.
</p>
<p class="col-md-8 fs-5">
<div layout:fragment="content" th:classappend="error-wrap">
<main id="content" role="main">
<div class="info-msg">
<strong>요청하신 페이지를<br>
찾을 수 없습니다</strong>
<span>페이지를 찾을 수 없습니다.<br>
일계부 첫 화면으로 이동해 주세요.</span>
</div>
<div class="btns">
<button type="button" class="fill" th:onclick="|location.href='#{uri.front.record.calendar.path}'|">일계부로 이동</button>
</div>
</main>
<th:block th:if="${@systemProperties['spring.profiles.active'] eq 'local'}">
<div class="info-msg">
<span>Error</span> <span class="text-muted" th:text="${error}"></span>
<br/>
<span>Message</span> <span class="text-muted" th:text="${message}"></span>
</p>
<button class="btn btn-primary btn-lg" onclick="location.href='/'" type="button">홈으로 이동
</button>
</div>
</div>
</div>
</div>
</section>
</th:block>
</div>
</body>
</html>

View File

@@ -1,43 +1,33 @@
<!DOCTYPE html>
<html layout:decorate="~{layout/layout-error}" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
xmlns:th="http://www.thymeleaf.org">
xmlns:th="http://www.thymeleaf.org" lang="ko">
<head>
<title>500 - 에러발생</title>
<title>500</title>
</head>
<body>
<section layout:fragment="content">
<div class="container">
<div class="row">
<div class="p-5 mb-4 bg-light rounded-3">
<div class="container-fluid py-5">
<h1 class="display-5 fw-bold"><i class="bi bi-cone-striped"></i>
Oops, <span class="text-muted">에러가 발생했습니다!</span> :-(</h1>
<p class="col-md-8 fs-4">
아래 에러 메세지를 담당자에게 전달해주세요.
</p>
<p class="col-md-8 fs-5">
<div layout:fragment="content" th:classappend="error-wrap">
<main id="content" role="main">
<div class="info-msg">
<strong>요청하신 작업을<br> 완료할 수 없습니다.</strong>
<span>서비스 이용 중 문제가 발생했습니다.<br>
잠시 후 다시 시도해 주세요.</span>
</div>
<div class="btns">
<button type="button" class="strock" th:onclick="|location.href='#{uri.front.record.calendar.path}'|">일계부로 이동</button>
<button type="button" class="fill" th:onclick="location.reload()">다시 시도</button>
</div>
</main>
<th:block th:if="${@systemProperties['spring.profiles.active'] eq 'local'}">
<div class="info-msg">
<span>Error</span> <span class="text-muted" th:text="${error}"></span>
<br/>
<span>Message</span> <span class="text-muted" th:text="${message}"></span>
<!-- <br/>-->
<!-- <span>Status</span> <span th:text="${status}" class="text-muted"></span>-->
<!-- <br/>-->
<!-- <span>Path</span> <span th:text="${path}" class="text-muted"></span>-->
<!-- <br/>-->
<!-- <span>Timestamp</span> <span th:text="${timestamp}" class="text-muted"></span>-->
</p>
<hr>
<button class="btn btn-primary btn-lg" onclick="history.go(-1)" type="button">이전으로 이동
</button>
</div>
</div>
</div>
</div>
</section>
</th:block>
</div>
</body>
</html>
</html>

View File

@@ -15,7 +15,7 @@
</hgroup>
<section class="form-group">
<form method="post" name="reqForm" id="reqForm" onsubmit="formControl.authInfoUser();" th:action="@{/}">
<form method="post" name="reqForm" id="reqForm" onsubmit="event.preventDefault(); formControl.authInfoUser(event);" th:action="@{/}">
<div class="component-input" data-props-toggle-Password="true">
<div class="input-label">
<label for="password" class="label-txt">비밀번호</label>
@@ -55,7 +55,8 @@
};
let formControl = {
authInfoUser() {
authInfoUser(event) {
event.preventDefault();
const f = document.reqForm;
const obj = $(f).serializeObject();

View File

@@ -85,14 +85,14 @@
</div>
<div class="component-input">
<div class="input-field">
<input type="text" th:field="*{tel2}" maxlength="4"
oninput="this.value=this.value.replace(/[^0-9]/g,'')"/>
<input type="text" th:field="*{tel2}"
maxlength="4" inputmode="tel" pattern="[0-9]*" oninput="kri.form.maxlength(this)"/>
</div>
</div>
<div class="component-input">
<div class="input-field">
<input type="text" th:field="*{tel3}" maxlength="4"
oninput="this.value=this.value.replace(/[^0-9]/g,'')"/>
<input type="text" th:field="*{tel3}"
maxlength="4" inputmode="tel" pattern="[0-9]*" oninput="kri.form.maxlength(this)"/>
</div>
</div>
</div>
@@ -114,13 +114,13 @@
<div class="component-input">
<div class="input-field">
<input type="text" id="temp_input_0006" th:field="*{phone2}"
maxlength="4" oninput="this.value=this.value.replace(/[^0-9]/g,'')">
maxlength="4" inputmode="tel" pattern="[0-9]*" oninput="kri.form.maxlength(this)">
</div>
</div>
<div class="component-input">
<div class="input-field">
<input type="text" id="temp_input_0007" th:field="*{phone3}"
maxlength="4" oninput="this.value=this.value.replace(/[^0-9]/g,'')">
maxlength="4" inputmode="tel" pattern="[0-9]*" oninput="kri.form.maxlength(this)">
</div>
</div>
</div>

View File

@@ -1,19 +1,45 @@
<!DOCTYPE html>
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org" lang="ko">
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, viewport-fit=cover" />
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
<meta charset="utf-8" />
<title>Error | KRI 임가경제조사 일계부</title>
<meta name="keywords" content="" />
<meta name="description" content="" />
<meta property="og:type" content="website" />
<meta property="og:site_name" content="" />
<meta property="og:title" content="" />
<meta property="og:description" content="" />
<meta property="og:image" content="pathImages/" />
<link rel="icon" type="image/x-icon" href="pathImages/" />
<link rel="shortcut icon" type="image/x-icon" href="pathImages/" />
<link rel="preconnect" href="https://cdn.jsdelivr.net" crossorigin />
<link rel="preload" as="font" type="font/woff2" crossorigin href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/variable/PretendardVariable.woff2" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/variable/pretendardvariable.css" />
<style>
* {margin: 0; padding: 0;}
body, html {height: 100%; font-family: "Pretendard Variable", Pretendard, -apple-system, BlinkMacSystemFont, system-ui, Roboto, "Helvetica Neue", "Segoe UI", "Apple SD Gothic Neo", "Noto Sans KR", "Malgun Gothic", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", sans-serif;}
#wrap {height: 100%;}
.error-wrap {padding-top: 120px;}
.error-wrap main {display: flex; flex-direction: column; width: 310px; margin: 0 auto; padding-top: 88px; background:url('../../assets/images/common/ico_nodata.svg') center top / 64px no-repeat;}
.info-msg {display: flex; flex-direction: column; align-items: center;}
.info-msg strong {display: block; font-size: 24px; font-weight: 700; color: #212529; line-height: 140%; text-align: center;}
.info-msg span {display: block; margin-top: 8px; font-size: 15px; font-weight: 400; color: #495057; line-height: 140%; text-align: center;}
.btns {display: flex; gap: 8px; margin-top: 32px;}
.btns button {flex: 1; display: inline-block; height: 52px; font-size: 18px; font-weight: 600; border-radius: 8px;}
.btns .strock {color: #4BBC43; border: 1px solid #4BBC43; background: #ffffff;}
.btns .fill {color: #ffffff; border: 0; background: #4BBC43;}
</style>
</head>
<body>
<section layout:fragment="content">
<p>Page content goes here</p>
</section>
<div class="container">
<footer class="py-3 my-4 border-top">
<div class="text-center">
<span class="text-muted">&copy; 2022 All rights reserved</span>
</div>
</footer>
<div id="wrap">
<div id="container" layout:fragment="content">
page content
</div>
</div>
</body>
</html>

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}}

View File

@@ -105,9 +105,10 @@
<button type="button" class="btn btn-l btn-secondary" onclick="krip.daily.goToPrev();">
<span class="btn-txt">이전 단계로 이동</span>
</button>
<button type="button" class="btn btn-l btn-primary"
<button type="button" class="btn btn-l btn-primary _nextStep"
th:data-last="${dailyRecord.lastDay}"
th:disabled="${not #strings.equals(dailyRecord.expenseStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(expenseList)}"
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]])">
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]], [[${targetList}]])">
<span class="btn-txt">다음 단계로 이동</span>
</button>
</div>

View File

@@ -116,7 +116,8 @@
<button type="button" class="btn btn-l btn-secondary" onclick="krip.daily.goToPrev();">
<span class="btn-txt">이전 단계로 이동</span>
</button>
<button type="button" class="btn btn-l btn-primary"
<button type="button" class="btn btn-l btn-primary _nextStep"
th:data-last="${dailyRecord.lastDay}"
th:disabled="${not #strings.equals(dailyRecord.farmingStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(farmingList)}"
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]], [[${targetList}]])">
<span class="btn-txt">다음 단계로 이동</span>

View File

@@ -108,9 +108,10 @@
<button type="button" class="btn btn-l btn-secondary" onclick="krip.daily.goToPrev();">
<span class="btn-txt">이전 단계로 이동</span>
</button>
<button type="button" class="btn btn-l btn-primary"
<button type="button" class="btn btn-l btn-primary _nextStep"
th:data-last="${dailyRecord.lastDay}"
th:disabled="${not #strings.equals(dailyRecord.forestryStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(forestryList)}"
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]])">
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]], [[${targetList}]])">
<span class="btn-txt">다음 단계로 이동</span>
</button>
</div>

View File

@@ -127,7 +127,8 @@
<button type="button" class="btn btn-l btn-secondary" onclick="krip.daily.goToPrev();">
<span class="btn-txt">이전 단계로 이동</span>
</button>
<button type="button" class="btn btn-l btn-primary"
<button type="button" class="btn btn-l btn-primary _nextStep"
th:data-last="${dailyRecord.lastDay}"
th:disabled="${not #strings.equals(dailyRecord.incomeStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(incomeList)}"
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]], [[${targetList}]])">
<span class="btn-txt">다음 단계로 이동</span>

View File

@@ -93,9 +93,10 @@
<button type="button" class="btn btn-l btn-secondary" onclick="krip.daily.goToPrev();">
<span class="btn-txt">이전 단계로 이동</span>
</button>
<button type="button" class="btn btn-l btn-primary"
<button type="button" class="btn btn-l btn-primary _nextStep"
th:data-last="${dailyRecord.lastDay}"
th:disabled="${not #strings.equals(dailyRecord.powerStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(powerList)}"
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]])">
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]], [[${targetList}]])">
<span class="btn-txt">다음 단계로 이동</span>
</button>
</div>

View File

@@ -154,9 +154,10 @@
<button type="button" class="btn btn-l btn-secondary" onclick="krip.daily.goToPrev();">
<span class="btn-txt">이전 단계로 이동</span>
</button>
<button type="button" class="btn btn-l btn-primary"
<button type="button" class="btn btn-l btn-primary _nextStep"
th:data-last="${dailyRecord.lastDay}"
th:disabled="${not #strings.equals(dailyRecord.workStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(workList)}"
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]])">
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]], [[${targetList}]])">
<span class="btn-txt">다음 단계로 이동</span>
</button>
</div>