ajout année

This commit is contained in:
Mialy Tiana 2025-02-27 08:19:09 +01:00
parent 84f2931bab
commit 8531fe7d4e
3 changed files with 16 additions and 7 deletions

File diff suppressed because one or more lines are too long

View File

@ -90,9 +90,10 @@ $('body').on('click', '#closeDevisModal', function () {
$('body').on('click', '#cocher', function () { $('body').on('click', '#cocher', function () {
var selectedMonth = document.getElementById("monthSelect").value; var selectedMonth = document.getElementById("monthSelect").value;
var currentYear = new Date().getFullYear(); var selectedYear = document.getElementById("yearSelect").value;
var oTable = $('.tabledt').DataTable(); var oTable = $('.tabledt').DataTable();
var rowcollection = oTable.$(".devisToFacture", {"page": "all"}).toArray(); var rowcollection = oTable.$(".devisToFacture", {"page": "all"}).toArray();
oTable.$(".devisToFacture").prop('checked', false); oTable.$(".devisToFacture").prop('checked', false);
@ -106,7 +107,8 @@ $('body').on('click', '#cocher', function () {
var rowDate = new Date(dateText); var rowDate = new Date(dateText);
var rowYear = rowDate.getFullYear(); var rowYear = rowDate.getFullYear();
var rowMonth = rowDate.getMonth() + 1; var rowMonth = rowDate.getMonth() + 1;
if (rowYear === currentYear && rowMonth === parseInt(selectedMonth)) {
if (rowYear == selectedYear && rowMonth == selectedMonth) {
var checkbox = $(inputElem).closest("tr").find('.devisToFacture'); var checkbox = $(inputElem).closest("tr").find('.devisToFacture');
checkbox.prop('checked', true); checkbox.prop('checked', true);
devisToSelect.push(checkbox.val()); devisToSelect.push(checkbox.val());
@ -115,7 +117,7 @@ $('body').on('click', '#cocher', function () {
}); });
if (devisToSelect.length === 0) { if (devisToSelect.length === 0) {
showError(t('gestion', "Aucun devis trouvé pour ce mois")); showError(t('gestion', "Aucun devis trouvé pour ce mois et cette année"));
return; return;
} }
@ -125,5 +127,3 @@ $('body').on('click', '#cocher', function () {
$('#cocherparmois').hide(); $('#cocherparmois').hide();
}); });

View File

@ -74,7 +74,7 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title">Choisir le mois de facturation souhaitée</h5> <h5 class="modal-title">Choisir le mois de facturation souhaité</h5>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="d-flex align-items-center gap-2"> <div class="d-flex align-items-center gap-2">
@ -92,6 +92,15 @@
<option value="11">Novembre</option> <option value="11">Novembre</option>
<option value="12">Décembre</option> <option value="12">Décembre</option>
</select> </select>
<select class="form-select w-auto" name="year" id="yearSelect">
<?php
$currentYear = date('Y');
for ($year = $currentYear; $year >= $currentYear - 10; $year--) {
echo '<option value="' . $year . '"';
echo '>' . $year . '</option>';
}
?>
</select>
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">