From d6d8890929b9999340d5b2213ff57b0be86bf4e9 Mon Sep 17 00:00:00 2001 From: Mialy Tiana Date: Thu, 27 Feb 2025 07:00:23 +0100 Subject: [PATCH] correction mois pour safari --- gestion/src/js/listener/devisListener.js | 12 +++++------- gestion/templates/content/devis.php | 21 +++++++++++++++++++-- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/gestion/src/js/listener/devisListener.js b/gestion/src/js/listener/devisListener.js index 3d9dcbe..acb6af5 100644 --- a/gestion/src/js/listener/devisListener.js +++ b/gestion/src/js/listener/devisListener.js @@ -90,12 +90,9 @@ $('body').on('click', '#closeDevisModal', function () { $('body').on('click', '#cocher', function () { var selectedMonth = document.getElementById("monthSelect").value; - var yearMonth = selectedMonth.split('-'); - var selectedYear = parseInt(yearMonth[0]); - var selectedMonthValue = parseInt(yearMonth[1]); + var currentYear = new Date().getFullYear(); var oTable = $('.tabledt').DataTable(); - var rowcollection = oTable.$(".devisToFacture", {"page": "all"}).toArray(); oTable.$(".devisToFacture").prop('checked', false); @@ -108,9 +105,8 @@ $('body').on('click', '#cocher', function () { if (dateText) { var rowDate = new Date(dateText); var rowYear = rowDate.getFullYear(); - var rowMonth = rowDate.getMonth() + 1; - - if (rowYear === selectedYear && rowMonth === selectedMonthValue) { + var rowMonth = rowDate.getMonth() + 1; + if (rowYear === currentYear && rowMonth === parseInt(selectedMonth)) { var checkbox = $(inputElem).closest("tr").find('.devisToFacture'); checkbox.prop('checked', true); devisToSelect.push(checkbox.val()); @@ -129,3 +125,5 @@ $('body').on('click', '#cocher', function () { $('#cocherparmois').hide(); }); + + diff --git a/gestion/templates/content/devis.php b/gestion/templates/content/devis.php index e8bd513..0e895ed 100644 --- a/gestion/templates/content/devis.php +++ b/gestion/templates/content/devis.php @@ -69,14 +69,30 @@ +