Skip to content

DLSV2-276 Fixes bug with GetNthCompetency dapper query and DLSV2-275 standardises multi-step flow navigation #504

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 3 commits into from
Jul 22, 2021
Merged

DLSV2-276 Fixes bug with GetNthCompetency dapper query and DLSV2-275 standardises multi-step flow navigation #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7760ca3
DLSV2-275 Tweaks create framework flow for consistent navigation
kevwhitt-hee Jul 22, 2021
d90079c
DLSV2-275 Tweaks steps of create role profile flow for consistent nav…
kevwhitt-hee Jul 22, 2021
65fca24
DLSV2-276 Fixes bug with GetNthCompetency dapper query
kevwhitt-hee Jul 22, 2021
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
6 changes: 3 additions & 3 deletions DigitalLearningSolutions.Data/Services/SelfAssessmentService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ LEFT OUTER JOIN CompetencyAssessmentQuestionRoleRequirements rr
ON s.CompetencyID = rr.CompetencyID AND s.AssessmentQuestionID = rr.AssessmentQuestionID AND s.SelfAssessmentID = rr.SelfAssessmentID

WHERE CandidateID = @candidateId
AND SelfAssessmentID = @selfAssessmentId
AND s.SelfAssessmentID = @selfAssessmentId
)";
private const string SpecificAssessmentResults =
@"LatestAssessmentResults AS
Expand Down Expand Up @@ -215,8 +215,8 @@ INNER JOIN Competencies AS C
$@"WITH CompetencyRowNumber AS
(SELECT ROW_NUMBER() OVER (ORDER BY Ordering) as RowNo,
CompetencyID
FROM SelfAssessmentStructure
WHERE SelfAssessmentID = @selfAssessmentId
FROM SelfAssessmentStructure as sas
WHERE sas.SelfAssessmentID = @selfAssessmentId
),
{LatestAssessmentResults}
SELECT {CompetencyFields}
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Views/Frameworks/Developer/Branding.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ else
Back
</a>
<button class="nhsuk-button" type="submit">
Continue
Next
</button>
<div class="nhsuk-back-link">
<a class="nhsuk-back-link__link" asp-action="ViewFrameworks" asp-route-tabname="Mine">
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Views/Frameworks/Developer/Description.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ else
Back
</a>
<button class="nhsuk-button" type="submit">
Continue
Next
</button>
<div class="nhsuk-back-link">
<a class="nhsuk-back-link__link" asp-action="ViewFrameworks" asp-route-tabname="Mine">
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Views/Frameworks/Developer/Name.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ else
@if ((string)ViewContext.RouteData.Values["actionname"] == "New")
{
<button class="nhsuk-button" type="submit">
Continue
Next
</button>
<div class="nhsuk-back-link">
<a class="nhsuk-back-link__link" asp-action="ViewFrameworks" asp-route-tabname="Mine">
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Views/Frameworks/Developer/Similar.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ else
Back
</a>
<a class="nhsuk-button" asp-action="SaveNewFramework" asp-route-frameworkname="@Model.FrameworkName" asp-route-actionname="@(ViewContext.RouteData.Values["actionname"])">
Continue
Next
</a>
<div class="nhsuk-back-link">
<a class="nhsuk-back-link__link" asp-action="ViewFrameworks" asp-route-tabname="Mine">
Expand Down
3 changes: 0 additions & 3 deletions DigitalLearningSolutions.Web/Views/Frameworks/Developer/Summary.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,6 @@
</dd>
</div>
</dl>
<a class="nhsuk-button nhsuk-button--secondary" asp-action="SetNewFrameworkBrand" asp-route-actionname="New">
Back
</a>
<a class="nhsuk-button" asp-action="InsertFramework">
Save and Continue
</a>
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Views/Frameworks/Developer/Type.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ else
Back
</a>
<button class="nhsuk-button" type="submit">
Continue
Next
</button>
<div class="nhsuk-back-link">
<a class="nhsuk-back-link__link" asp-action="ViewFrameworks" asp-route-tabname="Mine">
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Views/RoleProfiles/Name.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ else
@if ((string)ViewContext.RouteData.Values["actionname"] == "New")
{
<button class="nhsuk-button" type="submit">
Continue
Next
</button>
<div class="nhsuk-back-link">
<a class="nhsuk-back-link__link" asp-action="ViewRoleProfiles" asp-route-tabname="Mine">
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Views/RoleProfiles/ProfessionalGroup.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ else
Back
</a>
<button class="nhsuk-button" type="submit">
Continue
Next
</button>
<div class="nhsuk-back-link">
<a class="nhsuk-back-link__link" asp-action="ViewRoleProfiles" asp-route-tabname="Mine">
Expand Down