From c5757b83222908e33bdcd755cfb79c142f3780b5 Mon Sep 17 00:00:00 2001 From: Claude Agent Date: Fri, 27 Mar 2026 11:19:42 +0000 Subject: [PATCH 01/22] refactor(modal): extract order detail to shared.js Move duplicated order detail modal logic from dashboard.js and logs.js into a shared renderOrderDetailModal() function in shared.js. Move modal HTML from dashboard.html and logs.html into base.html. Shared functions: renderCodmatCell, orderStatusBadge, fmtCost, fmtNum, computeDiscountSplit, renderReceipt. Both pages now call the shared modal with page-specific quick map callbacks. Net -152 lines. Logs page gains invoice info, TVA column, and receipt footer that were previously dashboard-only. Co-Authored-By: Claude Opus 4.6 (1M context) --- api/app/static/js/dashboard.js | 296 +---------------------------- api/app/static/js/logs.js | 139 +------------- api/app/static/js/shared.js | 313 +++++++++++++++++++++++++++++++ api/app/templates/base.html | 57 +++++- api/app/templates/dashboard.html | 58 +----- api/app/templates/logs.html | 57 +----- 6 files changed, 384 insertions(+), 536 deletions(-) diff --git a/api/app/static/js/dashboard.js b/api/app/static/js/dashboard.js index 6415752..5e47c61 100644 --- a/api/app/static/js/dashboard.js +++ b/api/app/static/js/dashboard.js @@ -432,14 +432,6 @@ function escHtml(s) { .replace(/'/g, '''); } -// Alias kept for backward compat with inline handlers in modal -function esc(s) { return escHtml(s); } - -function fmtCost(v) { - return v > 0 ? Number(v).toFixed(2) : '–'; -} - - function statusLabelText(status) { switch ((status || '').toUpperCase()) { case 'IMPORTED': return 'Importat'; @@ -450,40 +442,12 @@ function statusLabelText(status) { } } -function orderStatusBadge(status) { - switch ((status || '').toUpperCase()) { - case 'IMPORTED': return 'Importat'; - case 'ALREADY_IMPORTED': return 'Deja importat'; - case 'SKIPPED': return 'Omis'; - case 'ERROR': return 'Eroare'; - case 'CANCELLED': return 'Anulat'; - case 'DELETED_IN_ROA': return 'Sters din ROA'; - default: return `${esc(status)}`; - } -} - function invoiceDot(order) { if (order.status !== 'IMPORTED' && order.status !== 'ALREADY_IMPORTED') return '–'; if (order.invoice && order.invoice.facturat) return ''; return ''; } -function renderCodmatCell(item) { - if (!item.codmat_details || item.codmat_details.length === 0) { - return `${esc(item.codmat || '-')}`; - } - if (item.codmat_details.length === 1) { - const d = item.codmat_details[0]; - if (d.direct) { - return `${esc(d.codmat)} direct`; - } - return `${esc(d.codmat)}`; - } - return item.codmat_details.map(d => - `
${esc(d.codmat)} \xd7${d.cantitate_roa}
` - ).join(''); -} - // ── Refresh Invoices ────────────────────────────── async function refreshInvoices() { @@ -509,262 +473,12 @@ async function refreshInvoices() { // ── Order Detail Modal ──────────────────────────── -async function openDashOrderDetail(orderNumber) { - document.getElementById('detailOrderNumber').textContent = '#' + orderNumber; - document.getElementById('detailCustomer').textContent = '...'; - document.getElementById('detailDate').textContent = ''; - document.getElementById('detailStatus').innerHTML = ''; - document.getElementById('detailIdComanda').textContent = '-'; - document.getElementById('detailIdPartener').textContent = '-'; - document.getElementById('detailIdAdresaFact').textContent = '-'; - document.getElementById('detailIdAdresaLivr').textContent = '-'; - document.getElementById('detailItemsBody').innerHTML = 'Se incarca...'; - document.getElementById('detailError').style.display = 'none'; - document.getElementById('detailReceipt').innerHTML = ''; - document.getElementById('detailReceiptMobile').innerHTML = ''; - const invInfo = document.getElementById('detailInvoiceInfo'); - if (invInfo) invInfo.style.display = 'none'; - const mobileContainer = document.getElementById('detailItemsMobile'); - if (mobileContainer) mobileContainer.innerHTML = ''; - - const modalEl = document.getElementById('orderDetailModal'); - const existing = bootstrap.Modal.getInstance(modalEl); - if (existing) { existing.show(); } else { new bootstrap.Modal(modalEl).show(); } - - try { - const res = await fetch(`/api/sync/order/${encodeURIComponent(orderNumber)}`); - const data = await res.json(); - - if (data.error) { - document.getElementById('detailError').textContent = data.error; - document.getElementById('detailError').style.display = ''; - return; - } - - const order = data.order || {}; - document.getElementById('detailCustomer').textContent = order.customer_name || '-'; - document.getElementById('detailDate').textContent = fmtDate(order.order_date); - document.getElementById('detailStatus').innerHTML = orderStatusBadge(order.status); - document.getElementById('detailIdComanda').textContent = order.id_comanda || '-'; - document.getElementById('detailIdPartener').textContent = order.id_partener || '-'; - document.getElementById('detailIdAdresaFact').textContent = order.id_adresa_facturare || '-'; - document.getElementById('detailIdAdresaLivr').textContent = order.id_adresa_livrare || '-'; - - // Invoice info - const invInfo = document.getElementById('detailInvoiceInfo'); - const inv = order.invoice; - if (inv && inv.facturat) { - const serie = inv.serie_act || ''; - const numar = inv.numar_act || ''; - document.getElementById('detailInvoiceNumber').textContent = serie ? `${serie} ${numar}` : numar; - document.getElementById('detailInvoiceDate').textContent = inv.data_act ? fmtDate(inv.data_act) : '-'; - if (invInfo) invInfo.style.display = ''; - } else { - if (invInfo) invInfo.style.display = 'none'; - } - - if (order.error_message) { - document.getElementById('detailError').textContent = order.error_message; - document.getElementById('detailError').style.display = ''; - } - - const items = data.items || []; - if (items.length === 0) { - document.getElementById('detailItemsBody').innerHTML = 'Niciun articol'; - return; - } - - // Store items for quick map pre-population - window._detailItems = items; - - // Mobile article flat list - const mobileContainer = document.getElementById('detailItemsMobile'); - if (mobileContainer) { - let mobileHtml = items.map((item, idx) => { - const codmatText = item.codmat_details?.length - ? item.codmat_details.map(d => `${esc(d.codmat)}${d.direct ? ' direct' : ''}`).join(' ') - : `${esc(item.codmat || '–')}`; - const valoare = (Number(item.price || 0) * Number(item.quantity || 0)); - return `
-
- ${esc(item.sku)} - ${codmatText} -
-
- ${esc(item.product_name || '–')} - x${item.quantity || 0} - ${fmtNum(valoare)} lei - TVA ${item.vat != null ? Number(item.vat) : '?'} -
-
`; - }).join(''); - - // Transport row (mobile) - if (order.delivery_cost > 0) { - const tVat = order.transport_vat || '21'; - mobileHtml += `
-
- Transport - x1 - ${fmtNum(order.delivery_cost)} lei - TVA ${tVat} -
-
`; - } - - // Discount rows (mobile) - if (order.discount_total > 0) { - const discSplit = computeDiscountSplit(items, order); - if (discSplit) { - Object.entries(discSplit) - .sort(([a], [b]) => Number(a) - Number(b)) - .forEach(([rate, amt]) => { - if (amt > 0) mobileHtml += `
-
- Discount - x\u20131 - ${fmtNum(amt)} lei - TVA ${Number(rate)} -
-
`; - }); - } else { - mobileHtml += `
-
- Discount - x\u20131 - ${fmtNum(order.discount_total)} lei -
-
`; - } - } - - mobileContainer.innerHTML = '
' + mobileHtml + '
'; - } - - let tableHtml = items.map((item, idx) => { - const valoare = Number(item.price || 0) * Number(item.quantity || 0); - return ` - ${esc(item.sku)} - ${esc(item.product_name || '-')} - ${renderCodmatCell(item)} - ${item.quantity || 0} - ${item.price != null ? fmtNum(item.price) : '-'} - ${item.vat != null ? Number(item.vat) : '-'} - ${fmtNum(valoare)} - `; - }).join(''); - - // Transport row - if (order.delivery_cost > 0) { - const tVat = order.transport_vat || '21'; - const tCodmat = order.transport_codmat || ''; - tableHtml += ` - Transport - ${tCodmat ? '' + esc(tCodmat) + '' : ''} - 1${fmtNum(order.delivery_cost)} - ${tVat}${fmtNum(order.delivery_cost)} - `; - } - - // Discount rows (split by VAT rate) - if (order.discount_total > 0) { - const dCodmat = order.discount_codmat || ''; - const discSplit = computeDiscountSplit(items, order); - if (discSplit) { - Object.entries(discSplit) - .sort(([a], [b]) => Number(a) - Number(b)) - .forEach(([rate, amt]) => { - if (amt > 0) tableHtml += ` - Discount - ${dCodmat ? '' + esc(dCodmat) + '' : ''} - \u20131${fmtNum(amt)} - ${Number(rate)}\u2013${fmtNum(amt)} - `; - }); - } else { - tableHtml += ` - Discount - ${dCodmat ? '' + esc(dCodmat) + '' : ''} - \u20131${fmtNum(order.discount_total)} - -\u2013${fmtNum(order.discount_total)} - `; - } - } - - document.getElementById('detailItemsBody').innerHTML = tableHtml; - - // Receipt footer (just total) - renderReceipt(items, order); - } catch (err) { - document.getElementById('detailError').textContent = err.message; - document.getElementById('detailError').style.display = ''; - } -} - -function fmtNum(v) { - return Number(v).toLocaleString('ro-RO', { minimumFractionDigits: 2, maximumFractionDigits: 2 }); -} - -function computeDiscountSplit(items, order) { - if (order.discount_split && typeof order.discount_split === 'object') - return order.discount_split; - - // Compute proportionally from items by VAT rate - const byRate = {}; - items.forEach(item => { - const rate = item.vat != null ? Number(item.vat) : null; - if (rate === null) return; - if (!byRate[rate]) byRate[rate] = 0; - byRate[rate] += Number(item.price || 0) * Number(item.quantity || 0); +function openDashOrderDetail(orderNumber) { + _sharedModalQuickMapFn = openDashQuickMap; + renderOrderDetailModal(orderNumber, { + onQuickMap: openDashQuickMap, + onAfterRender: function() { /* nothing extra needed */ } }); - const rates = Object.keys(byRate).sort((a, b) => Number(a) - Number(b)); - if (rates.length === 0) return null; - - const grandTotal = rates.reduce((s, r) => s + byRate[r], 0); - if (grandTotal <= 0) return null; - - const split = {}; - let remaining = order.discount_total; - rates.forEach((rate, i) => { - if (i === rates.length - 1) { - split[rate] = Math.round(remaining * 100) / 100; - } else { - const amt = Math.round(order.discount_total * byRate[rate] / grandTotal * 100) / 100; - split[rate] = amt; - remaining -= amt; - } - }); - return split; -} - -function renderReceipt(items, order) { - const desktop = document.getElementById('detailReceipt'); - const mobile = document.getElementById('detailReceiptMobile'); - if (!items.length) { - desktop.innerHTML = ''; - mobile.innerHTML = ''; - return; - } - - const articole = items.reduce((s, i) => s + Number(i.price || 0) * Number(i.quantity || 0), 0); - const discount = Number(order.discount_total || 0); - const transport = Number(order.delivery_cost || 0); - const total = order.order_total != null ? fmtNum(order.order_total) : '-'; - - // Desktop: full labels - let dHtml = `Articole: ${fmtNum(articole)}`; - if (discount > 0) dHtml += `Discount: \u2013${fmtNum(discount)}`; - if (transport > 0) dHtml += `Transport: ${fmtNum(transport)}`; - dHtml += `Total: ${total} lei`; - desktop.innerHTML = dHtml; - - // Mobile: shorter labels - let mHtml = `Art: ${fmtNum(articole)}`; - if (discount > 0) mHtml += `Disc: \u2013${fmtNum(discount)}`; - if (transport > 0) mHtml += `Transp: ${fmtNum(transport)}`; - mHtml += `Total: ${total} lei`; - mobile.innerHTML = mHtml; } // ── Quick Map Modal (uses shared openQuickMap) ─── diff --git a/api/app/static/js/logs.js b/api/app/static/js/logs.js index b70dedb..fd5eaf5 100644 --- a/api/app/static/js/logs.js +++ b/api/app/static/js/logs.js @@ -8,10 +8,6 @@ let ordersPage = 1; let ordersSortColumn = 'order_date'; let ordersSortDirection = 'desc'; -function fmtCost(v) { - return v > 0 ? Number(v).toFixed(2) : '–'; -} - function fmtDuration(startedAt, finishedAt) { if (!startedAt || !finishedAt) return '-'; const diffMs = new Date(finishedAt) - new Date(startedAt); @@ -30,17 +26,6 @@ function runStatusBadge(status) { } } -function orderStatusBadge(status) { - switch ((status || '').toUpperCase()) { - case 'IMPORTED': return 'Importat'; - case 'ALREADY_IMPORTED': return 'Deja importat'; - case 'SKIPPED': return 'Omis'; - case 'ERROR': return 'Eroare'; - case 'DELETED_IN_ROA': return 'Sters din ROA'; - default: return `${esc(status)}`; - } -} - function logStatusText(status) { switch ((status || '').toUpperCase()) { case 'IMPORTED': return 'Importat'; @@ -296,125 +281,17 @@ async function fetchTextLog(runId) { } } -// ── Multi-CODMAT helper (D1) ───────────────────── - -function renderCodmatCell(item) { - if (!item.codmat_details || item.codmat_details.length === 0) { - return `${esc(item.codmat || '-')}`; - } - if (item.codmat_details.length === 1) { - const d = item.codmat_details[0]; - return `${esc(d.codmat)}`; - } - // Multi-CODMAT: compact list - return item.codmat_details.map(d => - `
${esc(d.codmat)} \xd7${d.cantitate_roa}
` - ).join(''); -} - // ── Order Detail Modal (R9) ───────────────────── -async function openOrderDetail(orderNumber) { - document.getElementById('detailOrderNumber').textContent = '#' + orderNumber; - document.getElementById('detailCustomer').textContent = '...'; - document.getElementById('detailDate').textContent = ''; - document.getElementById('detailStatus').innerHTML = ''; - document.getElementById('detailIdComanda').textContent = '-'; - document.getElementById('detailIdPartener').textContent = '-'; - document.getElementById('detailIdAdresaFact').textContent = '-'; - document.getElementById('detailIdAdresaLivr').textContent = '-'; - document.getElementById('detailItemsBody').innerHTML = 'Se incarca...'; - document.getElementById('detailError').style.display = 'none'; - const detailItemsTotal = document.getElementById('detailItemsTotal'); - if (detailItemsTotal) detailItemsTotal.textContent = '-'; - const detailOrderTotal = document.getElementById('detailOrderTotal'); - if (detailOrderTotal) detailOrderTotal.textContent = '-'; - const mobileContainer = document.getElementById('detailItemsMobile'); - if (mobileContainer) mobileContainer.innerHTML = ''; - - const modalEl = document.getElementById('orderDetailModal'); - const existing = bootstrap.Modal.getInstance(modalEl); - if (existing) { existing.show(); } else { new bootstrap.Modal(modalEl).show(); } - - try { - const res = await fetch(`/api/sync/order/${encodeURIComponent(orderNumber)}`); - const data = await res.json(); - - if (data.error) { - document.getElementById('detailError').textContent = data.error; - document.getElementById('detailError').style.display = ''; - return; +function openOrderDetail(orderNumber) { + _sharedModalQuickMapFn = function(sku, productName, orderNum, itemIdx) { + openLogsQuickMap(sku, productName, orderNum); + }; + renderOrderDetailModal(orderNumber, { + onQuickMap: function(sku, productName, orderNum, itemIdx) { + openLogsQuickMap(sku, productName, orderNum); } - - const order = data.order || {}; - document.getElementById('detailCustomer').textContent = order.customer_name || '-'; - document.getElementById('detailDate').textContent = fmtDate(order.order_date); - document.getElementById('detailStatus').innerHTML = orderStatusBadge(order.status); - document.getElementById('detailIdComanda').textContent = order.id_comanda || '-'; - document.getElementById('detailIdPartener').textContent = order.id_partener || '-'; - document.getElementById('detailIdAdresaFact').textContent = order.id_adresa_facturare || '-'; - document.getElementById('detailIdAdresaLivr').textContent = order.id_adresa_livrare || '-'; - - if (order.error_message) { - document.getElementById('detailError').textContent = order.error_message; - document.getElementById('detailError').style.display = ''; - } - - const dlvEl = document.getElementById('detailDeliveryCost'); - if (dlvEl) dlvEl.textContent = order.delivery_cost > 0 ? Number(order.delivery_cost).toFixed(2) + ' lei' : '–'; - - const dscEl = document.getElementById('detailDiscount'); - if (dscEl) dscEl.textContent = order.discount_total > 0 ? '–' + Number(order.discount_total).toFixed(2) + ' lei' : '–'; - - const items = data.items || []; - if (items.length === 0) { - document.getElementById('detailItemsBody').innerHTML = 'Niciun articol'; - return; - } - - // Update totals row - const itemsTotal = items.reduce((sum, item) => sum + (Number(item.price || 0) * Number(item.quantity || 0)), 0); - document.getElementById('detailItemsTotal').textContent = itemsTotal.toFixed(2) + ' lei'; - document.getElementById('detailOrderTotal').textContent = order.order_total != null ? Number(order.order_total).toFixed(2) + ' lei' : '-'; - - // Mobile article flat list - const mobileContainer = document.getElementById('detailItemsMobile'); - if (mobileContainer) { - mobileContainer.innerHTML = '
' + items.map((item, idx) => { - const codmatList = item.codmat_details?.length - ? item.codmat_details.map(d => `${esc(d.codmat)}`).join(' ') - : `${esc(item.codmat || '–')}`; - const valoare = (Number(item.price || 0) * Number(item.quantity || 0)).toFixed(2); - return `
-
- ${esc(item.sku)} - ${codmatList} -
-
- ${esc(item.product_name || '–')} - x${item.quantity || 0} - ${valoare} lei -
-
`; - }).join('') + '
'; - } - - document.getElementById('detailItemsBody').innerHTML = items.map(item => { - const valoare = (Number(item.price || 0) * Number(item.quantity || 0)).toFixed(2); - const codmatCell = `${renderCodmatCell(item)}`; - return ` - ${esc(item.sku)} - ${esc(item.product_name || '-')} - ${codmatCell} - ${item.quantity || 0} - ${item.price != null ? Number(item.price).toFixed(2) : '-'} - ${valoare} - `; - }).join(''); - } catch (err) { - document.getElementById('detailError').textContent = err.message; - document.getElementById('detailError').style.display = ''; - } + }); } // ── Quick Map Modal (uses shared openQuickMap) ─── diff --git a/api/app/static/js/shared.js b/api/app/static/js/shared.js index 5486eb2..9ac20ee 100644 --- a/api/app/static/js/shared.js +++ b/api/app/static/js/shared.js @@ -352,6 +352,319 @@ async function saveQuickMapping() { } } +// ── Shared helpers (moved from dashboard.js/logs.js) ─ + +function fmtCost(v) { + return v > 0 ? Number(v).toFixed(2) : '–'; +} + +function fmtNum(v) { + return Number(v).toLocaleString('ro-RO', { minimumFractionDigits: 2, maximumFractionDigits: 2 }); +} + +function orderStatusBadge(status) { + switch ((status || '').toUpperCase()) { + case 'IMPORTED': return 'Importat'; + case 'ALREADY_IMPORTED': return 'Deja importat'; + case 'SKIPPED': return 'Omis'; + case 'ERROR': return 'Eroare'; + case 'CANCELLED': return 'Anulat'; + case 'DELETED_IN_ROA': return 'Sters din ROA'; + default: return `${esc(status)}`; + } +} + +function renderCodmatCell(item) { + if (!item.codmat_details || item.codmat_details.length === 0) { + return `${esc(item.codmat || '-')}`; + } + if (item.codmat_details.length === 1) { + const d = item.codmat_details[0]; + if (d.direct) { + return `${esc(d.codmat)} direct`; + } + return `${esc(d.codmat)}`; + } + return item.codmat_details.map(d => + `
${esc(d.codmat)} \xd7${d.cantitate_roa}
` + ).join(''); +} + +function computeDiscountSplit(items, order) { + if (order.discount_split && typeof order.discount_split === 'object') + return order.discount_split; + + const byRate = {}; + items.forEach(item => { + const rate = item.vat != null ? Number(item.vat) : null; + if (rate === null) return; + if (!byRate[rate]) byRate[rate] = 0; + byRate[rate] += Number(item.price || 0) * Number(item.quantity || 0); + }); + const rates = Object.keys(byRate).sort((a, b) => Number(a) - Number(b)); + if (rates.length === 0) return null; + + const grandTotal = rates.reduce((s, r) => s + byRate[r], 0); + if (grandTotal <= 0) return null; + + const split = {}; + let remaining = order.discount_total; + rates.forEach((rate, i) => { + if (i === rates.length - 1) { + split[rate] = Math.round(remaining * 100) / 100; + } else { + const amt = Math.round(order.discount_total * byRate[rate] / grandTotal * 100) / 100; + split[rate] = amt; + remaining -= amt; + } + }); + return split; +} + +function _renderReceipt(items, order) { + const desktop = document.getElementById('detailReceipt'); + const mobile = document.getElementById('detailReceiptMobile'); + if (!desktop && !mobile) return; + if (!items.length) { + if (desktop) desktop.innerHTML = ''; + if (mobile) mobile.innerHTML = ''; + return; + } + + const articole = items.reduce((s, i) => s + Number(i.price || 0) * Number(i.quantity || 0), 0); + const discount = Number(order.discount_total || 0); + const transport = Number(order.delivery_cost || 0); + const total = order.order_total != null ? fmtNum(order.order_total) : '-'; + + let dHtml = `Articole: ${fmtNum(articole)}`; + if (discount > 0) dHtml += `Discount: \u2013${fmtNum(discount)}`; + if (transport > 0) dHtml += `Transport: ${fmtNum(transport)}`; + dHtml += `Total: ${total} lei`; + if (desktop) desktop.innerHTML = dHtml; + + let mHtml = `Art: ${fmtNum(articole)}`; + if (discount > 0) mHtml += `Disc: \u2013${fmtNum(discount)}`; + if (transport > 0) mHtml += `Transp: ${fmtNum(transport)}`; + mHtml += `Total: ${total} lei`; + if (mobile) mobile.innerHTML = mHtml; +} + +// ── Order Detail Modal (shared) ────────────────── +/** + * Render and show the order detail modal. + * @param {string} orderNumber + * @param {object} opts + * @param {function} opts.onQuickMap - (sku, productName, orderNumber, itemIdx) => void + * @param {function} [opts.onAfterRender] - (order, items) => void + */ +async function renderOrderDetailModal(orderNumber, opts) { + opts = opts || {}; + + // Reset modal state + document.getElementById('detailOrderNumber').textContent = '#' + orderNumber; + document.getElementById('detailCustomer').textContent = '...'; + document.getElementById('detailDate').textContent = ''; + document.getElementById('detailStatus').innerHTML = ''; + document.getElementById('detailIdComanda').textContent = '-'; + document.getElementById('detailIdPartener').textContent = '-'; + document.getElementById('detailIdAdresaFact').textContent = '-'; + document.getElementById('detailIdAdresaLivr').textContent = '-'; + document.getElementById('detailItemsBody').innerHTML = 'Se incarca...'; + document.getElementById('detailError').style.display = 'none'; + const receiptEl = document.getElementById('detailReceipt'); + if (receiptEl) receiptEl.innerHTML = ''; + const receiptMEl = document.getElementById('detailReceiptMobile'); + if (receiptMEl) receiptMEl.innerHTML = ''; + const invInfo = document.getElementById('detailInvoiceInfo'); + if (invInfo) invInfo.style.display = 'none'; + const mobileContainer = document.getElementById('detailItemsMobile'); + if (mobileContainer) mobileContainer.innerHTML = ''; + + const modalEl = document.getElementById('orderDetailModal'); + const existing = bootstrap.Modal.getInstance(modalEl); + if (existing) { existing.show(); } else { new bootstrap.Modal(modalEl).show(); } + + try { + const res = await fetch(`/api/sync/order/${encodeURIComponent(orderNumber)}`); + const data = await res.json(); + + if (data.error) { + document.getElementById('detailError').textContent = data.error; + document.getElementById('detailError').style.display = ''; + return; + } + + const order = data.order || {}; + document.getElementById('detailCustomer').textContent = order.customer_name || '-'; + document.getElementById('detailDate').textContent = fmtDate(order.order_date); + document.getElementById('detailStatus').innerHTML = orderStatusBadge(order.status); + document.getElementById('detailIdComanda').textContent = order.id_comanda || '-'; + document.getElementById('detailIdPartener').textContent = order.id_partener || '-'; + document.getElementById('detailIdAdresaFact').textContent = order.id_adresa_facturare || '-'; + document.getElementById('detailIdAdresaLivr').textContent = order.id_adresa_livrare || '-'; + + // Invoice info + const inv = order.invoice; + if (inv && inv.facturat) { + const serie = inv.serie_act || ''; + const numar = inv.numar_act || ''; + document.getElementById('detailInvoiceNumber').textContent = serie ? `${serie} ${numar}` : numar; + document.getElementById('detailInvoiceDate').textContent = inv.data_act ? fmtDate(inv.data_act) : '-'; + if (invInfo) invInfo.style.display = ''; + } + + if (order.error_message) { + document.getElementById('detailError').textContent = order.error_message; + document.getElementById('detailError').style.display = ''; + } + + const items = data.items || []; + if (items.length === 0) { + document.getElementById('detailItemsBody').innerHTML = 'Niciun articol'; + return; + } + + // Store items for quick map pre-population + window._detailItems = items; + + const qmFn = opts.onQuickMap ? opts.onQuickMap.name || '_sharedQuickMap' : null; + + // Mobile article flat list + if (mobileContainer) { + let mobileHtml = items.map((item, idx) => { + const codmatText = item.codmat_details?.length + ? item.codmat_details.map(d => `${esc(d.codmat)}${d.direct ? ' direct' : ''}`).join(' ') + : `${esc(item.codmat || '–')}`; + const valoare = (Number(item.price || 0) * Number(item.quantity || 0)); + const clickAttr = opts.onQuickMap ? `onclick="_sharedModalQuickMap('${esc(item.sku)}','${esc(item.product_name||'')}','${esc(orderNumber)}',${idx})"` : ''; + return `
+
+ ${esc(item.sku)} + ${codmatText} +
+
+ ${esc(item.product_name || '–')} + x${item.quantity || 0} + ${fmtNum(valoare)} lei + TVA ${item.vat != null ? Number(item.vat) : '?'} +
+
`; + }).join(''); + + // Transport row (mobile) + if (order.delivery_cost > 0) { + const tVat = order.transport_vat || '21'; + mobileHtml += `
+
+ Transport + x1 + ${fmtNum(order.delivery_cost)} lei + TVA ${tVat} +
+
`; + } + + // Discount rows (mobile) + if (order.discount_total > 0) { + const discSplit = computeDiscountSplit(items, order); + if (discSplit) { + Object.entries(discSplit) + .sort(([a], [b]) => Number(a) - Number(b)) + .forEach(([rate, amt]) => { + if (amt > 0) mobileHtml += `
+
+ Discount + x\u20131 + ${fmtNum(amt)} lei + TVA ${Number(rate)} +
+
`; + }); + } else { + mobileHtml += `
+
+ Discount + x\u20131 + ${fmtNum(order.discount_total)} lei +
+
`; + } + } + + mobileContainer.innerHTML = '
' + mobileHtml + '
'; + } + + // Desktop items table + const clickAttrFn = (item, idx) => opts.onQuickMap + ? `onclick="_sharedModalQuickMap('${esc(item.sku)}', '${esc(item.product_name || '')}', '${esc(orderNumber)}', ${idx})" title="Click pentru mapare"` + : ''; + + let tableHtml = items.map((item, idx) => { + const valoare = Number(item.price || 0) * Number(item.quantity || 0); + return ` + ${esc(item.sku)} + ${esc(item.product_name || '-')} + ${renderCodmatCell(item)} + ${item.quantity || 0} + ${item.price != null ? fmtNum(item.price) : '-'} + ${item.vat != null ? Number(item.vat) : '-'} + ${fmtNum(valoare)} + `; + }).join(''); + + // Transport row + if (order.delivery_cost > 0) { + const tVat = order.transport_vat || '21'; + const tCodmat = order.transport_codmat || ''; + tableHtml += ` + Transport + ${tCodmat ? '' + esc(tCodmat) + '' : ''} + 1${fmtNum(order.delivery_cost)} + ${tVat}${fmtNum(order.delivery_cost)} + `; + } + + // Discount rows (split by VAT rate) + if (order.discount_total > 0) { + const dCodmat = order.discount_codmat || ''; + const discSplit = computeDiscountSplit(items, order); + if (discSplit) { + Object.entries(discSplit) + .sort(([a], [b]) => Number(a) - Number(b)) + .forEach(([rate, amt]) => { + if (amt > 0) tableHtml += ` + Discount + ${dCodmat ? '' + esc(dCodmat) + '' : ''} + \u20131${fmtNum(amt)} + ${Number(rate)}\u2013${fmtNum(amt)} + `; + }); + } else { + tableHtml += ` + Discount + ${dCodmat ? '' + esc(dCodmat) + '' : ''} + \u20131${fmtNum(order.discount_total)} + -\u2013${fmtNum(order.discount_total)} + `; + } + } + + document.getElementById('detailItemsBody').innerHTML = tableHtml; + _renderReceipt(items, order); + + if (opts.onAfterRender) opts.onAfterRender(order, items); + } catch (err) { + document.getElementById('detailError').textContent = err.message; + document.getElementById('detailError').style.display = ''; + } +} + +// Global quick map dispatcher — set by each page +let _sharedModalQuickMapFn = null; +function _sharedModalQuickMap(sku, productName, orderNumber, itemIdx) { + if (_sharedModalQuickMapFn) _sharedModalQuickMapFn(sku, productName, orderNumber, itemIdx); +} + // ── Dot helper ──────────────────────────────────── function statusDot(status) { switch ((status || '').toUpperCase()) { diff --git a/api/app/templates/base.html b/api/app/templates/base.html index be75f6b..a20ef89 100644 --- a/api/app/templates/base.html +++ b/api/app/templates/base.html @@ -59,9 +59,64 @@ + + + - + {% block scripts %}{% endblock %} diff --git a/api/app/templates/dashboard.html b/api/app/templates/dashboard.html index fdb543f..570b675 100644 --- a/api/app/templates/dashboard.html +++ b/api/app/templates/dashboard.html @@ -109,64 +109,8 @@
- - - - {% endblock %} {% block scripts %} - + {% endblock %} diff --git a/api/app/templates/logs.html b/api/app/templates/logs.html index cc6eb8f..dea03cb 100644 --- a/api/app/templates/logs.html +++ b/api/app/templates/logs.html @@ -96,65 +96,10 @@ - - - - {% endblock %} {% block scripts %} - + {% endblock %} From a8292c2ef266c31a2e9b0754b6b3f77683c1e227 Mon Sep 17 00:00:00 2001 From: Claude Agent Date: Fri, 27 Mar 2026 11:36:07 +0000 Subject: [PATCH 02/22] style(design): migrate to DESIGN.md system Full visual migration: Space Grotesk + DM Sans + JetBrains Mono fonts, warm amber two-accent system (amber=state, blue=action), dark mode with CSS vars + localStorage + FOUC prevention, mobile bottom nav (5 tabs), full-width tables, error/skipped dot glow, ~13 hardcoded hex replaced with CSS vars in 4 JS files, 5 new E2E tests. Files: style.css (full rewrite), base.html (fonts, theme script, dark toggle, bottom nav), settings.html (dark toggle card), dashboard.js, logs.js, mappings.js, settings.js (color vars), 5 templates (bnav active blocks), test_design_system_e2e.py (NEW). Cache-bust: style.css?v=18, shared.js?v=14, dashboard.js?v=27, logs.js?v=13, mappings.js?v=12, settings.js?v=8 Co-Authored-By: Claude Opus 4.6 (1M context) --- api/app/static/css/style.css | 510 ++++++++++++++++-------- api/app/static/js/dashboard.js | 4 +- api/app/static/js/logs.js | 8 +- api/app/static/js/mappings.js | 6 +- api/app/static/js/settings.js | 15 +- api/app/templates/base.html | 56 ++- api/app/templates/dashboard.html | 3 +- api/app/templates/logs.html | 3 +- api/app/templates/mappings.html | 3 +- api/app/templates/missing_skus.html | 1 + api/app/templates/settings.html | 15 +- api/tests/e2e/test_design_system_e2e.py | 105 +++++ api/tests/e2e/test_order_detail.py | 4 +- 13 files changed, 550 insertions(+), 183 deletions(-) create mode 100644 api/tests/e2e/test_design_system_e2e.py diff --git a/api/app/static/css/style.css b/api/app/static/css/style.css index a0c1e45..191a48d 100644 --- a/api/app/static/css/style.css +++ b/api/app/static/css/style.css @@ -1,49 +1,171 @@ -/* ── Design tokens ───────────────────────────────── */ +/* ── Design tokens (DESIGN.md) ───────────────────── */ :root { + /* Fonts */ + --font-display: 'Space Grotesk', sans-serif; + --font-body: 'DM Sans', sans-serif; + --font-data: 'JetBrains Mono', monospace; + /* Surfaces */ - --body-bg: #f9fafb; - --card-bg: #ffffff; - --card-shadow: 0 1px 3px rgba(0,0,0,0.1), 0 1px 2px rgba(0,0,0,0.06); + --bg: #F8F7F5; + --surface: #FFFFFF; + --surface-raised: #F3F2EF; + --card-shadow: 0 1px 3px rgba(28,25,23,0.1), 0 1px 2px rgba(28,25,23,0.06); --card-radius: 0.5rem; - /* Semantic colors */ - --blue-600: #2563eb; - --blue-700: #1d4ed8; - --green-100: #dcfce7; --green-800: #166534; - --yellow-100: #fef9c3; --yellow-800: #854d0e; - --red-100: #fee2e2; --red-800: #991b1b; - --blue-100: #dbeafe; --blue-800: #1e40af; - /* Text */ - --text-primary: #111827; - --text-secondary: #4b5563; - --text-muted: #6b7280; - --border-color: #e5e7eb; + --text-primary: #1C1917; + --text-secondary: #57534E; + --text-muted: #78716C; - /* Dots */ - --dot-green: #22c55e; - --dot-yellow: #eab308; - --dot-red: #ef4444; + /* Borders */ + --border: #E7E5E4; + --border-subtle: #F0EFED; + + /* Accent — amber (state: nav active, filter pills) */ + --accent: #D97706; + --accent-hover: #B45309; + --accent-light: #FEF3C7; + --accent-text: #92400E; + + /* Semantic */ + --success: #16A34A; + --success-light: #DCFCE7; + --success-text: #166534; + + --warning: #CA8A04; + --warning-light: #FEF9C3; + --warning-text: #854D0E; + + --error: #DC2626; + --error-light: #FEE2E2; + --error-text: #991B1B; + + --info: #2563EB; + --info-hover: #1D4ED8; + --info-light: #DBEAFE; + --info-text: #1E40AF; + + --cancelled: #78716C; + --cancelled-light: #F5F5F4; + + /* Border radius */ + --radius-sm: 4px; + --radius-md: 8px; + --radius-lg: 12px; + --radius-full: 9999px; } +/* ── Dark mode ──────────────────────────────────── */ +[data-theme="dark"] { + --bg: #121212; + --surface: #1E1E1E; + --surface-raised: #2A2A2A; + --card-shadow: 0 1px 3px rgba(0,0,0,0.4), 0 1px 2px rgba(0,0,0,0.3); + + --text-primary: #E8E4DD; + --text-secondary: #A8A29E; + --text-muted: #78716C; + + --border: #333333; + --border-subtle: #262626; + + --accent: #F59E0B; + --accent-hover: #D97706; + --accent-light: rgba(245,158,11,0.12); + --accent-text: #FCD34D; + + --success: #16A34A; + --success-light: rgba(22,163,74,0.15); + --success-text: #4ADE80; + + --warning: #CA8A04; + --warning-light: rgba(202,138,4,0.15); + --warning-text: #FACC15; + + --error: #DC2626; + --error-light: rgba(220,38,38,0.15); + --error-text: #FCA5A5; + + --info: #2563EB; + --info-hover: #3B82F6; + --info-light: rgba(37,99,235,0.15); + --info-text: #93C5FD; + + --cancelled: #78716C; + --cancelled-light: rgba(120,113,108,0.15); +} + +/* Dark mode overrides for elements with hardcoded colors */ +[data-theme="dark"] body { color-scheme: dark; } +[data-theme="dark"] .top-navbar { background: var(--surface); border-bottom-color: var(--border); } +[data-theme="dark"] .navbar-brand { color: var(--text-primary); } +[data-theme="dark"] .nav-tab { color: var(--text-muted); } +[data-theme="dark"] .nav-tab:hover { color: var(--text-primary); background: var(--surface-raised); } +[data-theme="dark"] .table th { background: var(--surface-raised); color: var(--text-muted); } +[data-theme="dark"] .table td { color: var(--text-secondary); } +[data-theme="dark"] .table tbody tr:nth-child(even) td { background-color: var(--surface-raised); } +[data-theme="dark"] .table-hover tbody tr:hover td { background-color: rgba(37,99,235,0.1) !important; } +[data-theme="dark"] .card-header { background: var(--surface); border-bottom-color: var(--border); } +[data-theme="dark"] .flat-row { border-bottom-color: var(--border-subtle); } +[data-theme="dark"] .flat-row:hover { background: var(--surface-raised); } +[data-theme="dark"] .filter-pill { background: var(--surface); border-color: var(--border); color: var(--text-secondary); } +[data-theme="dark"] .filter-pill:hover { background: var(--surface-raised); } +[data-theme="dark"] .page-btn { background: var(--surface); border-color: var(--border); color: var(--text-secondary); } +[data-theme="dark"] .page-btn:hover:not(:disabled):not(.active) { background: var(--surface-raised); border-color: var(--text-muted); color: var(--text-primary); } +[data-theme="dark"] .page-btn.active { background: var(--info); border-color: var(--info); } +[data-theme="dark"] .form-control, [data-theme="dark"] .form-select { background: var(--surface-raised); border-color: var(--border); color: var(--text-primary); } +[data-theme="dark"] .form-control:focus, [data-theme="dark"] .form-select:focus { border-color: var(--info); } +[data-theme="dark"] .sync-card { background: var(--surface); border-color: var(--border); } +[data-theme="dark"] .sync-card-info:hover { background: var(--surface-raised); } +[data-theme="dark"] .sync-card-progress { background: var(--info-light); color: var(--info-text); border-top-color: var(--border); } +[data-theme="dark"] .autocomplete-dropdown { background: var(--surface); border-color: var(--border); } +[data-theme="dark"] .autocomplete-item:hover, [data-theme="dark"] .autocomplete-item.active { background-color: var(--surface-raised); } +[data-theme="dark"] .autocomplete-item .codmat { color: var(--text-primary); } +[data-theme="dark"] .autocomplete-item .denumire { color: var(--text-muted); } +[data-theme="dark"] .context-menu { background: var(--surface); border-color: var(--border); } +[data-theme="dark"] .context-menu-item { color: var(--text-primary); } +[data-theme="dark"] .context-menu-item:hover { background: var(--surface-raised); } +[data-theme="dark"] .spinner-overlay { background: rgba(18,18,18,0.7); } +[data-theme="dark"] .modal-content { background: var(--surface); color: var(--text-primary); } +[data-theme="dark"] .modal-header { border-bottom-color: var(--border); } +[data-theme="dark"] .modal-footer { border-top-color: var(--border); } +[data-theme="dark"] .detail-item-card { border-color: var(--border); } +[data-theme="dark"] .select-compact { background: var(--surface); border-color: var(--border); color: var(--text-secondary); } +[data-theme="dark"] .search-input { background: var(--surface-raised); border-color: var(--border); color: var(--text-primary); } +[data-theme="dark"] .editable:hover { background-color: var(--surface-raised); } +[data-theme="dark"] .sortable:hover { background-color: var(--surface-raised); } +[data-theme="dark"] .result-banner { background: var(--success-light); color: var(--success-text); border-color: var(--success); } +[data-theme="dark"] .badge-pct.complete { background: var(--success-light); color: var(--success-text); } +[data-theme="dark"] .badge-pct.incomplete { background: var(--warning-light); color: var(--warning-text); } +[data-theme="dark"] .table-light { --bs-table-bg: var(--surface-raised); } +[data-theme="dark"] .bottom-nav { background: var(--surface); border-top-color: var(--border); } +[data-theme="dark"] .qm-line { border-bottom-color: var(--border-subtle); } + /* ── Base ────────────────────────────────────────── */ body { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; + font-family: var(--font-body); font-size: 1rem; - background-color: var(--body-bg); + background-color: var(--bg); + color: var(--text-primary); margin: 0; padding: 0; } h1, h2, h3, h4, h5, h6 { + font-family: var(--font-display); text-wrap: balance; } +/* Data font — selective: codes, numbers, sums, dates. NOT text names. */ +.font-data, code, .dif-sku, .detail-item-card .card-sku { + font-family: var(--font-data); +} + /* ── Checkboxes — accessible size ────────────────── */ input[type="checkbox"] { width: 1.125rem; height: 1.125rem; - accent-color: var(--blue-600); + accent-color: var(--info); cursor: pointer; } @@ -54,8 +176,8 @@ input[type="checkbox"] { left: 0; right: 0; height: 48px; - background: #fff; - border-bottom: 1px solid var(--border-color); + background: var(--surface); + border-bottom: 1px solid var(--border); display: flex; align-items: center; padding: 0 1.5rem; @@ -65,9 +187,10 @@ input[type="checkbox"] { } .navbar-brand { + font-family: var(--font-display); font-weight: 700; font-size: 1rem; - color: #111827; + color: var(--text-primary); white-space: nowrap; } @@ -78,6 +201,7 @@ input[type="checkbox"] { overflow-x: auto; -webkit-overflow-scrolling: touch; scrollbar-width: none; + flex: 1; } .navbar-links::-webkit-scrollbar { display: none; } @@ -86,7 +210,7 @@ input[type="checkbox"] { align-items: center; padding: 0 1rem; height: 48px; - color: #64748b; + color: var(--text-muted); text-decoration: none; font-size: 0.9375rem; font-weight: 500; @@ -96,15 +220,30 @@ input[type="checkbox"] { transition: color 0.15s, border-color 0.15s; } .nav-tab:hover { - color: #111827; - background: #f9fafb; + color: var(--text-primary); + background: var(--surface-raised); text-decoration: none; } .nav-tab.active { - color: var(--blue-600); - border-bottom-color: var(--blue-600); + color: var(--accent); + border-bottom-color: var(--accent); } +/* Dark toggle button in navbar */ +.dark-toggle { + background: none; + border: none; + color: var(--text-muted); + cursor: pointer; + padding: 0.25rem; + font-size: 1.125rem; + line-height: 1; + border-radius: var(--radius-sm); + transition: color 0.15s; + flex-shrink: 0; +} +.dark-toggle:hover { color: var(--text-primary); } + /* ── Main content ────────────────────────────────── */ .main-content { padding-top: 64px; @@ -112,22 +251,27 @@ input[type="checkbox"] { padding-right: 1.5rem; padding-bottom: 1.5rem; min-height: 100vh; - max-width: 1280px; margin-left: auto; margin-right: auto; } +/* Non-table pages: constrained width */ +.main-content.constrained { + max-width: 1200px; +} + /* ── Cards ───────────────────────────────────────── */ .card { border: none; box-shadow: var(--card-shadow); border-radius: var(--card-radius); - background: var(--card-bg); + background: var(--surface); } .card-header { - background: var(--card-bg); - border-bottom: 1px solid var(--border-color); + background: var(--surface); + border-bottom: 1px solid var(--border); + font-family: var(--font-display); font-weight: 600; font-size: 0.9375rem; padding: 0.75rem 1rem; @@ -139,12 +283,13 @@ input[type="checkbox"] { } .table th { - font-size: 0.8125rem; + font-family: var(--font-display); + font-size: 0.75rem; font-weight: 500; text-transform: uppercase; - letter-spacing: 0.05em; + letter-spacing: 0.04em; color: var(--text-muted); - background: #f9fafb; + background: var(--surface-raised); padding: 0.75rem 1rem; border-top: none; } @@ -157,28 +302,28 @@ input[type="checkbox"] { } /* Zebra striping */ -.table tbody tr:nth-child(even) td { background-color: #f7f8fa; } -.table-hover tbody tr:hover td { background-color: #eef2ff !important; } +.table tbody tr:nth-child(even) td { background-color: var(--surface-raised); } +.table-hover tbody tr:hover td { background-color: rgba(37, 99, 235, 0.08) !important; } /* ── Badges — soft pill style ────────────────────── */ .badge { font-size: 0.8125rem; font-weight: 500; padding: 0.125rem 0.5rem; - border-radius: 9999px; + border-radius: var(--radius-full); } -.badge.bg-success { background: var(--green-100) !important; color: var(--green-800) !important; } -.badge.bg-info { background: var(--blue-100) !important; color: var(--blue-800) !important; } -.badge.bg-warning { background: var(--yellow-100) !important; color: var(--yellow-800) !important; } -.badge.bg-danger { background: var(--red-100) !important; color: var(--red-800) !important; } +.badge.bg-success { background: var(--success-light) !important; color: var(--success-text) !important; } +.badge.bg-info { background: var(--info-light) !important; color: var(--info-text) !important; } +.badge.bg-warning { background: var(--warning-light) !important; color: var(--warning-text) !important; } +.badge.bg-danger { background: var(--error-light) !important; color: var(--error-text) !important; } /* Legacy badge classes */ -.badge-imported { background: var(--green-100); color: var(--green-800); } -.badge-skipped { background: var(--yellow-100); color: var(--yellow-800); } -.badge-error { background: var(--red-100); color: var(--red-800); } -.badge-pending { background: #f3f4f6; color: #374151; } -.badge-ready { background: var(--blue-100); color: var(--blue-800); } +.badge-imported { background: var(--success-light); color: var(--success-text); } +.badge-skipped { background: var(--warning-light); color: var(--warning-text); } +.badge-error { background: var(--error-light); color: var(--error-text); } +.badge-pending { background: var(--surface-raised); color: var(--text-secondary); } +.badge-ready { background: var(--info-light); color: var(--info-text); } /* ── Buttons ─────────────────────────────────────── */ .btn { @@ -192,12 +337,12 @@ input[type="checkbox"] { } .btn-primary { - background: var(--blue-600); - border-color: var(--blue-600); + background: var(--info); + border-color: var(--info); } .btn-primary:hover { - background: var(--blue-700); - border-color: var(--blue-700); + background: var(--info-hover); + border-color: var(--info-hover); } /* ── Forms ───────────────────────────────────────── */ @@ -205,11 +350,11 @@ input[type="checkbox"] { font-size: 0.9375rem; padding: 0.5rem 0.75rem; border-radius: 0.375rem; - border-color: #d1d5db; + border-color: var(--border); } .form-control:focus, .form-select:focus { - border-color: var(--blue-600); + border-color: var(--info); box-shadow: 0 0 0 2px rgba(37, 99, 235, 0.2); } @@ -229,9 +374,9 @@ input[type="checkbox"] { height: 2.75rem; padding: 0 0.5rem; font-size: 0.875rem; - border: 1px solid #d1d5db; + border: 1px solid var(--border); border-radius: 0.375rem; - background: #fff; + background: var(--surface); color: var(--text-secondary); cursor: pointer; transition: background 0.12s, border-color 0.12s; @@ -239,14 +384,14 @@ input[type="checkbox"] { user-select: none; } .page-btn:hover:not(:disabled):not(.active) { - background: #f3f4f6; - border-color: #9ca3af; + background: var(--surface-raised); + border-color: var(--text-muted); color: var(--text-primary); text-decoration: none; } .page-btn.active { - background: var(--blue-600); - border-color: var(--blue-600); + background: var(--info); + border-color: var(--info); color: #fff; font-weight: 600; } @@ -275,11 +420,11 @@ input[type="checkbox"] { border-radius: 50%; flex-shrink: 0; } -.dot-green { background: var(--dot-green); } -.dot-yellow { background: var(--dot-yellow); } -.dot-red { background: var(--dot-red); } -.dot-gray { background: #9ca3af; } -.dot-blue { background: #3b82f6; } +.dot-green { background: var(--success); } +.dot-yellow { background: var(--warning); } +.dot-red { background: var(--error); box-shadow: 0 0 8px 2px rgba(220,38,38,0.35); } +.dot-gray { background: var(--cancelled); } +.dot-blue { background: var(--info); } /* ── Flat row (mobile + desktop) ────────────────── */ .flat-row { @@ -287,26 +432,26 @@ input[type="checkbox"] { align-items: center; gap: 0.5rem; padding: 0.5rem 0.75rem; - border-bottom: 1px solid #f3f4f6; + border-bottom: 1px solid var(--border-subtle); font-size: 1rem; } .flat-row:last-child { border-bottom: none; } -.flat-row:hover { background: #f9fafb; cursor: pointer; } +.flat-row:hover { background: var(--surface-raised); cursor: pointer; } .grow { flex: 1; min-width: 0; } .truncate { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } /* ── Colored filter count - text color only ─────── */ -.fc-green { color: #16a34a; } -.fc-yellow { color: #ca8a04; } -.fc-red { color: #dc2626; } -.fc-neutral { color: #6b7280; } -.fc-blue { color: #2563eb; } -.fc-dark { color: #374151; } +.fc-green { color: var(--success); } +.fc-yellow { color: var(--warning); } +.fc-red { color: var(--error); } +.fc-neutral { color: var(--text-muted); } +.fc-blue { color: var(--info); } +.fc-dark { color: var(--text-secondary); } /* ── Log viewer (dark theme — keep as-is) ────────── */ .log-viewer { - font-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, monospace; + font-family: var(--font-data); font-size: 0.8125rem; line-height: 1.5; max-height: 600px; @@ -325,7 +470,7 @@ input[type="checkbox"] { cursor: pointer; } .table-hover tbody tr[data-href]:hover { - background-color: #f9fafb; + background-color: var(--surface-raised); } /* ── Sortable table headers ──────────────────────── */ @@ -334,22 +479,22 @@ input[type="checkbox"] { user-select: none; } .sortable:hover { - background-color: #f3f4f6; + background-color: var(--surface-raised); } .sort-icon { font-size: 0.75rem; margin-left: 0.25rem; - color: var(--blue-600); + color: var(--info); } /* ── SKU group visual grouping ───────────────────── */ .sku-group-odd { - background-color: #f8fafc; + background-color: var(--surface-raised); } /* ── Editable cells ──────────────────────────────── */ .editable { cursor: pointer; } -.editable:hover { background-color: #f3f4f6; } +.editable:hover { background-color: var(--surface-raised); } /* ── Order detail modal ──────────────────────────── */ .modal-lg .table-sm td, @@ -364,7 +509,7 @@ input[type="checkbox"] { .modal-backdrop ~ .modal-backdrop { z-index: 1055; } /* ── Quick Map compact lines ─────────────────────── */ -.qm-line { border-bottom: 1px solid #e5e7eb; padding: 6px 0; } +.qm-line { border-bottom: 1px solid var(--border); padding: 6px 0; } .qm-line:last-child { border-bottom: none; } .qm-row { display: flex; gap: 6px; align-items: center; } .qm-codmat-wrap { flex: 1; min-width: 0; } @@ -388,17 +533,17 @@ tr.mapping-deleted td { /* ── Map icon button ─────────────────────────────── */ .btn-map-icon { - color: var(--blue-600); + color: var(--info); padding: 0.1rem 0.25rem; cursor: pointer; font-size: 1rem; text-decoration: none; } -.btn-map-icon:hover { color: var(--blue-700); } +.btn-map-icon:hover { color: var(--info-hover); } /* ── Last sync summary card columns ─────────────── */ .last-sync-col { - border-right: 1px solid var(--border-color); + border-right: 1px solid var(--border); } /* ── Cursor pointer utility ──────────────────────── */ @@ -418,18 +563,19 @@ tr.mapping-deleted td { align-items: center; gap: 0.3rem; padding: 0.5rem 0.75rem; - border: 1px solid #d1d5db; + border: 1px solid var(--border); border-radius: 0.375rem; - background: #fff; + background: var(--surface); font-size: 0.9375rem; cursor: pointer; transition: background 0.15s, border-color 0.15s; white-space: nowrap; + color: var(--text-secondary); } -.filter-pill:hover { background: #f3f4f6; } +.filter-pill:hover { background: var(--surface-raised); } .filter-pill.active { - background: var(--blue-700); - border-color: var(--blue-700); + background: var(--accent); + border-color: var(--accent); color: #fff; } .filter-pill.active .filter-count { @@ -444,22 +590,22 @@ tr.mapping-deleted td { /* ── Search input ────────────────────────────────── */ .search-input { padding: 0.375rem 0.75rem; - border: 1px solid #d1d5db; + border: 1px solid var(--border); border-radius: 0.375rem; font-size: 0.9375rem; width: 160px; } .search-input:focus { - border-color: var(--blue-600); + border-color: var(--info); box-shadow: 0 0 0 2px rgba(37, 99, 235, 0.2); } -/* ── Autocomplete dropdown (keep as-is) ──────────── */ +/* ── Autocomplete dropdown ──────────────────────── */ .autocomplete-dropdown { position: absolute; z-index: 1050; - background: #fff; - border: 1px solid #dee2e6; + background: var(--surface); + border: 1px solid var(--border); border-radius: 0.375rem; box-shadow: 0 4px 12px rgba(0,0,0,0.15); max-height: 300px; @@ -470,17 +616,17 @@ tr.mapping-deleted td { padding: 0.5rem 0.75rem; cursor: pointer; font-size: 0.9375rem; - border-bottom: 1px solid #f1f5f9; + border-bottom: 1px solid var(--border-subtle); } .autocomplete-item:hover, .autocomplete-item.active { - background-color: #f1f5f9; + background-color: var(--surface-raised); } .autocomplete-item .codmat { font-weight: 600; - color: #1e293b; + color: var(--text-primary); } .autocomplete-item .denumire { - color: #64748b; + color: var(--text-muted); font-size: 0.875rem; } @@ -499,7 +645,7 @@ tr.mapping-deleted td { color: #f9fafb; font-size: 0.75rem; padding: 0.3rem 0.6rem; - border-radius: 4px; + border-radius: var(--radius-sm); white-space: nowrap; pointer-events: none; opacity: 0; @@ -510,8 +656,8 @@ tr.mapping-deleted td { /* ── Sync card ───────────────────────────────────── */ .sync-card { - background: #fff; - border: 1px solid var(--border-color); + background: var(--surface); + border: 1px solid var(--border); border-radius: var(--card-radius); overflow: hidden; margin-bottom: 1rem; @@ -525,7 +671,7 @@ tr.mapping-deleted td { } .sync-card-divider { height: 1px; - background: var(--border-color); + background: var(--border); margin: 0; } .sync-card-info { @@ -538,34 +684,34 @@ tr.mapping-deleted td { cursor: pointer; transition: background 0.12s; } -.sync-card-info:hover { background: #f9fafb; } +.sync-card-info:hover { background: var(--surface-raised); } .sync-card-progress { display: flex; align-items: center; gap: 0.5rem; padding: 0.4rem 1rem; - background: #eff6ff; + background: var(--info-light); font-size: 1rem; - color: var(--blue-700); - border-top: 1px solid #dbeafe; + color: var(--info-text); + border-top: 1px solid var(--border); } -/* ── Pulsing live dot (keep as-is) ──────────────── */ +/* ── Pulsing live dot ──────────────────────────── */ .sync-live-dot { display: inline-block; width: 8px; height: 8px; border-radius: 50%; - background: #3b82f6; - animation: pulse-dot 1.2s ease-in-out infinite; + background: var(--info); + animation: pulse-dot 2s ease-in-out infinite; flex-shrink: 0; } @keyframes pulse-dot { - 0%, 100% { opacity: 1; transform: scale(1); } - 50% { opacity: 0.4; transform: scale(0.75); } + 0%, 100% { opacity: 1; } + 50% { opacity: 0.4; } } -/* ── Status dot (keep as-is) ─────────────────────── */ +/* ── Status dot ─────────────────────────────────── */ .sync-status-dot { display: inline-block; width: 10px; @@ -573,10 +719,10 @@ tr.mapping-deleted td { border-radius: 50%; flex-shrink: 0; } -.sync-status-dot.idle { background: #9ca3af; } -.sync-status-dot.running { background: #3b82f6; animation: pulse-dot 1.2s ease-in-out infinite; } -.sync-status-dot.completed { background: #10b981; } -.sync-status-dot.failed { background: #ef4444; } +.sync-status-dot.idle { background: var(--cancelled); } +.sync-status-dot.running { background: var(--info); animation: pulse-dot 2s ease-in-out infinite; } +.sync-status-dot.completed { background: var(--success); } +.sync-status-dot.failed { background: var(--error); } /* ── Custom period range inputs ──────────────────── */ .period-custom-range { @@ -591,13 +737,13 @@ tr.mapping-deleted td { .select-compact { padding: 0.375rem 0.5rem; font-size: 0.9375rem; - border: 1px solid #d1d5db; + border: 1px solid var(--border); border-radius: 0.375rem; - background: #fff; + background: var(--surface); cursor: pointer; } -/* ── btn-compact (kept for backward compat) ──────── */ +/* ── btn-compact ─────────────────────────────────── */ .btn-compact { padding: 0.375rem 0.75rem; font-size: 0.9375rem; @@ -608,26 +754,26 @@ tr.mapping-deleted td { padding: 0.4rem 0.75rem; border-radius: 0.375rem; font-size: 0.9375rem; - background: #d1fae5; - color: #065f46; - border: 1px solid #6ee7b7; + background: var(--success-light); + color: var(--success-text); + border: 1px solid var(--success); } /* ── Badge-pct (mappings page) ───────────────────── */ .badge-pct { font-size: 0.75rem; padding: 0.1rem 0.35rem; - border-radius: 4px; + border-radius: var(--radius-sm); font-weight: 600; } -.badge-pct.complete { background: #d1fae5; color: #065f46; } -.badge-pct.incomplete { background: #fef3c7; color: #92400e; } +.badge-pct.complete { background: var(--success-light); color: var(--success-text); } +.badge-pct.incomplete { background: var(--warning-light); color: var(--warning-text); } /* ── Context Menu ────────────────────────────────── */ .context-menu-trigger { background: none; border: none; - color: #9ca3af; + color: var(--cancelled); padding: 0.2rem 0.4rem; cursor: pointer; border-radius: 0.25rem; @@ -637,14 +783,14 @@ tr.mapping-deleted td { } .context-menu-trigger:hover { color: var(--text-secondary); - background: #f3f4f6; + background: var(--surface-raised); } .context-menu { position: fixed; - background: #fff; - border: 1px solid #e5e7eb; - border-radius: 0.5rem; + background: var(--surface); + border: 1px solid var(--border); + border-radius: var(--card-radius); box-shadow: 0 4px 16px rgba(0,0,0,0.12); z-index: 1050; min-width: 150px; @@ -662,9 +808,9 @@ tr.mapping-deleted td { color: var(--text-primary); transition: background 0.1s; } -.context-menu-item:hover { background: #f3f4f6; } -.context-menu-item.text-danger { color: #dc2626; } -.context-menu-item.text-danger:hover { background: #fee2e2; } +.context-menu-item:hover { background: var(--surface-raised); } +.context-menu-item.text-danger { color: var(--error); } +.context-menu-item.text-danger:hover { background: var(--error-light); } /* ── Pagination info strip ───────────────────────── */ .pag-strip { @@ -673,12 +819,12 @@ tr.mapping-deleted td { justify-content: space-between; gap: 1rem; padding: 0.5rem 1rem; - border-bottom: 1px solid var(--border-color); + border-bottom: 1px solid var(--border); flex-wrap: wrap; } .pag-strip-bottom { border-bottom: none; - border-top: 1px solid var(--border-color); + border-top: 1px solid var(--border); } /* ── Per page selector ───────────────────────────── */ @@ -697,29 +843,56 @@ tr.mapping-deleted td { /* ── Mappings flat-rows: always visible ────────────── */ .mappings-flat-list { display: block; } -/* ── Mobile ⋯ dropdown ─────────────────────────── */ +/* ── Mobile more dropdown ─────────────────────────── */ .mobile-more-dropdown { position: relative; display: inline-block; } .mobile-more-dropdown .dropdown-toggle::after { display: none; } /* ── Mobile segmented control (hidden on desktop) ── */ .mobile-seg { display: none; } +/* ── Bottom nav (mobile) ─────────────────────────── */ +.bottom-nav { + position: fixed; + bottom: 0; + left: 0; + right: 0; + height: 56px; + padding-bottom: env(safe-area-inset-bottom); + background: var(--surface); + border-top: 1px solid var(--border); + display: none; /* shown on mobile */ + justify-content: space-around; + align-items: center; + z-index: 1000; +} + +.bottom-nav-item { + display: flex; + flex-direction: column; + align-items: center; + gap: 2px; + text-decoration: none; + color: var(--text-muted); + font-size: 0.625rem; + font-weight: 500; + padding: 4px 0; + min-width: 48px; + min-height: 44px; + justify-content: center; +} +.bottom-nav-item i { font-size: 1.25rem; } +.bottom-nav-item.active { color: var(--accent); } +.bottom-nav-item:hover { color: var(--text-secondary); text-decoration: none; } + /* ── Responsive ──────────────────────────────────── */ @media (max-width: 767.98px) { - .top-navbar { - padding: 0 0.5rem; - gap: 0.5rem; - } - .navbar-brand { - font-size: 0.875rem; - } - .nav-tab { - padding: 0 0.625rem; - font-size: 0.8125rem; - } + .top-navbar { display: none; } + .bottom-nav { display: flex; } .main-content { padding-left: 0.75rem; padding-right: 0.75rem; + padding-bottom: 72px; + padding-top: 8px; } .filter-bar { gap: 0.375rem; @@ -751,20 +924,22 @@ tr.mapping-deleted td { /* Hide per-page selector on mobile */ .per-page-label { display: none; } + + /* Hide dark toggle in navbar on mobile (use settings page instead) */ + .dark-toggle { display: none; } } /* Mobile article cards in order detail modal */ .detail-item-card { - border: 1px solid #e5e7eb; + border: 1px solid var(--border); border-radius: 6px; padding: 0.5rem 0.75rem; margin-bottom: 0.5rem; font-size: 0.875rem; } .detail-item-card .card-sku { - font-family: monospace; font-size: 0.8rem; - color: #6b7280; + color: var(--text-muted); } .detail-item-card .card-name { font-weight: 500; @@ -773,24 +948,41 @@ tr.mapping-deleted td { .detail-item-card .card-details { display: flex; gap: 1rem; - color: #374151; + color: var(--text-secondary); } /* Clickable CODMAT link in order detail modal */ -.codmat-link { color: #0d6efd; cursor: pointer; text-decoration: underline; } -.codmat-link:hover { color: #0a58ca; } +.codmat-link { color: var(--info); cursor: pointer; text-decoration: underline; } +.codmat-link:hover { color: var(--info-hover); } /* Mobile article flat list in order detail modal */ .detail-item-flat { font-size: 0.85rem; } .detail-item-flat .dif-item { } -.detail-item-flat .dif-item:nth-child(even) .dif-row { background: #f7f8fa; } +.detail-item-flat .dif-item:nth-child(even) .dif-row { background: var(--surface-raised); } .detail-item-flat .dif-row { display: flex; align-items: baseline; gap: 0.5rem; padding: 0.2rem 0.75rem; flex-wrap: wrap; } -.dif-sku { font-family: monospace; font-size: 0.78rem; color: #6b7280; } +.dif-sku { font-size: 0.78rem; color: var(--text-muted); } .dif-name { font-weight: 500; flex: 1; } -.dif-qty { white-space: nowrap; color: #6b7280; } +.dif-qty { white-space: nowrap; color: var(--text-muted); } .dif-val { white-space: nowrap; font-weight: 600; } -.dif-codmat-link { color: #0d6efd; cursor: pointer; font-size: 0.78rem; font-family: monospace; } -.dif-codmat-link:hover { color: #0a58ca; text-decoration: underline; } +.dif-codmat-link { color: var(--info); cursor: pointer; font-size: 0.78rem; } +.dif-codmat-link:hover { color: var(--info-hover); text-decoration: underline; } + +/* ── Dark mode form toggle ──────────────────────── */ +.theme-toggle-card { + display: flex; + align-items: center; + justify-content: space-between; + padding: 0.75rem 1rem; + background: var(--surface); + border: 1px solid var(--border); + border-radius: var(--card-radius); + margin-bottom: 1rem; +} +.theme-toggle-card label { + font-weight: 500; + margin: 0; + cursor: pointer; +} diff --git a/api/app/static/js/dashboard.js b/api/app/static/js/dashboard.js index 5e47c61..fee1790 100644 --- a/api/app/static/js/dashboard.js +++ b/api/app/static/js/dashboard.js @@ -119,7 +119,7 @@ function updateSyncPanel(data) { } if (st) { st.textContent = lr.status === 'completed' ? '\u2713' : '\u2715'; - st.style.color = lr.status === 'completed' ? '#10b981' : '#ef4444'; + st.style.color = lr.status === 'completed' ? 'var(--success)' : 'var(--error)'; } } } @@ -342,7 +342,7 @@ async function loadDashOrders() { const totalStr = o.order_total ? Number(o.order_total).toFixed(2) : ''; return `
${statusDot(o.status)} - ${dateFmt} + ${dateFmt} ${esc(name)} x${o.items_count || 0}${totalStr ? ' · ' + totalStr + '' : ''}
`; diff --git a/api/app/static/js/logs.js b/api/app/static/js/logs.js index fd5eaf5..ea65639 100644 --- a/api/app/static/js/logs.js +++ b/api/app/static/js/logs.js @@ -19,9 +19,9 @@ function fmtDuration(startedAt, finishedAt) { function runStatusBadge(status) { switch ((status || '').toLowerCase()) { - case 'completed': return 'completed'; - case 'running': return 'running'; - case 'failed': return 'failed'; + case 'completed': return 'completed'; + case 'running': return 'running'; + case 'failed': return 'failed'; default: return `${esc(status)}`; } } @@ -174,7 +174,7 @@ async function loadRunOrders(runId, statusFilter, page) { const totalStr = o.order_total ? Number(o.order_total).toFixed(2) : ''; return `
${statusDot(o.status)} - ${dateFmt} + ${dateFmt} ${esc(o.customer_name || '—')} x${o.items_count || 0}${totalStr ? ' · ' + totalStr + '' : ''}
`; diff --git a/api/app/static/js/mappings.js b/api/app/static/js/mappings.js index e8b3674..7c6bbde 100644 --- a/api/app/static/js/mappings.js +++ b/api/app/static/js/mappings.js @@ -107,7 +107,7 @@ function renderTable(mappings, showDeleted) { ? ` Kit · ${skuCodmatCount[m.sku]}` : ''; const inactiveStyle = !m.activ && !m.sters ? 'opacity:0.6;' : ''; - html += `
+ html += `
@@ -135,7 +135,7 @@ function renderTable(mappings, showDeleted) { // After last CODMAT of a kit, add total row const isLastOfKit = isKitRow && (i === mappings.length - 1 || mappings[i + 1].sku !== m.sku); if (isLastOfKit) { - html += ``; + html += ``; } prevSku = m.sku; @@ -523,7 +523,7 @@ function showInlineAddRow() { const row = document.createElement('div'); row.id = 'inlineAddRow'; row.className = 'flat-row'; - row.style.background = '#eff6ff'; + row.style.background = 'var(--info-light)'; row.style.gap = '0.5rem'; row.innerHTML = ` diff --git a/api/app/static/js/settings.js b/api/app/static/js/settings.js index 2bdd066..a869fdb 100644 --- a/api/app/static/js/settings.js +++ b/api/app/static/js/settings.js @@ -15,6 +15,15 @@ document.addEventListener('DOMContentLoaded', async () => { }); }); + // Dark mode toggle + const darkToggle = document.getElementById('settDarkMode'); + if (darkToggle) { + darkToggle.checked = document.documentElement.getAttribute('data-theme') === 'dark'; + darkToggle.addEventListener('change', () => { + if (typeof toggleDarkMode === 'function') toggleDarkMode(); + }); + } + // Catalog sync toggle const catChk = document.getElementById('settCatalogSyncEnabled'); if (catChk) catChk.addEventListener('change', () => { @@ -191,14 +200,14 @@ async function saveSettings() { const data = await res.json(); const resultEl = document.getElementById('settSaveResult'); if (data.success) { - if (resultEl) { resultEl.textContent = 'Salvat!'; resultEl.style.color = '#16a34a'; } + if (resultEl) { resultEl.textContent = 'Salvat!'; resultEl.style.color = 'var(--success)'; } setTimeout(() => { if (resultEl) resultEl.textContent = ''; }, 3000); } else { - if (resultEl) { resultEl.textContent = 'Eroare: ' + JSON.stringify(data); resultEl.style.color = '#dc2626'; } + if (resultEl) { resultEl.textContent = 'Eroare: ' + JSON.stringify(data); resultEl.style.color = 'var(--error)'; } } } catch (err) { const resultEl = document.getElementById('settSaveResult'); - if (resultEl) { resultEl.textContent = 'Eroare: ' + err.message; resultEl.style.color = '#dc2626'; } + if (resultEl) { resultEl.textContent = 'Eroare: ' + err.message; resultEl.style.color = 'var(--error)'; } } } diff --git a/api/app/templates/base.html b/api/app/templates/base.html index a20ef89..cf5c08b 100644 --- a/api/app/templates/base.html +++ b/api/app/templates/base.html @@ -1,16 +1,28 @@ - + {% block title %}GoMag Import Manager{% endblock %} + + + + + + {% set rp = request.scope.get('root_path', '') %} - + - + + + + -
+
{% block content %}{% endblock %}
@@ -39,7 +63,7 @@
Produs:
-
+
CODMAT Cant. @@ -116,7 +140,27 @@ - + + {% block scripts %}{% endblock %} diff --git a/api/app/templates/dashboard.html b/api/app/templates/dashboard.html index 570b675..e28e16d 100644 --- a/api/app/templates/dashboard.html +++ b/api/app/templates/dashboard.html @@ -1,6 +1,7 @@ {% extends "base.html" %} {% block title %}Dashboard - GoMag Import{% endblock %} {% block nav_dashboard %}active{% endblock %} +{% block bnav_dashboard %}active{% endblock %} {% block content %}

Panou de Comanda

@@ -112,5 +113,5 @@ {% endblock %} {% block scripts %} - + {% endblock %} diff --git a/api/app/templates/logs.html b/api/app/templates/logs.html index dea03cb..65ba711 100644 --- a/api/app/templates/logs.html +++ b/api/app/templates/logs.html @@ -1,6 +1,7 @@ {% extends "base.html" %} {% block title %}Jurnale Import - GoMag Import{% endblock %} {% block nav_logs %}active{% endblock %} +{% block bnav_logs %}active{% endblock %} {% block content %}

Jurnale Import

@@ -101,5 +102,5 @@ {% endblock %} {% block scripts %} - + {% endblock %} diff --git a/api/app/templates/mappings.html b/api/app/templates/mappings.html index 7fb8b6a..bbfb97a 100644 --- a/api/app/templates/mappings.html +++ b/api/app/templates/mappings.html @@ -1,6 +1,7 @@ {% extends "base.html" %} {% block title %}Mapari SKU - GoMag Import{% endblock %} {% block nav_mappings %}active{% endblock %} +{% block bnav_mappings %}active{% endblock %} {% block content %}
@@ -150,5 +151,5 @@ {% endblock %} {% block scripts %} - + {% endblock %} diff --git a/api/app/templates/missing_skus.html b/api/app/templates/missing_skus.html index 4b8f6bd..7341ebd 100644 --- a/api/app/templates/missing_skus.html +++ b/api/app/templates/missing_skus.html @@ -1,6 +1,7 @@ {% extends "base.html" %} {% block title %}SKU-uri Lipsa - GoMag Import{% endblock %} {% block nav_missing %}active{% endblock %} +{% block bnav_missing %}active{% endblock %} {% block content %}
diff --git a/api/app/templates/settings.html b/api/app/templates/settings.html index 05f2620..c1a9fb0 100644 --- a/api/app/templates/settings.html +++ b/api/app/templates/settings.html @@ -1,10 +1,23 @@ {% extends "base.html" %} {% block title %}Setari - GoMag Import{% endblock %} {% block nav_settings %}active{% endblock %} +{% block bnav_settings %}active{% endblock %} +{% block main_class %}constrained{% endblock %} {% block content %}

Setari

+ +
+
+ + +
+
+ +
+
+
@@ -233,5 +246,5 @@ {% endblock %} {% block scripts %} - + {% endblock %} diff --git a/api/tests/e2e/test_design_system_e2e.py b/api/tests/e2e/test_design_system_e2e.py new file mode 100644 index 0000000..c27c9dd --- /dev/null +++ b/api/tests/e2e/test_design_system_e2e.py @@ -0,0 +1,105 @@ +""" +E2E tests for DESIGN.md migration (Commit 0.5). +Tests: dark toggle, FOUC prevention, bottom nav, active tab amber, dark contrast. +""" +import pytest + +pytestmark = [pytest.mark.e2e] + + +def test_dark_mode_toggle(page, app_url): + """Dark toggle switches theme and persists in localStorage.""" + page.goto(f"{app_url}/settings") + page.wait_for_load_state("networkidle") + + # Settings page has the dark mode toggle + toggle = page.locator("#settDarkMode") + assert toggle.is_visible() + + # Start in light mode + theme = page.evaluate("document.documentElement.getAttribute('data-theme')") + if theme == "dark": + toggle.click() + page.wait_for_timeout(200) + + # Toggle to dark + toggle.click() + page.wait_for_timeout(200) + assert page.evaluate("document.documentElement.getAttribute('data-theme')") == "dark" + assert page.evaluate("localStorage.getItem('theme')") == "dark" + + # Toggle back to light + toggle.click() + page.wait_for_timeout(200) + assert page.evaluate("document.documentElement.getAttribute('data-theme')") != "dark" + assert page.evaluate("localStorage.getItem('theme')") == "light" + + +def test_fouc_prevention(page, app_url): + """Theme is applied before CSS loads (inline script in ).""" + # Set dark theme in localStorage before navigation + page.goto(f"{app_url}/") + page.evaluate("localStorage.setItem('theme', 'dark')") + + # Navigate fresh — the inline script should apply dark before paint + page.goto(f"{app_url}/") + # Check immediately (before networkidle) that data-theme is set + theme = page.evaluate("document.documentElement.getAttribute('data-theme')") + assert theme == "dark", "FOUC: dark theme not applied before first paint" + + # Cleanup + page.evaluate("localStorage.removeItem('theme')") + + +def test_bottom_nav_visible_on_mobile(page, app_url): + """Bottom nav is visible on mobile viewport, top navbar is hidden.""" + page.set_viewport_size({"width": 375, "height": 812}) + page.goto(f"{app_url}/") + page.wait_for_load_state("networkidle") + + bottom_nav = page.locator(".bottom-nav") + top_navbar = page.locator(".top-navbar") + + assert bottom_nav.is_visible(), "Bottom nav should be visible on mobile" + assert not top_navbar.is_visible(), "Top navbar should be hidden on mobile" + + # Check 5 tabs exist + tabs = page.locator(".bottom-nav-item") + assert tabs.count() == 5 + + +def test_active_tab_amber_accent(page, app_url): + """Active nav tab uses amber accent color, not blue.""" + page.goto(f"{app_url}/") + page.wait_for_load_state("networkidle") + + active_tab = page.locator(".nav-tab.active") + assert active_tab.count() >= 1 + + # Get computed color of active tab + color = page.evaluate(""" + () => getComputedStyle(document.querySelector('.nav-tab.active')).color + """) + # Amber #D97706 = rgb(217, 119, 6) + assert "217" in color and "119" in color, f"Active tab color should be amber, got: {color}" + + +def test_dark_mode_contrast(page, app_url): + """Dark mode has proper contrast — bg is dark, text is light.""" + page.goto(f"{app_url}/") + page.wait_for_load_state("networkidle") + + # Enable dark mode + page.evaluate("document.documentElement.setAttribute('data-theme', 'dark')") + page.wait_for_timeout(100) + + bg = page.evaluate("getComputedStyle(document.body).backgroundColor") + color = page.evaluate("getComputedStyle(document.body).color") + + # bg should be dark (#121212 = rgb(18, 18, 18)) + assert "18" in bg, f"Dark mode bg should be dark, got: {bg}" + # text should be light (#E8E4DD = rgb(232, 228, 221)) + assert "232" in color or "228" in color, f"Dark mode text should be light, got: {color}" + + # Cleanup + page.evaluate("document.documentElement.removeAttribute('data-theme')") diff --git a/api/tests/e2e/test_order_detail.py b/api/tests/e2e/test_order_detail.py index 2bd980b..3dbab25 100644 --- a/api/tests/e2e/test_order_detail.py +++ b/api/tests/e2e/test_order_detail.py @@ -51,5 +51,5 @@ def test_dashboard_navigates_to_logs(page: Page, app_url: str): page.goto(f"{app_url}/") page.wait_for_load_state("networkidle") - logs_link = page.locator("a[href='/logs']") - expect(logs_link).to_be_visible() + logs_link = page.locator(".top-navbar a[href='/logs'], .bottom-nav a[href='/logs']") + expect(logs_link.first).to_be_visible() From aacca13b85cc8b2f953900b150ca4d45577ae692 Mon Sep 17 00:00:00 2001 From: Claude Agent Date: Fri, 27 Mar 2026 11:52:15 +0000 Subject: [PATCH 03/22] =?UTF-8?q?style(design):=20FINDING-001=20=E2=80=94?= =?UTF-8?q?=20mobile=20segmented=20control=20uses=20amber=20accent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mobile segmented filter buttons used Bootstrap btn-primary (blue) for active state. Per DESIGN.md two-accent system, state indicators use amber. Added .seg-active class with --accent color. Co-Authored-By: Claude Opus 4.6 (1M context) --- api/app/static/css/style.css | 5 +++++ api/app/static/js/shared.js | 2 +- api/app/templates/base.html | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/api/app/static/css/style.css b/api/app/static/css/style.css index 191a48d..dee9ac2 100644 --- a/api/app/static/css/style.css +++ b/api/app/static/css/style.css @@ -849,6 +849,11 @@ tr.mapping-deleted td { /* ── Mobile segmented control (hidden on desktop) ── */ .mobile-seg { display: none; } +.seg-active { + background: var(--accent) !important; + border-color: var(--accent) !important; + color: #fff !important; +} /* ── Bottom nav (mobile) ─────────────────────────── */ .bottom-nav { diff --git a/api/app/static/js/shared.js b/api/app/static/js/shared.js index 9ac20ee..dd72a2c 100644 --- a/api/app/static/js/shared.js +++ b/api/app/static/js/shared.js @@ -194,7 +194,7 @@ function renderMobileSegmented(containerId, pills, onSelect) { const btnStyle = 'font-size:0.75rem;height:32px;white-space:nowrap;display:inline-flex;align-items:center;justify-content:center;gap:0.25rem;flex:1;padding:0 0.25rem'; container.innerHTML = `
${pills.map(p => { - const cls = p.active ? 'btn btn-primary' : 'btn btn-outline-secondary'; + const cls = p.active ? 'btn seg-active' : 'btn btn-outline-secondary'; const countColor = (!p.active && p.colorClass) ? ` class="${p.colorClass}"` : ''; return ``; }).join('')}
`; diff --git a/api/app/templates/base.html b/api/app/templates/base.html index cf5c08b..cd1080c 100644 --- a/api/app/templates/base.html +++ b/api/app/templates/base.html @@ -19,7 +19,7 @@ {% set rp = request.scope.get('root_path', '') %} - + @@ -140,7 +140,7 @@ - + - + + {% endblock %} diff --git a/api/tests/e2e/test_order_detail.py b/api/tests/e2e/test_order_detail.py index 3dbab25..c1421d9 100644 --- a/api/tests/e2e/test_order_detail.py +++ b/api/tests/e2e/test_order_detail.py @@ -29,7 +29,7 @@ def test_order_detail_items_table_columns(page: Page, app_url: str): texts = headers.all_text_contents() # Current columns (may evolve — check dashboard.html for source of truth) - required_columns = ["SKU", "Produs", "CODMAT", "Cant.", "Pret", "Valoare"] + required_columns = ["SKU", "Produs", "CODMAT", "Cant.", "Pret GoMag", "Pret ROA", "Valoare"] for col in required_columns: assert col in texts, f"Column '{col}' missing from order detail items table. Found: {texts}" From a10a00aa4d6c07e1c9089fc300279ca5c872aedb Mon Sep 17 00:00:00 2001 From: Claude Agent Date: Fri, 27 Mar 2026 12:28:18 +0000 Subject: [PATCH 09/22] feat(safety): needs attention card on dashboard MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add a "Needs Attention" card above the orders table that surfaces: - Import errors count (click → ERROR filter) - Unmapped SKUs count (click → Missing SKUs page) - Uninvoiced orders >3 days (click → UNINVOICED filter) Shows green "Totul in ordine" when all metrics are zero. Backend: add uninvoiced_old count to get_orders() and unresolved_skus from get_dashboard_stats() to dashboard/orders API response. Cache-bust: style.css?v=21, dashboard.js?v=29 Co-Authored-By: Claude Opus 4.6 (1M context) --- api/app/routers/sync.py | 7 ++++++ api/app/services/sqlite_service.py | 11 +++++++++ api/app/static/css/style.css | 38 ++++++++++++++++++++++++++++++ api/app/static/js/dashboard.js | 18 ++++++++++++++ api/app/templates/base.html | 2 +- api/app/templates/dashboard.html | 3 ++- 6 files changed, 77 insertions(+), 2 deletions(-) diff --git a/api/app/routers/sync.py b/api/app/routers/sync.py index aab6e69..09f0d7e 100644 --- a/api/app/routers/sync.py +++ b/api/app/routers/sync.py @@ -564,6 +564,13 @@ async def dashboard_orders(page: int = 1, per_page: int = 50, counts["facturate"] = max(0, imported_total - counts["nefacturate"]) counts.setdefault("total", counts.get("imported", 0) + counts.get("skipped", 0) + counts.get("error", 0)) + # Attention metrics: add unresolved SKUs count + try: + stats = await sqlite_service.get_dashboard_stats() + counts["unresolved_skus"] = stats.get("unresolved_skus", 0) + except Exception: + counts["unresolved_skus"] = 0 + # For UNINVOICED filter: apply server-side filtering + pagination if is_uninvoiced_filter: filtered = [o for o in all_orders if o.get("status") in ("IMPORTED", "ALREADY_IMPORTED") and not o.get("invoice")] diff --git a/api/app/services/sqlite_service.py b/api/app/services/sqlite_service.py index 237db92..f9d8a2c 100644 --- a/api/app/services/sqlite_service.py +++ b/api/app/services/sqlite_service.py @@ -739,6 +739,16 @@ async def get_orders(page: int = 1, per_page: int = 50, cursor = await db.execute(f"SELECT COUNT(*) FROM orders {uninv_where}", base_params) uninvoiced_sqlite = (await cursor.fetchone())[0] + # Uninvoiced > 3 days old + uninv_old_clauses = list(base_clauses) + [ + "UPPER(status) IN ('IMPORTED', 'ALREADY_IMPORTED')", + "(factura_numar IS NULL OR factura_numar = '')", + "order_date < datetime('now', '-3 days')", + ] + uninv_old_where = "WHERE " + " AND ".join(uninv_old_clauses) + cursor = await db.execute(f"SELECT COUNT(*) FROM orders {uninv_old_where}", base_params) + uninvoiced_old = (await cursor.fetchone())[0] + return { "orders": [dict(r) for r in rows], "total": total, @@ -754,6 +764,7 @@ async def get_orders(page: int = 1, per_page: int = 50, "cancelled": status_counts.get("CANCELLED", 0), "total": sum(status_counts.values()), "uninvoiced_sqlite": uninvoiced_sqlite, + "uninvoiced_old": uninvoiced_old, } } finally: diff --git a/api/app/static/css/style.css b/api/app/static/css/style.css index 1a8b638..405a271 100644 --- a/api/app/static/css/style.css +++ b/api/app/static/css/style.css @@ -995,3 +995,41 @@ tr.mapping-deleted td { margin: 0; cursor: pointer; } + +/* ── Attention card ──────────────────────────── */ +.attention-card { + display: flex; + align-items: center; + gap: 16px; + padding: 10px 16px; + border-radius: 8px; + font-size: 0.875rem; + margin-bottom: 8px; +} +.attention-ok { + background: var(--success-light); + color: var(--success-text); +} +.attention-alert { + background: var(--surface); + border: 1px solid var(--border); + flex-wrap: wrap; +} +.attention-item { + display: inline-flex; + align-items: center; + gap: 4px; + padding: 4px 10px; + border-radius: 4px; + cursor: pointer; + transition: opacity 0.15s; +} +.attention-item:hover { opacity: 0.8; } +.attention-error { + background: var(--error-light); + color: var(--error-text); +} +.attention-warning { + background: var(--warning-light); + color: var(--warning-text); +} diff --git a/api/app/static/js/dashboard.js b/api/app/static/js/dashboard.js index ee7f760..950ea46 100644 --- a/api/app/static/js/dashboard.js +++ b/api/app/static/js/dashboard.js @@ -301,6 +301,24 @@ async function loadDashOrders() { if (el('cntNef')) el('cntNef').textContent = c.nefacturate || c.uninvoiced || 0; if (el('cntCanc')) el('cntCanc').textContent = c.cancelled || 0; + // Attention card + const attnEl = document.getElementById('attentionCard'); + if (attnEl) { + const errors = c.error || 0; + const unmapped = c.unresolved_skus || 0; + const uninvOld = c.uninvoiced_old || 0; + + if (errors === 0 && unmapped === 0 && uninvOld === 0) { + attnEl.innerHTML = '
Totul in ordine
'; + } else { + let items = []; + if (errors > 0) items.push(` ${errors} erori import`); + if (unmapped > 0) items.push(` ${unmapped} SKU-uri nemapate`); + if (uninvOld > 0) items.push(` ${uninvOld} nefacturate >3 zile`); + attnEl.innerHTML = '
' + items.join('') + '
'; + } + } + const tbody = document.getElementById('dashOrdersBody'); const orders = data.orders || []; diff --git a/api/app/templates/base.html b/api/app/templates/base.html index f4d1a4c..46dba28 100644 --- a/api/app/templates/base.html +++ b/api/app/templates/base.html @@ -19,7 +19,7 @@ {% set rp = request.scope.get('root_path', '') %} - + diff --git a/api/app/templates/dashboard.html b/api/app/templates/dashboard.html index cad8195..b95c200 100644 --- a/api/app/templates/dashboard.html +++ b/api/app/templates/dashboard.html @@ -49,6 +49,7 @@ Comenzi
+
-
Cât de des verifică dashboard-ul starea sync-ului (implicit 5s)
-
-
-
-
-
-
-
Pricing Kituri / Pachete
-
-
-
- - -
-
- - -
-
- - -
-
-