From c213bddb8ceaa55af7527f4de295b921997c83da Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 11 Jan 2022 11:21:17 +0100 Subject: [PATCH 01/34] fix a main_inventory --- ereuse_devicehub/static/js/main_inventory.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ereuse_devicehub/static/js/main_inventory.js b/ereuse_devicehub/static/js/main_inventory.js index 1f1b6d4c..d876ddca 100644 --- a/ereuse_devicehub/static/js/main_inventory.js +++ b/ereuse_devicehub/static/js/main_inventory.js @@ -1,6 +1,6 @@ - $(document) .ready(function() { - $(".deviceSelect").on("change", deviceSelect); -// $('#selectLot').selectpicker(); +$(document).ready(function() { + $(".deviceSelect").on("change", deviceSelect); + // $('#selectLot').selectpicker(); }) function deviceSelect() { From 062eed3d9827dfc7e35db3920c128dce913b41e9 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 11 Jan 2022 11:46:47 +0100 Subject: [PATCH 02/34] unassigned have only the devices than not exist in any lot --- ereuse_devicehub/inventory/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index 55ed61e8..63a5a336 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -25,7 +25,7 @@ class DeviceListView(View): else: devices = Device.query.filter( Device.owner_id == current_user.id).filter( - Device.type.in_(filter_types)) + Device.type.in_(filter_types)).filter(Device.lots == None) context = {'devices': devices, 'lots': lots, From e0e4ecfd2d8d983d3f14df73ef4843261b8a483e Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 12 Jan 2022 16:52:55 +0100 Subject: [PATCH 03/34] replace Temporal for Temporary --- ereuse_devicehub/templates/ereuse_devicehub/base_site.html | 4 ++-- ereuse_devicehub/templates/inventory/device_list.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html index e4ae17f6..a85cd316 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html @@ -133,12 +133,12 @@
    • - New temporal lot + New temporary lot
      • {% for lot in lots %} diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html index 376afe75..7c3ab5ae 100644 --- a/ereuse_devicehub/templates/inventory/device_list.html +++ b/ereuse_devicehub/templates/inventory/device_list.html @@ -10,7 +10,7 @@ {% if not lot %}
    • Unassgined
      • {% elif lot.is_temporary %} -
    • Temporal Lot
      • +
    • Temporary Lot
    • {{ lot.name }}
      • {% elif lot.is_incominig %}
    • Incoming Lot
      • From d6dd740142d156c3eb20806bfcdc6581a6a2856e Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 12 Jan 2022 17:09:20 +0100 Subject: [PATCH 04/34] split LotView in LotCreateView and LotUpdateView --- ereuse_devicehub/inventory/views.py | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index 63a5a336..fa89c769 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -62,22 +62,35 @@ class LotDeviceDeleteView(View): return flask.redirect(next_url) -class LotView(View): +class LotCreateView(View): methods = ['GET', 'POST'] decorators = [login_required] template_name = 'inventory/lot.html' title = "Add a new lot" - def dispatch_request(self, id=None): + def dispatch_request(self): if id: self.title = "Edit lot" + form = LotForm() + if form.validate_on_submit(): + form.save() + next_url = url_for('inventory.devices.lotdevicelist', id=form.instance.id) + return flask.redirect(next_url) + + return flask.render_template(self.template_name, form=form, title=self.title) + + +class LotUpdateView(View): + methods = ['GET', 'POST'] + decorators = [login_required] + template_name = 'inventory/lot.html' + title = "Edit a new lot" + + def dispatch_request(self, id): form = LotForm(id=id) if form.validate_on_submit(): form.save() - lot_id = id - if not id: - lot_id = form.instance.id - next_url = url_for('inventory.devices.lotdevicelist', id=lot_id) + next_url = url_for('inventory.devices.lotdevicelist', id=id) return flask.redirect(next_url) return flask.render_template(self.template_name, form=form, title=self.title) @@ -100,6 +113,6 @@ devices.add_url_rule('/device/', view_func=DeviceListView.as_view('devicelist')) devices.add_url_rule('/lot//device/', view_func=DeviceListView.as_view('lotdevicelist')) devices.add_url_rule('/lot/devices/add/', view_func=LotDeviceAddView.as_view('lot_devices_add')) devices.add_url_rule('/lot/devices/del/', view_func=LotDeviceDeleteView.as_view('lot_devices_del')) -devices.add_url_rule('/lot/add/', view_func=LotView.as_view('lot_add')) +devices.add_url_rule('/lot/add/', view_func=LotCreateView.as_view('lot_add')) devices.add_url_rule('/lot//del/', view_func=LotDeleteView.as_view('lot_del')) -devices.add_url_rule('/lot//', view_func=LotView.as_view('lot_edit')) +devices.add_url_rule('/lot//', view_func=LotUpdateView.as_view('lot_edit')) From 18fc0e6e5b3a01784bf34e037c134d84945a1c8a Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 12 Jan 2022 19:44:10 +0100 Subject: [PATCH 05/34] add lots in create or update lot views --- ereuse_devicehub/inventory/views.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index fa89c769..3c9099e7 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -77,7 +77,8 @@ class LotCreateView(View): next_url = url_for('inventory.devices.lotdevicelist', id=form.instance.id) return flask.redirect(next_url) - return flask.render_template(self.template_name, form=form, title=self.title) + lots = Lot.query.filter(Lot.owner_id == current_user.id) + return flask.render_template(self.template_name, form=form, title=self.title, lots=lots) class LotUpdateView(View): @@ -93,7 +94,8 @@ class LotUpdateView(View): next_url = url_for('inventory.devices.lotdevicelist', id=id) return flask.redirect(next_url) - return flask.render_template(self.template_name, form=form, title=self.title) + lots = Lot.query.filter(Lot.owner_id == current_user.id) + return flask.render_template(self.template_name, form=form, title=self.title, lots=lots) class LotDeleteView(View): From aba5b9dc3b8811ab50983dd1e1cc0ff663927e3d Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 12 Jan 2022 20:26:14 +0100 Subject: [PATCH 06/34] confirmation dialog when deleting a lot --- .../{addinglot.html => addDeviceslot.html} | 0 .../templates/inventory/device_list.html | 9 ++++---- ...removinglot.html => removeDeviceslot.html} | 0 .../templates/inventory/removelot.html | 23 +++++++++++++++++++ 4 files changed, 28 insertions(+), 4 deletions(-) rename ereuse_devicehub/templates/inventory/{addinglot.html => addDeviceslot.html} (100%) rename ereuse_devicehub/templates/inventory/{removinglot.html => removeDeviceslot.html} (100%) create mode 100644 ereuse_devicehub/templates/inventory/removelot.html diff --git a/ereuse_devicehub/templates/inventory/addinglot.html b/ereuse_devicehub/templates/inventory/addDeviceslot.html similarity index 100% rename from ereuse_devicehub/templates/inventory/addinglot.html rename to ereuse_devicehub/templates/inventory/addDeviceslot.html diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html index 7c3ab5ae..dc0cb4d0 100644 --- a/ereuse_devicehub/templates/inventory/device_list.html +++ b/ereuse_devicehub/templates/inventory/device_list.html @@ -45,11 +45,11 @@
      {% if lot and lot.is_temporary and not lot.devices %} - + {% else %}
      -{% include "inventory/addinglot.html" %} -{% include "inventory/removinglot.html" %} +{% include "inventory/addDeviceslot.html" %} +{% include "inventory/removeDeviceslot.html" %} +{% include "inventory/removelot.html" %} {% include "inventory/actions.html" %} diff --git a/ereuse_devicehub/templates/inventory/removinglot.html b/ereuse_devicehub/templates/inventory/removeDeviceslot.html similarity index 100% rename from ereuse_devicehub/templates/inventory/removinglot.html rename to ereuse_devicehub/templates/inventory/removeDeviceslot.html diff --git a/ereuse_devicehub/templates/inventory/removelot.html b/ereuse_devicehub/templates/inventory/removelot.html new file mode 100644 index 00000000..125d97d3 --- /dev/null +++ b/ereuse_devicehub/templates/inventory/removelot.html @@ -0,0 +1,23 @@ + From bdc518b949073892e727177411bfb3d6c1c15830 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 12 Jan 2022 20:26:37 +0100 Subject: [PATCH 07/34] fixing create lot id --- ereuse_devicehub/inventory/forms.py | 14 ++++++-------- ereuse_devicehub/inventory/views.py | 4 +--- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py index 701e73a7..ea9a8bc8 100644 --- a/ereuse_devicehub/inventory/forms.py +++ b/ereuse_devicehub/inventory/forms.py @@ -54,18 +54,16 @@ class LotForm(FlaskForm): self.name.data = self.instance.name def save(self): - name = self.name.data.strip() - if self.instance: - if self.instance.name == name: - return self.instance - self.instance.name = name - else: - self.instance = Lot(name=name) + if not self.id: + self.instance = Lot(name=self.name.data) + + self.populate_obj(self.instance) if not self.id: + self.id = self.instance.id db.session.add(self.instance) db.session.commit() - return self.instance + return self.id db.session.commit() return self.id diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index 3c9099e7..e8a280f9 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -69,12 +69,10 @@ class LotCreateView(View): title = "Add a new lot" def dispatch_request(self): - if id: - self.title = "Edit lot" form = LotForm() if form.validate_on_submit(): form.save() - next_url = url_for('inventory.devices.lotdevicelist', id=form.instance.id) + next_url = url_for('inventory.devices.lotdevicelist', id=form.id) return flask.redirect(next_url) lots = Lot.query.filter(Lot.owner_id == current_user.id) From 97f450a07c578306b4193baa6a733d14ffab9ee0 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 12 Jan 2022 20:40:57 +0100 Subject: [PATCH 08/34] ordered list of devices --- ereuse_devicehub/inventory/views.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index e8a280f9..a7ef5521 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -21,11 +21,13 @@ class DeviceListView(View): lot = None if id: lot = lots.filter(Lot.id == id).one() + # import pdb; pdb.set_trace() devices = [dev for dev in lot.devices if dev.type in filter_types] + devices = sorted(devices, key=lambda x: x.updated, reverse=True) else: devices = Device.query.filter( Device.owner_id == current_user.id).filter( - Device.type.in_(filter_types)).filter(Device.lots == None) + Device.type.in_(filter_types)).filter(Device.lots == None).order_by('id', 'updated') context = {'devices': devices, 'lots': lots, From 2cfe8a44c6f8316552452d306c95ea6db457ba90 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 12 Jan 2022 20:45:49 +0100 Subject: [PATCH 09/34] fix order of tags and change code for id --- ereuse_devicehub/templates/inventory/device_list.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html index dc0cb4d0..79d01a40 100644 --- a/ereuse_devicehub/templates/inventory/device_list.html +++ b/ereuse_devicehub/templates/inventory/device_list.html @@ -222,8 +222,8 @@ {{ dev.type }} {{ dev.manufacturer }} {{ dev.model }} {{ dev.devicehub_id }} - {% for t in dev.tags %} - {{ t.code }}{% if not loop.last %},{% endif %} + {% for t in dev.tags | sort(attribute="id") %} + {{ t.id }}{% if not loop.last %},{% endif %} {% endfor %} {% if dev.status %}{{ dev.status }}{% endif %} From 3463d63f319ad925e2a06ac6877b9ad19452076b Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 12 Jan 2022 21:02:47 +0100 Subject: [PATCH 10/34] changes redirect static for reffered --- ereuse_devicehub/inventory/views.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index a7ef5521..21519123 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -1,6 +1,6 @@ import flask from flask.views import View -from flask import Blueprint, url_for +from flask import Blueprint, url_for, request from flask_login import login_required, current_user from ereuse_devicehub.resources.lot.models import Lot @@ -46,8 +46,7 @@ class LotDeviceAddView(View): if form.validate_on_submit(): form.save() - next_url = url_for('inventory.devices.lotdevicelist', id=form.lot.data) - return flask.redirect(next_url) + return flask.redirect(request.referrer) class LotDeviceDeleteView(View): @@ -60,8 +59,8 @@ class LotDeviceDeleteView(View): if form.validate_on_submit(): form.remove() - next_url = url_for('inventory.devices.lotdevicelist', id=form.lot.data) - return flask.redirect(next_url) + # TODO @cayop It's possible this redirect not work in production + return flask.redirect(request.referrer) class LotCreateView(View): From 68269c4b211c6b6eb5b3fc00614e468b4e93f517 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 13 Jan 2022 16:08:55 +0100 Subject: [PATCH 11/34] device details --- ereuse_devicehub/inventory/views.py | 17 +- .../templates/inventory/device_details.html | 150 ++++++++++++++++++ .../templates/inventory/device_list.html | 6 +- 3 files changed, 168 insertions(+), 5 deletions(-) create mode 100644 ereuse_devicehub/templates/inventory/device_details.html diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index 21519123..9d259a80 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -21,7 +21,6 @@ class DeviceListView(View): lot = None if id: lot = lots.filter(Lot.id == id).one() - # import pdb; pdb.set_trace() devices = [dev for dev in lot.devices if dev.type in filter_types] devices = sorted(devices, key=lambda x: x.updated, reverse=True) else: @@ -36,6 +35,20 @@ class DeviceListView(View): return flask.render_template(self.template_name, **context) +class DeviceDetailsView(View): + decorators = [login_required] + template_name = 'inventory/device_details.html' + + def dispatch_request(self, id): + lots = Lot.query.filter(Lot.owner_id == current_user.id) + device = Device.query.filter( + Device.owner_id == current_user.id).filter(Device.devicehub_id == id).one() + + context = {'device': device, + 'lots': lots} + return flask.render_template(self.template_name, **context) + + class LotDeviceAddView(View): methods = ['POST'] decorators = [login_required] @@ -109,8 +122,8 @@ class LotDeleteView(View): return flask.redirect(next_url) - devices.add_url_rule('/device/', view_func=DeviceListView.as_view('devicelist')) +devices.add_url_rule('/device//', view_func=DeviceDetailsView.as_view('device_details')) devices.add_url_rule('/lot//device/', view_func=DeviceListView.as_view('lotdevicelist')) devices.add_url_rule('/lot/devices/add/', view_func=LotDeviceAddView.as_view('lot_devices_add')) devices.add_url_rule('/lot/devices/del/', view_func=LotDeviceDeleteView.as_view('lot_devices_del')) diff --git a/ereuse_devicehub/templates/inventory/device_details.html b/ereuse_devicehub/templates/inventory/device_details.html new file mode 100644 index 00000000..f6ebd522 --- /dev/null +++ b/ereuse_devicehub/templates/inventory/device_details.html @@ -0,0 +1,150 @@ +{% extends "ereuse_devicehub/base_site.html" %} +{% block main %} + + +
      +

      Inventory

      + +
      + +
      +
      + +
      + +
      +
      +

      {{ device.devicehub_id }}

      + +
        + +
      • + +
        • + +
      • + +
        • + +
      • + +
        • + +
      • + +
        • + +
      • + +
        • + +
      +
      + +
      +
      Type Details
      + +
      +
      Type
      +
      {{ device.type }}
      +
      + +
      +
      Manufacturer
      +
      {{ device.manufacturer }}
      +
      + +
      +
      Model
      +
      {{ device.model }}
      +
      + +
      +
      Serial Number
      +
      {{ device.serial_number }}
      +
      +
      + +
      +
      Status Details
      +
      +
      Physical States
      +
      {{ device.physical or '' }}
      +
      +
      +
      Trading States
      +
      {{ device.last_action_trading or ''}}
      +
      +
      +
      Usage States
      +
      {{ device.usage or '' }}
      +
      +
      + +
      +
      Rate Details
      +
      +
      Rating
      +
      {{ device.rate or '' }}
      +
      +
      +
      Processor
      +
      {{ device.rate.processor or '' }}
      +
      +
      +
      RAM
      +
      {{ device.rate.ram or '' }}
      +
      +
      +
      Data storage
      +
      {{ device.rate.data_storage or '' }}
      +
      +
      + +
      +
      Traceability log Details
      +
      + {% for action in device.actions %} +
      + {{ action.type }} {{ action.severity }} + {{ action.created.strftime('%H:%M %d-%m-%Y') }} +
      + {% endfor %} +
      +
      + +
      +
      Components Details
      +
      + {% for component in device.components|sort(attribute='type') %} +
      +
      +
      {{ component.type }}
      + {{ component.created.strftime('%H:%M %d-%m-%Y') }} +
      +

      + {{ component.manufacturer }}
      + {{ component.model }}
      +

      + + {% if component.type in ['RamModule', 'HardDrive', 'SolidStateDrive'] %} + {{ component.size }}MB + {% endif %} + +
      + {% endfor %} +
      +
      + +
      +
      +
      +
      +
      +{% endblock main %} diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html index 79d01a40..38ecfe9d 100644 --- a/ereuse_devicehub/templates/inventory/device_list.html +++ b/ereuse_devicehub/templates/inventory/device_list.html @@ -6,7 +6,7 @@

      Inventory