Skip to content

TD-5286 tweak table #3091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 28, 2025
Merged

TD-5286 tweak table #3091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@ FROM AdminUsers
WHERE (AdminID = sa.CreatedByAdminID)) AS Owner,
sa.Archived,
sa.LastEdit,
STUFF((
SELECT
', ' + f.FrameworkName
FROM
Frameworks f
WHERE
f.ID = saf.FrameworkId
FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') AS LinkedFrameworks,
(SELECT ProfessionalGroup
FROM NRPProfessionalGroups
WHERE (ID = sa.NRPProfessionalGroupID)) AS NRPProfessionalGroup,
Expand All @@ -68,7 +76,8 @@ FROM NRPRoles

private const string SelfAssessmentTables =
@" LEFT OUTER JOIN
SelfAssessmentReviews AS sar ON sac.ID = sar.SelfAssessmentCollaboratorID AND sar.Archived IS NULL AND sar.ReviewComplete IS NULL";
SelfAssessmentReviews AS sar ON sac.ID = sar.SelfAssessmentCollaboratorID AND sar.Archived IS NULL AND sar.ReviewComplete IS NULL
LEFT OUTER JOIN SelfAssessmentFrameworks AS saf ON sa.ID = saf.SelfAssessmentId";

private readonly IDbConnection connection;
private readonly ILogger<CompetencyAssessmentDataService> logger;
Expand Down
1 change: 1 addition & 0 deletions DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public string? Brand
public string? Owner { get; set; }
public DateTime? Archived { get; set; }
public DateTime LastEdit { get; set; }
public string? LinkedFrameworks { get; set; }
public string? NRPProfessionalGroup { get; set; }
public string? NRPSubGroup { get; set; }
public string? NRPRole { get; set; }
Expand Down
10 changes: 4 additions & 6 deletions DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_AssessmentsGrid.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Competency Assessment
</th>
<th role="columnheader" class="" scope="col">
National Profile Link
Framework Links
</th>
<th role="columnheader" class="" scope="col">
Created
Expand Down Expand Up @@ -41,11 +41,9 @@
</span>
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">National Profile Link </span>
<span class="nhsuk-table-responsive__heading">Framework links </span>
<span class="roleprofile-linkage">
@(competencyAssessment.NRPProfessionalGroup != null ? @competencyAssessment.NRPProfessionalGroup : "None/Generic")
@(competencyAssessment.NRPSubGroupID != null ? " / " + competencyAssessment.NRPSubGroup : "")
@(competencyAssessment.NRPRoleID != null ? " / " + competencyAssessment.NRPRole : "")
@competencyAssessment.LinkedFrameworks
</span>
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
Expand All @@ -71,7 +69,7 @@
@if (competencyAssessment.UserRole > 1)
{
<a asp-action="ViewCompetencyAssessment" asp-route-frameworkId="@competencyAssessment.ID" asp-route-tabname="Structure">
View/Edit
Manage
</a>
}
else
Expand Down
Loading