fixed stas3
This commit is contained in:
@@ -75,6 +75,9 @@ if ($action === 'data') {
|
||||
SUM(x.status IN ('aperto','bloccato') AND x.due_date < CURDATE()) AS late,
|
||||
SUM(x.status IN ('aperto','bloccato') AND x.client_date < CURDATE()) AS late_client,
|
||||
SUM(x.status IN ('aperto','bloccato') AND x.late_lines > 0 AND x.late_lines < x.open_lines) AS late_partial,
|
||||
SUM(CASE WHEN x.status IN ('aperto','bloccato') THEN x.late_lines ELSE 0 END) AS late_lines,
|
||||
SUM(x.status IN ('aperto','bloccato') AND x.week_lines > 0) AS week_orders,
|
||||
SUM(CASE WHEN x.status IN ('aperto','bloccato') THEN x.week_lines ELSE 0 END) AS week_lines,
|
||||
SUM(x.delivered = 1 AND x.invoiced = 0 AND x.cancelled = 0) AS to_invoice,
|
||||
COUNT(DISTINCT x.customer) AS customers,
|
||||
AVG(CASE WHEN x.status <> 'annullato' AND x.due_date IS NOT NULL AND x.due_date >= x.order_date
|
||||
@@ -184,7 +187,7 @@ if ($action === 'data') {
|
||||
x.order_date, x.due_date, x.customer, x.company_name,
|
||||
x.salesperson, x.area, x.status, x.invoiced, x.your_reference,
|
||||
x.taxable_amount, x.total_amount,
|
||||
x.zibo_date, x.client_date, x.open_lines, x.late_lines, x.late_lines_client, x.open_dates,
|
||||
x.zibo_date, x.client_date, x.open_lines, x.late_lines, x.late_lines_client, x.open_dates, x.week_lines,
|
||||
(x.status IN ('aperto','bloccato') AND x.client_date < CURDATE()) AS is_late_client,
|
||||
(x.summary_tb_modified IS NULL) AS no_amount,
|
||||
(x.status IN ('aperto','bloccato') AND x.due_date < CURDATE()) AS is_late
|
||||
@@ -727,6 +730,43 @@ if ($action === 'order') {
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
.kpi-unit {
|
||||
font-size: .9rem;
|
||||
font-weight: 700;
|
||||
color: var(--c-muted);
|
||||
}
|
||||
|
||||
.kpi-week {
|
||||
margin: 10px -18px -16px;
|
||||
padding: 7px 18px;
|
||||
background: #fef3c7;
|
||||
border-top: 1px solid #fde68a;
|
||||
color: #92400e;
|
||||
font-size: .8rem;
|
||||
transition: background .15s ease;
|
||||
}
|
||||
|
||||
.kpi-week:hover {
|
||||
background: #fde68a;
|
||||
}
|
||||
|
||||
.kpi-week.selected {
|
||||
background: #fcd34d;
|
||||
box-shadow: inset 0 0 0 2px #b45309;
|
||||
}
|
||||
|
||||
.week-badge {
|
||||
display: inline-block;
|
||||
background: #fef3c7;
|
||||
color: #b45309;
|
||||
font-size: .66rem;
|
||||
font-weight: 800;
|
||||
border-radius: 999px;
|
||||
padding: 1px 7px;
|
||||
margin-left: 5px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.more-dates {
|
||||
display: inline-block;
|
||||
background: #eef2ff;
|
||||
@@ -932,6 +972,7 @@ if ($action === 'order') {
|
||||
<div class="chip-row" id="statusChips">
|
||||
<button type="button" class="chip" data-status="aperto" style="--chip-c:var(--c-open);">Aperti</button>
|
||||
<button type="button" class="chip" data-status="ritardo" style="--chip-c:var(--c-late);">In ritardo (ZIBO)</button>
|
||||
<button type="button" class="chip" data-status="settimana" style="--chip-c:#b45309;">In consegna questa sett.</button>
|
||||
<button type="button" class="chip" data-status="ritardo_cliente" style="--chip-c:#ea580c;">Oltre data cliente</button>
|
||||
<button type="button" class="chip" data-status="bloccato" style="--chip-c:var(--c-block);">Bloccati</button>
|
||||
<button type="button" class="chip" data-status="evaso" style="--chip-c:var(--c-done);">Evasi</button>
|
||||
@@ -993,6 +1034,7 @@ if ($action === 'order') {
|
||||
<div class="kpi-label">In ritardo</div>
|
||||
<div class="kpi-value" id="kLate">—</div>
|
||||
<div class="kpi-sub" id="kLateSub">data ZIBO superata</div>
|
||||
<div class="kpi-week" id="kWeek" data-status="settimana" title="Ordini con righe da consegnare entro questa settimana (non ancora in ritardo)"> </div>
|
||||
</div>
|
||||
<div class="kpi" data-status="evaso" style="--k:var(--c-done);">
|
||||
<div class="kpi-icon"><i class="fa-solid fa-truck"></i></div>
|
||||
@@ -1321,7 +1363,8 @@ if ($action === 'order') {
|
||||
|
||||
// evidenzio il KPI corrispondente allo stato filtrato
|
||||
$('.kpi').removeClass('selected');
|
||||
if (f.statuses.length === 1) $(`.kpi[data-status="${f.statuses[0]}"]`).addClass('selected');
|
||||
$('.kpi-week').removeClass('selected');
|
||||
if (f.statuses.length === 1) $(`.kpi[data-status="${f.statuses[0]}"], .kpi-week[data-status="${f.statuses[0]}"]`).addClass('selected');
|
||||
}
|
||||
|
||||
// aperta da link (?q=numero ordine): non sovrascrivo i filtri salvati dell'utente
|
||||
@@ -1479,10 +1522,13 @@ if ($action === 'order') {
|
||||
const orders = +k.orders || 0;
|
||||
$('#kOrders').text(fmtNum(orders));
|
||||
$('#kOpen').text(fmtNum(k.open_orders));
|
||||
$('#kLate').text(fmtNum(k.late));
|
||||
$('#kLateSub').html(`data ZIBO superata` +
|
||||
$('#kLate').html(`${fmtNum(k.late)} <span class="kpi-unit">ordini</span>`);
|
||||
$('#kLateSub').html(`<b style="color:var(--c-late);">${fmtNum(k.late_lines)}</b> righe in ritardo` +
|
||||
(+k.late_partial ? ` · ${fmtNum(k.late_partial)} parziali` : '') +
|
||||
`<br><span style="color:#ea580c;font-weight:700;">${fmtNum(k.late_client)}</span> oltre data cliente`);
|
||||
$('#kWeek').html(+k.week_orders ?
|
||||
`<i class="fa-solid fa-calendar-week"></i> <b>${fmtNum(k.week_orders)}</b> in consegna questa sett. · ${fmtNum(k.week_lines)} righe` :
|
||||
'<i class="fa-solid fa-calendar-check"></i> nessuna consegna in scadenza questa settimana');
|
||||
$('#kDelivered').text(fmtNum(k.delivered));
|
||||
$('#kToInvoice').text(fmtNum(k.to_invoice));
|
||||
$('#kCustomers').text(fmtNum(k.customers));
|
||||
@@ -1898,16 +1944,43 @@ if ($action === 'order') {
|
||||
});
|
||||
}
|
||||
|
||||
// cella consegna: data ZIBO (rossa se superata) + data cliente (arancione se superata)
|
||||
// Data ZIBO = settimana di consegna (impostazioni in MagoSalesStats)
|
||||
const ZIBO_WEEK = <?= MagoSalesStats::ZIBO_IS_WEEK ? 'true' : 'false' ?>;
|
||||
const ZIBO_END_DAYS = <?= (int)MagoSalesStats::ZIBO_WEEK_END_DAYS ?>;
|
||||
|
||||
// scadenza della data ZIBO: fine della settimana indicata
|
||||
function ziboEnd(z) {
|
||||
if (!z || !ZIBO_WEEK) return z;
|
||||
const d = new Date(String(z).substring(0, 10) + 'T00:00:00');
|
||||
d.setDate(d.getDate() - ((d.getDay() + 6) % 7) + ZIBO_END_DAYS);
|
||||
return iso(d);
|
||||
}
|
||||
|
||||
// stato della data ZIBO: 'late' (settimana finita), 'week' (settimana in corso), '' (futura)
|
||||
function ziboState(z, open) {
|
||||
if (!z || !open) return '';
|
||||
const today = iso(new Date());
|
||||
if (ziboEnd(z) < today) return 'late';
|
||||
if (ZIBO_WEEK && String(z).substring(0, 10) <= today) return 'week';
|
||||
return '';
|
||||
}
|
||||
|
||||
function ziboHtml(z, open, extra) {
|
||||
const st = ziboState(z, open);
|
||||
const title = ZIBO_WEEK ? ` title="Settimana del ${fmtDate(z)}: consegna entro ${fmtDate(ziboEnd(z))}"` : '';
|
||||
return `<div class="dt-zibo${st === 'late' ? ' late' : ''}"${title}><span class="dt-tag">ZIBO${ZIBO_WEEK ? ' sett.' : ''}</span>${fmtDate(z)}` +
|
||||
(st === 'week' ? '<span class="week-badge">IN SETTIMANA</span>' : '') + (extra || '') + '</div>';
|
||||
}
|
||||
|
||||
// cella consegna: data ZIBO (rossa a settimana finita, avviso in settimana) + data cliente (arancione se superata)
|
||||
function dateCell(zibo, client, opts) {
|
||||
opts = opts || {};
|
||||
const today = iso(new Date());
|
||||
const open = opts.open !== false;
|
||||
const zLate = open && zibo && zibo < today;
|
||||
const cLate = open && client && client < today;
|
||||
let html = '';
|
||||
if (zibo) {
|
||||
html += `<div class="dt-zibo${zLate ? ' late' : ''}"><span class="dt-tag">ZIBO</span>${fmtDate(zibo)}${opts.more ? `<span class="more-dates" title="Le righe aperte hanno date di consegna diverse">+${opts.more} date</span>` : ''}</div>`;
|
||||
html += ziboHtml(zibo, open, opts.more ? `<span class="more-dates" title="Le righe aperte hanno date di consegna diverse">+${opts.more} date</span>` : '');
|
||||
} else {
|
||||
html += `<div class="dt-fallback">data ZIBO non indicata</div>`;
|
||||
}
|
||||
@@ -2082,7 +2155,7 @@ if ($action === 'order') {
|
||||
const today = iso(new Date());
|
||||
const rows = lines.map(l => {
|
||||
const open = !+l.delivered && !+l.cancelled;
|
||||
const due = l.zibo_date || l.client_date;
|
||||
const due = l.zibo_date ? ziboEnd(l.zibo_date) : l.client_date;
|
||||
const late = open && due && due < today;
|
||||
const days = late ? Math.round((new Date(today) - new Date(due)) / 86400000) : 0;
|
||||
const st = +l.cancelled ? '<span class="st-badge st-annullato">Annullata</span>' :
|
||||
@@ -2187,6 +2260,12 @@ if ($action === 'order') {
|
||||
});
|
||||
$('#fSearch').on('input', () => scheduleLoad(450));
|
||||
|
||||
// striscia "in consegna questa settimana" dentro il box rosso: filtra solo quegli ordini
|
||||
$('#kpiGrid').on('click', '.kpi-week', function(e) {
|
||||
e.stopPropagation();
|
||||
toggleStatus('settimana', true);
|
||||
});
|
||||
|
||||
$('#kpiGrid').on('click', '.kpi', function() {
|
||||
if ($(this).data('nofilter')) return;
|
||||
const st = $(this).data('status');
|
||||
|
||||
Reference in New Issue
Block a user