mirror of
https://github.com/Sea-Haven-Industries/shoc-backend.git
synced 2026-10-01 09:53:15 +00:00
620a36af54
* feat(work-orders): enrich board search overdue filters and 0-based paging * fix(work-orders): align stacked services with CI build * fix(tests): pass userDataService in comment service unit test * fix(work-orders): use dedicated overdue query flag Stop treating WorkOrderType.Other as an overdue sentinel. Board and advanced search now accept overdue=true while types=Other filters real Other rows; combining both uses OR. * test(work-orders): cover overdue date/status boundary and Other type-filter Lock the PR #23 overdue regression boundary through the public advanced search service. Prove overdue filtering is driven by past-due date plus non-terminal status, not by the WorkOrderType.Other sentinel: - Other + future/not-completed excluded from overdue - past-due + Scheduled included; past-due + Completed/Canceled excluded - types=[PM, Other] keeps real Other rows and does not pull past-due rows - assert 0-based paging (Page=0) is preserved alongside overdue/type filters --------- Co-authored-by: Arthur Bassi <arthur.winiarski.ranger@outlook.com> Co-authored-by: Alexandre Brandizzi <alex_brandizzi@hotmail.com>
65 lines
3 KiB
C#
65 lines
3 KiB
C#
using Data.SeaHavenIndustries.Enums;
|
|
using SeaHaven.Services.Helpers;
|
|
|
|
namespace SeaHaven.Services.DTOs
|
|
{
|
|
/// <summary>
|
|
/// Payload for creating a board work order (SHOC create wizard).
|
|
/// FE follow-up: extend WorkOrderBoardCreatePayload + mapper with PrimaryService,
|
|
/// ExtraServices, ServiceNotes, PocName, PocPhone, VendorNotes, TechPhone; stop embedding
|
|
/// POC/vendor/service notes in description (pocNotes already exists). Prefer structured
|
|
/// fields; keep Trade+Description temporarily for legacy clients.
|
|
/// </summary>
|
|
public class WorkOrderBoardCreateRequestDto
|
|
{
|
|
public string? WoNumber { get; set; }
|
|
public WorkOrderType WorkOrderType { get; set; }
|
|
public string? SiteCode { get; set; }
|
|
public string? Description { get; set; }
|
|
/// <summary>Legacy alias for primary service; prefer <see cref="PrimaryService"/>.</summary>
|
|
public string? Trade { get; set; }
|
|
/// <summary>Primary service label; persisted as Trade / board pm.</summary>
|
|
public string? PrimaryService { get; set; }
|
|
public List<string>? ExtraServices { get; set; }
|
|
public string? ServiceNotes { get; set; }
|
|
public int? LocationId { get; set; }
|
|
public DateTime? DueDate { get; set; }
|
|
public string? AssignTo { get; set; }
|
|
public DateTime? ScheduledDate { get; set; }
|
|
public DateOnly? TargetWeek { get; set; }
|
|
public bool? ScheduleWeekOnly { get; set; }
|
|
public DocStatus? DocStatus { get; set; }
|
|
public int? VendorId { get; set; }
|
|
public DateTime? ApptDate { get; set; }
|
|
public string? ApptTime { get; set; }
|
|
public int? PocContactId { get; set; }
|
|
public string? PocName { get; set; }
|
|
public string? PocPhone { get; set; }
|
|
public string? PocNotes { get; set; }
|
|
public string? TechPhone { get; set; }
|
|
public string? VendorNotes { get; set; }
|
|
}
|
|
|
|
/// <summary>Advanced search / filter query for the board.</summary>
|
|
public class WorkOrderAdvancedSearchQueryDto
|
|
{
|
|
public int Page { get; set; } = 0;
|
|
public int PageSize { get; set; } = 50;
|
|
public string? Search { get; set; }
|
|
public WorkOrderAdvancedSearchDatePreset? DatePreset { get; set; }
|
|
public DateOnly? DateFrom { get; set; }
|
|
public DateOnly? DateTo { get; set; }
|
|
public List<string>? Sites { get; set; }
|
|
public List<WorkOrderType>? Types { get; set; }
|
|
/// <summary>When true, include past-due (isPastDue) rows. Combined with Types via OR.</summary>
|
|
public bool Overdue { get; set; }
|
|
public List<string>? Dispatchers { get; set; }
|
|
public List<LifecycleStatus>? Statuses { get; set; }
|
|
public List<string>? PmTypes { get; set; }
|
|
public List<int>? VendorIds { get; set; }
|
|
public List<DocStatus>? DocStatuses { get; set; }
|
|
public bool MyWorkOrders { get; set; }
|
|
public string? SortBy { get; set; }
|
|
public string? SortDir { get; set; }
|
|
}
|
|
}
|