Merge pull request #45 from DFE-Digital/buf-fixes-for-contact-school

bug fixes and color changes
DFE-Digital · Jan 17, 2025 · 436d51a · 436d51a
2 parents 32400c8 + 8cb2a16
commit 436d51a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/Dfe.RegionalImprovementForStandardsAndExcellence/Pages/Shared/_TaskListStatus.cshtml b/src/Dfe.RegionalImprovementForStandardsAndExcellence/Pages/Shared/_TaskListStatus.cshtml
@@ -8,16 +8,16 @@
     {
         case TaskListStatus.Complete:
             output = "Completed";
-            colour = "";
+            colour = "green";
             break;
         case TaskListStatus.InProgress:
             output = "In Progress";
-            colour = "blue";
+            colour = "orange";
             break;
         case TaskListStatus.NotStarted:
         default:
             output = "Not Started";
-            colour = "grey";
+            colour = "blue";
             break;
     }
 }

diff --git a/...rovementForStandardsAndExcellence/Pages/TaskList/ContactTheSchool/ContactTheSchool.cshtml b/...rovementForStandardsAndExcellence/Pages/TaskList/ContactTheSchool/ContactTheSchool.cshtml
@@ -18,10 +18,9 @@
         <h1 class="govuk-heading-l">
             Contact the school
         </h1>
-        <div class="govuk-hint">Get in touch with the school to tell them they are eligible for support</div>
+        <div class="govuk-hint">Get in touch with the school to tell them they are eligible for targeted support</div>
 
         <div class="govuk-grid-row">
-            <div class="govuk-grid-column-two-thirds">
                 <form method="post" novalidate>
                     <govuk-checkbox-input label="Find the school's email address" id="school-email-address-found" name="school-email-address-found" asp-for="@Model.SchoolEmailAddressFound"/>
                     <govuk-checkbox-input label="Use the template notification letter to create the email" id="notification-letter-to-create-email" name="notification-letter-to-create-email" asp-for="@Model.UseTheNotificationLetterToCreateEmail"/>
@@ -31,7 +30,6 @@
                         Save and return
                     </button>
                 </form>
-            </div>
         </div>
 
     </div>

diff --git a/...ementForStandardsAndExcellence/Pages/TaskList/ContactTheSchool/ContactTheSchool.cshtml.cs b/...ementForStandardsAndExcellence/Pages/TaskList/ContactTheSchool/ContactTheSchool.cshtml.cs
@@ -1,3 +1,5 @@
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
 using Dfe.RegionalImprovementForStandardsAndExcellence.Application.SupportProject.Commands.UpdateSupportProject;
 using Dfe.RegionalImprovementForStandardsAndExcellence.Application.SupportProject.Queries;
 using Dfe.RegionalImprovementForStandardsAndExcellence.Domain.ValueObjects;
@@ -14,6 +16,8 @@ public class ContactTheSchoolModel(ISupportProjectQueryService supportProjectQue
 {
 
     [BindProperty(Name = "school-contacted-date", BinderType = typeof(DateInputModelBinder))]
+    [DateValidation(Dfe.RegionalImprovementForStandardsAndExcellence.Frontend.Services.DateRangeValidationService.DateRange.PastOrToday)]
+    [Display(Name = "Contacted the school")]
     public DateTime? SchoolContactedDate  { get; set; }
 
     [BindProperty(Name = "school-email-address-found")]
@@ -57,6 +61,8 @@ public async Task<IActionResult> OnGet(int id, CancellationToken cancellationTok
 
     public async Task<IActionResult> OnPost(int id,CancellationToken cancellationToken)
     {
+
+
         if (!ModelState.IsValid)
         {
             _errorService.AddErrors(Request.Form.Keys, ModelState);