From 9f424ef86884e94fb5b827e9febe53b5ed756e50 Mon Sep 17 00:00:00 2001 From: Daniel Clarke Date: Tue, 13 Aug 2024 16:53:41 +0100 Subject: [PATCH 1/3] small html changes to the additional reqs page + layout change for qual list page --- .../CheckAdditionalRequirements/Index.cshtml | 4 +- .../Views/QualificationDetails/Get.cshtml | 91 ++++++++++--------- 2 files changed, 50 insertions(+), 45 deletions(-) diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/CheckAdditionalRequirements/Index.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/CheckAdditionalRequirements/Index.cshtml index 39852d4f..c24b2faa 100644 --- a/src/Dfe.EarlyYearsQualification.Web/Views/CheckAdditionalRequirements/Index.cshtml +++ b/src/Dfe.EarlyYearsQualification.Web/Views/CheckAdditionalRequirements/Index.cshtml @@ -69,7 +69,7 @@
-

@Model.QuestionSectionHeading

+

@Model.QuestionSectionHeading

@for (var qi = 0; qi < Model.AdditionalRequirementQuestions.Count; qi++) { @@ -79,7 +79,7 @@
-

@question.Question

+

@question.Question

 @if (!string.IsNullOrEmpty(question.HintText)) { diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml index b56a76e5..fa314c65 100644 --- a/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml +++ b/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml @@ -25,51 +25,53 @@
@Html.Raw(Model.PostSearchCriteriaContent)
-

@Model.Header

-

- - @if (Model.Qualifications.Count > 0) - { - @Model.Qualifications.Count - } - else - { - @Model.NoQualificationsFoundText - } @(Model.Qualifications.Count == 1 ? Model.SingleQualificationFoundText : Model.MultipleQualificationsFoundText) - -

-
@Html.Raw(Model.PreSearchBoxContent)
-
- @using (Html.BeginForm("Refine", "QualificationDetails", FormMethod.Post)) - { -
- - -
- - } -
-
- @using (Html.BeginForm("Refine", "QualificationDetails", FormMethod.Post)) - { - - - } -
+

@Model.Header

+
+
+

+ + @if (Model.Qualifications.Count > 0) + { + @Model.Qualifications.Count + } + else + { + @Model.NoQualificationsFoundText + } + @(Model.Qualifications.Count == 1 ? Model.SingleQualificationFoundText : Model.MultipleQualificationsFoundText) + +

+
+
+
@Html.Raw(Model.PreSearchBoxContent)
+
+
+ @using (Html.BeginForm("Refine", "QualificationDetails", FormMethod.Post, new { @class = "float-left", style = "width:80%" })) + { + + + } + @using (Html.BeginForm("Refine", "QualificationDetails", FormMethod.Post, new { @class = "float-left", style = "width:20%" })) + { + + + } +
+
+ @if (Model.Qualifications.Count == 0) + { +
+ @Html.Raw(Model.NoResultText) +
+ }
- - @if (Model.Qualifications.Count == 0) - { -
- @Html.Raw(Model.NoResultText) -
- } @foreach (var qualification in Model.Qualifications) - { + { +
@qualification.QualificationName @@ -94,7 +96,10 @@
- } -
@Html.Raw(Model.PostQualificationListContent)
+
+ } +
+
@Html.Raw(Model.PostQualificationListContent)
+
\ No newline at end of file From 37557d56a546c5ea5566c1595d62e63d9864d812 Mon Sep 17 00:00:00 2001 From: Daniel Clarke Date: Wed, 14 Aug 2024 11:07:31 +0100 Subject: [PATCH 2/3] small fix for cypress testing text spanning over multiple lines on the qualification list page --- .../Views/QualificationDetails/Get.cshtml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml index fa314c65..afc9dcfa 100644 --- a/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml +++ b/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml @@ -33,13 +33,12 @@ @if (Model.Qualifications.Count > 0) { - @Model.Qualifications.Count + @(Model.Qualifications.Count + " " + Model.MultipleQualificationsFoundText) } else { - @Model.NoQualificationsFoundText + @(Model.NoQualificationsFoundText + " " + (Model.Qualifications.Count == 1 ? Model.SingleQualificationFoundText : Model.MultipleQualificationsFoundText)) } - @(Model.Qualifications.Count == 1 ? Model.SingleQualificationFoundText : Model.MultipleQualificationsFoundText) From e27ee924938be3cf3b12786614a24e2156f5be62 Mon Sep 17 00:00:00 2001 From: Daniel Clarke Date: Wed, 14 Aug 2024 11:17:26 +0100 Subject: [PATCH 3/3] swapped some logic around for no qualifications --- .../Views/QualificationDetails/Get.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml index afc9dcfa..4d360f66 100644 --- a/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml +++ b/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml @@ -33,11 +33,11 @@ @if (Model.Qualifications.Count > 0) { - @(Model.Qualifications.Count + " " + Model.MultipleQualificationsFoundText) + @(Model.Qualifications.Count + " " + (Model.Qualifications.Count == 1 ? Model.SingleQualificationFoundText : Model.MultipleQualificationsFoundText)) } else { - @(Model.NoQualificationsFoundText + " " + (Model.Qualifications.Count == 1 ? Model.SingleQualificationFoundText : Model.MultipleQualificationsFoundText)) + @(Model.NoQualificationsFoundText + " " + Model.MultipleQualificationsFoundText) }