-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Loading status checks…
Merge pull request #667 from DFE-Digital/feat/211792/recommendations-…
…front-end feat: self assessment changes with time and view recommendation button
- v2.15.1
- v2.15.0
- v2.15.0-development.4
- v2.15.0-development.3
- v2.15.0-development.2
- v2.15.0-development.1
- v2.14.1
- v2.14.0
- v2.13.0
- v2.13.0-development.13
- v2.13.0-development.12
- v2.13.0-development.11
- v2.13.0-development.10
- v2.13.0-development.9
- v2.13.0-development.8
- v2.13.0-development.7
- v2.13.0-development.6
- v2.13.0-development.5
- v2.13.0-development.4
- v2.13.0-development.3
- v2.13.0-development.2
- v2.13.0-development.1
- v2.12.0
- v2.11.1
- v2.11.0
- v2.10.0
- v2.9.0
- v2.8.0
- v2.7.0
- v2.6.0
- v2.5.0
- v2.4.0
- v2.3.0
- v2.2.0
- v2.0.0-development.112
- v2.0.0-development.111
- v2.0.0-development.110
- v2.0.0-development.109
- v2.0.0-development.108
- v2.0.0-development.107
- v2.0.0-development.106
- v2.0.0-development.105
- v2.0.0-development.104
- v2.0.0-development.103
- v2.0.0-development.102
- v2.0.0-development.101
- v2.0.0-development.100
- v2.0.0-development.99
- v2.0.0-development.98
- v2.0.0-development.97
- v2.0.0-development.96
- v2.0.0-development.95
- v2.0.0-development.94
- v2.0.0-development.93
- v2.0.0-development.92
- v2.0.0-development.91
- v2.0.0-development.90
- v2.0.0-development.89
- v2.0.0-development.88
- v2.0.0-development.87
- v2.0.0-development.86
- v2.0.0-development.85
- v2.0.0-development.84
- v2.0.0-development.83
- v2.0.0-development.82
- v2.0.0-development.81
- v2.0.0-development.80
- v2.0.0-development.79
- v2.0.0-development.78
- v2.0.0-development.77
- v2.0.0-development.76
- v2.0.0-development.75
- v2.0.0-development.74
- v2.0.0-development.73
- v2.0.0-development.72
- v2.0.0-development.71
- v2.0.0-development.70
- v2.0.0-development.69
- v2.0.0-development.68
- v2.0.0-development.67
- v2.0.0-development.66
- v2.0.0-development.65
- v2.0.0-development.64
- v2.0.0-development.63
- v2.0.0-development.62
- v2.0.0-development.61
- v2.0.0-development.60
- v2.0.0-development.59
- v2.0.0-development.58
- v2.0.0-development.57
- v2.0.0-development.56
- v2.0.0-development.55
- v2.0.0-development.54
- v2.0.0-development.53
- v2.0.0-development.52
- v2.0.0-development.51
- v2.0.0-development.50
- v2.0.0-development.49
- v2.0.0-development.48
- v2.0.0-development.47
- v2.0.0-development.46
- v2.0.0-development.45
- v2.0.0-development.44
- v2.0.0-development.43
- v2.0.0-development.42
- v2.0.0-development.41
- v2.0.0-development.40
- v2.0.0-development.39
- v2.0.0-development.38
- v2.0.0-development.37
- v2.0.0-development.36
- v2.0.0-development.35
- v2.0.0-development.34
- v2.0.0-development.33
- v2.0.0-development.32
- v2.0.0-development.31
- v2.0.0-development.30
- v2.0.0-development.29
- v2.0.0-development.28
- v2.0.0-development.27
- v2.0.0-development.26
- v2.0.0-development.25
- v2.0.0-development.24
- v2.0.0-development.23
- v2.0.0-development.22
- v2.0.0-development.21
- v2.0.0-development.20
- v2.0.0-development.19
- v2.0.0-development.18
- v2.0.0-development.17
- v2.0.0-development.16
- v2.0.0-development.15
Showing
16 changed files
with
90 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 23 additions & 22 deletions
45
src/Dfe.PlanTech.Web/Views/Shared/Components/CategorySection/SubtopicRecommendation.cshtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,29 @@ | ||
@using Dfe.PlanTech.Domain.Constants | ||
@model Dfe.PlanTech.Domain.CategorySection.CategorySectionRecommendationDto | ||
|
||
@if (Model.NoRecommendationFoundErrorMessage == null) | ||
{ | ||
@if (Model.RecommendationSlug != null) | ||
|
||
<dd class="govuk-summary-list__value govuk-!-text-align-right"> | ||
@if (Model.NoRecommendationFoundErrorMessage != null) | ||
{ | ||
<task-list-item-name> | ||
<a class="govuk-link" asp-route="GetRecommendation" asp-route-sectionSlug="@Model.SectionSlug" asp-route-recommendationSlug="@Model.RecommendationSlug"> | ||
Recommendation | ||
</a> | ||
</task-list-item-name> | ||
<govuk-error-message>@Model.NoRecommendationFoundErrorMessage</govuk-error-message> | ||
} | ||
else | ||
else if (Model.RecommendationSlug != null) | ||
{ | ||
<task-list-item-name> | ||
Recommendation | ||
</task-list-item-name> | ||
if (TempData.ContainsKey("SectionSlug")) | ||
{ | ||
var sectionSlug = TempData["SectionSlug"] as string; | ||
@if (!string.IsNullOrEmpty(sectionSlug) && sectionSlug == Model.SectionSlug) | ||
{ | ||
<task-list-tag colour="@TagColour.Yellow">New</task-list-tag> | ||
} | ||
} | ||
<govuk-button-link | ||
class="go" | ||
asp-route="GetRecommendation" | ||
asp-route-sectionSlug="@Model.SectionSlug" | ||
asp-route-recommendationSlug="@Model.RecommendationSlug"> | ||
View Recommendation | ||
</govuk-button-link> | ||
} | ||
<task-list-tag colour=@Model.Tag.Colour> | ||
@Model.Tag.Text | ||
</task-list-tag> | ||
} | ||
else | ||
{ | ||
<task-list-item-name> | ||
<govuk-error-message>@Model.NoRecommendationFoundErrorMessage</govuk-error-message> | ||
</task-list-item-name> | ||
} | ||
</dd> | ||
|
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters