Merge branch 'main' into Additional-A1-Validation

UK-SBCoA · Dec 6, 2024 · bd81ad4 · bd81ad4
2 parents f7ad86b + a55003f
commit bd81ad4
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 31 deletions.
diff --git a/src/UDS.Net.Forms.Tests/UDS.Net.Forms.Tests.csproj b/src/UDS.Net.Forms.Tests/UDS.Net.Forms.Tests.csproj
@@ -5,7 +5,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<IsPackable>false</IsPackable>
-		<ReleaseVersion>4.4.0</ReleaseVersion>
+		<ReleaseVersion>4.4.1</ReleaseVersion>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />

diff --git a/src/UDS.Net.Forms/UDS.Net.Forms.csproj b/src/UDS.Net.Forms/UDS.Net.Forms.csproj
@@ -6,13 +6,13 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<PackageId>UDS.Net.Forms</PackageId>
-		<Version>4.4.0</Version>
+		<Version>4.4.1</Version>
 		<Authors>Sanders-Brown Center on Aging</Authors>
 		<Description>UDS Forms razor class library</Description>
 		<Owners>UK-SBCoA</Owners>
 		<PackageDescription>Razor class library for rendering UDS forms</PackageDescription>
 		<RepositoryUrl>https://github.com/UK-SBCoA/uniform-data-set-dotnet-web</RepositoryUrl>
-		<ReleaseVersion>4.4.0</ReleaseVersion>
+		<ReleaseVersion>4.4.1</ReleaseVersion>
 	</PropertyGroup>
 	<ItemGroup>
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />

diff --git a/src/UDS.Net.Forms/Views/Shared/_LayoutForm.cshtml b/src/UDS.Net.Forms/Views/Shared/_LayoutForm.cshtml
@@ -68,33 +68,36 @@
             </div>
 
             <div class="divide-y divide-gray-200">
-                @if(Model.BaseForm.Kind != "C2" || Model.BaseForm.Kind != "C2T")
+                @if (Model.BaseForm.Kind == "C2" || Model.BaseForm.Kind == "C2T")
+
                 {
-                <form method="post" id="UDSForm" data-turbo="false">
-                    <input name="Enum.FormMode.NotCompleted" value="@(((int)FormMode.NotCompleted).ToString())" type="hidden" />
-                    <input name="Enum.FormStatus.Finalized" value="@(((int)FormStatus.Finalized).ToString())" type="hidden" />
-                    <input asp-for="Visit.Id" type="hidden" />
-                    <input asp-for="Visit.ParticipationId" type="hidden" />
-                    <input asp-for="Visit.VISITNUM" type="hidden" />
-                    <input asp-for="Visit.PACKET" type="hidden" />
-                    <input asp-for="Visit.FORMVER" type="hidden" />
-                    <input asp-for="Visit.VISIT_DATE" type="hidden" />
-                    <input asp-for="Visit.INITIALS" type="hidden" />
-                    <input asp-for="Visit.CreatedAt" type="hidden" />
-                    <input asp-for="Visit.CreatedBy" type="hidden" />
-                    <input asp-for="Visit.ModifiedBy" type="hidden" />
-                    <input asp-for="Visit.DeletedBy" type="hidden" />
-                    <input asp-for="Visit.IsDeleted" type="hidden" />
-
-                    <div class="counterreset space-y-12 sm:space-y-16 mt-2">
-
-                        @RenderBody()
-                    </div>
+                    <form method="post" id="UDSForm">
+                        <input name="Enum.FormMode.NotCompleted" value="@(((int)FormMode.NotCompleted).ToString())" type="hidden" />
+                        <input name="Enum.FormStatus.Finalized" value="@(((int)FormStatus.Finalized).ToString())" type="hidden" />
+                        <input asp-for="Visit.Id" type="hidden" />
+                        <input asp-for="Visit.ParticipationId" type="hidden" />
+                        <input asp-for="Visit.VISITNUM" type="hidden" />
+                        <input asp-for="Visit.PACKET" type="hidden" />
+                        <input asp-for="Visit.FORMVER" type="hidden" />
+                        <input asp-for="Visit.VISIT_DATE" type="hidden" />
+                        <input asp-for="Visit.INITIALS" type="hidden" />
+                        <input asp-for="Visit.CreatedAt" type="hidden" />
+                        <input asp-for="Visit.CreatedBy" type="hidden" />
+                        <input asp-for="Visit.ModifiedBy" type="hidden" />
+                        <input asp-for="Visit.DeletedBy" type="hidden" />
+                        <input asp-for="Visit.IsDeleted" type="hidden" />
+
+                        <div class="counterreset space-y-12 sm:space-y-16 mt-2">
+
+                            @RenderBody()
+                        </div>
                     </form>
                 }
+
                 else
+
                 {
-                    <form method="post" id="UDSForm">
+                    <form method="post" id="UDSForm" data-turbo="false">
                         <input name="Enum.FormMode.NotCompleted" value="@(((int)FormMode.NotCompleted).ToString())" type="hidden" />
                         <input name="Enum.FormStatus.Finalized" value="@(((int)FormStatus.Finalized).ToString())" type="hidden" />
                         <input asp-for="Visit.Id" type="hidden" />

diff --git a/src/UDS.Net.Services.Test/UDS.Net.Services.Test.csproj b/src/UDS.Net.Services.Test/UDS.Net.Services.Test.csproj
@@ -7,7 +7,7 @@
 
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
-    <ReleaseVersion>4.4.0</ReleaseVersion>
+    <ReleaseVersion>4.4.1</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/UDS.Net.Services/UDS.Net.Services.csproj b/src/UDS.Net.Services/UDS.Net.Services.csproj
@@ -4,13 +4,13 @@
 		<TargetFramework>netstandard2.1</TargetFramework>
 		<OutputType>Library</OutputType>
 		<PackageId>UDS.Net.Services</PackageId>
-		<Version>4.4.0</Version>
+		<Version>4.4.1</Version>
 		<Authors>Sanders-Brown Center on Aging</Authors>
 		<Description>Service contracts for implmenting your own back-end with MVC web app</Description>
 		<Owners>UK-SBCoA</Owners>
 		<PackageDescription>Service contracts required by MVC web app</PackageDescription>
 		<RepositoryUrl>https://github.com/UK-SBCoA/uniform-data-set-dotnet-web</RepositoryUrl>
-		<ReleaseVersion>4.4.0</ReleaseVersion>
+		<ReleaseVersion>4.4.1</ReleaseVersion>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="UDS.Net.Dto" Version="4.3.0" />

diff --git a/src/UDS.Net.Web.MVC.Services/UDS.Net.Web.MVC.Services.csproj b/src/UDS.Net.Web.MVC.Services/UDS.Net.Web.MVC.Services.csproj
@@ -4,13 +4,13 @@
 		<TargetFramework>netstandard2.1</TargetFramework>
 		<OutputType>Library</OutputType>
 		<PackageId>UDS.Net.MVC.Services</PackageId>
-		<Version>4.4.0</Version>
+		<Version>4.4.1</Version>
 		<Authors>Sanders-Brown Center on Aging</Authors>
 		<Description>Implemented service layer for using MVC front-end with API back-end</Description>
 		<Owners>UK-SBCoA</Owners>
 		<PackageDescription>Implemented service contract</PackageDescription>
 		<RepositoryUrl>https://github.com/UK-SBCoA/uniform-data-set-dotnet-web</RepositoryUrl>
-		<ReleaseVersion>4.4.0</ReleaseVersion>
+		<ReleaseVersion>4.4.1</ReleaseVersion>
 	</PropertyGroup>
 	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
 	<ItemGroup>

diff --git a/src/UDS.Net.Web.MVC/UDS.Net.Web.MVC.csproj b/src/UDS.Net.Web.MVC/UDS.Net.Web.MVC.csproj
@@ -6,7 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<UserSecretsId>aspnet-UDS.Net.Web.MVC-F92C0881-61B6-4292-8635-0004DE84CFE6</UserSecretsId>
 		<DockerComposeProjectPath>../docker-compose.dcproj</DockerComposeProjectPath>
-		<ReleaseVersion>4.4.0</ReleaseVersion>
+		<ReleaseVersion>4.4.1</ReleaseVersion>
 	</PropertyGroup>
 	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
 	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />