DFE-Digital · Robware · May 4, 2021 · May 4, 2021
diff --git a/ApplyToBecomeInternal/ApplyToBecomeInternal.Tests/Extensions/NavigationExtensionsTest.cs b/ApplyToBecomeInternal/ApplyToBecomeInternal.Tests/Extensions/NavigationExtensionsTest.cs
@@ -1,5 +1,5 @@
 using ApplyToBecomeInternal.Extensions;
-using ApplyToBecomeInternal.Models.Shared;
+using ApplyToBecomeInternal.Models.Navigation;
 using FluentAssertions;
 using Xunit;
 

diff --git a/ApplyToBecomeInternal/ApplyToBecomeInternal.Tests/Models/ApplicationFormViewModelTests.cs b/ApplyToBecomeInternal/ApplyToBecomeInternal.Tests/Models/ApplicationFormViewModelTests.cs
@@ -1,7 +1,6 @@
 using ApplyToBecome.Data.Models;
 using ApplyToBecome.Data.Models.Application;
-using ApplyToBecomeInternal.Models;
-using ApplyToBecomeInternal.Models.Shared;
+using ApplyToBecomeInternal.ViewModels;
 using FluentAssertions;
 using System;
 using Xunit;

diff --git a/ApplyToBecomeInternal/ApplyToBecomeInternal.Tests/Models/NewProjectNoteViewModelTests.cs b/ApplyToBecomeInternal/ApplyToBecomeInternal.Tests/Models/NewProjectNoteViewModelTests.cs
@@ -1,5 +1,5 @@
 using ApplyToBecome.Data.Models;
-using ApplyToBecomeInternal.Models;
+using ApplyToBecomeInternal.ViewModels;
 using FluentAssertions;
 using Xunit;
 

diff --git a/ApplyToBecomeInternal/ApplyToBecomeInternal.Tests/Models/ProjectListViewModelTests.cs b/ApplyToBecomeInternal/ApplyToBecomeInternal.Tests/Models/ProjectListViewModelTests.cs
@@ -1,5 +1,5 @@
 using ApplyToBecome.Data.Models;
-using ApplyToBecomeInternal.Models;
+using ApplyToBecomeInternal.ViewModels;
 using FluentAssertions;
 using Xunit;
 

diff --git a/ApplyToBecomeInternal/ApplyToBecomeInternal.Tests/Models/ProjectNotesViewModelTests.cs b/ApplyToBecomeInternal/ApplyToBecomeInternal.Tests/Models/ProjectNotesViewModelTests.cs
@@ -1,6 +1,5 @@
 using ApplyToBecome.Data.Models;
-using ApplyToBecomeInternal.Models;
-using ApplyToBecomeInternal.Models.Shared;
+using ApplyToBecomeInternal.ViewModels;
 using FluentAssertions;
 using Xunit;
 

diff --git a/ApplyToBecomeInternal/ApplyToBecomeInternal.Tests/Models/ProjectViewModelTests.cs b/ApplyToBecomeInternal/ApplyToBecomeInternal.Tests/Models/ProjectViewModelTests.cs
@@ -1,5 +1,5 @@
 using ApplyToBecome.Data.Models;
-using ApplyToBecomeInternal.Models;
+using ApplyToBecomeInternal.ViewModels;
 using FluentAssertions;
 using System;
 using Xunit;

diff --git a/ApplyToBecomeInternal/ApplyToBecomeInternal.Tests/Models/TaskListViewModelTests.cs b/ApplyToBecomeInternal/ApplyToBecomeInternal.Tests/Models/TaskListViewModelTests.cs
@@ -1,6 +1,5 @@
 using ApplyToBecome.Data.Models;
-using ApplyToBecomeInternal.Models;
-using ApplyToBecomeInternal.Models.Shared;
+using ApplyToBecomeInternal.ViewModels;
 using FluentAssertions;
 using Xunit;
 

diff --git a/ApplyToBecomeInternal/ApplyToBecomeInternal/Controllers/ApplicationFormController.cs b/ApplyToBecomeInternal/ApplyToBecomeInternal/Controllers/ApplicationFormController.cs
@@ -1,5 +1,5 @@
 using ApplyToBecome.Data;
-using ApplyToBecomeInternal.Models;
+using ApplyToBecomeInternal.ViewModels;
 using Microsoft.AspNetCore.Mvc;
 
 namespace ApplyToBecomeInternal.Controllers

diff --git a/ApplyToBecomeInternal/ApplyToBecomeInternal/Controllers/ErrorController.cs b/ApplyToBecomeInternal/ApplyToBecomeInternal/Controllers/ErrorController.cs
@@ -1,5 +1,5 @@
 using System.Diagnostics;
-using ApplyToBecomeInternal.Models;
+using ApplyToBecomeInternal.ViewModels;
 using Microsoft.AspNetCore.Mvc;
 
 namespace ApplyToBecomeInternal.Controllers

diff --git a/ApplyToBecomeInternal/ApplyToBecomeInternal/Controllers/ProjectListController.cs b/ApplyToBecomeInternal/ApplyToBecomeInternal/Controllers/ProjectListController.cs
@@ -1,5 +1,5 @@
 using ApplyToBecome.Data;
-using ApplyToBecomeInternal.Models;
+using ApplyToBecomeInternal.ViewModels;
 using Microsoft.AspNetCore.Mvc;
 
 namespace ApplyToBecomeInternal.Controllers

diff --git a/ApplyToBecomeInternal/ApplyToBecomeInternal/Controllers/ProjectNotesController.cs b/ApplyToBecomeInternal/ApplyToBecomeInternal/Controllers/ProjectNotesController.cs
@@ -1,5 +1,5 @@
 using ApplyToBecome.Data;
-using ApplyToBecomeInternal.Models;
+using ApplyToBecomeInternal.ViewModels;
 using Microsoft.AspNetCore.Mvc;
 
 namespace ApplyToBecomeInternal.Controllers

diff --git a/ApplyToBecomeInternal/ApplyToBecomeInternal/Controllers/TaskListController.cs b/ApplyToBecomeInternal/ApplyToBecomeInternal/Controllers/TaskListController.cs
@@ -1,5 +1,5 @@
 using ApplyToBecome.Data;
-using ApplyToBecomeInternal.Models;
+using ApplyToBecomeInternal.ViewModels;
 using Microsoft.AspNetCore.Mvc;
 
 namespace ApplyToBecomeInternal.Controllers

diff --git a/ApplyToBecomeInternal/ApplyToBecomeInternal/Extensions/NavigationTargetExtensions.cs b/ApplyToBecomeInternal/ApplyToBecomeInternal/Extensions/NavigationTargetExtensions.cs
@@ -1,4 +1,4 @@
-using ApplyToBecomeInternal.Models.Shared;
+using ApplyToBecomeInternal.Models.Navigation;
 
 namespace ApplyToBecomeInternal.Extensions
 {

diff --git a/...rnal/Models/Shared/NavigationAttribute.cs → .../Models/Navigation/NavigationAttribute.cs b/...rnal/Models/Shared/NavigationAttribute.cs → .../Models/Navigation/NavigationAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace ApplyToBecomeInternal.Models.Shared
+namespace ApplyToBecomeInternal.Models.Navigation
 {
 	public class NavigationAttribute : Attribute
 	{

diff --git a/...nternal/Models/Shared/NavigationTarget.cs → ...nal/Models/Navigation/NavigationTarget.cs b/...nternal/Models/Shared/NavigationTarget.cs → ...nal/Models/Navigation/NavigationTarget.cs
@@ -1,4 +1,4 @@
-namespace ApplyToBecomeInternal.Models.Shared
+namespace ApplyToBecomeInternal.Models.Navigation
 {
 	public enum NavigationTarget
 	{

diff --git a/...rnal/Models/Shared/NavigationViewModel.cs → .../Models/Navigation/NavigationViewModel.cs b/...rnal/Models/Shared/NavigationViewModel.cs → .../Models/Navigation/NavigationViewModel.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace ApplyToBecomeInternal.Models.Shared
+namespace ApplyToBecomeInternal.Models.Navigation
 {
 	public class NavigationViewModel
 	{

diff --git a/...ternal/Models/ApplicationFormViewModel.cs → ...al/ViewModels/ApplicationFormViewModel.cs b/...ternal/Models/ApplicationFormViewModel.cs → ...al/ViewModels/ApplicationFormViewModel.cs
@@ -1,10 +1,10 @@
 using ApplyToBecome.Data.Models.Application;
 using ApplyToBecomeInternal.Models.ApplicationForm;
 using ApplyToBecomeInternal.Models.ApplicationForm.Sections;
-using ApplyToBecomeInternal.Models.Shared;
+using ApplyToBecomeInternal.Models.Navigation;
 using System.Collections.Generic;
 
-namespace ApplyToBecomeInternal.Models
+namespace ApplyToBecomeInternal.ViewModels
 {
 	public class ApplicationFormViewModel
 	{

diff --git a/...ToBecomeInternal/Models/ErrorViewModel.cs → ...comeInternal/ViewModels/ErrorViewModel.cs b/...ToBecomeInternal/Models/ErrorViewModel.cs → ...comeInternal/ViewModels/ErrorViewModel.cs
@@ -1,4 +1,4 @@
-namespace ApplyToBecomeInternal.Models
+namespace ApplyToBecomeInternal.ViewModels
 {
 	public class ErrorViewModel
 	{

diff --git a/...nternal/Models/NewProjectNoteViewModel.cs → ...nal/ViewModels/NewProjectNoteViewModel.cs b/...nternal/Models/NewProjectNoteViewModel.cs → ...nal/ViewModels/NewProjectNoteViewModel.cs
@@ -1,7 +1,7 @@
-using ApplyToBecomeInternal.Models.Shared;
+using ApplyToBecomeInternal.Models.Navigation;
 using System.Collections.Generic;
 
-namespace ApplyToBecomeInternal.Models
+namespace ApplyToBecomeInternal.ViewModels
 {
 	public class NewProjectNoteViewModel
 	{

diff --git a/...meInternal/Models/ProjectListViewModel.cs → ...ternal/ViewModels/ProjectListViewModel.cs b/...meInternal/Models/ProjectListViewModel.cs → ...ternal/ViewModels/ProjectListViewModel.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace ApplyToBecomeInternal.Models
+namespace ApplyToBecomeInternal.ViewModels
 {
 	public class ProjectListViewModel
 	{

diff --git a/...eInternal/Models/ProjectNotesViewModel.cs → ...ernal/ViewModels/ProjectNotesViewModel.cs b/...eInternal/Models/ProjectNotesViewModel.cs → ...ernal/ViewModels/ProjectNotesViewModel.cs
@@ -1,6 +1,6 @@
-using ApplyToBecomeInternal.Models.Shared;
+using ApplyToBecomeInternal.Models.Navigation;
 
-namespace ApplyToBecomeInternal.Models
+namespace ApplyToBecomeInternal.ViewModels
 {
 	public class ProjectNotesViewModel
 	{

diff --git a/...BecomeInternal/Models/ProjectViewModel.cs → ...meInternal/ViewModels/ProjectViewModel.cs b/...BecomeInternal/Models/ProjectViewModel.cs → ...meInternal/ViewModels/ProjectViewModel.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ApplyToBecomeInternal.Models
+namespace ApplyToBecomeInternal.ViewModels
 {
 	public class ProjectViewModel
 	{

diff --git a/...comeInternal/Models/Shared/SubMenuPage.cs → ...oBecomeInternal/ViewModels/SubMenuPage.cs b/...comeInternal/Models/Shared/SubMenuPage.cs → ...oBecomeInternal/ViewModels/SubMenuPage.cs
@@ -1,4 +1,4 @@
-namespace ApplyToBecomeInternal.Models.Shared
+namespace ApplyToBecomeInternal.ViewModels
 {
 	public enum SubMenuPage
 	{

diff --git a/...nternal/Models/Shared/SubMenuViewModel.cs → ...meInternal/ViewModels/SubMenuViewModel.cs b/...nternal/Models/Shared/SubMenuViewModel.cs → ...meInternal/ViewModels/SubMenuViewModel.cs
@@ -1,4 +1,4 @@
-namespace ApplyToBecomeInternal.Models.Shared
+namespace ApplyToBecomeInternal.ViewModels
 {
 	public class SubMenuViewModel
 	{

diff --git a/...ecomeInternal/Models/TaskListViewModel.cs → ...eInternal/ViewModels/TaskListViewModel.cs b/...ecomeInternal/Models/TaskListViewModel.cs → ...eInternal/ViewModels/TaskListViewModel.cs
@@ -1,6 +1,6 @@
-using ApplyToBecomeInternal.Models.Shared;
+using ApplyToBecomeInternal.Models.Navigation;
 
-namespace ApplyToBecomeInternal.Models
+namespace ApplyToBecomeInternal.ViewModels
 {
 	public class TaskListViewModel
 	{

diff --git a/ApplyToBecomeInternal/ApplyToBecomeInternal/Views/ApplicationForm/Index.cshtml b/ApplyToBecomeInternal/ApplyToBecomeInternal/Views/ApplicationForm/Index.cshtml
@@ -1,4 +1,4 @@
-@model ApplicationFormViewModel;
+@model ApplyToBecomeInternal.ViewModels.ApplicationFormViewModel;
 @{
 	ViewData["Title"] = "Application Form";
 }

diff --git a/ApplyToBecomeInternal/ApplyToBecomeInternal/Views/Error/Index.cshtml b/ApplyToBecomeInternal/ApplyToBecomeInternal/Views/Error/Index.cshtml
@@ -1,4 +1,4 @@
-@model ErrorViewModel
+@model ApplyToBecomeInternal.ViewModels.ErrorViewModel
 @{
 	ViewData["Title"] = "Error";
 }

diff --git a/ApplyToBecomeInternal/ApplyToBecomeInternal/Views/ProjectList/Index.cshtml b/ApplyToBecomeInternal/ApplyToBecomeInternal/Views/ProjectList/Index.cshtml
@@ -1,4 +1,4 @@
-@model ProjectListViewModel
+@model ApplyToBecomeInternal.ViewModels.ProjectListViewModel
 @{
 	ViewData["Title"] = "Project list";
 }

diff --git a/ApplyToBecomeInternal/ApplyToBecomeInternal/Views/ProjectNotes/Index.cshtml b/ApplyToBecomeInternal/ApplyToBecomeInternal/Views/ProjectNotes/Index.cshtml
@@ -1,4 +1,4 @@
-@model ProjectNotesViewModel;
+@model ApplyToBecomeInternal.ViewModels.ProjectNotesViewModel;
 @{
 	ViewData["Title"] = "Project Notes";
 }

diff --git a/ApplyToBecomeInternal/ApplyToBecomeInternal/Views/ProjectNotes/NewNote.cshtml b/ApplyToBecomeInternal/ApplyToBecomeInternal/Views/ProjectNotes/NewNote.cshtml
@@ -1,4 +1,4 @@
-@model ApplyToBecomeInternal.Models.NewProjectNoteViewModel;
+@model ApplyToBecomeInternal.ViewModels.NewProjectNoteViewModel;
 
 <div class="govuk-grid-row">
 	<div class="govuk-grid-column-full">

diff --git a/ApplyToBecomeInternal/ApplyToBecomeInternal/Views/Shared/_Navigation.cshtml b/ApplyToBecomeInternal/ApplyToBecomeInternal/Views/Shared/_Navigation.cshtml
@@ -1,4 +1,3 @@
-@using ApplyToBecomeInternal.Models.Shared
-@model NavigationViewModel;
+@model ApplyToBecomeInternal.Models.Navigation.NavigationViewModel;
 
 <a href="@Model.Url" class="govuk-back-link">@Model.Content</a>
diff --git a/ApplyToBecomeInternal/ApplyToBecomeInternal/Views/Shared/_ProjectHeader.cshtml b/ApplyToBecomeInternal/ApplyToBecomeInternal/Views/Shared/_ProjectHeader.cshtml
@@ -1,4 +1,4 @@
-@model ProjectViewModel
+@model ApplyToBecomeInternal.ViewModels.ProjectViewModel
 
 <span class="govuk-caption-xl">@Model.SchoolURN</span>
 <h1 class="govuk-heading-xl govuk-!-margin-bottom-4">

diff --git a/ApplyToBecomeInternal/ApplyToBecomeInternal/Views/Shared/_SubMenu.cshtml b/ApplyToBecomeInternal/ApplyToBecomeInternal/Views/Shared/_SubMenu.cshtml
@@ -1,5 +1,5 @@
-@using ApplyToBecomeInternal.Models.Shared
-@model SubMenuViewModel;
+@using ApplyToBecomeInternal.ViewModels
+@model ApplyToBecomeInternal.ViewModels.SubMenuViewModel;
 
 <nav class="moj-sub-navigation" aria-label="Sub navigation">
 	<ul class="moj-sub-navigation__list">

diff --git a/ApplyToBecomeInternal/ApplyToBecomeInternal/Views/TaskList/Index.cshtml b/ApplyToBecomeInternal/ApplyToBecomeInternal/Views/TaskList/Index.cshtml
@@ -1,4 +1,4 @@
-@model TaskListViewModel;
+@model ApplyToBecomeInternal.ViewModels.TaskListViewModel;
 @{
 	ViewData["Title"] = "Task List";
 }