diff --git a/db/registry-export-permissions.sql b/db/registry-export-permissions.sql new file mode 100644 index 0000000..0fecef9 --- /dev/null +++ b/db/registry-export-permissions.sql @@ -0,0 +1,34 @@ +-- Registry Excel export rights (NAFITHTCS schema): who sees the "تصدير Excel" button of the trucks, trailers and drivers lists. +-- The application has NO role list for this: only these rows decide (SU always may). Safe to re-run: a row is only inserted +-- when it is not there yet. Not executed by the application. +-- +-- Starting values copy the legacy screens (truckGrid.cfm / driverGrid.cfm): +-- trucks, trailers : GTO, GOO, GNAC (+ CO, which has the same rights as GTO) +-- drivers : GTO, GOO (+ CO) +-- +-- To take a right away, delete the row; the API applies it within about a minute (permissions are cached per role for 60 seconds) +-- and the user's browser picks it up on the next page reload or sign-in. + +INSERT INTO GRAINS_SCREEN_PERMISSIONS (ROLECODE, RESOURCE_KEY) +SELECT v.rolecode, v.resource_key + FROM ( + SELECT 'GTO' AS rolecode, 'grains.registry.trucks.export' AS resource_key FROM dual UNION ALL + SELECT 'GOO', 'grains.registry.trucks.export' FROM dual UNION ALL + SELECT 'GNAC', 'grains.registry.trucks.export' FROM dual UNION ALL + SELECT 'CO', 'grains.registry.trucks.export' FROM dual UNION ALL + SELECT 'GTO', 'grains.registry.trailers.export' FROM dual UNION ALL + SELECT 'GOO', 'grains.registry.trailers.export' FROM dual UNION ALL + SELECT 'GNAC', 'grains.registry.trailers.export' FROM dual UNION ALL + SELECT 'CO', 'grains.registry.trailers.export' FROM dual UNION ALL + SELECT 'GTO', 'grains.registry.drivers.export' FROM dual UNION ALL + SELECT 'GOO', 'grains.registry.drivers.export' FROM dual UNION ALL + SELECT 'CO', 'grains.registry.drivers.export' FROM dual + ) v + WHERE NOT EXISTS ( + SELECT 1 FROM GRAINS_SCREEN_PERMISSIONS p + WHERE p.rolecode = v.rolecode AND p.resource_key = v.resource_key); + +COMMIT; + +-- Check (expect 11 rows): +-- SELECT rolecode, resource_key FROM GRAINS_SCREEN_PERMISSIONS WHERE resource_key LIKE 'grains.registry.%.export' ORDER BY 2, 1; diff --git a/docs/ENVIRONMENTS.md b/docs/ENVIRONMENTS.md index 37b9e98..8a27dc5 100644 --- a/docs/ENVIRONMENTS.md +++ b/docs/ENVIRONMENTS.md @@ -50,6 +50,7 @@ Apply these scripts once per database (not run by the application), in this orde 1. `db/grains-screen-permissions.sql` - role to screen/action permissions (`GRAINS_SCREEN_PERMISSIONS`) 2. `db/registry-create-permissions.sql` - add / edit rights of trucks, trailers and drivers (safe to re-run) +2b. `db/registry-export-permissions.sql` - Excel export rights of the trucks, trailers and drivers lists (`grains.registry.*.export`; without rows nobody but SU sees the button) (safe to re-run) 3. `db/disabled-features.sql` - features switched OFF for everybody, SU included (safe to re-run) 4. `db/permits-create-permission.sql` - right to register a turn (تسجيل دور) from the permits list, granted to GOO (safe to re-run) 5. `db/menu-reorganisation.sql` - new طلبية التموين screen, GOO reports reduced to two, GOO loses ضبط الميزان (safe to re-run) diff --git a/src/NTP.Api/Controllers/V1/Grains/OrdersController.cs b/src/NTP.Api/Controllers/V1/Grains/OrdersController.cs index f1eb306..21c5f15 100644 --- a/src/NTP.Api/Controllers/V1/Grains/OrdersController.cs +++ b/src/NTP.Api/Controllers/V1/Grains/OrdersController.cs @@ -234,12 +234,12 @@ public sealed class OrderReportsController(IOrderReportService reports) : Contro public Task TenderOrders([FromQuery] DateTime orderDate, CancellationToken ct) => reports.GetTenderOrderReportAsync(orderDate, ct); - /// format: csv (default) or xlsx. + /// Legacy Excel (HTML table) of the distribution ratios. [HttpGet("tender-orders/export")] [RequirePermission(PermissionKeys.OrdersReportOrders)] - public async Task ExportTenderOrders([FromQuery] DateTime orderDate, [FromQuery] string format = "csv", CancellationToken ct = default) + public async Task ExportTenderOrders([FromQuery] DateTime orderDate, CancellationToken ct = default) { - var f = await reports.ExportTenderOrderReportAsync(orderDate, format, ct); + var f = await reports.ExportTenderOrderReportAsync(orderDate, ct); return File(f.Content, f.ContentType, f.FileName); } diff --git a/src/NTP.Api/Controllers/V1/Grains/RegistryController.cs b/src/NTP.Api/Controllers/V1/Grains/RegistryController.cs index 4954520..1f84a1d 100644 --- a/src/NTP.Api/Controllers/V1/Grains/RegistryController.cs +++ b/src/NTP.Api/Controllers/V1/Grains/RegistryController.cs @@ -25,7 +25,8 @@ public sealed class RegistryController( IRegistryOpsService ops, IRegistryLookupService lookups, IRegistryAttachmentService attachments, - IRegistryQueuePermitService queuePermits) : ControllerBase + IRegistryQueuePermitService queuePermits, + IRegistryExportService exports) : ControllerBase { // ------------------------------------------------------------------------------------------ permissions + lookups @@ -67,6 +68,33 @@ public sealed class RegistryController( [FromQuery] string? headType, [FromQuery] long? tcscac, [FromQuery] int page = 1, [FromQuery] int pageSize = 15, CancellationToken ct = default) => trucks.SearchAsync(new TruckListQuery(searchType, tn, chasesNumber, statusCode, headType, tcscac), new PageRequest(page, pageSize), ct); + /// Excel of the filtered truck / trailer list (legacy openTruckReportExcel; right from GRAINS_SCREEN_PERMISSIONS). + [HttpGet("trucks/export")] + [RequirePermission(PermissionKeys.RegistryTrucksExport)] + public async Task ExportTrucks([FromQuery] string? searchType, [FromQuery] string? tn, [FromQuery] string? chasesNumber, [FromQuery] string? statusCode, + [FromQuery] string? headType, [FromQuery] long? tcscac, CancellationToken ct) + { + var f = await exports.ExportTrucksAsync(new TruckListQuery(searchType, tn, chasesNumber, statusCode, headType, tcscac), ct); + return File(f.Content, f.ContentType, f.FileName); + } + + [HttpGet("trailers/export")] + [RequirePermission(PermissionKeys.RegistryTrailersExport)] + public async Task ExportTrailers([FromQuery] string? tn, [FromQuery] string? chasesNumber, [FromQuery] string? statusCode, [FromQuery] long? tcscac, CancellationToken ct) + { + var f = await exports.ExportTrailersAsync(new TrailerListQuery(tn, chasesNumber, statusCode, tcscac), ct); + return File(f.Content, f.ContentType, f.FileName); + } + + /// Excel of the filtered driver list (legacy openDriversReportExcel; right from GRAINS_SCREEN_PERMISSIONS). + [HttpGet("drivers/export")] + [RequirePermission(PermissionKeys.RegistryDriversExport)] + public async Task ExportDrivers([FromQuery] string? nnpn, [FromQuery] string? name, [FromQuery] string? statusCode, CancellationToken ct) + { + var f = await exports.ExportDriversAsync(new DriverListQuery(nnpn, name, statusCode), ct); + return File(f.Content, f.ContentType, f.FileName); + } + /// getTruckInfo (+ connected trailer, destinations, attachments). [HttpGet("trucks/{id:long}")] [RequirePermission(PermissionKeys.RegistryTrucks)] diff --git a/src/NTP.Api/ErrorHandling/GlobalExceptionHandler.cs b/src/NTP.Api/ErrorHandling/GlobalExceptionHandler.cs index 7dd3c54..d193288 100644 --- a/src/NTP.Api/ErrorHandling/GlobalExceptionHandler.cs +++ b/src/NTP.Api/ErrorHandling/GlobalExceptionHandler.cs @@ -57,7 +57,7 @@ internal sealed class GlobalExceptionHandler( private static (int Status, string Title, string? Detail, IDictionary? Errors) Map(Exception ex) => ex switch { - ValidationException v when v.Errors.Any() => (400, "Validation failed", null, + ValidationException v when v.Errors.Any() => (400, "Validation failed", string.Join(" - ", v.Errors.Select(e => e.ErrorMessage).Distinct()), v.Errors.GroupBy(e => e.PropertyName) .ToDictionary(g => g.Key, g => g.Select(e => e.ErrorMessage).ToArray())), ValidationException v => (400, "Validation failed", v.Message, null), diff --git a/src/NTP.Application/Access/PermissionDefaults.cs b/src/NTP.Application/Access/PermissionDefaults.cs index 409bcfe..faf5d14 100644 --- a/src/NTP.Application/Access/PermissionDefaults.cs +++ b/src/NTP.Application/Access/PermissionDefaults.cs @@ -47,6 +47,11 @@ public static class PermissionKeys public const string RegistryTrucksEdit = "grains.registry.trucks.edit"; public const string RegistryTrailersEdit = "grains.registry.trailers.edit"; + // Actions: Excel export of the trucks / trailers / drivers lists. Granted ONLY by rows in GRAINS_SCREEN_PERMISSIONS (SU always). + public const string RegistryTrucksExport = "grains.registry.trucks.export"; + public const string RegistryTrailersExport = "grains.registry.trailers.export"; + public const string RegistryDriversExport = "grains.registry.drivers.export"; + // Actions / sub-screens of the permits module that have no menu entry of their own public const string PermitsClose = "grains.permits.close"; // legacy arrivalTruck.cfm public const string PermitsTruckOrder = "grains.permits.truckOrder"; // legacy processOpenPermit.cfm diff --git a/src/NTP.Application/Auth/AuthValidators.cs b/src/NTP.Application/Auth/AuthValidators.cs index c0a9989..4e02398 100644 --- a/src/NTP.Application/Auth/AuthValidators.cs +++ b/src/NTP.Application/Auth/AuthValidators.cs @@ -15,9 +15,9 @@ public sealed class ChangePasswordRequestValidator : AbstractValidator x.OldPassword).NotEmpty().MaximumLength(200); + RuleFor(x => x.OldPassword).NotEmpty().WithMessage("الرجاء إدخال كلمة السر الحالية").MaximumLength(200); // login keeps accepting every existing password; only a NEW password has to be reasonably strong - RuleFor(x => x.NewPassword).NotEmpty().MaximumLength(200) + RuleFor(x => x.NewPassword).NotEmpty().WithMessage("الرجاء إدخال كلمة السر الجديدة").MaximumLength(200) .MinimumLength(8).WithMessage("كلمة السر يجب ألا تقل عن 8 خانات") .Must(p => p is not null && p.Any(char.IsLetter) && p.Any(char.IsDigit)).WithMessage("كلمة السر يجب أن تحتوي على أحرف وأرقام") .Must((r, p) => p != r.OldPassword).WithMessage("كلمة السر الجديدة يجب أن تختلف عن القديمة"); diff --git a/src/NTP.Application/Grains/Orders/OrderReportService.cs b/src/NTP.Application/Grains/Orders/OrderReportService.cs index 685396d..e1d30a7 100644 --- a/src/NTP.Application/Grains/Orders/OrderReportService.cs +++ b/src/NTP.Application/Grains/Orders/OrderReportService.cs @@ -7,7 +7,8 @@ namespace NTP.Application.Grains.Orders; public interface IOrderReportService { Task GetTenderOrderReportAsync(DateTime orderDate, CancellationToken ct); - Task ExportTenderOrderReportAsync(DateTime orderDate, string format, CancellationToken ct); + /// The legacy tenderOrderReport_xls.cfm Excel (an HTML table opened by Excel). + Task ExportTenderOrderReportAsync(DateTime orderDate, CancellationToken ct); Task GetFinancialBillingAsync(long scac, long invoiceNumber, PageRequest page, CancellationToken ct); /// The legacy FinancialBilling.cfm Excel (an HTML table opened by Excel), byte for byte the same layout. @@ -62,30 +63,40 @@ public sealed class OrderReportService(IOrderReportRepository repository, ICurre destRows.Sum(x => x.Individuals), destRows.Sum(x => x.Companies)); } - public async Task ExportTenderOrderReportAsync(DateTime orderDate, string format, CancellationToken ct) + /// Legacy tenderOrderReport_xls.cfm: an HTML table opened by Excel, same layout and texts. + public async Task ExportTenderOrderReportAsync(DateTime orderDate, CancellationToken ct) { var r = await GetTenderOrderReportAsync(orderDate, ct); - string TypeLabel(string? t) => t switch - { - TenderOrderType.Individuals => L("افراد", "Individuals"), - TenderOrderType.Company => L("شركات", "Companies"), - _ => string.Empty - }; + static string E(object? v) => System.Net.WebUtility.HtmlEncode(Convert.ToString(v, System.Globalization.CultureInfo.InvariantCulture) ?? string.Empty); + static string TypeLabel(string? t) => t switch { TenderOrderType.Individuals => "افراد", TenderOrderType.Company => "شركات", _ => string.Empty }; - var title = new[] { L("شركة نافذ للخدمات اللوجستية", "Nafith Logistics Services"), L("نسب التوزيع في طلبيات السائب", "Distribution ratios of bulk orders"), $"{L("تاريخ الطلبية", "Order date")}: {r.OrderDate}" }; - var t1 = new ExportTable(title, - [L("افراد \\ شركات", "Individuals / Companies"), L("العدد", "Count"), L("النسبة", "Ratio")], - r.ByType.Select(x => (IReadOnlyList)new object?[] { TypeLabel(x.Type), x.Quantity, x.Percent }).ToList(), - [L("المجموع", "Total"), r.TypeTotal, "100%"]); + var h = new System.Text.StringBuilder(); + h.Append(""); + h.Append(""); + h.Append("
"); + h.Append(""); + h.Append(""); + h.Append(""); + foreach (var x in r.ByType) + h.Append($""); + h.Append($""); + h.Append(""); + h.Append(""); + foreach (var c in new[] { "الوجهة", "عدد الافراد", "نسبة الافراد", "عدد الشركات", "نسبة الشركات", "المجموع" }) + h.Append($""); + h.Append(""); + foreach (var x in r.ByDestination) + h.Append($""); + h.Append(""); + if (r.ByDestination.Count == 0) h.Append(""); + h.Append($""); + h.Append($""); + h.Append("
شركة نافذ للخدمات اللوجستية
نسب التوزيع في طلبيات السائب
افراد \\ شركاتالعددالنسبة
{TypeLabel(x.Type)}{E(x.Quantity)}{E(x.Percent)}
المجموع{E(r.TypeTotal)}100%
{c}
{E(x.Destination)}{E(x.Individuals)}{E(x.IndividualsPercent)}%{E(x.Companies)}{E(x.CompaniesPercent)}%{E(x.Total)}
لايوجد معلومات
بتاريخ : {DateTime.Now:dd/MM/yyyy HH:mm}جميع الحقوق محفوظة لشركة نافذ للخدمات اللوجستيةطبع التقرير بواسطة : {E(user.UserId)}
"); - var t2 = new ExportTable([], - [L("الوجهة", "Destination"), L("عدد الافراد", "Individuals"), L("نسبة الافراد", "Individuals %"), - L("عدد الشركات", "Companies"), L("نسبة الشركات", "Companies %"), L("المجموع", "Total")], - r.ByDestination.Select(x => (IReadOnlyList)new object?[] - { x.Destination, x.Individuals, x.IndividualsPercent + "%", x.Companies, x.CompaniesPercent + "%", x.Total }).ToList(), - [L("المجموع", "Total"), r.TotalIndividuals, null, r.TotalCompanies, null, r.TotalIndividuals + r.TotalCompanies]); - - return Build([t1, t2], format, $"ordersReport_{r.OrderDate}"); + var bytes = new System.Text.UTF8Encoding(true).GetPreamble().Concat(System.Text.Encoding.UTF8.GetBytes(h.ToString())).ToArray(); + return new ExportFile(bytes, "application/vnd.ms-excel", "ordersReport.xls"); } // ------------------------------------------------------------------ financial billing diff --git a/src/NTP.Application/Grains/Orders/OrdersContracts.cs b/src/NTP.Application/Grains/Orders/OrdersContracts.cs index bcbd94d..9412f0f 100644 --- a/src/NTP.Application/Grains/Orders/OrdersContracts.cs +++ b/src/NTP.Application/Grains/Orders/OrdersContracts.cs @@ -47,14 +47,14 @@ public sealed record TenderOrderDto( bool? MobileShow, bool CanDelete); -// Shift: Mobile shift: 1 morning, 2 evening, 3 night (legacy form field SHIFT). +// Shift (optional): Mobile shift: 1 morning, 2 evening, 3 night (legacy form field SHIFT). // Type: AHALE or COMP (required unless cargo type is 41). public sealed record CreateTenderOrderRequest( long CargoType, long Location, long Destination, DateTime OrderDate, - int Shift, + int? Shift, int Quantity, bool IsTipper, string? Type); diff --git a/src/NTP.Application/Grains/Orders/OrdersValidators.cs b/src/NTP.Application/Grains/Orders/OrdersValidators.cs index 35951a3..78a0fcf 100644 --- a/src/NTP.Application/Grains/Orders/OrdersValidators.cs +++ b/src/NTP.Application/Grains/Orders/OrdersValidators.cs @@ -11,7 +11,7 @@ public sealed class CreateTenderOrderValidator : AbstractValidator x.Location).GreaterThan(0).WithMessage("موقع التحميل مطلوب"); RuleFor(x => x.Destination).GreaterThan(0).WithMessage("الوجهه مطلوبة"); RuleFor(x => x.OrderDate).NotEmpty().WithMessage("تاريخ الطلبية مطلوب"); - RuleFor(x => x.Shift).InclusiveBetween(1, 3).WithMessage("الفترة مطلوبة"); + RuleFor(x => x.Shift).InclusiveBetween(1, 3).When(x => x.Shift.HasValue).WithMessage("الفترة غير صحيحة"); RuleFor(x => x.Quantity) .Must(TenderOrderRules.IsQuantityValid).WithMessage("عدد السيارات يجب ان يكون بين 1 - 200"); RuleFor(x => x.Type) diff --git a/src/NTP.Application/Grains/Registry/RegistryExportService.cs b/src/NTP.Application/Grains/Registry/RegistryExportService.cs new file mode 100644 index 0000000..0157ef5 --- /dev/null +++ b/src/NTP.Application/Grains/Registry/RegistryExportService.cs @@ -0,0 +1,92 @@ +using System.Net; +using System.Text; +using NTP.Application.Abstractions; +using NTP.Application.Common; +using NTP.Application.Grains.Orders; + +namespace NTP.Application.Grains.Registry; + +public interface IRegistryExportService +{ + Task ExportTrucksAsync(TruckListQuery query, CancellationToken ct); + Task ExportTrailersAsync(TrailerListQuery query, CancellationToken ct); + Task ExportDriversAsync(DriverListQuery query, CancellationToken ct); +} + +/// +/// Excel of the filtered registry grids (legacy truckGrid.cfm openTruckReportExcel / driverGrid.cfm openDriversReportExcel: the buttons +/// were shown to GTO, GOO, GNAC / GTO, GOO). Who may export is decided only by the permission keys *.export (GRAINS_SCREEN_PERMISSIONS, see +/// the controller); there is no role list in code. +/// +public sealed class RegistryExportService( + ITruckRegistryService trucks, ITrailerRegistryService trailers, IDriverRegistryService drivers, ICurrentUser user) : IRegistryExportService +{ + private const int MaxRows = 20000; + private static async Task> AllAsync(Func>> fetch) + { + var all = new List(); + for (var p = 1; all.Count < MaxRows; p++) + { + var r = await fetch(new PageRequest(p, PageRequest.MaxPageSize)); + all.AddRange(r.Items); + if (r.Items.Count == 0 || all.Count >= r.TotalCount) break; + } + return all; + } + + public async Task ExportTrucksAsync(TruckListQuery query, CancellationToken ct) + { + var rows = await AllAsync(p => trucks.SearchAsync(query, p, ct)); + var label = query.SearchType == "TRN" ? "المقطورة" : "القاطرة"; + return Build("شاشة القاطرات/ المقطورات المسجلة", "TruckReport", + [label, "رقم الشاصي", "الشركة", "انتهاء الترخيص", "تاريخ الإنشاء", "أنشئ بواسطة", "الحالة"], + rows.Select(r => new object?[] { r.Tn, r.ChasesNumber, r.CompName, D(r.RegDate), D(r.CreateTimestamp, true), r.CreateUserId, r.StatusCaption })); + } + + public async Task ExportTrailersAsync(TrailerListQuery query, CancellationToken ct) + { + var rows = await AllAsync(p => trailers.SearchAsync(query, p, ct)); + return Build("شاشة المقطورات المسجلة", "TrailerReport", + ["رقم المقطورة", "رقم الشاصي", "الشركة", "المالك", "انتهاء الترخيص", "تاريخ الإنشاء", "أنشئ بواسطة", "الحالة"], + rows.Select(r => new object?[] { r.Tn, r.ChasesNumber, r.CompName, r.OwnerName, D(r.RegDate), D(r.CreateTimestamp, true), r.CreateUserId, r.StatusCaption })); + } + + public async Task ExportDriversAsync(DriverListQuery query, CancellationToken ct) + { + var rows = await AllAsync(p => drivers.SearchAsync(query, p, ct)); + return Build("شاشة السائقين المسجلين", "DriversReport", + ["الرقم الوطني", "الاسم", "رقم الرخصة", "انتهاء الرخصة", "الشركة", "تاريخ الإنشاء", "أنشئ بواسطة", "الحالة"], + rows.Select(r => new object?[] { r.Nnpn, r.Name, r.Dln, D(r.Dled), r.CompName, D(r.CreateTimestamp, true), r.CreateUserId, r.StatusCaption })); + } + + private static string D(DateTime? d, bool time = false) => d is null ? string.Empty : d.Value.ToString(time ? "dd/MM/yyyy HH:mm" : "dd/MM/yyyy"); + + private ExportFile Build(string title, string fileName, string[] headers, IEnumerable rows) + { + static string E(object? v) => WebUtility.HtmlEncode(Convert.ToString(v, System.Globalization.CultureInfo.InvariantCulture) ?? string.Empty); + var n = headers.Length; + var h = new StringBuilder(); + h.Append(""); + h.Append(""); + h.Append("
"); + h.Append($""); + h.Append($""); + h.Append(""); + foreach (var c in headers) h.Append($""); + h.Append(""); + var count = 0; + foreach (var r in rows) + { + count++; + h.Append(""); + foreach (var v in r) h.Append($""); + h.Append(""); + } + if (count == 0) h.Append($""); + h.Append($""); + h.Append("
شركة نافذ للخدمات اللوجستية
{E(title)}
{E(c)}
{E(v)}
لايوجد معلومات
بتاريخ : {DateTime.Now:dd/MM/yyyy HH:mm} - عدد النتائج : {count} - طبع التقرير بواسطة : {E(user.UserId)}
"); + var bytes = new UTF8Encoding(true).GetPreamble().Concat(Encoding.UTF8.GetBytes(h.ToString())).ToArray(); + return new ExportFile(bytes, "application/vnd.ms-excel", fileName + ".xls"); + } +} diff --git a/src/NTP.Domain/Grains/Orders/OrdersDomain.cs b/src/NTP.Domain/Grains/Orders/OrdersDomain.cs index 76da1dc..fc10429 100644 --- a/src/NTP.Domain/Grains/Orders/OrdersDomain.cs +++ b/src/NTP.Domain/Grains/Orders/OrdersDomain.cs @@ -52,7 +52,7 @@ public static class GrainsOrderConstants /// New GRAINSTENDERORDER row. public sealed record NewTenderOrder( - long CargoType, long Location, long Destination, DateTime OrderDate, int MobileShift, + long CargoType, long Location, long Destination, DateTime OrderDate, int? MobileShift, int Quantity, string? Type, string Ct, string CreatedBy); /// New GRAINS_BILLING row (columns exactly as written by legacy addBillingInfo). diff --git a/src/NTP.Domain/Grains/Permits/PermitRules.cs b/src/NTP.Domain/Grains/Permits/PermitRules.cs index 4b9ec35..26e93e3 100644 --- a/src/NTP.Domain/Grains/Permits/PermitRules.cs +++ b/src/NTP.Domain/Grains/Permits/PermitRules.cs @@ -146,7 +146,7 @@ public sealed record DistributionCategory(string Request, string DistributionCod public bool IsGallabCompany => Request == "BULK_GALLAB_COMP"; public static readonly string[] Allowed = - ["PCKD", "BULK_AHALE", "BULK_COMP", "BULK_GALLAB_COMP", "BULK_GALLAB_AHALE"]; + ["PCKD", "BULK_AHALE", "BULK_COMP", "BULK_GALLAB_COMP", "BULK_GALLAB_AHALE", "RED_SEA"]; public static DistributionCategory? Parse(string? request) { @@ -156,6 +156,8 @@ public sealed record DistributionCategory(string Request, string DistributionCod "BULK_AHALE" => new(r, "BULK", "AHALE", "BULK"), "BULK_COMP" => new(r, "BULK", "COMP", "BULK"), "PCKD" => new(r, "PCKD", "", "PCKD"), + // البحر الأحمر: its own cargo class / queue code RED_SEA, not split into individuals and companies (new, no legacy counterpart) + "RED_SEA" => new(r, "RED_SEA", "", "RED_SEA"), "BULK_GALLAB_COMP" => new(r, "BULK_GALLAB", "COMP", "BULK"), "BULK_GALLAB_AHALE" => new(r, "BULK_GALLAB", "AHALE", "BULK"), _ => null @@ -180,6 +182,7 @@ public sealed record DistributionCategory(string Request, string DistributionCod "BULK_COMP" => "لا توجد طلبات سائب شركات مسجلة على النظام ، او قد تم توزيع كامل الطلبية", "BULK_GALLAB_COMP" => "لا توجد طلبات قلاب شركات مسجلة على النظام ، او قد تم توزيع كامل الطلبية", "BULK_GALLAB_AHALE" => "لا توجد طلبات قلاب أفراد مسجلة على النظام ، او قد تم توزيع كامل الطلبية", + "RED_SEA" => "لا توجد طلبات البحر الأحمر مسجلة على النظام ، او قد تم توزيع كامل الطلبية", _ => string.Empty }; } diff --git a/src/NTP.Infrastructure/Persistence/Repositories/Grains/Permits/DistributionRepository.cs b/src/NTP.Infrastructure/Persistence/Repositories/Grains/Permits/DistributionRepository.cs index 45a1590..9af3bbc 100644 --- a/src/NTP.Infrastructure/Persistence/Repositories/Grains/Permits/DistributionRepository.cs +++ b/src/NTP.Infrastructure/Persistence/Repositories/Grains/Permits/DistributionRepository.cs @@ -26,7 +26,7 @@ internal sealed class DistributionRepository(IDbSession session, ILogger(sql, new { Code = distributionCode, Type = queueType }, ct)) ?? new OrderTotalsRow(); } @@ -34,7 +34,7 @@ internal sealed class DistributionRepository(IDbSession session, ILogger(sql, new { Code = distributionCode, Type = queueType }, ct); } diff --git a/web/src/features/grains-orders/api.ts b/web/src/features/grains-orders/api.ts index 00d781c..9114655 100644 --- a/web/src/features/grains-orders/api.ts +++ b/web/src/features/grains-orders/api.ts @@ -164,12 +164,17 @@ export function useSaveCompanyDestinations(scac: number | null) { } // ---------------------------------------------------------------- CSV / Excel download (bearer token, so not a plain link) -export async function downloadExport(path: string, params: Record, fallbackName: string): Promise { +export function downloadExport(path: string, params: Record, fallbackName: string): Promise { + return downloadFile(`${BASE}${path}`, params, fallbackName); +} + +/** Authenticated file download of any API path below the versioned base (the bearer token rules out a plain link). */ +export async function downloadFile(apiPath: string, params: Record, fallbackName: string): Promise { if (MOCK) return; const qs = new URLSearchParams(); for (const [k, v] of Object.entries(params)) if (v !== undefined && v !== '') qs.append(k, String(v)); const token = getToken(); - const res = await fetch(`${API_BASE}${BASE}${path}?${qs}`, { headers: token ? { Authorization: `Bearer ${token}` } : {} }); + const res = await fetch(`${API_BASE}${apiPath}?${qs}`, { headers: token ? { Authorization: `Bearer ${token}` } : {} }); if (!res.ok) { let problem: { detail?: string; title?: string } | undefined; try { problem = await res.json(); } catch { /* not JSON */ } diff --git a/web/src/features/grains-orders/meta/orders.tsx b/web/src/features/grains-orders/meta/orders.tsx index 9abef77..960bff2 100644 --- a/web/src/features/grains-orders/meta/orders.tsx +++ b/web/src/features/grains-orders/meta/orders.tsx @@ -99,10 +99,10 @@ export const tenderOrderForm = (): FormMeta => ({ columns: 2, fields: [ { name: 'cargoType', type: 'select', label: { en: 'Cargo type', ar: 'نمط الحمولة' }, required: true, options: cargoTypeOptions }, - { name: 'location', type: 'select', label: { en: 'Loading site', ar: 'موقع التحميل' }, required: true, options: loadingLocationOptions }, - { name: 'destination', type: 'select', label: { en: 'Destination', ar: 'الوجهه' }, required: true, options: destinationOptions }, + { name: 'location', type: 'autocomplete', label: { en: 'Loading site', ar: 'موقع التحميل' }, required: true, options: loadingLocationOptions }, + { name: 'destination', type: 'autocomplete', label: { en: 'Destination', ar: 'الوجهه' }, required: true, options: destinationOptions }, { name: 'orderDate', type: 'select', label: { en: 'Order date', ar: 'تاريخ الطلبية' }, required: true, options: orderDateOptions() }, - { name: 'shift', type: 'select', label: { en: 'Shift', ar: 'الفترة' }, required: true, options: shiftOptions }, + { name: 'shift', type: 'select', label: { en: 'Shift', ar: 'الفترة' }, options: shiftOptions }, { name: 'quantity', type: 'number', label: { en: 'Number of trucks', ar: 'عدد السيارات' }, required: true, min: 1, max: 200 }, { // packed cargo and the tipper destinations lock this box (legacy checkIfGallab); the backend derives CT anyway diff --git a/web/src/features/grains-orders/pages.tsx b/web/src/features/grains-orders/pages.tsx index d0559ea..dabe750 100644 --- a/web/src/features/grains-orders/pages.tsx +++ b/web/src/features/grains-orders/pages.tsx @@ -124,7 +124,7 @@ export function TenderOrderCreatePage() { new Promise((resolve) => { setServerErrors({}); create.mutate( - { ...payload, quantity: Number(payload.quantity), shift: Number(payload.shift), isTipper: payload.isTipper === true }, + { ...payload, quantity: Number(payload.quantity), shift: payload.shift ? Number(payload.shift) : null, isTipper: payload.isTipper === true }, { onSuccess: () => { resolve(); navigate('/grains/orders'); }, onError: (e) => { setServerErrors({ ...e.fieldErrors }); resolve(); }, @@ -593,8 +593,8 @@ export function TenderOrderReportPage() { if (!canManage) return {t('ord.forbidden')}; - const exportAs = (format: 'csv' | 'xlsx') => - downloadExport('/reports/tender-orders/export', { orderDate: date, format }, `ordersReport_${date}.${format}`) + const exportExcel = () => + downloadExport('/reports/tender-orders/export', { orderDate: date }, 'ordersReport.xls') .catch((e) => toast.error(errText(e, t('ord.export.failed')))); return ( @@ -602,18 +602,15 @@ export function TenderOrderReportPage() { - - - - } /> - - + + + + + {!date && {t('ord.orders.reportPickDate')}} {q.isPending && date && } {q.isError && {errText(q.error, t('error.generic'))}} diff --git a/web/src/features/grains-orders/strings.ts b/web/src/features/grains-orders/strings.ts index 08d01ca..5c7e7ec 100644 --- a/web/src/features/grains-orders/strings.ts +++ b/web/src/features/grains-orders/strings.ts @@ -4,7 +4,7 @@ import { defineStrings } from '@/i18n/useUi'; export default defineStrings({ // ---- menu 'ord.menu.finance': { en: 'Finance', ar: 'المالية' }, - 'ord.menu.group': { en: 'Orders and billing', ar: 'الطلبيات والمطالبات' }, + 'ord.menu.group': { en: 'Orders', ar: 'الطلبيات' }, 'ord.menu.orders': { en: 'Tender orders', ar: 'الطلبيات' }, 'ord.menu.quotas': { en: 'Daily quota', ar: 'الحصة اليومية' }, 'ord.menu.billing': { en: 'Billing claims', ar: 'المطالبات المالية' }, diff --git a/web/src/features/grains-permits/pages.tsx b/web/src/features/grains-permits/pages.tsx index 0d11292..d936ed5 100644 --- a/web/src/features/grains-permits/pages.tsx +++ b/web/src/features/grains-permits/pages.tsx @@ -737,10 +737,10 @@ export function SupplyOrderPage() { - {t('pm.dist.company')}{t('pm.dist.silos')} + {t('pm.dist.companyNo')}{t('pm.dist.company')}{t('pm.dist.silos')} {t('pm.dist.direct')}{t('pm.dist.packed')} {(pivot.data ?? []).map((r) => ( - {r.company}{r.silos} + {r.companyCode}{r.company}{r.silos} {r.direct}{r.packed} ))}
@@ -795,6 +795,7 @@ function DistributeTab() { { v: 'BULK_COMP', en: 'Bulk - companies', ar: 'سائب - شركات', q: 'هل أنت متأكد من توزيع طلبية سائب شركات لهذا اليوم؟' }, { v: 'BULK_GALLAB_AHALE', en: 'Tipper bulk - individuals', ar: 'قلاب - أفراد', q: 'هل أنت متأكد من توزيع طلبية قلاب أفراد لهذا اليوم؟' }, { v: 'BULK_GALLAB_COMP', en: 'Tipper bulk - companies', ar: 'قلاب - شركات', q: 'هل أنت متأكد من توزيع طلبية قلاب شركات لهذا اليوم؟' }, + { v: 'RED_SEA', en: 'Red Sea', ar: 'البحر الأحمر', q: 'هل أنت متأكد من توزيع طلبية البحر الأحمر لهذا اليوم؟' }, ]; const [cat, setCat] = useState(''); // nothing preselected: a distribution run cannot be undone const summary = useDistributionSummary(); diff --git a/web/src/features/grains-permits/strings.ts b/web/src/features/grains-permits/strings.ts index 90621d2..b37b755 100644 --- a/web/src/features/grains-permits/strings.ts +++ b/web/src/features/grains-permits/strings.ts @@ -161,6 +161,7 @@ export default defineStrings({ 'pm.wb.tabClose': { en: 'Close a permit', ar: 'اغلاق إرسالية' }, 'pm.menu.close': { en: 'Close a permit', ar: 'اغلاق إرسالية' }, 'pm.menu.inquiry': { en: 'Truck inquiry', ar: 'استعلام عن سيارة' }, + 'pm.dist.companyNo': { en: 'Company no.', ar: 'رقم الشركة' }, 'pm.menu.supply': { en: 'Supply order', ar: 'طلبية التموين' }, 'pm.close.title': { en: 'Close a permit', ar: 'اغلاق إرسالية' }, 'pm.close.subtitle': { en: 'Close a permit manually by its number', ar: 'اغلاق الإرسالية يدويا برقمها' }, diff --git a/web/src/features/grains-registry/meta/trailers.ts b/web/src/features/grains-registry/meta/trailers.ts index 4b1d914..059a2f8 100644 --- a/web/src/features/grains-registry/meta/trailers.ts +++ b/web/src/features/grains-registry/meta/trailers.ts @@ -20,7 +20,6 @@ export function trailerGrid(h: { isCompanyUser: boolean; onOpen: (r: TrailerRow) ], columns: [ { key: 'tn', header: lbl('Number', 'الرقم'), ltr: true }, - { key: 'chasesNumber', header: lbl('Chassis number', 'رقم الشصي'), ltr: true, hideBelow: 'sm' }, { key: 'compName', header: lbl('Company', 'الشركة'), hideBelow: 'md' }, { key: 'ownerName', header: lbl('Owner', 'المالك'), hideBelow: 'lg' }, { key: 'regDate', header: lbl('License expiry', 'انتهاء الترخيص'), format: 'date', ltr: true, hideBelow: 'lg' }, diff --git a/web/src/features/grains-registry/meta/trucks.ts b/web/src/features/grains-registry/meta/trucks.ts index 2c0a3df..a6ed851 100644 --- a/web/src/features/grains-registry/meta/trucks.ts +++ b/web/src/features/grains-registry/meta/trucks.ts @@ -28,7 +28,6 @@ export function truckGrid(h: { isCompanyUser: boolean; onOpen: (r: TruckRow) => ], columns: [ { key: 'tn', header: lbl('Number', 'الرقم'), ltr: true }, - { key: 'chasesNumber', header: lbl('Chassis number', 'رقم الشصي'), ltr: true, hideBelow: 'sm' }, { key: 'compName', header: lbl('Company', 'الشركة'), hideBelow: 'md' }, { key: 'regDate', header: lbl('License expiry', 'انتهاء الترخيص'), format: 'date', ltr: true, hideBelow: 'lg' }, { key: 'createTimestamp', header: lbl('Created on', 'تاريخ الإنشاء'), format: 'datetime', ltr: true, hideBelow: 'lg' }, @@ -41,7 +40,6 @@ export function truckGrid(h: { isCompanyUser: boolean; onOpen: (r: TruckRow) => /** Small read-only grid of the trailers connected to a truck (legacy getTrailerGrid of the truck page). */ export const connectedTrailerColumns = (): GridMeta['columns'] => [ { key: 'tn', header: lbl('Trailer', 'المقطورة'), ltr: true }, - { key: 'chasesNumber', header: lbl('Chassis number', 'رقم الشصي'), ltr: true, hideBelow: 'sm' }, { key: 'regDate', header: lbl('License expiry', 'انتهاء الترخيص'), format: 'date', ltr: true, hideBelow: 'md' }, { key: 'statusCode', header: lbl('Status', 'الحالة'), format: 'status', statuses: registryStatuses }, ]; diff --git a/web/src/features/grains-registry/pages.tsx b/web/src/features/grains-registry/pages.tsx index e48b041..fcde4ea 100644 --- a/web/src/features/grains-registry/pages.tsx +++ b/web/src/features/grains-registry/pages.tsx @@ -5,6 +5,7 @@ import { TableHead, TableRow, TextField, Typography, } from '@mui/material'; import AddIcon from '@mui/icons-material/Add'; +import DownloadIcon from '@mui/icons-material/Download'; import BlockIcon from '@mui/icons-material/Block'; import CheckCircleIcon from '@mui/icons-material/CheckCircle'; import type { ApiError } from '@/api/client'; @@ -16,7 +17,9 @@ import { StatusChip } from '@/components/StatusChip'; import { formatDate, formatNumber } from '@/components/meta/format'; import { useFeatureUi } from '@/i18n/useUi'; import { useConfirm } from '@/providers/ConfirmProvider'; +import { useAuth } from '@/providers/AuthProvider'; import { useToast } from '@/providers/ToastProvider'; +import { downloadFile } from '../grains-orders/api'; import { useAddBlacklist, useCancelBlacklist, useCreateDriver, useCreateTrailer, useCreateTruck, useDestinationOptions, useDriver, useDriverAction, useLocationTruckCounts, usePermissions, useSaveWeighbridge, useTrailer, useTrailerAction, useTruck, @@ -97,6 +100,25 @@ function splitDestinations(ids: number[] | null | undefined, o: RegistryDestinat } // ================================================================= trucks +/** Excel of the list with the filters currently applied (legacy report icon); shown only with the permission grains.registry..export from the database. */ +function ExportButton({ kind }: { kind: 'trucks' | 'trailers' | 'drivers' }) { + const { t } = useFeatureUi(strings); + const { can } = useAuth(); + const toast = useToast(); + const [sp] = useSearchParams(); + const [busy, setBusy] = useState(false); + if (!can(`grains.registry.${kind}.export`)) return null; + const run = async () => { + setBusy(true); + const params: Record = {}; + sp.forEach((v, k) => { if (k !== 'page' && k !== 'pageSize' && k !== 'f') params[k] = v; }); + try { await downloadFile(`/grains/registry/${kind}/export`, params, kind + '.xls'); } + catch (e) { toast.error(e instanceof Error ? e.message : t('error.generic')); } + finally { setBusy(false); } + }; + return ; +} + export function TrucksPage() { const { t } = useFeatureUi(strings); const navigate = useNavigate(); @@ -115,8 +137,13 @@ export function TrucksPage() { } onClick={() => navigate(`${ROOT}/trucks/new`)}>{t('reg.trucks.new')} + actions={( + <> + + {perms?.canAddTruck && ( + + )} + )} /> @@ -277,8 +304,13 @@ export function TrailersPage() { } onClick={() => navigate(`${ROOT}/trailers/new`)}>{t('reg.trailers.new')} + actions={( + <> + + {perms?.canAddTrailer && ( + + )} + )} /> @@ -407,8 +439,13 @@ export function DriversPage() { } onClick={() => navigate(`${ROOT}/drivers/new`)}>{t('reg.drivers.new')} + actions={( + <> + + {perms?.canAddDriver && ( + + )} + )} /> diff --git a/web/src/features/grains-registry/strings.ts b/web/src/features/grains-registry/strings.ts index 6135c80..743175b 100644 --- a/web/src/features/grains-registry/strings.ts +++ b/web/src/features/grains-registry/strings.ts @@ -50,6 +50,7 @@ export default defineStrings({ // ---- trucks 'reg.trucks.title': { en: 'Trucks', ar: 'القاطرات' }, 'reg.trucks.subtitle': { en: 'Registered tractor units per company', ar: 'القاطرات المسجلة حسب الشركة' }, + 'reg.export': { en: 'Export Excel', ar: 'تصدير Excel' }, 'reg.trucks.new': { en: 'New truck', ar: 'قاطرة جديدة' }, 'reg.trucks.createTitle': { en: 'Register a truck', ar: 'تسجيل قاطرة' }, 'reg.trucks.detailTitle': { en: 'Truck {tn}', ar: 'القاطرة {tn}' }, diff --git a/web/src/features/grains-reports/routes.tsx b/web/src/features/grains-reports/routes.tsx index 18be5a4..a7b6683 100644 --- a/web/src/features/grains-reports/routes.tsx +++ b/web/src/features/grains-reports/routes.tsx @@ -13,6 +13,7 @@ import { } from './pages'; import { tableReports } from './meta'; import strings from './strings'; +import orderStrings from '../grains-orders/strings'; const B = '/grains/reports'; @@ -48,6 +49,7 @@ export const menu: MenuItem[] = [ { key: 'grains.reports.details', title: strings['rpt.menu.details'], icon: TableChartIcon, path: `${B}/trips/details` }, table('weighbridge-events', ScaleIcon), table('waybridge-summary', ScaleIcon), table('waybridge-details', ScaleIcon), table('loading-weights', ScaleIcon), table('closed-permits'), table('incapability'), + { key: 'grains.orders.reportOrders', title: orderStrings['ord.orders.reportTitle'], icon: PieChartIcon, path: '/grains/orders/reports/tender-orders' }, table('tender-order'), table('distribution-summary'), table('order-distribution'), table('call-list'), table('companies-turn'), table('owners-turn'), table('drivers'), table('trucks'), diff --git a/web/src/i18n/ui.ts b/web/src/i18n/ui.ts index b9d3cec..cab1035 100644 --- a/web/src/i18n/ui.ts +++ b/web/src/i18n/ui.ts @@ -51,6 +51,10 @@ export const ui = { 'user.currentPassword': { en: 'Current password', ar: 'كلمة المرور الحالية' }, 'user.newPassword': { en: 'New password', ar: 'كلمة المرور الجديدة' }, 'user.confirmPassword': { en: 'Confirm new password', ar: 'تأكيد كلمة المرور الجديدة' }, + 'user.passwordRules': { en: 'At least 8 characters, letters and digits, different from the current password', ar: 'ثماني خانات على الأقل، أحرف وأرقام، وتختلف عن كلمة المرور الحالية' }, + 'user.passwordTooShort': { en: 'The password must be at least 8 characters', ar: 'كلمة السر يجب ألا تقل عن 8 خانات' }, + 'user.passwordWeak': { en: 'The password must contain letters and digits', ar: 'كلمة السر يجب أن تحتوي على أحرف وأرقام' }, + 'user.passwordSame': { en: 'The new password must differ from the current one', ar: 'كلمة السر الجديدة يجب أن تختلف عن القديمة' }, 'user.passwordMismatch': { en: 'The passwords do not match', ar: 'كلمتا المرور غير متطابقتين' }, 'user.passwordChanged': { en: 'Password changed', ar: 'تم تغيير كلمة المرور' }, 'user.sessionExpired': { en: 'Your session has expired. Please sign in again.', ar: 'انتهت جلستك. الرجاء تسجيل الدخول مرة أخرى.' }, diff --git a/web/src/providers/ToastProvider.tsx b/web/src/providers/ToastProvider.tsx index 3bbe6c8..0f0b0fb 100644 --- a/web/src/providers/ToastProvider.tsx +++ b/web/src/providers/ToastProvider.tsx @@ -59,8 +59,9 @@ export function ToastProvider({ children }: { children: ReactNode }) { reason !== 'clickaway' && close(current.id)} anchorOrigin={{ vertical: 'bottom', horizontal: 'center' }} sx={{ zIndex: (th) => th.zIndex.snackbar + 10 }} diff --git a/web/src/registry.ts b/web/src/registry.ts index 21574a4..4b9ea88 100644 --- a/web/src/registry.ts +++ b/web/src/registry.ts @@ -16,4 +16,9 @@ const modules = import.meta.glob('./features/*/routes.tsx', { eag const sorted = Object.entries(modules).sort(([a], [b]) => a.localeCompare(b)); export const featureRoutes: RouteObject[] = sorted.flatMap(([, m]) => m.routes ?? []); -export const featureMenu: MenuItem[] = sorted.flatMap(([, m]) => m.menu ?? []); +/** Top-level menu groups shown before everything else, in this order (the rest keep the folder order). */ +const MENU_FIRST = ['grains.finance']; +const menuRank = (item: MenuItem) => { const i = MENU_FIRST.indexOf(item.key); return i < 0 ? MENU_FIRST.length : i; }; + +// Array.sort is stable, so groups with the same rank keep their feature order +export const featureMenu: MenuItem[] = sorted.flatMap(([, m]) => m.menu ?? []).sort((a, b) => menuRank(a) - menuRank(b)); diff --git a/web/src/shell/ChangePasswordDialog.tsx b/web/src/shell/ChangePasswordDialog.tsx index 4b6224f..700a100 100644 --- a/web/src/shell/ChangePasswordDialog.tsx +++ b/web/src/shell/ChangePasswordDialog.tsx @@ -22,11 +22,14 @@ export function ChangePasswordDialog({ open, onClose }: { open: boolean; onClose const out: Record = {}; if (!cur) out.cur = t('common.required'); if (!next) out.next = t('common.required'); + if (next && next.length < 8) out.next = t('user.passwordTooShort'); + else if (next && !(/\p{L}/u.test(next) && /\d/.test(next))) out.next = t('user.passwordWeak'); + else if (next && next === cur) out.next = t('user.passwordSame'); if (next && again !== next) out.again = t('user.passwordMismatch'); setErr(out); if (Object.keys(out).length) return; save.mutate({ c: cur, n: next }, { - onError: (x) => x instanceof ApiError && setErr({ cur: x.fieldErrors.currentPassword ?? '', next: x.fieldErrors.newPassword ?? '' }), + onError: (x) => x instanceof ApiError && setErr({ cur: x.fieldErrors.oldPassword ?? x.fieldErrors.currentPassword ?? '', next: x.fieldErrors.newPassword ?? '' }), }); } @@ -39,7 +42,7 @@ export function ChangePasswordDialog({ open, onClose }: { open: boolean; onClose setCur(e.target.value)} error={!!err.cur} helperText={err.cur} slotProps={{ htmlInput: { dir: 'ltr' } }} /> setNext(e.target.value)} error={!!err.next} helperText={err.next} slotProps={{ htmlInput: { dir: 'ltr' } }} /> + onChange={(e) => setNext(e.target.value)} error={!!err.next} helperText={err.next ?? t('user.passwordRules')} slotProps={{ htmlInput: { dir: 'ltr' } }} /> setAgain(e.target.value)} error={!!err.again} helperText={err.again} slotProps={{ htmlInput: { dir: 'ltr' } }} />