add tab for Hard drives without device
This commit is contained in:
Cayo Puigdefabregas
parent
d1eed13b0a
commit
a09e087b0e
|
|
@ -115,15 +115,19 @@ class DeviceListMixin(GenericMixin):
|
|||
class ErasureListView(DeviceListMixin):
|
||||
template_name = 'inventory/erasure_list.html'
|
||||
|
||||
def dispatch_request(self):
|
||||
def dispatch_request(self, orphans=0):
|
||||
self.get_context()
|
||||
self.get_devices()
|
||||
self.get_devices(orphans)
|
||||
if orphans:
|
||||
self.context['orphans'] = True
|
||||
return flask.render_template(self.template_name, **self.context)
|
||||
|
||||
def get_devices(self):
|
||||
def get_devices(self, orphans):
|
||||
erasure = EraseBasic.query.filter_by(author=g.user).order_by(
|
||||
EraseBasic.created.desc()
|
||||
)
|
||||
if orphans:
|
||||
erasure = [e for e in erasure if e.device.orphan]
|
||||
self.context['erasure'] = erasure
|
||||
|
||||
|
||||
|
|
@ -1452,3 +1456,7 @@ devices.add_url_rule(
|
|||
devices.add_url_rule(
|
||||
'/device/erasure/', view_func=ErasureListView.as_view('device_erasure_list')
|
||||
)
|
||||
devices.add_url_rule(
|
||||
'/device/erasure/<int:orphans>/',
|
||||
view_func=ErasureListView.as_view('device_erasure_list_orphans'),
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1326,6 +1326,19 @@ class DataStorage(JoinedComponentTableMixin, Component):
|
|||
except LookupError:
|
||||
return None
|
||||
|
||||
@property
|
||||
def orphan(self):
|
||||
if not self.parent:
|
||||
return True
|
||||
|
||||
if self.parent.placeholder and self.parent.placeholder.kangaroo:
|
||||
return True
|
||||
|
||||
if self.parent.binding and self.parent.binding.kangaroo:
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
|
||||
class HardDrive(DataStorage):
|
||||
pass
|
||||
|
|
|
|||
|
|
@ -21,33 +21,51 @@
|
|||
<ul class="nav nav-tabs nav-tabs-bordered">
|
||||
|
||||
<li class="nav-item">
|
||||
<button class="nav-link" data-bs-toggle="tab" data-bs-target="#details">General details</button>
|
||||
<a href="{{ url_for('inventory.device_erasure_list') }}" class="nav-link{% if not orphans %} active{% endif %}">
|
||||
All hard drivers
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ device.public_link }}" target="_blank">Web</a>
|
||||
</li>
|
||||
|
||||
<li class="nav-item">
|
||||
<button class="nav-link" data-bs-toggle="tab" data-bs-target="#lots">Lots</button>
|
||||
</li>
|
||||
|
||||
<li class="nav-item">
|
||||
<button class="nav-link" data-bs-toggle="tab" data-bs-target="#status">Status</button>
|
||||
</li>
|
||||
|
||||
<li class="nav-item">
|
||||
<button class="nav-link" data-bs-toggle="tab" data-bs-target="#traceability">Traceability log</button>
|
||||
</li>
|
||||
|
||||
<li class="nav-item">
|
||||
<button class="nav-link" data-bs-toggle="tab" data-bs-target="#components">Components</button>
|
||||
<a href="{{ url_for('inventory.device_erasure_list_orphans', orphans=1) }}" class="nav-link{% if orphans %} active{% endif %}">
|
||||
Hard drives without device
|
||||
</a>
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
<div class="tab-content pt-2">
|
||||
<div id="devices-list" class="tab-pane fade devices-list active show">
|
||||
<label class="btn btn-primary " for="SelectAllBTN"><input type="checkbox" id="SelectAllBTN" autocomplete="off"></label>
|
||||
{% if orphans %}
|
||||
<div class="btn-group dropdown ml-1">
|
||||
<button id="btnLots" type="button" onclick="processSelectedDevices()" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
|
||||
<i class="bi bi-folder2"></i>
|
||||
Lots
|
||||
<span class="caret"></span>
|
||||
</button>
|
||||
<span class="d-none" id="activeTradeModal" data-bs-toggle="modal" data-bs-target="#tradeLotModal"></span>
|
||||
|
||||
<ul class="dropdown-menu" aria-labelledby="btnLots" id="dropDownLotsSelector">
|
||||
<div class="row w-100">
|
||||
<div class="input-group mb-3 mx-2">
|
||||
<div class="input-group-prepend">
|
||||
<span class="input-group-text" id="basic-addon1"><i class="bi bi-search"></i></span>
|
||||
</div>
|
||||
<input type="text" class="form-control" id="lots-search" placeholder="search" aria-label="search" aria-describedby="basic-addon1">
|
||||
</div>
|
||||
</div>
|
||||
<h6 class="dropdown-header">Select lots where to store the selected devices</h6>
|
||||
<ul class="mx-3" id="LotsSelector"></ul>
|
||||
<li><hr /></li>
|
||||
<li>
|
||||
<a href="#" class="dropdown-item" id="ApplyDeviceLots">
|
||||
<i class="bi bi-check"></i>
|
||||
Apply
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="btn-group dropdown m-1" uib-dropdown="">
|
||||
<button id="btnExport" type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
|
||||
<i class="bi bi-reply"></i>
|
||||
|
|
@ -69,6 +87,27 @@
|
|||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
{% if orphans %}
|
||||
<div class="btn-group dropdown m-1" uib-dropdown="">
|
||||
<button id="btnTags" type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
|
||||
<i class="bi bi-tag"></i>
|
||||
Labels
|
||||
</button>
|
||||
<ul class="dropdown-menu" aria-labelledby="btnTags">
|
||||
<li>
|
||||
<form id="print_labels" method="post" action="{{ url_for('labels.print_labels') }}">
|
||||
{% for f in form_print_labels %}
|
||||
{{ f }}
|
||||
{% endfor %}
|
||||
<a href="javascript:$('#print_labels').submit()" class="dropdown-item">
|
||||
<i class="bi bi-printer"></i>
|
||||
Print labels
|
||||
</a>
|
||||
</form>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div class="tab-content pt-2">
|
||||
<table class="table">
|
||||
|
|
|
|||
Reference in New Issue