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
|
|
@ -157,6 +157,8 @@ namespace Yavsc.ApiControllers
|
|||
.Where(q => allowedActivityCodes.Contains(q.ActivityCode))
|
||||
.Where(q => q.Status == QueryStatus.Inserted
|
||||
|| q.Status == QueryStatus.Accepted
|
||||
|| q.Status == QueryStatus.ProAccepted
|
||||
|| q.Status == QueryStatus.ClientAccepted
|
||||
|| q.Status == QueryStatus.InProgress)
|
||||
.Cast<NominativeServiceCommand>()
|
||||
.ToList()
|
||||
|
|
@ -169,6 +171,8 @@ namespace Yavsc.ApiControllers
|
|||
.Where(q => allowedActivityCodes.Contains(q.ActivityCode))
|
||||
.Where(q => q.Status == QueryStatus.Inserted
|
||||
|| q.Status == QueryStatus.Accepted
|
||||
|| q.Status == QueryStatus.ProAccepted
|
||||
|| q.Status == QueryStatus.ClientAccepted
|
||||
|| q.Status == QueryStatus.InProgress)
|
||||
.Cast<NominativeServiceCommand>()
|
||||
.ToList()
|
||||
|
|
@ -181,6 +185,8 @@ namespace Yavsc.ApiControllers
|
|||
.Where(q => allowedActivityCodes.Contains(q.ActivityCode))
|
||||
.Where(q => q.Status == QueryStatus.Inserted
|
||||
|| q.Status == QueryStatus.Accepted
|
||||
|| q.Status == QueryStatus.ProAccepted
|
||||
|| q.Status == QueryStatus.ClientAccepted
|
||||
|| q.Status == QueryStatus.InProgress)
|
||||
.Cast<NominativeServiceCommand>()
|
||||
.ToList()
|
||||
|
|
|
|||
|
|
@ -100,7 +100,16 @@ namespace Yavsc.ApiControllers
|
|||
estimate.ClientValidationDate = DateTime.UtcNow;
|
||||
}
|
||||
|
||||
query.Status = QueryStatus.Accepted;
|
||||
// The party-specific status records who accepted: the
|
||||
// provider (ProAccepted) or the client (ClientAccepted).
|
||||
// An admin accepting (neither party) falls back to the
|
||||
// legacy generic Accepted.
|
||||
query.Status = role switch
|
||||
{
|
||||
ActorRole.Provider => QueryStatus.ProAccepted,
|
||||
ActorRole.Client => QueryStatus.ClientAccepted,
|
||||
_ => QueryStatus.Accepted,
|
||||
};
|
||||
|
||||
try
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue