From a8df3f5e5afec38c03ff510a89d895a24a41fc79 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 16 Mar 2022 13:06:42 +0100 Subject: [PATCH 01/62] Render a template for get a labels of multiple devices --- ereuse_devicehub/inventory/forms.py | 15 +++ ereuse_devicehub/inventory/views.py | 35 ++++++ .../templates/inventory/device_list.html | 11 ++ .../templates/inventory/print_tags.html | 108 ++++++++++++++++++ 4 files changed, 169 insertions(+) create mode 100644 ereuse_devicehub/templates/inventory/print_tags.html diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py index 5eab3236..3faa8751 100644 --- a/ereuse_devicehub/inventory/forms.py +++ b/ereuse_devicehub/inventory/forms.py @@ -1007,3 +1007,18 @@ class TradeDocumentForm(FlaskForm): db.session.commit() return self._obj + + +class PrintTagsForm(FlaskForm): + devices = StringField(render_kw={'class': "devicesList d-none"}) + + def validate(self, extra_validators=None): + is_valid = super().validate(extra_validators) + + if not self.devices.data: + return False + + device_ids = self.devices.data.split(",") + self._tags = Tag.query.filter(Tag.device_id.in_(device_ids)).all() + + return is_valid diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index 4e827be4..a438bf96 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -21,6 +21,7 @@ from ereuse_devicehub.inventory.forms import ( LotForm, NewActionForm, NewDeviceForm, + PrintTagsForm, TagDeviceForm, TagForm, TagUnnamedForm, @@ -118,6 +119,7 @@ class DeviceListMix(GenericMixView): 'form_new_datawipe': form_new_datawipe, 'form_new_trade': form_new_trade, 'form_filter': form_filter, + 'form_print_tags': PrintTagsForm(), 'lot': lot, 'tags': tags, 'list_devices': list_devices, @@ -381,6 +383,35 @@ class TagAddUnnamedView(View): return flask.render_template(self.template_name, form=form, **context) +class PrintTagsView(View): + """This View is used to print labels from multiple devices""" + + methods = ['POST', 'GET'] + decorators = [login_required] + template_name = 'inventory/print_tags.html' + title = 'Design and implementation of labels' + + def dispatch_request(self): + lots = Lot.query.filter(Lot.owner_id == current_user.id) + context = { + 'lots': lots, + 'page_title': self.title, + 'version': __version__, + 'referrer': request.referrer, + } + + form = PrintTagsForm() + if form.validate_on_submit(): + context['form'] = form + context['tags'] = form._tags + return flask.render_template(self.template_name, **context) + else: + messages.error('Error you need select one or more devices') + + next_url = request.referrer or url_for('inventory.devicelist') + return flask.redirect(next_url) + + class TagDetailView(View): decorators = [login_required] template_name = 'inventory/tag_detail.html' @@ -734,3 +765,7 @@ devices.add_url_rule( devices.add_url_rule( '/export//', view_func=ExportsView.as_view('export') ) +devices.add_url_rule( + '/tags/print', + view_func=PrintTagsView.as_view('print_tags'), +) diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html index 157dda05..9c6ced51 100644 --- a/ereuse_devicehub/templates/inventory/device_list.html +++ b/ereuse_devicehub/templates/inventory/device_list.html @@ -235,6 +235,17 @@ Remove Tag from selected Device +
  • + +
    • diff --git a/ereuse_devicehub/templates/inventory/print_tags.html b/ereuse_devicehub/templates/inventory/print_tags.html new file mode 100644 index 00000000..421eecde --- /dev/null +++ b/ereuse_devicehub/templates/inventory/print_tags.html @@ -0,0 +1,108 @@ +{% extends "ereuse_devicehub/base_site.html" %} +{% block main %} + +
    +

    Print tags

    + +
    + +
    +
    +
    + +
    +
    +
    +
    Print Tags
    +

    {{ title }}

    +
    + +
    +
    + {% for tag in tags %} +
    +
    +
    +
    +
    +
    +
    +
    {{ tag.id }}
    +
    +
    +
    +
    + {% endfor %} +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    + + mm +
    +
    + +
    +
    + + mm +
    +
    +
    +
    +
    +
    + Print +
    +
    + Save +
    +
    + Reset +
    +
    + +
    + +
    +
    +
    + +
    + + + + +{% endblock main %} From a36fb0b0fc7f7acf4c8f8b21d572a154280d13f7 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 16 Mar 2022 14:27:55 +0100 Subject: [PATCH 02/62] generate pdf with multiple devices --- ereuse_devicehub/static/js/print.pdf.js | 26 +++++++++++++------ .../templates/inventory/print_tags.html | 13 +++------- .../templates/inventory/tag_detail.html | 6 ++--- 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/ereuse_devicehub/static/js/print.pdf.js b/ereuse_devicehub/static/js/print.pdf.js index 5316e1ef..0d6fe6d5 100644 --- a/ereuse_devicehub/static/js/print.pdf.js +++ b/ereuse_devicehub/static/js/print.pdf.js @@ -5,8 +5,8 @@ $(document).ready(function() { load_size(); }) -function qr_draw(url) { - var qrcode = new QRCode($("#qrcode")[0], { +function qr_draw(url, id) { + var qrcode = new QRCode($(id)[0], { text: url, width: 128, height: 128, @@ -54,16 +54,26 @@ function printpdf() { var border = 2; var height = parseInt($("#height-tag").val()); var width = parseInt($("#width-tag").val()); - var tag = $("#tag").text(); - var pdf = new jsPDF('l', 'mm', [width, height]); - var imgData = $('#qrcode img').attr("src"); img_side = Math.min(height, width) - 2*border; max_tag_side = (Math.max(height, width)/2) + border; if (max_tag_side < img_side) { max_tag_side = img_side+ 2*border; }; min_tag_side = (Math.min(height, width)/2) + border; - pdf.addImage(imgData, 'PNG', border, border, img_side, img_side); - pdf.text(tag, max_tag_side, min_tag_side); - pdf.save('Tag_'+tag+'.pdf'); + var last_tag_code = ''; + + var pdf = new jsPDF('l', 'mm', [width, height]); + $(".tag").map(function(x, y) { + if (x != 0){ + pdf.addPage(); + console.log(x) + }; + var tag = $(y).text(); + last_tag_code = tag; + var imgData = $('#'+tag+' img').attr("src"); + pdf.addImage(imgData, 'PNG', border, border, img_side, img_side); + pdf.text(tag, max_tag_side, min_tag_side); + }); + + pdf.save('Tag_'+last_tag_code+'.pdf'); } diff --git a/ereuse_devicehub/templates/inventory/print_tags.html b/ereuse_devicehub/templates/inventory/print_tags.html index 421eecde..25a43a9d 100644 --- a/ereuse_devicehub/templates/inventory/print_tags.html +++ b/ereuse_devicehub/templates/inventory/print_tags.html @@ -32,7 +32,9 @@
    -
    {{ tag.id }}
    +
    + {{ tag.id }} +
    @@ -95,14 +97,7 @@ {% endblock main %} diff --git a/ereuse_devicehub/templates/inventory/tag_detail.html b/ereuse_devicehub/templates/inventory/tag_detail.html index 691838df..3bc3863b 100644 --- a/ereuse_devicehub/templates/inventory/tag_detail.html +++ b/ereuse_devicehub/templates/inventory/tag_detail.html @@ -47,10 +47,10 @@
    -
    +
    -
    {{ tag.id }}
    +
    {{ tag.id }}
    @@ -109,6 +109,6 @@ {% endblock main %} From f8e1776ca840617ee52a6d0c7beb49728751c0d7 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 17 Mar 2022 09:41:03 +0100 Subject: [PATCH 03/62] Change names tags for labels in the labels sections --- ereuse_devicehub/templates/inventory/device_list.html | 2 +- ereuse_devicehub/templates/inventory/print_tags.html | 6 +++--- ereuse_devicehub/templates/inventory/tag_detail.html | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html index 9c6ced51..9e76fb46 100644 --- a/ereuse_devicehub/templates/inventory/device_list.html +++ b/ereuse_devicehub/templates/inventory/device_list.html @@ -242,7 +242,7 @@ {% endfor %} - Print tags + Print labels diff --git a/ereuse_devicehub/templates/inventory/print_tags.html b/ereuse_devicehub/templates/inventory/print_tags.html index 25a43a9d..ebafbe61 100644 --- a/ereuse_devicehub/templates/inventory/print_tags.html +++ b/ereuse_devicehub/templates/inventory/print_tags.html @@ -2,11 +2,11 @@ {% block main %}
    -

    Print tags

    +

    Print Labels

    @@ -18,7 +18,7 @@
    -
    Print Tags
    +
    Print Labels

    {{ title }}

    diff --git a/ereuse_devicehub/templates/inventory/tag_detail.html b/ereuse_devicehub/templates/inventory/tag_detail.html index 3bc3863b..7d07dc59 100644 --- a/ereuse_devicehub/templates/inventory/tag_detail.html +++ b/ereuse_devicehub/templates/inventory/tag_detail.html @@ -40,7 +40,7 @@
    -
    Print details
    +
    Print Label
    From 3ac380271952a2e5b2e6b73a762f554b42912816 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 17 Mar 2022 18:09:08 +0100 Subject: [PATCH 04/62] Filter for show only dhid tags --- ereuse_devicehub/inventory/forms.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py index 3faa8751..7108e3a5 100644 --- a/ereuse_devicehub/inventory/forms.py +++ b/ereuse_devicehub/inventory/forms.py @@ -1019,6 +1019,18 @@ class PrintTagsForm(FlaskForm): return False device_ids = self.devices.data.split(",") - self._tags = Tag.query.filter(Tag.device_id.in_(device_ids)).all() + self._devices = ( + Device.query.filter(Device.id.in_(device_ids)) + .filter(Device.owner_id == g.user.id) + .distinct() + .all() + ) + dhids = [x.devicehub_id for x in self._devices] + # filter for found all tags of a list of devices + # self._tags = Tag.query.filter(Tag.owner_id == g.user.id).filter(Tag.device_id.in_(dhids)).all() + # filter for found all tags equal to devicehub_id + self._tags = ( + Tag.query.filter(Tag.owner_id == g.user.id).filter(Tag.id.in_(dhids)).all() + ) return is_valid From 358c569eea90df086694c49300d1cd7aab072b2c Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Tue, 22 Mar 2022 11:37:46 +0100 Subject: [PATCH 05/62] Rewrite comment to be more clear --- ereuse_devicehub/inventory/forms.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py index 7108e3a5..14f93516 100644 --- a/ereuse_devicehub/inventory/forms.py +++ b/ereuse_devicehub/inventory/forms.py @@ -1025,10 +1025,9 @@ class PrintTagsForm(FlaskForm): .distinct() .all() ) + + # print only tags that are DHID dhids = [x.devicehub_id for x in self._devices] - # filter for found all tags of a list of devices - # self._tags = Tag.query.filter(Tag.owner_id == g.user.id).filter(Tag.device_id.in_(dhids)).all() - # filter for found all tags equal to devicehub_id self._tags = ( Tag.query.filter(Tag.owner_id == g.user.id).filter(Tag.id.in_(dhids)).all() ) From 25bf04e93d373e8b5936d432aa0e4932e4dd534f Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Tue, 22 Mar 2022 11:40:25 +0100 Subject: [PATCH 06/62] Add Python 3.8 to CI testing matrix --- .github/workflows/flask.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flask.yml b/.github/workflows/flask.yml index 16086b5b..d668079e 100644 --- a/.github/workflows/flask.yml +++ b/.github/workflows/flask.yml @@ -32,7 +32,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [3.7] + python-version: [3.7, 3.8] steps: - uses: actions/checkout@v2 From 90b19972ba7343cf539e6102c7ca76d43636690b Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Tue, 22 Mar 2022 11:48:43 +0100 Subject: [PATCH 07/62] Revert "Add Python 3.8 to CI testing matrix" This reverts commit 25bf04e93d373e8b5936d432aa0e4932e4dd534f. --- .github/workflows/flask.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flask.yml b/.github/workflows/flask.yml index d668079e..16086b5b 100644 --- a/.github/workflows/flask.yml +++ b/.github/workflows/flask.yml @@ -32,7 +32,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [3.7, 3.8] + python-version: [3.7] steps: - uses: actions/checkout@v2 From aa5d93cf48d1c309778fad29355ccb188bef4040 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 31 Mar 2022 14:04:16 +0200 Subject: [PATCH 08/62] modularize labels instead of tags into inventory --- ereuse_devicehub/inventory/forms.py | 66 -------- ereuse_devicehub/inventory/views.py | 133 +--------------- ereuse_devicehub/label/__init__.py | 0 ereuse_devicehub/label/views.py | 142 ++++++++++++++++++ .../templates/ereuse_devicehub/base_site.html | 2 +- .../templates/inventory/device_list.html | 8 +- .../label_detail.html} | 2 +- .../tag_list.html => label/label_list.html} | 6 +- .../print_labels.html} | 2 +- .../{inventory => label}/tag_create.html | 4 +- .../tag_create_unnamed.html | 4 +- 11 files changed, 158 insertions(+), 211 deletions(-) create mode 100644 ereuse_devicehub/label/__init__.py create mode 100644 ereuse_devicehub/label/views.py rename ereuse_devicehub/templates/{inventory/tag_detail.html => label/label_detail.html} (97%) rename ereuse_devicehub/templates/{inventory/tag_list.html => label/label_list.html} (88%) rename ereuse_devicehub/templates/{inventory/print_tags.html => label/print_labels.html} (97%) rename ereuse_devicehub/templates/{inventory => label}/tag_create.html (90%) rename ereuse_devicehub/templates/{inventory => label}/tag_create_unnamed.html (90%) diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py index 14f93516..48484a1e 100644 --- a/ereuse_devicehub/inventory/forms.py +++ b/ereuse_devicehub/inventory/forms.py @@ -485,46 +485,6 @@ class NewDeviceForm(FlaskForm): return snapshot -class TagForm(FlaskForm): - code = StringField('Code', [validators.length(min=1)]) - - def validate(self, extra_validators=None): - error = ["This value is being used"] - is_valid = super().validate(extra_validators) - if not is_valid: - return False - tag = Tag.query.filter(Tag.id == self.code.data).all() - if tag: - self.code.errors = error - return False - - return True - - def save(self): - self.instance = Tag(id=self.code.data) - db.session.add(self.instance) - db.session.commit() - return self.instance - - def remove(self): - if not self.instance.device and not self.instance.provider: - self.instance.delete() - db.session.commit() - return self.instance - - -class TagUnnamedForm(FlaskForm): - amount = IntegerField('amount') - - def save(self): - num = self.amount.data - tags_id, _ = g.tag_provider.post('/', {}, query=[('num', num)]) - tags = [Tag(id=tag_id, provider=g.inventory.tag_provider) for tag_id in tags_id] - db.session.add_all(tags) - db.session.commit() - return tags - - class TagDeviceForm(FlaskForm): tag = SelectField('Tag', choices=[]) device = StringField('Device', [validators.Optional()]) @@ -1007,29 +967,3 @@ class TradeDocumentForm(FlaskForm): db.session.commit() return self._obj - - -class PrintTagsForm(FlaskForm): - devices = StringField(render_kw={'class': "devicesList d-none"}) - - def validate(self, extra_validators=None): - is_valid = super().validate(extra_validators) - - if not self.devices.data: - return False - - device_ids = self.devices.data.split(",") - self._devices = ( - Device.query.filter(Device.id.in_(device_ids)) - .filter(Device.owner_id == g.user.id) - .distinct() - .all() - ) - - # print only tags that are DHID - dhids = [x.devicehub_id for x in self._devices] - self._tags = ( - Tag.query.filter(Tag.owner_id == g.user.id).filter(Tag.id.in_(dhids)).all() - ) - - return is_valid diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index a438bf96..f8df5b0a 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -7,7 +7,6 @@ import flask_weasyprint from flask import Blueprint, g, make_response, request, url_for from flask.views import View from flask_login import current_user, login_required -from requests.exceptions import ConnectionError from sqlalchemy import or_ from werkzeug.exceptions import NotFound @@ -21,14 +20,12 @@ from ereuse_devicehub.inventory.forms import ( LotForm, NewActionForm, NewDeviceForm, - PrintTagsForm, TagDeviceForm, - TagForm, - TagUnnamedForm, TradeDocumentForm, TradeForm, UploadSnapshotForm, ) +from ereuse_devicehub.label.forms import PrintLabelsForm from ereuse_devicehub.resources.action.models import Trade from ereuse_devicehub.resources.device.models import Computer, DataStorage, Device from ereuse_devicehub.resources.documents.device_row import ActionRow, DeviceRow @@ -119,7 +116,7 @@ class DeviceListMix(GenericMixView): 'form_new_datawipe': form_new_datawipe, 'form_new_trade': form_new_trade, 'form_filter': form_filter, - 'form_print_tags': PrintTagsForm(), + 'form_print_labels': PrintLabelsForm(), 'lot': lot, 'tags': tags, 'list_devices': list_devices, @@ -317,120 +314,6 @@ class DeviceCreateView(GenericMixView): return flask.render_template(self.template_name, **context) -class TagListView(View): - methods = ['GET'] - decorators = [login_required] - template_name = 'inventory/tag_list.html' - - def dispatch_request(self): - lots = Lot.query.filter(Lot.owner_id == current_user.id) - tags = Tag.query.filter(Tag.owner_id == current_user.id).order_by(Tag.id) - context = { - 'lots': lots, - 'tags': tags, - 'page_title': 'Tags Management', - 'version': __version__, - } - return flask.render_template(self.template_name, **context) - - -class TagAddView(View): - methods = ['GET', 'POST'] - decorators = [login_required] - template_name = 'inventory/tag_create.html' - - def dispatch_request(self): - lots = Lot.query.filter(Lot.owner_id == current_user.id) - context = {'page_title': 'New Tag', 'lots': lots, 'version': __version__} - form = TagForm() - if form.validate_on_submit(): - form.save() - next_url = url_for('inventory.taglist') - return flask.redirect(next_url) - - return flask.render_template(self.template_name, form=form, **context) - - -class TagAddUnnamedView(View): - methods = ['GET', 'POST'] - decorators = [login_required] - template_name = 'inventory/tag_create_unnamed.html' - - def dispatch_request(self): - lots = Lot.query.filter(Lot.owner_id == current_user.id) - context = { - 'page_title': 'New Unnamed Tag', - 'lots': lots, - 'version': __version__, - } - form = TagUnnamedForm() - if form.validate_on_submit(): - try: - form.save() - except ConnectionError as e: - logger.error( - "Error while trying to connect to tag server: {}".format(e) - ) - msg = ( - "Sorry, we cannot create the unnamed tags requested because " - "some error happens while connecting to the tag server!" - ) - messages.error(msg) - - next_url = url_for('inventory.taglist') - return flask.redirect(next_url) - - return flask.render_template(self.template_name, form=form, **context) - - -class PrintTagsView(View): - """This View is used to print labels from multiple devices""" - - methods = ['POST', 'GET'] - decorators = [login_required] - template_name = 'inventory/print_tags.html' - title = 'Design and implementation of labels' - - def dispatch_request(self): - lots = Lot.query.filter(Lot.owner_id == current_user.id) - context = { - 'lots': lots, - 'page_title': self.title, - 'version': __version__, - 'referrer': request.referrer, - } - - form = PrintTagsForm() - if form.validate_on_submit(): - context['form'] = form - context['tags'] = form._tags - return flask.render_template(self.template_name, **context) - else: - messages.error('Error you need select one or more devices') - - next_url = request.referrer or url_for('inventory.devicelist') - return flask.redirect(next_url) - - -class TagDetailView(View): - decorators = [login_required] - template_name = 'inventory/tag_detail.html' - - def dispatch_request(self, id): - lots = Lot.query.filter(Lot.owner_id == current_user.id) - tag = ( - Tag.query.filter(Tag.owner_id == current_user.id).filter(Tag.id == id).one() - ) - - context = { - 'lots': lots, - 'tag': tag, - 'page_title': '{} Tag'.format(tag.code), - 'version': __version__, - } - return flask.render_template(self.template_name, **context) - - class TagLinkDeviceView(View): methods = ['POST'] decorators = [login_required] @@ -747,14 +630,6 @@ devices.add_url_rule( '/lot//device/add/', view_func=DeviceCreateView.as_view('lot_device_add'), ) -devices.add_url_rule('/tag/', view_func=TagListView.as_view('taglist')) -devices.add_url_rule('/tag/add/', view_func=TagAddView.as_view('tag_add')) -devices.add_url_rule( - '/tag/unnamed/add/', view_func=TagAddUnnamedView.as_view('tag_unnamed_add') -) -devices.add_url_rule( - '/tag//', view_func=TagDetailView.as_view('tag_details') -) devices.add_url_rule( '/tag/devices/add/', view_func=TagLinkDeviceView.as_view('tag_devices_add') ) @@ -765,7 +640,3 @@ devices.add_url_rule( devices.add_url_rule( '/export//', view_func=ExportsView.as_view('export') ) -devices.add_url_rule( - '/tags/print', - view_func=PrintTagsView.as_view('print_tags'), -) diff --git a/ereuse_devicehub/label/__init__.py b/ereuse_devicehub/label/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/ereuse_devicehub/label/views.py b/ereuse_devicehub/label/views.py new file mode 100644 index 00000000..e00a3d41 --- /dev/null +++ b/ereuse_devicehub/label/views.py @@ -0,0 +1,142 @@ +import logging + +import flask +from flask import Blueprint, request, url_for +from flask.views import View +from flask_login import current_user, login_required +from requests.exceptions import ConnectionError + +from ereuse_devicehub import __version__, messages +from ereuse_devicehub.label.forms import PrintLabelsForm, TagForm, TagUnnamedForm +from ereuse_devicehub.resources.lot.models import Lot +from ereuse_devicehub.resources.tag.model import Tag + +label = Blueprint('label', __name__, url_prefix='/label') + +logger = logging.getLogger(__name__) + + +class TagListView(View): + methods = ['GET'] + decorators = [login_required] + template_name = 'label/label_list.html' + + def dispatch_request(self): + lots = Lot.query.filter(Lot.owner_id == current_user.id) + tags = Tag.query.filter(Tag.owner_id == current_user.id).order_by(Tag.id) + context = { + 'lots': lots, + 'tags': tags, + 'page_title': 'Tags Management', + 'version': __version__, + } + return flask.render_template(self.template_name, **context) + + +class TagAddView(View): + methods = ['GET', 'POST'] + decorators = [login_required] + template_name = 'label/tag_create.html' + + def dispatch_request(self): + lots = Lot.query.filter(Lot.owner_id == current_user.id) + context = {'page_title': 'New Tag', 'lots': lots, 'version': __version__} + form = TagForm() + if form.validate_on_submit(): + form.save() + next_url = url_for('label.label_list') + return flask.redirect(next_url) + + return flask.render_template(self.template_name, form=form, **context) + + +class TagAddUnnamedView(View): + methods = ['GET', 'POST'] + decorators = [login_required] + template_name = 'label/tag_create_unnamed.html' + + def dispatch_request(self): + lots = Lot.query.filter(Lot.owner_id == current_user.id) + context = { + 'page_title': 'New Unnamed Tag', + 'lots': lots, + 'version': __version__, + } + form = TagUnnamedForm() + if form.validate_on_submit(): + try: + form.save() + except ConnectionError as e: + logger.error( + "Error while trying to connect to tag server: {}".format(e) + ) + msg = ( + "Sorry, we cannot create the unnamed tags requested because " + "some error happens while connecting to the tag server!" + ) + messages.error(msg) + + next_url = url_for('label.label_list') + return flask.redirect(next_url) + + return flask.render_template(self.template_name, form=form, **context) + + +class PrintLabelsView(View): + """This View is used to print labels from multiple devices""" + + methods = ['POST', 'GET'] + decorators = [login_required] + template_name = 'label/print_labels.html' + title = 'Design and implementation of labels' + + def dispatch_request(self): + lots = Lot.query.filter(Lot.owner_id == current_user.id) + context = { + 'lots': lots, + 'page_title': self.title, + 'version': __version__, + 'referrer': request.referrer, + } + + form = PrintLabelsForm() + if form.validate_on_submit(): + context['form'] = form + context['tags'] = form._tags + return flask.render_template(self.template_name, **context) + else: + messages.error('Error you need select one or more devices') + + next_url = request.referrer or url_for('inventory.devicelist') + return flask.redirect(next_url) + + +class LabelDetailView(View): + decorators = [login_required] + template_name = 'label/label_detail.html' + + def dispatch_request(self, id): + lots = Lot.query.filter(Lot.owner_id == current_user.id) + tag = ( + Tag.query.filter(Tag.owner_id == current_user.id).filter(Tag.id == id).one() + ) + + context = { + 'lots': lots, + 'tag': tag, + 'page_title': '{} Tag'.format(tag.code), + 'version': __version__, + } + return flask.render_template(self.template_name, **context) + + +label.add_url_rule('/', view_func=TagListView.as_view('label_list')) +label.add_url_rule('/add/', view_func=TagAddView.as_view('tag_add')) +label.add_url_rule( + '/unnamed/add/', view_func=TagAddUnnamedView.as_view('tag_unnamed_add') +) +label.add_url_rule( + '/print', + view_func=PrintLabelsView.as_view('print_labels'), +) +label.add_url_rule('//', view_func=LabelDetailView.as_view('label_details')) diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html index 5d87be53..9592978a 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html @@ -181,7 +181,7 @@
  • Utils
  • - diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html index 9e76fb46..afd1108b 100644 --- a/ereuse_devicehub/templates/inventory/device_list.html +++ b/ereuse_devicehub/templates/inventory/device_list.html @@ -236,11 +236,11 @@
  • - diff --git a/ereuse_devicehub/templates/inventory/tag_create_unnamed.html b/ereuse_devicehub/templates/label/tag_create_unnamed.html similarity index 90% rename from ereuse_devicehub/templates/inventory/tag_create_unnamed.html rename to ereuse_devicehub/templates/label/tag_create_unnamed.html index d8eddde0..3e668312 100644 --- a/ereuse_devicehub/templates/inventory/tag_create_unnamed.html +++ b/ereuse_devicehub/templates/label/tag_create_unnamed.html @@ -5,7 +5,7 @@

    {{ title }}

    @@ -49,7 +49,7 @@
    • - Cancel + Cancel
    From 1df6303f21d1cd960df1448575b22ffcfcec3f18 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 31 Mar 2022 14:09:26 +0200 Subject: [PATCH 09/62] Jinja2==3.0.3 in requirements --- requirements.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/requirements.txt b/requirements.txt index 59375c33..4dadabf0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,6 +15,9 @@ Flask-WTF==1.0.0 hashids==1.2.0 inflection==0.3.1 itsdangerous==2.0.1 +# lock Jinja2 version because it's the latest compatible with Flask 1.0.X +# see related info on https://github.com/pallets/jinja/issues/1628 +Jinja2==3.0.3 marshmallow==3.0.0b11 marshmallow-enum==1.4.1 passlib==1.7.1 From 7a532fb02c7504ab2e14b5bf8f90d46943025a9a Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 31 Mar 2022 16:12:35 +0200 Subject: [PATCH 10/62] change label for labels --- ereuse_devicehub/inventory/views.py | 2 +- .../{label => labels}/__init__.py | 0 ereuse_devicehub/labels/forms.py | 73 +++++++++++++++++++ ereuse_devicehub/{label => labels}/views.py | 28 +++---- .../templates/ereuse_devicehub/base_site.html | 2 +- .../templates/inventory/device_list.html | 4 +- .../{label => labels}/label_detail.html | 2 +- .../{label => labels}/label_list.html | 6 +- .../{label => labels}/print_labels.html | 2 +- .../{label => labels}/tag_create.html | 4 +- .../{label => labels}/tag_create_unnamed.html | 4 +- 11 files changed, 100 insertions(+), 27 deletions(-) rename ereuse_devicehub/{label => labels}/__init__.py (100%) create mode 100644 ereuse_devicehub/labels/forms.py rename ereuse_devicehub/{label => labels}/views.py (83%) rename ereuse_devicehub/templates/{label => labels}/label_detail.html (97%) rename ereuse_devicehub/templates/{label => labels}/label_list.html (88%) rename ereuse_devicehub/templates/{label => labels}/print_labels.html (97%) rename ereuse_devicehub/templates/{label => labels}/tag_create.html (90%) rename ereuse_devicehub/templates/{label => labels}/tag_create_unnamed.html (90%) diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index f8df5b0a..66b28563 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -25,7 +25,7 @@ from ereuse_devicehub.inventory.forms import ( TradeForm, UploadSnapshotForm, ) -from ereuse_devicehub.label.forms import PrintLabelsForm +from ereuse_devicehub.labels.forms import PrintLabelsForm from ereuse_devicehub.resources.action.models import Trade from ereuse_devicehub.resources.device.models import Computer, DataStorage, Device from ereuse_devicehub.resources.documents.device_row import ActionRow, DeviceRow diff --git a/ereuse_devicehub/label/__init__.py b/ereuse_devicehub/labels/__init__.py similarity index 100% rename from ereuse_devicehub/label/__init__.py rename to ereuse_devicehub/labels/__init__.py diff --git a/ereuse_devicehub/labels/forms.py b/ereuse_devicehub/labels/forms.py new file mode 100644 index 00000000..cd4b5bec --- /dev/null +++ b/ereuse_devicehub/labels/forms.py @@ -0,0 +1,73 @@ +from flask import g +from flask_wtf import FlaskForm +from wtforms import IntegerField, StringField, validators + +from ereuse_devicehub.db import db +from ereuse_devicehub.resources.device.models import Device +from ereuse_devicehub.resources.tag.model import Tag + + +class TagForm(FlaskForm): + code = StringField('Code', [validators.length(min=1)]) + + def validate(self, extra_validators=None): + error = ["This value is being used"] + is_valid = super().validate(extra_validators) + if not is_valid: + return False + tag = Tag.query.filter(Tag.id == self.code.data).all() + if tag: + self.code.errors = error + return False + + return True + + def save(self): + self.instance = Tag(id=self.code.data) + db.session.add(self.instance) + db.session.commit() + return self.instance + + def remove(self): + if not self.instance.device and not self.instance.provider: + self.instance.delete() + db.session.commit() + return self.instance + + +class TagUnnamedForm(FlaskForm): + amount = IntegerField('amount') + + def save(self): + num = self.amount.data + tags_id, _ = g.tag_provider.post('/', {}, query=[('num', num)]) + tags = [Tag(id=tag_id, provider=g.inventory.tag_provider) for tag_id in tags_id] + db.session.add_all(tags) + db.session.commit() + return tags + + +class PrintLabelsForm(FlaskForm): + devices = StringField(render_kw={'class': "devicesList d-none"}) + + def validate(self, extra_validators=None): + is_valid = super().validate(extra_validators) + + if not self.devices.data: + return False + + device_ids = self.devices.data.split(",") + self._devices = ( + Device.query.filter(Device.id.in_(device_ids)) + .filter(Device.owner_id == g.user.id) + .distinct() + .all() + ) + + # print only tags that are DHID + dhids = [x.devicehub_id for x in self._devices] + self._tags = ( + Tag.query.filter(Tag.owner_id == g.user.id).filter(Tag.id.in_(dhids)).all() + ) + + return is_valid diff --git a/ereuse_devicehub/label/views.py b/ereuse_devicehub/labels/views.py similarity index 83% rename from ereuse_devicehub/label/views.py rename to ereuse_devicehub/labels/views.py index e00a3d41..445a4eb8 100644 --- a/ereuse_devicehub/label/views.py +++ b/ereuse_devicehub/labels/views.py @@ -7,11 +7,11 @@ from flask_login import current_user, login_required from requests.exceptions import ConnectionError from ereuse_devicehub import __version__, messages -from ereuse_devicehub.label.forms import PrintLabelsForm, TagForm, TagUnnamedForm +from ereuse_devicehub.labels.forms import PrintLabelsForm, TagForm, TagUnnamedForm from ereuse_devicehub.resources.lot.models import Lot from ereuse_devicehub.resources.tag.model import Tag -label = Blueprint('label', __name__, url_prefix='/label') +labels = Blueprint('labels', __name__, url_prefix='/labels') logger = logging.getLogger(__name__) @@ -19,7 +19,7 @@ logger = logging.getLogger(__name__) class TagListView(View): methods = ['GET'] decorators = [login_required] - template_name = 'label/label_list.html' + template_name = 'labels/label_list.html' def dispatch_request(self): lots = Lot.query.filter(Lot.owner_id == current_user.id) @@ -36,7 +36,7 @@ class TagListView(View): class TagAddView(View): methods = ['GET', 'POST'] decorators = [login_required] - template_name = 'label/tag_create.html' + template_name = 'labels/tag_create.html' def dispatch_request(self): lots = Lot.query.filter(Lot.owner_id == current_user.id) @@ -44,7 +44,7 @@ class TagAddView(View): form = TagForm() if form.validate_on_submit(): form.save() - next_url = url_for('label.label_list') + next_url = url_for('labels.label_list') return flask.redirect(next_url) return flask.render_template(self.template_name, form=form, **context) @@ -53,7 +53,7 @@ class TagAddView(View): class TagAddUnnamedView(View): methods = ['GET', 'POST'] decorators = [login_required] - template_name = 'label/tag_create_unnamed.html' + template_name = 'labels/tag_create_unnamed.html' def dispatch_request(self): lots = Lot.query.filter(Lot.owner_id == current_user.id) @@ -76,7 +76,7 @@ class TagAddUnnamedView(View): ) messages.error(msg) - next_url = url_for('label.label_list') + next_url = url_for('labels.label_list') return flask.redirect(next_url) return flask.render_template(self.template_name, form=form, **context) @@ -87,7 +87,7 @@ class PrintLabelsView(View): methods = ['POST', 'GET'] decorators = [login_required] - template_name = 'label/print_labels.html' + template_name = 'labels/print_labels.html' title = 'Design and implementation of labels' def dispatch_request(self): @@ -113,7 +113,7 @@ class PrintLabelsView(View): class LabelDetailView(View): decorators = [login_required] - template_name = 'label/label_detail.html' + template_name = 'labels/label_detail.html' def dispatch_request(self, id): lots = Lot.query.filter(Lot.owner_id == current_user.id) @@ -130,13 +130,13 @@ class LabelDetailView(View): return flask.render_template(self.template_name, **context) -label.add_url_rule('/', view_func=TagListView.as_view('label_list')) -label.add_url_rule('/add/', view_func=TagAddView.as_view('tag_add')) -label.add_url_rule( +labels.add_url_rule('/', view_func=TagListView.as_view('label_list')) +labels.add_url_rule('/add/', view_func=TagAddView.as_view('tag_add')) +labels.add_url_rule( '/unnamed/add/', view_func=TagAddUnnamedView.as_view('tag_unnamed_add') ) -label.add_url_rule( +labels.add_url_rule( '/print', view_func=PrintLabelsView.as_view('print_labels'), ) -label.add_url_rule('//', view_func=LabelDetailView.as_view('label_details')) +labels.add_url_rule('//', view_func=LabelDetailView.as_view('label_details')) diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html index 9592978a..d55a1065 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html @@ -181,7 +181,7 @@
  • Utils
  • - diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html index afd1108b..4181c82c 100644 --- a/ereuse_devicehub/templates/inventory/device_list.html +++ b/ereuse_devicehub/templates/inventory/device_list.html @@ -236,7 +236,7 @@
  • - diff --git a/ereuse_devicehub/templates/label/tag_create_unnamed.html b/ereuse_devicehub/templates/labels/tag_create_unnamed.html similarity index 90% rename from ereuse_devicehub/templates/label/tag_create_unnamed.html rename to ereuse_devicehub/templates/labels/tag_create_unnamed.html index 3e668312..fa59b44f 100644 --- a/ereuse_devicehub/templates/label/tag_create_unnamed.html +++ b/ereuse_devicehub/templates/labels/tag_create_unnamed.html @@ -5,7 +5,7 @@

    {{ title }}

    @@ -49,7 +49,7 @@
    • - Cancel + Cancel
    From 3967d6a0c4d6b44d4906909e4bf6398da9612135 Mon Sep 17 00:00:00 2001 From: RubenPX Date: Mon, 4 Apr 2022 12:34:33 +0200 Subject: [PATCH 11/62] Convert readme to markdown --- README.rst | 159 ----------------------------------------------------- readme.md | 140 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+), 159 deletions(-) delete mode 100644 README.rst create mode 100644 readme.md diff --git a/README.rst b/README.rst deleted file mode 100644 index 1eba57c5..00000000 --- a/README.rst +++ /dev/null @@ -1,159 +0,0 @@ -Devicehub -######### -Devicehub is a distributed IT Asset Management System focused in reusing -devices, created under the project -`eReuse.org `__. - -This README explains how to install and use Devicehub. -`The documentation `_ explains the concepts -and the API. - -Devicehub is built with `Teal `__ and -`Flask `__. - -Installing -********** -The requirements are: - -- Python 3.7.3 or higher. In debian 10 is ``# apt install python3``. -- `PostgreSQL 11 or higher `__. -- Weasyprint - `dependencies `__. - -Install Devicehub with *pip*: -``pip3 install -U -r requirements.txt -e .``. - -Running -******* -Create a PostgreSQL database called *devicehub* by running -`create-db `__: - -- In Linux, execute the following two commands (adapt them to your distro): - - 1. ``sudo su - postgres``. - 2. ``bash examples/create-db.sh devicehub dhub``, and password - ``ereuse``. - -- In MacOS: ``bash examples/create-db.sh devicehub dhub``, and password - ``ereuse``. - -Configure project using environment file (you can use provided example as quickstart): -.. code:: bash - - $ cp examples/env.example .env - -Using the `dh` tool for set up with one or multiple inventories. -Create the tables in the database by executing: - -.. code:: bash - - $ export dhi=dbtest; dh inv add --common --name dbtest - -Finally, run the app: - -.. code:: bash - - $ export dhi=dbtest;dh run --debugger - -The error ‘bdist_wheel’ can happen when you work with a *virtual environment*. -To fix it, install in the *virtual environment* wheel -package. ``pip3 install wheel`` - -Multiple instances ------------------- -Devicehub can run as a single inventory or with multiple inventories, -each inventory being an instance of the ``devicehub``. To add a new inventory -execute: - -.. code:: bash - - $ export dhi=dbtest; dh inv add --name dbtest - -Note: The ``dh`` command is like ``flask``, but -it allows you to create and delete instances, and interface to them -directly. - - -Testing -******* -1. ``git clone`` this project. -2. Create a database for testing executing ``create-db.sh`` like the - normal installation but changing the first parameter from - ``devicehub`` to ``dh_test``: ``create-db.sh dh_test dhub`` and - password ``ereuse``. -3. Execute at the root folder of the project ``python3 setup.py test``. - - -Migrations -********** -At this stage, migration files are created manually. -Set up the database: - -.. code:: bash - - $ sudo su - postgres - $ bash $PATH_TO_DEVIHUBTEAL/examples/create-db.sh devicehub dhub - -Initialize the database: - -.. code:: bash - - $ export dhi=dbtest; dh inv add --common --name dbtest - -This command will create the schemas, tables in the specified database. -Then we need to stamp the initial migration. - -.. code:: bash - - $ alembic stamp head - - -This command will set the revision **fbb7e2a0cde0_initial** as our initial migration. -For more info in migration stamping please see https://alembic.sqlalchemy.org/en/latest/cookbook.html - - -Whenever a change needed eg to create a new schema, alter an existing table, column or perform any -operation on tables, create a new revision file: - -.. code:: bash - - $ alembic revision -m "A table change" - -This command will create a new revision file with name `_a_table_change`. -Edit the generated file with the necessary operations to perform the migration: - -.. code:: bash - - $ alembic edit - -Apply migrations using: - -.. code:: bash - - $ alembic -x inventory=dbtest upgrade head - -Then to go back to previous db version: - -.. code:: bash - - $ alembic -x inventory=dbtest downgrade - -To see a full list of migrations use - -.. code:: bash - - $ alembic history - - -Generating the docs -******************* - -1. ``git clone`` this project. -2. Install plantuml. In Debian 9 is ``# apt install plantuml``. -3. Execute ``pip3 install -e .[docs]`` in the project root folder. -4. Go to ``/docs`` and execute ``make html``. - Repeat this step to generate new docs. - -To auto-generate the docs do ``pip3 install -e .[docs-auto]``, then -execute, in the root folder of the project -``sphinx-autobuild docs docs/_build/html``. diff --git a/readme.md b/readme.md new file mode 100644 index 00000000..169bbe0d --- /dev/null +++ b/readme.md @@ -0,0 +1,140 @@ +#Devicehub + +Devicehub is a distributed IT Asset Management System focused in reusing devices, created under the project [eReuse.org](https://www.ereuse.org) + +This README explains how to install and use Devicehub. [The documentation](http://devicehub.ereuse.org) explains the concepts and the API. + +Devicehub is built with [Teal](https://github.com/ereuse/teal) and [Flask](http://flask.pocoo.org). + +# Installing +The requirements are: + +- Python 3.7.3 or higher. In debian 10 is `# apt install python3`. +- [PostgreSQL 11 or higher](https://www.postgresql.org/download/). +- Weasyprint [dependencie](http://weasyprint.readthedocs.io/en/stable/install.html>) + +Install Devicehub with *pip*: `pip3 install -U -r requirements.txt -e .` + +# Running +Create a PostgreSQL database called *devicehub* by running [create-db](examples/create-db.sh): + +- In Linux, execute the following two commands (adapt them to your distro): + + 1. ``sudo su - postgres``. + 2. ``bash examples/create-db.sh devicehub dhub``, and password ``ereuse``. + +- In MacOS: `bash examples/create-db.sh devicehub dhub`, and password `ereuse`. + +Configure project using environment file (you can use provided example as quickstart): +```bash +$ cp examples/env.example .env +``` + +Using the `dh` tool for set up with one or multiple inventories. +Create the tables in the database by executing: + +```bash +$ export dhi=dbtest; dh inv add --common --name dbtest +``` + +Finally, run the app: + +```bash +$ export dhi=dbtest;dh run --debugger +``` + +The error ‘bdist_wheel’ can happen when you work with a *virtual environment*. +To fix it, install in the *virtual environment* wheel +package. ``pip3 install wheel`` + +## Multiple instances + +Devicehub can run as a single inventory or with multiple inventories, +each inventory being an instance of the ``devicehub``. To add a new inventory +execute: +```bash +$ export dhi=dbtest; dh inv add --name dbtest +``` + +Note: The ``dh`` command is like ``flask``, but it allows you to create and delete instances, and interface to them +directly. + + +# Testing + +1. `git clone` this project. +2. Create a database for testing executing `create-db.sh` like the + normal installation but changing the first parameter from + `devicehub` to `dh_test`: `create-db.sh dh_test dhub` and + password `ereuse`. +3. Execute at the root folder of the project `python3 setup.py test`. + + +# Migrations + +At this stage, migration files are created manually. +Set up the database: + +```bash +$ sudo su - postgres +$ bash $PATH_TO_DEVIHUBTEAL/examples/create-db.sh devicehub dhub +``` + +Initialize the database: + +```bash +$ export dhi=dbtest; dh inv add --common --name dbtest +``` + +This command will create the schemas, tables in the specified database. +Then we need to stamp the initial migration. + +```bash +$ alembic stamp head +``` + + +This command will set the revision **fbb7e2a0cde0_initial** as our initial migration. +For more info in migration stamping please see https://alembic.sqlalchemy.org/en/latest/cookbook.html + + +Whenever a change needed eg to create a new schema, alter an existing table, column or perform any +operation on tables, create a new revision file: + +```bash +$ alembic revision -m "A table change" +``` + +This command will create a new revision file with name `_a_table_change`. +Edit the generated file with the necessary operations to perform the migration: + +```bash +$ alembic edit +``` + +Apply migrations using: + +```bash +$ alembic -x inventory=dbtest upgrade head +``` +Then to go back to previous db version: + +```bash +$ alembic -x inventory=dbtest downgrade +``` + +To see a full list of migrations use + +```bash +$ alembic history +``` + +## Generating the docs + + +1. `git clone` this project. +2. Install plantuml. In Debian 9 is `# apt install plantuml`. +3. Execute `pip3 install -e .[docs]` in the project root folder. +4. Go to `/docs` and execute `make html`. Repeat this step to generate new docs. + +To auto-generate the docs do `pip3 install -e .[docs-auto]`, then execute, in the root folder of the project `sphinx-autobuild docs docs/_build/html`. From e1821c3a8e305d07b2936b709cd57c96612ee328 Mon Sep 17 00:00:00 2001 From: RubenPX Date: Mon, 4 Apr 2022 12:35:32 +0200 Subject: [PATCH 12/62] Comment some app.py lines that cause an error Request by @slamora --- examples/app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/app.py b/examples/app.py index 91b48a59..b0f3bad0 100644 --- a/examples/app.py +++ b/examples/app.py @@ -18,5 +18,5 @@ app.register_blueprint(devices) # NOTE: enable by blueprint to exclude API views # TODO(@slamora: enable by default & exclude API views when decouple of Teal is completed csrf = CSRFProtect(app) -csrf.protect(core) -csrf.protect(devices) +# csrf.protect(core) +# csrf.protect(devices) From 4656bbf8723f9158bf1ada011564c0502580fb69 Mon Sep 17 00:00:00 2001 From: RubenPX Date: Mon, 4 Apr 2022 12:35:52 +0200 Subject: [PATCH 13/62] add developement setup guide --- developement-setup.md | 55 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 developement-setup.md diff --git a/developement-setup.md b/developement-setup.md new file mode 100644 index 00000000..d2684fbf --- /dev/null +++ b/developement-setup.md @@ -0,0 +1,55 @@ +# Setup developement project + +## Installing + +complete this steps from readme +- #installing + +## Setup project + +Create a PostgreSQL database called devicehub by running [create-db](examples/create-db.sh): + +- Start postgresDB +- `bash examples/create-db.sh devicehub dhub, and password ereuse.` +- `cp examples/env.example .env` + +Create a secretkey and add into `.env` + +```bash +echo "SECRET_KEY=$(python3 -c 'import secrets; print(secrets.token_hex())')" >> .env +``` + +Using the dh tool for set up with one or multiple inventories. Create the tables in the database by executing: + +```bash +export dhi=dbtest; dh inv add --common --name dbtest +``` + +Create a demo table + +```bash +export dhi=dbtest; dh dummy +``` + +copy `examples/app.py` to project directory: +```bash +copy examples/app.py . +``` + +## Run project + +Run the app + +```bash +export FLASK_APP=app.py; export FLASK_ENV=development; flask run --debugger +``` + +Finally login into `localhost:5000/login/` + +- User: user@dhub.com +- Pass: 1234 + +## Troubleshooting + +- If when execute dh command it thows an error, install this dependencies in your distro + - `sudo apt install python3-pip python3-cffi python3-brotli libpango-1.0-0 libpangoft2-1.0-0` From 960a4dc85f3a41c73b9358bb333194ee645a5eef Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Mon, 4 Apr 2022 13:41:36 +0200 Subject: [PATCH 14/62] Enable labels Blueprint on examples/app.py --- examples/app.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/examples/app.py b/examples/app.py index 91b48a59..da6e2202 100644 --- a/examples/app.py +++ b/examples/app.py @@ -8,11 +8,13 @@ from flask_wtf.csrf import CSRFProtect from ereuse_devicehub.config import DevicehubConfig from ereuse_devicehub.devicehub import Devicehub from ereuse_devicehub.inventory.views import devices +from ereuse_devicehub.labels.views import labels from ereuse_devicehub.views import core app = Devicehub(inventory=DevicehubConfig.DB_SCHEMA) app.register_blueprint(core) app.register_blueprint(devices) +app.register_blueprint(labels) # configure & enable CSRF of Flask-WTF # NOTE: enable by blueprint to exclude API views From 3bb09c654cecbe3c21892984afc087c1424df313 Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Mon, 4 Apr 2022 13:43:09 +0200 Subject: [PATCH 15/62] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e7d9b0b..34987193 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ ml). ## master ## testing +- [changed] #2970 #2971 Print DHID-QR label for selected devices. ## [2.0.0] - 2022-03-15 First server render HTML version. Completely rewrites views of angular JS client on flask. From 3119658098902813b74d99cf80d02fc25fe58443 Mon Sep 17 00:00:00 2001 From: RubenPX Date: Mon, 4 Apr 2022 17:17:07 +0200 Subject: [PATCH 16/62] Update developement-setup.md Co-authored-by: Santiago L --- developement-setup.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/developement-setup.md b/developement-setup.md index d2684fbf..1bb00f18 100644 --- a/developement-setup.md +++ b/developement-setup.md @@ -2,8 +2,7 @@ ## Installing -complete this steps from readme -- #installing +complete this steps from [README - Installing](README.md#installing) ## Setup project From 584f8b990ac117e3b0ff0b0d86fb4ca4df2048b7 Mon Sep 17 00:00:00 2001 From: RubenPX Date: Mon, 4 Apr 2022 17:23:25 +0200 Subject: [PATCH 17/62] change config to set readme.md instead of rst Necesary to build wheel package --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6a0db9b9..9dbedba9 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ setup( packages=find_packages(), include_package_data=True, python_requires='>=3.7.3', - long_description=Path('README.rst').read_text('utf8'), + long_description=Path('README.md').read_text('utf8'), install_requires=[ 'teal>=0.2.0a38', # teal always first 'click', From 6b7cf88a2f6c736a7cd614bc02074b5c804516b8 Mon Sep 17 00:00:00 2001 From: RubenPX Date: Mon, 4 Apr 2022 17:25:39 +0200 Subject: [PATCH 18/62] fix typo developement to development --- developement-setup.md => development-setup.md | 108 +++++++++--------- 1 file changed, 54 insertions(+), 54 deletions(-) rename developement-setup.md => development-setup.md (95%) diff --git a/developement-setup.md b/development-setup.md similarity index 95% rename from developement-setup.md rename to development-setup.md index 1bb00f18..4743f2a9 100644 --- a/developement-setup.md +++ b/development-setup.md @@ -1,54 +1,54 @@ -# Setup developement project - -## Installing - -complete this steps from [README - Installing](README.md#installing) - -## Setup project - -Create a PostgreSQL database called devicehub by running [create-db](examples/create-db.sh): - -- Start postgresDB -- `bash examples/create-db.sh devicehub dhub, and password ereuse.` -- `cp examples/env.example .env` - -Create a secretkey and add into `.env` - -```bash -echo "SECRET_KEY=$(python3 -c 'import secrets; print(secrets.token_hex())')" >> .env -``` - -Using the dh tool for set up with one or multiple inventories. Create the tables in the database by executing: - -```bash -export dhi=dbtest; dh inv add --common --name dbtest -``` - -Create a demo table - -```bash -export dhi=dbtest; dh dummy -``` - -copy `examples/app.py` to project directory: -```bash -copy examples/app.py . -``` - -## Run project - -Run the app - -```bash -export FLASK_APP=app.py; export FLASK_ENV=development; flask run --debugger -``` - -Finally login into `localhost:5000/login/` - -- User: user@dhub.com -- Pass: 1234 - -## Troubleshooting - -- If when execute dh command it thows an error, install this dependencies in your distro - - `sudo apt install python3-pip python3-cffi python3-brotli libpango-1.0-0 libpangoft2-1.0-0` +# Setup developement project + +## Installing + +complete this steps from [README - Installing](README.md#installing) + +## Setup project + +Create a PostgreSQL database called devicehub by running [create-db](examples/create-db.sh): + +- Start postgresDB +- `bash examples/create-db.sh devicehub dhub, and password ereuse.` +- `cp examples/env.example .env` + +Create a secretkey and add into `.env` + +```bash +echo "SECRET_KEY=$(python3 -c 'import secrets; print(secrets.token_hex())')" >> .env +``` + +Using the dh tool for set up with one or multiple inventories. Create the tables in the database by executing: + +```bash +export dhi=dbtest; dh inv add --common --name dbtest +``` + +Create a demo table + +```bash +export dhi=dbtest; dh dummy +``` + +copy `examples/app.py` to project directory: +```bash +copy examples/app.py . +``` + +## Run project + +Run the app + +```bash +export FLASK_APP=app.py; export FLASK_ENV=development; flask run --debugger +``` + +Finally login into `localhost:5000/login/` + +- User: user@dhub.com +- Pass: 1234 + +## Troubleshooting + +- If when execute dh command it thows an error, install this dependencies in your distro + - `sudo apt install python3-pip python3-cffi python3-brotli libpango-1.0-0 libpangoft2-1.0-0` From c5f006d40fd07ab7b60ccdf5e436550a0f81b846 Mon Sep 17 00:00:00 2001 From: RubenPX Date: Mon, 4 Apr 2022 17:45:04 +0200 Subject: [PATCH 19/62] fix troubleshooting and link --- development-setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 development-setup.md diff --git a/development-setup.md b/development-setup.md old mode 100644 new mode 100755 index 4743f2a9..c900574a --- a/development-setup.md +++ b/development-setup.md @@ -51,4 +51,4 @@ Finally login into `localhost:5000/login/` ## Troubleshooting - If when execute dh command it thows an error, install this dependencies in your distro - - `sudo apt install python3-pip python3-cffi python3-brotli libpango-1.0-0 libpangoft2-1.0-0` + - `sudo apt install -y libpango1.0-0 libcairo2 libpq-dev` From 57e35c016fc397c9d76fa94b1e4acf574f0ae991 Mon Sep 17 00:00:00 2001 From: RubenPX Date: Mon, 4 Apr 2022 17:59:51 +0200 Subject: [PATCH 20/62] fix link readme (reviewed) --- readme.md | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/readme.md b/readme.md index 169bbe0d..37c85957 100644 --- a/readme.md +++ b/readme.md @@ -11,7 +11,7 @@ The requirements are: - Python 3.7.3 or higher. In debian 10 is `# apt install python3`. - [PostgreSQL 11 or higher](https://www.postgresql.org/download/). -- Weasyprint [dependencie](http://weasyprint.readthedocs.io/en/stable/install.html>) +- Weasyprint [dependencie](http://weasyprint.readthedocs.io/en/stable/install.html) Install Devicehub with *pip*: `pip3 install -U -r requirements.txt -e .` @@ -20,8 +20,8 @@ Create a PostgreSQL database called *devicehub* by running [create-db](examples/ - In Linux, execute the following two commands (adapt them to your distro): - 1. ``sudo su - postgres``. - 2. ``bash examples/create-db.sh devicehub dhub``, and password ``ereuse``. + 1. `sudo su - postgres`. + 2. `bash examples/create-db.sh devicehub dhub`, and password `ereuse`. - In MacOS: `bash examples/create-db.sh devicehub dhub`, and password `ereuse`. @@ -45,28 +45,22 @@ $ export dhi=dbtest;dh run --debugger The error ‘bdist_wheel’ can happen when you work with a *virtual environment*. To fix it, install in the *virtual environment* wheel -package. ``pip3 install wheel`` +package. `pip3 install wheel` ## Multiple instances -Devicehub can run as a single inventory or with multiple inventories, -each inventory being an instance of the ``devicehub``. To add a new inventory -execute: +Devicehub can run as a single inventory or with multiple inventories, each inventory being an instance of the `devicehub`. To add a new inventory execute: ```bash $ export dhi=dbtest; dh inv add --name dbtest ``` -Note: The ``dh`` command is like ``flask``, but it allows you to create and delete instances, and interface to them -directly. +Note: The `dh` command is like `flask`, but it allows you to create and delete instances, and interface to them directly. # Testing 1. `git clone` this project. -2. Create a database for testing executing `create-db.sh` like the - normal installation but changing the first parameter from - `devicehub` to `dh_test`: `create-db.sh dh_test dhub` and - password `ereuse`. +2. Create a database for testing executing `create-db.sh` like the normal installation but changing the first parameter from `devicehub` to `dh_test`: `create-db.sh dh_test dhub` and password `ereuse`. 3. Execute at the root folder of the project `python3 setup.py test`. From 348970946bc38df93d4aea2f7add9da176f51057 Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Tue, 5 Apr 2022 10:36:04 +0200 Subject: [PATCH 21/62] Fix login_manager.user_loader Also redirect unathorized requests to login view --- ereuse_devicehub/devicehub.py | 170 ++++++++++++++++++++++------------ 1 file changed, 110 insertions(+), 60 deletions(-) diff --git a/ereuse_devicehub/devicehub.py b/ereuse_devicehub/devicehub.py index 7163173d..520ca132 100644 --- a/ereuse_devicehub/devicehub.py +++ b/ereuse_devicehub/devicehub.py @@ -10,7 +10,7 @@ from ereuse_utils.session import DevicehubClient from flask import _app_ctx_stack, g from flask_login import LoginManager, current_user from flask_sqlalchemy import SQLAlchemy -from teal.db import SchemaSQLAlchemy +from teal.db import ResourceNotFound, SchemaSQLAlchemy from teal.teal import Teal from ereuse_devicehub.auth import Auth @@ -29,32 +29,49 @@ class Devicehub(Teal): Dummy = Dummy jinja_environment = Environment - def __init__(self, - inventory: str, - config: DevicehubConfig = DevicehubConfig(), - db: SQLAlchemy = db, - import_name=__name__.split('.')[0], - static_url_path=None, - static_folder='static', - static_host=None, - host_matching=False, - subdomain_matching=False, - template_folder='templates', - instance_path=None, - instance_relative_config=False, - root_path=None, - Auth: Type[Auth] = Auth): + def __init__( + self, + inventory: str, + config: DevicehubConfig = DevicehubConfig(), + db: SQLAlchemy = db, + import_name=__name__.split('.')[0], + static_url_path=None, + static_folder='static', + static_host=None, + host_matching=False, + subdomain_matching=False, + template_folder='templates', + instance_path=None, + instance_relative_config=False, + root_path=None, + Auth: Type[Auth] = Auth, + ): assert inventory - super().__init__(config, db, inventory, import_name, static_url_path, static_folder, - static_host, - host_matching, subdomain_matching, template_folder, instance_path, - instance_relative_config, root_path, False, Auth) + super().__init__( + config, + db, + inventory, + import_name, + static_url_path, + static_folder, + static_host, + host_matching, + subdomain_matching, + template_folder, + instance_path, + instance_relative_config, + root_path, + False, + Auth, + ) self.id = inventory """The Inventory ID of this instance. In Teal is the app.schema.""" self.dummy = Dummy(self) - @self.cli.group(short_help='Inventory management.', - help='Manages the inventory {}.'.format(os.environ.get('dhi'))) + @self.cli.group( + short_help='Inventory management.', + help='Manages the inventory {}.'.format(os.environ.get('dhi')), + ) def inv(): pass @@ -69,43 +86,68 @@ class Devicehub(Teal): # configure Flask-Login login_manager = LoginManager() login_manager.init_app(self) + login_manager.login_view = "core.login" @login_manager.user_loader def load_user(user_id): - return User.query.get(user_id) + # TODO(@slamora) refactor when teal library has been drop. + # `load_user` expects None if the user ID is invalid or the + # session has expired so we need to handle Exception raised + # by teal (it's overriding default behaviour of flask-sqlalchemy + # which already returns None) + try: + return User.query.get(user_id) + except ResourceNotFound: + return None # noinspection PyMethodOverriding - @click.option('--name', '-n', - default='Test 1', - help='The human name of the inventory.') - @click.option('--org-name', '-on', - default='My Organization', - help='The name of the default organization that owns this inventory.') - @click.option('--org-id', '-oi', - default='foo-bar', - help='The Tax ID of the organization.') - @click.option('--tag-url', '-tu', - type=ereuse_utils.cli.URL(scheme=True, host=True, path=False), - default='http://example.com', - help='The base url (scheme and host) of the tag provider.') - @click.option('--tag-token', '-tt', - type=click.UUID, - default='899c794e-1737-4cea-9232-fdc507ab7106', - help='The token provided by the tag provider. It is an UUID.') - @click.option('--erase/--no-erase', - default=False, - help='Delete the schema before? ' - 'If --common is set this includes the common database.') - @click.option('--common/--no-common', - default=False, - help='Creates common databases. Only execute if the database is empty.') - def init_db(self, name: str, - org_name: str, - org_id: str, - tag_url: boltons.urlutils.URL, - tag_token: uuid.UUID, - erase: bool, - common: bool): + @click.option( + '--name', '-n', default='Test 1', help='The human name of the inventory.' + ) + @click.option( + '--org-name', + '-on', + default='My Organization', + help='The name of the default organization that owns this inventory.', + ) + @click.option( + '--org-id', '-oi', default='foo-bar', help='The Tax ID of the organization.' + ) + @click.option( + '--tag-url', + '-tu', + type=ereuse_utils.cli.URL(scheme=True, host=True, path=False), + default='http://example.com', + help='The base url (scheme and host) of the tag provider.', + ) + @click.option( + '--tag-token', + '-tt', + type=click.UUID, + default='899c794e-1737-4cea-9232-fdc507ab7106', + help='The token provided by the tag provider. It is an UUID.', + ) + @click.option( + '--erase/--no-erase', + default=False, + help='Delete the schema before? ' + 'If --common is set this includes the common database.', + ) + @click.option( + '--common/--no-common', + default=False, + help='Creates common databases. Only execute if the database is empty.', + ) + def init_db( + self, + name: str, + org_name: str, + org_id: str, + tag_url: boltons.urlutils.URL, + tag_token: uuid.UUID, + erase: bool, + common: bool, + ): """Creates an inventory. This creates the database and adds the inventory to the @@ -120,10 +162,14 @@ class Devicehub(Teal): with click_spinner.spinner(): if erase: self.db.drop_all(common_schema=common) - assert not db.has_schema(self.id), 'Schema {} already exists.'.format(self.id) + assert not db.has_schema(self.id), 'Schema {} already exists.'.format( + self.id + ) exclude_schema = 'common' if not common else None self._init_db(exclude_schema=exclude_schema) - InventoryDef.set_inventory_config(name, org_name, org_id, tag_url, tag_token) + InventoryDef.set_inventory_config( + name, org_name, org_id, tag_url, tag_token + ) DeviceSearch.set_all_devices_tokens_if_empty(self.db.session) self._init_resources(exclude_schema=exclude_schema) self.db.session.commit() @@ -138,8 +184,11 @@ class Devicehub(Teal): return True - @click.confirmation_option(prompt='Are you sure you want to delete the inventory {}?' - .format(os.environ.get('dhi'))) + @click.confirmation_option( + prompt='Are you sure you want to delete the inventory {}?'.format( + os.environ.get('dhi') + ) + ) def delete_inventory(self): """Erases an inventory. @@ -161,8 +210,9 @@ class Devicehub(Teal): def _prepare_request(self): """Prepares request stuff.""" inv = g.inventory = Inventory.current # type: Inventory - g.tag_provider = DevicehubClient(base_url=inv.tag_provider, - token=DevicehubClient.encode_token(inv.tag_token)) + g.tag_provider = DevicehubClient( + base_url=inv.tag_provider, token=DevicehubClient.encode_token(inv.tag_token) + ) # NOTE: models init methods expects that current user is # available on g.user (e.g. to initialize object owner) g.user = current_user From 66afb7b683c16bd0ab99cc336ad9430834976c07 Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Tue, 5 Apr 2022 10:49:27 +0200 Subject: [PATCH 22/62] Configure index route (redirect to login) --- ereuse_devicehub/views.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ereuse_devicehub/views.py b/ereuse_devicehub/views.py index 3ca1db3c..0c9b4361 100644 --- a/ereuse_devicehub/views.py +++ b/ereuse_devicehub/views.py @@ -11,6 +11,11 @@ from ereuse_devicehub.utils import is_safe_url core = Blueprint('core', __name__) +@core.route("/") +def index(): + return flask.redirect(flask.url_for('core.login')) + + class LoginView(View): methods = ['GET', 'POST'] template_name = 'ereuse_devicehub/user_login.html' From 88751b46bdd0143ec4790daab29de484f01fb355 Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Tue, 5 Apr 2022 11:03:18 +0200 Subject: [PATCH 23/62] Update CHANGELOG.md - Add reference to fixed PR - Fix reference to PR instead of Taige --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34987193..542b5491 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,8 @@ ml). ## master ## testing -- [changed] #2970 #2971 Print DHID-QR label for selected devices. +- [changed] #211 Print DHID-QR label for selected devices. +- [fixed] #214 Login workflow ## [2.0.0] - 2022-03-15 First server render HTML version. Completely rewrites views of angular JS client on flask. From b46551321266e96874d76063adea767fab809ae4 Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Tue, 5 Apr 2022 11:27:21 +0200 Subject: [PATCH 24/62] Fix flask.messages render --- ereuse_devicehub/templates/ereuse_devicehub/base_site.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html index d55a1065..99bd68cf 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html @@ -195,7 +195,11 @@ {% block messages %} {% for level, message in get_flashed_messages(with_categories=true) %} From 683c7cff727249c088a3a7c00d85764a7b0a4691 Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Tue, 5 Apr 2022 11:28:07 +0200 Subject: [PATCH 25/62] Hide user profile details untils is implemented --- ereuse_devicehub/templates/ereuse_devicehub/user_profile.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html b/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html index 0a6b7710..7dcd62a8 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html @@ -28,7 +28,7 @@
    -
    +
    From 1e79948e57c66dc303e2b6f847afd02fef89bdfb Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Tue, 5 Apr 2022 11:32:27 +0200 Subject: [PATCH 26/62] Drop broken link of breadcrumb --- ereuse_devicehub/templates/ereuse_devicehub/user_profile.html | 1 - 1 file changed, 1 deletion(-) diff --git a/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html b/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html index 7dcd62a8..71ab39fa 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/user_profile.html @@ -8,7 +8,6 @@

    Profile

    From 64182403a2214d8af270289941db0ba2c896779e Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Tue, 5 Apr 2022 11:47:12 +0200 Subject: [PATCH 30/62] UI: update button colors --- ereuse_devicehub/templates/inventory/removelot.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ereuse_devicehub/templates/inventory/removelot.html b/ereuse_devicehub/templates/inventory/removelot.html index 40cfc14d..1ee1558b 100644 --- a/ereuse_devicehub/templates/inventory/removelot.html +++ b/ereuse_devicehub/templates/inventory/removelot.html @@ -3,21 +3,21 @@
    -
    Remove Lot
    +
    Delete Lot
    - Are you sure that you want to remove lot {{ lot.name }}? + Are you sure that you want to delete lot {{ lot.name }}?

    - There are devices in this lot, are you sure you want to delete it? + This action cannot be undone.

    - - - Confirm + + + Delete it!
    From 277c3a84a9beec72494e1379c700d56e1fac652e Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Tue, 5 Apr 2022 11:49:47 +0200 Subject: [PATCH 31/62] Rename removelot.html -> lot_delete_modal.html --- ereuse_devicehub/templates/inventory/device_list.html | 2 +- .../inventory/{removelot.html => lot_delete_modal.html} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename ereuse_devicehub/templates/inventory/{removelot.html => lot_delete_modal.html} (100%) diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html index 4c4c864a..b1c45382 100644 --- a/ereuse_devicehub/templates/inventory/device_list.html +++ b/ereuse_devicehub/templates/inventory/device_list.html @@ -400,7 +400,7 @@ {% include "inventory/addDeviceslot.html" %} {% include "inventory/addDevicestag.html" %} {% include "inventory/removeDeviceslot.html" %} -{% include "inventory/removelot.html" %} +{% include "inventory/lot_delete_modal.html" %} {% include "inventory/actions.html" %} {% include "inventory/allocate.html" %} {% include "inventory/data_wipe.html" %} diff --git a/ereuse_devicehub/templates/inventory/removelot.html b/ereuse_devicehub/templates/inventory/lot_delete_modal.html similarity index 100% rename from ereuse_devicehub/templates/inventory/removelot.html rename to ereuse_devicehub/templates/inventory/lot_delete_modal.html From c2501a143a98dd58b41b097f4f85a4b5788b85b9 Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Tue, 5 Apr 2022 13:20:26 +0200 Subject: [PATCH 32/62] Bump ereuse-utils from 0.4.0b49 to 0.4.0b50 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4dadabf0..56dbf2be 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ click==6.7 click-spinner==0.1.8 colorama==0.3.9 colour==0.1.5 -ereuse-utils[naming,test,session,cli]==0.4.0b49 +ereuse-utils[naming,test,session,cli]==0.4.0b50 Flask==1.0.2 Flask-Cors==3.0.10 Flask-Login==0.5.0 From 554d79d2f98978b8679f2b1cbc564ddbb6986d0f Mon Sep 17 00:00:00 2001 From: RubenPX Date: Wed, 6 Apr 2022 14:12:27 +0200 Subject: [PATCH 33/62] Upercase readme.md --- readme.md => README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename readme.md => README.md (100%) diff --git a/readme.md b/README.md similarity index 100% rename from readme.md rename to README.md From 629a773dd227406925e98fd5fbb98131bad26e51 Mon Sep 17 00:00:00 2001 From: RubenPX Date: Thu, 7 Apr 2022 13:28:07 +0200 Subject: [PATCH 34/62] Add reactive lots list --- ereuse_devicehub/static/js/main_inventory.js | 253 +++++++++++++++++- .../templates/inventory/device_list.html | 34 +-- 2 files changed, 262 insertions(+), 25 deletions(-) diff --git a/ereuse_devicehub/static/js/main_inventory.js b/ereuse_devicehub/static/js/main_inventory.js index 86c25a82..11b0dc31 100644 --- a/ereuse_devicehub/static/js/main_inventory.js +++ b/ereuse_devicehub/static/js/main_inventory.js @@ -1,4 +1,4 @@ -$(document).ready(function() { +$(document).ready(function () { var show_allocate_form = $("#allocateModal").data('show-action-form'); var show_datawipe_form = $("#datawipeModal").data('show-action-form'); var show_trade_form = $("#tradeLotModal").data('show-action-form'); @@ -71,9 +71,9 @@ function removeLot() { function removeTag() { var devices = $(".deviceSelect").filter(':checked'); - var devices_id = $.map(devices, function(x) { return $(x).attr('data')}); + var devices_id = $.map(devices, function (x) { return $(x).attr('data') }); if (devices_id.length == 1) { - var url = "/inventory/tag/devices/"+devices_id[0]+"/del/"; + var url = "/inventory/tag/devices/" + devices_id[0] + "/del/"; window.location.href = url; } else { $("#unlinkTagAlertModal").click(); @@ -82,7 +82,7 @@ function removeTag() { function addTag() { var devices = $(".deviceSelect").filter(':checked'); - var devices_id = $.map(devices, function(x) { return $(x).attr('data')}); + var devices_id = $.map(devices, function (x) { return $(x).attr('data') }); if (devices_id.length == 1) { $("#addingTagModal .pol").hide(); $("#addingTagModal .btn-primary").show(); @@ -146,8 +146,8 @@ function get_device_list() { $("#actionModal .devices-count").html(devices_count); /* Insert the correct value in the input devicesList */ - var devices_id = $.map(devices, function(x) { return $(x).attr('data')}).join(","); - $.map($(".devicesList"), function(x) { + var devices_id = $.map(devices, function (x) { return $(x).attr('data') }).join(","); + $.map($(".devicesList"), function (x) { $(x).val(devices_id); }); @@ -166,17 +166,250 @@ function get_device_list() { return typ + " " + manuf + " " + dhid; }); - description = $.map(list_devices, function(x) { return x }).join(", "); + description = $.map(list_devices, function (x) { return x }).join(", "); $(".enumeration-devices").html(description); } function export_file(type_file) { var devices = $(".deviceSelect").filter(':checked'); - var devices_id = $.map(devices, function(x) { return $(x).attr('data-device-dhid')}).join(","); - if (devices_id){ - var url = "/inventory/export/"+type_file+"/?ids="+devices_id; + var devices_id = $.map(devices, function (x) { return $(x).attr('data-device-dhid') }).join(","); + if (devices_id) { + var url = "/inventory/export/" + type_file + "/?ids=" + devices_id; window.location.href = url; } else { $("#exportAlertModal").click(); } } + + + +/** + * Añade reactividad al botón de lotes + */ +async function processSelectedDevices() { + const Api = { + /** + * get lots id + * @returns get lots + */ + async get_lots() { + var request = await this.doRequest(API_URLS.lots, "GET", null) + if (request != undefined) return request.items + throw request + }, + + /** + * Get filtered devices info + * @param {number[]} ids devices ids + * @returns full detailed device list + */ + async get_devices(ids) { + var request = await this.doRequest(API_URLS.devices + '?filter={"id": [' + ids.toString() + ']}', "GET", null) + if (request != undefined) return request.items + throw request + }, + + /** + * Add devices to lot + * @param {number} lotID lot id + * @param {number[]} listDevices list devices id + */ + async devices_add(lotID, listDevices) { + var queryURL = API_URLS.devices_modify.replace("UUID", lotID) + "?" + listDevices.map(deviceID => "id=" + deviceID).join("&") + return await Api.doRequest(queryURL, "POST", null) + }, + + /** + * Remove devices from a lot + * @param {number} lotID lot id + * @param {number[]} listDevices list devices id + */ + async devices_remove(lotID, listDevices) { + var queryURL = API_URLS.devices_modify.replace("UUID", lotID) + "?" + listDevices.map(deviceID => "id=" + deviceID).join("&") + return await Api.doRequest(queryURL, "DELETE", null) + }, + + /** + * + * @param {string} url URL to be requested + * @param {String} type Action type + * @param {String | Object} body body content + * @returns + */ + async doRequest(url, type, body) { + var result; + try { + result = await $.ajax({ + url: url, + type: type, + headers: { + "Authorization": API_URLS.Auth_Token + }, + body: body + }); + return result + } catch (error) { + console.error(error) + throw error + } + } + } + + class Actions { + + constructor () { + this.list = [] // list of petitions of requests @item --> {type: ["Remove" | "Add"], "LotID": string, "devices": number[]} + } + + /** + * Manage the actions that will be performed when applying the changes + * @param {*} ev event (Should be a checkbos type) + * @param {string} lotID lot id + * @param {number} deviceID device id + */ + manage(event, lotID, deviceListID) { + const checked = event.srcElement.checked + + var found = this.list.filter(list => list.lotID == lotID)[0] + + if (checked) { + if (found != undefined && found.type == "Remove") { + this.list = this.list.filter(list => list.lotID != lotID) + } else { + this.list.push({ type: "Add", lotID: lotID, devices: deviceListID }) + } + } else { + if (found != undefined && found.type == "Add") { + this.list = this.list.filter(list => list.lotID != lotID) + } else { + this.list.push({ type: "Remove", lotID: lotID, devices: deviceListID }) + } + } + + if (this.list.length > 0) { + document.getElementById("ApplyDeviceLots").classList.remove("disabled") + } else { + document.getElementById("ApplyDeviceLots").classList.add("disabled") + } + } + + /** + * Creates notification to give feedback to user + * @param {string} title notification title + * @param {string | null} toastText notification text + * @param {boolean} isError defines if a toast is a error + */ + notifyUser(title, toastText, isError) { + let toast = document.createElement("div") + toast.classList = "alert alert-dismissible fade show " + (isError ? "alert-danger" : "alert-success") + toast.attributes["data-autohide"] = !isError + toast.attributes["role"] = "alert" + toast.style = "margin-left: auto; width: fit-content;" + toast.innerHTML = `${title}` + if (toastText && toastText.length > 0) { + toast.innerHTML += `
    ${toastText}` + } + + document.getElementById("NotificationsContainer").appendChild(toast) + if (!isError) { + setTimeout(() => toast.classList.remove("show"), 3000) + setTimeout(() => toast.remove(), 3500) + } + } + + /** + * Get actions and execute call request to add or remove devices from lots + */ + doActions() { + this.list.forEach(async action => { + if (action.type == "Add") { + try { + await Api.devices_add(action.lotID, action.devices) + this.notifyUser("Devices sucefully aded to selected lot/s", "", false) + } catch (error) { + this.notifyUser("Failed to add devices to selected lot/s", error.responseJSON.message, true) + } + } else if (action.type == "Remove") { + try { + await Api.devices_remove(action.lotID, action.devices) + this.notifyUser("Devices sucefully removed from selected lot/s", "", false) + } catch (error) { + this.notifyUser("Fail to remove devices from selected lot/s", error.responseJSON.message, true) + } + } + }) + } + } + + var eventClickActions; + + /** + * Generates a list item with a correspondient checkbox state + * @param {String} lotID + * @param {String} lotName + * @param {Array} selectedDevicesIDs + * @param {HTMLElement} target + */ + function templateLot(lotID, lot, selectedDevicesIDs, elementTarget, actions) { + elementTarget.innerHTML = "" + + var htmlTemplate = ` + `; + + var existLotList = selectedDevicesIDs.map(selected => lot.devices.includes(selected)) + + var doc = document.createElement('li') + doc.innerHTML = htmlTemplate + + if (selectedDevicesIDs.length <= 0) { + doc.children[0].disabled = true + } else if (existLotList.every(value => value == true)) { + doc.children[0].checked = true + } else if (existLotList.every(value => value == false)) { + doc.children[0].checked = false + } else { + doc.children[0].indeterminate = true; + } + + doc.children[0].addEventListener('change', (ev) => actions.manage(ev, lotID, selectedDevicesIDs)) + elementTarget.append(doc) + } + + var listHTML = $("#LotsSelector") + + // Get selected devices + var selectedDevicesIDs = $.map($(".deviceSelect").filter(':checked'), function (x) { return parseInt($(x).attr('data')) }) + if (selectedDevicesIDs.length <= 0) { + listHTML.html('
  • No devices selected
    • ') + return + } + + // Initialize Actions list, and set checkbox triggers + var actions = new Actions() + if (eventClickActions) { + document.getElementById("ApplyDeviceLots").removeEventListener(eventClickActions) + } + eventClickActions = document.getElementById("ApplyDeviceLots").addEventListener("click", () => actions.doActions()) + document.getElementById("ApplyDeviceLots").classList.add("disabled") + + try { + listHTML.html('
    • ') + var devices = await Api.get_devices(selectedDevicesIDs) + var lots = await Api.get_lots() + + lots = lots.map(lot => { + lot.devices = devices + .filter(device => device.lots.filter(devicelot => devicelot.id == lot.id).length > 0) + .map(device => parseInt(device.id)) + return lot + }) + + listHTML.html('') + lots.forEach(lot => templateLot(lot.id, lot, selectedDevicesIDs, listHTML, actions)) + } catch (error) { + console.log(error) + listHTML.html('
  • Error feching devices and lots
    (see console for more details)
    • ') + } + + +} \ No newline at end of file diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html index 157dda05..3168616e 100644 --- a/ereuse_devicehub/templates/inventory/device_list.html +++ b/ereuse_devicehub/templates/inventory/device_list.html @@ -71,25 +71,20 @@ {% endif %}
    -
    - - -
      + @@ -303,7 +298,7 @@ - + @@ -383,6 +378,8 @@ +
      + @@ -400,6 +397,13 @@ -{% endblock main %} +{% endblock main %} \ No newline at end of file From 184d22ac816dd9be908b5c46294bb72d52670610 Mon Sep 17 00:00:00 2001 From: RubenPX Date: Thu, 7 Apr 2022 14:12:20 +0200 Subject: [PATCH 35/62] Fix User token Needs encode string to Base64 --- ereuse_devicehub/templates/inventory/device_list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html index 3168616e..7b9e48bd 100644 --- a/ereuse_devicehub/templates/inventory/device_list.html +++ b/ereuse_devicehub/templates/inventory/device_list.html @@ -398,7 +398,7 @@ -{% endblock main %} \ No newline at end of file +{% endblock main %} From e7dbb343155afb82de7ce03eb4b40f31aecfef36 Mon Sep 17 00:00:00 2001 From: RubenPX Date: Mon, 11 Apr 2022 11:25:30 +0200 Subject: [PATCH 43/62] Moved api lines to fork with others features branches Future freature (Search feature) --- .../templates/ereuse_devicehub/base_site.html | 10 ++++++++++ ereuse_devicehub/templates/inventory/device_list.html | 7 ------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html index 5d87be53..75192cd5 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html @@ -220,4 +220,14 @@ + + {% endblock body %} diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html index 72d10907..df86c6f5 100644 --- a/ereuse_devicehub/templates/inventory/device_list.html +++ b/ereuse_devicehub/templates/inventory/device_list.html @@ -398,13 +398,6 @@ {% endblock main %} From 756c7bd1c48d4154a5f9b4d6db4599aa0e3a8c6a Mon Sep 17 00:00:00 2001 From: RubenPX Date: Mon, 11 Apr 2022 11:44:48 +0000 Subject: [PATCH 44/62] Search lots and devices --- ereuse_devicehub/static/js/main_inventory.js | 506 +++++++++++------- .../templates/ereuse_devicehub/base_site.html | 477 +++++++++-------- 2 files changed, 574 insertions(+), 409 deletions(-) diff --git a/ereuse_devicehub/static/js/main_inventory.js b/ereuse_devicehub/static/js/main_inventory.js index 86c25a82..775b0402 100644 --- a/ereuse_devicehub/static/js/main_inventory.js +++ b/ereuse_devicehub/static/js/main_inventory.js @@ -1,182 +1,324 @@ -$(document).ready(function() { - var show_allocate_form = $("#allocateModal").data('show-action-form'); - var show_datawipe_form = $("#datawipeModal").data('show-action-form'); - var show_trade_form = $("#tradeLotModal").data('show-action-form'); - if (show_allocate_form != "None") { - $("#allocateModal .btn-primary").show(); - newAllocate(show_allocate_form); - } else if (show_datawipe_form != "None") { - $("#datawipeModal .btn-primary").show(); - newDataWipe(show_datawipe_form); - } else if (show_trade_form != "None") { - $("#tradeLotModal .btn-primary").show(); - newTrade(show_trade_form); - } else { - $(".deviceSelect").on("change", deviceSelect); - } - // $('#selectLot').selectpicker(); -}) - -function deviceSelect() { - var devices_count = $(".deviceSelect").filter(':checked').length; - get_device_list(); - if (devices_count == 0) { - $("#addingLotModal .pol").show(); - $("#addingLotModal .btn-primary").hide(); - - $("#removeLotModal .pol").show(); - $("#removeLotModal .btn-primary").hide(); - - $("#addingTagModal .pol").show(); - $("#addingTagModal .btn-primary").hide(); - - $("#actionModal .pol").show(); - $("#actionModal .btn-primary").hide(); - - $("#allocateModal .pol").show(); - $("#allocateModal .btn-primary").hide(); - - $("#datawipeModal .pol").show(); - $("#datawipeModal .btn-primary").hide(); - } else { - $("#addingLotModal .pol").hide(); - $("#addingLotModal .btn-primary").show(); - - $("#removeLotModal .pol").hide(); - $("#removeLotModal .btn-primary").show(); - - $("#actionModal .pol").hide(); - $("#actionModal .btn-primary").show(); - - $("#allocateModal .pol").hide(); - $("#allocateModal .btn-primary").show(); - - $("#datawipeModal .pol").hide(); - $("#datawipeModal .btn-primary").show(); - - $("#addingTagModal .pol").hide(); - $("#addingTagModal .btn-primary").show(); - } -} - -function removeLot() { - var devices = $(".deviceSelect"); - if (devices.length > 0) { - $("#btnRemoveLots .text-danger").show(); - } else { - $("#btnRemoveLots .text-danger").hide(); - } - $("#activeRemoveLotModal").click(); -} - -function removeTag() { - var devices = $(".deviceSelect").filter(':checked'); - var devices_id = $.map(devices, function(x) { return $(x).attr('data')}); - if (devices_id.length == 1) { - var url = "/inventory/tag/devices/"+devices_id[0]+"/del/"; - window.location.href = url; - } else { - $("#unlinkTagAlertModal").click(); - } -} - -function addTag() { - var devices = $(".deviceSelect").filter(':checked'); - var devices_id = $.map(devices, function(x) { return $(x).attr('data')}); - if (devices_id.length == 1) { - $("#addingTagModal .pol").hide(); - $("#addingTagModal .btn-primary").show(); - } else { - $("#addingTagModal .pol").show(); - $("#addingTagModal .btn-primary").hide(); - } - - $("#addTagAlertModal").click(); -} - -function newTrade(action) { - var title = "Trade " - var user_to = $("#user_to").data("email"); - var user_from = $("#user_from").data("email"); - if (action == 'user_from') { - title = 'Trade Incoming'; - $("#user_to").attr('readonly', 'readonly'); - $("#user_from").prop('readonly', false); - $("#user_from").val(''); - $("#user_to").val(user_to); - } else if (action == 'user_to') { - title = 'Trade Outgoing'; - $("#user_from").attr('readonly', 'readonly'); - $("#user_to").prop('readonly', false); - $("#user_to").val(''); - $("#user_from").val(user_from); - } - $("#tradeLotModal #title-action").html(title); - $("#activeTradeModal").click(); -} - -function newAction(action) { - $("#actionModal #type").val(action); - $("#actionModal #title-action").html(action); - deviceSelect(); - $("#activeActionModal").click(); -} - -function newAllocate(action) { - $("#allocateModal #type").val(action); - $("#allocateModal #title-action").html(action); - deviceSelect(); - $("#activeAllocateModal").click(); -} - -function newDataWipe(action) { - $("#datawipeModal #type").val(action); - $("#datawipeModal #title-action").html(action); - deviceSelect(); - $("#activeDatawipeModal").click(); -} - -function get_device_list() { - var devices = $(".deviceSelect").filter(':checked'); - - /* Insert the correct count of devices in actions form */ - var devices_count = devices.length; - $("#datawipeModal .devices-count").html(devices_count); - $("#allocateModal .devices-count").html(devices_count); - $("#actionModal .devices-count").html(devices_count); - - /* Insert the correct value in the input devicesList */ - var devices_id = $.map(devices, function(x) { return $(x).attr('data')}).join(","); - $.map($(".devicesList"), function(x) { - $(x).val(devices_id); - }); - - /* Create a list of devices for human representation */ - var computer = { - "Desktop": "", - "Laptop": "", - }; - list_devices = devices.map(function (x) { - var typ = $(devices[x]).data("device-type"); - var manuf = $(devices[x]).data("device-manufacturer"); - var dhid = $(devices[x]).data("device-dhid"); - if (computer[typ]) { - typ = computer[typ]; - }; - return typ + " " + manuf + " " + dhid; - }); - - description = $.map(list_devices, function(x) { return x }).join(", "); - $(".enumeration-devices").html(description); -} - -function export_file(type_file) { - var devices = $(".deviceSelect").filter(':checked'); - var devices_id = $.map(devices, function(x) { return $(x).attr('data-device-dhid')}).join(","); - if (devices_id){ - var url = "/inventory/export/"+type_file+"/?ids="+devices_id; - window.location.href = url; - } else { - $("#exportAlertModal").click(); - } -} +$(document).ready(function () { + var show_allocate_form = $("#allocateModal").data('show-action-form'); + var show_datawipe_form = $("#datawipeModal").data('show-action-form'); + var show_trade_form = $("#tradeLotModal").data('show-action-form'); + if (show_allocate_form != "None") { + $("#allocateModal .btn-primary").show(); + newAllocate(show_allocate_form); + } else if (show_datawipe_form != "None") { + $("#datawipeModal .btn-primary").show(); + newDataWipe(show_datawipe_form); + } else if (show_trade_form != "None") { + $("#tradeLotModal .btn-primary").show(); + newTrade(show_trade_form); + } else { + $(".deviceSelect").on("change", deviceSelect); + } + // $('#selectLot').selectpicker(); +}) + +function deviceSelect() { + var devices_count = $(".deviceSelect").filter(':checked').length; + get_device_list(); + if (devices_count == 0) { + $("#addingLotModal .pol").show(); + $("#addingLotModal .btn-primary").hide(); + + $("#removeLotModal .pol").show(); + $("#removeLotModal .btn-primary").hide(); + + $("#addingTagModal .pol").show(); + $("#addingTagModal .btn-primary").hide(); + + $("#actionModal .pol").show(); + $("#actionModal .btn-primary").hide(); + + $("#allocateModal .pol").show(); + $("#allocateModal .btn-primary").hide(); + + $("#datawipeModal .pol").show(); + $("#datawipeModal .btn-primary").hide(); + } else { + $("#addingLotModal .pol").hide(); + $("#addingLotModal .btn-primary").show(); + + $("#removeLotModal .pol").hide(); + $("#removeLotModal .btn-primary").show(); + + $("#actionModal .pol").hide(); + $("#actionModal .btn-primary").show(); + + $("#allocateModal .pol").hide(); + $("#allocateModal .btn-primary").show(); + + $("#datawipeModal .pol").hide(); + $("#datawipeModal .btn-primary").show(); + + $("#addingTagModal .pol").hide(); + $("#addingTagModal .btn-primary").show(); + } +} + +function removeLot() { + var devices = $(".deviceSelect"); + if (devices.length > 0) { + $("#btnRemoveLots .text-danger").show(); + } else { + $("#btnRemoveLots .text-danger").hide(); + } + $("#activeRemoveLotModal").click(); +} + +function removeTag() { + var devices = $(".deviceSelect").filter(':checked'); + var devices_id = $.map(devices, function (x) { return $(x).attr('data') }); + if (devices_id.length == 1) { + var url = "/inventory/tag/devices/" + devices_id[0] + "/del/"; + window.location.href = url; + } else { + $("#unlinkTagAlertModal").click(); + } +} + +function addTag() { + var devices = $(".deviceSelect").filter(':checked'); + var devices_id = $.map(devices, function (x) { return $(x).attr('data') }); + if (devices_id.length == 1) { + $("#addingTagModal .pol").hide(); + $("#addingTagModal .btn-primary").show(); + } else { + $("#addingTagModal .pol").show(); + $("#addingTagModal .btn-primary").hide(); + } + + $("#addTagAlertModal").click(); +} + +function newTrade(action) { + var title = "Trade " + var user_to = $("#user_to").data("email"); + var user_from = $("#user_from").data("email"); + if (action == 'user_from') { + title = 'Trade Incoming'; + $("#user_to").attr('readonly', 'readonly'); + $("#user_from").prop('readonly', false); + $("#user_from").val(''); + $("#user_to").val(user_to); + } else if (action == 'user_to') { + title = 'Trade Outgoing'; + $("#user_from").attr('readonly', 'readonly'); + $("#user_to").prop('readonly', false); + $("#user_to").val(''); + $("#user_from").val(user_from); + } + $("#tradeLotModal #title-action").html(title); + $("#activeTradeModal").click(); +} + +function newAction(action) { + $("#actionModal #type").val(action); + $("#actionModal #title-action").html(action); + deviceSelect(); + $("#activeActionModal").click(); +} + +function newAllocate(action) { + $("#allocateModal #type").val(action); + $("#allocateModal #title-action").html(action); + deviceSelect(); + $("#activeAllocateModal").click(); +} + +function newDataWipe(action) { + $("#datawipeModal #type").val(action); + $("#datawipeModal #title-action").html(action); + deviceSelect(); + $("#activeDatawipeModal").click(); +} + +function get_device_list() { + var devices = $(".deviceSelect").filter(':checked'); + + /* Insert the correct count of devices in actions form */ + var devices_count = devices.length; + $("#datawipeModal .devices-count").html(devices_count); + $("#allocateModal .devices-count").html(devices_count); + $("#actionModal .devices-count").html(devices_count); + + /* Insert the correct value in the input devicesList */ + var devices_id = $.map(devices, function (x) { return $(x).attr('data') }).join(","); + $.map($(".devicesList"), function (x) { + $(x).val(devices_id); + }); + + /* Create a list of devices for human representation */ + var computer = { + "Desktop": "", + "Laptop": "", + }; + list_devices = devices.map(function (x) { + var typ = $(devices[x]).data("device-type"); + var manuf = $(devices[x]).data("device-manufacturer"); + var dhid = $(devices[x]).data("device-dhid"); + if (computer[typ]) { + typ = computer[typ]; + }; + return typ + " " + manuf + " " + dhid; + }); + + description = $.map(list_devices, function (x) { return x }).join(", "); + $(".enumeration-devices").html(description); +} + +function export_file(type_file) { + var devices = $(".deviceSelect").filter(':checked'); + var devices_id = $.map(devices, function (x) { return $(x).attr('data-device-dhid') }).join(","); + if (devices_id) { + var url = "/inventory/export/" + type_file + "/?ids=" + devices_id; + window.location.href = url; + } else { + $("#exportAlertModal").click(); + } +} + +window.addEventListener("DOMContentLoaded", () => { + var searchForm = document.getElementById("SearchForm") + var inputSearch = document.querySelector("#SearchForm > input") + var doSearch = true + + const Api = { + /** + * get lots id + * @returns get lots + */ + async get_lots() { + var request = await this.doRequest(API_URLS.lots, "GET", null) + if (request != undefined) return request.items + throw request + }, + + /** + * Get filtered devices info + * @param {number[]} ids devices ids + * @returns full detailed device list + */ + async get_devices(id) { + var request = await this.doRequest(API_URLS.devices + '?filter={"devicehub_id": ["' + id + '"]}', "GET", null) + if (request != undefined) return request.items + throw request + }, + + /** + * + * @param {string} url URL to be requested + * @param {String} type Action type + * @param {String | Object} body body content + * @returns {Object[]} + */ + async doRequest(url, type, body) { + var result; + try { + result = await $.ajax({ + url: url, + type: type, + headers: { + "Authorization": API_URLS.Auth_Token + }, + body: body + }); + return result + } catch (error) { + console.error(error) + throw error + } + } + } + + + + searchForm.addEventListener("submit", (event) => { + event.preventDefault(); + }) + + var timeoutHandler = setTimeout(() => { }, 1000) + var dropdownList = document.getElementById("dropdown-search-list") + + + inputSearch.addEventListener("input", (e) => { + console.log("Timeout restart") + clearTimeout(timeoutHandler) + timeoutHandler = setTimeout(async () => { + console.log("timeout start") + dropdownList.innerHTML = ` + + + ` + var searchText = e.target.value + + try { + Api.get_devices(searchText.toUpperCase()).then(devices => { + dropdownList.querySelector("#deviceSearchLoader").style = "display: none" + + for (let i = 0; i < devices.length; i++) { + const device = devices[i]; + + // See: ereuse_devicehub/resources/device/models.py + var verboseName = `${device.type} ${device.manufacturer} ${device.model}` + + const templateString = ` +
    • + + + ${verboseName} + ${device.devicehubID} + +
      • ` + dropdownList.innerHTML += templateString + if (i == 4) { // Limit to 4 resullts + break; + } + } + }) + } catch (error) { + console.log(error) + } + + try { + Api.get_lots().then(lots => { + dropdownList.querySelector("#lotSearchLoader").style = "display: none" + for (let i = 0; i < lots.length; i++) { + const lot = lots[i]; + if (lot.name.toUpperCase().includes(searchText.toUpperCase())) { + const templateString = ` +
    • + + + ${lot.name} + +
      • ` + dropdownList.innerHTML += templateString + if (i == 4) { + break; + } + } + } + }) + + } catch (error) { + console.log(error) + } + }, 1000) + }) + + +}) \ No newline at end of file diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html index 1ffddfa0..e809dcc9 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html @@ -1,227 +1,250 @@ -{% extends "ereuse_devicehub/base.html" %} -{% block page_title %}{{ page_title }}{% endblock %} -{% block body %} - - - - - - -
      - {% block messages %} - {% for level, message in get_flashed_messages(with_categories=true) %} - - {% endfor %} - {% endblock %} - {% block main %} - - {% endblock main %} -
      - - -
      -
      - © Copyright USOdy. All Rights Reserved -
      -
      - - - - - Designed by BootstrapMade // DeviceHub {{ version }} -
      -
      - -{% endblock body %} +{% extends "ereuse_devicehub/base.html" %} +{% block page_title %}{{ page_title }}{% endblock %} +{% block body %} + + + + + + +
      + {% block messages %} + {% for level, message in get_flashed_messages(with_categories=true) %} + + {% endfor %} + {% endblock %} + {% block main %} + + {% endblock main %} +
      + + +
      +
      + © Copyright USOdy. All Rights Reserved +
      +
      + + + + + Designed by BootstrapMade // DeviceHub {{ version }} +
      +
      + + + + +{% endblock body %} From b08a0139128782af481f7720e3fa997b206c4461 Mon Sep 17 00:00:00 2001 From: RubenPX Date: Mon, 11 Apr 2022 13:51:27 +0200 Subject: [PATCH 45/62] Remove demo data --- .../templates/ereuse_devicehub/base_site.html | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html index e809dcc9..60cab63b 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html @@ -17,14 +17,6 @@ From 34da3599f3d144ee44e0f423592ceac267f96c70 Mon Sep 17 00:00:00 2001 From: RubenPX Date: Tue, 12 Apr 2022 09:40:45 +0200 Subject: [PATCH 46/62] Fix start search info --- ereuse_devicehub/templates/ereuse_devicehub/base_site.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html index 60cab63b..8e03f429 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html @@ -17,6 +17,9 @@ From a910f9d76a46116c671c8aa5ecb7c002dac781ff Mon Sep 17 00:00:00 2001 From: RubenPX Date: Tue, 12 Apr 2022 10:34:59 +0200 Subject: [PATCH 47/62] fix typo Co-authored-by: Santiago L --- ereuse_devicehub/static/js/main_inventory.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ereuse_devicehub/static/js/main_inventory.js b/ereuse_devicehub/static/js/main_inventory.js index ae1b5705..c63f8329 100644 --- a/ereuse_devicehub/static/js/main_inventory.js +++ b/ereuse_devicehub/static/js/main_inventory.js @@ -261,7 +261,7 @@ async function processSelectedDevices() { /** * Manage the actions that will be performed when applying the changes - * @param {*} ev event (Should be a checkbos type) + * @param {*} ev event (Should be a checkbox type) * @param {string} lotID lot id * @param {number} deviceID device id */ From 7d9d091a31d914d63e43f669a5f7cfe870b2c17e Mon Sep 17 00:00:00 2001 From: RubenPX Date: Tue, 12 Apr 2022 10:35:19 +0200 Subject: [PATCH 48/62] translate to english Co-authored-by: Santiago L --- ereuse_devicehub/static/js/main_inventory.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ereuse_devicehub/static/js/main_inventory.js b/ereuse_devicehub/static/js/main_inventory.js index c63f8329..1e93c91f 100644 --- a/ereuse_devicehub/static/js/main_inventory.js +++ b/ereuse_devicehub/static/js/main_inventory.js @@ -184,7 +184,7 @@ function export_file(type_file) { /** - * Añade reactividad al botón de lotes + * Reactive lots button */ async function processSelectedDevices() { const Api = { From c910e0f7c0e3dc861a9f4fdf62df9c88499242e8 Mon Sep 17 00:00:00 2001 From: RubenPX Date: Tue, 12 Apr 2022 11:38:31 +0200 Subject: [PATCH 49/62] Avoid hide dropdown when user clicked inside --- ereuse_devicehub/static/js/main.js | 7 +++++++ ereuse_devicehub/templates/inventory/device_list.html | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ereuse_devicehub/static/js/main.js b/ereuse_devicehub/static/js/main.js index fe2401ba..13646f28 100644 --- a/ereuse_devicehub/static/js/main.js +++ b/ereuse_devicehub/static/js/main.js @@ -245,4 +245,11 @@ tableListCheckboxes.forEach(ckeckbox => ckeckbox.checked = checkedState); }) + /** + * Avoid hide dropdown when user clicked inside + */ + document.getElementById("dropDownLotsSelector").addEventListener("click", event => { + event.stopPropagation(); + }) + })(); diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html index 065f5f90..41b33e09 100644 --- a/ereuse_devicehub/templates/inventory/device_list.html +++ b/ereuse_devicehub/templates/inventory/device_list.html @@ -78,7 +78,7 @@ Lots -
        +
      SelectSelect Title DHID Tags