diff --git a/Makefile b/Makefile index 939c862..6c510ad 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ all: build build: dev dev: $(DIR_BACK)/.env - . $(DIR_BACK)/.env && docker-compose -f docker-compose.dev.yml up + . $(DIR_BACK)/.env && docker-compose -f docker-compose.dev.yml up prod: . $(DIR_BACK)/.env && docker-compose -f docker-compose.prod.yml up diff --git a/back-end/src/services/box.service.ts b/back-end/src/services/box.service.ts index ce03d1b..648f6e0 100644 --- a/back-end/src/services/box.service.ts +++ b/back-end/src/services/box.service.ts @@ -16,7 +16,9 @@ async function getPiecesFromBox(id_box: number): Promise> = new Array(); for (let i = 0; i < res.rows.length; ++i) { + console.log(res.rows[i]['id_piece']); const piece: Either = 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 17adc7c..ee199ea 100644 --- a/back-end/src/services/pieces.service.ts +++ b/back-end/src/services/pieces.service.ts @@ -12,7 +12,7 @@ async function getEntity(table: string, column: string, value: string | numbe } const entity: T = f(res.rows[0]); await client.end(); - return eitherLeft(entity); + return eitherLeft(entity); } async function getEntities(table: string, f: (o: Object) => T): Promise> { @@ -87,10 +87,11 @@ async function createShape(name: string): Promise { async function getPiece(id: number): Promise> { const client = new_client(); await client.connect(); - const res = await client.query(`SELECT * FROM pieces NATURAL JOIN colorer NATURAL JOIN etre_forme NATURAL JOIN avoir_motif WHERE id_piece = $1`, [id]); + const res = await client.query(`SELECT * FROM pieces NATURAL JOIN colorer NATURAL JOIN couleurs NATURAL JOIN etre_forme NATURAL JOIN formes NATURAL JOIN avoir_motif NATURAL JOIN motifs WHERE id_piece = $1`, [id]); if (!res.rows[0]) { return eitherRight("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(result); } @@ -98,7 +99,7 @@ async function getPiece(id: number): Promise> { async function getPieces(): Promise> { const client = new_client(); await client.connect(); - const res = await client.query(`SELECT * FROM pieces NATURAL JOIN colorer NATURAL JOIN etre_forme NATURAL JOIN avoir_motif;`); + const res = await client.query(`SELECT * FROM pieces NATURAL JOIN colorer NATURAL JOIN couleurs NATURAL JOIN etre_forme NATURAL JOIN formes NATURAL JOIN avoir_motif NATURAL JOIN motifs;`); const arr: Array = new Array(); for (let i = 0; i < res.rows.length; ++i) { arr.push({ id_piece: res.rows[i]['id_piece'], colour: toColour(res.rows[i]), pattern: toPattern(res.rows[i]), shape: toShape(res.rows[i]) }); diff --git a/back-end/src/templates/box.ejs b/back-end/src/templates/box.ejs index c4744d1..842e26b 100644 --- a/back-end/src/templates/box.ejs +++ b/back-end/src/templates/box.ejs @@ -19,6 +19,14 @@
 		id          : <%= box.id %>
 		date        : <%= box.date %>
+    pièces      :
+    <% box.pieces.forEach(function(pair) { console.log(pair);%>
+			
  • + + <%=pair.first.id_piece%> @ <%=pair.second%> + +
  • + <% }); %>