From d9f337117f4ec168585fa8378231422308ccb5f7 Mon Sep 17 00:00:00 2001 From: "Lim\\jun" Date: Tue, 16 May 2023 11:07:32 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=88=EC=82=B0=EA=B4=80=EB=A6=AC=20-=20?= =?UTF-8?q?=EA=B8=B0=EB=B3=B8=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=BF=8C?= =?UTF-8?q?=EB=A0=A4=EC=A3=BC=EA=B8=B0=20=EB=B0=8F=20=EC=98=88=EC=82=B0?= =?UTF-8?q?=ED=86=B5=EA=B3=84=20-=20=EC=B4=9D=EA=B4=84=ED=91=9C=20?= =?UTF-8?q?=EC=A3=BC=EC=84=9D=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/budget/expense.js | 16 ++++++++++++++-- .../resources/static/js/budget/statsDetail.js | 17 ++++++++++++++--- src/main/resources/static/js/budget/statsOrg.js | 16 ++++++++++++++-- src/main/resources/templates/budget/assign.html | 2 +- .../resources/templates/budget/budgeting.html | 2 +- .../resources/templates/budget/expense.html | 9 +++++++-- .../resources/templates/budget/statsDetail.html | 12 ++++++------ .../resources/templates/budget/statsOrg.html | 12 ++++++------ 8 files changed, 63 insertions(+), 23 deletions(-) diff --git a/src/main/resources/static/js/budget/expense.js b/src/main/resources/static/js/budget/expense.js index efb996c9..03b2f2aa 100644 --- a/src/main/resources/static/js/budget/expense.js +++ b/src/main/resources/static/js/budget/expense.js @@ -10,7 +10,19 @@ $(document).on('click', '#addBtn', function (){ getEditModal(0) }) +$(document).ready(function(){ + if ($("#ResultRow").text().trim() == "") { + expenseSearch(); + } else { + contentFade("out"); + } +}); + $(document).on('click', '#searchBtn', function (){ + expenseSearch(); +}) + +function expenseSearch() { var stDate = $("#stDate").val() var edDate = $("#edDate").val() if($("#stDate").val() ==""){ @@ -30,12 +42,12 @@ $(document).on('click', '#searchBtn', function (){ alert('같은 년도의 데이터만 조회가능합니다. ex)2021-01-01 ~ 2021-12-31'); return; } - $("#year").val(stDate.getFullYear()); + contentFade("in"); location.href="/budget/expense?year="+$("#year").val() + "&stDate=" + $("#stDate").val() + "&edDate=" + $("#edDate").val() + "&code=" +$("#code").val(); +} -}) $(document).on('click', '#deleteBtn', function (){ if($("input[name='budget']:checked").val() == undefined || $("input[name='budget']:checked").val()==null){ alert('삭제할 항목을 선택해주세요'); diff --git a/src/main/resources/static/js/budget/statsDetail.js b/src/main/resources/static/js/budget/statsDetail.js index 7454c78d..d88c89e0 100644 --- a/src/main/resources/static/js/budget/statsDetail.js +++ b/src/main/resources/static/js/budget/statsDetail.js @@ -10,7 +10,19 @@ $(document).on('click', '#addBtn', function (){ getEditModal(0) }) +$(document).ready(function(){ + if ($("#ResultRow").text().trim() == "") { + statsSearch(); + } else { + contentFade("out"); + } +}); + $(document).on('click', '#searchBtn', function (){ + statsSearch(); +}) + +function statsSearch () { var stDate = $("#stDate").val() var edDate = $("#edDate").val() if($("#stDate").val() ==""){ @@ -31,12 +43,11 @@ $(document).on('click', '#searchBtn', function (){ return; } - - + contentFade("in"); //location.href="/budget/stats/detail?year="+$("#year").val() + "&stDate=" + $("#stDate").val() + "&edDate=" + $("#edDate").val() + "&code=" +$("#code").val() + "&won="+$("#won").val(); location.href="/budget/stats/detail?year="+$("#year").val() + "&stDate=" + $("#stDate").val() + "&edDate=" + $("#edDate").val() + "&code=본청&won="+$("#won").val()+"&item="+$("#item").val(); +} -}) $(document).on('click', '#deleteBtn', function (){ if($("input[name='budget']:checked").val() == undefined || $("input[name='budget']:checked").val()==null){ alert('삭제할 항목을 선택해주세요'); diff --git a/src/main/resources/static/js/budget/statsOrg.js b/src/main/resources/static/js/budget/statsOrg.js index 839663af..edb20ab7 100644 --- a/src/main/resources/static/js/budget/statsOrg.js +++ b/src/main/resources/static/js/budget/statsOrg.js @@ -10,7 +10,19 @@ $(document).on('click', '#addBtn', function (){ getEditModal(0) }) +$(document).ready(function(){ + if ($("#ResultRow").text().trim() == "") { + statsSearch(); + } else { + contentFade("out"); + } +}); + $(document).on('click', '#searchBtn', function (){ + statsSearch(); +}) + +function statsSearch() { var stDate = $("#stDate").val() var edDate = $("#edDate").val() if($("#stDate").val() ==""){ @@ -30,12 +42,12 @@ $(document).on('click', '#searchBtn', function (){ alert('같은 년도의 데이터만 조회가능합니다. ex)2021-01-01 ~ 2021-12-31'); return; } - $("#year").val(stDate.getFullYear()); + contentFade("in"); location.href="/budget/stats/org?year="+$("#year").val() + "&stDate=" + $("#stDate").val() + "&edDate=" + $("#edDate").val() + "&code=" +$("#code").val() + "&won="+$("#won").val(); +} -}) $(document).on('click', '#deleteBtn', function (){ if($("input[name='budget']:checked").val() == undefined || $("input[name='budget']:checked").val()==null){ alert('삭제할 항목을 선택해주세요'); diff --git a/src/main/resources/templates/budget/assign.html b/src/main/resources/templates/budget/assign.html index c2c122d9..b455c2ae 100644 --- a/src/main/resources/templates/budget/assign.html +++ b/src/main/resources/templates/budget/assign.html @@ -7,7 +7,7 @@
- +
diff --git a/src/main/resources/templates/budget/budgeting.html b/src/main/resources/templates/budget/budgeting.html index 673a7695..6d4e831f 100644 --- a/src/main/resources/templates/budget/budgeting.html +++ b/src/main/resources/templates/budget/budgeting.html @@ -7,7 +7,7 @@
- +
diff --git a/src/main/resources/templates/budget/expense.html b/src/main/resources/templates/budget/expense.html index a4eb3e0d..f20e83a1 100644 --- a/src/main/resources/templates/budget/expense.html +++ b/src/main/resources/templates/budget/expense.html @@ -7,7 +7,7 @@
- +
@@ -83,7 +83,7 @@ - + -->
+
diff --git a/src/main/resources/templates/budget/statsDetail.html b/src/main/resources/templates/budget/statsDetail.html index 94677aa1..d51b5a60 100644 --- a/src/main/resources/templates/budget/statsDetail.html +++ b/src/main/resources/templates/budget/statsDetail.html @@ -7,7 +7,7 @@
- +
@@ -26,10 +26,10 @@
    - + + + +