diff --git a/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml b/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml index e7f65e2e..25f738ca 100644 --- a/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml +++ b/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml @@ -22,7 +22,7 @@ bat.source_purpose AS sourcePurpose, /* 수입원 */ bat.count, /* 수량 */ CASE - WHEN ui_unit.id = 'code.record.unit.self' + WHEN ui_unit.id = 'code.count.unit.self' THEN bat.unit ELSE ui_unit.code_text END AS unitText, /* 단위 */ @@ -33,7 +33,7 @@ AND ui_crop.id = bat.crop_code AND ui_crop.is_deleted = false LEFT JOIN uicode ui_unit - ON ui_unit.parent_id = 'code.record.unit' + ON ui_unit.parent_id = 'code.count.unit' AND ui_unit.id = bat.unit_code AND ui_unit.is_deleted = false LEFT JOIN uicode ui_category @@ -59,7 +59,7 @@ bat.source_purpose AS sourcePurpose, /* 용도 */ bat.count, /* 수량 */ CASE - WHEN ui_unit.id = 'code.record.unit.self' + WHEN ui_unit.id = 'code.count.unit.self' THEN bat.unit ELSE ui_unit.code_text END AS unitText, /* 단위 */ @@ -67,7 +67,7 @@ FROM bank_auto_transfer bat LEFT JOIN uicode ui_unit - ON ui_unit.parent_id = 'code.record.unit' + ON ui_unit.parent_id = 'code.count.unit' AND ui_unit.id = bat.unit_code AND ui_unit.is_deleted = false LEFT JOIN diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/GetBankInputUIController.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/GetBankInputUIController.java index 4fdf53e9..2528b5ea 100644 --- a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/GetBankInputUIController.java +++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/GetBankInputUIController.java @@ -96,7 +96,7 @@ class GetBankInputUIController { model.addAttribute("transferCategoryList", uiCodeListPortIn.connect("code.bank.input")); model.addAttribute("codeRecordCropList", uiCodeListPortIn.connect("code.record.crop")); - model.addAttribute("unitList", uiCodeListPortIn.connect("code.record.unit")); + model.addAttribute("countList", uiCodeListPortIn.connect("code.count.unit")); model.addAttribute("MonthStatus", MonthStatus.class); model.addAttribute("editable", editable); @@ -112,7 +112,7 @@ class GetBankInputUIController { model.addAttribute("transferCategoryList", uiCodeListPortIn.connect("code.bank.input")); model.addAttribute("codeRecordCropList", uiCodeListPortIn.connect("code.record.crop")); - model.addAttribute("unitList", uiCodeListPortIn.connect("code.record.unit")); + model.addAttribute("countList", uiCodeListPortIn.connect("code.count.unit")); return "info/bank/inputForm"; } diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankOutputUI/adapters/web/GetBankOutputUIController.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankOutputUI/adapters/web/GetBankOutputUIController.java index 09d2e19f..ff44472e 100644 --- a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankOutputUI/adapters/web/GetBankOutputUIController.java +++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankOutputUI/adapters/web/GetBankOutputUIController.java @@ -101,7 +101,7 @@ class GetBankOutputUIController { model.addAttribute("transferCategoryList", uiCodeListPortIn.connect("code.bank.output")); model.addAttribute("codeRecordCropList", uiCodeListPortIn.connect("code.record.crop")); - model.addAttribute("unitList", uiCodeListPortIn.connect("code.record.unit")); + model.addAttribute("countList", uiCodeListPortIn.connect("code.count.unit")); model.addAttribute("MonthStatus", MonthStatus.class); model.addAttribute("editable", editable); @@ -116,7 +116,7 @@ class GetBankOutputUIController { model.addAttribute("transferCategoryList", uiCodeListPortIn.connect("code.bank.output")); model.addAttribute("codeRecordCropList", uiCodeListPortIn.connect("code.record.crop")); - model.addAttribute("unitList", uiCodeListPortIn.connect("code.record.unit")); + model.addAttribute("countList", uiCodeListPortIn.connect("code.count.unit")); return "info/bank/outputForm"; } diff --git a/front/src/main/resources/static/assets/images/kri_appimg.png b/front/src/main/resources/static/assets/images/kri_appimg.png new file mode 100644 index 00000000..27ce6ecc Binary files /dev/null and b/front/src/main/resources/static/assets/images/kri_appimg.png differ diff --git a/front/src/main/resources/static/assets/images/kri_favicon.ico b/front/src/main/resources/static/assets/images/kri_favicon.ico new file mode 100644 index 00000000..6faaf3bb Binary files /dev/null and b/front/src/main/resources/static/assets/images/kri_favicon.ico differ diff --git a/front/src/main/resources/static/assets/json/manifest.json b/front/src/main/resources/static/assets/json/manifest.json new file mode 100644 index 00000000..bb1d8140 --- /dev/null +++ b/front/src/main/resources/static/assets/json/manifest.json @@ -0,0 +1,15 @@ +{ + "name": "My App", + "short_name": "MyApp", + "start_url": "/", + "display": "standalone", + "background_color": "#ffffff", + //"theme_color": "#4BBC43", + "icons": [ + { + "src": "kri_appimg.png", + "sizes": "512x512", + "type": "image/png" + } + ] +} diff --git a/front/src/main/resources/static/assets/styles/style.css b/front/src/main/resources/static/assets/styles/style.css index c23ced15..3c8482d4 100644 --- a/front/src/main/resources/static/assets/styles/style.css +++ b/front/src/main/resources/static/assets/styles/style.css @@ -8516,13 +8516,15 @@ button.swiper-pagination-bullet { } .regist-item-area .item-list .list-item .detail-list li p { position: relative; + min-width: -webkit-fit-content; + min-width: -moz-fit-content; + min-width: fit-content; margin-right: 0.4rem; padding-right: 0.9rem; font-size: 1.6rem; line-height: 140%; color: #868e96; word-break: break-all; - white-space: nowrap; } .regist-item-area .item-list .list-item .detail-list li p::before { position: absolute; @@ -9067,14 +9069,92 @@ button.swiper-pagination-bullet { line-height: 140%; font-weight: 700; } -.regi-wrap .month-detail .btn-column-list a { +.regi-wrap .month-detail .btn-column-list li { + padding: 2rem 1.6rem; +} +.regi-wrap .month-detail .btn-column-list li.view { padding: 0; } +.regi-wrap .month-detail .btn-column-list li.view .label { + position: relative; + padding-right: 2rem; +} +.regi-wrap .month-detail .btn-column-list li.view .label::before { + position: absolute; + display: block; + content: ""; + width: 2rem; + height: 2rem; + background: url("../images/common/ico_arr_right_gray.svg") center/contain no-repeat; + right: 0; + top: 50%; + -webkit-transform: translateY(-50%); + transform: translateY(-50%); +} +.regi-wrap .month-detail .btn-column-list li.view a { + padding: 2rem 1.6rem; +} +.regi-wrap .month-detail .btn-column-list li.view a:before { + display: none; +} .regi-wrap .month-detail .btn-column-list .value li { + display: -webkit-box; + display: -webkit-flex; + display: flex; + -webkit-box-align: center; + -webkit-align-items: center; + align-items: center; padding: 0; box-shadow: none; border: 0; } +.regi-wrap .month-detail .btn-column-list .value li + li { + margin-top: 0.6rem; +} +.regi-wrap .month-detail .btn-column-list .value li.total { + margin-top: 0.4rem; +} +.regi-wrap .month-detail .btn-column-list .value li.total span { + color: #4bbc43 !important; +} +.regi-wrap .month-detail .btn-column-list .value li.total span:last-child { + display: -webkit-box; + display: -webkit-flex; + display: flex; + -webkit-box-align: center; + -webkit-align-items: center; + align-items: center; + margin-left: auto; +} +.regi-wrap .month-detail .btn-column-list .value li.total strong { + margin-right: 0.2rem; + font-size: 2rem; + line-height: 140%; + font-weight: 600; +} +.regi-wrap .month-detail .btn-column-list .value li span { + font-size: 1.6rem; + line-height: 140%; + font-weight: 400; + color: #212529; +} +.regi-wrap .month-detail .btn-column-list .value li span:first-child { + padding-right: 1.2rem; + position: relative; + color: #868e96; + white-space: nowrap; +} +.regi-wrap .month-detail .btn-column-list .value li span:first-child:before { + position: absolute; + display: block; + content: ":"; + font-size: 1.6rem; + line-height: 140%; + right: 0.5rem; + top: 50%; + -webkit-transform: translateY(-50%); + transform: translateY(-50%); +} .regi-wrap .component-select.bottom-sheet { width: -webkit-fit-content; width: -moz-fit-content; @@ -9113,6 +9193,7 @@ button.swiper-pagination-bullet { padding: 3.2rem 0rem; } .regi-wrap .month-filter .summary { + margin-top: 2rem; display: -webkit-box; display: -webkit-flex; display: flex; @@ -9157,4 +9238,14 @@ button.swiper-pagination-bullet { line-height: 140%; font-weight: 700; } +.regi-wrap .regist-item-area .month-tit { + margin-bottom: 1.6rem; + font-size: 2rem; + line-height: 140%; + font-weight: 700; + color: #212529; +} +.regi-wrap .regist-item-area .item-list + .month-tit { + margin-top: 2.4rem; +} /*# sourceMappingURL=style.css.map */ diff --git a/front/src/main/resources/templates/common/components.html b/front/src/main/resources/templates/common/components.html index 9e5e5eb1..c3da8822 100644 --- a/front/src/main/resources/templates/common/components.html +++ b/front/src/main/resources/templates/common/components.html @@ -25,9 +25,15 @@ + - - + + + + + + + diff --git a/front/src/main/resources/templates/info/bank/input.html b/front/src/main/resources/templates/info/bank/input.html index 4a7e959a..18394aa0 100644 --- a/front/src/main/resources/templates/info/bank/input.html +++ b/front/src/main/resources/templates/info/bank/input.html @@ -113,7 +113,7 @@ data: { transferCategoryCodeList: /*[[${transferCategoryList}]]*/ [], codeRecordCropList: /*[[${codeRecordCropList}]]*/ [], - unitList: /*[[${unitList}]]*/ [], + countList: /*[[${countList}]]*/ [], bankList : /*[[${bankList.content}]]*/ [], pastBankList : /*[[${pastBankList.content}]]*/ [], id: /*[[${currentMonthlyInfo.id}]]*/'', @@ -288,7 +288,7 @@ ENV.elementRefs.select.unitCodeSelect.core.init($select3,{ selectItemCallback({selectValue, dataValue}){ document.querySelector('#unitCode').value=dataValue; - if(dataValue === "code.record.unit.self") { + if(dataValue === "code.count.unit.self") { document.querySelector('#unit').value=""; document.querySelector('#unitDiv').style.display ='block'; } else { @@ -381,7 +381,7 @@ field: 'unitCode', message: '단위를 선택해주세요.' }); - } else if (form.unitCode.value && form.unitCode.value =="code.record.unit.self" && !form.unit.value){ + } else if (form.unitCode.value && form.unitCode.value =="code.count.unit.self" && !form.unit.value){ errors.push({ field: 'unit', @@ -417,7 +417,7 @@ }, // 단위 코드 getUnitLabel(code) { - const found = ENV.data.unitList.find(i => i.id === code); + const found = ENV.data.countList.find(i => i.id === code); return found ? found.codeText : '-'; }, // 재배형태 @@ -441,7 +441,7 @@ if(key == 'transferCategoryCode' && val == "code.bank.input.self"){ document.getElementById(val+"_value").value = product["transferCategory"]; } - if(key == 'unitCode' && val == "code.record.unit.self"){ + if(key == 'unitCode' && val == "code.count.unit.self"){ document.getElementById("unitDiv").style.display = ""; } } @@ -535,7 +535,7 @@ let tagCount = ''; if (product.count > 0) { - const unitText = product.unitCode !== 'code.record.unit.self' + const unitText = product.unitCode !== 'code.count.unit.self' ? getUnit(product.unitCode) : product.unit; diff --git a/front/src/main/resources/templates/info/bank/inputForm.html b/front/src/main/resources/templates/info/bank/inputForm.html index f4b0c739..df9eafa7 100644 --- a/front/src/main/resources/templates/info/bank/inputForm.html +++ b/front/src/main/resources/templates/info/bank/inputForm.html @@ -152,7 +152,7 @@