artin/API-Manager
1
0
Fork 0
mirror of https://github.com/OpenBankProject/API-Manager.git synced 2026-02-06 11:37:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #81 from PengfeiLi0218/master

Browse Source 
branch update api
This commit is contained in:
Simon Redfern 2019-02-15 12:05:11 +01:00 committed by GitHub
commit 6799272380
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 86 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apimanager/branches/templates/branches/index.html
View File

@ -128,6 +128,23 @@
</div>
</div>
<div class="row">
<div class="col-xs-12 col-sm-4">
{% if form.lobby.errors %}<div class="alert alert-danger">{{ form.lobby.errors }}</div>{% endif %}
<div class="form-group">
{{ form.lobby.label_tag }}
{{ form.lobby }}
</div>
</div>
<div class="col-xs-12 col-sm-4">
{% if form.drive_up.errors %}<div class="alert alert-danger">{{ form.drive_up.errors }}</div>{% endif %}
<div class="form-group">
{{ form.drive_up.label_tag }}
{{ form.drive_up }}
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12 hidden-xs">
<div class="form-group">

58
apimanager/branches/templates/branches/update.html
View File

@ -129,7 +129,65 @@
</div>
</div>
<div class="row">
<div class="col-xs-12 col-sm-4">
{% if form.branch_routing_scheme.errors %}<div class="alert alert-danger">{{ form.branch_routing_scheme.errors }}</div>{% endif %}
<div class="form-group">
{{ form.branch_routing_scheme.label_tag }}
{{ form.branch_routing_scheme }}
</div>
</div>
<div class="col-xs-12 col-sm-4">
{% if form.branch_routing_address.errors %}<div class="alert alert-danger">{{ form.branch_routing_address.errors }}</div>{% endif %}
<div class="form-group">
{{ form.branch_routing_address.label_tag }}
{{ form.branch_routing_address }}
</div>
</div>
<div class="col-xs-12 col-sm-4">
{% if form.is_accessible.errors %}<div class="alert alert-danger">{{ form.is_accessible.errors }}</div>{% endif %}
<div class="form-group">
{{ form.is_accessible.label_tag }}
{{ form.is_accessible }}
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12 col-sm-4">
{% if form.branch_type.errors %}<div class="alert alert-danger">{{ form.branch_type.errors }}</div>{% endif %}
<div class="form-group">
{{ form.branch_type.label_tag }}
{{ form.branch_type }}
</div>
</div>
<div class="col-xs-12 col-sm-4">
{% if form.more_info.errors %}<div class="alert alert-danger">{{ form.more_info.errors }}</div>{% endif %}
<div class="form-group">
{{ form.more_info.label_tag }}
{{ form.more_info }}
</div>
</div>
<div class="col-xs-12 col-sm-4">
{% if form.phone_number.errors %}<div class="alert alert-danger">{{ form.phone_number.errors }}</div>{% endif %}
<div class="form-group">
{{ form.phone_number.label_tag }}
{{ form.phone_number }}
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12 col-sm-4">
{% if form.accessibleFeatures.errors %}<div class="alert alert-danger">{{ form.accessibleFeatures.errors }}</div>{% endif %}
<div class="form-group">
{{ form.accessibleFeatures.label_tag }}
{{ form.accessibleFeatures }}
</div>
</div>
<div class="col-xs-12 col-sm-4">
{% if form.lobby.errors %}<div class="alert alert-danger">{{ form.lobby.errors }}</div>{% endif %}
<div class="form-group">

12
apimanager/branches/views.py
View File

@ -241,6 +241,7 @@ class UpdateBranchesView(LoginRequiredMixin, FormView):
urlpath = "/banks/{}/branches/{}".format(self.kwargs['bank_id'], self.kwargs['branch_id'])
try:
fields['bank_id'].choices = self.api.get_bank_id_choices()
fields['is_accessible'].choices = [('', 'Choose...'), (True, True), (False, False)]
except APIError as err:
messages.error(self.request, err)
except:
@ -305,7 +306,16 @@ class UpdateBranchesView(LoginRequiredMixin, FormView):
}
},
"lobby": data["lobby"],
"drive_up": data["drive_up"]
"drive_up": data["drive_up"],
"branch_routing": {
"scheme": data["branch_routing_scheme"] if data["branch_routing_scheme"] != "" else "license name",
"address": data["branch_routing_address"] if data["branch_routing_address"] != "" else "license name"
},
"is_accessible": data["is_accessible"],
"accessibleFeatures": data["accessibleFeatures"],
"branch_type": data["branch_type"],
"more_info": data["more_info"],
"phone_number": data["phone_number"]
}
try:
result = self.api.put(urlpath, payload=payload)