Ajout de l'occasion (Noël ou anniv)

This commit is contained in:
2023-11-14 12:00:30 +01:00
parent f958d0918b
commit 610fb726a7
3 changed files with 23 additions and 9 deletions

8
app.js
View File

@@ -36,7 +36,7 @@ app.use(express.json())
app.get("/", (req, res) => { 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; let message;
if(error){ if(error){
@@ -72,7 +72,7 @@ app.get("/reservation", (req, res) => {
let totalAchats; 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) { if(error) {
console.log(error); console.log(error);
} }
@@ -112,9 +112,9 @@ app.get("/reservation", (req, res) => {
app.post("/confirm-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; if (err) throw err;
console.log("1 record updated"); console.log("1 record updated");
}); });

View File

@@ -12,7 +12,7 @@
<body> <body>
<div class="container mt-4"> <div class="container mt-4">
<div class="mt-4 p-5 bg-danger text-white rounded"> <div class="mt-4 p-5 bg-danger text-white rounded">
<h1>Liste des cadeaux de Noël pour Louisa</h1> <h1>Liste des cadeaux pour Louisa</h1>
<p>{{ message }}</p> <p>{{ message }}</p>
</div> </div>
</div> </div>
@@ -27,6 +27,7 @@
<li>Qui va l'offrir ?</li> <li>Qui va l'offrir ?</li>
<li>&nbsp;</li> <li>&nbsp;</li>
<li>Qui l'achète ?</li> <li>Qui l'achète ?</li>
<li>Noël ou son anniv' ?</li>
</ul> </ul>
{{#each cadeaux}} {{#each cadeaux}}
<ul> <ul>
@@ -60,7 +61,8 @@
<label class="form-check-label" for="flexPayeDisabled-{{this.id}}">A payer</label> <label class="form-check-label" for="flexPayeDisabled-{{this.id}}">A payer</label>
{{/if}} {{/if}}
</div> </div>
<li>{{#if this.responsable_achat}}{{this.responsable_achat}}{{/if}}</li> <li>{{#if this.responsable_achat}}{{this.responsableAchat}}{{/if}}</li>
<li>{{#if this.pourNoel}}Noël{{else}}Anniversaire{{/if}}</li>
</ul> </ul>
{{/each}} {{/each}}
</div> </div>

View File

@@ -17,7 +17,7 @@
</div> </div>
</div> </div>
<div class="container mt-4"> <div class="container mt-4">
<div class="card" style="width: 30rem;"> <div class="card" style="width: 40rem;">
<div class="card-header">{{infosCadeaux.libelle}}</div> <div class="card-header">{{infosCadeaux.libelle}}</div>
<div class="card-body"> <div class="card-body">
<form action="/confirm-reservation" method="POST"> <form action="/confirm-reservation" method="POST">
@@ -44,7 +44,7 @@
</div> </div>
</div> </div>
<div class="mb-3"> <div class="mb-3">
<label for="responsable-reg" class="form-label">Qui doit s'occuper de l'achat ?</label> <label for="responsable-reg" class="form-label">Qui doit s'occuper de l'achat (toi y compris) ?</label>
<select name="responsableAchat" id="acheteur-reg" required class="form-select" aria-label="Default select example"> <select name="responsableAchat" id="acheteur-reg" required class="form-select" aria-label="Default select example">
<option value="" disabled selected>Choisir dans la liste</option> <option value="" disabled selected>Choisir dans la liste</option>
{{#each listeResponsables}} {{#each listeResponsables}}
@@ -53,7 +53,7 @@
</select> </select>
</div> </div>
<div class="mb-3"> <div class="mb-3">
<label class="form-label">Le cadeau a-t-il déjà été payé ?</label> <label class="form-label">Si quelqu'un d'autre doit acheter le cadeau, avez-vous déjà remboursé cette personne ?</label>
<div class="form-check form-check-inline"> <div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="paye" id="paye1" value="1" {{#if infosCadeaux.paye}}checked{{/if}}> <input class="form-check-input" type="radio" name="paye" id="paye1" value="1" {{#if infosCadeaux.paye}}checked{{/if}}>
<label class="form-check-label" for="paye1">Oui</label> <label class="form-check-label" for="paye1">Oui</label>
@@ -63,6 +63,18 @@
<label class="form-check-label" for="paye2">Non</label> <label class="form-check-label" for="paye2">Non</label>
</div> </div>
</div> </div>
<br>
<div class="mb-3">
<label class="form-label">Pour quelle occasion veux-tu l'offrir ?</label>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="occasion" id="occasion1" value="1" {{#if infosCadeaux.pourNoel}}checked{{/if}}>
<label class="form-check-label" for="occasion1">Pour Noël</label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="occasion" id="occasion2" value="0" {{#unless infosCadeaux.pourNoel}}checked{{/unless}}>
<label class="form-check-label" for="occasion2">Pour son anniversaire</label>
</div>
</div>
<button type="submit" class="btn btn-primary">Enregistrer</button> <button type="submit" class="btn btn-primary">Enregistrer</button>
<a href="/" class="btn btn-secondary">Retour aux cadeaux</a> <a href="/" class="btn btn-secondary">Retour aux cadeaux</a>
</form> </form>