trustchain-oc1-orchestral
/
devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add new view for search phid

This commit is contained in:
Cayo Puigdefabregas 2022-08-12 15:59:15 +02:00
parent 1e5254d7d3
commit ae4ea03b49
2 changed files with 30 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ereuse_devicehub/inventory/views.py
View File

@ -148,15 +148,37 @@ class DeviceDetailView(GenericMixin):
.one()
)
form_binding = BindingForm(device=device)
self.context.update(
{
'device': device,
'placeholder': device.binding or device.placeholder,
'page_title': 'Device {}'.format(device.devicehub_id),
}
)
return flask.render_template(self.template_name, **self.context)
class BindingSearchView(GenericMixin):
methods = ['GET', 'POST']
decorators = [login_required]
template_name = 'inventory/binding_search.html'
def dispatch_request(self, dhid):
self.get_context()
device = (
Device.query.filter(Device.owner_id == current_user.id)
.filter(Device.devicehub_id == dhid)
.one()
)
form_binding = BindingForm(device=device)
self.context.update(
{
'page_title': 'Search a Device for to do a binding from {}'.format(device.devicehub_id),
'form_binding': form_binding,
'active_binding': False,
'device': device
}
)
@ -167,8 +189,6 @@ class DeviceDetailView(GenericMixin):
phid=form_binding.placeholder.phid,
)
return flask.redirect(next_url)
elif form_binding.phid.data:
self.context['active_binding'] = True
return flask.render_template(self.template_name, **self.context)
@ -1227,3 +1247,6 @@ devices.add_url_rule(
devices.add_url_rule(
'/unbinding/<string:phid>/', view_func=UnBindingView.as_view('unbinding')
)
devices.add_url_rule(
'/<string:dhid>/binding/', view_func=BindingSearchView.as_view('binding_search')
)

41
ereuse_devicehub/templates/inventory/device_detail.html
View File

@ -21,7 +21,7 @@
<h3>{{ placeholder.device.devicehub_id }}</h3>
<div class="tab-pane active show mb-5">
{% if placeholder.status in ['Abstract', 'Real'] %}
<a type="button" href="{{ url_for('inventory.unbinding', phid=placeholder.phid) }}" class="btn btn-primary" style="float: right; margin-right: 15px;">
<a type="button" href="{{ url_for('inventory.binding_search', dhid=placeholder.device.devicehub_id) }}" class="btn btn-primary" style="float: right; margin-right: 15px;">
Binding
</a>
{% elif placeholder.status == 'Twin' %}
@ -61,7 +61,7 @@
</ul>
<div class="tab-content pt-2">
<div class="tab-pane fade {% if active_binding %}profile-overview{% else %}show active{% endif %}" id="details">
<div class="tab-pane fade show active" id="details">
<h5 class="card-title">Details Real parth</h5>
<div class="row mb-3">
<div class="col-lg-3 col-md-4 label ">
@ -232,43 +232,6 @@
</div>
{% endif %}
</div>
{% if placeholder.status %}
<div class="tab-pane fade {% if active_binding %}show active{% else %}profile-overview{% endif %}" id="binding">
<h5 class="card-title">Binding</h5>
<div class="list-group col-6">
<p>
Be careful, binding implies changes in the data of a device that affect its
traceability.
</p>
</div>
<div class="list-group col-6">
<form action="{{ url_for('inventory.device_details', id=placeholder.device.devicehub_id) }}" method="post">
{{ form_binding.csrf_token }}
{% for field in form_binding %}
{% if field != form_binding.csrf_token %}
<div class="col-12">
{{ field.label(class_="form-label") }}:
{{ field }}
{% if field.errors %}
<p class="text-danger">
{% for error in field.errors %}
{{ error }}<br/>
{% endfor %}
</p>
{% endif %}
</div>
{% endif %}
{% endfor %}
<div class="col-12 mt-2">
<input type="submit" class="btn btn-primary" value="Search" />
</div>
</form>
</div>
</div>
{% endif %}
</div>
</div>
</div>