diff --git a/F4SDM42WebApi/F4SDHelperService.cs b/F4SDM42WebApi/F4SDHelperService.cs index 3618147..8362bb1 100644 --- a/F4SDM42WebApi/F4SDHelperService.cs +++ b/F4SDM42WebApi/F4SDHelperService.cs @@ -324,6 +324,7 @@ namespace C4IT.F4SD public bool ReactionTimeEscalated { get; set; } public bool SolutionTimeEscalated { get; set; } public bool IsIncident { get; set; } + public string ActivityType { get; set; } } internal async Task getTicketOverviewCounts( @@ -472,6 +473,7 @@ namespace C4IT.F4SD { ["Summary"] = entry.Summary ?? string.Empty, ["StatusId"] = ConvertM42State(entry.State), + ["ActivityType"] = entry.ActivityType ?? string.Empty, ["UserDisplayName"] = entry.InitiatorDisplayName ?? string.Empty, ["UserAccount"] = entry.InitiatorAccount ?? string.Empty, ["UserDomain"] = entry.InitiatorDomain ?? string.Empty, @@ -583,7 +585,8 @@ namespace C4IT.F4SD ", NewInformationReceived" + ", ReactionTimeEscalated" + ", SolutionTimeEscalated" + - ", UsedInTypeSPSActivityTypeIncident as IsIncident", + ", UsedInTypeSPSActivityTypeTicket as TicketEoid" + + ", UsedInTypeSPSActivityTypeIncident as IncidentEoid", filter); if (tbl?.Rows == null || tbl.Rows.Count == 0) @@ -596,6 +599,13 @@ namespace C4IT.F4SD if (ticketId == Guid.Empty) continue; + var ticketEoid = getGuidFromObject(row["TicketEoid"]); + var incidentEoid = getGuidFromObject(row["IncidentEoid"]); + var isIncident = incidentEoid != Guid.Empty; + var activityType = isIncident + ? "SPSActivityTypeIncident" + : (ticketEoid != Guid.Empty ? "SPSActivityTypeTicket" : null); + entries.Add(new TicketOverviewEntry { TicketId = ticketId, @@ -613,7 +623,8 @@ namespace C4IT.F4SD NewInformationReceived = GetBoolValue(row["NewInformationReceived"]), ReactionTimeEscalated = GetBoolValue(row["ReactionTimeEscalated"]), SolutionTimeEscalated = GetBoolValue(row["SolutionTimeEscalated"]), - IsIncident = row["IsIncident"] != DBNull.Value + IsIncident = isIncident, + ActivityType = activityType }); }