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

feat(css): add creator name

Browse Source
This commit is contained in:
Martin Eyben 2024-12-03 22:45:25 +00:00
parent 86664d6c44
commit b25f62ca21
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
back-end/src/services/model.service.ts
View File

@ -3,6 +3,7 @@ import { Model } from '../types/model';
import { Either, eitherLeft, eitherRight, Pair, createPair } from '../utils/utils'; import { Either, eitherLeft, eitherRight, Pair, createPair } from '../utils/utils';
import { Piece } from '../types/piece'; import { Piece } from '../types/piece';
import { getPiece } from './pieces.service'; import { getPiece } from './pieces.service';
import memberService from './member.service';
type DBModel = { type DBModel = {
id_modele: number; id_modele: number;
@ -37,7 +38,7 @@ async function db2Model(data: DBModel) {
id: data.id_modele, id: data.id_modele,
name: data.nom_modele, name: data.nom_modele,
url: data.url_notice_modele, url: data.url_notice_modele,
creator: data.id_membre, creator: (await memberService.getMember(data.id_membre)).left,
inheritFrom: data.id_modele_2, inheritFrom: data.id_modele_2,
pieces: await getPiecesFromModel(data.id_modele), pieces: await getPiecesFromModel(data.id_modele),
review: await getNoteFromModel(data.id_modele), review: await getNoteFromModel(data.id_modele),

4
back-end/src/templates/model.ejs
View File

@ -14,16 +14,16 @@
<body> <body>
<%- include('partials/header.ejs') %> <%- include('partials/header.ejs') %>
<main>
<h1> <h1>
<%= model.name %> <%= model.name %>
</h1> </h1>
<pre> <pre>
<main>
id : <%= model.id %> id : <%= model.id %>
url : <%= model.url %> url : <%= model.url %>
creator : <%= model.creator %> creator : <%= model.creator.name %>
inheritFrom : <%= model.inheritFrom %> inheritFrom : <%= model.inheritFrom %>
<h2>Liste des pièces nécessaires</h2> <h2>Liste des pièces nécessaires</h2>
<table> <table>

2
back-end/src/templates/models.ejs
View File

@ -33,7 +33,7 @@
<tr> <tr>
<td><%=model.id%></td> <td><%=model.id%></td>
<td><%=model.name%></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="/membres/byid/<%=model.creator.id_member%>"><i class="fa-solid fa-user"></i> <%=model.creator.name%></a></td>
<td><%=model.review.first%>/5 (<%=model.review.second%> avis)</td> <td><%=model.review.first%>/5 (<%=model.review.second%> avis)</td>
<td><a href="/models/byname/<%=model.name%>"><i class="fa-solid fa-eye"></i></a></td> <td><a href="/models/byname/<%=model.name%>"><i class="fa-solid fa-eye"></i></a></td>
</tr> </tr>

3
back-end/src/types/model.ts
View File

@ -1,11 +1,12 @@
import { Pair } from '../utils/utils'; import { Pair } from '../utils/utils';
import { Member } from './member';
import { Piece } from './piece'; import { Piece } from './piece';
type Model = { type Model = {
id: number; id: number;
name: string; name: string;
url: string; url: string;
creator: number; creator: Member;
inheritFrom: number; inheritFrom: number;
pieces: Array<Pair<Piece, number>> pieces: Array<Pair<Piece, number>>
review: Pair<number, number> review: Pair<number, number>