diff --git a/app.js b/app.js index 4c4ff1c..c402768 100644 --- a/app.js +++ b/app.js @@ -36,7 +36,7 @@ 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 "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 ORDER BY c.prix', 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 "responsableAchat", c.pour_noel as "pourNoel" 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 ORDER BY c.prix', async (error, resultCadeaux) => { let message; if(error){ @@ -72,7 +72,7 @@ app.get("/reservation", (req, res) => { let totalAchats; - db.query('SELECT id, libelle, prix, photo, lien, achete, paye FROM cadeau WHERE id = ?', [reqCadeau], async (error, infosCadeau) => { + db.query('SELECT id, libelle, prix, photo, lien, achete, paye, pour_noel as "pourNoel" FROM cadeau WHERE id = ?', [reqCadeau], async (error, infosCadeau) => { if(error) { console.log(error); } @@ -112,9 +112,9 @@ app.get("/reservation", (req, res) => { app.post("/confirm-reservation", (req, res) => { - const { cadeau, offrant, achete, paye, responsableAchat } = req.body + const { cadeau, offrant, achete, paye, occasion, responsableAchat } = req.body - db.query('UPDATE cadeau SET achete=?, paye=? WHERE ID=?', [achete, paye, cadeau], function (err, result) { + db.query('UPDATE cadeau SET achete=?, paye=?, pour_noel=? WHERE ID=?', [achete, paye, occasion, cadeau], function (err, result) { if (err) throw err; console.log("1 record updated"); }); diff --git a/views/index.hbs b/views/index.hbs index 86ed903..47d65a5 100644 --- a/views/index.hbs +++ b/views/index.hbs @@ -12,7 +12,7 @@
-

Liste des cadeaux de Noël pour Louisa

+

Liste des cadeaux pour Louisa

{{ message }}

@@ -27,6 +27,7 @@
  • Qui va l'offrir ?
  •  
  • Qui l'achète ?
    • +
  • Noël ou son anniv' ?
    • {{#each cadeaux}} {{/each}} diff --git a/views/reservation.hbs b/views/reservation.hbs index ac3583a..8ec881b 100644 --- a/views/reservation.hbs +++ b/views/reservation.hbs @@ -17,7 +17,7 @@
    -
    +
    {{infosCadeaux.libelle}}
    @@ -44,7 +44,7 @@
    - +
    - +
    @@ -63,6 +63,18 @@
    +
    +
    + +
    + + +
    +
    + + +
    +
    Retour aux cadeaux