Quelques modifs

app.js

@@ -29,7 +29,7 @@ app.use('/css', express.static(__dirname + '/node_modules/bootstrap/dist/css'));
 app.use(express.json());
 
 app.get("/", (req, res) => { 
-    db.query('SELECT c.id as "id", c.libelle as "libelle", c.prix, c.photo as "photo", c.lien, p.prenom as "demandeur", c.achete as "achete", p2.prenom as "responsable" FROM cadeau c LEFT OUTER JOIN participations pc on pc.cadeau = c.id LEFT OUTER JOIN participant p on p.id = pc.personne LEFT OUTER JOIN participant p2 on p2.id = pc.responsable', async (error, resultCadeaux) => {
+    db.query('SELECT c.id as "id", c.libelle as "libelle", c.prix, c.photo as "photo", c.lien, p.prenom as "acheteur", c.achete as "achete", c.paye as "paye", p2.prenom as "responsable_achat" FROM cadeau c LEFT OUTER JOIN participations pc on pc.cadeau = c.id LEFT OUTER JOIN participant p on p.id = pc.offrant LEFT OUTER JOIN participant p2 on p2.id = pc.responsable_achat', async (error, resultCadeaux) => {
         let message;
 
         if(error){
@@ -50,9 +50,11 @@ app.get("/reserve", (req, res) => {
             console.log(error);
         }
         if (result.length > 0) {
+            db.query('SELECT id, prenom, FROM participant', async (error, selectOffrant) => {
 
-            db.query('SELECT id, prenom FROM participant', async (error, select) => {
+                db.query('SELECT sum(c.prix) FROM cadeau c LEFT OUTER JOIN participations pc on pc.cadeau = c.id WHERE pc.offrant = ?', [], async (error, totalAchats) => {
-                res.render('reservation', { "id": result[0].id, "libelle": result[0].libelle, "photo": result[0].photo, "responsable": select } );
+                    res.render('reservation', { "id": result[0].id, "libelle": result[0].libelle, "photo": result[0].photo, "offrant": selectOffrant, "totalDepenses": totalAchats } );
+                })
             })
         }
     })

views/index.hbs

@@ -38,20 +38,29 @@
             </li>
             <li>{{this.prix}} €</li>
             <li><a href="{{this.lien}}" target="_blank">Voir le produit</a></li>
-            <li>{{#if this.demandeur}}{{this.demandeur}}
+            <li>{{#if this.acheteur}}{{this.acheteur}}
                 {{else}}<a href="/reserve?id={{this.id}}" class="btn btn-primary">Le réserver</a>{{/if}}
             </li>
             <li>
                 <div class="form-check form-switch">
                 {{#if this.achete}}
-                    <input class="form-check-input" type="checkbox" id="flexSwitchCheckCheckedDisabled-{{this.id}}" checked disabled>
+                    <input class="form-check-input" type="checkbox" id="flexAcheteCheckedDisabled-{{this.id}}" checked disabled>
-                    <label class="form-check-label" for="flexSwitchCheckCheckedDisabled-{{this.id}}">Déja acheté</label>
+                    <label class="form-check-label" for="flexAcheteCheckedDisabled-{{this.id}}">Déja acheté</label>
                 {{else}}
-                    <input class="form-check-input" type="checkbox" id="flexSwitchCheckDisabled-{{this.id}}" disabled>
+                    <input class="form-check-input" type="checkbox" id="flexAcheteDisabled-{{this.id}}" disabled>
-                    <label class="form-check-label" for="flexSwitchCheckDisabled-{{this.id}}">A acheter</label>
+                    <label class="form-check-label" for="flexAcheteDisabled-{{this.id}}">A acheter</label>
                 {{/if}}
                 </div>
-            <li>{{#if this.responsable}}{{this.responsable}}{{/if}}</li>
+                <div class="form-check form-switch">
+                {{#if this.paye}}
+                    <input class="form-check-input" type="checkbox" id="flexPayeCheckedDisabled-{{this.id}}" checked disabled>
+                    <label class="form-check-label" for="flexPayeCheckedDisabled-{{this.id}}">Déja payé</label>
+                {{else}}
+                    <input class="form-check-input" type="checkbox" id="flexPayeDisabled-{{this.id}}" disabled>
+                    <label class="form-check-label" for="flexPayeDisabled-{{this.id}}">A payer</label>
+                {{/if}}
+                </div>                
+            <li>{{#if this.responsable_achat}}{{this.responsable_achat}}{{/if}}</li>
         </ul>
         {{/each}}
     </div>

views/reservation.hbs

@@ -46,7 +46,7 @@
                             </div>
                     </div>
                     <div class="mb-3">
-                        <label for="responsable-reg" class="form-label">Qui doit s'en occuper ?</label>
+                        <label for="responsable-reg" class="form-label">Qui doit s'occuper de l'achat ?</label>
                         <select name="acheteur" id="acheteur-reg" class="">
                             <option value="" disabled selected>Choisir dans la liste</option>
                             {{#each responsable}} 
@@ -55,13 +55,10 @@
                         </select>
                     </div>
                     <button type="submit" class="btn btn-primary">Enregistrer</button>
+                    <a href="/" class="btn btn-secondary">Retour aux cadeaux</a>
                 </form>
             </div>
         </div>
     </div>
-
-    <div class="container mt-4">
-        <a href="/" class="btn btn-primary">Retour à la liste</a>
-    </div>
 </body>
 </html>