Merge pull request #314 from ministryofjustice/CFODEV-813

CFODEV-813: Accessibility - dialogs for dates
ministryofjustice · Nov 22, 2024 · 2a17bfc · 2a17bfc
2 parents 2f084c1 + f465875
commit 2a17bfc
Show file tree

Hide file tree

Showing 18 changed files with 103 additions and 79 deletions.
diff --git a/src/Application/Application.csproj b/src/Application/Application.csproj
@@ -7,6 +7,7 @@
         <Nullable>enable</Nullable>
         <LangVersion>default</LangVersion>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <NuGetAudit>false</NuGetAudit>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Humanizer.Core.uk" Version="2.14.1" />

diff --git a/src/Infrastructure/Infrastructure.csproj b/src/Infrastructure/Infrastructure.csproj
@@ -8,6 +8,7 @@
         <Nullable>enable</Nullable>
         <LangVersion>default</LangVersion>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <NuGetAudit>false</NuGetAudit>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Server.UI/Pages/Candidates/Components/CandidateFinderComponent.razor b/src/Server.UI/Pages/Candidates/Components/CandidateFinderComponent.razor
@@ -24,7 +24,7 @@
                             Immediate="true" />
                     </MudItem>
                     <MudItem xs="12">
-                        <MudDatePicker Label="Date Of Birth" @bind-Date="Query.DateOfBirth" For="(() => Query.DateOfBirth)"
+                        <MudDatePicker Label="Date Of Birth" @bind-Date="Query.DateOfBirth" For="(() => Query.DateOfBirth)" PickerVariant="PickerVariant.Dialog"
                             ImmediateText="true" Editable="true" MaxDate="DateTime.Today.AddYears(-18)" />
                     </MudItem>
                 </MudFocusTrap>

diff --git a/src/Server.UI/Pages/Enrolments/Components/Consent.razor b/src/Server.UI/Pages/Enrolments/Components/Consent.razor
@@ -32,6 +32,7 @@
                         For="() => Model.ConsentDate"
                         Label="@Model.GetMemberDescription(x => x.ConsentDate)"
                         MaxDate="DateTime.Now.Date"
+                        PickerVariant="PickerVariant.Dialog"
                         Editable="true" />
 
         <div class="mb-4 mt-8">

diff --git a/src/Server.UI/Pages/Enrolments/Components/RightToWork.razor b/src/Server.UI/Pages/Enrolments/Components/RightToWork.razor
@@ -56,7 +56,8 @@
                                Label="@Model.GetMemberDescription(x => x.ValidFrom)"
                                MaxDate="DateTime.Now.Date"
                                MinDate="DateTime.Now.AddYears(-5).Date"
-                               Editable="true" />
+                               Editable="true"
+                               PickerVariant="PickerVariant.Dialog"/>
 
                 @if (Model.IndefiniteRightToWork is false)
                 {
@@ -65,7 +66,8 @@
                                    Label="@Model.GetMemberDescription(x => x.ValidTo)"
                                    MaxDate="DateTime.MaxValue.Date"
                                    MinDate="DateTime.Now.Date"
-                                   Editable="true" />
+                                   Editable="true"
+                                   PickerVariant="PickerVariant.Dialog"/>
                 }
 
                 <div class="mb-4 mt-8">

diff --git a/src/Server.UI/Pages/Objectives/Tasks/AddTaskDialog.razor b/src/Server.UI/Pages/Objectives/Tasks/AddTaskDialog.razor
@@ -17,7 +17,8 @@
                           MinDate="new DateTime(DateTime.UtcNow.Year, DateTime.UtcNow.Month, 1)"
                           Label="@Model.GetMemberDescription(x => x.Due)"
                           For="@(() => Model.Due)"
-                           Editable="true" />
+                          Editable="true"
+                          PickerVariant="PickerVariant.Dialog"/>
         </MudForm>
     </DialogContent>
     <DialogActions>

diff --git a/src/Server.UI/Pages/Objectives/Tasks/AdjustDateTaskDialog.razor b/src/Server.UI/Pages/Objectives/Tasks/AdjustDateTaskDialog.razor
@@ -12,7 +12,8 @@
                            MinDate="new DateTime(DateTime.UtcNow.Year, DateTime.UtcNow.Month, 1)"
                            Label="@Model.GetMemberDescription(x => x.Due)"
                            For="@(() => Model.Due)" 
-                           Editable="true" />
+                           Editable="true"
+                           PickerVariant="PickerVariant.Dialog"/>
         </MudForm>
     </DialogContent>
     <DialogActions>

diff --git a/src/Server.UI/Pages/Participants/Components/AddHubInductionDialog.razor b/src/Server.UI/Pages/Participants/Components/AddHubInductionDialog.razor
@@ -6,25 +6,28 @@
 
 <MudDialog>
     <DialogContent>
-        @if(Model is not null)
-        {
-            <MudForm @ref="form" Model="Model" Validation="@(Validator.ValidateValue(Model))">
-                <MudGrid>
-                    <MudItem xs="12">
-                        <MudDatePicker Label="@Model.GetMemberDescription(x => x.InductionDate)"
-                                       @bind-Date="Model.InductionDate"
-                                       For="(() => Model.InductionDate)"
-                                       ImmediateText="true" Editable="false" MaxDate="DateTime.Today.Date" />
-                    </MudItem>
-                    <MudItem xs="12">
-                        <MudAutocomplete T="LocationDto" Label="@Model.GetMemberDescription(x => x.Location)" @bind-Value="Model.Location" SearchFunc="@SearchLocations"
-                                         Required="true" RequiredError="Location is required"
-                                         ResetValueOnEmptyText="true" CoerceText="true" CoerceValue="true" Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.Search"
-                                         AdornmentColor="Color.Primary" ToStringFunc="@(e=> e==null?null : e.Name)" />
-                    </MudItem>
-                </MudGrid>
-            </MudForm>
-        }
+        <MudPaper Height="300px" Elevation="0">
+            @if (Model is not null)
+            {
+                <MudForm @ref="form" Model="Model" Validation="@(Validator.ValidateValue(Model))">
+                    <MudGrid>
+                        <MudItem xs="12">
+                            <MudDatePicker Label="@Model.GetMemberDescription(x => x.InductionDate)" PickerVariant="PickerVariant.Dialog"
+                                           @bind-Date="Model.InductionDate"
+                                           For="(() => Model.InductionDate)"
+                                           ImmediateText="true" Editable="false" MaxDate="DateTime.Today.Date"/>
+                        </MudItem>
+                        <MudItem xs="12">
+                            <MudAutocomplete T="LocationDto" Label="@Model.GetMemberDescription(x => x.Location)" @bind-Value="Model.Location" SearchFunc="@SearchLocations"
+                                             Required="true" RequiredError="Location is required"
+                                             ResetValueOnEmptyText="true" CoerceText="true" CoerceValue="true" Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.Search"
+                                             AdornmentColor="Color.Primary" ToStringFunc="@(e => e == null ? null : e.Name)"/>
+                        </MudItem>
+                    </MudGrid>
+                </MudForm>
+            }
+        </MudPaper>
+
     </DialogContent>
     <DialogActions>
         <MudButton OnClick="Cancel">@ConstantString.Cancel</MudButton>

diff --git a/src/Server.UI/Pages/Participants/Components/AddInductionPhaseDialog.razor b/src/Server.UI/Pages/Participants/Components/AddInductionPhaseDialog.razor
@@ -5,21 +5,23 @@
 
 <MudDialog>
     <DialogContent>
-        @if (Model is not null)
-        {
-            <MudForm @ref="form" Model="Model" Validation="@(Validator.ValidateValue(Model))">
-                <MudGrid xs="12">
-                    <MudItem xs="12">
-                        <MudDatePicker Label="@Model.GetMemberDescription(x => x.StartDate)"
-                                       @bind-Date="Model.StartDate"
-                                       For="(() => Model.StartDate)"
-                                       ImmediateText="true" Editable="false"
-                                       MinDate="EarliestStartDate"
-                                       MaxDate="DateTime.Today.Date"/>    
-                    </MudItem>
-                </MudGrid>
-            </MudForm>    
-        }
+        <MudPaper Height="300px" Elevation="0">
+            @if (Model is not null)
+            {
+                <MudForm @ref="form" Model="Model" Validation="@(Validator.ValidateValue(Model))">
+                    <MudGrid xs="12">
+                        <MudItem xs="12">
+                            <MudDatePicker Label="@Model.GetMemberDescription(x => x.StartDate)"
+                                           @bind-Date="Model.StartDate"
+                                           For="(() => Model.StartDate)"
+                                           ImmediateText="true" Editable="false"
+                                           MinDate="EarliestStartDate"
+                                           MaxDate="DateTime.Today.Date" PickerVariant="PickerVariant.Dialog"/>
+                        </MudItem>
+                    </MudGrid>
+                </MudForm>
+            }
+        </MudPaper>
     </DialogContent>
     <DialogActions>
         <MudButton OnClick="Cancel">@ConstantString.Cancel</MudButton>

diff --git a/src/Server.UI/Pages/Participants/Components/AddWingInductionDialog.razor b/src/Server.UI/Pages/Participants/Components/AddWingInductionDialog.razor
@@ -6,25 +6,27 @@
 
 <MudDialog>
     <DialogContent>
-        @if(Model is not null)
-        {
-            <MudForm @ref="form" Model="Model" Validation="@(Validator.ValidateValue(Model))">
-                <MudGrid>
-                    <MudItem xs="12">
-                        <MudDatePicker Label="@Model.GetMemberDescription(x => x.InductionDate)"
-                                       @bind-Date="Model.InductionDate"
-                                       For="(() => Model.InductionDate)"
-                                       ImmediateText="true" Editable="false" MaxDate="DateTime.Today.Date" />
-                    </MudItem>
-                    <MudItem xs="12">
-                        <MudAutocomplete T="LocationDto" Label="@Model.GetMemberDescription(x => x.Location)" @bind-Value="Model.Location" SearchFunc="@SearchLocations"
-                                         Required="true" RequiredError="Location is required"
-                                         ResetValueOnEmptyText="true" CoerceText="true" CoerceValue="true" Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.Search"
-                                         AdornmentColor="Color.Primary" ToStringFunc="@(e=> e==null?null : e.Name)" />
-                    </MudItem>
-                </MudGrid>
-            </MudForm>
-        }
+        <MudPaper Height="300px" Elevation="0">
+            @if (Model is not null)
+            {
+                <MudForm @ref="form" Model="Model" Validation="@(Validator.ValidateValue(Model))">
+                    <MudGrid>
+                        <MudItem xs="12">
+                            <MudDatePicker Label="@Model.GetMemberDescription(x => x.InductionDate)"
+                                           @bind-Date="Model.InductionDate"
+                                           For="(() => Model.InductionDate)"
+                                           ImmediateText="true" Editable="false" MaxDate="DateTime.Today.Date" PickerVariant="PickerVariant.Dialog"/>
+                        </MudItem>
+                        <MudItem xs="12">
+                            <MudAutocomplete T="LocationDto" Label="@Model.GetMemberDescription(x => x.Location)" @bind-Value="Model.Location" SearchFunc="@SearchLocations"
+                                             Required="true" RequiredError="Location is required"
+                                             ResetValueOnEmptyText="true" CoerceText="true" CoerceValue="true" Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.Search"
+                                             AdornmentColor="Color.Primary" ToStringFunc="@(e => e == null ? null : e.Name)"/>
+                        </MudItem>
+                    </MudGrid>
+                </MudForm>
+            }
+        </MudPaper>
     </DialogContent>
     <DialogActions>
         <MudButton OnClick="Cancel">@ConstantString.Cancel</MudButton>

diff --git a/src/Server.UI/Pages/Participants/Components/CompletePhaseDialog.razor b/src/Server.UI/Pages/Participants/Components/CompletePhaseDialog.razor
@@ -5,21 +5,23 @@
 
 <MudDialog>
     <DialogContent>
-        @if (Model is not null)
-        {
-            <MudForm @ref="form" Model="Model" Validation="@(Validator.ValidateValue(Model))">
-                <MudGrid xs="12">
-                    <MudItem xs="12">
-                        <MudDatePicker Label="@Model.GetMemberDescription(x => x.CompletionDate)"
-                                       @bind-Date="Model.CompletionDate"
-                                       For="(() => Model.CompletionDate)"
-                                       ImmediateText="true" Editable="false"
-                                       MinDate="EarliestCompletionDate"
-                                       MaxDate="DateTime.Today.Date"/>    
-                    </MudItem>
-                </MudGrid>
-            </MudForm>    
-        }
+        <MudPaper Height="300px;" Elevation="0">
+            @if (Model is not null)
+            {
+                <MudForm @ref="form" Model="Model" Validation="@(Validator.ValidateValue(Model))">
+                    <MudGrid xs="12">
+                        <MudItem xs="12">
+                            <MudDatePicker Label="@Model.GetMemberDescription(x => x.CompletionDate)"
+                                           @bind-Date="Model.CompletionDate"
+                                           For="(() => Model.CompletionDate)"
+                                           ImmediateText="true" Editable="false"
+                                           MinDate="EarliestCompletionDate"
+                                           MaxDate="DateTime.Today.Date" PickerVariant="PickerVariant.Dialog"/>
+                        </MudItem>
+                    </MudGrid>
+                </MudForm>
+            }
+        </MudPaper>
     </DialogContent>
     <DialogActions>
         <MudButton OnClick="Cancel">@ConstantString.Cancel</MudButton>

diff --git a/src/Server.UI/Pages/Risk/RiskComponents/AdditionalInformation.razor b/src/Server.UI/Pages/Risk/RiskComponents/AdditionalInformation.razor
@@ -32,7 +32,8 @@
                        For="@(() => Model.ReferredOn)"
                        MaxDate="DateTime.UtcNow.Date"
                        Editable="true"
-                       Class="mt-4"/>
+                       Class="mt-4"
+                       PickerVariant="PickerVariant.Dialog"/>
     </CatsMudStep>
 }
 

diff --git a/src/Server.UI/Pages/Risk/RiskComponents/LicenseConditions.razor b/src/Server.UI/Pages/Risk/RiskComponents/LicenseConditions.razor
@@ -19,7 +19,8 @@
                        For="@(() => Model.LicenseEnd)"
                        MinDate="DateTime.UtcNow.Date" 
                        Class="mt-4"
-                       Editable="true" />
+                       Editable="true"
+                       PickerVariant="PickerVariant.Dialog"/>
     </CatsMudStep>
 }
 

diff --git a/src/Server.UI/Pages/Risk/RiskComponents/Recommendations.razor b/src/Server.UI/Pages/Risk/RiskComponents/Recommendations.razor
@@ -20,7 +20,8 @@
                        For="@(() => Model.ActivityRecommendationsReceived)"
                        MaxDate="DateTime.UtcNow.Date"
                        Class="mt-4"
-                       Editable="true" />
+                       Editable="true" 
+                       PickerVariant="PickerVariant.Dialog"/>
     </CatsMudStep>
 }
 

diff --git a/src/Server.UI/Pages/Risk/RiskComponents/Restrictions.razor b/src/Server.UI/Pages/Risk/RiskComponents/Restrictions.razor
@@ -19,7 +19,8 @@
                        For="@(() => Model.ActivityRestrictionsReceived)"
                        MaxDate="DateTime.UtcNow.Date"
                        Class="mt-4"
-                       Editable="true" />
+                       Editable="true"
+                       PickerVariant="PickerVariant.Dialog"/>
 
         <MudDivider Class="mt-8 mb-8"/>
 
@@ -34,7 +35,8 @@
                        For="@(() => Model.PSFRestrictionsReceived)"
                        MaxDate="DateTime.UtcNow.Date"
                        Class="mt-4"
-                       Editable="true" />
+                       Editable="true"
+                       PickerVariant="PickerVariant.Dialog"/>
     </CatsMudStep>
 }
 

diff --git a/src/Server.UI/Server.UI.csproj b/src/Server.UI/Server.UI.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
         <RootNamespace>Cfo.Cats.Server.UI</RootNamespace>
@@ -14,6 +14,7 @@
         <LangVersion>default</LangVersion>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <WarningsNotAsErrors>CS8785</WarningsNotAsErrors>
+        <NuGetAudit>false</NuGetAudit>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/test/Application.UnitTests/Application.UnitTests.csproj b/test/Application.UnitTests/Application.UnitTests.csproj
@@ -7,6 +7,7 @@
         <IsPackable>false</IsPackable>
         <LangVersion>default</LangVersion>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <NuGetAudit>false</NuGetAudit>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/test/ArchitectureTests/ArchitectureTests.csproj b/test/ArchitectureTests/ArchitectureTests.csproj
@@ -7,6 +7,7 @@
         <IsPackable>false</IsPackable>
         <LangVersion>default</LangVersion>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <NuGetAudit>false</NuGetAudit>
     </PropertyGroup>