diff --git a/app/blueprints/fund_builder/forms/round.py b/app/blueprints/fund_builder/forms/round.py index 90d41186..5b60594b 100644 --- a/app/blueprints/fund_builder/forms/round.py +++ b/app/blueprints/fund_builder/forms/round.py @@ -92,7 +92,7 @@ class RoundForm(FlaskForm): application_reminder_sent = RadioField(choices=[("true", "Yes"), ("false", "No")], default="false") contact_us_banner_json = TextAreaField("Contact Us Banner") reference_contact_page_over_email = RadioField( - "Reference contact page over emai", choices=[("true", "Yes"), ("false", "No")], default="false" + "Reference contact page over email", choices=[("true", "Yes"), ("false", "No")], default="false" ) contact_email = StringField("Contact Email", validators=[DataRequired()]) contact_phone = StringField("Contact Phone", validators=[DataRequired()]) diff --git a/app/blueprints/fund_builder/templates/fund.html b/app/blueprints/fund_builder/templates/fund.html index 5406d986..dcff26d1 100644 --- a/app/blueprints/fund_builder/templates/fund.html +++ b/app/blueprints/fund_builder/templates/fund.html @@ -1,11 +1,12 @@ {% extends "base.html" %} +{% set pageHeading %}{{ 'Update a Fund' if fund_id else 'Create a Fund' }} {% endset %} {% from "macros/wtfToGovUk.html" import input %} {% from "macros/wtfToGovUk.html" import yes_no %} {%- from "govuk_frontend_jinja/components/button/macro.html" import govukButton -%} {% block content %}
-

{{ 'Update a Fund' if fund_id else 'Create a Fund' }}

+

{{pageHeading}}

diff --git a/app/blueprints/fund_builder/templates/fund_config.html b/app/blueprints/fund_builder/templates/fund_config.html index a5192dcb..fe4bb9d1 100644 --- a/app/blueprints/fund_builder/templates/fund_config.html +++ b/app/blueprints/fund_builder/templates/fund_config.html @@ -1,4 +1,7 @@ {% extends "base.html" %} +{% set pageHeading %} + Fund Settings +{% endset %} {%- from "govuk_frontend_jinja/components/button/macro.html" import govukButton -%} {%- from "govuk_frontend_jinja/components/accordion/macro.html" import govukAccordion -%} {%- from "govuk_frontend_jinja/components/summary-list/macro.html" import govukSummaryList -%} @@ -6,7 +9,7 @@ {% block content %}
-

Fund Settings

+

{{ pageHeading }}

{{ govukSelect({ "id": "fund_id", diff --git a/app/blueprints/fund_builder/templates/round.html b/app/blueprints/fund_builder/templates/round.html index 7835e636..26ca0dab 100644 --- a/app/blueprints/fund_builder/templates/round.html +++ b/app/blueprints/fund_builder/templates/round.html @@ -1,4 +1,6 @@ {% extends "base.html" %} +{% set pageHeading %}{{ 'Update a Round' if round_id else 'Create a Round' }}{% endset %} + {% from "macros/wtfToGovUk.html" import input %} {% from "macros/wtfToGovUk.html" import dateinput %} {% from "macros/wtfToGovUk.html" import multilineinput %} @@ -8,7 +10,7 @@ {% block content %}
-

{{ 'Update a Round' if round_id else 'Create a Round' }}

+

{{ pageHeading }}

diff --git a/app/blueprints/fund_builder/templates/section.html b/app/blueprints/fund_builder/templates/section.html index 0ec0ec15..bb48991f 100644 --- a/app/blueprints/fund_builder/templates/section.html +++ b/app/blueprints/fund_builder/templates/section.html @@ -1,4 +1,10 @@ {% extends "base.html" %} +{% set pageHeading %} + {% if form.section_id.data %} + Update + {% else %} + Create{% endif %} Section +{% endset %} {% from "macros/wtfToGovUk.html" import input %} {% from "macros/wtfToGovUk.html" import yes_no %} {%- from "govuk_frontend_jinja/components/button/macro.html" import govukButton -%} @@ -6,12 +12,7 @@ {% block content %}
-

- {% if form.section_id.data %} - Update - {% else %} - Create{% endif %} Section -

+

{{ pageHeading }}

Section Name

diff --git a/app/blueprints/fund_builder/templates/view_assessment_config.html b/app/blueprints/fund_builder/templates/view_assessment_config.html index 60b84ec4..552e60cb 100644 --- a/app/blueprints/fund_builder/templates/view_assessment_config.html +++ b/app/blueprints/fund_builder/templates/view_assessment_config.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% set pageHeading %}View Full Assessment Config {% endset %} {%- from "govuk_frontend_jinja/components/button/macro.html" import govukButton -%} {%- from "govuk_frontend_jinja/components/accordion/macro.html" import govukAccordion -%} {%- from "govuk_frontend_jinja/components/summary-list/macro.html" import govukSummaryList -%} @@ -6,7 +7,7 @@ {% block content %}
-

View Full Assessment Config

+

{{ pageHeading }}

{{ fund.short_name }} - {{ round.short_name }}

diff --git a/app/blueprints/self_serve/templates/create_form.html b/app/blueprints/self_serve/templates/create_form.html index 9ebeef5e..66edb1a0 100644 --- a/app/blueprints/self_serve/templates/create_form.html +++ b/app/blueprints/self_serve/templates/create_form.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% set pageHeading %}Create Application Form{% endset %} {%- from "govuk_frontend_jinja/components/input/macro.html" import govukInput -%} {%- from "govuk_frontend_jinja/components/textarea/macro.html" import govukTextarea -%} @@ -6,7 +7,7 @@ {% block content %}
-

Create Application Form

+

{{ pageHeading }}

diff --git a/app/blueprints/self_serve/templates/create_page.html b/app/blueprints/self_serve/templates/create_page.html index 6b73cb5d..c4304296 100644 --- a/app/blueprints/self_serve/templates/create_page.html +++ b/app/blueprints/self_serve/templates/create_page.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% set pageHeading %}Build Form Page{% endset %} {%- from "govuk_frontend_jinja/components/input/macro.html" import govukInput -%} {%- from "govuk_frontend_jinja/components/textarea/macro.html" import govukTextarea -%} @@ -6,7 +7,7 @@ {% block content %}
-

Build Form Page

+

{{ pageHeading }}

diff --git a/app/blueprints/self_serve/templates/create_question.html b/app/blueprints/self_serve/templates/create_question.html index 1c73fec6..eb30fed5 100644 --- a/app/blueprints/self_serve/templates/create_question.html +++ b/app/blueprints/self_serve/templates/create_question.html @@ -1,4 +1,5 @@ {% extends "base.html" %} + {%- from "govuk_frontend_jinja/components/button/macro.html" import govukButton -%} {%- from "govuk_frontend_jinja/components/input/macro.html" import govukInput -%} {% from "govuk_frontend_jinja/components/radios/macro.html" import govukRadios %} diff --git a/app/blueprints/self_serve/templates/create_section.html b/app/blueprints/self_serve/templates/create_section.html index d79fd61f..8ff4b841 100644 --- a/app/blueprints/self_serve/templates/create_section.html +++ b/app/blueprints/self_serve/templates/create_section.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% set pageHeading %}Build Section{% endset %} {%- from "govuk_frontend_jinja/components/input/macro.html" import govukInput -%} {%- from "govuk_frontend_jinja/components/textarea/macro.html" import govukTextarea -%} @@ -6,7 +7,7 @@ {% block content %}
-

Build Section

+

{{ pageHeading }}

diff --git a/app/create_app.py b/app/create_app.py index 0d4254de..447575aa 100644 --- a/app/create_app.py +++ b/app/create_app.py @@ -1,5 +1,6 @@ from flask import Flask from flask_assets import Environment +from fsd_utils.logging import logging from jinja2 import ChoiceLoader from jinja2 import PackageLoader from jinja2 import PrefixLoader @@ -11,7 +12,6 @@ from app.blueprints.templates.routes import template_bp from app.db.models import Fund # noqa:F401 from app.db.models import Round # noqa:F401 -from fsd_utils.logging import logging def create_app() -> Flask: diff --git a/app/db/queries/fund.py b/app/db/queries/fund.py index bd602f78..6dd6b432 100644 --- a/app/db/queries/fund.py +++ b/app/db/queries/fund.py @@ -1,9 +1,9 @@ +from flask import current_app from sqlalchemy import select from app.db import db from app.db.models.fund import Fund from app.db.models.fund import Organisation -from flask import current_app def add_organisation(organisation: Organisation) -> Organisation: diff --git a/app/db/queries/round.py b/app/db/queries/round.py index af053b4c..25616f34 100644 --- a/app/db/queries/round.py +++ b/app/db/queries/round.py @@ -1,8 +1,8 @@ +from flask import current_app from sqlalchemy import select from app.db import db from app.db.models.round import Round -from flask import current_app def add_round(round: Round) -> Round: diff --git a/copilot/fsd-fund-application-builder/manifest.yml b/copilot/fsd-fund-application-builder/manifest.yml index 78384db9..46b88b2b 100644 --- a/copilot/fsd-fund-application-builder/manifest.yml +++ b/copilot/fsd-fund-application-builder/manifest.yml @@ -51,7 +51,8 @@ variables: AUTHENTICATOR_HOST: "https://authenticator.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk" COOKIE_DOMAIN: ".test.levellingup.gov.uk" FLASK_ENV: ${COPILOT_ENVIRONMENT_NAME} - FORMS_SERVICE_PUBLIC_HOST: "https://forms.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk" + FORM_RUNNER_EXTERNAL_HOST: "https://forms.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk" + FORM_RUNNER_INTERNAL_HOST: "http://fsd-form-runner-adapter:3009" FUND_STORE_API_HOST: "http://fsd-fund-store:8080" NOTIFICATION_SERVICE_HOST: http://fsd-notification:8080 MAINTENANCE_MODE: false