solocla/zibo-dashboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update mescole and photo diagram

Browse Source
This commit is contained in:
Claudio
2025-12-03 08:35:59 +01:00
parent a1c9d9f789
commit dd9d109dee
375 changed files with 1394 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/userarea/produzione_programmazione_drag.php
+166 -53
View File
@@ -23,50 +23,105 @@ function selectOptions($arr, $sel = null, $val = 'id', $txt = 'nome')
// --- SALVATAGGIO INLINE ---
if ($_SERVER['REQUEST_METHOD'] === 'POST' && !empty($_POST['action'])) {
$action = $_POST['action'];
$data = [
'Data' => $_POST['Data'],
'idmatrice' => $_POST['idmatrice'],
'idmescola' => $_POST['idmescola'],
'id_linea' => $_POST['id_linea'],
'id_cliente' => $_POST['id_cliente'] ?: null,
'data_zibo' => $_POST['data_zibo'] ?: null,
'data_cliente' => $_POST['data_cliente'] ?: null,
'metri' => $_POST['metri'] ?: 0,
'kg_sp' => $_POST['kg_sp'] ?: 0,
'kg_p' => $_POST['kg_p'] ?: 0,
'ore_previste' => $_POST['ore_previste'] ?: 0,
'note_extra' => $_POST['note_extra'] ?: null,
'data_produzione' => $_POST['data_produzione'],
'id_status' => $_POST['id_status'] ?? 1
'idmatrice' => $_POST['idmatrice'],
'id_linea' => $_POST['id_linea'],
'id_cliente' => $_POST['id_cliente'] ?: null,
'data_zibo' => $_POST['data_zibo'] ?: null,
'data_cliente' => $_POST['data_cliente'] ?: null,
'metri' => $_POST['metri'] ?: 0,
'kg_sp' => $_POST['kg_sp'] ?: 0,
'kg_p' => $_POST['kg_p'] ?: 0,
'ore_previste' => $_POST['ore_previste'] ?: 0,
'note_extra' => $_POST['note_extra'] ?: null,
'id_status' => $_POST['id_status'] ?? 1
];
try {
// ============================
// INSERT
// ============================
if ($action === 'insert') {
$sql = "INSERT INTO productiondata
(Data, idmatrice, idmescola, id_linea, id_cliente, data_zibo, data_cliente, metri, kg_sp, kg_p, ore_previste, note_extra, data_produzione, id_status)
VALUES
(:Data, :idmatrice, :idmescola, :id_linea, :id_cliente, :data_zibo, :data_cliente, :metri, :kg_sp, :kg_p, :ore_previste, :note_extra, :data_produzione, :id_status)";
$stmt = $pdo->prepare($sql);
$stmt->execute($data);
echo json_encode(['success' => true]);
} elseif ($action === 'update' && !empty($_POST['id'])) {
$data['id'] = $_POST['id'];
$sql = "UPDATE productiondata SET
Data=:Data, idmatrice=:idmatrice, idmescola=:idmescola, id_linea=:id_linea,
id_cliente=:id_cliente, data_zibo=:data_zibo, data_cliente=:data_cliente,
metri=:metri, kg_sp=:kg_sp, kg_p=:kg_p, ore_previste=:ore_previste,
note_extra=:note_extra, data_produzione=:data_produzione, id_status=:id_status
WHERE id = :id";
(Data, idmatrice, id_linea, id_cliente, data_zibo, data_cliente,
metri, kg_sp, kg_p, ore_previste, note_extra, data_produzione, id_status)
VALUES
(:Data, :idmatrice, :id_linea, :id_cliente, :data_zibo, :data_cliente,
:metri, :kg_sp, :kg_p, :ore_previste, :note_extra, :data_produzione, :id_status)";
$stmt = $pdo->prepare($sql);
$stmt->execute($data);
// QUI devi prendere il nuovo ID
$idProd = $pdo->lastInsertId();
// cancella vecchie associazioni (non serve ma per sicurezza)
$pdo->prepare("DELETE FROM productiondata_mescole WHERE id_productiondata=?")
->execute([$idProd]);
// aggiungi nuove
if (!empty($_POST['mescole'])) {
$ins = $pdo->prepare("INSERT INTO productiondata_mescole (id_productiondata, id_mescola) VALUES (?, ?)");
foreach ($_POST['mescole'] as $m) {
$ins->execute([$idProd, $m]);
}
}
echo json_encode(['success' => true]);
}
// ============================
// UPDATE
// ============================
elseif ($action === 'update' && !empty($_POST['id'])) {
$data['id'] = $_POST['id'];
$sql = "UPDATE productiondata SET
idmatrice=:idmatrice,
id_linea=:id_linea,
id_cliente=:id_cliente,
data_zibo=:data_zibo,
data_cliente=:data_cliente,
metri=:metri,
kg_sp=:kg_sp,
kg_p=:kg_p,
ore_previste=:ore_previste,
note_extra=:note_extra,
id_status=:id_status
WHERE id = :id
";
$stmt = $pdo->prepare($sql);
$stmt->execute($data);
// QUI devi usare L'ID ESISTENTE !
$idProd = $_POST['id'];
$pdo->prepare("DELETE FROM productiondata_mescole WHERE id_productiondata=?")
->execute([$idProd]);
if (!empty($_POST['mescole'])) {
$ins = $pdo->prepare("INSERT INTO productiondata_mescole (id_productiondata, id_mescola) VALUES (?, ?)");
foreach ($_POST['mescole'] as $m) {
$ins->execute([$idProd, $m]);
}
}
echo json_encode(['success' => true]);
}
exit;
} catch (Exception $e) {
echo json_encode(['success' => false, 'msg' => $e->getMessage()]);
exit;
}
}
?>
<!doctype html>
<html lang="it">
@@ -310,21 +365,25 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && !empty($_POST['action'])) {
<?php
// CARICO TUTTE LE RIGHE UNA SOLA VOLTA
$sql = "SELECT
p.*,
m.nome AS matrice,
ms.nome AS mescola,
l.name AS linea,
c.nome AS cliente,
s.nome AS status_nome,
COALESCE(s.badge_color, '#6c757d') AS badge_color,
COALESCE(s.line_color, '#ffffff') AS line_color
FROM productiondata p
LEFT JOIN matrice m ON p.idmatrice = m.id
LEFT JOIN mescole ms ON p.idmescola = ms.id
LEFT JOIN production_lines l ON p.id_linea = l.id
LEFT JOIN clients c ON p.id_cliente = c.id
LEFT JOIN production_status s ON p.id_status = s.id
ORDER BY p.priority ASC, p.data_produzione ASC, p.Data ASC";
p.*,
m.nome AS matrice,
GROUP_CONCAT(ms.nome SEPARATOR ', ') AS mescola,
GROUP_CONCAT(ms.id SEPARATOR ',') AS mescole_ids,
l.name AS linea,
c.nome AS cliente,
s.nome AS status_nome,
COALESCE(s.badge_color, '#6c757d') AS badge_color,
COALESCE(s.line_color, '#ffffff') AS line_color
FROM productiondata p
LEFT JOIN matrice m ON p.idmatrice = m.id
LEFT JOIN productiondata_mescole pm ON p.id = pm.id_productiondata
LEFT JOIN mescole ms ON pm.id_mescola = ms.id
LEFT JOIN production_lines l ON p.id_linea = l.id
LEFT JOIN clients c ON p.id_cliente = c.id
LEFT JOIN production_status s ON p.id_status = s.id
GROUP BY p.id
ORDER BY p.priority ASC, p.data_produzione ASC, p.Data ASC
";
$rows = $pdo->query($sql)->fetchAll(PDO::FETCH_ASSOC);
?>
@@ -497,7 +556,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && !empty($_POST['action'])) {
<?php if ($r['id_status'] != 1) continue; ?>
<tr data-id="<?= $r['id'] ?>" data-status="1"
style="background-color: <?= $r['line_color'] ?> !important;">
<?php $is_da_programmare = true;
<?php $is_da_programmare = false;
include 'row_production.php'; ?>
</tr>
<?php endforeach; ?>
@@ -636,7 +695,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && !empty($_POST['action'])) {
// --- INLINE EDIT ---
let original = {};
$('#tabProgrammazione').on('click', '.edit-row', function() {
$('table').on('click', '.edit-row', function() {
const tr = $(this).closest('tr');
original = tr.find('.view').map((i, e) => $(e).html()).get();
tr.find('.view').hide();
@@ -653,7 +712,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && !empty($_POST['action'])) {
});
});
$('#tabProgrammazione').on('click', '.cancel-row', function() {
$('table').on('click', '.cancel-row', function() {
const tr = $(this).closest('tr');
tr.find('.view').show().each((i, e) => $(e).html(original[i]));
tr.find('.inline-edit').hide();
@@ -662,8 +721,10 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && !empty($_POST['action'])) {
tr.find('.inline-edit.select2').select2('destroy');
});
$('#tabProgrammazione').on('click', '.save-row', function() {
$('table').on('click', '.save-row', function() {
const tr = $(this).closest('tr');
const data = tr.find('.inline-edit').serializeArray();
data.push({
name: 'action',
@@ -672,9 +733,19 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && !empty($_POST['action'])) {
name: 'id',
value: tr.data('id')
});
$.post('', data, r => r.success ? location.reload() : alert(r.msg || 'Errore'), 'json');
$.post('', data, function(r) {
if (r.success) {
location.reload();
} else {
alert(r.msg || 'Errore salvataggio');
}
}, 'json');
});
// --- ELIMINAZIONE ---
let deleteRow;
$('#tabProgrammazione').on('click', '.delete-row', function(e) {
@@ -755,19 +826,27 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && !empty($_POST['action'])) {
function updatePriority() {
let programmati = [];
let daProgrammare = [];
// → Righe nella tabella PROGRAMMATI (status deve diventare 6)
$("#programmatiBlock tr").each(function(index) {
programmati.push({
id: $(this).data("id"),
priority: index + 1,
status: 6
});
});
// → Righe nella tabella DA PROGRAMMARE (status deve diventare 1)
$("#daProgrammareBlock tr").each(function(index) {
daProgrammare.push({
id: $(this).data("id"),
priority: index + 1
});
});
$("#daProgrammareBlock tr").each(function() {
daProgrammare.push($(this).data("id"));
});
$.post("ajax_update_priority.php", {
programmati: JSON.stringify(programmati),
@@ -776,11 +855,12 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && !empty($_POST['action'])) {
if (response.success) {
location.reload();
} else {
alert("Errore aggiornamento priorità");
alert("Errore aggiornamento priorità: " + response.msg);
}
}, "json");
}
});
</script>
@@ -814,7 +894,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && !empty($_POST['action'])) {
</div>
<div class="col-md-6">
<label class="form-label">Mescola</label>
<select class="form-select select2" name="idmescola" required>
<select class="form-select select2" name="mescole[]" multiple required>
<option value="">Seleziona...</option>
<?php foreach ($mescole as $m): ?>
<option value="<?= $m['id'] ?>"><?= htmlspecialchars($m['nome']) ?></option>
@@ -976,6 +1056,21 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && !empty($_POST['action'])) {
$("#imagePreviewModal").hide();
}
});
$(document).on("click", ".view-mescole-btn", function() {
let names = $(this).data("names");
let html = "";
names.split(",").forEach(n => {
html += `<div class="p-2 border-bottom">${n.trim()}</div>`;
});
$("#mescoleList").html(html);
let modal = new bootstrap.Modal(document.getElementById("modalMescoleView"));
modal.show();
});
</script>
@@ -998,6 +1093,24 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && !empty($_POST['action'])) {
</div>
</div>
<div class="modal fade" id="modalMescoleView" tabindex="-1">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Mescole utilizzate</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
</div>
<div class="modal-body" id="mescoleList"></div>
<div class="modal-footer">
<button class="btn btn-secondary" data-bs-dismiss="modal">Chiudi</button>
</div>
</div>
</div>
</div>
</body>