diff --git a/build/web/WEB-INF/createUserJSP.jsp b/build/web/WEB-INF/createUserJSP.jsp index 323d926..63c2b1b 100644 --- a/build/web/WEB-INF/createUserJSP.jsp +++ b/build/web/WEB-INF/createUserJSP.jsp @@ -28,7 +28,7 @@ uri="http://java.sun.com/jsp/jstl/core" %> <div class="p-4 border-2 border-gray-200 border-dashed rounded-lg dark:border-gray-700 mt-14" > - <h1>Créer un nouvelle utilisateur :</h1> + <h1>Créer un nouveau salarié :</h1> <form class="space-x-[1dvh] w-full flex" action="CreateUserServlet" @@ -105,107 +105,6 @@ uri="http://java.sun.com/jsp/jstl/core" %> </div> </div> <div class="flex flex-col"> - <div class="w-[20dvw]"> - <label - for="email" - class="block mb-2 text-sm font-medium text-gray-900" - >Email :</label - > - <div class="relative mb-6"> - <div - class="absolute inset-y-0 start-0 flex items-center ps-3.5 pointer-events-none" - > - <svg - class="w-4 h-4 text-gray-500" - aria-hidden="true" - xmlns="http://www.w3.org/2000/svg" - fill="currentColor" - viewBox="0 0 20 16" - > - <path - d="m10.036 8.278 9.258-7.79A1.979 1.979 0 0 0 18 0H2A1.987 1.987 0 0 0 .641.541l9.395 7.737Z" - /> - <path - d="M11.241 9.817c-.36.275-.801.425-1.255.427-.428 0-.845-.138-1.187-.395L0 2.6V14a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2V2.5l-8.759 7.317Z" - /> - </svg> - </div> - <input - type="text" - id="email" - name="email" - class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full ps-10 p-2.5" - placeholder="name@gmail.com" - /> - </div> - </div> - <div class="w-[20dvw]"> - <label - for="username" - class="block mb-2 text-sm font-medium text-gray-900" - >Username :</label - > - <div class="relative mb-6"> - <div - class="absolute inset-y-0 start-0 flex items-center ps-3.5 pointer-events-none" - > - <svg - class="w-4 h-4 text-gray-500" - aria-hidden="true" - xmlns="http://www.w3.org/2000/svg" - fill="currentColor" - viewBox="0 0 20 16" - > - <path - d="m10.036 8.278 9.258-7.79A1.979 1.979 0 0 0 18 0H2A1.987 1.987 0 0 0 .641.541l9.395 7.737Z" - /> - <path - d="M11.241 9.817c-.36.275-.801.425-1.255.427-.428 0-.845-.138-1.187-.395L0 2.6V14a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2V2.5l-8.759 7.317Z" - /> - </svg> - </div> - <input - type="text" - id="username" - name="username" - class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full ps-10 p-2.5" - placeholder="utilisateur..." - /> - </div> - </div> - </div> - <div class="flex flex-col"> - <div class="w-[20dvw]"> - <label - for="password" - class="block mb-2 text-sm font-medium text-gray-900" - >Mot de passe :</label - > - <div class="relative mb-6"> - <div - class="absolute inset-y-0 start-0 flex items-center ps-3.5 pointer-events-none" - > - <svg - class="w-4 h-4 text-gray-500" - aria-hidden="true" - xmlns="http://www.w3.org/2000/svg" - fill="currentColor" - viewBox="0 0 20 20" - > - <path - d="M10 0a10 10 0 1 0 10 10A10.011 10.011 0 0 0 10 0Zm0 5a3 3 0 1 1 0 6 3 3 0 0 1 0-6Zm0 13a8.949 8.949 0 0 1-4.951-1.488A3.987 3.987 0 0 1 9 13h2a3.987 3.987 0 0 1 3.951 3.512A8.949 8.949 0 0 1 10 18Z" - /> - </svg> - </div> - <input - type="password" - id="password" - name="password" - class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full ps-10 p-2.5" - placeholder="mot de passe..." - /> - </div> - </div> <div class="w-[20dvw]"> <label for="password" @@ -248,7 +147,7 @@ uri="http://java.sun.com/jsp/jstl/core" %> <span class="relative px-5 py-2.5 transition-all ease-in duration-75 bg-white rounded-md group-hover:bg-opacity-0" > - Creer l'utilisateur + Créer le salarié </span> </button> </div> @@ -256,10 +155,10 @@ uri="http://java.sun.com/jsp/jstl/core" %> </div> </form> <c:if test="${param.sucess == true}" var="resultatTest" scope="page"> - <h1>L'utilisateur a bien était créer !</h1> + <h1>Le salarie a bien était créer !</h1> </c:if> <c:if test="${param.sucess == false}" var="resultatTest" scope="page"> - <h1>Erreur dans la création de l'utilisateur.</h1> + <h1>Erreur dans la création du salarié.</h1> </c:if> </div> </div> diff --git a/build/web/WEB-INF/jspf/sidebarJSP.jspf b/build/web/WEB-INF/jspf/sidebarJSP.jspf index 7d15f43..c2ec3dc 100644 --- a/build/web/WEB-INF/jspf/sidebarJSP.jspf +++ b/build/web/WEB-INF/jspf/sidebarJSP.jspf @@ -117,28 +117,7 @@ > <div class="h-full px-3 pb-4 overflow-y-auto bg-white dark:bg-gray-800"> <ul class="space-y-2 font-medium"> - <li> - <a - href="#" - class="flex items-center p-2 text-gray-900 rounded-lg dark:text-white hover:bg-gray-100 dark:hover:bg-gray-700 group" - > - <svg - class="w-5 h-5 text-gray-500 transition duration-75 dark:text-gray-400 group-hover:text-gray-900 dark:group-hover:text-white" - aria-hidden="true" - xmlns="http://www.w3.org/2000/svg" - fill="currentColor" - viewBox="0 0 22 21" - > - <path - d="M16.975 11H10V4.025a1 1 0 0 0-1.066-.998 8.5 8.5 0 1 0 9.039 9.039.999.999 0 0 0-1-1.066h.002Z" - /> - <path - d="M12.5 0c-.157 0-.311.01-.565.027A1 1 0 0 0 11 1.02V10h8.975a1 1 0 0 0 1-.935c.013-.188.028-.374.028-.565A8.51 8.51 0 0 0 12.5 0Z" - /> - </svg> - <span class="ms-3">Dashboard</span> - </a> - </li> + <li> <a href="EmployesAttendanceServlet" diff --git a/web/WEB-INF/createUserJSP.jsp b/web/WEB-INF/createUserJSP.jsp index 323d926..63c2b1b 100644 --- a/web/WEB-INF/createUserJSP.jsp +++ b/web/WEB-INF/createUserJSP.jsp @@ -28,7 +28,7 @@ uri="http://java.sun.com/jsp/jstl/core" %> <div class="p-4 border-2 border-gray-200 border-dashed rounded-lg dark:border-gray-700 mt-14" > - <h1>Créer un nouvelle utilisateur :</h1> + <h1>Créer un nouveau salarié :</h1> <form class="space-x-[1dvh] w-full flex" action="CreateUserServlet" @@ -105,107 +105,6 @@ uri="http://java.sun.com/jsp/jstl/core" %> </div> </div> <div class="flex flex-col"> - <div class="w-[20dvw]"> - <label - for="email" - class="block mb-2 text-sm font-medium text-gray-900" - >Email :</label - > - <div class="relative mb-6"> - <div - class="absolute inset-y-0 start-0 flex items-center ps-3.5 pointer-events-none" - > - <svg - class="w-4 h-4 text-gray-500" - aria-hidden="true" - xmlns="http://www.w3.org/2000/svg" - fill="currentColor" - viewBox="0 0 20 16" - > - <path - d="m10.036 8.278 9.258-7.79A1.979 1.979 0 0 0 18 0H2A1.987 1.987 0 0 0 .641.541l9.395 7.737Z" - /> - <path - d="M11.241 9.817c-.36.275-.801.425-1.255.427-.428 0-.845-.138-1.187-.395L0 2.6V14a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2V2.5l-8.759 7.317Z" - /> - </svg> - </div> - <input - type="text" - id="email" - name="email" - class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full ps-10 p-2.5" - placeholder="name@gmail.com" - /> - </div> - </div> - <div class="w-[20dvw]"> - <label - for="username" - class="block mb-2 text-sm font-medium text-gray-900" - >Username :</label - > - <div class="relative mb-6"> - <div - class="absolute inset-y-0 start-0 flex items-center ps-3.5 pointer-events-none" - > - <svg - class="w-4 h-4 text-gray-500" - aria-hidden="true" - xmlns="http://www.w3.org/2000/svg" - fill="currentColor" - viewBox="0 0 20 16" - > - <path - d="m10.036 8.278 9.258-7.79A1.979 1.979 0 0 0 18 0H2A1.987 1.987 0 0 0 .641.541l9.395 7.737Z" - /> - <path - d="M11.241 9.817c-.36.275-.801.425-1.255.427-.428 0-.845-.138-1.187-.395L0 2.6V14a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2V2.5l-8.759 7.317Z" - /> - </svg> - </div> - <input - type="text" - id="username" - name="username" - class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full ps-10 p-2.5" - placeholder="utilisateur..." - /> - </div> - </div> - </div> - <div class="flex flex-col"> - <div class="w-[20dvw]"> - <label - for="password" - class="block mb-2 text-sm font-medium text-gray-900" - >Mot de passe :</label - > - <div class="relative mb-6"> - <div - class="absolute inset-y-0 start-0 flex items-center ps-3.5 pointer-events-none" - > - <svg - class="w-4 h-4 text-gray-500" - aria-hidden="true" - xmlns="http://www.w3.org/2000/svg" - fill="currentColor" - viewBox="0 0 20 20" - > - <path - d="M10 0a10 10 0 1 0 10 10A10.011 10.011 0 0 0 10 0Zm0 5a3 3 0 1 1 0 6 3 3 0 0 1 0-6Zm0 13a8.949 8.949 0 0 1-4.951-1.488A3.987 3.987 0 0 1 9 13h2a3.987 3.987 0 0 1 3.951 3.512A8.949 8.949 0 0 1 10 18Z" - /> - </svg> - </div> - <input - type="password" - id="password" - name="password" - class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full ps-10 p-2.5" - placeholder="mot de passe..." - /> - </div> - </div> <div class="w-[20dvw]"> <label for="password" @@ -248,7 +147,7 @@ uri="http://java.sun.com/jsp/jstl/core" %> <span class="relative px-5 py-2.5 transition-all ease-in duration-75 bg-white rounded-md group-hover:bg-opacity-0" > - Creer l'utilisateur + Créer le salarié </span> </button> </div> @@ -256,10 +155,10 @@ uri="http://java.sun.com/jsp/jstl/core" %> </div> </form> <c:if test="${param.sucess == true}" var="resultatTest" scope="page"> - <h1>L'utilisateur a bien était créer !</h1> + <h1>Le salarie a bien était créer !</h1> </c:if> <c:if test="${param.sucess == false}" var="resultatTest" scope="page"> - <h1>Erreur dans la création de l'utilisateur.</h1> + <h1>Erreur dans la création du salarié.</h1> </c:if> </div> </div> diff --git a/web/WEB-INF/jspf/sidebarJSP.jspf b/web/WEB-INF/jspf/sidebarJSP.jspf index 7d15f43..c2ec3dc 100644 --- a/web/WEB-INF/jspf/sidebarJSP.jspf +++ b/web/WEB-INF/jspf/sidebarJSP.jspf @@ -117,28 +117,7 @@ > <div class="h-full px-3 pb-4 overflow-y-auto bg-white dark:bg-gray-800"> <ul class="space-y-2 font-medium"> - <li> - <a - href="#" - class="flex items-center p-2 text-gray-900 rounded-lg dark:text-white hover:bg-gray-100 dark:hover:bg-gray-700 group" - > - <svg - class="w-5 h-5 text-gray-500 transition duration-75 dark:text-gray-400 group-hover:text-gray-900 dark:group-hover:text-white" - aria-hidden="true" - xmlns="http://www.w3.org/2000/svg" - fill="currentColor" - viewBox="0 0 22 21" - > - <path - d="M16.975 11H10V4.025a1 1 0 0 0-1.066-.998 8.5 8.5 0 1 0 9.039 9.039.999.999 0 0 0-1-1.066h.002Z" - /> - <path - d="M12.5 0c-.157 0-.311.01-.565.027A1 1 0 0 0 11 1.02V10h8.975a1 1 0 0 0 1-.935c.013-.188.028-.374.028-.565A8.51 8.51 0 0 0 12.5 0Z" - /> - </svg> - <span class="ms-3">Dashboard</span> - </a> - </li> + <li> <a href="EmployesAttendanceServlet"