Merge branch 'DLS-Release-v1.1.1' into UAT

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs

@@ -1827,7 +1827,7 @@ public int GetAdminUserRoleForFrameworkId(int adminId, int frameworkId)
                 @"SELECT CASE WHEN FW.OwnerAdminID = @adminId THEN 3 WHEN fwc.CanModify = 1 THEN 2 WHEN fwc.CanModify = 0 THEN 1 ELSE 0 END AS UserRole
                 FROM Frameworks AS FW LEFT OUTER JOIN
                 FrameworkCollaborators AS fwc ON fwc.FrameworkID = FW.ID AND fwc.AdminID = @adminId
-                WHERE FW.ID = @frameworkId",
+                WHERE FW.ID = @frameworkId and FWC.IsDeleted=0",
                 new { adminId, frameworkId }
             );
         }

DigitalLearningSolutions.Web/Views/SuperAdmin/Users/UserCentreAccounts.cshtml

@@ -58,7 +58,15 @@
                                             {
                                                 if (centreRow.CentreId == admin.CentreId)
                                                 {
-                                                    <a asp-action="RedirectToAdmin" asp-route-AdminId="@admin.Id">Admin@(admin.Active ? "" : "(Inactive)")</a>
+                                                    bool IsDelegateActive = false;
+                                                    foreach (var delegates in Model.UserEntity.DelegateAccounts)
+                                                    {
+                                                        if (centreRow.CentreId == delegates.CentreId)
+                                                        {
+                                                            IsDelegateActive = delegates.Active;
+                                                        }
+                                                    }
+                                                    <a asp-action="RedirectToAdmin" asp-route-AdminId="@admin.Id">Admin@(!admin.Active && IsDelegateActive ? "(Inactive)" : "")</a>
                                                 }
                                             }
                                         }