Merge branch 'master' of https://dev.azure.com/DBNTech/ForeignAffairs/_git/ForeignAffairs

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('삭제할 항목을 선택해주세요');

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('삭제할 항목을 선택해주세요');

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('삭제할 항목을 선택해주세요');

src/main/resources/templates/budget/assign.html

@@ -7,7 +7,7 @@
 </th:block>
 <div layout:fragment="content">
     <main>
-        <input type="hidden" id="menuKey" value="1">
+        <input type="hidden" id="menuKey" value="55">
         <div class="row justify-content-between">
             <div class="col-auto">
                 <div class="mb-2">

src/main/resources/templates/budget/budgeting.html

@@ -7,7 +7,7 @@
 </th:block>
 <div layout:fragment="content">
     <main>
-        <input type="hidden" id="menuKey" value="1">
+        <input type="hidden" id="menuKey" value="20">
         <div class="row justify-content-between">
             <div class="col-auto">
                 <div class="mb-2">

src/main/resources/templates/budget/expense.html

@@ -7,7 +7,7 @@
 </th:block>
 <div layout:fragment="content">
     <main>
-        <input type="hidden" id="menuKey" value="1">
+        <input type="hidden" id="menuKey" value="56">
         <div class="row justify-content-between">
             <div class="col-auto">
                 <div class="mb-2">
@@ -83,7 +83,7 @@
                                     </th:block>
                                 </tr>
                                 </thead>
-                                <tbody class="table-group-divider">
+                                <tbody class="table-group-divider" id="ResultRow">
                                 <tr class="faRptTr" th:each="info, i : ${list}" onclick="getEditModal(this)"
                                     th:data-name1="${info.getbudget_name_l1}"
                                     th:data-name2="${info.getbudget_name_l2}"
@@ -194,6 +194,11 @@
                             <!--<input type="button" class="btn btn-success" value="등록" id="addFaRptBtn">-->
                         </div>
                     </div>
+                    <div class="modal fade" id="editModal">
+                        <div class="modal-dialog modal-lg modal-dialog-scrollable">
+                            <div class="modal-content" id="editModalContent"></div>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>

src/main/resources/templates/budget/statsDetail.html

@@ -7,7 +7,7 @@
 </th:block>
 <div layout:fragment="content">
     <main>
-        <input type="hidden" id="menuKey" value="1">
+        <input type="hidden" id="menuKey" value="57">
         <div class="row justify-content-between">
             <div class="col-auto">
                 <div class="mb-2">
@@ -26,10 +26,10 @@
                 <div class="card-body">
                     <form id="assginForm" method="get" action="/budget/assign" onsubmit="return false;">
                         <ul class="nav nav-tabs" role="tablist">
-                            <li class="nav-item" role="presentation" onclick="goAll()">
+                            <!--                            <li class="nav-item" role="presentation" onclick="goAll()">-->
-                                <button class="nav-link ivsgtTab"
+                            <!--                                <button class="nav-link ivsgtTab"-->
-                                        data-bs-toggle="tab" type="button" role="tab">총괄표</button>
+                            <!--                                        data-bs-toggle="tab" type="button" role="tab">총괄표</button>-->
-                            </li>
+                            <!--                            </li>-->
                             <li class="nav-item" role="presentation" onclick="goOrg()">
                                 <button class="nav-link ivsgtTab"
                                         data-bs-toggle="tab" type="button" role="tab">관서별현황</button>
@@ -95,7 +95,7 @@
                                 </tr>
                                 </tr>
                                 </thead>
-                                <tbody class="table-group-divider">
+                                <tbody class="table-group-divider" id="ResultRow">
                                 <tr class="faRptTr" th:each="info, i : ${list}">
                                     <td th:text="${info.getorg_name}"></td>
                                     <td th:text="${#numbers.formatInteger(info.getplan_amount,1,'COMMA')}"></td>

src/main/resources/templates/budget/statsOrg.html

@@ -7,7 +7,7 @@
 </th:block>
 <div layout:fragment="content">
     <main>
-        <input type="hidden" id="menuKey" value="1">
+        <input type="hidden" id="menuKey" value="57">
         <div class="row justify-content-between">
             <div class="col-auto">
                 <div class="mb-2">
@@ -27,10 +27,10 @@
                     <form id="assginForm" method="get" action="/budget/assign" onsubmit="return false;">
                         <input type="hidden" name="year" id="year" value=""/>
                         <ul class="nav nav-tabs" role="tablist">
-                            <li class="nav-item" role="presentation" onclick="goAll()">
+                            <!--                            <li class="nav-item" role="presentation" onclick="goAll()">-->
-                                <button class="nav-link ivsgtTab"
+                            <!--                                <button class="nav-link ivsgtTab"-->
-                                        data-bs-toggle="tab" type="button" role="tab">총괄표></button>
+                            <!--                                        data-bs-toggle="tab" type="button" role="tab">총괄표></button>-->
-                            </li>
+                            <!--                            </li>-->
                             <li class="nav-item" role="presentation">
                                 <button class="nav-link ivsgtTab active"
                                         data-bs-toggle="tab" type="button" role="tab">관서별현황</button>
@@ -101,7 +101,7 @@
                                     </th:block>
                                 </tr>
                                 </thead>
-                                <tbody class="table-group-divider">
+                                <tbody class="table-group-divider" id="ResultRow">
                                 <tr class="faRptTr" th:each="info, i : ${list}">
                                     <td th:text="${info.getbudget_name_l1}"></td>
                                     <td th:text="${info.getbudget_name_l2}"></td>