From e7d2a62b4a73d7450fd14bc9da9a7c916630026a Mon Sep 17 00:00:00 2001
From: Martin Eyben <martin.eyben@enseirb-matmeca.fr>
Date: Wed, 4 Dec 2024 21:22:03 +0000
Subject: [PATCH 1/3] fix: member template

---
 back-end/src/templates/member.ejs | 142 ++++++++++++++++--------------
 1 file changed, 77 insertions(+), 65 deletions(-)
diff --git a/back-end/src/templates/member.ejs b/back-end/src/templates/member.ejs
index 2886553..90de320 100644
--- a/back-end/src/templates/member.ejs
+++ b/back-end/src/templates/member.ejs
@@ -9,27 +9,30 @@
   </title>
 
   <%- include('partials/links.ejs') %>
-<style>
-#box-register-form {
-	display: flex;
-	flex-direction: column;
-	max-width: max(30vw, 60ch);
-	margin: auto;
-}
+    <style>
+      #box-register-form {
+        display: flex;
+        flex-direction: column;
+        max-width: max(30vw, 60ch);
+        margin: auto;
+      }
 
-#box-register-form select, #box-register-form input {
-	padding: .5rem 1rem;
-}
+      #box-register-form select,
+      #box-register-form input {
+        padding: .5rem 1rem;
+      }
 
 
-	i { color: var(--bg); }
-</style>
+      i {
+        color: var(--bg);
+      }
+    </style>
 
-<script>
-	function removeBox(id) {
-		fetch(window.location.origin + '/boxes/' + id + '/' + <%= member.id_member%>, { method: 'DELETE' }).then(r => window.location.reload());
-	}
-</script>
+    <script>
+      function removeBox(id) {
+        fetch(window.location.origin + '/boxes/' + id + '/' + <%= member.id_member %>, {method: 'DELETE'}).then(r => window.location.reload());
+      }
+    </script>
 </head>
 
 <body>
@@ -46,65 +49,67 @@
 
       <pre>
         id: <%= member.id_member%>
-        name: <%= member.name%>
+          name: <%= member.name%>
       </pre>
 
       <h2>Liste des boites enregistrées</h2>
 
-			<form name="title" action="/boxes/register" id="box-register-form" method="POST">
-				<input type="hidden" name="id_member" id="id_member" value="<%= member.id_member %>">
+      <form name="title" action="/boxes/register" id="box-register-form" method="POST">
+        <input type="hidden" name="id_member" id="id_member" value="<%= member.id_member %>">
 
-				<label for="id_box">id de la boite</label>
-				<select name="id_box" id="id_box">
+        <label for="id_box">id de la boite</label>
+        <select name="id_box" id="id_box">
 
           <% allboxes.forEach(function(box) { %>
-						<option value="<%=box.id%>"><%=box.id%></option>
-					<% }); %>
-				</select>
+            <option value="<%=box.id%>">
+              <%=box.id%>
+            </option>
+            <% }); %>
+        </select>
 
-				<label for="quantity">Quantité</label>
-				<input type="number" name="quantity" min="0" step="1" id="quantity">
+        <label for="quantity">Quantité</label>
+        <input type="number" name="quantity" min="0" step="1" id="quantity">
 
-				<input type="submit" value="Ajouter">
-			</form>
+        <input type="submit" value="Ajouter">
+      </form>
 
       <div class="table">
-      <table>
-        <thead>
-          <tr>
-            <th>Id</th>
-            <th>Nom</th>
-            <th>Nombre de pièces</th>
-            <th>Quantité</th>
-            <th></th>
-            <th></th>
-          </tr>
-        </thead>
-        <tbody>
-          <% boxes.forEach(function(box) { %>
+        <table>
+          <thead>
             <tr>
-              <td>
-                <%=box.first.id%>
-              </td>
-              <td>
-                <%=box.first.title%>
-              </td>
-              <td><%- box.first.pieces.reduce( (p,q)=> p + q.second, 0
-                  )
-                  -%></td>
-              <td>
-                <%=box.second%>
-              </td>
-              <td><a href="/boxes/byid/<%=box.first.id%>"><i class="fa-solid fa-eye"></i></a></td>
-							<td><button onclick="removeBox(<%=box.first.id%>)"><i class="fa-solid fa-trash"></i></button></td>
+              <th>Id</th>
+              <th>Nom</th>
+              <th>Nombre de pièces</th>
+              <th>Quantité</th>
+              <th></th>
+              <th></th>
             </tr>
+          </thead>
+          <tbody>
+            <% boxes.forEach(function(box) { %>
+              <tr>
+                <td>
+                  <%=box.first.id%>
+                </td>
+                <td>
+                  <%=box.first.title%>
+                </td>
+                <td><%- box.first.pieces.reduce( (p,q)=> p + q.second, 0
+                    )
+                    -%></td>
+                <td>
+                  <%=box.second%>
+                </td>
+                <td><a href="/boxes/byid/<%=box.first.id%>"><i class="fa-solid fa-eye"></i></a></td>
+                <td><button onclick="removeBox(<%=box.first.id%>)"><i class="fa-solid fa-trash"></i></button></td>
+              </tr>
 
-            <% }); %>
+              <% }); %>
 
-        </tbody>
-      </table>
+          </tbody>
+        </table>
 
-      <div class="box"></div>
+        <div class="box"></div>
       </div>
 
       <h2>
@@ -168,19 +173,26 @@
                 <td>
                   <%=model.name%>
                 </td>
-                <td><a href="/membres/byid/<%=model.creator%>"><i class="fa-solid fa-user"></i>
-                    <%=model.creator%>
-                  </a></td>
-                <td><a href="/models/byname/<%=model.name%>"><i class="fa-solid fa-eye"></i></a></td>
+                <% if (model.creator===undefined) {%>
+
+                  <td></td>
+                  <% } else {%>
+                    <td><a href="/membres/byid/<%=model.creator.id_member%>"><i class="fa-solid fa-user"></i>
+                        <%=model.creator.name%>
+                      </a></td>
+                    <% } %>
+                      <td><a href="/models/byname/<%=model.name%>"><i class="fa-solid fa-eye"></i></a></td>
               </tr>
 
               <% }); %>
 
+
+
           </tbody>
         </table>
         <div class="box"></div>
       </div>
-</main>
+    </main>
 </body>
 
 </html>

From 1546149b1b23dca4bfc18788cb05d653d3af4b3c Mon Sep 17 00:00:00 2001
From: Martin Eyben <martin.eyben@enseirb-matmeca.fr>
Date: Wed, 4 Dec 2024 21:30:19 +0000
Subject: [PATCH 2/3] fix: creator name for box

---
 back-end/src/templates/model.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/back-end/src/templates/model.ejs b/back-end/src/templates/model.ejs
index 6bbd65e..6d6e740 100644
--- a/back-end/src/templates/model.ejs
+++ b/back-end/src/templates/model.ejs
@@ -23,7 +23,7 @@
 
         id : <%= model.id %>
         url : <%= model.url %>
-        creator : <%= model.creator.name %>
+        creator : <%- model.creator !== undefined ? model.creator.name : 'system' %>
         inheritFrom : <%= model.inheritFrom %>
         <h2>Liste des pièces nécessaires</h2>
         <div class="table">

From a9faaa351fc3fe78e90bf6f1c0073aafdfc3c8d3 Mon Sep 17 00:00:00 2001
From: Martin Eyben <martin.eyben@enseirb-matmeca.fr>
Date: Wed, 4 Dec 2024 21:39:43 +0000
Subject: [PATCH 3/3] feat: rename box register

---
 back-end/src/templates/member.ejs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/back-end/src/templates/member.ejs b/back-end/src/templates/member.ejs
index 90de320..3db3425 100644
--- a/back-end/src/templates/member.ejs
+++ b/back-end/src/templates/member.ejs
@@ -52,27 +52,28 @@
           name: <%= member.name%>
       </pre>
 
-      <h2>Liste des boites enregistrées</h2>
 
+      <h2>Enregistrer une boite</h2>
       <form name="title" action="/boxes/register" id="box-register-form" method="POST">
         <input type="hidden" name="id_member" id="id_member" value="<%= member.id_member %>">
 
-        <label for="id_box">id de la boite</label>
+        <label for="id_box">Nom de la boite</label>
         <select name="id_box" id="id_box">
 
           <% allboxes.forEach(function(box) { %>
             <option value="<%=box.id%>">
-              <%=box.id%>
+              <%=box.title%>
             </option>
             <% }); %>
         </select>
 
         <label for="quantity">Quantité</label>
-        <input type="number" name="quantity" min="0" step="1" id="quantity">
+        <input type="number" name="quantity" min="1" step="1" id="quantity" value="1">
 
         <input type="submit" value="Ajouter">
       </form>
 
+      <h2>Liste des boites enregistrées</h2>
       <div class="table">
         <table>
           <thead>

- <%=box.first.id%> -	- <%=box.first.title%> -	<%- box.first.pieces.reduce( (p,q)=> p + q.second, 0 - ) - -%>	- <%=box.second%> -			Id	Nom	Nombre de pièces	Quantité
+ <%=box.first.id%> +	+ <%=box.first.title%> +	<%- box.first.pieces.reduce( (p,q)=> p + q.second, 0 + ) + -%>	+ <%=box.second%> +