Feature/bug 502 (#274)

* updated code to hide Dashboard and Notification nav link until user has organisation registered, able to register organisation for user now

* Switched controller for contactDetails from UserDetails to Organisation

Author: SushreeM-DESNZ

HNTAS/HNTAS.Web.UI/Controllers/OrganisationController.cs

@@ -393,10 +393,10 @@ public IActionResult ContactDetails()
             var orgModel = _sessionHelper.GetFromSession<OrganisationModel>(HttpContext, SessionKeys.OrganisationCreation_SessionKey);
             var userModel = _sessionHelper.GetFromSession<UserModel>(HttpContext, SessionKeys.UserCreation_SessionKey);
             this.ShowBackButton("DeedPoll");
-            ViewBag.NextActionController = "UserDetails";
-            return View("UserDetails/ContactDetails", userModel.ContactDetails);
+            return View(userModel.ContactDetails);
         }
 
+        // not in use
         [HttpPost]
         [ValidateAntiForgeryToken]
         [ServiceFilter(typeof(EnsureSessionForOrganisationFlowOnPostAttribute))]
@@ -460,9 +460,7 @@ public IActionResult CheckYourAnswers()
                 Organisation = organisationModel,
                 User = userModel,
                 ConfirmDeclaration = false
-            };
-
-            //ViewBag.ShowBackButton = false;
+            };            
 
             // Set the flow state to Check Answers mode
             _sessionHelper.SetIsCheckAnswerFlow(HttpContext, true);

HNTAS/HNTAS.Web.UI/Models/CheckYourAnswersModel.cs

@@ -17,6 +17,6 @@ public class CheckYourAnswersModel
         // The ConfirmedDeclaration property, now part of this specific ViewModel
         [Display(Name = "I confirm that")]
         [Range(typeof(bool), "true", "true", ErrorMessage = "You must confirm the declaration to proceed.")]
-        public bool ConfirmDeclaration { get; set; }
+        public bool ConfirmDeclaration { get; set; } = true;
     }
 }

HNTAS/HNTAS.Web.UI/Views/Organisation/CheckYourAnswers.cshtml

@@ -36,7 +36,8 @@
 }
 
 <div class="govuk-width-container">
-    <main class="govuk-main-wrapper" id="main-content" role="main">
+    <div class="govuk-grid-row">
+        <div class="govuk-grid-column-two-thirds">        
         <h1 class="govuk-heading-l">Check your answers before submitting</h1>
 
         <form asp-controller="Organisation" asp-action="SubmitAnswers" method="post" novalidate>
@@ -93,13 +94,13 @@
                     <dd class="govuk-summary-list__actions">
                         @if (!string.IsNullOrEmpty(organisationModel.CompanyNumber))
                         {
-                             <a class="govuk-link" href="@Url.Action("CompanyNumber")">Change<span class="govuk-visually-hidden"> company number</span></a>
+                                <a class="govuk-link" href="@Url.Action("CompanyNumber")">Change<span class="govuk-visually-hidden"> company number</span></a>
                         }
                         else
                         {
-                             <a class="govuk-link" href="@Url.Action("OrganisationAddress")">Change<span class="govuk-visually-hidden"> company number</span></a>
+                                <a class="govuk-link" href="@Url.Action("OrganisationAddress")">Change<span class="govuk-visually-hidden"> company number</span></a>
                         }
-                     </dd>
+                        </dd>
                 </div>
             </dl>
 
@@ -144,8 +145,8 @@
                 </div>
             </dl>
 
-            <h2 class="govuk-heading-m">Declaration</h2>
-            <div class="govuk-form-group @(hasDeclarationErrors ? "govuk-form-group--error" : "")">
+            @* <h2 class="govuk-heading-m">Declaration</h2> *@
+            @* <div class="govuk-form-group @(hasDeclarationErrors ? "govuk-form-group--error" : "")">
                 <fieldset class="govuk-fieldset" aria-describedby="@(hasDeclarationErrors ? "confirmDeclaration-error" : "")">
                     <legend class="govuk-fieldset__legend govuk-fieldset__legend--s">
                         <h1 class="govuk-fieldset__heading">Tick to confirm:</h1>
@@ -160,10 +161,10 @@
                     <div class="govuk-checkboxes govuk-checkboxes--small" data-module="govuk-checkboxes">
                         <div class="govuk-checkboxes__item">
                             <input class="govuk-checkboxes__input"
-                                   id="@fieldName"
-                                   asp-for="ConfirmDeclaration"
-                                   type="checkbox"
-                                   value="true">
+                                    id="@fieldName"
+                                    asp-for="ConfirmDeclaration"
+                                    type="checkbox"
+                                    value="true">
                             <label class="govuk-label govuk-checkboxes__label" for="@fieldName">
                                 I confirm that:
                             </label>
@@ -174,11 +175,12 @@
 
             <ul class="govuk-list govuk-list--bullet">
                 <li>I have read and understood the digital form and guidance currently published on <a href="#" class="govuk-link">GOV.UK</a></li>
-            </ul>
+            </ul> *@
 
             <button type="submit" class="govuk-button" data-module="govuk-button">
-                Accept and send
+                Submit
             </button>
         </form>
-    </main>
+    </div>
+    </div>
 </div>