diff --git a/public/userarea/scadenzario/index.php b/public/userarea/scadenzario/index.php index 51414b8..c273b6b 100644 --- a/public/userarea/scadenzario/index.php +++ b/public/userarea/scadenzario/index.php @@ -1115,15 +1115,15 @@ function getContrastTextColor($hexColor)
- +
- +
- +
@@ -1221,6 +1221,33 @@ function getContrastTextColor($hexColor) var fpDue = flatpickr('#filterDueRange', fpOpts); var fpCheck = flatpickr('#filterCheckRange', fpOpts); + // --- Flatpickr Italian date fields in deadline modal --- + // Visible format: dd/mm/yyyy + // Submitted format: yyyy-mm-dd, compatible with MySQL DATE + var fpDocDate = flatpickr('#dlDocDate', { + dateFormat: 'Y-m-d', + altInput: true, + altFormat: 'd/m/Y', + locale: 'it', + allowInput: true + }); + + var fpDueDate = flatpickr('#dlDueDate', { + dateFormat: 'Y-m-d', + altInput: true, + altFormat: 'd/m/Y', + locale: 'it', + allowInput: true + }); + + var fpCheckDate = flatpickr('#dlCheckDate', { + dateFormat: 'Y-m-d', + altInput: true, + altFormat: 'd/m/Y', + locale: 'it', + allowInput: true + }); + // --- Select2 --- $('#dlSubject').select2({ theme: 'bootstrap-5', @@ -1295,7 +1322,7 @@ function getContrastTextColor($hexColor) var iso = d.getFullYear() + '-' + String(d.getMonth() + 1).padStart(2, '0') + '-' + String(d.getDate()).padStart(2, '0'); - document.getElementById('dlDueDate').value = iso; + fpDueDate.setDate(iso, true, 'Y-m-d'); } $('#dlDocDate, #dlRecurrence').on('change', computeDueDate); @@ -1464,16 +1491,24 @@ function getContrastTextColor($hexColor) var modal = new bootstrap.Modal(document.getElementById('deadlineModal')); var form = document.getElementById('deadlineForm'); + // Add // Add document.getElementById('btnAddDeadline').addEventListener('click', function() { form.reset(); + document.getElementById('dlId').value = ''; document.getElementById('dlNotifDays').value = '7'; document.getElementById('modalTitle').textContent = 'Nuova Scadenza'; document.getElementById('dlFiles').value = ''; + + fpDocDate.clear(); + fpDueDate.clear(); + fpCheckDate.clear(); + $('#dlSubject').val('').trigger('change'); $('#dlDepartments').val(null).trigger('change'); $('#dlEmployees').val(null).trigger('change'); + renderAttachments([]); modal.show(); }); @@ -1639,9 +1674,9 @@ function getContrastTextColor($hexColor) document.getElementById('dlTopic').value = d.topic || ''; document.getElementById('dlLaw').value = d.law_regulation || ''; document.getElementById('dlRecurrence').value = d.recurrence_type || 'once'; - document.getElementById('dlDocDate').value = d.document_date || ''; - document.getElementById('dlDueDate').value = d.due_date || ''; - document.getElementById('dlCheckDate').value = d.check_date || ''; + fpDocDate.setDate(d.document_date || null, false, 'Y-m-d'); + fpDueDate.setDate(d.due_date || null, false, 'Y-m-d'); + fpCheckDate.setDate(d.check_date || null, false, 'Y-m-d'); document.getElementById('dlNotifDays').value = d.notification_days || 7; document.getElementById('dlStorage').value = d.storage_location || ''; document.getElementById('dlNotes').value = d.notes || ''; @@ -1765,9 +1800,9 @@ function getContrastTextColor($hexColor) document.getElementById('dlTopic').value = d.topic || ''; document.getElementById('dlLaw').value = d.law_regulation || ''; document.getElementById('dlRecurrence').value = d.recurrence_type || 'once'; - document.getElementById('dlDocDate').value = d.document_date || ''; - document.getElementById('dlDueDate').value = d.due_date || ''; - document.getElementById('dlCheckDate').value = d.check_date || ''; + fpDocDate.setDate(d.document_date || null, false, 'Y-m-d'); + fpDueDate.setDate(d.due_date || null, false, 'Y-m-d'); + fpCheckDate.setDate(d.check_date || null, false, 'Y-m-d'); document.getElementById('dlNotifDays').value = d.notification_days || 7; document.getElementById('dlStorage').value = d.storage_location || ''; document.getElementById('dlNotes').value = d.notes || '';