diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/FrameworkPrintLayout.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/FrameworkPrintLayout.cshtml index 69ec377b44..eb7a84e074 100644 --- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/FrameworkPrintLayout.cshtml +++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/FrameworkPrintLayout.cshtml @@ -28,27 +28,29 @@

@Model.DetailFramework.FrameworkName

- @if (!String.IsNullOrEmpty(Model.DetailFramework.Description)) - { -
-
-

- Framework description + @if (!String.IsNullOrEmpty(Model.DetailFramework.Description.Trim())) + { +
+
+

+ Framework description -

-

- @(Html.Raw(Model.DetailFramework.Description)) -

-
+

+

+ @(Html.Raw(Model.DetailFramework.Description)) +

- } -

Framework @Model.VocabPlural().ToLower()

+
+ } +

Framework @Model.VocabPlural().ToLower()

- @if (Model.FrameworkCompetencyGroups != null) + @if (Model.FrameworkCompetencyGroups != null) + { + if (Model.FrameworkCompetencyGroups.Any()) { - if (Model.FrameworkCompetencyGroups.Any()) + @foreach (var frameworkCompetencyGroup in Model.FrameworkCompetencyGroups) { - @foreach (var frameworkCompetencyGroup in Model.FrameworkCompetencyGroups) + if (frameworkCompetencyGroup.FrameworkCompetencies.Count() > 0) { groupNum++;

@frameworkCompetencyGroup.Name

@@ -58,70 +60,70 @@ @frameworkCompetencyGroup.Description

} - + int compNum = 0; if (frameworkCompetencyGroup.FrameworkCompetencies[0] != null) { - - - - - - - - - @foreach (var frameworkCompetency in frameworkCompetencyGroup.FrameworkCompetencies) - { - compNum++; - -
- @Model.VocabSingular() - - Date and Signature -
- @frameworkCompetency.Name - - - @if (frameworkCompetency.Description != null) + + + + + + + + + @foreach (var frameworkCompetency in frameworkCompetencyGroup.FrameworkCompetencies) { -

- @Html.Raw(frameworkCompetency.Description) -

- } - - + + + @if (frameworkCompetency.Description != null) + { +

+ @Html.Raw(frameworkCompetency.Description) +

+ } + +
- } + }
+ @Model.VocabSingular() + + Date and Signature +
+ compNum++; +
+ @frameworkCompetency.Name - +
} } } } - @if (Model.FrameworkCompetencies != null) + } + @if (Model.FrameworkCompetencies != null) + { + if (Model.FrameworkCompetencies.Any()) { - if (Model.FrameworkCompetencies.Any()) + groupNum++; + int compNum = 0; +

Ungrouped competencies

+ foreach (var frameworkCompetency in Model.FrameworkCompetencies) { - groupNum++; - int compNum = 0; -

Ungrouped competencies

- foreach (var frameworkCompetency in Model.FrameworkCompetencies) - { - compNum++; -
-

@frameworkCompetency.Name

- - @if (frameworkCompetency.Description != null) - { -

- @frameworkCompetency.Description -

- } -
- } + compNum++; +
+

@frameworkCompetency.Name

+ + @if (frameworkCompetency.Description != null) + { +

+ @Html.Raw(frameworkCompetency.Description) +

+ } +
} } - + } + diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/_Structure.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/_Structure.cshtml index 79abdafa54..54742d65b2 100644 --- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/_Structure.cshtml +++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/_Structure.cshtml @@ -8,8 +8,11 @@
Add @Model.VocabSingular().ToLower() group Add ungrouped @Model.VocabSingular().ToLower() - Bulk upload/update @Model.VocabPlural().ToLower() - View for print + Bulk upload/update @Model.VocabPlural().ToLower() + @if ((Model.FrameworkCompetencies?.Any() ?? false) || (Model.FrameworkCompetencyGroups?.Any(group => group.FrameworkCompetencies.Any()) ?? false) ) + { + View for print + }
}