Merge pull request #18 from BaptisteBuvron/fix_offers

Fix: affichage du salaire lors de l'affichage des offres.
BaptisteBuvron · Jun 20, 2023 · 7be880f · 7be880f
2 parents 1c37229 + db470ed
commit 7be880f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/app/public/js/filter.js b/app/public/js/filter.js
@@ -40,7 +40,7 @@ function generateOfferPrototype(offer) {
 
     const h4 = document.createElement('h4');
     h4.className = '';
-    h4.innerHTML = `${offer.ficheDePoste.typeMetier} <span class="badge text-bg-secondary float-end">45000 €</span>`;
+    h4.innerHTML = `${offer.ficheDePoste.typeMetier} <span class="badge text-bg-secondary float-end">${offer.ficheDePoste.salaire} €</span>`;
 
     const p1 = document.createElement('p');
     p1.innerHTML = offer.ficheDePoste.description;

diff --git a/app/repository/OfferRepository.ts b/app/repository/OfferRepository.ts
@@ -34,7 +34,7 @@ export class OfferRepository {
             query += ` WHERE FicheDePoste.salaire >= ?`;
             params.push(filterOffer.minSalary);
             if (filterOffer.region) {
-                query += ` AND FicheDePoste.lieu = ?'`;
+                query += ` AND FicheDePoste.lieu = ?`;
                 params.push(filterOffer.region);
             }
         }

diff --git a/app/routes/MainRouter.ts b/app/routes/MainRouter.ts
@@ -14,7 +14,6 @@ export const defaultRouter = Router();
 defaultRouter.use(
     session({
         genid: (req:any) => {
-            console.log("1. in genid req.sessionID: ", req.sessionID);
             return uuidv4();
         },
         store: new FileStore(),

diff --git a/app/views/index.ejs b/app/views/index.ejs
@@ -20,7 +20,7 @@
             <h4>Filtres</h4>
             <hr>
             <h5>Salaire</h5>
-            <input type="range" class="form-range" id="salary" min="0" max="10000" step="100"
+            <input type="range" class="form-range" id="salary" min="0" max="100000" step="1000"
                    onmouseup="updateSalaryValue()">
             <p class="text-muted">Salaire minimum : <span id="salary-value"></span></p>
             <h5>Région</h5>
@@ -39,7 +39,7 @@
                 <% offers.forEach((offer) => { %>
                     <div class="border-1 border p-2 my-2">
                         <h4 class=""><%= offer.ficheDePoste.typeMetier %> <span
-                                    class="badge text-bg-secondary float-end">45000 €</span>
+                                    class="badge text-bg-secondary float-end"><%= offer.ficheDePoste.salaire %> €</span>
                         </h4>
                         <p><%= offer.ficheDePoste.description %></p>
                         <p>Organisation : <%= offer.ficheDePoste.siren %></p>