From ff8887b6e85c223c82f5972a56246fcd8614caad Mon Sep 17 00:00:00 2001
From: Nguyen Son <152074875+thson58@users.noreply.github.com>
Date: Thu, 7 Mar 2024 14:28:05 +0700
Subject: [PATCH 1/4] fix add customer

---
 .../jsp/management/customer/add-customer.jsp  | 66 ++++++++++++++++---
 1 file changed, 56 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/view/jsp/management/customer/add-customer.jsp b/src/main/webapp/view/jsp/management/customer/add-customer.jsp
index 7bb9264..0697a8d 100644
--- a/src/main/webapp/view/jsp/management/customer/add-customer.jsp
+++ b/src/main/webapp/view/jsp/management/customer/add-customer.jsp
@@ -12,9 +12,9 @@
         <link rel="icon" type="image/png" sizes="512x512" href="<%=request.getContextPath()%>/view/assets/images/favicon/favicon.png">
 
         <link rel="stylesheet" href="<%=request.getContextPath()%>/view/assets/css/bootstrap.min.css">
-        <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i&amp;display=swap">
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/line-awesome/1.3.0/line-awesome/css/line-awesome.min.css">
+        <link rel="stylesheet" href="https://f...content-available-to-author-only...s.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i&amp;display=swap">
+        <link rel="stylesheet" href="https://c...content-available-to-author-only...e.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
+        <link rel="stylesheet" href="https://c...content-available-to-author-only...e.com/ajax/libs/line-awesome/1.3.0/line-awesome/css/line-awesome.min.css">
         <link rel="stylesheet" href="<%=request.getContextPath()%>/view/assets/css/animate.min.css">
 
     </head>
@@ -36,20 +36,50 @@
                                                 <p class="text-primary m-0 fw-bold">Thêm khách hàng mới</p>
                                             </div>
                                             <div class="card-body">
-                                                <form action="./add-customer" method="post">
+                                                <form action="./add-customer" method="post" id="form-add-customer">
                                                     <div class="row">
                                                         <div class="col">
-                                                            <div class="mb-3"><label class="form-label" for="name"><strong>Tên khách hàng</strong></label><input class="form-control" type="text" id="name" placeholder="Nhập tên khách hàng" name="name"></div>
+                                                            <div class="mb-3 form-group">
+                                                                <label class="form-label" for="name">
+                                                                    <strong>Tên khách hàng</strong>
+                                                                </label>
+                                                                <div class="mb-3 form-group">
+                                                                    <input class="form-control" type="text" id="name-customer" placeholder="Nhập tên khách hàng" name="name" >
+                                                                    <span class="form-message text-danger"></span>
+                                                                </div>
+                                                            </div>
                                                         </div>
                                                         <div class="col">
-                                                            <div class="mb-3"><label class="form-label" for="code"><strong>Mã khách hàng</strong></label><input class="form-control" type="text" id="code" placeholder="Mã khách hàng" name="code"></div>
+                                                            <div class="mb-3">
+                                                                <label class="form-label" for="code">
+                                                                    <strong>Mã khách hàng</strong>
+                                                                </label>
+                                                                <div class="mb-3 form-group">
+                                                                    <input class="form-control" type="text" id="code-customer" placeholder="Mã khách hàng" name="code" >
+                                                                    <span class="form-message text-danger"></span>
+                                                                </div> 
+                                                            </div>
                                                         </div>
                                                     </div>
                                                     <div class="mb-3">
-                                                        <div class="mb-3"><label class="form-label" for="address"><strong>Địa chỉ</strong></label><input class="form-control" type="text" id="address" placeholder="Nhập địa chỉ của khách hàng" name="address"></div>
-                                                        <div class="mb-3"><label class="form-label" for="email"><strong>Email</strong></label><input class="form-control" type="email" id="email" placeholder="Nhập email khách hàng" name="email"></div>
-
-                                                        <a class="btn btn-primary btn-sm" href="customer">Quay lại</a>
+                                                        <div class="mb-3">
+                                                            <label class="form-label" for="address">
+                                                                <strong>Địa chỉ</strong>
+                                                            </label>
+                                                            <div class="mb-3 form-group">
+                                                                <input class="form-control" type="text" id="address-customer" placeholder="Nhập địa chỉ của khách hàng" name="address"  >
+                                                                <span class="form-message text-danger"></span>
+                                                            </div>
+                                                        </div>
+                                                        <div class="mb-3">
+                                                            <label class="form-label" for="email">
+                                                                <strong>Email</strong>
+                                                            </label>
+                                                            <div class="mb-3 form-group">
+                                                                <input class="form-control" type="email" id="email-customer" placeholder="Nhập email khách hàng" name="email"  >
+                                                                <span class="form-message text-danger"></span>
+                                                            </div>
+                                                        </div>
                                                         <button class="btn btn-primary btn-sm" type="submit">Lưu lại</button>
                                                     </div>
                                                 </form>
@@ -68,7 +98,23 @@
         <script src="<%=request.getContextPath()%>/view/assets/js/bootstrap.min.js"></script>
         <script src="<%=request.getContextPath()%>/view/assets/js/bs-init.js"></script>
         <script src="<%=request.getContextPath()%>/view/assets/js/theme.js"></script>
+        <script src="<%=request.getContextPath()%>/view/assets/js/validate/validator.js"></script>
+
+        <script>
+            Validator({
+                form: '#form-add-customer',
+                errorSelector: '.form-message',
+                formGroupSelector: '.form-group',
+                rules: [
+                    Validator.isRequired('#name-customer', 'Vui lòng nhập tên khách hàng!'),
+                    Validator.isRequired('#code-customer', 'Vui lòng nhập mã khách hàng!'),
+                    Validator.isRequired('#address-customer', 'Vui lòng nhập mã khách hàng!'),
+                    Validator.isRequired('#email-customer', 'Vui lòng nhập mã khách hàng!')
+
 
+                ]
+            });
+        </script>
     </body>
 
 </html>
\ No newline at end of file

From c79e35cf4b4edd0b35d40f7a30a61549d423dfa4 Mon Sep 17 00:00:00 2001
From: Nguyen Son <152074875+thson58@users.noreply.github.com>
Date: Sun, 10 Mar 2024 14:36:17 +0700
Subject: [PATCH 2/4] =?UTF-8?q?=C4=91=E1=BB=8Ba=20ch=E1=BB=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/view/jsp/management/customer/add-customer.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/view/jsp/management/customer/add-customer.jsp b/src/main/webapp/view/jsp/management/customer/add-customer.jsp
index 0697a8d..2813d0c 100644
--- a/src/main/webapp/view/jsp/management/customer/add-customer.jsp
+++ b/src/main/webapp/view/jsp/management/customer/add-customer.jsp
@@ -108,7 +108,7 @@
                 rules: [
                     Validator.isRequired('#name-customer', 'Vui lòng nhập tên khách hàng!'),
                     Validator.isRequired('#code-customer', 'Vui lòng nhập mã khách hàng!'),
-                    Validator.isRequired('#address-customer', 'Vui lòng nhập mã khách hàng!'),
+                    Validator.isRequired('#address-customer', 'Vui lòng nhập địa chỉ khách hàng!'),
                     Validator.isRequired('#email-customer', 'Vui lòng nhập mã khách hàng!')
 
 

From 7596231301962ae0fd7be14252210e6e2b1e1856 Mon Sep 17 00:00:00 2001
From: Nguyen Son <152074875+thson58@users.noreply.github.com>
Date: Sun, 10 Mar 2024 14:39:17 +0700
Subject: [PATCH 3/4] email

---
 src/main/webapp/view/jsp/management/customer/add-customer.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/view/jsp/management/customer/add-customer.jsp b/src/main/webapp/view/jsp/management/customer/add-customer.jsp
index 2813d0c..a3439ab 100644
--- a/src/main/webapp/view/jsp/management/customer/add-customer.jsp
+++ b/src/main/webapp/view/jsp/management/customer/add-customer.jsp
@@ -109,7 +109,7 @@
                     Validator.isRequired('#name-customer', 'Vui lòng nhập tên khách hàng!'),
                     Validator.isRequired('#code-customer', 'Vui lòng nhập mã khách hàng!'),
                     Validator.isRequired('#address-customer', 'Vui lòng nhập địa chỉ khách hàng!'),
-                    Validator.isRequired('#email-customer', 'Vui lòng nhập mã khách hàng!')
+                    Validator.isRequired('#email-customer', 'Vui lòng nhập email khách hàng!')
 
 
                 ]

From a6cd85754b5f38fc9458853e89bbad66e8e7a696 Mon Sep 17 00:00:00 2001
From: Nguyen Son <152074875+thson58@users.noreply.github.com>
Date: Sun, 10 Mar 2024 14:57:57 +0700
Subject: [PATCH 4/4] =?UTF-8?q?s=E1=BB=ADa=20th=C3=B4ng=20b=C3=A1o=20null?=
 =?UTF-8?q?=20:=20=C4=91=E1=BB=8Ba=20ch=E1=BB=89=20,=20email?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsp/management/customer/add-customer.jsp  | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/view/jsp/management/customer/add-customer.jsp b/src/main/webapp/view/jsp/management/customer/add-customer.jsp
index fa1c6be..036c25e 100644
--- a/src/main/webapp/view/jsp/management/customer/add-customer.jsp
+++ b/src/main/webapp/view/jsp/management/customer/add-customer.jsp
@@ -69,17 +69,23 @@
                                                     <div class="mb-3">
                                                         <div class="mb-3">
                                                             <div class="mb-3">
-                                                                <label class="form-label" for="address">
-                                                                    <strong>Địa chỉ</strong>
-                                                                </label>
-                                                                <input class="form-control" type="text" id="address" placeholder="Nhập địa chỉ của khách hàng" name="address" value="<%= (error != null && customer != null) ? customer.getAddress() : ""%>">
+                                                            <label class="form-label" for="address">
+                                                                <strong>Địa chỉ</strong>
+                                                            </label>
+                                                            <div class="mb-3 form-group">
+                                                                <input class="form-control" type="text" id="address-customer" placeholder="Nhập địa chỉ của khách hàng" name="address"  >
+                                                                <span class="form-message text-danger"></span>
                                                             </div>
-                                                            <div class="mb-3">
-                                                                <label class="form-label" for="email">
-                                                                    <strong>Email</strong>
-                                                                </label>
-                                                                <input class="form-control" type="email" id="email" placeholder="Nhập email khách hàng" name="email">
+                                                        </div>
+                                                        <div class="mb-3">
+                                                            <label class="form-label" for="email">
+                                                                <strong>Email</strong>
+                                                            </label>
+                                                            <div class="mb-3 form-group">
+                                                                <input class="form-control" type="email" id="email-customer" placeholder="Nhập email khách hàng" name="email"  >
+                                                                <span class="form-message text-danger"></span>
                                                             </div>
+                                                        </div>
                                                                 <%
                                                                     if(error != null) {
                                                                 %>