diff --git a/ereuse_devicehub/inventory/devices/views.py b/ereuse_devicehub/inventory/devices/views.py index 8646f09c..7b028145 100644 --- a/ereuse_devicehub/inventory/devices/views.py +++ b/ereuse_devicehub/inventory/devices/views.py @@ -1,22 +1,27 @@ import flask from flask import Blueprint from flask.views import View -from flask_login import login_required, login_user +from flask_login import login_required, current_user -from ereuse_devicehub.forms import LoginForm -from ereuse_devicehub.resources.user.models import User +from ereuse_devicehub.resources.device.models import Device from ereuse_devicehub.utils import is_safe_url -devices = Blueprint('devices', __name__) +devices = Blueprint('inventory.devices', __name__, url_prefix='/inventory') class DeviceListView(View): - # decorators = [login_required] + decorators = [login_required] template_name = 'inventory/device_list.html' def dispatch_request(self): - context = {} + # import pdb; pdb.set_trace() + filter_types = ['Desktop', 'Laptop', 'Server'] + devices = Device.query.filter( + Device.owner_id==current_user.id).filter( + Device.type.in_(filter_types)) + + context = {'devices': devices} return flask.render_template(self.template_name, **context) -devices.add_url_rule('/inventory/device/list/', view_func=DeviceListView.as_view('devicelist')) +devices.add_url_rule('/device/list/', view_func=DeviceListView.as_view('devicelist')) diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html index b68d5635..f233903d 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html @@ -242,7 +242,7 @@
  • - diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html index 4ea12a71..140b7860 100644 --- a/ereuse_devicehub/templates/inventory/device_list.html +++ b/ereuse_devicehub/templates/inventory/device_list.html @@ -46,39 +46,27 @@
    Computers
    -
    Full Name
    -
    Kevin Anderson
    +
    Title
    +
    DHID
    +
    Tags
    +
    Status
    +
    Update
    + {% for dev in devices %}
    -
    Company
    -
    Lueilwitz, Wisoky and Leuschke
    +
    {{ dev.type }} {{ dev.manufacturer }} {{ dev.model }}
    +
    {{ dev.devicehub_id }}
    +
    + {% for t in dev.tags %} + {{ t.code }} + {% endfor %} +
    +
    {% if dev.status %}{{ dev.status }}{% endif %}
    +
    {{ dev.updated.strftime('%H:%M %d-%m-%Y') }}
    -
    -
    Job
    -
    Web Designer
    -
    - -
    -
    Country
    -
    USA
    -
    - -
    -
    Address
    -
    A108 Adam Street, New York, NY 535022
    -
    - -
    -
    Phone
    -
    (436) 486-3538 x29071
    -
    - -
    -
    Email
    -
    k.anderson@example.com
    -
    + {% endfor %}