-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #527 from hmrc/SASS-9947
SASS-9763: Adjustments section: Create 'Have you finished this section' page
- Loading branch information
Showing
9 changed files
with
465 additions
and
3 deletions.
There are no files selected for viewing
95 changes: 95 additions & 0 deletions
95
app/controllers/foreign/adjustments/ForeignAdjustmentsCompleteController.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| /* | ||
| * Copyright 2025 HM Revenue & Customs | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package controllers.foreign.adjustments | ||
|
|
||
| import controllers.ControllerUtils.statusForPage | ||
| import controllers.actions._ | ||
| import controllers.statusError | ||
| import forms.foreign.adjustments.ForeignAdjustmentsCompleteFormProvider | ||
| import models.JourneyPath.ForeignPropertyAdjustments | ||
| import models.{JourneyContext, NormalMode} | ||
| import navigation.ForeignPropertyNavigator | ||
| import pages.foreign.adjustments.ForeignAdjustmentsCompletePage | ||
| import play.api.i18n.{I18nSupport, MessagesApi} | ||
| import play.api.mvc.{Action, AnyContent, MessagesControllerComponents} | ||
| import repositories.SessionRepository | ||
| import service.JourneyAnswersService | ||
| import uk.gov.hmrc.play.bootstrap.frontend.controller.FrontendBaseController | ||
| import views.html.foreign.adjustments.ForeignAdjustmentsCompleteView | ||
|
|
||
| import javax.inject.Inject | ||
| import scala.concurrent.{ExecutionContext, Future} | ||
|
|
||
| class ForeignAdjustmentsCompleteController @Inject()( | ||
| override val messagesApi: MessagesApi, | ||
| sessionRepository: SessionRepository, | ||
| foreignPropertyNavigator: ForeignPropertyNavigator, | ||
| identify: IdentifierAction, | ||
| getData: DataRetrievalAction, | ||
| requireData: DataRequiredAction, | ||
| journeyAnswersService: JourneyAnswersService, | ||
| formProvider: ForeignAdjustmentsCompleteFormProvider, | ||
| val controllerComponents: MessagesControllerComponents, | ||
| view: ForeignAdjustmentsCompleteView | ||
| )(implicit ec: ExecutionContext) | ||
| extends FrontendBaseController with I18nSupport { | ||
|
|
||
| val form = formProvider() | ||
|
|
||
| def onPageLoad(taxYear: Int, countryCode: String): Action[AnyContent] = (identify andThen getData andThen requireData) { | ||
| implicit request => | ||
| val preparedForm = request.userAnswers.get(ForeignAdjustmentsCompletePage(countryCode)) match { | ||
| case None => form | ||
| case Some(value) => form.fill(value) | ||
| } | ||
|
|
||
| Ok(view(preparedForm, NormalMode, taxYear, countryCode)) | ||
| } | ||
|
|
||
| def onSubmit(taxYear: Int, countryCode: String): Action[AnyContent] = (identify andThen getData andThen requireData).async { | ||
| implicit request => | ||
| form | ||
| .bindFromRequest() | ||
| .fold( | ||
| formWithErrors => Future.successful(BadRequest(view(formWithErrors, NormalMode, taxYear, countryCode))), | ||
| value => | ||
| for { | ||
| updatedAnswers <- Future.fromTry(request.userAnswers.set(ForeignAdjustmentsCompletePage(countryCode), value)) | ||
| _ <- sessionRepository.set(updatedAnswers) | ||
| status <- journeyAnswersService.setStatus( | ||
| ctx = JourneyContext( | ||
| taxYear = taxYear, | ||
| mtditid = request.user.mtditid, | ||
| nino = request.user.nino, | ||
| journeyPath = ForeignPropertyAdjustments | ||
| ), | ||
| status = statusForPage(value), | ||
| user = request.user | ||
| ) | ||
| } yield status.fold( | ||
| _ => | ||
| //TODO: When we implement navigation story, update the route to show message from backend or error | ||
| Redirect(controllers.routes.SummaryController.show(taxYear) | ||
| ), | ||
| _ => | ||
| Redirect( | ||
| foreignPropertyNavigator.nextPage(ForeignAdjustmentsCompletePage(countryCode), taxYear, NormalMode, request.userAnswers, updatedAnswers) | ||
| ) | ||
| ) | ||
| ) | ||
| } | ||
| } |
30 changes: 30 additions & 0 deletions
30
app/forms/foreign/adjustments/ForeignAdjustmentsCompleteFormProvider.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| /* | ||
| * Copyright 2025 HM Revenue & Customs | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package forms.foreign.adjustments | ||
|
|
||
| import forms.mappings.Mappings | ||
| import play.api.data.Form | ||
|
|
||
| import javax.inject.Inject | ||
|
|
||
| class ForeignAdjustmentsCompleteFormProvider @Inject() extends Mappings { | ||
|
|
||
| def apply(): Form[Boolean] = | ||
| Form( | ||
| "foreignAdjustmentsCompleteYesOrNo" -> boolean("haveYouFinishedThisSection.error.required") | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
app/pages/foreign/adjustments/ForeignAdjustmentsCompletePage.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| /* | ||
| * Copyright 2025 HM Revenue & Customs | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package pages.foreign.adjustments | ||
|
|
||
| import models.ForeignProperty | ||
| import pages.PageConstants.adjustmentsPath | ||
| import pages.QuestionPage | ||
| import play.api.libs.json.JsPath | ||
|
|
||
| case class ForeignAdjustmentsCompletePage(countryCode: String) extends QuestionPage[Boolean] { | ||
|
|
||
| override def path: JsPath = JsPath \ adjustmentsPath(ForeignProperty) \ countryCode.toUpperCase \ toString | ||
|
|
||
| override def toString: String = "foreignAdjustmentsComplete" | ||
| } |
52 changes: 52 additions & 0 deletions
52
app/views/foreign/adjustments/ForeignAdjustmentsCompleteView.scala.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| @* | ||
| * Copyright 2025 HM Revenue & Customs | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| *@ | ||
|
|
||
| @import controllers.foreign.adjustments.routes._ | ||
| @import viewmodels.LegendSize | ||
|
|
||
| @this( | ||
| layout: templates.Layout, | ||
| formHelper: FormWithCSRF, | ||
| govukErrorSummary: GovukErrorSummary, | ||
| govukRadios: GovukRadios, | ||
| govukButton: GovukButton | ||
| ) | ||
|
|
||
|
|
||
| @(form: Form[_], mode: Mode, taxYear: Int, countryCode: String)(implicit request: Request[_], messages: Messages) | ||
|
|
||
| @layout(pageTitle = title(form, messages("haveYouFinishedThisSection.title"))) { | ||
| @formHelper(action = ForeignAdjustmentsCompleteController.onSubmit(taxYear, countryCode), Symbol("autoComplete") -> "off") { | ||
| @if(form.errors.nonEmpty) { | ||
| @govukErrorSummary(ErrorSummaryViewModel(form)) | ||
| } | ||
|
|
||
| @govukRadios( | ||
| RadiosViewModel.yesNo( | ||
| field = form("foreignAdjustmentsCompleteYesOrNo"), | ||
| legend = LegendViewModel(messages("haveYouFinishedThisSection.heading")).asPageHeading(LegendSize.Large) | ||
| ).withHint(HintViewModel(messages("haveYouFinishedThisSection.hint"))) | ||
| ) | ||
|
|
||
| @govukButton( | ||
| ButtonViewModel(messages("site.continue")).withId("continue").preventingDoubleClick() | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @{ | ||
| // $COVERAGE-OFF$ | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.