dlFunction fix
This commit is contained in:
@@ -70,12 +70,12 @@ try {
|
|||||||
|
|
||||||
$ins = $pdo->prepare("
|
$ins = $pdo->prepare("
|
||||||
INSERT INTO scad_deadlines
|
INSERT INTO scad_deadlines
|
||||||
(subject_id, topic, law_regulation, recurrence_type, due_date, check_date,
|
(subject_id, function_id, topic, law_regulation, recurrence_type, due_date, check_date,
|
||||||
document_date, notification_days, storage_location, notes, created_by, departments)
|
document_date, notification_days, storage_location, notes, created_by, departments)
|
||||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||||
");
|
");
|
||||||
$ins->execute([
|
$ins->execute([
|
||||||
$deadline['subject_id'], $deadline['topic'], $deadline['law_regulation'],
|
$deadline['subject_id'], $deadline['function_id'], $deadline['topic'], $deadline['law_regulation'],
|
||||||
$deadline['recurrence_type'], $dueDate->format('Y-m-d'),
|
$deadline['recurrence_type'], $dueDate->format('Y-m-d'),
|
||||||
$checkDate ? $checkDate->format('Y-m-d') : null,
|
$checkDate ? $checkDate->format('Y-m-d') : null,
|
||||||
$documentDate ? $documentDate->format('Y-m-d') : null,
|
$documentDate ? $documentDate->format('Y-m-d') : null,
|
||||||
|
|||||||
@@ -30,3 +30,12 @@ if (!isset($departments)) {
|
|||||||
if (!isset($subjects)) {
|
if (!isset($subjects)) {
|
||||||
$subjects = $pdo->query("SELECT id, name, color FROM scad_subjects ORDER BY name")->fetchAll(PDO::FETCH_ASSOC);
|
$subjects = $pdo->query("SELECT id, name, color FROM scad_subjects ORDER BY name")->fetchAll(PDO::FETCH_ASSOC);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!isset($functions)) {
|
||||||
|
$functions = $pdo->query("
|
||||||
|
SELECT id, name
|
||||||
|
FROM scad_functions
|
||||||
|
WHERE status = 'active'
|
||||||
|
ORDER BY name ASC
|
||||||
|
")->fetchAll(PDO::FETCH_ASSOC);
|
||||||
|
}
|
||||||
|
|||||||
@@ -35,6 +35,23 @@
|
|||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-12 col-md-6">
|
||||||
|
<label for="dlFunction" class="form-label fw-semibold">Funzione</label>
|
||||||
|
<div class="d-flex gap-2">
|
||||||
|
<select class="form-select" id="dlFunction" name="function_id" style="flex:1">
|
||||||
|
<option value="">— Nessuna —</option>
|
||||||
|
<?php foreach ($functions as $fn): ?>
|
||||||
|
<option value="<?= (int)$fn['id'] ?>">
|
||||||
|
<?= htmlspecialchars($fn['name'], ENT_QUOTES, 'UTF-8') ?>
|
||||||
|
</option>
|
||||||
|
<?php endforeach; ?>
|
||||||
|
</select>
|
||||||
|
|
||||||
|
<a href="scadenzario/functions/index.php" target="_blank" class="btn btn-scad-outline" title="Gestisci funzioni">
|
||||||
|
<i class="fa-solid fa-gear"></i>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="col-12 col-md-6">
|
<div class="col-12 col-md-6">
|
||||||
<label for="dlLaw" class="form-label fw-semibold">Legge / Articolo</label>
|
<label for="dlLaw" class="form-label fw-semibold">Legge / Articolo</label>
|
||||||
<input type="text" class="form-control" id="dlLaw" name="law_regulation" maxlength="500" placeholder="es. D.Lgs. 81/2008, D.M. 10.03.1998...">
|
<input type="text" class="form-control" id="dlLaw" name="law_regulation" maxlength="500" placeholder="es. D.Lgs. 81/2008, D.M. 10.03.1998...">
|
||||||
|
|||||||
@@ -39,6 +39,7 @@
|
|||||||
$('#dlSubject').select2($.extend({}, s2Opts, { placeholder: 'Seleziona argomento...' }));
|
$('#dlSubject').select2($.extend({}, s2Opts, { placeholder: 'Seleziona argomento...' }));
|
||||||
$('#dlDepartments').select2($.extend({}, s2Opts, { placeholder: 'Seleziona reparti...' }));
|
$('#dlDepartments').select2($.extend({}, s2Opts, { placeholder: 'Seleziona reparti...' }));
|
||||||
$('#dlEmployees').select2($.extend({}, s2Opts, { placeholder: 'Seleziona persone...' }));
|
$('#dlEmployees').select2($.extend({}, s2Opts, { placeholder: 'Seleziona persone...' }));
|
||||||
|
$('#dlFunction').select2($.extend({}, s2Opts, { placeholder: 'Seleziona funzione...' }));
|
||||||
|
|
||||||
// --- Auto-calc due_date from document_date + recurrence ---
|
// --- Auto-calc due_date from document_date + recurrence ---
|
||||||
var RECURRENCE_OFFSETS = {
|
var RECURRENCE_OFFSETS = {
|
||||||
@@ -104,6 +105,7 @@
|
|||||||
$('#dlSubject').val('').trigger('change');
|
$('#dlSubject').val('').trigger('change');
|
||||||
$('#dlDepartments').val(null).trigger('change');
|
$('#dlDepartments').val(null).trigger('change');
|
||||||
$('#dlEmployees').val(null).trigger('change');
|
$('#dlEmployees').val(null).trigger('change');
|
||||||
|
$('#dlFunction').val('').trigger('change');
|
||||||
renderAttachments([]);
|
renderAttachments([]);
|
||||||
modal.show();
|
modal.show();
|
||||||
};
|
};
|
||||||
@@ -123,6 +125,7 @@
|
|||||||
document.getElementById('dlId').value = d.id;
|
document.getElementById('dlId').value = d.id;
|
||||||
$('#dlSubject').val(d.subject_id || '').trigger('change');
|
$('#dlSubject').val(d.subject_id || '').trigger('change');
|
||||||
document.getElementById('dlTopic').value = d.topic || '';
|
document.getElementById('dlTopic').value = d.topic || '';
|
||||||
|
$('#dlFunction').val(d.function_id || '').trigger('change');
|
||||||
document.getElementById('dlLaw').value = d.law_regulation || '';
|
document.getElementById('dlLaw').value = d.law_regulation || '';
|
||||||
document.getElementById('dlRecurrence').value = d.recurrence_type || 'once';
|
document.getElementById('dlRecurrence').value = d.recurrence_type || 'once';
|
||||||
fpDocDate.setDate(d.document_date || null, false, 'Y-m-d');
|
fpDocDate.setDate(d.document_date || null, false, 'Y-m-d');
|
||||||
|
|||||||
@@ -73,13 +73,6 @@ $deadlines = $stmt->fetchAll(PDO::FETCH_ASSOC);
|
|||||||
|
|
||||||
require __DIR__ . '/include/deadline_form_data.php';
|
require __DIR__ . '/include/deadline_form_data.php';
|
||||||
|
|
||||||
$functions = $pdo->query("
|
|
||||||
SELECT id, name
|
|
||||||
FROM scad_functions
|
|
||||||
WHERE status = 'active'
|
|
||||||
ORDER BY name ASC
|
|
||||||
")->fetchAll(PDO::FETCH_ASSOC);
|
|
||||||
|
|
||||||
$today = date('Y-m-d');
|
$today = date('Y-m-d');
|
||||||
|
|
||||||
function getContrastTextColor($hexColor)
|
function getContrastTextColor($hexColor)
|
||||||
|
|||||||
Reference in New Issue
Block a user