From f07c1c71dbcec3ee89a337b84697c138b9a16365 Mon Sep 17 00:00:00 2001
From: FyloZ <fylozdev@gmail.com>
Date: Mon, 9 Mar 2020 23:42:41 -0400
Subject: [PATCH] =?UTF-8?q?Correction=20d'un=20bug=20d'affichage=20dans=20?=
 =?UTF-8?q?le=20cr=C3=A9ateur=20de=20produit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/material/creator.html | 17 +++++----
 .../resources/templates/material/edit.html    | 37 +++++++++++--------
 2 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/src/main/resources/templates/material/creator.html b/src/main/resources/templates/material/creator.html
index 9b04664..9d31e2b 100644
--- a/src/main/resources/templates/material/creator.html
+++ b/src/main/resources/templates/material/creator.html
@@ -9,7 +9,6 @@
 <header th:include="fragments.html :: header(false)"></header>
 <!-- Corps de la page -->
 <section>
-    <p th:if="${name != null}" th:text="#{material.success.created(${name})}" class="success"></p>
     <div th:include="fragments.html :: messages"></div>
 
     <h1 th:text="#{material.add.title}"></h1>
@@ -37,7 +36,6 @@
                         <input type="text"
                                class="rawInput"
                                th:field="*{name}"
-                               style="width: 145px"
                                required/>
                     </div>
                     <div style="display: flex; flex-direction: row">
@@ -46,7 +44,7 @@
                                id="quantity"
                                min="0"
                                name="quantity"
-                               onchange="calculateMilliliters(this.value, this.dataset.unit)"
+                               onchange="calculateMilliliters(this)"
                                required
                                step="0.001"
                                th:value="${material.inventoryQuantity}"
@@ -54,7 +52,7 @@
                                style="margin-right: 10px; width: 50px">
                         <!--Contient la quantité en millilitres-->
                         <input type="hidden"
-                               th:field="*{inventoryQuantity}"/>
+                               th:field="*{inventoryQuantity}" required/>
 
                         <select id="units"
                                 name="units"
@@ -74,7 +72,8 @@
                         <input id="simdut"
                                class="rawInput"
                                name="simdut"
-                               type="file"/>
+                               type="file"
+                               style="width: 145px"/>
                     </div>
                 </div>
             </div>
@@ -91,10 +90,14 @@
 
         const quantityElem = $("#quantity");
         quantityElem.data({unit: unitSelect.val()});
-        calculateMilliliters(quantityElem.val(), unitSelect.val());
+        calculateMilliliters(quantityElem);
     }
 
-    function calculateMilliliters(quantity, unit) {
+    function calculateMilliliters(input) {
+        input = $(input);
+        const quantity = input.val();
+        const unit = $("#units").val();
+
         let convertedQuantity = quantity;
 
         switch (unit) {
diff --git a/src/main/resources/templates/material/edit.html b/src/main/resources/templates/material/edit.html
index 850754f..f7e16e0 100644
--- a/src/main/resources/templates/material/edit.html
+++ b/src/main/resources/templates/material/edit.html
@@ -1,10 +1,7 @@
 <!DOCTYPE html>
 <html lang="fr" xmlns:th="http://www.thymeleaf.org">
 <head>
-    <th:block
-            th:include="fragments.html :: head(#{material.editing.title(${material.name})}, 'form')"></th:block>
-
-    <link th:href="@{|${baseUrl}/css/forms.css|}" rel="stylesheet"/>
+    <th:block th:include="fragments.html :: head(#{material.editing.title(${material.name})}, 'form')"></th:block>
 </head>
 <body>
 
@@ -14,7 +11,7 @@
 <section>
     <div th:include="fragments.html :: messages"></div>
 
-    <h1 class="materialCode" th:text="#{material.editing.title(${material.name})}"></h1>
+    <h1 th:text="#{material.editing.title(${material.name})}"></h1>
 
     <form th:action="@{/material/editor}" th:object="${material}" class="requireAuth" method="POST">
         <input type="hidden" th:field="*{id}"/>
@@ -29,10 +26,10 @@
                         <label th:for="${#ids.next('name')}" th:text="#{material.code} + ':'"></label>
                     </div>
                     <div>
-                        <label for="quantity" th:text="#{material.inventoryQuantity}"></label>
+                        <label for="quantity" th:text="#{material.inventoryQuantity} + ':'"></label>
                     </div>
                     <div>
-                        <label th:for="${#ids.next('materialType')}">Type de produit: </label>
+                        <label th:for="${#ids.next('materialType')}" th:text="#{material.type} + ':'"></label>
                     </div>
                     <div>
                         <label th:text="#{material.simdut} + ':'"></label>
@@ -43,20 +40,26 @@
                         <input type="number" th:field="*{id}" required readonly/>
                     </div>
                     <div>
-                        <input type="text" th:field="*{name}"/>
+                        <input type="text"
+                               class="rawInput"
+                               th:field="*{name}"
+                               required />
                     </div>
                     <div style="display: flex; flex-direction: row">
                         <input data-unit="mL"
+                               class="rawInput"
                                id="quantity"
                                min="0"
                                name="quantity"
-                               onchange="calculateMilliliters(this.value, this.dataset.unit)"
-                               step="0.01"
+                               required
+                               onchange="calculateMilliliters(this)"
+                               step="0.001"
                                th:value="${material.inventoryQuantity}"
                                type="number"
-                               style="margin-right: 10px; width: 50px">
+                               style="margin-right: 10px; width: 50px"
+                        >
                         <!--Contient la quantité en millilitres-->
-                        <input type="hidden" th:field="*{inventoryQuantity}"/>
+                        <input type="hidden" th:field="*{inventoryQuantity}" required/>
 
                         <select id="units"
                                 name="units"
@@ -109,11 +112,15 @@
     function switchUnits(unitSelect) {
         unitSelect = $(unitSelect);
         const quantityElem = $("#quantity");
-        quantityElem.data({unit: unitSelect.val()})
-        calculateMilliliters(quantityElem.val(), unitSelect.val());
+        quantityElem.data({unit: unitSelect.val()});
+        calculateMilliliters(quantityElem);
     }
 
-    function calculateMilliliters(quantity, unit) {
+    function calculateMilliliters(input) {
+        input = $(input);
+        const quantity = input.val();
+        const unit = $("#units").val();
+
         let convertedQuantity = quantity;
 
         switch (unit) {
