From ef0e72ff9d4afd0c940b1cbbc10c7f9f48182ba9 Mon Sep 17 00:00:00 2001 From: Samer Salameh Date: Sun, 22 Nov 2026 16:27:29 +0300 Subject: [PATCH] =?UTF-8?q?Refinery:=20REFINERY=5FOP=20grants,=20legacy-st?= =?UTF-8?q?yle=20reports,=20=D8=A7=D9=84=D8=AD=D9=88=D8=A7=D9=84=D8=A7?= =?UTF-8?q?=D8=AA=20report,=20cards=20log=20and=20pricing=20list=20fixes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - db/refinery-op-permissions.sql (re-runnable, listed in docs/ENVIRONMENTS.md): role REFINERY_OP gets the الارساليات screen, the شحن الديزل report, print and the payment actions (13 keys) - Excel reports of the trips screen (trips, diesel balances) use the legacy report.cfc layout: right-to-left sheet, Arial Unicode MS, centred cells, navy headers, filters row, legacy column widths - "الارساليات - الصرف" is now الحوالات: asks for the bank account number (required on the server too) and follows the legacy bank report output (banner, account block with total, 13 columns), only the legacy filters apply - Diesel cards view: movements log collapsed by default and fetched on open, Arabic pager, aligned columns - تسعير عطاء النفط الخام: no default month filter, newest period first - tests for the workbook layouts, the filters row and the bank-account requirement Co-Authored-By: Claude Sonnet 5.5 --- db/refinery-op-permissions.sql | 54 ++++ docs/ENVIRONMENTS.md | 1 + .../Refinery/Trips/LegacyReportWorkbook.cs | 291 ++++++++++++++++++ .../Refinery/Trips/TripReportService.cs | 90 +++++- .../Refinery/Variables/VariablesRepository.cs | 2 +- .../Refinery/LegacyReportWorkbookTests.cs | 159 ++++++++++ web/src/features/refinery/cards/api.ts | 4 +- web/src/features/refinery/cards/pages.tsx | 97 +++--- web/src/features/refinery/trips/pages.tsx | 13 +- web/src/features/refinery/trips/strings.ts | 2 +- web/src/features/refinery/variables/meta.ts | 12 +- 11 files changed, 661 insertions(+), 64 deletions(-) create mode 100644 db/refinery-op-permissions.sql create mode 100644 src/NTP.Application/Refinery/Trips/LegacyReportWorkbook.cs create mode 100644 tests/NTP.Tests/Refinery/LegacyReportWorkbookTests.cs diff --git a/db/refinery-op-permissions.sql b/db/refinery-op-permissions.sql new file mode 100644 index 0000000..8fee332 --- /dev/null +++ b/db/refinery-op-permissions.sql @@ -0,0 +1,54 @@ +-- Refinery (المصفاة): role REFINERY_OP (موظف عطاء الصرف) sees the الارساليات screen with the شحن الديزل (Excel) report, print and the +-- payment actions. Safe to re-run; not run by the app. +-- Run order: part 1 in the NTP schema (only needed where the role row is missing; it exists in the legacy data), part 2 in the primary +-- (NAFITHTCS) schema, after db/grains-screen-permissions.sql. Afterwards assign role REFINERY_OP to the users who need it (NTPUSERS): +-- they sign in as before. The API applies the rows within about a minute, the browser on the next reload / sign-in. +-- SU needs no rows. Everything else of the refinery module (wage claims, commission claims, wallets, variables, cards, the other +-- trip reports, the reverse-advance actions, recalculate balance) stays with REFINERY_MGR and SU. + +-- --------------------------------------------------------------------------------------------------------------------------- +-- Part 1 (NTP schema): the role row, copied from REFINERY_MGR (level, type, manager columns) when REFINERY_OP does not exist yet. +-- --------------------------------------------------------------------------------------------------------------------------- +INSERT INTO ROLES (CODE, NAME, DIRECTMANAGER, EMPLOYEES, MANAGERS, LEVELNUMBER, ROLETYPE, TENDER) +SELECT 'REFINERY_OP', 'موظف عطاء الصرف', r.DIRECTMANAGER, r.EMPLOYEES, r.MANAGERS, r.LEVELNUMBER, r.ROLETYPE, r.TENDER + FROM ROLES r + WHERE r.CODE = 'REFINERY_MGR' + AND NOT EXISTS (SELECT 1 FROM ROLES x WHERE x.CODE = 'REFINERY_OP'); + +COMMIT; + +-- --------------------------------------------------------------------------------------------------------------------------- +-- Part 2 (primary schema): 13 keys. +-- screen refinery.trips (list, view, history) +-- report refinery.trips.dieselReport (شحن الديزل Excel) +-- print refinery.trips.print (cash voucher) +-- diesel refinery.trips.firstAdvance, secondAdvance +-- cash refinery.trips.cashPayment, receipt +-- bank / orange refinery.trips.payment, orangePayment +-- e-wallet refinery.trips.exchange, exchangeAudit, activateWalletExchange, confirmExchange (Dinarak is OFF until configured) +-- --------------------------------------------------------------------------------------------------------------------------- +INSERT INTO GRAINS_SCREEN_PERMISSIONS (ROLECODE, RESOURCE_KEY) +SELECT 'REFINERY_OP', v.resource_key + FROM (SELECT 'refinery.trips' AS resource_key FROM dual UNION ALL + SELECT 'refinery.trips.dieselReport' FROM dual UNION ALL + SELECT 'refinery.trips.print' FROM dual UNION ALL + SELECT 'refinery.trips.firstAdvance' FROM dual UNION ALL + SELECT 'refinery.trips.secondAdvance' FROM dual UNION ALL + SELECT 'refinery.trips.cashPayment' FROM dual UNION ALL + SELECT 'refinery.trips.receipt' FROM dual UNION ALL + SELECT 'refinery.trips.payment' FROM dual UNION ALL + SELECT 'refinery.trips.orangePayment' FROM dual UNION ALL + SELECT 'refinery.trips.exchange' FROM dual UNION ALL + SELECT 'refinery.trips.exchangeAudit' FROM dual UNION ALL + SELECT 'refinery.trips.activateWalletExchange' FROM dual UNION ALL + SELECT 'refinery.trips.confirmExchange' FROM dual) v + WHERE NOT EXISTS ( + SELECT 1 FROM GRAINS_SCREEN_PERMISSIONS p + WHERE p.rolecode = 'REFINERY_OP' AND p.resource_key = v.resource_key); + +COMMIT; + +-- Check (expect 13 rows): +-- SELECT resource_key FROM GRAINS_SCREEN_PERMISSIONS WHERE rolecode = 'REFINERY_OP' ORDER BY resource_key; +-- Take a right away by deleting its row, e.g.: +-- DELETE FROM GRAINS_SCREEN_PERMISSIONS WHERE rolecode = 'REFINERY_OP' AND resource_key = 'refinery.trips.confirmExchange'; diff --git a/docs/ENVIRONMENTS.md b/docs/ENVIRONMENTS.md index 3c4712f..b9a4c5f 100644 --- a/docs/ENVIRONMENTS.md +++ b/docs/ENVIRONMENTS.md @@ -59,6 +59,7 @@ Apply these scripts once per database (not run by the application), in this orde 7. `db/grains-jobs.sql` - tables of the scheduled jobs (`GRAINS_JOBS`, `GRAINS_JOB_RUNS`), primary schema. Without it the scheduler stays idle. Jobs are then started, stopped and timed on the SU screen "المهام المجدولة" (`/jobs`); nothing runs until a job is started there. `Jobs:SchedulerEnabled=false` (set in appsettings.Development.json) switches the scheduler loop off for a process 6. `db/gnac-finance-screens.sql` - GNAC gets claims, fines, wages, invoices and the invoice check report (safe to re-run) 8. `db/refinery-permissions.sql` - refinery (المصفاة) modules: REFINERY_MGR gets the 6 screens and every action key (47 rows); SU needs none (safe to re-run). The external services are OFF until configured: `Refinery__Dinarak__Enabled/BaseUrl/UserName/Password` (trip payment) and `Refinery__Jopetrol__Enabled/Url/UserName/Password` (wage claim ترحيل); `Refinery__Trips__MaxPaymentAmount` (default 500, unverified) +9. `db/refinery-op-permissions.sql` - role REFINERY_OP (موظف عطاء الصرف): the الارساليات screen, the شحن الديزل (Excel) report, print and the payment actions (13 keys); part 1 (role row, NTP schema) is only needed where the row is missing, part 2 (primary schema) writes the rows (safe to re-run). Everything else of the refinery module stays with REFINERY_MGR and SU **Switching a feature off for everybody:** a row with `ROLECODE = 'DISABLED'` takes that resource out of the system for all users, SU included: the menu entry and buttons disappear and the API answers 403. It overrides every other row. Delete the row to bring the diff --git a/src/NTP.Application/Refinery/Trips/LegacyReportWorkbook.cs b/src/NTP.Application/Refinery/Trips/LegacyReportWorkbook.cs new file mode 100644 index 0000000..0ef6641 --- /dev/null +++ b/src/NTP.Application/Refinery/Trips/LegacyReportWorkbook.cs @@ -0,0 +1,291 @@ +using System.Globalization; +using System.IO.Compression; +using System.Security; +using System.Text; +using NTP.Application.Grains.Orders; + +namespace NTP.Application.Refinery.Trips; + +/// +/// One report in the layout of the legacy AqabaTCS reports (backend/common/report.cfc): company name and title on the first row, +/// the applied filters as label / value pairs, a spacer row, the column captions, then the rows. The first column is the counter +/// (متسلسل). are the legacy column widths in points. +/// +public sealed record LegacyReport( + string CompanyName, + string Title, + IReadOnlyList<(string Label, string Value)> Filters, + IReadOnlyList Headers, + IReadOnlyList WidthsPt, + IReadOnlyList> Rows); + +/// +/// The legacy الحوالات list (refineryBankReport, companyreport.cfr): a banner with the company and the list title, a block with the +/// account details and the total, then the trips table. are the label / value rows of the block; +/// are the column widths in characters. +/// +public sealed record TransfersReport( + string CompanyName, + string Title, + IReadOnlyList<(string Label, object? Value)> Info, + IReadOnlyList Headers, + IReadOnlyList WidthsChars, + IReadOnlyList> Rows); + +/// +/// Writes legacy-style reports as .xlsx workbooks (right-to-left sheet, Arial Unicode MS 11, centred and wrapped cells, navy #003366 header +/// cells with white text, thin borders). Strings are written as inline strings, so cell text can never be evaluated as a formula. +/// +public static class LegacyReportWorkbook +{ + private const string Font = "Arial Unicode MS"; + + // cellXfs indexes of the report.cfc style sheet below + private const int Company = 1, Title = 2, Header = 3, FilterValue = 4, Data = 5; + // cellXfs indexes of the transfers style sheet + private const int TBanner = 1, TLabel = 2, TValue = 3, THeader = 4, TData = 5; + + /// Legacy widths are points (ss:Width); the sheet needs characters: ((pt * 4/3) - 5) / 7. + public static double Chars(int points) => Math.Round((points * 4.0 / 3.0 - 5) / 7, 2); + + public static byte[] ToXlsx(LegacyReport r) => Package(r.Title, Styles(), Sheet(r)); + + public static byte[] ToTransfersXlsx(TransfersReport r) => Package(r.Title, TransfersStyles(), TransfersSheet(r)); + + private static byte[] Package(string title, string styles, string sheet) + { + using var ms = new MemoryStream(); + using (var zip = new ZipArchive(ms, ZipArchiveMode.Create, leaveOpen: true)) + { + Add(zip, "[Content_Types].xml", + ""); + Add(zip, "_rels/.rels", + ""); + Add(zip, "xl/workbook.xml", + ""); + Add(zip, "xl/_rels/workbook.xml.rels", + ""); + Add(zip, "xl/styles.xml", styles); + Add(zip, "xl/worksheets/sheet1.xml", sheet); + } + return ms.ToArray(); + } + + // ------------------------------------------------------------------ report.cfc layout + /// Style sheet: fonts 0 normal, 1 navy 14, 2 white 11, 3 black 12; fills 2 navy, 3 grey; borders 1 all thin black, 2 data row. + internal static string Styles() + { + static string F(int size, string color) => $""; + static string B(string l, string r, string t, string b) => + $" 0 ? "thin" : "none")}\">{(t.Length > 0 ? $"" : "")}"; + static string X(int font, int fill, int border, string h, string v) => + $""; + var sb = new StringBuilder(); + sb.Append(""); + sb.Append("").Append(F(11, "FF000000")).Append(F(14, "FF003366")).Append(F(11, "FFFFFFFF")).Append(F(12, "FF000000")).Append(""); + sb.Append("") + .Append("") + .Append(""); + sb.Append("") + .Append(B("FF000000", "FF000000", "FF000000", "FF000000")) // header: black box + .Append(B("FF666699", "FF666699", "", "FF000000")) // data: violet sides, black bottom + .Append(""); + sb.Append(""); + sb.Append("") + .Append(X(1, 0, 0, "right", "top")) // 1 company name + .Append(X(1, 0, 0, "center", "center")) // 2 title + .Append(X(2, 2, 1, "center", "top")) // 3 header / filter label + .Append(X(3, 3, 0, "center", "top")) // 4 filter value + .Append(X(0, 0, 2, "center", "top")) // 5 data + .Append(""); + return sb.ToString(); + } + + private static string Sheet(LegacyReport r) + { + var cols = r.Headers.Count; + var sb = new StringBuilder(); + sb.Append(""); + sb.Append(""); + sb.Append(""); + for (var c = 0; c < cols; c++) + Col(sb, c, Chars(c < r.WidthsPt.Count ? r.WidthsPt[c] : 150)); + sb.Append(""); + + // row 1: company name over the first three columns, title over columns E:F (legacy cell layout) + sb.Append(""); + Text(sb, 0, 1, r.CompanyName, Company); + Blank(sb, 1, 1, Company); Blank(sb, 2, 1, Company); + Text(sb, 4, 1, r.Title, Title); + Blank(sb, 5, 1, Title); + sb.Append(""); + + // row 2: filters as label / value pairs + sb.Append(""); + var fc = 0; + foreach (var (label, value) in r.Filters) + { + Text(sb, fc++, 2, label, Header); + Text(sb, fc++, 2, value, FilterValue); + } + sb.Append(""); + + // row 3: spacer, row 4: column captions + sb.Append(""); + sb.Append(""); + for (var c = 0; c < cols; c++) Text(sb, c, 4, r.Headers[c], Header); + sb.Append(""); + + var rowNo = 5; + foreach (var row in r.Rows) + { + sb.Append(""); + for (var c = 0; c < cols && c < row.Count; c++) Value(sb, c, rowNo, row[c], Data); + sb.Append(""); + rowNo++; + } + sb.Append(""); + return sb.ToString(); + } + + // ------------------------------------------------------------------ الحوالات layout (companyreport.cfr output) + /// + /// Style sheet read from a legacy output file: fonts 1 Arial bold 21 (banner), 2 bold white 11 (labels), 3 bold black 11 (values), 4 white 11 + /// (column captions), 0 black 11 (data); navy #003366 fills; thin borders, violet (#666699) sides on the data rows. + /// + internal static string TransfersStyles() + { + static string Fn(string name, int size, string color, bool bold) => + $"{(bold ? "" : "")}"; + static string X(int font, int fill, int border, string h) => + $""; + var sb = new StringBuilder(); + sb.Append(""); + sb.Append("").Append(Fn(Font, 11, "FF000000", false)).Append(Fn("Arial", 21, "FF000000", true)) + .Append(Fn(Font, 11, "FFFFFFFF", true)).Append(Fn(Font, 11, "FF000000", true)).Append(Fn(Font, 11, "FFFFFFFF", false)).Append(""); + sb.Append("") + .Append("") + .Append(""); + sb.Append("") + .Append("") + .Append("") + .Append(""); + sb.Append(""); + sb.Append("") + .Append(X(1, 0, 0, "center")) // 1 banner (company, title) + .Append(X(2, 2, 1, "center")) // 2 label of the account block + .Append(X(3, 3, 1, "right")) // 3 value of the account block + .Append(X(4, 2, 1, "center")) // 4 column caption + .Append(X(0, 3, 2, "center")) // 5 data + .Append(""); + return sb.ToString(); + } + + private static string TransfersSheet(TransfersReport r) + { + var cols = r.Headers.Count; + var last = TabularExport.ColumnName(cols - 1); + var merges = new List(); + var sb = new StringBuilder(); + sb.Append(""); + sb.Append(""); + sb.Append(""); + for (var c = 0; c < cols; c++) Col(sb, c, c < r.WidthsChars.Count ? r.WidthsChars[c] : 14); + sb.Append(""); + + // rows 1-3: company, title, blank banner row, each merged over the whole table width + void Banner(int row, string? text) + { + sb.Append(""); + if (text is null) Blank(sb, 0, row, TBanner); else Text(sb, 0, row, text, TBanner); + for (var c = 1; c < cols; c++) Blank(sb, c, row, TBanner); + sb.Append(""); + merges.Add($"A{row}:{last}{row}"); + } + Banner(1, r.CompanyName); + Banner(2, r.Title); + Banner(3, null); + + // account block: label over A:B, value over C:last + var rowNo = 4; + foreach (var (label, value) in r.Info) + { + sb.Append(""); + Text(sb, 0, rowNo, label, TLabel); + Blank(sb, 1, rowNo, TLabel); + Value(sb, 2, rowNo, value, TValue); + for (var c = 3; c < cols; c++) Blank(sb, c, rowNo, TValue); + sb.Append(""); + merges.Add($"A{rowNo}:B{rowNo}"); + merges.Add($"C{rowNo}:{last}{rowNo}"); + rowNo++; + } + // blank row, then the column captions (height 45) + sb.Append(""); + merges.Add($"A{rowNo}:{last}{rowNo}"); + rowNo++; + sb.Append(""); + for (var c = 0; c < cols; c++) Text(sb, c, rowNo, r.Headers[c], THeader); + sb.Append(""); + rowNo++; + foreach (var row in r.Rows) + { + sb.Append(""); + for (var c = 0; c < cols && c < row.Count; c++) Value(sb, c, rowNo, row[c], TData); + sb.Append(""); + rowNo++; + } + sb.Append(""); + foreach (var m in merges) sb.Append(""); + sb.Append(""); + return sb.ToString(); + } + + // ------------------------------------------------------------------ shared pieces + private static void Col(StringBuilder sb, int c, double width) => + sb.Append(""); + + private static string Ref(int col, int row) => TabularExport.ColumnName(col) + row.ToString(CultureInfo.InvariantCulture); + + private static void Blank(StringBuilder sb, int col, int row, int style) => + sb.Append(""); + + private static void Text(StringBuilder sb, int col, int row, string text, int style) => + sb.Append("") + .Append(Esc(text)).Append(""); + + private static void Value(StringBuilder sb, int col, int row, object? v, int style) + { + if (v is null) { Blank(sb, col, row, style); return; } + if (v is sbyte or byte or short or ushort or int or uint or long or ulong or float or double or decimal) + sb.Append("") + .Append(Convert.ToString(v, CultureInfo.InvariantCulture)).Append(""); + else Text(sb, col, row, TabularExport.FormatCell(v), style); + } + + /// Sheet names: at most 31 characters and none of : \ / ? * [ ]. + public static string SheetName(string title) + { + var s = new string(title.Where(ch => ":\\/?*[]".IndexOf(ch) < 0).ToArray()).Trim(); + if (s.Length == 0) s = "Report"; + return s.Length > 31 ? s[..31] : s; + } + + private static void Add(ZipArchive zip, string name, string content) + { + var entry = zip.CreateEntry(name, CompressionLevel.Fastest); + using var s = entry.Open(); + var bytes = new UTF8Encoding(false).GetBytes(content); + s.Write(bytes, 0, bytes.Length); + } + + private static string Esc(string s) + { + var clean = new StringBuilder(s.Length); + foreach (var ch in s) + if (ch == '\t' || ch == '\n' || ch == '\r' || ch >= 0x20 && ch != 0xFFFE && ch != 0xFFFF) clean.Append(ch); + return SecurityElement.Escape(clean.ToString()) ?? string.Empty; + } +} diff --git a/src/NTP.Application/Refinery/Trips/TripReportService.cs b/src/NTP.Application/Refinery/Trips/TripReportService.cs index 6cdcbb1..aa8b50f 100644 --- a/src/NTP.Application/Refinery/Trips/TripReportService.cs +++ b/src/NTP.Application/Refinery/Trips/TripReportService.cs @@ -27,6 +27,50 @@ public sealed class TripReportService(ITripRepository trips) : ITripReportServic private static string Day(DateTime? d) => d?.ToString("dd/MM/yyyy", CultureInfo.InvariantCulture) ?? string.Empty; + // ---- legacy report layout (aqabaTCSBCommon.report.create): the trips, exchange and diesel-balance reports use it + private const string CompanyName = "شركة نافذ للخدمات اللوجستية"; // caption PUBLIC.NAFITH_NAME + private const string TripsTitle = "شاشة الارساليات"; // caption MENU.REFINERYTRIPS + private const string CardsTitle = "أرصدة الديزل"; // caption PUBLIC.CARD_REPORT + + // column widths in points, as set in the legacy factory: report() manager set (650-820), refineryCardsReport (559-576) + private static readonly int[] TripsWidths = + [100, 150, 150, 150, 200, 200, 200, 200, 150, 150, 150, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 220, 200, 200, 200, 200, 200, 200, 200, 150]; + private static readonly int[] CardsWidths = [100, 150, 150, 150]; + + private static TripExportFile Legacy( + string name, string title, IReadOnlyList<(string Label, string Value)> filters, string[] headers, int[] widths, + IReadOnlyList> data) => + new(LegacyReportWorkbook.ToXlsx(new LegacyReport(CompanyName, title, filters, headers, widths, data)), + $"{name}-{Stamp}.xlsx", TabularExport.XlsxContentType); + + /// The filters row of the legacy report: the text filters in a fixed order (status shown with its caption), then the dates, oldest first. + public static IReadOnlyList<(string Label, string Value)> Filters(TripQuery q) + { + var f = new List<(string Label, string Value)>(); + void Add(string label, string? v) { if (!string.IsNullOrWhiteSpace(v)) f.Add((label, v.Trim())); } + Add("رقم الارسالية", q.Pn); + Add("رقم القاطرة", q.Tn); + Add("رقم المقطورة", q.Trn); + Add("الرقم الوطني", q.Nnpn); + Add("رقم الحمولة", q.LoadingNo); + Add("رقم النموذج", q.DischargeAuthNo); + if (!string.IsNullOrWhiteSpace(q.StatusCode)) + f.Add(("الحالة", string.Join("،", q.StatusCode.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) + .Select(s => s.Trim('\'')).Select(s => TripStatus.Captions.GetValueOrDefault(s, s))))); + Add("رقم مطالبة اجور النقل", q.WageClaimNo); + Add("رقم الحساب", q.BankAccount); + var dates = new List<(DateTime Value, string Label)>(); + void AddDate(string label, DateTime? d) { if (d is not null) dates.Add((d.Value, label)); } + AddDate("تاريخ الارسالية", q.DispatchDate); + AddDate("تاريخ النموذج", q.DischargeEntryDate); + AddDate("من تاريخ التحميل", q.LoadingDateFrom); + AddDate("الى تاريخ التحميل", q.LoadingDateTo); + AddDate("من تاريخ الدفع", q.PaymentedDateFrom); + AddDate("الى تاريخ الدفع", q.PaymentedDateTo); + foreach (var (value, label) in dates.OrderBy(d => d.Value)) f.Add((label, Day(value))); + return f; + } + public async Task TripsAsync(TripQuery query, CancellationToken ct) { TripQueryService.ValidateRanges(query); @@ -67,7 +111,7 @@ public sealed class TripReportService(ITripRepository trips) : ITripReportServic "تاريخ الاستلام", "اسم المستلم", "تاريخ التحميل", "آلية الصرف", "صاحب الحساب", "صاحب الحساب بالانجليزي", "البنك", "IBAN", "رقم الحساب", "رقم المحفظة", "رقم هوية المالك" ]; - return Xlsx("refinery-trips", new ExportTable(["شاشة الارساليات"], headers, data)); + return Legacy("refinery-trips", TripsTitle, Filters(query), headers, TripsWidths, data); } /// factoryweb.report, REFINERY_OP column set (lines 825-870): form no., truck, net wage, paid / received dates and receiver. @@ -82,22 +126,49 @@ public sealed class TripReportService(ITripRepository trips) : ITripReportServic return Xlsx("refinery-trips-operator", new ExportTable(["شاشة الارساليات"], headers, data)); } - /// factoryweb.report, EXCHANGE_OP column set (lines 870-940): the trip, weights, truck, trailer, driver id, net wage and status. + // legacy الحوالات list (companyreport.cfr output): title and column widths in characters, as in the legacy sample files + private const string TransfersTitle = "قائمة ارقام نماذج التفريغ المعدة لصرف أجور النقل"; + private static readonly double[] TransfersWidths = [9.14, 10.86, 16.71, 12.29, 12.71, 24.86, 12.29, 13.57, 13.71, 11.43, 15.43, 15.43, 24.29]; + + /// + /// الحوالات (legacy refineryBankReport, layout of companyreport.cfr): the discharge forms prepared for payment by bank transfer to ONE account. + /// The bank account is required (ERROR.NO_BANK_ACCOUNT); the other filters are the legacy ones: status, wage-claim flag and payment dates. + /// The sheet shows the account block (owner, English name, bank, account number, IBAN, total net wage) and then the trips table. + /// public async Task ExchangeAsync(TripQuery query, CancellationToken ct) { - TripQueryService.ValidateRanges(query); - var rows = await trips.ReportAsync(query, ct); + if (string.IsNullOrWhiteSpace(query.BankAccount)) throw TripErrors.NoBankAccount(); + if (query.PaymentedDateFrom > query.PaymentedDateTo) throw TripErrors.FromAfterTo(); + var q = new TripQuery( + BankAccount: query.BankAccount, StatusCode: query.StatusCode, HasWageClaim: query.HasWageClaim, + PaymentedDateFrom: query.PaymentedDateFrom, PaymentedDateTo: query.PaymentedDateTo); + var rows = await trips.ReportAsync(q, ct); + + var first = rows.FirstOrDefault(); + var total = Math.Round(rows.Sum(r => r.NetWage ?? 0m), 3); + IReadOnlyList<(string Label, object? Value)> info = + [ + ("صاحب الحساب", first?.OwnerName), + ("الاسم بالانجليزي", first?.OwnerNameEnglish), + ("اسم البنك", first?.BankName), + ("رقم الحساب", first?.BankAccount ?? query.BankAccount.Trim()), + ("IBAN", first?.Iban), + ("صافي قيمة اجور النقل", total) + ]; var data = rows.Select((r, i) => (IReadOnlyList) [ i + 1, r.Pn, r.DispatchDate, r.LoadingNo, r.DischargeAuthNo, r.DischargeEntryDate, r.NetLoadingWeight, r.NetDischargeWeight, - r.Tn, r.Trn, r.Nnpn, r.NetWage, TripStatus.Captions.GetValueOrDefault(r.StatusCode ?? string.Empty, r.StatusCode ?? string.Empty) + r.Tn, r.Trn, r.NetWage, TripStatus.Captions.GetValueOrDefault(r.StatusCode ?? string.Empty, r.StatusCode ?? string.Empty), + r.ReceivedDate?.ToString("dd/MM/yyyy HH:mm", CultureInfo.InvariantCulture) ]).ToList(); string[] headers = [ - "متسلسل", "رقم الارسالية", "تاريخ الارسالية", "رقم الحمولة", "رقم النموذج", "تاريخ النموذج", "الوزن الصافي(كغ)", - "الوزن الصافي للتفريغ(كغ)", "رقم القاطرة", "رقم المقطورة", "الرقم الوطني", "صافي قيمة الصرف الفعلي", "الحالة" + "متسلسل", "رقم الارسالية", "تاريخ الارسالية", "رقم الحمولة", "رقم النموذج", "تاريخ النموذج", "الوزن الصافي للتحميل (كغ)", + "الوزن الصافي للتفريغ(كغ)", "رقم القاطرة", "رقم المقطورة", "صافي قيمة اجور النقل", "الحالة", "تاريخ الاستلام" ]; - return Xlsx("refinery-trips-exchange", new ExportTable(["شاشة الارساليات"], headers, data)); + return new( + LegacyReportWorkbook.ToTransfersXlsx(new TransfersReport(CompanyName, TransfersTitle, info, headers, TransfersWidths, data)), + $"refinery-transfers-{Stamp}.xlsx", TabularExport.XlsxContentType); } public async Task DieselAsync(DieselReportQuery query, CancellationToken ct) @@ -123,7 +194,8 @@ public sealed class TripReportService(ITripRepository trips) : ITripReportServic var rows = await trips.CardsAsync(string.IsNullOrWhiteSpace(tn) ? null : tn.Trim(), ct); var data = rows.Select((r, i) => (IReadOnlyList)[i + 1, r.Tn, r.CardNumber, r.CurrentBalance]).ToList(); string[] headers = ["متسلسل", "رقم القاطرة", "رقم بطاقة جوبترول", "القيمة التراكمية الحالية"]; - return Xlsx("refinery-cards", new ExportTable(["أرصدة الديزل"], headers, data)); + var filters = string.IsNullOrWhiteSpace(tn) ? [] : new List<(string Label, string Value)> { ("رقم القاطرة", tn.Trim()) }; + return Legacy("refinery-cards", CardsTitle, filters, headers, CardsWidths, data); } public async Task BankAsync(BankReportQuery query, CancellationToken ct) diff --git a/src/NTP.Infrastructure/Persistence/Repositories/Refinery/Variables/VariablesRepository.cs b/src/NTP.Infrastructure/Persistence/Repositories/Refinery/Variables/VariablesRepository.cs index 6f0742d..adca468 100644 --- a/src/NTP.Infrastructure/Persistence/Repositories/Refinery/Variables/VariablesRepository.cs +++ b/src/NTP.Infrastructure/Persistence/Repositories/Refinery/Variables/VariablesRepository.cs @@ -83,7 +83,7 @@ internal sealed class VariablesRepository(IDbSession session, ILogger([], page.SafePage, page.SafePageSize, 0); p.Add("MinRow", page.MinRow); p.Add("MaxRow", page.MaxRow); - var items = await QueryAsync(OracleSql.Paginate(baseSql + " ORDER BY g.GroupId DESC"), p, ct); + var items = await QueryAsync(OracleSql.Paginate(baseSql + " ORDER BY g.StartDate DESC, g.GroupId DESC"), p, ct); return new PagedResult(items.Select(i => i.ToRow()).ToList(), page.SafePage, page.SafePageSize, total); } diff --git a/tests/NTP.Tests/Refinery/LegacyReportWorkbookTests.cs b/tests/NTP.Tests/Refinery/LegacyReportWorkbookTests.cs new file mode 100644 index 0000000..d84806e --- /dev/null +++ b/tests/NTP.Tests/Refinery/LegacyReportWorkbookTests.cs @@ -0,0 +1,159 @@ +using System.IO.Compression; +using System.Text; +using NTP.Application.Refinery.Trips; +using Xunit; + +namespace NTP.Tests.Refinery; + +/// The refinery Excel reports follow the layout of the legacy report.cfc (font, alignment, header colours, widths, RTL). +public class LegacyReportWorkbookTests +{ + private static string Part(byte[] xlsx, string name) + { + using var zip = new ZipArchive(new MemoryStream(xlsx), ZipArchiveMode.Read); + using var s = zip.GetEntry(name)!.Open(); + using var r = new StreamReader(s, Encoding.UTF8); + return r.ReadToEnd(); + } + + private static byte[] Sample(IReadOnlyList<(string, string)>? filters = null) => + LegacyReportWorkbook.ToXlsx(new LegacyReport( + "شركة نافذ للخدمات اللوجستية", "أرصدة الديزل", filters ?? [("رقم القاطرة", "123")], + ["متسلسل", "رقم القاطرة", "رقم بطاقة جوبترول", "القيمة التراكمية الحالية"], [100, 150, 150, 150], + [[1, "123", "=1+1", 55.5m]])); + + [Fact] + public void Sheet_is_right_to_left_with_the_legacy_title_row_and_merges() + { + var sheet = Part(Sample(), "xl/worksheets/sheet1.xml"); + Assert.Contains("rightToLeft=\"1\"", sheet); + Assert.Contains("", sheet); + Assert.Contains("", sheet); + Assert.Contains("شركة نافذ للخدمات اللوجستية", sheet); + Assert.Contains("أرصدة الديزل", sheet); + } + + [Fact] + public void Filters_are_label_value_pairs_on_row_two_and_the_header_is_on_row_four() + { + var sheet = Part(Sample(), "xl/worksheets/sheet1.xml"); + Assert.Contains("رقم القاطرة", sheet); // label in the header style + Assert.Contains("123", sheet); // value in the grey style + Assert.Contains("متسلسل", sheet); + Assert.Contains("1", sheet); // counter, data style + } + + [Fact] + public void Styles_use_the_legacy_font_centre_alignment_and_navy_header() + { + var styles = Part(Sample(), "xl/styles.xml"); + Assert.Contains("", styles); + Assert.DoesNotContain("Calibri", styles); + Assert.Contains("rgb=\"FF003366\"", styles); // navy header fill + Assert.Contains("rgb=\"FFC0C0C0\"", styles); // grey filter values + Assert.Contains("horizontal=\"center\"", styles); + Assert.Contains("horizontal=\"right\"", styles); // company name + Assert.Contains("wrapText=\"1\"", styles); + } + + [Fact] + public void Column_widths_follow_the_legacy_point_widths() + { + Assert.InRange(LegacyReportWorkbook.Chars(100), 18, 19); + Assert.True(LegacyReportWorkbook.Chars(200) > LegacyReportWorkbook.Chars(150)); + Assert.True(LegacyReportWorkbook.Chars(150) > LegacyReportWorkbook.Chars(100)); + var sheet = Part(Sample(), "xl/worksheets/sheet1.xml"); + Assert.Equal(4, System.Text.RegularExpressions.Regex.Matches(sheet, "", sheet); + Assert.Contains("=1+1", sheet); + } + + [Fact] + public void Sheet_name_has_no_forbidden_characters_and_fits_31_characters() + { + Assert.Equal("Report", LegacyReportWorkbook.SheetName("[:*?/\\]")); + Assert.Equal(31, LegacyReportWorkbook.SheetName(new string('ا', 50)).Length); + Assert.Equal("أرصدة الديزل", LegacyReportWorkbook.SheetName("أرصدة الديزل")); + } + + private static readonly string[] TransferHeaders = + [ + "متسلسل", "رقم الارسالية", "تاريخ الارسالية", "رقم الحمولة", "رقم النموذج", "تاريخ النموذج", "الوزن الصافي للتحميل (كغ)", + "الوزن الصافي للتفريغ(كغ)", "رقم القاطرة", "رقم المقطورة", "صافي قيمة اجور النقل", "الحالة", "تاريخ الاستلام" + ]; + + private static byte[] Transfers(IReadOnlyList>? rows = null) => + LegacyReportWorkbook.ToTransfersXlsx(new TransfersReport( + "شركة نافذ للخدمات اللوجستية", "قائمة ارقام نماذج التفريغ المعدة لصرف أجور النقل", + [("صاحب الحساب", "مكتب"), ("الاسم بالانجليزي", "OFFICE"), ("اسم البنك", "بنك"), ("رقم الحساب", "0055"), ("IBAN", "JO83"), ("صافي قيمة اجور النقل", 360.743m)], + TransferHeaders, [9.14, 10.86, 16.71, 12.29, 12.71, 24.86, 12.29, 13.57, 13.71, 11.43, 15.43, 15.43, 24.29], + rows ?? [[1, "318912", "03/07/2021", 23300L, "26680", "04/07/2021", 35600m, 35600m, "6059378", "7117953", 360.743m, "جاهز للدفع", "08/07/2021 13:37"]])); + + [Fact] + public void Transfers_sheet_has_the_legacy_cell_layout() + { + var sheet = Part(Transfers(), "xl/worksheets/sheet1.xml"); + Assert.Contains("rightToLeft=\"1\"", sheet); + foreach (var m in new[] { "A1:M1", "A2:M2", "A3:M3", "A4:B4", "C4:M4", "A9:B9", "C9:M9", "A10:M10" }) + Assert.Contains($"", sheet); + Assert.Contains("صاحب الحساب", sheet); // label on A:B + Assert.Contains("مكتب", sheet); // value on C:M + Assert.Contains("360.743", sheet); // total, numeric + Assert.Contains("", sheet); // captions on row 11 + Assert.Contains("متسلسل", sheet); + Assert.Contains("تاريخ الاستلام", sheet); + Assert.Contains("1", sheet); // first data row on row 12 + Assert.Equal(13, System.Text.RegularExpressions.Regex.Matches(sheet, "", styles); + Assert.Contains("", styles); // banner: Arial bold 21 + Assert.Contains("rgb=\"FF003366\"", styles); // navy labels and captions + Assert.Contains("horizontal=\"right\"", styles); // account values + Assert.Contains("horizontal=\"center\"", styles); + Assert.DoesNotContain("Calibri", styles); + } + + [Fact] + public void Transfers_with_no_rows_still_has_the_block_and_the_captions() + { + var sheet = Part(Transfers([]), "xl/worksheets/sheet1.xml"); + Assert.Contains("(() => svc.ExchangeAsync(new TripQuery(), default)); + Assert.Equal("يجب ادخال رقم الحساب", e.Message); + await Assert.ThrowsAsync(() => svc.ExchangeAsync(new TripQuery(BankAccount: " "), default)); + } + + [Fact] + public void Trip_filters_show_status_captions_and_dates_oldest_first() + { + var f = TripReportService.Filters(new TripQuery( + Tn: " 55 ", StatusCode: "DISCHARGED,'RESD'", LoadingDateFrom: new DateTime(2026, 3, 1), LoadingDateTo: new DateTime(2026, 3, 31), + PaymentedDateFrom: new DateTime(2026, 1, 5))); + Assert.Equal(("رقم القاطرة", "55"), f[0]); + Assert.Equal("الحالة", f[1].Label); + Assert.Contains("تم التفريغ", f[1].Value); + Assert.Equal(new[] { "من تاريخ الدفع", "من تاريخ التحميل", "الى تاريخ التحميل" }, f.Skip(2).Select(x => x.Label).ToArray()); + Assert.Equal("05/01/2026", f[2].Value); + Assert.Empty(TripReportService.Filters(new TripQuery())); + } +} diff --git a/web/src/features/refinery/cards/api.ts b/web/src/features/refinery/cards/api.ts index 456ba63..0ab6205 100644 --- a/web/src/features/refinery/cards/api.ts +++ b/web/src/features/refinery/cards/api.ts @@ -42,11 +42,11 @@ const keys = () => [gridKey(GRID_CARDS), ['refinery.cards.one'], ['refinery.card export const useCard = (id: number | null) => useQuery({ queryKey: ['refinery.cards.one', id], queryFn: () => api.get(`${BASE}/${id}`), enabled: id !== null }); -export const useCardLog = (id: number | null, page: number, pageSize: number) => +export const useCardLog = (id: number | null, page: number, pageSize: number, enabled = true) => useQuery({ queryKey: ['refinery.cards.log', id, page, pageSize], queryFn: () => api.get>(`${BASE}/${id}/log`, { page, pageSize }, { silent: true }), - enabled: id !== null, + enabled: id !== null && enabled, }); export const useCreateCard = () => diff --git a/web/src/features/refinery/cards/pages.tsx b/web/src/features/refinery/cards/pages.tsx index f6f9cd8..2bf72b8 100644 --- a/web/src/features/refinery/cards/pages.tsx +++ b/web/src/features/refinery/cards/pages.tsx @@ -1,7 +1,8 @@ import { useMemo, useState } from 'react'; import { useNavigate, useParams, useSearchParams } from 'react-router-dom'; import { - Alert, Button, Paper, Stack, Table, TableBody, TableCell, TableContainer, TableHead, TablePagination, TableRow, Typography, + Alert, Box, Button, Collapse, Paper, Stack, Table, TableBody, TableCell, TableContainer, TableHead, TablePagination, TableRow, Typography, + useTheme, } from '@mui/material'; import AddIcon from '@mui/icons-material/Add'; import BlockIcon from '@mui/icons-material/Block'; @@ -71,56 +72,74 @@ export function CardsPage() { ); } -/** Movements of a card (legacy REFINERY_CARDS_logGrid, 5 per page). */ +/** Movements of a card (legacy REFINERY_CARDS_logGrid, 5 per page). Collapsed until the title is clicked; nothing is fetched before. */ function CardLog({ id }: { id: number }) { const { t, lang } = useFeatureUi(strings); + const dir = useTheme().direction; + const [open, setOpen] = useState(false); const [page, setPage] = useState(0); const [pageSize, setPageSize] = useState(5); - const q = useCardLog(id, page + 1, pageSize); + const q = useCardLog(id, page + 1, pageSize, open); const rows = q.data?.items ?? []; const method = (m: string | null) => { const key = `rc.method.${m ?? ''}`; return key in strings ? t(key as keyof typeof strings) : (m ?? ''); }; + // every column starts on the same edge as its header; digits and dates keep their left-to-right order inside the cell + const head = { fontWeight: 700, textAlign: 'start' } as const; + const cell = { textAlign: 'start' } as const; + const num = (v: number | null | undefined) => {formatNumber(v, lang)}; + const toggle = () => setOpen((o) => !o); return ( - - {q.isLoading ? : rows.length === 0 ? {t('rc.log.empty')} : ( - <> - - - - - {t('rc.log.method')} - {t('rc.log.date')} - {t('rc.log.user')} - {t('rc.log.before')} - {t('rc.log.after')} - {t('rc.log.amount')} - {t('rc.log.pn')} - - - - {rows.map((r) => ( - - {method(r.methodName)} - {formatDateTime(r.lastUpdateDate)} - {r.updatedBy} - {formatNumber(r.balanceBefore, lang)} - {formatNumber(r.balanceAfter, lang)} - {formatNumber(r.amount, lang)} - {r.pn && r.pn !== '0' ? r.pn : ''} + { if (e.key === 'Enter' || e.key === ' ') { e.preventDefault(); toggle(); } }} + sx={{ cursor: 'pointer', '& h2': { mb: open ? 1.5 : 0 } }} + > + + + + {q.isLoading ? : rows.length === 0 ? {t('rc.log.empty')} : ( + <> + +
+ + + {t('rc.log.method')} + {t('rc.log.date')} + {t('rc.log.user')} + {t('rc.log.before')} + {t('rc.log.after')} + {t('rc.log.amount')} + {t('rc.log.pn')} - ))} - -
-
- setPage(p)} onRowsPerPageChange={(e) => { setPageSize(Number(e.target.value)); setPage(0); }} - /> - - )} + + + {rows.map((r) => ( + + {method(r.methodName)} + {formatDateTime(r.lastUpdateDate)} + {r.updatedBy} + {num(r.balanceBefore)} + {num(r.balanceAfter)} + {num(r.amount)} + {r.pn && r.pn !== '0' ? r.pn : ''} + + ))} + + + + setPage(p)} onRowsPerPageChange={(e) => { setPageSize(Number(e.target.value)); setPage(0); }} + labelRowsPerPage={t('grid.rowsPerPage')} + labelDisplayedRows={({ from, to, count }) => t('grid.displayedRows', { from, to, count })} + sx={{ '.MuiTablePagination-spacer': { display: 'none' }, '.MuiTablePagination-toolbar': { flexWrap: 'wrap', justifyContent: dir === 'rtl' ? 'flex-end' : 'flex-start' } }} + /> + + )} +
); } diff --git a/web/src/features/refinery/trips/pages.tsx b/web/src/features/refinery/trips/pages.tsx index 727d910..cc793da 100644 --- a/web/src/features/refinery/trips/pages.tsx +++ b/web/src/features/refinery/trips/pages.tsx @@ -56,7 +56,18 @@ export function TripsPage() { const reports: { key: string; label: string; show: boolean; go: () => void }[] = [ { key: 'trips', label: t('trips.report.trips'), show: can('refinery.trips.report'), go: () => void run('trips', current(), 'refinery-trips.xlsx') }, { key: 'operator', label: t('trips.report.operator'), show: can('refinery.trips.operatorReport'), go: () => void run('operator', current(), 'refinery-trips-operator.xlsx') }, - { key: 'exchange', label: t('trips.report.exchange'), show: can('refinery.trips.exchangeReport'), go: () => void run('exchange', current(), 'refinery-trips-exchange.xlsx') }, + { + // الحوالات: the list of ONE bank account (legacy refineryBankReport), so the account number is asked first; the other filters are the + // legacy ones (status, wage claim flag, payment dates), taken from the list + key: 'exchange', label: t('trips.report.exchange'), show: can('refinery.trips.exchangeReport'), go: () => { + const c = current(); + const account = window.prompt(t('trips.report.bankAsk'), c.bankAccount ?? '')?.trim(); + if (!account) { setMenu(null); return; } + const params: Record = { bankAccount: account }; + for (const k of ['statusCode', 'hasWageClaim', 'paymentedDateFrom', 'paymentedDateTo']) if (c[k]) params[k] = c[k]; + void run('exchange', params, 'refinery-transfers.xlsx'); + }, + }, { key: 'diesel', label: t('trips.report.diesel'), show: can('refinery.trips.dieselReport'), go: () => void run('diesel', current(), 'refinery-diesel.xlsx') }, { key: 'cards', label: t('trips.report.cards'), show: can('refinery.trips.cardsReport'), go: () => void run('cards', { tn: current().tn ?? '' }, 'refinery-cards.xlsx') }, { diff --git a/web/src/features/refinery/trips/strings.ts b/web/src/features/refinery/trips/strings.ts index 6190b0c..1cfb703 100644 --- a/web/src/features/refinery/trips/strings.ts +++ b/web/src/features/refinery/trips/strings.ts @@ -46,7 +46,7 @@ export default defineStrings({ 'trips.reports': { en: 'Reports', ar: 'التقارير' }, 'trips.report.trips': { en: 'Trips (Excel)', ar: 'الارساليات (Excel)' }, 'trips.report.operator': { en: 'Trips - operator (Excel)', ar: 'الارساليات - المشغل (Excel)' }, - 'trips.report.exchange': { en: 'Trips - exchange (Excel)', ar: 'الارساليات - الصرف (Excel)' }, + 'trips.report.exchange': { en: 'Transfers (Excel)', ar: 'الحوالات (Excel)' }, 'trips.report.diesel': { en: 'Diesel charges (Excel)', ar: 'شحن الديزل (Excel)' }, 'trips.report.cards': { en: 'Diesel balances (Excel)', ar: 'أرصدة الديزل (Excel)' }, 'trips.report.bank': { en: 'Bank report (Excel)', ar: 'تقرير البنك (Excel)' }, diff --git a/web/src/features/refinery/variables/meta.ts b/web/src/features/refinery/variables/meta.ts index d3c45a2..0d1877d 100644 --- a/web/src/features/refinery/variables/meta.ts +++ b/web/src/features/refinery/variables/meta.ts @@ -4,15 +4,7 @@ import { GRID_VARIABLES, type VariablesRow } from './api'; const s = strings; -const p2 = (n: number) => String(n).padStart(2, '0'); -const iso = (d: Date) => `${d.getFullYear()}-${p2(d.getMonth() + 1)}-${p2(d.getDate())}`; -/** First and last day of the current month as the grid's startDate / endDate filters. */ -const monthRange = () => { - const now = new Date(); - return { startDate: iso(new Date(now.getFullYear(), now.getMonth(), 1)), endDate: iso(new Date(now.getFullYear(), now.getMonth() + 1, 0)) }; -}; - -/** Legacy REFINERY_VARIABLESGRID: period, then the prices; the filters are the two period dates. */ +/** Legacy REFINERY_VARIABLESGRID: period, then the prices; the filters are the two period dates. The API lists the newest period first. */ export function variablesGrid(h: { onOpen: (r: VariablesRow) => void }): GridMeta { return { key: GRID_VARIABLES, @@ -21,8 +13,6 @@ export function variablesGrid(h: { onOpen: (r: VariablesRow) => void }): GridMet onRowClick: h.onOpen, pageSize: 16, emptyAsGrid: true, - // opens on the periods that start in the current month (first day .. last day) - defaultFilters: monthRange(), filters: [ { name: 'startDate', type: 'date', label: s['rv.filter.startDate'] }, { name: 'endDate', type: 'date', label: s['rv.filter.endDate'] },