Split QueryStatus.Accepted into ProAccepted/ClientAccepted
Distinguish the two parties' acceptances: ProAccepted (provider) and ClientAccepted (client) replace the single Accepted value for new acceptances. Accepted=2 is retained as a legacy value so existing DB rows keep their integer mapping. - FrontOfficeApiController.AcceptQuery sets status by ActorRole - BillingController provider-ongoing filters match the new values - FrontOfficeController (MVC) dashboard counts use ProAccepted||Accepted - PostIt: IsOngoingStatus, GetStatusRank (client-accepted ranks first for the pro), and status-badge switches (P/C glyphs) handle the new values - Tests assert ProAccepted (provider) vs ClientAccepted (client) Co-Authored-By: Claude Code <noreply@anthropic.com>
This commit is contained in:
parent
36ffe4683c
commit
827fe6b41f
8 changed files with 62 additions and 19 deletions
|
|
@ -171,5 +171,9 @@ public partial class BillingQueriesPageViewModel : ViewModelBase, IActionStatusV
|
|||
}
|
||||
|
||||
private static bool IsOngoingStatus(QueryStatus status)
|
||||
=> status is QueryStatus.Inserted or QueryStatus.Accepted or QueryStatus.InProgress;
|
||||
=> status is QueryStatus.Inserted
|
||||
or QueryStatus.Accepted
|
||||
or QueryStatus.ProAccepted
|
||||
or QueryStatus.ClientAccepted
|
||||
or QueryStatus.InProgress;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -166,6 +166,8 @@ public partial class BillingQueryDetailsPageViewModel : ViewModelBase, IActionSt
|
|||
=> status switch
|
||||
{
|
||||
QueryStatus.Accepted => "#E6F7EC",
|
||||
QueryStatus.ProAccepted => "#E6F7EC",
|
||||
QueryStatus.ClientAccepted => "#E1F5FE",
|
||||
QueryStatus.InProgress => "#FFF4D6",
|
||||
QueryStatus.Rejected => "#FDECEA",
|
||||
QueryStatus.Failed => "#ECEFF1",
|
||||
|
|
@ -177,6 +179,8 @@ public partial class BillingQueryDetailsPageViewModel : ViewModelBase, IActionSt
|
|||
=> status switch
|
||||
{
|
||||
QueryStatus.Accepted => "#2E7D32",
|
||||
QueryStatus.ProAccepted => "#2E7D32",
|
||||
QueryStatus.ClientAccepted => "#1565C0",
|
||||
QueryStatus.InProgress => "#B26A00",
|
||||
QueryStatus.Rejected => "#C62828",
|
||||
QueryStatus.Failed => "#607D8B",
|
||||
|
|
@ -188,6 +192,8 @@ public partial class BillingQueryDetailsPageViewModel : ViewModelBase, IActionSt
|
|||
=> status switch
|
||||
{
|
||||
QueryStatus.Accepted => "#1B5E20",
|
||||
QueryStatus.ProAccepted => "#1B5E20",
|
||||
QueryStatus.ClientAccepted => "#0D47A1",
|
||||
QueryStatus.InProgress => "#7A4A00",
|
||||
QueryStatus.Rejected => "#8E0000",
|
||||
QueryStatus.Failed => "#37474F",
|
||||
|
|
@ -199,6 +205,8 @@ public partial class BillingQueryDetailsPageViewModel : ViewModelBase, IActionSt
|
|||
=> status switch
|
||||
{
|
||||
QueryStatus.Accepted => "OK",
|
||||
QueryStatus.ProAccepted => "P",
|
||||
QueryStatus.ClientAccepted => "C",
|
||||
QueryStatus.InProgress => "~",
|
||||
QueryStatus.Rejected => "!",
|
||||
QueryStatus.Failed => "X",
|
||||
|
|
|
|||
|
|
@ -344,11 +344,13 @@ public partial class ProviderOngoingRequestsPageViewModel : ViewModelBase, IActi
|
|||
=> status switch
|
||||
{
|
||||
QueryStatus.InProgress => 0,
|
||||
QueryStatus.Accepted => 1,
|
||||
QueryStatus.Inserted => 2,
|
||||
QueryStatus.Success => 3,
|
||||
QueryStatus.Rejected => 4,
|
||||
QueryStatus.Failed => 5,
|
||||
QueryStatus.ClientAccepted => 1,
|
||||
QueryStatus.ProAccepted => 2,
|
||||
QueryStatus.Accepted => 2,
|
||||
QueryStatus.Inserted => 3,
|
||||
QueryStatus.Success => 4,
|
||||
QueryStatus.Rejected => 5,
|
||||
QueryStatus.Failed => 6,
|
||||
_ => 99,
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue