From 1b4b31b016a25b1cccfc37c4c5d99681386cdc35 Mon Sep 17 00:00:00 2001 From: seb Date: Sun, 18 Oct 2026 03:25:57 +0200 Subject: [PATCH] u --- src/routes/infos/ArticleHistoryPage.jsx | 62 +++++++------------ src/routes/infos/GlobalHistoryPage.jsx | 58 ++++++------------ src/routes/infos/LedgerHistoryPage.jsx | 80 ++++++++----------------- 3 files changed, 62 insertions(+), 138 deletions(-) diff --git a/src/routes/infos/ArticleHistoryPage.jsx b/src/routes/infos/ArticleHistoryPage.jsx index ed943ef..1207909 100644 --- a/src/routes/infos/ArticleHistoryPage.jsx +++ b/src/routes/infos/ArticleHistoryPage.jsx @@ -52,7 +52,7 @@ export function createDummyTestArticleHistory() { const rowGridSx = { display: 'grid', gridTemplateColumns: - 'minmax(60px, max-content) minmax(150px, max-content) minmax(120px, max-content) minmax(160px, 1.2fr) minmax(240px, 2fr) minmax(120px, max-content)', + 'minmax(150px, max-content) minmax(130px, max-content) minmax(180px, 1.2fr) minmax(260px, 2fr)', gridTemplateRows: '0px 1fr', rowGap: 0, columnGap: 2, @@ -86,23 +86,17 @@ function renderInvisibleDummyRow(dummy) { return ( <> - {d.id} - - {formatDateTime(d.date)} - + {d.sku} - + {d.name} - + {d.text} - - {d.user} - ); } @@ -121,23 +115,17 @@ class ArticleHistoryRow extends PureComponent { > {renderInvisibleDummyRow(dummy)} - + - - - - + - + - - - ); } @@ -163,19 +151,15 @@ class ArticleHistoryRow extends PureComponent { > {renderInvisibleDummyRow(dummy)} + {/* 1. Datum */} - - {item.id} - - - - {formatDateTime(item.date || item.createdAt)} - + {/* 2. SKU */} + {item.sku ? ( - + {/* 3. Artikelname */} + {item.name || item.articlename || '–'} - - + {/* 4. Änderung / Ereignis */} + + - {item.text || item.message || '–'} + {item.historytext || item.text || item.message || '–'} - - - - {userName} - - ); } @@ -525,12 +505,10 @@ export default class ArticleHistoryPage extends PureComponent { }} > {renderInvisibleDummyRow(this.headerItem)} - ID - Datum - Artikel-Nr. - Artikelname - Änderung / Ereignis - Benutzer + Datum + Artikel-Nr. + Artikelname + Änderung / Ereignis } onPageChange={this.handlePageChange} diff --git a/src/routes/infos/GlobalHistoryPage.jsx b/src/routes/infos/GlobalHistoryPage.jsx index 0ffcd3a..f48890a 100644 --- a/src/routes/infos/GlobalHistoryPage.jsx +++ b/src/routes/infos/GlobalHistoryPage.jsx @@ -52,7 +52,7 @@ export function createDummyTestGlobalHistory() { const rowGridSx = { display: 'grid', gridTemplateColumns: - 'minmax(60px, max-content) minmax(150px, max-content) minmax(110px, max-content) minmax(140px, max-content) minmax(240px, 2fr) minmax(120px, max-content)', + 'minmax(150px, max-content) minmax(110px, max-content) minmax(140px, max-content) minmax(240px, 1fr)', gridTemplateRows: '0px 1fr', rowGap: 0, columnGap: 2, @@ -86,23 +86,17 @@ function renderInvisibleDummyRow(dummy) { return ( <> - {d.id} - - {formatDateTime(d.date)} - + {d.type} - + {d.reference} - + {d.text} - - {d.user} - ); } @@ -121,23 +115,17 @@ class GlobalHistoryRow extends PureComponent { > {renderInvisibleDummyRow(dummy)} - + - - - - + - + - - - ); } @@ -167,19 +155,15 @@ class GlobalHistoryRow extends PureComponent { > {renderInvisibleDummyRow(dummy)} + {/* 1. Datum */} - - {item.id} - - - - {formatDateTime(item.date || item.createdAt)} - + {/* 2. Typ */} + - + {/* 3. Referenz / Key */} + {isArticle ? ( - + {/* 4. Meldung / Beschreibung */} + {item.text || item.value || '–'} - - - - {userName} - - ); } @@ -537,12 +517,10 @@ export default class GlobalHistoryPage extends PureComponent { }} > {renderInvisibleDummyRow(this.headerItem)} - ID - Datum - Typ - Referenz / Key - Meldung / Beschreibung - Benutzer + Datum + Typ + Referenz / Key + Meldung / Beschreibung } onPageChange={this.handlePageChange} diff --git a/src/routes/infos/LedgerHistoryPage.jsx b/src/routes/infos/LedgerHistoryPage.jsx index 7765aae..df944c5 100644 --- a/src/routes/infos/LedgerHistoryPage.jsx +++ b/src/routes/infos/LedgerHistoryPage.jsx @@ -53,7 +53,7 @@ export function createDummyTestLedgerHistory() { const rowGridSx = { display: 'grid', gridTemplateColumns: - 'minmax(60px, max-content) minmax(150px, max-content) minmax(110px, max-content) minmax(130px, max-content) minmax(90px, max-content) minmax(220px, 2fr) minmax(120px, max-content)', + 'minmax(150px, max-content) minmax(110px, max-content) minmax(130px, max-content) minmax(90px, max-content) minmax(220px, 1fr)', gridTemplateRows: '0px 1fr', rowGap: 0, columnGap: 2, @@ -87,26 +87,20 @@ function renderInvisibleDummyRow(dummy) { return ( <> - {d.id} - - {formatDateTime(d.created_at || d.date)} - + {d.transaction_type} - + {d.sku} - + +{d.amount} - + {d.transaction_text} - - {d.user} - ); } @@ -137,26 +131,20 @@ class LedgerHistoryRow extends PureComponent { > {renderInvisibleDummyRow(dummy)} - + - - - - + - + - + - - - ); } @@ -195,27 +183,15 @@ class LedgerHistoryRow extends PureComponent { > {renderInvisibleDummyRow(dummy)} - {/* 1. ID */} + {/* 1. Datum */} - - {item.id} - - - - {/* 2. Datum */} - {formatDateTime(item.created_at || item.date || item.createdAt)} - {/* 3. Typ */} - + {/* 2. Typ */} + - {/* 4. SKU */} - + {/* 3. SKU */} + {hasSku ? ( { e.preventDefault(); e.stopPropagation(); @@ -258,8 +235,8 @@ class LedgerHistoryRow extends PureComponent { )} - {/* 5. Menge / Betrag */} - + {/* 4. Menge / Betrag */} + - {/* 6. Buchungstext */} - + {/* 5. Buchungstext */} + {bookingText} - - {/* 7. Benutzer */} - - - {userName} - - ); } @@ -592,13 +562,11 @@ export default class LedgerHistoryPage extends PureComponent { }} > {renderInvisibleDummyRow(this.headerItem)} - ID - Datum - Typ - Artikel-Nr. - Menge - Buchungstext - Benutzer + Datum + Typ + Artikel-Nr. + Menge + Buchungstext } onPageChange={this.handlePageChange}