From de3f1005fc05492f3ef841cbc783665c865b42d4 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Wed, 20 Oct 2021 17:10:51 -0400 Subject: [PATCH] add various status counts to org information (#1647) --- src/Admin/Models/OrganizationViewModel.cs | 6 ++++++ src/Admin/Views/Organizations/_ViewInformation.cshtml | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/Admin/Models/OrganizationViewModel.cs b/src/Admin/Models/OrganizationViewModel.cs index a6b2aedc47..5a9bc44521 100644 --- a/src/Admin/Models/OrganizationViewModel.cs +++ b/src/Admin/Models/OrganizationViewModel.cs @@ -17,6 +17,9 @@ namespace Bit.Admin.Models { Organization = org; HasPublicPrivateKeys = org.PublicKey != null && org.PrivateKey != null; + UserInvitedCount = orgUsers.Count(u => u.Status == OrganizationUserStatusType.Invited); + UserAcceptedCount = orgUsers.Count(u => u.Status == OrganizationUserStatusType.Accepted); + UserConfirmedCount = orgUsers.Count(u => u.Status == OrganizationUserStatusType.Confirmed); UserCount = orgUsers.Count(); CipherCount = ciphers.Count(); CollectionCount = collections.Count(); @@ -35,6 +38,9 @@ namespace Bit.Admin.Models public Organization Organization { get; set; } public string Owners { get; set; } public string Admins { get; set; } + public int UserInvitedCount { get; set; } + public int UserConfirmedCount { get; set; } + public int UserAcceptedCount { get; set; } public int UserCount { get; set; } public int CipherCount { get; set; } public int CollectionCount { get; set; } diff --git a/src/Admin/Views/Organizations/_ViewInformation.cshtml b/src/Admin/Views/Organizations/_ViewInformation.cshtml index bbf54ea94d..3c5a5ca8a6 100644 --- a/src/Admin/Views/Organizations/_ViewInformation.cshtml +++ b/src/Admin/Views/Organizations/_ViewInformation.cshtml @@ -10,7 +10,12 @@
@(Model.Organization.ExpirationDate?.ToString() ?? "-")
Users
-
@Model.UserCount / @(Model.Organization.Seats?.ToString() ?? "-")
+
+ @Model.UserCount / @(Model.Organization.Seats?.ToString() ?? "-") + (@Model.UserInvitedCount / + @Model.UserAcceptedCount / + @Model.UserConfirmedCount) +
Owners
@(string.IsNullOrWhiteSpace(Model.Owners) ? "None" : Model.Owners)
@@ -32,7 +37,7 @@
Policies
@Model.PolicyCount
- +
Public/Private Keys
@(Model.HasPublicPrivateKeys ? "Yes" : "No")