Skip to content

Commit 53658f4

Browse files
FrostyApeOneFrostyApeOne
authored andcommitted
Added form version to the application page
1 parent 4c50ef3 commit 53658f4

3 files changed

Lines changed: 6 additions & 18 deletions

File tree

src/DfE.ExternalApplications.Infrastructure/Services/ApplicationStateService.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,12 @@ public class ApplicationStateService(
100100
var leadApplicantNameKey = $"ApplicationLeadApplicantName_{application.ApplicationId}";
101101
var leadApplicantEmailKey = $"ApplicationLeadApplicantEmail_{application.ApplicationId}";
102102
var leadApplicantUserIdKey = $"ApplicationLeadApplicantUserId_{application.ApplicationId}";
103+
var applicationFormVersionKey = $"ApplicationFormVersion_{application.ApplicationId}";
103104

104105
session.SetString(leadApplicantNameKey, application.CreatedBy!.Name);
105106
session.SetString(leadApplicantEmailKey, application.CreatedBy.Email);
106107
session.SetString(leadApplicantUserIdKey, application.CreatedBy.UserId.ToString());
108+
session.SetString(applicationFormVersionKey, string.IsNullOrEmpty(application.TemplateSchema?.VersionNumber) ? "N/A" : application.TemplateSchema?.VersionNumber!);
107109

108110
// Load existing response data into session for existing applications
109111
await LoadResponseDataIntoSessionAsync(application, session);

src/DfE.ExternalApplications.Web/Pages/FormEngine/RenderForm.cshtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
var applicationId = HttpContext.Session.GetString("ApplicationId");
1212
var leadApplicantName = HttpContext.Session.GetString($"ApplicationLeadApplicantName_{applicationId}");
1313
var leadApplicantEmail = HttpContext.Session.GetString($"ApplicationLeadApplicantEmail_{applicationId}");
14-
14+
var applicationFormVersion = HttpContext.Session.GetString($"ApplicationFormVersion_{applicationId}");
1515
var currentUser = HttpContext.User.Identity!.Name;
1616
}
1717

@@ -74,6 +74,7 @@ else
7474
<h1 class="govuk-heading-xl govuk-!-margin-bottom-6">Your application</h1>
7575
<div class="govuk-!-margin-bottom-6" style="border-left: 4px solid #b1b4b6; padding-left: 15px;">
7676
<p class="govuk-body govuk-!-margin-bottom-1">Application reference: <strong>@Model.ReferenceNumber</strong></p>
77+
<p class="govuk-body govuk-!-margin-bottom-0">Application form version: <strong>@applicationFormVersion</strong></p>
7778
<p class="govuk-body govuk-!-margin-bottom-0">Lead applicant: <strong>@leadApplicantName</strong></p>
7879
</div>
7980
@foreach (var group in Model.Template.TaskGroups.OrderBy(g => g.GroupOrder))

src/DfE.ExternalApplications.Web/Pages/FormEngine/RenderForm.cshtml.cs

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
1-
using System.Diagnostics.CodeAnalysis;
2-
using System.Text.RegularExpressions;
31
using DfE.ExternalApplications.Application.Interfaces;
42
using DfE.ExternalApplications.Domain.Models;
53
using DfE.ExternalApplications.Web.Pages.Shared;
64
using DfE.ExternalApplications.Web.Services;
75
using Microsoft.AspNetCore.Mvc;
6+
using System.Diagnostics.CodeAnalysis;
7+
using System.Text.RegularExpressions;
88
using Task = System.Threading.Tasks.Task;
9-
using DfE.CoreLibs.Contracts.ExternalApplications.Models.Response;
10-
using GovUK.Dfe.ExternalApplications.Api.Client.Contracts;
11-
using Microsoft.AspNetCore.Http;
12-
using Microsoft.AspNetCore.Mvc;
13-
using Microsoft.Extensions.Logging;
14-
using System.IO;
15-
using System.Text.Json;
169

1710
namespace DfE.ExternalApplications.Web.Pages.FormEngine
1811
{
@@ -240,8 +233,6 @@ private void CheckAndClearSessionForNewApplication()
240233
}
241234
}
242235

243-
244-
245236
private void LoadAccumulatedDataFromSession()
246237
{
247238
// Get accumulated form data from session and populate the Data dictionary
@@ -259,8 +250,6 @@ private void LoadAccumulatedDataFromSession()
259250
}
260251
}
261252

262-
263-
264253
/// <summary>
265254
/// Calculate overall application status based on task statuses
266255
/// </summary>
@@ -282,10 +271,6 @@ public string CalculateApplicationStatus()
282271

283272
return hasAnyTaskWithProgress ? "InProgress" : "InProgress"; // Always InProgress until submitted
284273
}
285-
286-
287-
288-
289274
}
290275
}
291276

0 commit comments

Comments
 (0)