ndacremont/lego
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add box list for a member

Browse Source
This commit is contained in:
Martin Eyben 2024-12-03 19:59:00 +00:00
parent e5e73777cc
commit 01a081603d
3 changed files with 119 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
back-end/src/controllers/member.controller.ts
View File

@ -1,6 +1,7 @@
import { RequestHandler } from "express";
import memberService from "../services/member.service";
import modelService from "../services/model.service";
import boxService from "../services/box.service";
const memberByName: RequestHandler<{ name: string; }> = async (req, res) => {
const memberEither = await memberService.getMember(req.params.name);
@ -12,8 +13,9 @@ const memberByName: RequestHandler<{ name: string; }> = async (req, res) => {
const member = memberEither.left;
const models = await modelService.getAllBuildableModels(member.id_member);
const boxes = await boxService.getBoxesFromMember(member.id_member);
res.render('member.ejs', { member, models });
res.render('member.ejs', { member, models, boxes });
};
const allMembers: RequestHandler = async (_req, res) => {
@ -37,8 +39,10 @@ const memberById: RequestHandler<{ id: string; }> = async (req, res) => {
const member = memberEither.left;
const models = await modelService.getAllBuildableModels(member.id_member);
const boxes = await boxService.getBoxesFromMember(member.id_member);
console.log(boxes);
res.render('member.ejs', { member, models });
res.render('member.ejs', { member, models, boxes });
};
const memberController = {

24
back-end/src/services/box.service.ts
View File

@ -5,6 +5,7 @@ import { Piece } from '../types/piece';
import { getPiece } from './pieces.service';
import { Either, eitherLeft, eitherRight, Pair, createPair } from '../utils/utils';
import modelService from './model.service';
import { config } from 'dotenv';
type DBBox = {
id_boite: number;
@ -14,7 +15,7 @@ type DBBox = {
async function getPiecesFromBox(id_box: number): Promise<Array<Pair<Piece, number>>> {
const client = new_client();
const res = await client.query(`SELECT * FROM contenir WHERE id_boite = $1;`, [ id_box ]);
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) {
const piece: Either<Piece, string> = await getPiece(res.rows[i]['id_piece']);
@ -27,17 +28,17 @@ async function getPiecesFromBox(id_box: number): Promise<Array<Pair<Piece, numbe
async function addPiecesToBox(id_box: number, id_piece: number, qty: number) {
const client = new_client();
const res = await client.query(`INSERT INTO contenir (id_boite, id_piece, quantite_contenir) VALUES ($1, $2, $3);`, [ id_box, id_piece, qty ]);
const res = await client.query(`INSERT INTO contenir (id_boite, id_piece, quantite_contenir) VALUES ($1, $2, $3);`, [id_box, id_piece, qty]);
}
async function removePieceFromBox(id_box: number, id_piece: number) {
const client = new_client();
const res = await client.query(`DELETE FROM contenir WHERE id_boite = $1 AND id_piece = $2;`, [ id_box, id_piece ]);
const res = await client.query(`DELETE FROM contenir WHERE id_boite = $1 AND id_piece = $2;`, [id_box, id_piece]);
}
async function getModelsFromBox(id_box: number): Promise<Array<Model>> {
const client = new_client();
const res = await client.query(`SELECT * FROM modeles_faisables_boite($1);`, [ id_box ]);
const res = await client.query(`SELECT * FROM modeles_faisables_boite($1);`, [id_box]);
const arr: Array<Model> = new Array();
for (let i = 0; i < res.rows.length; ++i) {
const model: Either<Model, string> = await modelService.getModel(res.rows[i]['id_model']);
@ -48,6 +49,20 @@ async function getModelsFromBox(id_box: number): Promise<Array<Model>> {
return arr;
}
async function getBoxesFromMember(id_member: number): Promise<Array<Pair<Box, number>>> {
const client = new_client()
const res = await client.query(`SELECT id_boite, quantite_enregistrer FROM enregistrer WHERE id_membre = $1;`, [id_member])
const arr: Array<Pair<Box, number>> = new Array();
for (let index = 0; index < res.rows.length; index++) {
const box: Either<Box, string> = await getBox(res.rows[index]['id_boite']);
if (box.hasRight)
continue;
arr.push(createPair(box.left, res.rows[index]['quantite_enregistrer']));
}
return arr;
}
async function db2box(data: DBBox): Promise<Box> {
const box: Box = {
id: data.id_boite,
@ -110,6 +125,7 @@ const boxService = {
getAllBoxesFromDate,
removePieceFromBox,
registerBox,
getBoxesFromMember,
};
export default boxService;

52
back-end/src/templates/member.ejs
View File

@ -28,6 +28,42 @@
name: <%= member.name%>
</pre>
<h2>Liste des boites enregistrées</h2>
<table>
<thead>
<tr>
<th>Id</th>
<th>Nom</th>
<th>Nombre de pièces</th>
<th>Quantité</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>
</tr>
<% }); %>
</tbody>
</table>
<h2>Liste des modèles faisables</h2>
<table>
@ -42,9 +78,15 @@
<tbody>
<% models.forEach(function(model) { %>
<tr>
<td><%=model.id%></td>
<td><%=model.name%></td>
<td><a href="/membres/byid/<%=model.creator%>"><i class="fa-solid fa-user"></i> <%=model.creator%></a></td>
<td>
<%=model.id%>
</td>
<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>
</tr>
@ -52,7 +94,7 @@
</tbody>
</table>
</body>
</main>
</body>
</main>
</html>