diff --git a/src/GitHubCostVisualizer.Web/Models/UsageReportViewModel.cs b/src/GitHubCostVisualizer.Web/Models/UsageReportViewModel.cs index c2b7aaf..1bf3923 100644 --- a/src/GitHubCostVisualizer.Web/Models/UsageReportViewModel.cs +++ b/src/GitHubCostVisualizer.Web/Models/UsageReportViewModel.cs @@ -40,11 +40,9 @@ public class UsageReportViewModel public class ActionMinutesItem { - public string Repository { get; set; } + public string Label { get; set; } public decimal Minutes { get; set; } public decimal TotalCost { get; set; } - public string Workflow { get; set; } } - } diff --git a/src/GitHubCostVisualizer.Web/Processor/GithubUsageProcessor.cs b/src/GitHubCostVisualizer.Web/Processor/GithubUsageProcessor.cs index 37a69c6..4c3c26c 100644 --- a/src/GitHubCostVisualizer.Web/Processor/GithubUsageProcessor.cs +++ b/src/GitHubCostVisualizer.Web/Processor/GithubUsageProcessor.cs @@ -37,7 +37,7 @@ group x by x.Repository into grp select new ActionMinutesItem { - Repository = grp.Key, + Label = grp.Key, Minutes = grp.Sum(i => (int)i.Quantity), TotalCost = grp.Sum(i => i.Quantity.GetValueOrDefault() * i.Multiplier.GetValueOrDefault() * i.PricePer.GetValueOrDefault()) }).ToList(); @@ -49,7 +49,7 @@ into grp select new ActionMinutesItem { Minutes = grp.Sum(i => (int)i.Quantity), - Workflow = ($"{grp.Key.Repository} - {grp.Key.TrimmedWorkflow}").ToString(), + Label = ($"{grp.Key.Repository} - {grp.Key.TrimmedWorkflow}").ToString(), TotalCost = grp.Sum(i => i.Quantity.GetValueOrDefault() * i.Multiplier.GetValueOrDefault() * i.PricePer.GetValueOrDefault()) }).ToList(); diff --git a/src/GitHubCostVisualizer.Web/Views/Home/_ActionDetail.cshtml b/src/GitHubCostVisualizer.Web/Views/Home/_ActionDetail.cshtml index 166906c..bf664d6 100644 --- a/src/GitHubCostVisualizer.Web/Views/Home/_ActionDetail.cshtml +++ b/src/GitHubCostVisualizer.Web/Views/Home/_ActionDetail.cshtml @@ -68,7 +68,7 @@ @foreach (var item in Model.ActionMinutesByRepository) { - @item.Repository + @item.Label @item.Minutes minutes $@item.TotalCost @@ -90,7 +90,7 @@ backgroundColor: getColors(@Model.ActionMinutesByRepository.Count, 'primary', 'dark', 'secondary', 'light') } ], - labels: [@Html.Raw(String.Join(", ", Model.ActionMinutesByRepository.Select(m => $"'{m.Repository}'")))] + labels: [@Html.Raw(String.Join(", ", Model.ActionMinutesByRepository.Select(m => $"'{m.Label}'")))] }, options: { tooltips: { @@ -121,7 +121,7 @@ @foreach (var item in Model.ActionMinutesByWorkflow) { - @item.Workflow + @item.Label @item.Minutes minutes $@item.TotalCost