Merge pull request #3229 from TechnologyEnhancedLearning/Develop/Fix/TD-5451-SelfAssessment-expander-issue

rshrirohit · web-flow · commit 30605382c4c5 · 2025-04-24T12:16:32.000+01:00
TD-5451- Empty competency description check added
diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_OverviewTable.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_OverviewTable.cshtml
@@ -49,7 +49,7 @@
                                      model="competency.CompetencyFlags" />
                         </div>
                         <div class="nhsuk-grid-column-full">
-                            @if (competency.Description != null && !competency.AlwaysShowDescription)
+                            @if (!string.IsNullOrWhiteSpace(competency.Description) && !competency.AlwaysShowDescription)
                             {
                                 <details class="nhsuk-details">
                                     <summary class="nhsuk-details__summary nhsuk-u-padding-0">
@@ -64,10 +64,10 @@
                             }
                             else
                             {
-                                <p class="@(competency.Description != null ? "nhsuk-u-font-weight-bold" : "") nhsuk-u-margin-bottom-0">
+                                <p class="@(!string.IsNullOrWhiteSpace(competency.Description) ? "nhsuk-u-font-weight-bold" : "") nhsuk-u-margin-bottom-0">
                                     @competency.Name
                                 </p>
-                                @if (competency.Description != null)
+                                @if (!string.IsNullOrWhiteSpace(competency.Description))
                                 {
                                     <p class="nhsuk-u-margin-top-2">
                                         @(Html.Raw(competency.Description))

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@`
`49`	`49`	`model="competency.CompetencyFlags" />`
`50`	`50`	`</div>`
`51`	`51`	`<div class="nhsuk-grid-column-full">`
`52`		`- @if (competency.Description != null && !competency.AlwaysShowDescription)`
	`52`	`+ @if (!string.IsNullOrWhiteSpace(competency.Description) && !competency.AlwaysShowDescription)`
`53`	`53`	`{`
`54`	`54`	`<details class="nhsuk-details">`
`55`	`55`	`<summary class="nhsuk-details__summary nhsuk-u-padding-0">`
`@@ -64,10 +64,10 @@`
`64`	`64`	`}`
`65`	`65`	`else`
`66`	`66`	`{`
`67`		`- <p class="@(competency.Description != null ? "nhsuk-u-font-weight-bold" : "") nhsuk-u-margin-bottom-0">`
	`67`	`+ <p class="@(!string.IsNullOrWhiteSpace(competency.Description) ? "nhsuk-u-font-weight-bold" : "") nhsuk-u-margin-bottom-0">`
`68`	`68`	`@competency.Name`
`69`	`69`	`</p>`
`70`		`- @if (competency.Description != null)`
	`70`	`+ @if (!string.IsNullOrWhiteSpace(competency.Description))`
`71`	`71`	`{`
`72`	`72`	`<p class="nhsuk-u-margin-top-2">`
`73`	`73`	`@(Html.Raw(competency.Description))`