Merge branch 'daily' into dev
This commit is contained in:
@@ -0,0 +1,3 @@
|
||||
<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M7.33203 6.5V3.5C7.33203 3.23478 7.43739 2.98043 7.62492 2.79289C7.81246 2.60536 8.06681 2.5 8.33203 2.5H20.332C20.5972 2.5 20.8516 2.60536 21.0391 2.79289C21.2267 2.98043 21.332 3.23478 21.332 3.5V17.5C21.332 17.7652 21.2267 18.0196 21.0391 18.2071C20.8516 18.3946 20.5972 18.5 20.332 18.5H17.332V21.5C17.332 22.052 16.882 22.5 16.325 22.5H4.33903C4.20716 22.5008 4.07643 22.4755 3.95435 22.4256C3.83228 22.3757 3.72126 22.3022 3.62769 22.2093C3.53412 22.1164 3.45982 22.0059 3.40909 21.8841C3.35835 21.7624 3.33216 21.6319 3.33203 21.5L3.33503 7.5C3.33503 6.948 3.78503 6.5 4.34103 6.5H7.33203ZM5.33403 8.5L5.33203 20.5H15.332V8.5H5.33403ZM9.33203 6.5H17.332V16.5H19.332V4.5H9.33203V6.5ZM7.33203 11.5H13.332V13.5H7.33203V11.5ZM7.33203 15.5H13.332V17.5H7.33203V15.5Z" fill="#DEE2E6"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 898 B |
@@ -0,0 +1,3 @@
|
||||
<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M3.66797 3.5H21.668C21.9332 3.5 22.1875 3.60536 22.3751 3.79289C22.5626 3.98043 22.668 4.23478 22.668 4.5V20.5C22.668 20.7652 22.5626 21.0196 22.3751 21.2071C22.1875 21.3946 21.9332 21.5 21.668 21.5H3.66797C3.40275 21.5 3.1484 21.3946 2.96086 21.2071C2.77333 21.0196 2.66797 20.7652 2.66797 20.5V4.5C2.66797 4.23478 2.77333 3.98043 2.96086 3.79289C3.1484 3.60536 3.40275 3.5 3.66797 3.5ZM4.66797 5.5V19.5H20.668V5.5H4.66797ZM7.66797 13.5H9.66797V17.5H7.66797V13.5ZM11.668 7.5H13.668V17.5H11.668V7.5ZM15.668 10.5H17.668V17.5H15.668V10.5Z" fill="#DEE2E6"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 667 B |
@@ -7410,12 +7410,18 @@ button.swiper-pagination-bullet {
|
||||
.footer .footer-menu ul li.menu-regi.active {
|
||||
background-image: url("../images/common/ico_menu_regi_active.svg");
|
||||
}
|
||||
.footer .footer-menu ul li.menu-regi.disabled {
|
||||
background-image: url("../images/common/ico_menu_regi_disabled.svg");
|
||||
}
|
||||
.footer .footer-menu ul li.menu-stat {
|
||||
background-image: url("../images/common/ico_menu_stat.svg");
|
||||
}
|
||||
.footer .footer-menu ul li.menu-stat.active {
|
||||
background-image: url("../images/common/ico_menu_stat_active.svg");
|
||||
}
|
||||
.footer .footer-menu ul li.menu-stat.disabled {
|
||||
background-image: url("../images/common/ico_menu_stat_disabled.svg");
|
||||
}
|
||||
.footer .footer-menu ul li.menu-info {
|
||||
background-image: url("../images/common/ico_menu_info.svg");
|
||||
}
|
||||
@@ -7425,6 +7431,10 @@ button.swiper-pagination-bullet {
|
||||
.footer .footer-menu ul li.active a {
|
||||
color: #4bbc43;
|
||||
}
|
||||
.footer .footer-menu ul li.disabled a {
|
||||
cursor: default;
|
||||
color: #CED4DA;
|
||||
}
|
||||
|
||||
.acco-wrap .daily-report-area .date {
|
||||
position: relative;
|
||||
@@ -7455,6 +7465,9 @@ button.swiper-pagination-bullet {
|
||||
margin-top: 1.6rem;
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
.acco-wrap .modal-content .alert-box + .form-group {
|
||||
margin-top: 3.2rem;
|
||||
}
|
||||
.acco-wrap .modal-content .alert-box + .form-desc {
|
||||
margin-top: 0.8rem;
|
||||
}
|
||||
|
||||
@@ -28,6 +28,15 @@ krip.daily.goToPrev = function() {
|
||||
* @param groupNo
|
||||
*/
|
||||
krip.daily.goToNext = function(target, searchMonth, groupNo) {
|
||||
if (target == null) {
|
||||
if ($('._nextStep').data('last')) {
|
||||
target = 'LAST';
|
||||
} else {
|
||||
krip.daily.goToDone(searchMonth, groupNo);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (target === 'LAST') {
|
||||
// 임가 건의사항 팝업
|
||||
const commentModal = document.querySelector('.commentModal').ui;
|
||||
@@ -231,7 +240,7 @@ krip.daily.createComment = function(month, groupNo) {
|
||||
const f = document.commentReqForm;
|
||||
|
||||
const obj = $(f).serializeObject();
|
||||
console.log(obj)
|
||||
console.log(obj, month, groupNo)
|
||||
if (f.content.value === '') {
|
||||
krip.daily.goToDone(month, groupNo);
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user