Merge remote-tracking branch 'origin/master'

src/main/webapp/WEB-INF/views/stock/list.jsp

@@ -9,8 +9,11 @@
     <link rel="stylesheet" href="base.css">
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
     <script src="https://unpkg.com/feather-icons"></script>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet"
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
+          integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
+            integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
+            crossorigin="anonymous"></script>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>재고 관리</title>
 </head>
@@ -23,12 +26,20 @@
 
     <ul class="nav nav-tabs" id="myTab" role="tablist">
         <li class="nav-item" role="presentation">
-            <button class="nav-link active" id="home-tab" data-bs-toggle="tab" data-bs-target="#home" type="button" role="tab" aria-controls="home" aria-selected="true">재고</button>
+            <button class="nav-link active" id="home-tab" data-bs-toggle="tab" data-bs-target="#home" type="button"
+                    role="tab" aria-controls="home" aria-selected="true">재고
+            </button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link" id="profile-tab" data-bs-toggle="tab" data-bs-target="#profile" type="button" role="tab" aria-controls="profile" aria-selected="false">부족한 재고</button>
+            <button class="nav-link" id="profile-tab" data-bs-toggle="tab" data-bs-target="#profile" type="button"
+                    role="tab" aria-controls="profile" aria-selected="false">부족한 재고
+            </button>
         </li>
     </ul>
+
+
+
+    <!-- 탭 1 재고 -->
     <div class="tab-content" id="myTabContent">
         <div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="home-tab">
             <div class="container-fluid">
@@ -36,18 +47,19 @@
                     <form>
                         <div class="input-group mb-3 w-30 col-centered">
                             <div class="w-25">
-                                <select class="form-select" name="searchn" id="searchn">
+                                <select class="form-select" name="searchn1" id="searchn1">
                                     <option value="0">제품명</option>
                                     <option value="1">카테고리</option>
                                     <option value="2">재고수</option>
                                 </select>
                             </div>
-                            <input type="text" id="search" name="search" class="form-control" aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
+                            <input type="text" id="search1" name="search" class="form-control"
+                                   aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
                             <button class="btn btn-info" type="button" id="searchBtn">검색</button>
 
                             <!-- 페이징작업용 -->
-                            <input type="hidden" id="searchn1" value="${searchn}">
+                            <input type="hidden" id="searchn11" value="${searchn1}">
-                            <input type="hidden" id="search1" value="${search}">
+                            <input type="hidden" id="search11" value="${search1}">
                             <!-- 페이징작업용 -->
 
                         </div>
@@ -67,7 +79,7 @@
                             </tr>
                             </thead>
                             <tbody>
-                            <c:forEach items="${slist }" var="dto">
+                            <c:forEach items="${slist1 }" var="dto">
                                 <tr class="detailTr col-5" data-id="${dto.id}">
                                     <td class="col-1">${start} <c:set var="start" value="${start +1 }"/></td>
                                     <td class="col-1">${dto.productName }</td>
@@ -90,21 +102,26 @@
                         <nav>
                             <ul class="pagination">
 
-                                <c:if test="${begin > pageNum }">
+
+                                    <c:if test="${begin1 > pageNum1 }">
                                         <li class="page-item">
-                                        <a href="javascript:void(0);" class="page-link" onclick="pageingFunction(this.id)" id="${begin - 1 }">&lt;</a>
+                                            <a href="javascript:void(0);" class="page-link" id="before1"
+                                               value="${begin1 - 1 }">&lt;</a>
                                         </li>
                                     </c:if>
-                                <c:forEach begin="${begin }" end="${end }" var="i">
+                                    <c:forEach begin="${begin1 }" end="${end1 }" var="i">
-                                    <li class="page-item <c:if test="${p == i}"> active </c:if>">
+                                        <li class="page-item <c:if test="${p1 == i}"> active </c:if>">
-                                        <a href="javascript:void(0);" class="page-link " onclick="pageingFunction(this.id); return false;" id="${i }">${i }</a>
+                                            <a href="javascript:void(0);" class="page-link " id="pageNow1"
+                                               value="${i }">${i }</a>
                                         </li>
                                     </c:forEach>
-                                <c:if test="${end < totalPages }">
+                                    <c:if test="${end1 < totalPages1 }">
                                         <li class="page-item">
-                                        <a href="javascript:void(0);" class="page-link" onclick="pageingFunction(this.id)" id="${end + 1 }">&gt;</a>
+                                            <a href="javascript:void(0);" class="page-link" id="after1" value="${end1 + 1 }">&gt;</a>
                                         </li>
                                     </c:if>
+
+
                             </ul>
                         </nav>
                     </div>
@@ -129,7 +146,8 @@
                                     <option value="2">재고수</option>
                                 </select>
                             </div>
-                            <input type="text" id="search2" name="search" class="form-control" aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
+                            <input type="text" id="search2" name="search" class="form-control"
+                                   aria-label="Text input with dropdown button" placeholder="검색어를 입력하세요">
                             <button class="btn btn-info" type="button" id="searchBtn2">검색</button>
 
                             <!-- 페이징작업용 -->
@@ -177,21 +195,27 @@
                         <nav>
                             <ul class="pagination">
 
+
+
                                 <c:if test="${begin2 > pageNum2 }">
                                     <li class="page-item">
-                                        <a href="javascript:void(0);" class="page-link" onclick="pageingFunction2(this.id)" id="${begin2 - 1 }">&lt;</a>
+                                        <a href="javascript:void(0);" class="page-link" id="before2"
+                                           value="${begin2 - 1 }">&lt;</a>
                                     </li>
                                 </c:if>
                                 <c:forEach begin="${begin2 }" end="${end2 }" var="i">
                                     <li class="page-item <c:if test="${p2 == i}"> active </c:if>">
-                                        <a href="javascript:void(0);" class="page-link " onclick="pageingFunction2(this.id); return false;" id="${i }">${i }</a>
+                                        <a href="javascript:void(0);" class="page-link " id="pageNow2"
+                                           value="${i }">${i }</a>
                                     </li>
                                 </c:forEach>
                                 <c:if test="${end2 < totalPages2 }">
                                     <li class="page-item">
-                                        <a href="javascript:void(0);" class="page-link" onclick="pageingFunction2(this.id)" id="${end2 + 1 }">&gt;</a>
+                                        <a href="javascript:void(0);" class="page-link" id="after2" value="${end2 + 1 }">&gt;</a>
                                     </li>
                                 </c:if>
+
+
                             </ul>
                         </nav>
                     </div>
@@ -249,140 +273,116 @@
         });
 
         //탭 1 검색기능
-        $("#searchBtn").on("click",function(){
+        $("#searchBtn, #searchBtn2").on("click", function () {
 
-            var searchn = $("#searchn").val();
-            var search = $("#search").val();
-
-
-            var form = document.createElement("form");
-            form.action = "/stock/list";
-            form.method = "get";
-
-            var input1 = document.createElement("input");
-            input1.type = "hidden";
-            input1.name = "searchn";
-            input1.value = searchn;
-            form.appendChild(input1);
-
-            var input2 = document.createElement("input");
-            input2.type = "hidden";
-            input2.name = "search";
-            input2.value = search;
-            form.appendChild(input2);
-
-            var input3 = document.createElement("input");
-            input3.type = "hidden";
-            input3.name = "p";
-            input3.value = 1;
-            form.appendChild(input3);
-
-            document.body.appendChild(form);
-            form.submit();
-
-        });
-
-
-        //탭 2 검색기능
-        $("#searchBtn2").on("click",function(){
-
-            var searchn = $("#searchn2").val();
-            var search = $("#search2").val();
-
-
-            var form = document.createElement("form");
-            form.action = "/stock/list2";
-            form.method = "get";
-
-            var input1 = document.createElement("input");
-            input1.type = "hidden";
-            input1.name = "searchn";
-            input1.value = searchn;
-            form.appendChild(input1);
-
-            var input2 = document.createElement("input");
-            input2.type = "hidden";
-            input2.name = "search";
-            input2.value = search;
-            form.appendChild(input2);
-
-            var input3 = document.createElement("input");
-            input3.type = "hidden";
-            input3.name = "p";
-            input3.value = 1;
-            form.appendChild(input3);
-
-            document.body.appendChild(form);
-            form.submit();
-
-        });
-
-
-
-    });//ready
-
-
-    //탭 1 페이징
-    function pageingFunction(clickedId){
             var searchn1 = $("#searchn1").val();
             var search1 = $("#search1").val();
 
+            var searchn2 = $("#searchn2").val();
+            var search2 = $("#search2").val();
+
+
             var form = document.createElement("form");
             form.action = "/stock/list";
             form.method = "get";
 
             var input1 = document.createElement("input");
             input1.type = "hidden";
-        input1.name = "searchn";
+            input1.name = "searchn1";
             input1.value = searchn1;
             form.appendChild(input1);
 
             var input2 = document.createElement("input");
             input2.type = "hidden";
-        input2.name = "search";
+            input2.name = "search1";
             input2.value = search1;
             form.appendChild(input2);
 
             var input3 = document.createElement("input");
             input3.type = "hidden";
-        input3.name = "p";
+            input3.name = "p1";
-        input3.value = clickedId;
+            input3.value = 1;
             form.appendChild(input3);
 
+
+            var input4 = document.createElement("input");
+            input4.type = "hidden";
+            input4.name = "searchn2";
+            input4.value = searchn2;
+            form.appendChild(input4);
+
+            var input5 = document.createElement("input");
+            input5.type = "hidden";
+            input5.name = "search2";
+            input5.value = search2;
+            form.appendChild(input5);
+
+            var input6 = document.createElement("input");
+            input6.type = "hidden";
+            input6.name = "p2";
+            input6.value = 1;
+            form.appendChild(input6);
+
             document.body.appendChild(form);
             form.submit();
-    }
 
-    //탭 2 페이징
+        });
-    function pageingFunction2(clickedId){
+
+
+        $("#before1, #pageNow1, #after1, #before2, #pageNow2, #after2").on("click", function () {
+            var searchn1 = $("#searchn11").val();
+            var search1 = $("#search11").val();
+
             var searchn2 = $("#searchn22").val();
             var search2 = $("#search22").val();
 
             var form = document.createElement("form");
-        form.action = "/stock/list2";
+            form.action = "/stock/list";
             form.method = "get";
 
             var input1 = document.createElement("input");
             input1.type = "hidden";
-        input1.name = "searchn";
+            input1.name = "searchn1";
-        input1.value = searchn2;
+            input1.value = searchn1;
             form.appendChild(input1);
 
             var input2 = document.createElement("input");
             input2.type = "hidden";
-        input2.name = "search";
+            input2.name = "search1";
-        input2.value = search2;
+            input2.value = search1;
             form.appendChild(input2);
 
             var input3 = document.createElement("input");
             input3.type = "hidden";
-        input3.name = "p";
+            input3.name = "p1";
             input3.value = clickedId;
             form.appendChild(input3);
 
+
+
+
+            var input4 = document.createElement("input");
+            input4.type = "hidden";
+            input4.name = "searchn2";
+            input4.value = searchn2;
+            form.appendChild(input4);
+
+            var input5 = document.createElement("input");
+            input5.type = "hidden";
+            input5.name = "search2";
+            input5.value = search2;
+            form.appendChild(input5);
+
+            var input6 = document.createElement("input");
+            input6.type = "hidden";
+            input6.name = "p2";
+            input6.value = clickedId;
+            form.appendChild(input6);
+
             document.body.appendChild(form);
             form.submit();
-    }
+        });
+    });
 </script>
 </body>
 </html>