remove nhs and gpo forms

This commit is contained in:
stvnrlly
2022-09-13 13:20:54 +00:00
parent 0db9653638
commit 7b51d1e7a6
4 changed files with 30 additions and 127 deletions

View File

@@ -45,10 +45,9 @@ def _create_example_template(service_id):
@user_is_logged_in
@user_is_gov_user
def add_service():
# default_organisation_type = current_user.default_organisation_type
default_organisation_type = 'central'
default_organisation_type = current_user.default_organisation_type
form = CreateServiceForm(
organisation_type=default_organisation_type
# organisation_type=default_organisation_type
)
if form.validate_on_submit():

View File

@@ -17,8 +17,6 @@ from app import (
)
from app.main import main
from app.main.forms import (
AddGPOrganisationForm,
AddNHSLocalOrganisationForm,
AdminBillingDetailsForm,
AdminNewOrganisationForm,
AdminNotesForm,
@@ -81,62 +79,6 @@ def add_organisation():
)
@main.route('/services/<uuid:service_id>/add-gp-organisation', methods=['GET', 'POST'])
@user_has_permissions('manage_service')
def add_organisation_from_gp_service(service_id):
if (not current_service.organisation_type == Organisation.TYPE_NHS_GP) or current_service.organisation:
abort(403)
form = AddGPOrganisationForm(service_name=current_service.name)
if form.validate_on_submit():
Organisation.create(
form.get_organisation_name(),
crown=False,
organisation_type='nhs_gp',
agreement_signed=False,
).associate_service(
service_id
)
return redirect(url_for(
'.service_agreement',
service_id=service_id,
))
return render_template(
'views/organisations/add-gp-organisation.html',
form=form
)
@main.route('/services/<uuid:service_id>/add-nhs-local-organisation', methods=['GET', 'POST'])
@user_has_permissions('manage_service')
def add_organisation_from_nhs_local_service(service_id):
if (not current_service.organisation_type == Organisation.TYPE_NHS_LOCAL) or current_service.organisation:
abort(403)
form = AddNHSLocalOrganisationForm(organisation_choices=[
(organisation.id, organisation.name)
for organisation in sorted(AllOrganisations())
if organisation.organisation_type == Organisation.TYPE_NHS_LOCAL
])
search_form = SearchByNameForm()
if form.validate_on_submit():
Organisation.from_id(form.organisations.data).associate_service(service_id)
return redirect(url_for(
'.service_agreement',
service_id=service_id,
))
return render_template(
'views/organisations/add-nhs-local-organisation.html',
form=form,
search_form=search_form,
)
@main.route("/organisations/<uuid:org_id>", methods=['GET'])
@user_has_permissions()
def organisation_dashboard(org_id):