Skip to content

DLSV2-536 Move competency description text in self assessment overview to expanders #1092

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 11 commits into from
May 17, 2022
Merged

DLSV2-536 Move competency description text in self assessment overview to expanders #1092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9c3834a
DLSV2-536 Move the competency description text in the self assessment…
daniel-manta-hee Apr 29, 2022
dc32c34
DLSV2-536 Moved code to parent view as it only needs to appear one ti…
daniel-manta-hee Apr 29, 2022
388d3d6
DLSV2-536 Removed redundant competency name
daniel-manta-hee May 3, 2022
42254be
DLSV2-536 Turn Expander into a Details control
daniel-manta-hee May 3, 2022
191cb03
DLSV2-536 When listing competencies, use Expanders (+/-) for groups a…
daniel-manta-hee May 5, 2022
6c88da7
DLSV2-536 Removed validation no longer needed
daniel-manta-hee May 5, 2022
196b847
Merge branch 'Develop/Features/DLSV2-536-MoveCompetencyDescriptionToE…
kevwhitt-hee May 6, 2022
7e8bcdc
Revert "Merge branch 'Develop/Features/DLSV2-536-MoveCompetencyDescri…
kevwhitt-hee May 6, 2022
08dfd1a
DLSV2-536 Minor change, avoid using h2 tag
daniel-manta-hee May 6, 2022
840d699
DLSV2-536 Reconcile local and remote branches
daniel-manta-hee May 10, 2022
5bb4bf6
DLSV2-536 Minor style changes
daniel-manta-hee May 16, 2022
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
42 changes: 35 additions & 7 deletions ...lLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentOverview.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

<link rel="stylesheet" href="@Url.Content("~/css/learningPortal/selfAssessment.css")" asp-append-version="true">
<h1>@Model.SelfAssessment.Name - @Model.VocabPlural()</h1>
<partial name="SelfAssessments/_SearchSelfAssessmentOverview" model="@Model.SearchViewModel" view-data="@(new ViewDataDictionary(ViewData) { { "parent", Model } })"/>
<partial name="SelfAssessments/_SearchSelfAssessmentOverview" model="@Model.SearchViewModel" view-data="@(new ViewDataDictionary(ViewData) { { "parent", Model } })" />
<partial name="_OverviewActionButtons.cshtml" model=Model />
<p><span role="alert">@Model.CompetencyGroups.Sum(g => g.Count()) matching @Model.VocabPlural().ToLower()</span></p>
@if (Model.CompetencyGroups.Any())
Expand All @@ -51,7 +51,7 @@
var selfAssessedCount = questions.Count(q => q.ResultId.HasValue);
var verifiedCount = questions.Count(q => q.Verified.HasValue);
var competencySummaryViewData = new ViewDataDictionary(ViewData)
{
{
{ "isSupervisorResultsReviewed", Model.SelfAssessment.IsSupervisorResultsReviewed },
{ "questionsCount", questions.Count() },
{ "selfAssessedCount", selfAssessedCount },
Expand All @@ -62,11 +62,11 @@
questionsTotal += questions.Count();
<div class="nhsuk-panel competency-group-panel nhsuk-u-padding-0">
@{
var expanderOpen = Model.CompetencyGroups.Count() == 1
? "open"
: ViewContext.RouteData.Values.ContainsKey("competencyGroupId")
? ViewContext.RouteData.Values["competencyGroupId"].Equals(competencyGroup.First().CompetencyGroupID.ToString()) ? "open" : ""
: "";
var expanderOpen = Model.CompetencyGroups.Count() == 1
? "open"
: ViewContext.RouteData.Values.ContainsKey("competencyGroupId")
? ViewContext.RouteData.Values["competencyGroupId"].Equals(competencyGroup.First().CompetencyGroupID.ToString()) ? "open" : ""
: "";
}
<details class="nhsuk-details nhsuk-expander" @(expanderOpen)>
<summary class="nhsuk-details__summary">
Expand All @@ -83,6 +83,34 @@
view-data="@(new ViewDataDictionary(ViewData) { { "competencyGroup", competencyGroup } })" />
}

<style>
.nhsuk-expander[open] details.nhsuk-details[open] .nhsuk-details__summary-text::before {
display: block;
width: 0;
height: 0;
border-style: solid;
border-color: transparent;
clip-path: polygon(0% 0%, 50% 100%, 100% 0%);
border-width: 12.124px 7px 0 7px;
border-top-color: inherit;
}
.nhsuk-details[open] .nhsuk-details .nhsuk-details__summary-text::before {
bottom: 0;
content: "";
left: 0;
margin: auto;
position: absolute;
top: 0;
display: block;
width: 0;
height: 0;
border-style: solid;
border-color: transparent;
clip-path: polygon(0% 0%, 100% 50%, 0% 100%);
border-width: 7px 0 7px 12.124px;
border-left-color: inherit;
}
</style>
<partial name="SelfAssessments/_OverviewTable"
view-data="@(new ViewDataDictionary(ViewData) { { "linearNavigation", Model.SelfAssessment.LinearNavigation }, { "selfAssessment", Model.SelfAssessment } })"
model="competencyGroup" />
Expand Down
73 changes: 47 additions & 26 deletions DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_OverviewTable.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@using DigitalLearningSolutions.Data.Models.SelfAssessments;
@model IGrouping<string, Competency>;
@model IGrouping<string, Competency>;

<table role="table" class="nhsuk-table-responsive nhsuk-u-margin-top-4">
<thead role="rowgroup" class="nhsuk-table__head">
Expand Down Expand Up @@ -28,31 +28,52 @@

@foreach (var competency in Model)
{
<tbody class="nhsuk-table__body row-outer" id="comp-@competency.RowNo">
<tr role="row" class="nhsuk-table__row first-row">
<td role="cell" rowspan="@competency.AssessmentQuestions.Count()" class="nhsuk-table__cell">
<span class="nhsuk-table-responsive__heading">@competency.Vocabulary </span>@competency.Name
@if (competency.AlwaysShowDescription) {
<p class="nhsuk-u-margin-top-2">@Html.Raw(competency.Description)</p>
}
</td>
<partial name="Shared/_AssessmentQuestionOverviewCells" model="competency.AssessmentQuestions.First()" view-data="@(new ViewDataDictionary(ViewData) { { "competencyNumber", competency.RowNo } })" />
<td role="cell" rowspan="@competency.AssessmentQuestions.Count()" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Action </span>
<a asp-action="SelfAssessmentCompetency" asp-route-selfAssessmentId="@ViewContext.RouteData.Values["selfAssessmentId"]" asp-route-competencyNumber="@competency.RowNo">
Review
</a>
</td>
</tr>
@foreach (var question in competency.AssessmentQuestions.Skip(1))
{
<tr role="row" class="nhsuk-table__row">
<partial name="Shared/_AssessmentQuestionOverviewCells" model="question" view-data="@(new ViewDataDictionary(ViewData) { { "competencyNumber", competency.RowNo } })" />
<tbody class="nhsuk-table__body row-outer" id="comp-@competency.RowNo">
<tr role="row" class="nhsuk-table__row first-row">
<td role="cell" rowspan="@competency.AssessmentQuestions.Count()" class="nhsuk-table__cell">
@if (competency.Description != null && !competency.AlwaysShowDescription)
{
<details class="nhsuk-details">
<summary class="nhsuk-details__summary">
<p class="nhsuk-u-margin-bottom-0">
<span class="nhsuk-table-responsive__heading">@competency.Vocabulary </span>
<span class="nhsuk-details__summary-text">@competency.Name</span>
</p>
</summary>
<div class="nhsuk-details__text nhsuk-u-margin-left-6 nhsuk-u-margin-top-2">
@(Html.Raw(@competency.Description))
</div>
</details>
}
else
{
<p class="nhsuk-u-font-weight-bold nhsuk-u-margin-bottom-0">
<span class="nhsuk-table-responsive__heading">@competency.Vocabulary </span>@competency.Name
</p>
@if (competency.Description != null)
{
<p class="nhsuk-u-margin-top-2">
@(Html.Raw(competency.Description))
</p>
}
}
</td>
<partial name="Shared/_AssessmentQuestionOverviewCells" model="competency.AssessmentQuestions.First()" view-data="@(new ViewDataDictionary(ViewData) { { "competencyNumber", competency.RowNo } })" />
<td role="cell" rowspan="@competency.AssessmentQuestions.Count()" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Action </span>
<a asp-action="SelfAssessmentCompetency" asp-route-selfAssessmentId="@ViewContext.RouteData.Values["selfAssessmentId"]" asp-route-competencyNumber="@competency.RowNo">
Review
</a>
</td>
</tr>
@foreach (var question in competency.AssessmentQuestions.Skip(1))
{
<tr role="row" class="nhsuk-table__row">
<partial name="Shared/_AssessmentQuestionOverviewCells" model="question" view-data="@(new ViewDataDictionary(ViewData) { { "competencyNumber", competency.RowNo } })" />

</tr>
</tr>

}
</tbody>
}

</table>
</tbody>
}
</table>