From e4cb8c33000c0be35b9a693a51c32fc7f2197897 Mon Sep 17 00:00:00 2001
From: Alessandre Laguierce <alessandre.laguierce@enseirb-matmeca.fr>
Date: Mon, 2 Dec 2024 14:36:48 +0100
Subject: [PATCH] feat: add average pieces per box

---
 back-end/src/services/box.service.ts    | 2 --
 back-end/src/services/pieces.service.ts | 1 -
 back-end/src/templates/box.ejs          | 2 +-
 back-end/src/templates/boxes.ejs        | 6 ++++++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/back-end/src/services/box.service.ts b/back-end/src/services/box.service.ts
index 648f6e0..ce03d1b 100644
--- a/back-end/src/services/box.service.ts
+++ b/back-end/src/services/box.service.ts
@@ -16,9 +16,7 @@ async function getPiecesFromBox(id_box: number): Promise<Array<Pair<Piece, numbe
   const res = await client.query(`SELECT * FROM contenir WHERE id_boite = $1;`, [ id_box ]);
   const arr: Array<Pair<Piece, number>> = new Array();
   for (let i = 0; i < res.rows.length; ++i) {
-    console.log(res.rows[i]['id_piece']);
     const piece: Either<Piece, string> = await getPiece(res.rows[i]['id_piece']);
-    console.log(piece);
     if (piece.hasRight)
       continue;
     arr.push(createPair(piece.left, res.rows[i]['quantite_contenir'] as number));
diff --git a/back-end/src/services/pieces.service.ts b/back-end/src/services/pieces.service.ts
index ee199ea..1a338be 100644
--- a/back-end/src/services/pieces.service.ts
+++ b/back-end/src/services/pieces.service.ts
@@ -91,7 +91,6 @@ async function getPiece(id: number): Promise<Either<Piece, string>> {
   if (!res.rows[0]) {
     return eitherRight<Piece, string>("Nothing found");
   }
-  console.log(`Get entity ${Object.keys(res.rows[0])}`);
   const result: Piece = { id_piece: res.rows[0]['id_piece'], colour: toColour(res.rows[0]), pattern: toPattern(res.rows[0]), shape: toShape(res.rows[0]) };
   return eitherLeft<Piece, string>(result);
 }
diff --git a/back-end/src/templates/box.ejs b/back-end/src/templates/box.ejs
index 842e26b..5d13f83 100644
--- a/back-end/src/templates/box.ejs
+++ b/back-end/src/templates/box.ejs
@@ -20,7 +20,7 @@
 		id          : <%= box.id %>
 		date        : <%= box.date %>
     pièces      :
-    <% box.pieces.forEach(function(pair) { console.log(pair);%>
+    <% box.pieces.forEach(function(pair) { %>
 			<li>
 				<a href="/pieces/<%=pair.first.id_piece%>">
 					<%=pair.first.id_piece%> @ <%=pair.second%>
diff --git a/back-end/src/templates/boxes.ejs b/back-end/src/templates/boxes.ejs
index c1ef28f..3468f7b 100644
--- a/back-end/src/templates/boxes.ejs
+++ b/back-end/src/templates/boxes.ejs
@@ -20,6 +20,12 @@
 		<label for="fromDate">À partir de : </label>
 		<input type="date" name="fromDate" id="fromDate">
 		<input type="submit" value="Filtrer" onclick="window.location.pathname = '/boxes/from/' + document.getElementById('fromDate').value;">
+    <span>Nombre moyen de pièces : <%-
+          boxes.map(
+              (b) => b.pieces.reduce(
+                  (p, q) => p + q.second, 0
+              )
+           ).reduce((i, j) => i + j, 0) / boxes.length%></span>
 	</div>
 
 	<hr>