From f55abc4a7b7f018f4935620f5df8f5efc979c4af Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 10 Aug 2022 18:05:18 +0200 Subject: [PATCH 01/29] put the old dhid in the new placeholder device --- .../migrations/versions/d7ea9a3b2da1_create_placeholders.py | 5 +++++ ereuse_devicehub/resources/documents/device_row.py | 2 +- ereuse_devicehub/templates/inventory/device_detail.html | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ereuse_devicehub/migrations/versions/d7ea9a3b2da1_create_placeholders.py b/ereuse_devicehub/migrations/versions/d7ea9a3b2da1_create_placeholders.py index 6abff7a8..87a7154b 100644 --- a/ereuse_devicehub/migrations/versions/d7ea9a3b2da1_create_placeholders.py +++ b/ereuse_devicehub/migrations/versions/d7ea9a3b2da1_create_placeholders.py @@ -63,6 +63,9 @@ def clone_device(device): if device.type == "Battery": device.size + + old_devicehub_id = device.devicehub_id + dict_device = copy.copy(device.__dict__) dict_device.pop('_sa_instance_state') dict_device.pop('id', None) @@ -73,6 +76,8 @@ def clone_device(device): dict_device.pop('tags', None) dict_device.pop('system_uuid', None) new_device = device.__class__(**dict_device) + new_device.devicehub_id = old_devicehub_id + device.devicehub_id = None db.session.add(new_device) if hasattr(device, 'components'): diff --git a/ereuse_devicehub/resources/documents/device_row.py b/ereuse_devicehub/resources/documents/device_row.py index edca2752..b239ee92 100644 --- a/ereuse_devicehub/resources/documents/device_row.py +++ b/ereuse_devicehub/resources/documents/device_row.py @@ -276,7 +276,7 @@ class DeviceRow(BaseDeviceRow): software=snapshot.software.name, version=snapshot.version ) # General information about device - self['DHID'] = device.devicehub_id + self['DHID'] = self.placeholder.device.devicehub_id self['DocumentID'] = self.document_id self['Public Link'] = '{url}{id}'.format( url=url_for('Device.main', _external=True), id=device.devicehub_id diff --git a/ereuse_devicehub/templates/inventory/device_detail.html b/ereuse_devicehub/templates/inventory/device_detail.html index 9f46e787..ccc90020 100644 --- a/ereuse_devicehub/templates/inventory/device_detail.html +++ b/ereuse_devicehub/templates/inventory/device_detail.html @@ -34,7 +34,7 @@ {% if placeholder.binding %}
  • - Workbench device + Workbench device
    • {% endif %} From 7ed2368f02e8820d98d74b40b2b3bd31ea6e7b1b Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 11 Aug 2022 09:51:17 +0200 Subject: [PATCH 02/29] unic template for device details --- .../templates/inventory/device_detail.html | 105 +++++++----------- 1 file changed, 43 insertions(+), 62 deletions(-) diff --git a/ereuse_devicehub/templates/inventory/device_detail.html b/ereuse_devicehub/templates/inventory/device_detail.html index ccc90020..3a8ccdb0 100644 --- a/ereuse_devicehub/templates/inventory/device_detail.html +++ b/ereuse_devicehub/templates/inventory/device_detail.html @@ -18,25 +18,13 @@
    -

    {{ device.devicehub_id }}

    +

    {{ placeholder.device.devicehub_id }}

      - {% if placeholder %}
    • - Placeholder device +
      • - {% else %} -
    • - -
      • - {% endif %} - - {% if placeholder.binding %} -
    • - Workbench device -
      • - {% endif %}
    • Web @@ -50,10 +38,6 @@
      • -
    • - -
      • -
      • @@ -77,42 +61,59 @@
    -
    -
    Details
    - {% if device.placeholder %} +
    +
    Details Real parth
    - (Edit Device) + (Edit Device)
    -
    {{ device.is_abstract() }}
    +
    {{ placeholder.device.is_abstract() }}
    - {% endif %} - {% if device.placeholder %}
    Phid
    -
    {{ device.placeholder.phid }}
    +
    {{ placeholder.phid }}
    - {% endif %}
    Type
    -
    {{ device.type }}
    +
    {{ placeholder.device.type }}
    Manufacturer
    -
    {{ device.manufacturer or ''}}
    +
    {{ placeholder.device.manufacturer or ''}}
    Model
    -
    {{ device.model or ''}}
    +
    {{ placeholder.device.model or ''}}
    Serial Number
    -
    {{ device.serial_number or ''}}
    +
    {{ placeholder.device.serial_number or ''}}
    +
    + +
    Details Abstract parth
    +
    +
    Type
    +
    {{ placeholder.binding.type }}
    +
    + +
    +
    Manufacturer
    +
    {{ placeholder.binding.manufacturer or ''}}
    +
    + +
    +
    Model
    +
    {{ placeholder.binding.model or ''}}
    +
    + +
    +
    Serial Number
    +
    {{ placeholder.binding.serial_number or ''}}
    @@ -120,7 +121,7 @@
    Incoming Lots
    - {% for lot in device.lots %} + {% for lot in placeholder.device.lots %} {% if lot.is_incoming %}
    @@ -134,7 +135,7 @@
    Outgoing Lots
    - {% for lot in device.lots %} + {% for lot in placeholder.device.lots %} {% if lot.is_outgoing %}
    @@ -148,7 +149,7 @@
    Temporary Lots
    - {% for lot in device.lots %} + {% for lot in placeholder.device.lots %} {% if lot.is_temporary %}
    @@ -165,53 +166,33 @@
    Physical State
    - {% if device.physical_status %} - {{ device.physical_status.type }} + {% if placeholder.device.physical_status %} + {{ placeholder.device.physical_status.type }} {% endif %}
    Lifecycle State
    - {% if device.status %} - {{ device.status.type }} + {% if placeholder.device.status %} + {{ placeholder.device.status.type }} {% endif %}
    Allocated State
    - {% if device.allocated_status %} - {{ device.allocated_status.type }} + {% if placeholder.device.allocated_status %} + {{ placeholder.device.allocated_status.type }} {% endif %}
    -
    -
    Rate Details
    -
    -
    Rating
    -
    {{ device.rate or '' }}
    -
    -
    -
    Processor
    -
    {{ device.rate.processor or '' }}
    -
    -
    -
    RAM
    -
    {{ device.rate.ram or '' }}
    -
    -
    -
    Data storage
    -
    {{ device.rate.data_storage or '' }}
    -
    -
    -
    Traceability log Details
    - {% for action in device.reverse_actions %} + {% for action in placeholder.actions %}
    {{ action.type }} {{ action.severity }} {{ action.created.strftime('%H:%M %d-%m-%Y') }} @@ -258,7 +239,7 @@

    -
    + {{ form_binding.csrf_token }} {% for field in form_binding %} {% if field != form_binding.csrf_token %} From 57ba86eb39adfed262f9574d6db676c857b9c955 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 11 Aug 2022 10:21:45 +0200 Subject: [PATCH 03/29] add actions in placeholder model --- ereuse_devicehub/resources/device/models.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ereuse_devicehub/resources/device/models.py b/ereuse_devicehub/resources/device/models.py index a50d1593..1a95c3b3 100644 --- a/ereuse_devicehub/resources/device/models.py +++ b/ereuse_devicehub/resources/device/models.py @@ -924,6 +924,17 @@ class Placeholder(Thing): ) owner = db.relationship(User, primaryjoin=owner_id == User.id) + @property + def actions(self): + actions = list(self.device.actions) or [] + + if self.binding: + actions.extend(list(self.binding.actions)) + + actions = sorted(actions, key=lambda x: x.created) + actions.reverse() + return actions + class Computer(Device): """A chassis with components inside that can be processed From 138dc66b9aa58bb440a100823bb62fb9b2a88131 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 11 Aug 2022 14:50:47 +0200 Subject: [PATCH 04/29] modify details page and binding/unbinding page --- ereuse_devicehub/inventory/views.py | 89 +++++++++---------- ereuse_devicehub/resources/device/models.py | 8 ++ .../templates/inventory/binding.html | 85 +++++++++--------- .../templates/inventory/device_detail.html | 25 +++--- .../templates/inventory/unbinding.html | 81 ++++++++++------- 5 files changed, 153 insertions(+), 135 deletions(-) diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index a797a705..1da71c58 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -180,65 +180,66 @@ class BindingView(GenericMixin): def dispatch_request(self, dhid, phid): self.get_context() - device = ( + old_device = ( Device.query.filter(Device.owner_id == g.user.id) .filter(Device.devicehub_id == dhid) - .one() + .first() ) - placeholder = ( + new_placeholder = ( Placeholder.query.filter(Placeholder.owner_id == g.user.id) .filter(Placeholder.phid == phid) - .one() + .first() ) - if device.is_abstract() != 'Abstract': + if not old_device or old_device.placeholder.status != 'Abstract': next_url = url_for('inventory.device_details', id=dhid) - messages.error('Device "{}" not is a Abstract device!'.format(dhid)) + messages.error('Device Dhid: "{}" not is a Abstract device!'.format(dhid)) return flask.redirect(next_url) - if device.placeholder: - device = device.placeholder.binding - dhid = device.devicehub_id + if not new_placeholder or new_placeholder.status != 'Real': + next_url = url_for('inventory.device_details', id=dhid) + messages.error('Device Phid: "{}" not is a Abstract device!'.format(phid)) + return flask.redirect(next_url) + + old_placeholder = old_device.placeholder + new_device = new_placeholder.device + abstract_device = old_placeholder.binding + new_dhid = new_device.devicehub_id if request.method == 'POST': - old_placeholder = device.binding - old_device_placeholder = old_placeholder.device - if old_placeholder.is_abstract: - for plog in PlaceholdersLog.query.filter_by( - placeholder_id=old_placeholder.id - ): - db.session.delete(plog) + for plog in PlaceholdersLog.query.filter_by( + placeholder_id=old_placeholder.id + ): + db.session.delete(plog) - for ac in old_device_placeholder.actions: - ac.devices.add(placeholder.device) - ac.devices.remove(old_device_placeholder) - for act in ac.actions_device: - if act.device == old_device_placeholder: - db.session.delete(act) + for ac in old_device.actions: + ac.devices.add(new_device) + ac.devices.remove(old_device) + for act in ac.actions_device: + if act.device == old_device: + db.session.delete(act) - for tag in list(old_device_placeholder.tags): - tag.device = placeholder.device + for tag in list(old_device.tags): + tag.device = new_device - db.session.delete(old_device_placeholder) - - device.binding = placeholder + db.session.delete(old_device) + abstract_device.binding = new_placeholder db.session.commit() - next_url = url_for('inventory.device_details', id=dhid) + + next_url = url_for('inventory.device_details', id=new_dhid) messages.success( - 'Device "{}" bind successfully with {}!'.format(dhid, phid) + 'Device Dhid: "{}" bind successfully with Phid: {}!'.format(dhid, phid) ) return flask.redirect(next_url) self.context.update( { - 'device': device.binding.device, - 'placeholder': placeholder, + 'new_placeholder': new_placeholder, + 'old_placeholder': old_placeholder, 'page_title': 'Binding confirm', - 'actions': list(device.binding.device.actions) - + list(placeholder.device.actions), - 'tags': list(device.binding.device.tags) - + list(placeholder.device.tags), + 'actions': list(old_device.actions) + list(new_device.actions), + 'tags': list(old_device.tags) + list(new_device.tags), } ) @@ -256,31 +257,29 @@ class UnBindingView(GenericMixin): .filter(Placeholder.phid == phid) .one() ) - if not placeholder.binding: + if not placeholder.binding or placeholder.status != 'Twin': next_url = url_for( 'inventory.device_details', id=placeholder.device.devicehub_id ) return flask.redirect(next_url) - device = placeholder.binding - - if device.is_abstract() != 'Twin': - dhid = device.devicehub_id + if placeholder.status != 'Twin': + dhid = placeholder.device.devicehub_id next_url = url_for('inventory.device_details', id=dhid) - messages.error('Device "{}" not is a Twin device!'.format(dhid)) + messages.error('Device Dhid: "{}" not is a Twin device!'.format(dhid)) return flask.redirect(next_url) self.get_context() if request.method == 'POST': - new_device = self.clone_device(device) - next_url = url_for('inventory.device_details', id=new_device.devicehub_id) - messages.success('Device "{}" unbind successfully!'.format(phid)) + new_device = self.clone_device(placeholder.binding) + new_dhid = new_device.devicehub_id + next_url = url_for('inventory.device_details', id=new_dhid) + messages.success('Device Phid: "{}" unbind successfully!'.format(phid)) return flask.redirect(next_url) self.context.update( { - 'device': device, 'placeholder': placeholder, 'page_title': 'Unbinding confirm', } diff --git a/ereuse_devicehub/resources/device/models.py b/ereuse_devicehub/resources/device/models.py index 1a95c3b3..5bc25477 100644 --- a/ereuse_devicehub/resources/device/models.py +++ b/ereuse_devicehub/resources/device/models.py @@ -935,6 +935,14 @@ class Placeholder(Thing): actions.reverse() return actions + @property + def status(self): + if self.is_abstract: + return 'Abstract' + if self.binding: + return 'Twin' + return 'Real' + class Computer(Device): """A chassis with components inside that can be processed diff --git a/ereuse_devicehub/templates/inventory/binding.html b/ereuse_devicehub/templates/inventory/binding.html index 087b4e85..d453d154 100644 --- a/ereuse_devicehub/templates/inventory/binding.html +++ b/ereuse_devicehub/templates/inventory/binding.html @@ -26,109 +26,104 @@ Basic Data - Info to be Entered - Info to be Decoupled + Info Twin device + Info Abstract device - - PHID: - {{ placeholder.phid or '' }} - {{ device.placeholder.phid or '' }} - Manufacturer: - {{ placeholder.device.manufacturer or '' }} - {{ device.manufacturer or '' }} + {{ new_placeholder.device.manufacturer or '' }} + {{ old_placeholder.device.manufacturer or '' }} Model: - {{ placeholder.device.model or '' }} - {{ device.model or '' }} + {{ new_placeholder.device.model or '' }} + {{ old_placeholder.device.model or '' }} Serial Number: - {{ placeholder.device.serial_number or '' }} - {{ device.serial_number or '' }} + {{ new_placeholder.device.serial_number or '' }} + {{ old_placeholder.device.serial_number or '' }} Brand: - {{ placeholder.device.brand or '' }} - {{ device.brand or '' }} + {{ new_placeholder.device.brand or '' }} + {{ old_placeholder.device.brand or '' }} Sku: - {{ placeholder.device.sku or '' }} - {{ device.sku or '' }} + {{ new_placeholder.device.sku or '' }} + {{ old_placeholder.device.sku or '' }} Generation: - {{ placeholder.device.generation or '' }} - {{ device.generation or '' }} + {{ new_placeholder.device.generation or '' }} + {{ old_placeholder.device.generation or '' }} Version: - {{ placeholder.device.version or '' }} - {{ device.version or '' }} + {{ new_placeholder.device.version or '' }} + {{ old_placeholder.device.version or '' }} Weight: - {{ placeholder.device.weight or '' }} - {{ device.weight or '' }} + {{ new_placeholder.device.weight or '' }} + {{ old_placeholder.device.weight or '' }} Width: - {{ placeholder.device.width or '' }} - {{ device.width or '' }} + {{ new_placeholder.device.width or '' }} + {{ old_placeholder.device.width or '' }} Height: - {{ placeholder.device.height or '' }} - {{ device.height or '' }} + {{ new_placeholder.device.height or '' }} + {{ old_placeholder.device.height or '' }} Depth: - {{ placeholder.device.depth or '' }} - {{ device.depth or '' }} + {{ new_placeholder.device.depth or '' }} + {{ old_placeholder.device.depth or '' }} Color: - {{ placeholder.device.color or '' }} - {{ device.color or '' }} + {{ new_placeholder.device.color or '' }} + {{ old_placeholder.device.color or '' }} Production date: - {{ placeholder.device.production_date or '' }} - {{ device.production_date or '' }} + {{ new_placeholder.device.production_date or '' }} + {{ old_placeholder.device.production_date or '' }} Variant: - {{ placeholder.device.variant or '' }} - {{ device.variant or '' }} + {{ new_placeholder.device.variant or '' }} + {{ old_placeholder.device.variant or '' }}
    - {% if placeholder.device.components or device.components %} + {% if new_placeholder.device.components or old_placeholder.device.components %}

    Components

    - - + + @@ -144,8 +139,8 @@
    Info to be EnteredInfo to be DecoupledInfo Twin deviceInfo Abstract device
    - {% for c in placeholder.device.components %} + {% for c in new_placeholder.device.components %} * {{ c.verbose_name }}
    {% endfor %}     		- {% for c in device.components %} + {% for c in old_placeholder.device.components %} * {{ c.verbose_name }}
    {% endfor %}
    - - + + @@ -169,8 +164,8 @@
    Info to be EnteredInfo to be DecoupledInfo Twin deviceInfo Abstract device
    - - + + @@ -189,7 +184,7 @@
    - Cancel + Cancel
    diff --git a/ereuse_devicehub/templates/inventory/device_detail.html b/ereuse_devicehub/templates/inventory/device_detail.html index 3a8ccdb0..9dcc3ead 100644 --- a/ereuse_devicehub/templates/inventory/device_detail.html +++ b/ereuse_devicehub/templates/inventory/device_detail.html @@ -46,13 +46,13 @@ - {% if device.is_abstract() == 'Abstract' %} + {% if placeholder.status == 'Abstract' %}
    • {% endif %} - {% if device.is_abstract() == 'Twin' %} + {% if placeholder.status == 'Twin' %}
  • Unbinding
    • @@ -67,7 +67,7 @@
    (Edit Device)
    -
    {{ placeholder.device.is_abstract() }}
    +
    {{ placeholder.status }}
    @@ -95,6 +95,7 @@
    {{ placeholder.device.serial_number or ''}}
    + {% if placeholder.binding %}
    Details Abstract parth
    Type
    @@ -115,6 +116,7 @@
    Serial Number
    {{ placeholder.binding.serial_number or ''}}
    + {% endif %}
    @@ -202,10 +204,15 @@
    -
    Components Details
    - {% if device.binding %} +
    Components Real parth
    - {% for component in device.components|sort(attribute='type') %} + {{ placeholder.components or '' }} +
    + + {% if placeholder.binding %} +
    Components Abstract parth
    +
    + {% for component in placeholder.binding.components|sort(attribute='type') %}
    {{ component.type }}
    @@ -223,13 +230,9 @@
    {% endfor %}
    - {% else %} -
    - {{ device.placeholder.components or '' }} -
    {% endif %}
    - {% if device.is_abstract() %} + {% if placeholder.status %}
    Binding
    diff --git a/ereuse_devicehub/templates/inventory/unbinding.html b/ereuse_devicehub/templates/inventory/unbinding.html index 457b4a74..c041bfea 100644 --- a/ereuse_devicehub/templates/inventory/unbinding.html +++ b/ereuse_devicehub/templates/inventory/unbinding.html @@ -26,84 +26,79 @@
    - - + + - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -111,26 +106,21 @@
    - {% if placeholder.device.components or device.components %} + {% if placeholder.components %}

    Components

    Info to be EnteredInfo to be DecoupledInfo Twin deviceInfo Abstract device
    Basic DataInfo to be EnteredInfo to be DecoupledInfo Abstract deviceInfo Real device
    PHID:{{ placeholder.phid or '' }}
    Manufacturer:{{ device.manufacturer or '' }}{{ placeholder.binding.manufacturer or '' }} {{ placeholder.device.manufacturer or '' }}
    Model:{{ device.model or '' }}{{ placeholder.binding.model or '' }} {{ placeholder.device.model or '' }}
    Serial Number:{{ device.serial_number or '' }}{{ placeholder.binding.serial_number or '' }} {{ placeholder.device.serial_number or '' }}
    Brand:{{ device.brand or '' }}{{ placeholder.binding.brand or '' }} {{ placeholder.device.brand or '' }}
    Sku:{{ device.sku or '' }}{{ placeholder.binding.sku or '' }} {{ placeholder.device.sku or '' }}
    Generation:{{ device.generation or '' }}{{ placeholder.binding.generation or '' }} {{ placeholder.device.generation or '' }}
    Version:{{ device.version or '' }}{{ placeholder.binding.version or '' }} {{ placeholder.device.version or '' }}
    Weight:{{ device.weight or '' }}{{ placeholder.binding.weight or '' }} {{ placeholder.device.weight or '' }}
    Width:{{ device.width or '' }}{{ placeholder.binding.width or '' }} {{ placeholder.device.width or '' }}
    Height:{{ device.height or '' }}{{ placeholder.binding.height or '' }} {{ placeholder.device.height or '' }}
    Depth:{{ device.depth or '' }}{{ placeholder.binding.depth or '' }} {{ placeholder.device.depth or '' }}
    Color:{{ device.color or '' }}{{ placeholder.binding.color or '' }} {{ placeholder.device.color or '' }}
    Production date:{{ device.production_date or '' }}{{ placeholder.binding.production_date or '' }} {{ placeholder.device.production_date or '' }}
    Variant:{{ device.variant or '' }}{{ placeholder.binding.variant or '' }} {{ placeholder.device.variant or '' }}
    - - + + @@ -139,19 +129,19 @@
    - {% if placeholder.device.manual_actions or device.manual_actions %} + {% if placeholder.device.manual_actions or placeholder.binding.manual_actions %}

    Actions

    Info to be EnteredInfo to be DecoupledInfo Abstract deviceInfo Real device
    - {% for c in device.components %} - * {{ c.verbose_name }}
    - {% endfor %}     		- {% for c in placeholder.device.components %} - * {{ c.verbose_name }}
    - {% endfor %} + {{ placeholder.components or ''}}
    - - + + @@ -165,6 +155,29 @@
    Info to be EnteredInfo to be DecoupledInfo Abstract deviceInfo Real device
    - {% for a in device.manual_actions %} + {% for a in placeholder.binding.manual_actions %} * {{ a.t }}
    {% endfor %}
    {% endif %} + {% if placeholder.device.tags %} +

    Tags

    + + + + + + + + + + + + + +
    Info Abstract deviceInfo Real device
    + + {% for a in placeholder.device.tags %} + * {{ a.t }}
    + {% endfor %} +
    + {% endif %} +
    Cancel From 62b235a45515fbdad568c0d97594fb058988b3ee Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 11 Aug 2022 17:30:00 +0200 Subject: [PATCH 05/29] to do binding from real device --- ereuse_devicehub/inventory/forms.py | 6 +- ereuse_devicehub/inventory/views.py | 152 +++++++++++------- .../templates/inventory/binding.html | 2 +- .../templates/inventory/device_detail.html | 2 +- 4 files changed, 99 insertions(+), 63 deletions(-) diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py index b1fdb645..1864bb3b 100644 --- a/ereuse_devicehub/inventory/forms.py +++ b/ereuse_devicehub/inventory/forms.py @@ -1667,8 +1667,8 @@ class BindingForm(FlaskForm): self.phid.errors = [txt] return False - if self.device.is_abstract() != 'Abstract': - txt = "This is not a abstract device." + if self.device.is_abstract() not in ['Abstract', 'Real']: + txt = "This is not a Abstract or Real device." self.phid.errors = [txt] return False @@ -1682,7 +1682,7 @@ class BindingForm(FlaskForm): self.phid.errors = [txt] return False - if self.placeholder.binding: + if self.placeholder.status not in ['Abstract', 'Real']: txt = "This placeholder have a binding with other device. " txt += "Before you need to do an unbinding with this other device." self.phid.errors = [txt] diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index 1da71c58..f2d72350 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -163,7 +163,7 @@ class DeviceDetailView(GenericMixin): if form_binding.validate_on_submit(): next_url = url_for( 'inventory.binding', - dhid=form_binding.device.devicehub_id, + dhid=id, phid=form_binding.placeholder.phid, ) return flask.redirect(next_url) @@ -179,72 +179,108 @@ class BindingView(GenericMixin): template_name = 'inventory/binding.html' def dispatch_request(self, dhid, phid): + self.phid = phid + self.dhid = dhid + self.next_url = url_for('inventory.device_details', id=dhid) self.get_context() - old_device = ( - Device.query.filter(Device.owner_id == g.user.id) - .filter(Device.devicehub_id == dhid) - .first() - ) - new_placeholder = ( - Placeholder.query.filter(Placeholder.owner_id == g.user.id) - .filter(Placeholder.phid == phid) - .first() - ) - - if not old_device or old_device.placeholder.status != 'Abstract': - next_url = url_for('inventory.device_details', id=dhid) - messages.error('Device Dhid: "{}" not is a Abstract device!'.format(dhid)) - return flask.redirect(next_url) - - if not new_placeholder or new_placeholder.status != 'Real': - next_url = url_for('inventory.device_details', id=dhid) - messages.error('Device Phid: "{}" not is a Abstract device!'.format(phid)) - return flask.redirect(next_url) - - old_placeholder = old_device.placeholder - new_device = new_placeholder.device - abstract_device = old_placeholder.binding - new_dhid = new_device.devicehub_id + self.get_objects() + if self.check_errors(): + return flask.redirect(self.next_url) if request.method == 'POST': - - for plog in PlaceholdersLog.query.filter_by( - placeholder_id=old_placeholder.id - ): - db.session.delete(plog) - - for ac in old_device.actions: - ac.devices.add(new_device) - ac.devices.remove(old_device) - for act in ac.actions_device: - if act.device == old_device: - db.session.delete(act) - - for tag in list(old_device.tags): - tag.device = new_device - - db.session.delete(old_device) - abstract_device.binding = new_placeholder - db.session.commit() - - next_url = url_for('inventory.device_details', id=new_dhid) - messages.success( - 'Device Dhid: "{}" bind successfully with Phid: {}!'.format(dhid, phid) - ) - return flask.redirect(next_url) + return self.post() self.context.update( { - 'new_placeholder': new_placeholder, - 'old_placeholder': old_placeholder, + 'new_placeholder': self.new_placeholder, + 'old_placeholder': self.old_placeholder, 'page_title': 'Binding confirm', - 'actions': list(old_device.actions) + list(new_device.actions), - 'tags': list(old_device.tags) + list(new_device.tags), + 'actions': list(self.old_device.actions) + + list(self.new_device.actions), + 'tags': list(self.old_device.tags) + list(self.new_device.tags), + 'dhid': self.dhid, } ) return flask.render_template(self.template_name, **self.context) + def check_errors(self): + if not self.new_placeholder: + messages.error('Device Phid: "{}" not exist!'.format(self.phid)) + return True + + if self.old_device.placeholder.status != 'Abstract': + messages.error( + 'Device Dhid: "{}" is not a Abstract device!'.format(self.dhid) + ) + return True + + if self.new_placeholder.status == 'Twin': + messages.error('Device Phid: "{}" is a Twin device!'.format(self.phid)) + return True + + if self.new_placeholder.status == self.old_placeholder.status: + txt = 'Device Phid: "{}" and device Dhid: "{}" have the same status, "{}"!'.format( + self.phid, self.dhid, self.new_placeholder.status + ) + messages.error(txt) + return True + + def get_objects(self): + self.old_device = ( + Device.query.filter(Device.owner_id == g.user.id) + .filter(Device.devicehub_id == self.dhid) + .one() + ) + self.new_placeholder = ( + Placeholder.query.filter(Placeholder.owner_id == g.user.id) + .filter(Placeholder.phid == self.phid) + .first() + ) + + if not self.new_placeholder: + return + + if self.old_device.placeholder.status == 'Abstract': + self.new_device = self.new_placeholder.device + self.old_placeholder = self.old_device.placeholder + elif self.old_device.placeholder.status == 'Real': + self.new_device = self.old_device + self.old_placeholder = self.new_placeholder + self.old_device = self.old_placeholder.device + self.new_placeholder = self.new_device.placeholder + + self.abstract_device = self.old_placeholder.binding + self.new_dhid = self.new_device.devicehub_id + + def post(self): + for plog in PlaceholdersLog.query.filter_by( + placeholder_id=self.old_placeholder.id + ): + db.session.delete(plog) + + for ac in self.old_device.actions: + ac.devices.add(self.new_device) + ac.devices.remove(self.old_device) + for act in ac.actions_device: + if act.device == self.old_device: + db.session.delete(act) + + for tag in list(self.old_device.tags): + tag.device = self.new_device + + db.session.delete(self.old_device) + self.abstract_device.binding = self.new_placeholder + db.session.commit() + + next_url = url_for('inventory.device_details', id=self.new_dhid) + messages.success( + 'Device Dhid: "{}" bind successfully with Phid: {}!'.format( + self.dhid, self.phid + ) + ) + return flask.redirect(next_url) + class UnBindingView(GenericMixin): methods = ['GET', 'POST'] @@ -272,9 +308,9 @@ class UnBindingView(GenericMixin): self.get_context() if request.method == 'POST': - new_device = self.clone_device(placeholder.binding) - new_dhid = new_device.devicehub_id - next_url = url_for('inventory.device_details', id=new_dhid) + dhid = placeholder.device.devicehub_id + self.clone_device(placeholder.binding) + next_url = url_for('inventory.device_details', id=dhid) messages.success('Device Phid: "{}" unbind successfully!'.format(phid)) return flask.redirect(next_url) diff --git a/ereuse_devicehub/templates/inventory/binding.html b/ereuse_devicehub/templates/inventory/binding.html index d453d154..5d4b0ecb 100644 --- a/ereuse_devicehub/templates/inventory/binding.html +++ b/ereuse_devicehub/templates/inventory/binding.html @@ -184,7 +184,7 @@
    - Cancel + Cancel
    diff --git a/ereuse_devicehub/templates/inventory/device_detail.html b/ereuse_devicehub/templates/inventory/device_detail.html index 9dcc3ead..875d3508 100644 --- a/ereuse_devicehub/templates/inventory/device_detail.html +++ b/ereuse_devicehub/templates/inventory/device_detail.html @@ -46,7 +46,7 @@ - {% if placeholder.status == 'Abstract' %} + {% if placeholder.status in ['Abstract', 'Real'] %}
    • From 1e5254d7d39ef4679d754619ffb0d4644dabc10a Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 12 Aug 2022 12:28:48 +0200 Subject: [PATCH 06/29] buttons binding/unbinding --- .../templates/inventory/device_detail.html | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ereuse_devicehub/templates/inventory/device_detail.html b/ereuse_devicehub/templates/inventory/device_detail.html index 875d3508..b233c3ad 100644 --- a/ereuse_devicehub/templates/inventory/device_detail.html +++ b/ereuse_devicehub/templates/inventory/device_detail.html @@ -19,6 +19,18 @@

    {{ placeholder.device.devicehub_id }}

    +
    + {% if placeholder.status in ['Abstract', 'Real'] %} + + Binding + + {% elif placeholder.status == 'Twin' %} + + Unbinding + + {% endif %} +
    +
      @@ -46,18 +58,6 @@ - {% if placeholder.status in ['Abstract', 'Real'] %} -
    • - -
      • - {% endif %} - - {% if placeholder.status == 'Twin' %} -
    • - Unbinding -
      • - {% endif %} -
    From ae4ea03b49018871ea5fe328c39b8052c72b942b Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 12 Aug 2022 15:59:15 +0200 Subject: [PATCH 07/29] add new view for search phid --- ereuse_devicehub/inventory/views.py | 33 ++++++++++++--- .../templates/inventory/device_detail.html | 41 +------------------ 2 files changed, 30 insertions(+), 44 deletions(-) diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index f2d72350..3b1bff66 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -148,15 +148,37 @@ class DeviceDetailView(GenericMixin): .one() ) - form_binding = BindingForm(device=device) - self.context.update( { 'device': device, 'placeholder': device.binding or device.placeholder, 'page_title': 'Device {}'.format(device.devicehub_id), + } + ) + + return flask.render_template(self.template_name, **self.context) + + +class BindingSearchView(GenericMixin): + methods = ['GET', 'POST'] + decorators = [login_required] + template_name = 'inventory/binding_search.html' + + def dispatch_request(self, dhid): + self.get_context() + device = ( + Device.query.filter(Device.owner_id == current_user.id) + .filter(Device.devicehub_id == dhid) + .one() + ) + + form_binding = BindingForm(device=device) + + self.context.update( + { + 'page_title': 'Search a Device for to do a binding from {}'.format(device.devicehub_id), 'form_binding': form_binding, - 'active_binding': False, + 'device': device } ) @@ -167,8 +189,6 @@ class DeviceDetailView(GenericMixin): phid=form_binding.placeholder.phid, ) return flask.redirect(next_url) - elif form_binding.phid.data: - self.context['active_binding'] = True return flask.render_template(self.template_name, **self.context) @@ -1227,3 +1247,6 @@ devices.add_url_rule( devices.add_url_rule( '/unbinding//', view_func=UnBindingView.as_view('unbinding') ) +devices.add_url_rule( + '//binding/', view_func=BindingSearchView.as_view('binding_search') +) diff --git a/ereuse_devicehub/templates/inventory/device_detail.html b/ereuse_devicehub/templates/inventory/device_detail.html index b233c3ad..98bef52d 100644 --- a/ereuse_devicehub/templates/inventory/device_detail.html +++ b/ereuse_devicehub/templates/inventory/device_detail.html @@ -21,7 +21,7 @@

    {{ placeholder.device.devicehub_id }}

    {% if placeholder.status in ['Abstract', 'Real'] %} - + Binding {% elif placeholder.status == 'Twin' %} @@ -61,7 +61,7 @@
    -
    +
    Details Real parth
    @@ -232,43 +232,6 @@
    {% endif %}
    - {% if placeholder.status %} -
    -
    Binding
    -
    -

    - Be careful, binding implies changes in the data of a device that affect its - traceability. -

    -
    -
    -
    - {{ form_binding.csrf_token }} - {% for field in form_binding %} - {% if field != form_binding.csrf_token %} - -
    - {{ field.label(class_="form-label") }}: - {{ field }} - {% if field.errors %} -

    - {% for error in field.errors %} - {{ error }}
    - {% endfor %} -

    - {% endif %} -
    - - {% endif %} - {% endfor %} -
    - -
    -
    -
    -
    - {% endif %} -
    From d5de31338463ff8d47439813118059de14e76695 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 12 Aug 2022 16:29:51 +0200 Subject: [PATCH 08/29] fix binding search --- ereuse_devicehub/inventory/views.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index 3b1bff66..86770593 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -176,16 +176,18 @@ class BindingSearchView(GenericMixin): self.context.update( { - 'page_title': 'Search a Device for to do a binding from {}'.format(device.devicehub_id), + 'page_title': 'Search a Device for to do a binding from {}'.format( + device.devicehub_id + ), 'form_binding': form_binding, - 'device': device + 'device': device, } ) if form_binding.validate_on_submit(): next_url = url_for( 'inventory.binding', - dhid=id, + dhid=dhid, phid=form_binding.placeholder.phid, ) return flask.redirect(next_url) @@ -1248,5 +1250,6 @@ devices.add_url_rule( '/unbinding//', view_func=UnBindingView.as_view('unbinding') ) devices.add_url_rule( - '//binding/', view_func=BindingSearchView.as_view('binding_search') + '/device//binding/', + view_func=BindingSearchView.as_view('binding_search'), ) From 59509bf2d46216bc7429736d6a33ba327d7f2247 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Mon, 29 Aug 2022 11:37:39 +0200 Subject: [PATCH 09/29] messages succesfull --- ereuse_devicehub/inventory/views.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index 86770593..d673112c 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -273,7 +273,10 @@ class BindingView(GenericMixin): self.new_placeholder = self.new_device.placeholder self.abstract_device = self.old_placeholder.binding - self.new_dhid = self.new_device.devicehub_id + self.real_dhid = self.new_device.devicehub_id + self.real_phid = self.new_placeholder.phid + self.abstract_dhid = self.old_device.devicehub_id + self.abstract_phid = self.old_placeholder.phid def post(self): for plog in PlaceholdersLog.query.filter_by( @@ -295,10 +298,15 @@ class BindingView(GenericMixin): self.abstract_device.binding = self.new_placeholder db.session.commit() - next_url = url_for('inventory.device_details', id=self.new_dhid) + next_url = url_for('inventory.device_details', id=self.real_dhid) + txt = 'Device real with PHID: {} and DHID: {} bind successfully with ' + txt += 'device abstract PHID: {} DHID: {}.' messages.success( - 'Device Dhid: "{}" bind successfully with Phid: {}!'.format( - self.dhid, self.phid + txt.format( + self.real_phid, + self.real_dhid, + self.abstract_phid, + self.abstract_dhid ) ) return flask.redirect(next_url) @@ -333,7 +341,7 @@ class UnBindingView(GenericMixin): dhid = placeholder.device.devicehub_id self.clone_device(placeholder.binding) next_url = url_for('inventory.device_details', id=dhid) - messages.success('Device Phid: "{}" unbind successfully!'.format(phid)) + messages.success('Device with PHID:"{}" and DHID: {} unbind successfully!'.format(phid, dhid)) return flask.redirect(next_url) self.context.update( From 2f74a7526a7563eaff99f2277040f12137dfe338 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Mon, 29 Aug 2022 11:38:16 +0200 Subject: [PATCH 10/29] declare real and abstract details in the head --- ereuse_devicehub/templates/inventory/binding.html | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ereuse_devicehub/templates/inventory/binding.html b/ereuse_devicehub/templates/inventory/binding.html index 5d4b0ecb..e7410bb6 100644 --- a/ereuse_devicehub/templates/inventory/binding.html +++ b/ereuse_devicehub/templates/inventory/binding.html @@ -20,6 +20,17 @@
    {{ title }}

    Please check that the information is correct.

    +

    This is a binding between:  +

      + {% if new_placeholder.is_abstract %} +
    • 1. Device abstract with DHID:{{ new_placeholder.device.devicehub_id }} and PHID: {{ new_placeholder.phid }}
      • +
    • 2. Device real with DHID: {{ old_placeholder.device.devicehub_id }} and PHID:{{ old_placeholder.phid }}
      • + {% else %} +
    • 1. Device abstract with DHID:{{ old_placeholder.device.devicehub_id }} and PHID: {{ old_placeholder.phid }}
      • +
    • 2. Device real with DHID: {{ new_placeholder.device.devicehub_id }} and PHID:{{ new_placeholder.phid }}
      • + {% endif %} +
    +

    From c8ff7a74f13e5770e35c5dbce664d7ceb39f1f02 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Mon, 29 Aug 2022 12:49:15 +0200 Subject: [PATCH 11/29] messages succesfull --- ereuse_devicehub/inventory/views.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index d673112c..28f1e252 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -303,10 +303,7 @@ class BindingView(GenericMixin): txt += 'device abstract PHID: {} DHID: {}.' messages.success( txt.format( - self.real_phid, - self.real_dhid, - self.abstract_phid, - self.abstract_dhid + self.real_phid, self.real_dhid, self.abstract_phid, self.abstract_dhid ) ) return flask.redirect(next_url) @@ -341,7 +338,11 @@ class UnBindingView(GenericMixin): dhid = placeholder.device.devicehub_id self.clone_device(placeholder.binding) next_url = url_for('inventory.device_details', id=dhid) - messages.success('Device with PHID:"{}" and DHID: {} unbind successfully!'.format(phid, dhid)) + messages.success( + 'Device with PHID:"{}" and DHID: {} unbind successfully!'.format( + phid, dhid + ) + ) return flask.redirect(next_url) self.context.update( From df37c466369b3c081fdb3efe3e009514ec5b39bb Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Mon, 29 Aug 2022 12:50:01 +0200 Subject: [PATCH 12/29] messages and colors in binding details --- .../templates/inventory/binding.html | 47 +++++++++++++------ 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/ereuse_devicehub/templates/inventory/binding.html b/ereuse_devicehub/templates/inventory/binding.html index e7410bb6..1cb97765 100644 --- a/ereuse_devicehub/templates/inventory/binding.html +++ b/ereuse_devicehub/templates/inventory/binding.html @@ -31,6 +31,11 @@ {% endif %}

    +

    The DHID and PHID information of the abstract will be lost.

    +

    The information in red colour will be losted and replaced by the information in green colour.
    + The information in orange will be replaced by the information in green and you always can recover + it by doing an unbinding action or find this information into device details web. +

    @@ -45,72 +50,72 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - +
    Manufacturer: {{ new_placeholder.device.manufacturer or '' }}{{ old_placeholder.device.manufacturer or '' }}{{ old_placeholder.device.manufacturer or '' }}
    Model: {{ new_placeholder.device.model or '' }}{{ old_placeholder.device.model or '' }}{{ old_placeholder.device.model or '' }}
    Serial Number: {{ new_placeholder.device.serial_number or '' }}{{ old_placeholder.device.serial_number or '' }}{{ old_placeholder.device.serial_number or '' }}
    Brand: {{ new_placeholder.device.brand or '' }}{{ old_placeholder.device.brand or '' }}{{ old_placeholder.device.brand or '' }}
    Sku: {{ new_placeholder.device.sku or '' }}{{ old_placeholder.device.sku or '' }}{{ old_placeholder.device.sku or '' }}
    Generation: {{ new_placeholder.device.generation or '' }}{{ old_placeholder.device.generation or '' }}{{ old_placeholder.device.generation or '' }}
    Version: {{ new_placeholder.device.version or '' }}{{ old_placeholder.device.version or '' }}{{ old_placeholder.device.version or '' }}
    Weight: {{ new_placeholder.device.weight or '' }}{{ old_placeholder.device.weight or '' }}{{ old_placeholder.device.weight or '' }}
    Width: {{ new_placeholder.device.width or '' }}{{ old_placeholder.device.width or '' }}{{ old_placeholder.device.width or '' }}
    Height: {{ new_placeholder.device.height or '' }}{{ old_placeholder.device.height or '' }}{{ old_placeholder.device.height or '' }}
    Depth: {{ new_placeholder.device.depth or '' }}{{ old_placeholder.device.depth or '' }}{{ old_placeholder.device.depth or '' }}
    Color: {{ new_placeholder.device.color or '' }}{{ old_placeholder.device.color or '' }}{{ old_placeholder.device.color or '' }}
    Production date: {{ new_placeholder.device.production_date or '' }}{{ old_placeholder.device.production_date or '' }}{{ old_placeholder.device.production_date or '' }}
    Variant: {{ new_placeholder.device.variant or '' }}{{ old_placeholder.device.variant or '' }}{{ old_placeholder.device.variant or '' }}
    @@ -133,7 +138,7 @@ * {{ c.verbose_name }}
    {% endfor %} - + {% for c in old_placeholder.device.components %} * {{ c.verbose_name }}
    {% endfor %} @@ -147,6 +152,9 @@ {% if actions %}

    Actions

    +

    + The actions will become real device and will no longer be in the abstract +

    @@ -162,6 +170,9 @@ {% endfor %} @@ -172,6 +183,9 @@ {% if tags %}

    Tags

    +

    + The tags will become real device and will no longer be in the abstract +

    + {% for a in actions %} + * {{ a.t }}
    + {% endfor %}
    @@ -187,6 +201,9 @@ {% endfor %} From d3f87d553b05e632357838e4dbae04ef8a7b8cb2 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Mon, 29 Aug 2022 12:55:53 +0200 Subject: [PATCH 13/29] fix actions and tags colums --- ereuse_devicehub/templates/inventory/binding.html | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ereuse_devicehub/templates/inventory/binding.html b/ereuse_devicehub/templates/inventory/binding.html index 1cb97765..4aad3737 100644 --- a/ereuse_devicehub/templates/inventory/binding.html +++ b/ereuse_devicehub/templates/inventory/binding.html @@ -170,9 +170,6 @@ {% endfor %} @@ -201,9 +198,6 @@ {% endfor %} From 36dfba584df1bb57bbd3709b15ab264c46d397c5 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Mon, 29 Aug 2022 12:56:10 +0200 Subject: [PATCH 14/29] status colors and messages --- .../templates/inventory/unbinding.html | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/ereuse_devicehub/templates/inventory/unbinding.html b/ereuse_devicehub/templates/inventory/unbinding.html index c041bfea..1b397d28 100644 --- a/ereuse_devicehub/templates/inventory/unbinding.html +++ b/ereuse_devicehub/templates/inventory/unbinding.html @@ -34,72 +34,72 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - +
    + {% for tag in tags %} + * {{ tag.id }}
    + {% endfor %}
    - {% for a in actions %} - * {{ a.t }}
    - {% endfor %}
    - {% for tag in tags %} - * {{ tag.id }}
    - {% endfor %}
    Manufacturer: {{ placeholder.binding.manufacturer or '' }}{{ placeholder.device.manufacturer or '' }}{{ placeholder.device.manufacturer or '' }}
    Model: {{ placeholder.binding.model or '' }}{{ placeholder.device.model or '' }}{{ placeholder.device.model or '' }}
    Serial Number: {{ placeholder.binding.serial_number or '' }}{{ placeholder.device.serial_number or '' }}{{ placeholder.device.serial_number or '' }}
    Brand: {{ placeholder.binding.brand or '' }}{{ placeholder.device.brand or '' }}{{ placeholder.device.brand or '' }}
    Sku: {{ placeholder.binding.sku or '' }}{{ placeholder.device.sku or '' }}{{ placeholder.device.sku or '' }}
    Generation: {{ placeholder.binding.generation or '' }}{{ placeholder.device.generation or '' }}{{ placeholder.device.generation or '' }}
    Version: {{ placeholder.binding.version or '' }}{{ placeholder.device.version or '' }}{{ placeholder.device.version or '' }}
    Weight: {{ placeholder.binding.weight or '' }}{{ placeholder.device.weight or '' }}{{ placeholder.device.weight or '' }}
    Width: {{ placeholder.binding.width or '' }}{{ placeholder.device.width or '' }}{{ placeholder.device.width or '' }}
    Height: {{ placeholder.binding.height or '' }}{{ placeholder.device.height or '' }}{{ placeholder.device.height or '' }}
    Depth: {{ placeholder.binding.depth or '' }}{{ placeholder.device.depth or '' }}{{ placeholder.device.depth or '' }}
    Color: {{ placeholder.binding.color or '' }}{{ placeholder.device.color or '' }}{{ placeholder.device.color or '' }}
    Production date: {{ placeholder.binding.production_date or '' }}{{ placeholder.device.production_date or '' }}{{ placeholder.device.production_date or '' }}
    Variant: {{ placeholder.binding.variant or '' }}{{ placeholder.device.variant or '' }}{{ placeholder.device.variant or '' }}
    @@ -119,7 +119,7 @@ - + {{ placeholder.components or ''}} @@ -131,6 +131,9 @@ {% if placeholder.device.manual_actions or placeholder.binding.manual_actions %}

    Actions

    +

    + The actions will become real device and will no longer be in the abstract +

    @@ -157,6 +160,9 @@ {% if placeholder.device.tags %}

    Tags

    +

    + The tags will become real device and will no longer be in the abstract +

    From 05d1f9698cf9ab25060897115c61c08e1b0e4d45 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Mon, 29 Aug 2022 16:36:42 +0200 Subject: [PATCH 15/29] add both device in a public page when is a twin device --- .../device/templates/devices/layout.html | 192 ++++++++++++++++-- ereuse_devicehub/resources/device/views.py | 5 +- 2 files changed, 182 insertions(+), 15 deletions(-) diff --git a/ereuse_devicehub/resources/device/templates/devices/layout.html b/ereuse_devicehub/resources/device/templates/devices/layout.html index e4474426..f513d0b9 100644 --- a/ereuse_devicehub/resources/device/templates/devices/layout.html +++ b/ereuse_devicehub/resources/device/templates/devices/layout.html @@ -41,8 +41,8 @@
    -

    {{ device.__format__('t') }}
    - {{ device.__format__('s') }} +

    {% if abstract %}Real device {% endif %}{{ device.__format__('t') or '' }}
    + {{ device.__format__('s') or '' }}

    @@ -52,7 +52,7 @@
      {% for key, value in device.public_properties.items() %} -
    • {{ key }}: {{ value }}
      • +
    • {{ key }}: {{ value or '' }}
      • {% endfor %}
    {% if isinstance(device, d.Computer) %} @@ -140,17 +140,6 @@
    {% endif %} - {% if device.rate %} - - - - - {% endif %}
    - Total rate - - {{ device.rate.rating_range }} - ({{ device.rate.rating }}) -
    @@ -222,6 +211,181 @@ {% endif %}
    + {% if abstract %} +
    +
    +
    +

    Abstract device {{ abstract.__format__('t') or '' }}
    + {{ abstract.__format__('s') or '' }} +

    +
    +
    +
    +
    +
    +
    +
      + {% for key, value in abstract.public_properties.items() %} +
    • {{ key }}: {{ value or '' }}
      • + {% endfor %} +
    + {% if isinstance(abstract, d.Computer) %} +
    + + + + + + + + + {% if abstract.processor_model %} + + + + + {% endif %} + {% if abstract.ram_size %} + + + + + {% endif %} + {% if abstract.data_storage_size %} + + + + + {% endif %} + {% if abstract.graphic_card_model %} + + + + + {% endif %} + {% if abstract.network_speeds %} + + + + + {% endif %} + +
    Range
    + CPU – {{ abstract.processor_model }} + + Processor Rate = {% if abstract.rate %} + {{ abstract.rate.processor_range }} + ({{ abstract.rate.processor }}) + {% endif %} +
    + RAM – {{ abstract.ram_size // 1000 }} GB + {{ macros.component_type(abstract.components, 'RamModule') }} + + RAM Rate = {% if abstract.rate %} + {{ abstract.rate.ram_range }} + ({{ abstract.rate.ram }}) + {% endif %} +
    + Data Storage – {{ abstract.data_storage_size // 1000 }} GB + {{ macros.component_type(abstract.components, 'SolidStateDrive') }} + {{ macros.component_type(abstract.components, 'HardDrive') }} + + Data Storage Rate = {% if abstract.rate %} + {{ abstract.rate.data_storage_range }} + ({{ abstract.rate.data_storage }}) + {% endif %} +
    + Graphics – {{ abstract.graphic_card_model }} + {{ macros.component_type(abstract.components, 'GraphicCard') }} +
    + Network – + {% if abstract.network_speeds[0] %} + Ethernet + {% if abstract.network_speeds[0] != None %} + max. {{ abstract.network_speeds[0] }} Mbps + {% endif %} + {% endif %} + {% if abstract.network_speeds[0] and abstract.network_speeds[1] %} + + + {% endif %} + {% if abstract.network_speeds[1] %} + WiFi + {% if abstract.network_speeds[1] != None %} + max. {{ abstract.network_speeds[1] }} Mbps + {% endif %} + {% endif %} + {{ macros.component_type(abstract.components, 'NetworkAdapter') }} +
    +
    +

    Actual Status

    +
      +
    1. + + Lifecycle Status + + — + {% if abstract.status %} + {{ abstract.status.type }} + {% endif %} +
      2. +
    2. + + Allocate Status + + — + {% if abstract.allocated_status %} + {{ abstract.allocated_status.type }} + {% endif %} +
      3. +
    3. + + Physical Status + + — + {% if abstract.physical_status %} + {{ abstract.physical_status.type }} + {% endif %} +
      4. +
    + +

    Public traceability log of the abstract

    +
    + Latest one. +
    +
      + {% for action in abstract.public_actions %} +
    1. + + {{ abstract.is_status(action) }} + {% if not abstract.is_status(action) %} + {{ action.type }} + {% endif %} + + — + {% if abstract.is_status(action) %} + {{ action }} {{ action.type }} + {% else %} + {{ action }} + {% endif %} +
      +
      + + {{ action._date_str }} + +
      + {% if action.certificate %} + See the certificate + {% endif %} +
      2. + {% endfor %} +
    +
    + Oldest one. +
    + {% endif %} +
    +
    + {% endif %}
    diff --git a/ereuse_devicehub/resources/device/views.py b/ereuse_devicehub/resources/device/views.py index 238284e1..1fff5bcc 100644 --- a/ereuse_devicehub/resources/device/views.py +++ b/ereuse_devicehub/resources/device/views.py @@ -141,7 +141,10 @@ class DeviceView(View): device = Device.query.filter_by( devicehub_id=id, active=True ).one() - return render_template('devices/layout.html', device=device, states=states) + abstract = None + if device.is_abstract() == 'Twin': + abstract = device.placeholder.binding + return render_template('devices/layout.html', device=device, states=states, abstract=abstract) @auth.Auth.requires_auth def one_private(self, id: str): From 30f511a03afaeaf669f8592be0cfcd39304df00a Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Mon, 29 Aug 2022 16:36:57 +0200 Subject: [PATCH 16/29] add both device in a public page when is a twin device --- ereuse_devicehub/resources/device/views.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/ereuse_devicehub/resources/device/views.py b/ereuse_devicehub/resources/device/views.py index 1fff5bcc..2729592a 100644 --- a/ereuse_devicehub/resources/device/views.py +++ b/ereuse_devicehub/resources/device/views.py @@ -110,9 +110,7 @@ class DeviceView(View): return super().get(id) def patch(self, id): - dev = Device.query.filter_by( - id=id, owner_id=g.user.id, active=True - ).one() + dev = Device.query.filter_by(id=id, owner_id=g.user.id, active=True).one() if isinstance(dev, Computer): resource_def = app.resources['Computer'] # TODO check how to handle the 'actions_one' @@ -138,13 +136,13 @@ class DeviceView(View): return self.one_private(id) def one_public(self, id: int): - device = Device.query.filter_by( - devicehub_id=id, active=True - ).one() + device = Device.query.filter_by(devicehub_id=id, active=True).one() abstract = None if device.is_abstract() == 'Twin': abstract = device.placeholder.binding - return render_template('devices/layout.html', device=device, states=states, abstract=abstract) + return render_template( + 'devices/layout.html', device=device, states=states, abstract=abstract + ) @auth.Auth.requires_auth def one_private(self, id: str): From 43f1d4e209f6a47dc7543b07dc354eeb4b9ca0ca Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Mon, 29 Aug 2022 16:38:07 +0200 Subject: [PATCH 17/29] add template binding search --- .../templates/inventory/binding_search.html | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 ereuse_devicehub/templates/inventory/binding_search.html diff --git a/ereuse_devicehub/templates/inventory/binding_search.html b/ereuse_devicehub/templates/inventory/binding_search.html new file mode 100644 index 00000000..28fbad0b --- /dev/null +++ b/ereuse_devicehub/templates/inventory/binding_search.html @@ -0,0 +1,74 @@ +{% extends "ereuse_devicehub/base_site.html" %} +{% block main %} + +
    +

    Inventory

    + +
    + +
    +
    + +
    + +
    +
    +

    {{ device.devicehub_id }}

    + +
    + +
    +
    Binding
    + {% if device.is_abstract() == 'Twin' or not device.placeholder %} +
    +

    + Device with Dhid: {{ device.devicehub_id }} is a Twin device.
    + If you want to do a binding with this device, you need todo an Unbinding first.
    + You can to do this in here. +

    +
    + {% else %} +
    +

    + Be careful, binding implies changes in the data of a device that affect its traceability. +

    +
    +
    +
    + {{ form_binding.csrf_token }} + {% for field in form_binding %} + {% if field != form_binding.csrf_token %} + +
    + {{ field.label(class_="form-label") }}: + {{ field }} + {% if field.errors %} +

    + {% for error in field.errors %} + {{ error }}
    + {% endfor %} +

    + {% endif %} +
    + + {% endif %} + {% endfor %} +
    + +
    +
    +
    + {% endif %} +
    + +
    +
    +
    +
    +
    +{% endblock main %} From b5a738c44ab8d008f5107b0e7bd933e3897159c9 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Mon, 29 Aug 2022 17:22:29 +0200 Subject: [PATCH 18/29] fix test print label in test_render --- tests/test_render_2_0.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_render_2_0.py b/tests/test_render_2_0.py index 3395cda5..31965b13 100644 --- a/tests/test_render_2_0.py +++ b/tests/test_render_2_0.py @@ -419,7 +419,7 @@ def test_print_labels(user3: UserClientFlask): body, status = user3.post(uri, data=data) assert status == '200 OK' - path = "/inventory/device/{}/".format(dev.devicehub_id) + path = "/devices/{}".format(dev.devicehub_id) assert path in body assert "tag1" in body From bdf04061dc398e29998afa5fcef958bb4a1bdc51 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 30 Aug 2022 13:10:35 +0200 Subject: [PATCH 19/29] mv unique identifiers buttons to device details --- ereuse_devicehub/inventory/forms.py | 37 ++++++++---------- ereuse_devicehub/inventory/views.py | 26 ++++++++----- .../templates/ereuse_devicehub/base_site.html | 8 ++++ .../templates/inventory/addDevicestag.html | 12 ++---- .../templates/inventory/device_detail.html | 39 +++++++++++++++++++ .../templates/inventory/device_list.html | 33 ---------------- .../inventory/tag_unlink_device.html | 2 +- 7 files changed, 85 insertions(+), 72 deletions(-) diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py index 1864bb3b..83d18ad9 100644 --- a/ereuse_devicehub/inventory/forms.py +++ b/ereuse_devicehub/inventory/forms.py @@ -137,11 +137,11 @@ class FilterForm(FlaskForm): self.lot = self.lots.filter(Lot.id == self.lot_id).one() device_ids = (d.id for d in self.lot.devices) self.devices = Device.query.filter(Device.id.in_(device_ids)).filter( - Device.binding == None + Device.binding == None # noqa: E711 ) else: self.devices = Device.query.filter(Device.owner_id == g.user.id).filter( - Device.binding == None + Device.binding == None # noqa: E711 ) if self.only_unassigned: self.devices = self.devices.filter_by(lots=None) @@ -655,19 +655,30 @@ class NewDeviceForm(FlaskForm): class TagDeviceForm(FlaskForm): - tag = SelectField('Tag', choices=[]) - device = StringField('Device', [validators.Optional()]) + tag = SelectField( + 'Tag', + choices=[], + render_kw={ + 'class': 'form-control selectpicker', + 'data-live-search': 'true', + }, + ) def __init__(self, *args, **kwargs): self.delete = kwargs.pop('delete', None) - self.device_id = kwargs.pop('device', None) + self.dhid = kwargs.pop('dhid', None) + self._device = ( + Device.query.filter(Device.devicehub_id == self.dhid) + .filter(Device.owner_id == g.user.id) + .one() + ) super().__init__(*args, **kwargs) if self.delete: tags = ( Tag.query.filter(Tag.owner_id == g.user.id) - .filter_by(device_id=self.device_id) + .filter_by(device_id=self._device.id) .order_by(Tag.id) ) else: @@ -695,20 +706,6 @@ class TagDeviceForm(FlaskForm): self.tag.errors = [("This tag is actualy in use.")] return False - if self.device.data: - try: - self.device.data = int(self.device.data.split(',')[-1]) - except: # noqa: E722 - self.device.data = None - - if self.device_id or self.device.data: - self.device_id = self.device_id or self.device.data - self._device = ( - Device.query.filter(Device.id == self.device_id) - .filter(Device.owner_id == g.user.id) - .one() - ) - return True def save(self): diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index 28f1e252..8b65e37a 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -80,7 +80,6 @@ class DeviceListMixin(GenericMixin): self.context.update( { 'devices': devices, - 'form_tag_device': TagDeviceForm(), 'form_new_action': form_new_action, 'form_new_allocate': AllocateForm(lot=lot_id), 'form_new_datawipe': DataWipeForm(lot=lot_id), @@ -148,11 +147,13 @@ class DeviceDetailView(GenericMixin): .one() ) + form_tags = TagDeviceForm(dhid=id) self.context.update( { 'device': device, 'placeholder': device.binding or device.placeholder, 'page_title': 'Device {}'.format(device.devicehub_id), + 'form_tag_device': form_tags, } ) @@ -542,12 +543,15 @@ class TagLinkDeviceView(View): methods = ['POST'] decorators = [login_required] - def dispatch_request(self): - form = TagDeviceForm() + def dispatch_request(self, dhid): + form = TagDeviceForm(dhid=dhid) if form.validate_on_submit(): + tag = form.tag.data form.save() - return flask.redirect(request.referrer) + next_url = url_for('inventory.device_details', id=dhid) + messages.success('Tag {} was linked successfully!'.format(tag)) + return flask.redirect(next_url) class TagUnlinkDeviceView(GenericMixin): @@ -555,19 +559,20 @@ class TagUnlinkDeviceView(GenericMixin): decorators = [login_required] template_name = 'inventory/tag_unlink_device.html' - def dispatch_request(self, id): + def dispatch_request(self, dhid): self.get_context() - form = TagDeviceForm(delete=True, device=id) + form = TagDeviceForm(delete=True, dhid=dhid) if form.validate_on_submit(): form.remove() - next_url = url_for('inventory.devicelist') + next_url = url_for('inventory.device_details', id=dhid) + messages.success('Tag {} was unlinked successfully!'.format(form.tag.data)) return flask.redirect(next_url) self.context.update( { 'form': form, - 'referrer': request.referrer, + 'dhid': dhid, } ) @@ -1211,10 +1216,11 @@ devices.add_url_rule( '/device/edit//', view_func=DeviceEditView.as_view('device_edit') ) devices.add_url_rule( - '/tag/devices/add/', view_func=TagLinkDeviceView.as_view('tag_devices_add') + '/tag/devices//add/', + view_func=TagLinkDeviceView.as_view('tag_devices_add'), ) devices.add_url_rule( - '/tag/devices//del/', + '/tag/devices//del/', view_func=TagUnlinkDeviceView.as_view('tag_devices_del'), ) devices.add_url_rule( diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html index 87dfb226..4d793495 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html @@ -256,6 +256,14 @@ +
  • Unique Identifiers (Tags)
    • + +
  • + +
    • + diff --git a/ereuse_devicehub/templates/inventory/addDevicestag.html b/ereuse_devicehub/templates/inventory/addDevicestag.html index bb02c221..55c11fbc 100644 --- a/ereuse_devicehub/templates/inventory/addDevicestag.html +++ b/ereuse_devicehub/templates/inventory/addDevicestag.html @@ -7,16 +7,12 @@
    -
    - {{ form_tag_device.csrf_token }} +
    Please write a name of a unique identifier - - + {% for f in form_tag_device %} + {{ f }} + {% endfor %}

    You need select first one device and only one for add this in a unique identifier

    diff --git a/ereuse_devicehub/templates/inventory/device_detail.html b/ereuse_devicehub/templates/inventory/device_detail.html index 98bef52d..3d9c18d3 100644 --- a/ereuse_devicehub/templates/inventory/device_detail.html +++ b/ereuse_devicehub/templates/inventory/device_detail.html @@ -20,6 +20,28 @@

    {{ placeholder.device.devicehub_id }}

    +
    + + + + +
    {% if placeholder.status in ['Abstract', 'Real'] %} Binding @@ -30,6 +52,7 @@ {% endif %}
    +
      @@ -237,4 +260,20 @@
    + + +{% include "inventory/addDevicestag.html" %} {% endblock main %} diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html index b2ed449d..8d305417 100644 --- a/ereuse_devicehub/templates/inventory/device_list.html +++ b/ereuse_devicehub/templates/inventory/device_list.html @@ -268,42 +268,11 @@
    -
    - - - - -
    -
    - -
    • @@ -610,14 +579,12 @@
    -{% include "inventory/addDevicestag.html" %} {% include "inventory/lot_delete_modal.html" %} {% include "inventory/actions.html" %} {% include "inventory/allocate.html" %} {% include "inventory/data_wipe.html" %} {% include "inventory/trade.html" %} {% include "inventory/alert_export_error.html" %} -{% include "inventory/alert_unlink_tag_error.html" %} {% include "inventory/alert_lots_changes.html" %} diff --git a/ereuse_devicehub/templates/inventory/tag_unlink_device.html b/ereuse_devicehub/templates/inventory/tag_unlink_device.html index af6ed3a6..42d67014 100644 --- a/ereuse_devicehub/templates/inventory/tag_unlink_device.html +++ b/ereuse_devicehub/templates/inventory/tag_unlink_device.html @@ -49,7 +49,7 @@
    - Cancel + Cancel
    From 4dfbb4a0dcb9db7313946828308f961051f398f7 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 30 Aug 2022 13:17:58 +0200 Subject: [PATCH 20/29] js unique identifiers fix --- .../static/js/main_inventory.build.js | 31 ------------------- ereuse_devicehub/static/js/main_inventory.js | 31 ------------------- 2 files changed, 62 deletions(-) diff --git a/ereuse_devicehub/static/js/main_inventory.build.js b/ereuse_devicehub/static/js/main_inventory.build.js index 7737a44c..0ae433c1 100644 --- a/ereuse_devicehub/static/js/main_inventory.build.js +++ b/ereuse_devicehub/static/js/main_inventory.build.js @@ -178,8 +178,6 @@ function deviceSelect() { $("#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(); @@ -197,8 +195,6 @@ function deviceSelect() { $("#allocateModal .btn-primary").show(); $("#datawipeModal .pol").hide(); $("#datawipeModal .btn-primary").show(); - $("#addingTagModal .pol").hide(); - $("#addingTagModal .btn-primary").show(); } } @@ -214,33 +210,6 @@ function removeLot() { $("#activeRemoveLotModal").click(); } -function removeTag() { - const devices = TableController.getSelectedDevices(); - const devices_id = devices.map(dev => $(dev).attr('data')); - - if (devices_id.length == 1) { - const url = "/inventory/tag/devices/".concat(devices_id[0], "/del/"); - window.location.href = url; - } else { - $("#unlinkTagAlertModal").click(); - } -} - -function addTag() { - const devices = TableController.getSelectedDevices(); - const devices_id = devices.map(dev => $(dev).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 select_shift() { const chkboxes = $('.deviceSelect'); var lastChecked = null; diff --git a/ereuse_devicehub/static/js/main_inventory.js b/ereuse_devicehub/static/js/main_inventory.js index d80d6c66..061c82e0 100644 --- a/ereuse_devicehub/static/js/main_inventory.js +++ b/ereuse_devicehub/static/js/main_inventory.js @@ -163,9 +163,6 @@ function deviceSelect() { $("#removeLotModal .pol").show(); $("#removeLotModal .btn-primary").hide(); - $("#addingTagModal .pol").show(); - $("#addingTagModal .btn-primary").hide(); - $("#actionModal .pol").show(); $("#actionModal .btn-primary").hide(); @@ -189,9 +186,6 @@ function deviceSelect() { $("#datawipeModal .pol").hide(); $("#datawipeModal .btn-primary").show(); - - $("#addingTagModal .pol").hide(); - $("#addingTagModal .btn-primary").show(); } } @@ -205,31 +199,6 @@ function removeLot() { $("#activeRemoveLotModal").click(); } -function removeTag() { - const devices = TableController.getSelectedDevices(); - const devices_id = devices.map(dev => $(dev).attr("data")); - if (devices_id.length == 1) { - const url = `/inventory/tag/devices/${devices_id[0]}/del/`; - window.location.href = url; - } else { - $("#unlinkTagAlertModal").click(); - } -} - -function addTag() { - const devices = TableController.getSelectedDevices(); - const devices_id = devices.map(dev => $(dev).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 select_shift() { const chkboxes = $(".deviceSelect"); let lastChecked = null; From 4935a1bd7546f876c6f10d5a30764c2ca7a1b84d Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 30 Aug 2022 15:12:14 +0200 Subject: [PATCH 21/29] add phid in advanced search --- ereuse_devicehub/inventory/forms.py | 8 +++- .../templates/inventory/search.html | 43 ++++--------------- 2 files changed, 16 insertions(+), 35 deletions(-) diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py index 83d18ad9..ede98e95 100644 --- a/ereuse_devicehub/inventory/forms.py +++ b/ereuse_devicehub/inventory/forms.py @@ -110,7 +110,13 @@ class AdvancedSearchForm(FlaskForm): self.search(dhids) def search(self, dhids): - self.devices = Device.query.filter(Device.devicehub_id.in_(dhids)) + query = Device.query.filter(Device.owner_id == g.user.id) + self.devices = query.join(Device.placeholder).filter( + or_( + Device.devicehub_id.in_(dhids), + Placeholder.phid.in_(dhids), + ) + ) class FilterForm(FlaskForm): diff --git a/ereuse_devicehub/templates/inventory/search.html b/ereuse_devicehub/templates/inventory/search.html index d996a1f3..06a4f42e 100644 --- a/ereuse_devicehub/templates/inventory/search.html +++ b/ereuse_devicehub/templates/inventory/search.html @@ -28,7 +28,7 @@
    - {% if devices %} + {% if devices.count() %}
    @@ -178,42 +178,11 @@
    -
    - - - - -
    -
    - -
    -{% include "inventory/addDevicestag.html" %} {% include "inventory/lot_delete_modal.html" %} {% include "inventory/actions.html" %} {% include "inventory/allocate.html" %} {% include "inventory/data_wipe.html" %} {% include "inventory/trade.html" %} {% include "inventory/alert_export_error.html" %} -{% include "inventory/alert_unlink_tag_error.html" %} {% include "inventory/alert_lots_changes.html" %} From c0653e51cedc10178adaf76a75a687eab45a907f Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 31 Aug 2022 10:55:49 +0200 Subject: [PATCH 22/29] redirect public link from abstract to real device --- ereuse_devicehub/resources/device/models.py | 3 +++ ereuse_devicehub/resources/device/views.py | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/ereuse_devicehub/resources/device/models.py b/ereuse_devicehub/resources/device/models.py index 5bc25477..7772eacc 100644 --- a/ereuse_devicehub/resources/device/models.py +++ b/ereuse_devicehub/resources/device/models.py @@ -324,6 +324,9 @@ class Device(Thing): @property def public_link(self) -> str: + if self.binding: + return self.binding.device.public_link + host_url = request.host_url.strip('/') return "{}{}".format(host_url, self.url.to_text()) diff --git a/ereuse_devicehub/resources/device/views.py b/ereuse_devicehub/resources/device/views.py index 2729592a..e6e158a4 100644 --- a/ereuse_devicehub/resources/device/views.py +++ b/ereuse_devicehub/resources/device/views.py @@ -2,6 +2,7 @@ import datetime import uuid from itertools import filterfalse +import flask import marshmallow from flask import Response from flask import current_app as app @@ -138,8 +139,12 @@ class DeviceView(View): def one_public(self, id: int): device = Device.query.filter_by(devicehub_id=id, active=True).one() abstract = None + if device.binding: + return flask.redirect(device.public_link) + if device.is_abstract() == 'Twin': abstract = device.placeholder.binding + return render_template( 'devices/layout.html', device=device, states=states, abstract=abstract ) From eefcaeb6a0e617fe8211a51bee039ae04a8698de Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 31 Aug 2022 11:04:59 +0200 Subject: [PATCH 23/29] split new device in a parth real and other abstract --- .../templates/inventory/device_list.html | 31 ++++++++++++------- .../templates/inventory/search.html | 29 ++++++++++++++--- 2 files changed, 44 insertions(+), 16 deletions(-) diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html index 8d305417..4502b63e 100644 --- a/ereuse_devicehub/templates/inventory/device_list.html +++ b/ereuse_devicehub/templates/inventory/device_list.html @@ -291,19 +291,9 @@
    +
    + + +
    + {% if lot and not lot.is_temporary %}
    +
    + +
    + + From d2975ba3138397c705f9cf5c0f736c8b40c4cb32 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 31 Aug 2022 12:43:59 +0200 Subject: [PATCH 24/29] values of dimension optional in a new devices --- ereuse_devicehub/inventory/forms.py | 34 +++++++++++------------------ 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py index ede98e95..a87442c4 100644 --- a/ereuse_devicehub/inventory/forms.py +++ b/ereuse_devicehub/inventory/forms.py @@ -370,18 +370,6 @@ class NewDeviceForm(FlaskForm): if not self.generation.data: self.generation.data = 1 - if not self.weight.data: - self.weight.data = 0.1 - - if not self.height.data: - self.height.data = 0.1 - - if not self.width.data: - self.width.data = 0.1 - - if not self.depth.data: - self.depth.data = 0.1 - def reset_from_obj(self): if not self._obj: return @@ -455,24 +443,28 @@ class NewDeviceForm(FlaskForm): error = ["Not a correct value"] is_valid = super().validate(extra_validators) - if self.generation.data < 1: + if self.generation.data and self.generation.data < 1: self.generation.errors = error is_valid = False - if self.weight.data < 0.1: - self.weight.errors = error + if self.weight.data and not (0.1 <= self.weight.data <= 5): + txt = ["Supported values between 0.1 and 5"] + self.weight.errors = txt is_valid = False - if self.height.data < 0.1: - self.height.errors = error + if self.height.data and not (0.1 <= self.height.data <= 5): + txt = ["Supported values between 0.1 and 5"] + self.height.errors = txt is_valid = False - if self.width.data < 0.1: - self.width.errors = error + if self.width.data and not (0.1 <= self.width.data <= 5): + txt = ["Supported values between 0.1 and 5"] + self.width.errors = txt is_valid = False - if self.depth.data < 0.1: - self.depth.errors = error + if self.depth.data and not (0.1 <= self.depth.data <= 5): + txt = ["Supported values between 0.1 and 5"] + self.depth.errors = txt is_valid = False if self.imei.data and self.amount.data == 1: From a222b37ecc733584391de9b469280c286770c538 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 31 Aug 2022 17:25:38 +0200 Subject: [PATCH 25/29] fixing tests --- tests/files/basic.csv | 2 +- tests/files/export_devices.csv | 2 +- tests/files/proposal_extended_csv_report.csv | 4 +-- tests/test_basic.py | 5 ++-- tests/test_device.py | 24 ++++++++++++---- tests/test_render_2_0.py | 29 +++++++++++++------- 6 files changed, 44 insertions(+), 22 deletions(-) diff --git a/tests/files/basic.csv b/tests/files/basic.csv index 53fdf0b6..7d800ec5 100644 --- a/tests/files/basic.csv +++ b/tests/files/basic.csv @@ -1,2 +1,2 @@ "DHID";"DocumentID";"Public Link";"Lots";"Tag 1 Type";"Tag 1 ID";"Tag 1 Organization";"Tag 2 Type";"Tag 2 ID";"Tag 2 Organization";"Tag 3 Type";"Tag 3 ID";"Tag 3 Organization";"Device Hardware ID";"Device Type";"Device Chassis";"Device Serial Number";"Device Model";"Device Manufacturer";"Registered in";"Registered (process)";"Updated in (software)";"Updated in (web)";"Physical state";"Allocate state";"Lifecycle state";"Processor";"RAM (MB)";"Data Storage Size (MB)";"Processor 1";"Processor 1 Manufacturer";"Processor 1 Model";"Processor 1 Serial Number";"Processor 1 Number of cores";"Processor 1 Speed (GHz)";"Benchmark Processor 1 (points)";"Benchmark ProcessorSysbench Processor 1 (points)";"Processor 2";"Processor 2 Manufacturer";"Processor 2 Model";"Processor 2 Serial Number";"Processor 2 Number of cores";"Processor 2 Speed (GHz)";"Benchmark Processor 2 (points)";"Benchmark ProcessorSysbench Processor 2 (points)";"RamModule 1";"RamModule 1 Manufacturer";"RamModule 1 Model";"RamModule 1 Serial Number";"RamModule 1 Size (MB)";"RamModule 1 Speed (MHz)";"RamModule 2";"RamModule 2 Manufacturer";"RamModule 2 Model";"RamModule 2 Serial Number";"RamModule 2 Size (MB)";"RamModule 2 Speed (MHz)";"RamModule 3";"RamModule 3 Manufacturer";"RamModule 3 Model";"RamModule 3 Serial Number";"RamModule 3 Size (MB)";"RamModule 3 Speed (MHz)";"RamModule 4";"RamModule 4 Manufacturer";"RamModule 4 Model";"RamModule 4 Serial Number";"RamModule 4 Size (MB)";"RamModule 4 Speed (MHz)";"DataStorage 1";"DataStorage 1 Manufacturer";"DataStorage 1 Model";"DataStorage 1 Serial Number";"DataStorage 1 Size (MB)";"Erasure DataStorage 1";"Erasure DataStorage 1 Serial Number";"Erasure DataStorage 1 Size (MB)";"Erasure DataStorage 1 Software";"Erasure DataStorage 1 Result";"Erasure DataStorage 1 Certificate URL";"Erasure DataStorage 1 Type";"Erasure DataStorage 1 Method";"Erasure DataStorage 1 Elapsed (hours)";"Erasure DataStorage 1 Date";"Erasure DataStorage 1 Steps";"Erasure DataStorage 1 Steps Start Time";"Erasure DataStorage 1 Steps End Time";"Benchmark DataStorage 1 Read Speed (MB/s)";"Benchmark DataStorage 1 Writing speed (MB/s)";"Test DataStorage 1 Software";"Test DataStorage 1 Type";"Test DataStorage 1 Result";"Test DataStorage 1 Power cycle count";"Test DataStorage 1 Lifetime (days)";"Test DataStorage 1 Power on hours";"DataStorage 2";"DataStorage 2 Manufacturer";"DataStorage 2 Model";"DataStorage 2 Serial Number";"DataStorage 2 Size (MB)";"Erasure DataStorage 2";"Erasure DataStorage 2 Serial Number";"Erasure DataStorage 2 Size (MB)";"Erasure DataStorage 2 Software";"Erasure DataStorage 2 Result";"Erasure DataStorage 2 Certificate URL";"Erasure DataStorage 2 Type";"Erasure DataStorage 2 Method";"Erasure DataStorage 2 Elapsed (hours)";"Erasure DataStorage 2 Date";"Erasure DataStorage 2 Steps";"Erasure DataStorage 2 Steps Start Time";"Erasure DataStorage 2 Steps End Time";"Benchmark DataStorage 2 Read Speed (MB/s)";"Benchmark DataStorage 2 Writing speed (MB/s)";"Test DataStorage 2 Software";"Test DataStorage 2 Type";"Test DataStorage 2 Result";"Test DataStorage 2 Power cycle count";"Test DataStorage 2 Lifetime (days)";"Test DataStorage 2 Power on hours";"DataStorage 3";"DataStorage 3 Manufacturer";"DataStorage 3 Model";"DataStorage 3 Serial Number";"DataStorage 3 Size (MB)";"Erasure DataStorage 3";"Erasure DataStorage 3 Serial Number";"Erasure DataStorage 3 Size (MB)";"Erasure DataStorage 3 Software";"Erasure DataStorage 3 Result";"Erasure DataStorage 3 Certificate URL";"Erasure DataStorage 3 Type";"Erasure DataStorage 3 Method";"Erasure DataStorage 3 Elapsed (hours)";"Erasure DataStorage 3 Date";"Erasure DataStorage 3 Steps";"Erasure DataStorage 3 Steps Start Time";"Erasure DataStorage 3 Steps End Time";"Benchmark DataStorage 3 Read Speed (MB/s)";"Benchmark DataStorage 3 Writing speed (MB/s)";"Test DataStorage 3 Software";"Test DataStorage 3 Type";"Test DataStorage 3 Result";"Test DataStorage 3 Power cycle count";"Test DataStorage 3 Lifetime (days)";"Test DataStorage 3 Power on hours";"DataStorage 4";"DataStorage 4 Manufacturer";"DataStorage 4 Model";"DataStorage 4 Serial Number";"DataStorage 4 Size (MB)";"Erasure DataStorage 4";"Erasure DataStorage 4 Serial Number";"Erasure DataStorage 4 Size (MB)";"Erasure DataStorage 4 Software";"Erasure DataStorage 4 Result";"Erasure DataStorage 4 Certificate URL";"Erasure DataStorage 4 Type";"Erasure DataStorage 4 Method";"Erasure DataStorage 4 Elapsed (hours)";"Erasure DataStorage 4 Date";"Erasure DataStorage 4 Steps";"Erasure DataStorage 4 Steps Start Time";"Erasure DataStorage 4 Steps End Time";"Benchmark DataStorage 4 Read Speed (MB/s)";"Benchmark DataStorage 4 Writing speed (MB/s)";"Test DataStorage 4 Software";"Test DataStorage 4 Type";"Test DataStorage 4 Result";"Test DataStorage 4 Power cycle count";"Test DataStorage 4 Lifetime (days)";"Test DataStorage 4 Power on hours";"Motherboard 1";"Motherboard 1 Manufacturer";"Motherboard 1 Model";"Motherboard 1 Serial Number";"Display 1";"Display 1 Manufacturer";"Display 1 Model";"Display 1 Serial Number";"GraphicCard 1";"GraphicCard 1 Manufacturer";"GraphicCard 1 Model";"GraphicCard 1 Serial Number";"GraphicCard 1 Memory (MB)";"GraphicCard 2";"GraphicCard 2 Manufacturer";"GraphicCard 2 Model";"GraphicCard 2 Serial Number";"GraphicCard 2 Memory (MB)";"NetworkAdapter 1";"NetworkAdapter 1 Manufacturer";"NetworkAdapter 1 Model";"NetworkAdapter 1 Serial Number";"NetworkAdapter 2";"NetworkAdapter 2 Manufacturer";"NetworkAdapter 2 Model";"NetworkAdapter 2 Serial Number";"SoundCard 1";"SoundCard 1 Manufacturer";"SoundCard 1 Model";"SoundCard 1 Serial Number";"SoundCard 2";"SoundCard 2 Manufacturer";"SoundCard 2 Model";"SoundCard 2 Serial Number";"Device Rate";"Device Range";"Processor Rate";"Processor Range";"RAM Rate";"RAM Range";"Data Storage Rate";"Data Storage Range";"Benchmark RamSysbench (points)";"PHID";"Is Abstract";"Pallet";"id Supplier";"Real Info";"Real Components";"Real Type";"Real Serial Number";"Real Model";"Real Manufacturer" -"O48N2";"";"http://localhost/devices/O48N2";"";"";"";"";"";"";"";"";"";"";"desktop-d1mr-d1ml-d1s";"Desktop";"Microtower";"d1s";"d1ml";"d1mr";"Wed Aug 10 10:04:56 2022";"Workbench 11.0";"2022-08-10 10:04:56.794798+02:00";"";"";"";"";"p1ml";"0";"0";"Processor 7: model p1ml, S/N p1s";"p1mr";"p1ml";"p1s";"";"1.6";"2410.0";"";"";"";"";"";"";"";"";"";"RamModule 6: model rm1ml, S/N rm1s";"rm1mr";"rm1ml";"rm1s";"";"1333";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"GraphicCard 5: model gc1ml, S/N gc1s";"gc1mr";"gc1ml";"gc1s";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"4";"Abstract";"";"";"";"";"Desktop";"d1s";"d1ml";"d1mr" +"E39W3";"";"http://localhost/devices/O48N2";"";"";"";"";"";"";"";"";"";"";"desktop-d1mr-d1ml-d1s";"Desktop";"Microtower";"d1s";"d1ml";"d1mr";"Wed Aug 10 10:04:56 2022";"Workbench 11.0";"2022-08-10 10:04:56.794798+02:00";"";"";"";"";"p1ml";"0";"0";"Processor 7: model p1ml, S/N p1s";"p1mr";"p1ml";"p1s";"";"1.6";"2410.0";"";"";"";"";"";"";"";"";"";"RamModule 6: model rm1ml, S/N rm1s";"rm1mr";"rm1ml";"rm1s";"";"1333";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"GraphicCard 5: model gc1ml, S/N gc1s";"gc1mr";"gc1ml";"gc1s";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"4";"Abstract";"";"";"";"";"Desktop";"d1s";"d1ml";"d1mr" diff --git a/tests/files/export_devices.csv b/tests/files/export_devices.csv index 8089dd42..ce76ab52 100644 --- a/tests/files/export_devices.csv +++ b/tests/files/export_devices.csv @@ -1,2 +1,2 @@ "DHID";"DocumentID";"Public Link";"Lots";"Tag 1 Type";"Tag 1 ID";"Tag 1 Organization";"Tag 2 Type";"Tag 2 ID";"Tag 2 Organization";"Tag 3 Type";"Tag 3 ID";"Tag 3 Organization";"Device Hardware ID";"Device Type";"Device Chassis";"Device Serial Number";"Device Model";"Device Manufacturer";"Registered in";"Registered (process)";"Updated in (software)";"Updated in (web)";"Physical state";"Allocate state";"Lifecycle state";"Processor";"RAM (MB)";"Data Storage Size (MB)";"Processor 1";"Processor 1 Manufacturer";"Processor 1 Model";"Processor 1 Serial Number";"Processor 1 Number of cores";"Processor 1 Speed (GHz)";"Benchmark Processor 1 (points)";"Benchmark ProcessorSysbench Processor 1 (points)";"Processor 2";"Processor 2 Manufacturer";"Processor 2 Model";"Processor 2 Serial Number";"Processor 2 Number of cores";"Processor 2 Speed (GHz)";"Benchmark Processor 2 (points)";"Benchmark ProcessorSysbench Processor 2 (points)";"RamModule 1";"RamModule 1 Manufacturer";"RamModule 1 Model";"RamModule 1 Serial Number";"RamModule 1 Size (MB)";"RamModule 1 Speed (MHz)";"RamModule 2";"RamModule 2 Manufacturer";"RamModule 2 Model";"RamModule 2 Serial Number";"RamModule 2 Size (MB)";"RamModule 2 Speed (MHz)";"RamModule 3";"RamModule 3 Manufacturer";"RamModule 3 Model";"RamModule 3 Serial Number";"RamModule 3 Size (MB)";"RamModule 3 Speed (MHz)";"RamModule 4";"RamModule 4 Manufacturer";"RamModule 4 Model";"RamModule 4 Serial Number";"RamModule 4 Size (MB)";"RamModule 4 Speed (MHz)";"DataStorage 1";"DataStorage 1 Manufacturer";"DataStorage 1 Model";"DataStorage 1 Serial Number";"DataStorage 1 Size (MB)";"Erasure DataStorage 1";"Erasure DataStorage 1 Serial Number";"Erasure DataStorage 1 Size (MB)";"Erasure DataStorage 1 Software";"Erasure DataStorage 1 Result";"Erasure DataStorage 1 Certificate URL";"Erasure DataStorage 1 Type";"Erasure DataStorage 1 Method";"Erasure DataStorage 1 Elapsed (hours)";"Erasure DataStorage 1 Date";"Erasure DataStorage 1 Steps";"Erasure DataStorage 1 Steps Start Time";"Erasure DataStorage 1 Steps End Time";"Benchmark DataStorage 1 Read Speed (MB/s)";"Benchmark DataStorage 1 Writing speed (MB/s)";"Test DataStorage 1 Software";"Test DataStorage 1 Type";"Test DataStorage 1 Result";"Test DataStorage 1 Power cycle count";"Test DataStorage 1 Lifetime (days)";"Test DataStorage 1 Power on hours";"DataStorage 2";"DataStorage 2 Manufacturer";"DataStorage 2 Model";"DataStorage 2 Serial Number";"DataStorage 2 Size (MB)";"Erasure DataStorage 2";"Erasure DataStorage 2 Serial Number";"Erasure DataStorage 2 Size (MB)";"Erasure DataStorage 2 Software";"Erasure DataStorage 2 Result";"Erasure DataStorage 2 Certificate URL";"Erasure DataStorage 2 Type";"Erasure DataStorage 2 Method";"Erasure DataStorage 2 Elapsed (hours)";"Erasure DataStorage 2 Date";"Erasure DataStorage 2 Steps";"Erasure DataStorage 2 Steps Start Time";"Erasure DataStorage 2 Steps End Time";"Benchmark DataStorage 2 Read Speed (MB/s)";"Benchmark DataStorage 2 Writing speed (MB/s)";"Test DataStorage 2 Software";"Test DataStorage 2 Type";"Test DataStorage 2 Result";"Test DataStorage 2 Power cycle count";"Test DataStorage 2 Lifetime (days)";"Test DataStorage 2 Power on hours";"DataStorage 3";"DataStorage 3 Manufacturer";"DataStorage 3 Model";"DataStorage 3 Serial Number";"DataStorage 3 Size (MB)";"Erasure DataStorage 3";"Erasure DataStorage 3 Serial Number";"Erasure DataStorage 3 Size (MB)";"Erasure DataStorage 3 Software";"Erasure DataStorage 3 Result";"Erasure DataStorage 3 Certificate URL";"Erasure DataStorage 3 Type";"Erasure DataStorage 3 Method";"Erasure DataStorage 3 Elapsed (hours)";"Erasure DataStorage 3 Date";"Erasure DataStorage 3 Steps";"Erasure DataStorage 3 Steps Start Time";"Erasure DataStorage 3 Steps End Time";"Benchmark DataStorage 3 Read Speed (MB/s)";"Benchmark DataStorage 3 Writing speed (MB/s)";"Test DataStorage 3 Software";"Test DataStorage 3 Type";"Test DataStorage 3 Result";"Test DataStorage 3 Power cycle count";"Test DataStorage 3 Lifetime (days)";"Test DataStorage 3 Power on hours";"DataStorage 4";"DataStorage 4 Manufacturer";"DataStorage 4 Model";"DataStorage 4 Serial Number";"DataStorage 4 Size (MB)";"Erasure DataStorage 4";"Erasure DataStorage 4 Serial Number";"Erasure DataStorage 4 Size (MB)";"Erasure DataStorage 4 Software";"Erasure DataStorage 4 Result";"Erasure DataStorage 4 Certificate URL";"Erasure DataStorage 4 Type";"Erasure DataStorage 4 Method";"Erasure DataStorage 4 Elapsed (hours)";"Erasure DataStorage 4 Date";"Erasure DataStorage 4 Steps";"Erasure DataStorage 4 Steps Start Time";"Erasure DataStorage 4 Steps End Time";"Benchmark DataStorage 4 Read Speed (MB/s)";"Benchmark DataStorage 4 Writing speed (MB/s)";"Test DataStorage 4 Software";"Test DataStorage 4 Type";"Test DataStorage 4 Result";"Test DataStorage 4 Power cycle count";"Test DataStorage 4 Lifetime (days)";"Test DataStorage 4 Power on hours";"Motherboard 1";"Motherboard 1 Manufacturer";"Motherboard 1 Model";"Motherboard 1 Serial Number";"Display 1";"Display 1 Manufacturer";"Display 1 Model";"Display 1 Serial Number";"GraphicCard 1";"GraphicCard 1 Manufacturer";"GraphicCard 1 Model";"GraphicCard 1 Serial Number";"GraphicCard 1 Memory (MB)";"GraphicCard 2";"GraphicCard 2 Manufacturer";"GraphicCard 2 Model";"GraphicCard 2 Serial Number";"GraphicCard 2 Memory (MB)";"NetworkAdapter 1";"NetworkAdapter 1 Manufacturer";"NetworkAdapter 1 Model";"NetworkAdapter 1 Serial Number";"NetworkAdapter 2";"NetworkAdapter 2 Manufacturer";"NetworkAdapter 2 Model";"NetworkAdapter 2 Serial Number";"SoundCard 1";"SoundCard 1 Manufacturer";"SoundCard 1 Model";"SoundCard 1 Serial Number";"SoundCard 2";"SoundCard 2 Manufacturer";"SoundCard 2 Model";"SoundCard 2 Serial Number";"Device Rate";"Device Range";"Processor Rate";"Processor Range";"RAM Rate";"RAM Range";"Data Storage Rate";"Data Storage Range";"Benchmark RamSysbench (points)";"PHID";"Is Abstract";"Pallet";"id Supplier";"Real Info";"Real Components";"Real Type";"Real Serial Number";"Real Model";"Real Manufacturer" -"O48N2";"";"http://localhost/devices/O48N2";"";"";"";"";"";"";"";"";"";"";"laptop-asustek_computer_inc-1001pxd-b8oaas048285-14:da:e9:42:f6:7b";"Laptop";"Netbook";"b8oaas048285";"1001pxd";"asustek computer inc.";"Wed Aug 10 10:22:26 2022";"Workbench 11.0a2";"2022-08-10 10:22:26.867136+02:00";"";"";"";"";"intel atom cpu n455 @ 2.66ghz";"1024";"238475";"Processor 7: model intel atom cpu n455 @ 2.66ghz, S/N None";"intel corp.";"intel atom cpu n455 @ 2.66ghz";"";"1";"2.667";"6666.24";"164.0803";"";"";"";"";"";"";"";"";"RamModule 11: model None, S/N None";"";"";"";"1024";"667";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"HardDrive 12: model hts54322, S/N e2024242cv86mm";"hitachi";"hts54322";"e2024242cv86mm";"238475";"harddrive-hitachi-hts54322-e2024242cv86mm";"e2024242cv86mm";"238475";"Workbench 11.0a2";"Success";"";"EraseBasic";"Shred";"1:16:49";"2022-08-10 10:22:26.816392+02:00";"✓ – StepRandom 1:16:49";"2018-07-03 11:15:22.257059+02:00";"2018-07-03 12:32:11.843190+02:00";"66.2";"21.8";"Workbench 11.0a2";"Short";"Failure";"";"";"0";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"Motherboard 13: model 1001pxd, S/N eee0123456720";"asustek computer inc.";"1001pxd";"eee0123456720";"";"";"";"";"GraphicCard 8: model atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller, S/N None";"intel corporation";"atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller";"";"256";"";"";"";"";"";"NetworkAdapter 5: model ar9285 wireless network adapter, S/N 74:2f:68:8b:fd:c9";"qualcomm atheros";"ar9285 wireless network adapter";"74:2f:68:8b:fd:c9";"NetworkAdapter 6: model ar8152 v2.0 fast ethernet, S/N 14:da:e9:42:f6:7b";"qualcomm atheros";"ar8152 v2.0 fast ethernet";"14:da:e9:42:f6:7b";"SoundCard 9: model nm10/ich7 family high definition audio controller, S/N None";"intel corporation";"nm10/ich7 family high definition audio controller";"";"SoundCard 10: model usb 2.0 uvc vga webcam, S/N 0x0001";"azurewave";"usb 2.0 uvc vga webcam";"0x0001";"";"";"";"";"";"";"";"";"15.7188";"10";"Abstract";"";"";"";"";"Laptop";"b8oaas048285";"1001pxd";"asustek computer inc." +"E39W3";"";"http://localhost/devices/O48N2";"";"";"";"";"";"";"";"";"";"";"laptop-asustek_computer_inc-1001pxd-b8oaas048285-14:da:e9:42:f6:7b";"Laptop";"Netbook";"b8oaas048285";"1001pxd";"asustek computer inc.";"Wed Aug 10 10:22:26 2022";"Workbench 11.0a2";"2022-08-10 10:22:26.867136+02:00";"";"";"";"";"intel atom cpu n455 @ 2.66ghz";"1024";"238475";"Processor 7: model intel atom cpu n455 @ 2.66ghz, S/N None";"intel corp.";"intel atom cpu n455 @ 2.66ghz";"";"1";"2.667";"6666.24";"164.0803";"";"";"";"";"";"";"";"";"RamModule 11: model None, S/N None";"";"";"";"1024";"667";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"HardDrive 12: model hts54322, S/N e2024242cv86mm";"hitachi";"hts54322";"e2024242cv86mm";"238475";"harddrive-hitachi-hts54322-e2024242cv86mm";"e2024242cv86mm";"238475";"Workbench 11.0a2";"Success";"";"EraseBasic";"Shred";"1:16:49";"2022-08-10 10:22:26.816392+02:00";"✓ – StepRandom 1:16:49";"2018-07-03 11:15:22.257059+02:00";"2018-07-03 12:32:11.843190+02:00";"66.2";"21.8";"Workbench 11.0a2";"Short";"Failure";"";"";"0";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"Motherboard 13: model 1001pxd, S/N eee0123456720";"asustek computer inc.";"1001pxd";"eee0123456720";"";"";"";"";"GraphicCard 8: model atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller, S/N None";"intel corporation";"atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller";"";"256";"";"";"";"";"";"NetworkAdapter 5: model ar9285 wireless network adapter, S/N 74:2f:68:8b:fd:c9";"qualcomm atheros";"ar9285 wireless network adapter";"74:2f:68:8b:fd:c9";"NetworkAdapter 6: model ar8152 v2.0 fast ethernet, S/N 14:da:e9:42:f6:7b";"qualcomm atheros";"ar8152 v2.0 fast ethernet";"14:da:e9:42:f6:7b";"SoundCard 9: model nm10/ich7 family high definition audio controller, S/N None";"intel corporation";"nm10/ich7 family high definition audio controller";"";"SoundCard 10: model usb 2.0 uvc vga webcam, S/N 0x0001";"azurewave";"usb 2.0 uvc vga webcam";"0x0001";"";"";"";"";"";"";"";"";"15.7188";"10";"Abstract";"";"";"";"";"Laptop";"b8oaas048285";"1001pxd";"asustek computer inc." diff --git a/tests/files/proposal_extended_csv_report.csv b/tests/files/proposal_extended_csv_report.csv index 5050bd4f..531c288b 100644 --- a/tests/files/proposal_extended_csv_report.csv +++ b/tests/files/proposal_extended_csv_report.csv @@ -1,3 +1,3 @@ "DHID";"DocumentID";"Public Link";"Lots";"Tag 1 Type";"Tag 1 ID";"Tag 1 Organization";"Tag 2 Type";"Tag 2 ID";"Tag 2 Organization";"Tag 3 Type";"Tag 3 ID";"Tag 3 Organization";"Device Hardware ID";"Device Type";"Device Chassis";"Device Serial Number";"Device Model";"Device Manufacturer";"Registered in";"Registered (process)";"Updated in (software)";"Updated in (web)";"Physical state";"Allocate state";"Lifecycle state";"Processor";"RAM (MB)";"Data Storage Size (MB)";"Processor 1";"Processor 1 Manufacturer";"Processor 1 Model";"Processor 1 Serial Number";"Processor 1 Number of cores";"Processor 1 Speed (GHz)";"Benchmark Processor 1 (points)";"Benchmark ProcessorSysbench Processor 1 (points)";"Processor 2";"Processor 2 Manufacturer";"Processor 2 Model";"Processor 2 Serial Number";"Processor 2 Number of cores";"Processor 2 Speed (GHz)";"Benchmark Processor 2 (points)";"Benchmark ProcessorSysbench Processor 2 (points)";"RamModule 1";"RamModule 1 Manufacturer";"RamModule 1 Model";"RamModule 1 Serial Number";"RamModule 1 Size (MB)";"RamModule 1 Speed (MHz)";"RamModule 2";"RamModule 2 Manufacturer";"RamModule 2 Model";"RamModule 2 Serial Number";"RamModule 2 Size (MB)";"RamModule 2 Speed (MHz)";"RamModule 3";"RamModule 3 Manufacturer";"RamModule 3 Model";"RamModule 3 Serial Number";"RamModule 3 Size (MB)";"RamModule 3 Speed (MHz)";"RamModule 4";"RamModule 4 Manufacturer";"RamModule 4 Model";"RamModule 4 Serial Number";"RamModule 4 Size (MB)";"RamModule 4 Speed (MHz)";"DataStorage 1";"DataStorage 1 Manufacturer";"DataStorage 1 Model";"DataStorage 1 Serial Number";"DataStorage 1 Size (MB)";"Erasure DataStorage 1";"Erasure DataStorage 1 Serial Number";"Erasure DataStorage 1 Size (MB)";"Erasure DataStorage 1 Software";"Erasure DataStorage 1 Result";"Erasure DataStorage 1 Certificate URL";"Erasure DataStorage 1 Type";"Erasure DataStorage 1 Method";"Erasure DataStorage 1 Elapsed (hours)";"Erasure DataStorage 1 Date";"Erasure DataStorage 1 Steps";"Erasure DataStorage 1 Steps Start Time";"Erasure DataStorage 1 Steps End Time";"Benchmark DataStorage 1 Read Speed (MB/s)";"Benchmark DataStorage 1 Writing speed (MB/s)";"Test DataStorage 1 Software";"Test DataStorage 1 Type";"Test DataStorage 1 Result";"Test DataStorage 1 Power cycle count";"Test DataStorage 1 Lifetime (days)";"Test DataStorage 1 Power on hours";"DataStorage 2";"DataStorage 2 Manufacturer";"DataStorage 2 Model";"DataStorage 2 Serial Number";"DataStorage 2 Size (MB)";"Erasure DataStorage 2";"Erasure DataStorage 2 Serial Number";"Erasure DataStorage 2 Size (MB)";"Erasure DataStorage 2 Software";"Erasure DataStorage 2 Result";"Erasure DataStorage 2 Certificate URL";"Erasure DataStorage 2 Type";"Erasure DataStorage 2 Method";"Erasure DataStorage 2 Elapsed (hours)";"Erasure DataStorage 2 Date";"Erasure DataStorage 2 Steps";"Erasure DataStorage 2 Steps Start Time";"Erasure DataStorage 2 Steps End Time";"Benchmark DataStorage 2 Read Speed (MB/s)";"Benchmark DataStorage 2 Writing speed (MB/s)";"Test DataStorage 2 Software";"Test DataStorage 2 Type";"Test DataStorage 2 Result";"Test DataStorage 2 Power cycle count";"Test DataStorage 2 Lifetime (days)";"Test DataStorage 2 Power on hours";"DataStorage 3";"DataStorage 3 Manufacturer";"DataStorage 3 Model";"DataStorage 3 Serial Number";"DataStorage 3 Size (MB)";"Erasure DataStorage 3";"Erasure DataStorage 3 Serial Number";"Erasure DataStorage 3 Size (MB)";"Erasure DataStorage 3 Software";"Erasure DataStorage 3 Result";"Erasure DataStorage 3 Certificate URL";"Erasure DataStorage 3 Type";"Erasure DataStorage 3 Method";"Erasure DataStorage 3 Elapsed (hours)";"Erasure DataStorage 3 Date";"Erasure DataStorage 3 Steps";"Erasure DataStorage 3 Steps Start Time";"Erasure DataStorage 3 Steps End Time";"Benchmark DataStorage 3 Read Speed (MB/s)";"Benchmark DataStorage 3 Writing speed (MB/s)";"Test DataStorage 3 Software";"Test DataStorage 3 Type";"Test DataStorage 3 Result";"Test DataStorage 3 Power cycle count";"Test DataStorage 3 Lifetime (days)";"Test DataStorage 3 Power on hours";"DataStorage 4";"DataStorage 4 Manufacturer";"DataStorage 4 Model";"DataStorage 4 Serial Number";"DataStorage 4 Size (MB)";"Erasure DataStorage 4";"Erasure DataStorage 4 Serial Number";"Erasure DataStorage 4 Size (MB)";"Erasure DataStorage 4 Software";"Erasure DataStorage 4 Result";"Erasure DataStorage 4 Certificate URL";"Erasure DataStorage 4 Type";"Erasure DataStorage 4 Method";"Erasure DataStorage 4 Elapsed (hours)";"Erasure DataStorage 4 Date";"Erasure DataStorage 4 Steps";"Erasure DataStorage 4 Steps Start Time";"Erasure DataStorage 4 Steps End Time";"Benchmark DataStorage 4 Read Speed (MB/s)";"Benchmark DataStorage 4 Writing speed (MB/s)";"Test DataStorage 4 Software";"Test DataStorage 4 Type";"Test DataStorage 4 Result";"Test DataStorage 4 Power cycle count";"Test DataStorage 4 Lifetime (days)";"Test DataStorage 4 Power on hours";"Motherboard 1";"Motherboard 1 Manufacturer";"Motherboard 1 Model";"Motherboard 1 Serial Number";"Display 1";"Display 1 Manufacturer";"Display 1 Model";"Display 1 Serial Number";"GraphicCard 1";"GraphicCard 1 Manufacturer";"GraphicCard 1 Model";"GraphicCard 1 Serial Number";"GraphicCard 1 Memory (MB)";"GraphicCard 2";"GraphicCard 2 Manufacturer";"GraphicCard 2 Model";"GraphicCard 2 Serial Number";"GraphicCard 2 Memory (MB)";"NetworkAdapter 1";"NetworkAdapter 1 Manufacturer";"NetworkAdapter 1 Model";"NetworkAdapter 1 Serial Number";"NetworkAdapter 2";"NetworkAdapter 2 Manufacturer";"NetworkAdapter 2 Model";"NetworkAdapter 2 Serial Number";"SoundCard 1";"SoundCard 1 Manufacturer";"SoundCard 1 Model";"SoundCard 1 Serial Number";"SoundCard 2";"SoundCard 2 Manufacturer";"SoundCard 2 Model";"SoundCard 2 Serial Number";"Device Rate";"Device Range";"Processor Rate";"Processor Range";"RAM Rate";"RAM Range";"Data Storage Rate";"Data Storage Range";"Benchmark RamSysbench (points)";"PHID";"Is Abstract";"Pallet";"id Supplier";"Real Info";"Real Components";"Real Type";"Real Serial Number";"Real Model";"Real Manufacturer" -"O48N2";"";"http://localhost/devices/O48N2";"";"";"";"";"";"";"";"";"";"";"laptop-asustek_computer_inc-1001pxd-b8oaas048285-14:da:e9:42:f6:7b";"Laptop";"Netbook";"b8oaas048285";"1001pxd";"asustek computer inc.";"Wed Aug 10 10:06:14 2022";"Workbench 11.0a2";"2022-08-10 10:06:14.906703+02:00";"";"";"";"";"intel atom cpu n455 @ 2.66ghz";"1024";"238475";"Processor 7: model intel atom cpu n455 @ 2.66ghz, S/N None";"intel corp.";"intel atom cpu n455 @ 2.66ghz";"";"1";"2.667";"6666.24";"164.0803";"";"";"";"";"";"";"";"";"RamModule 11: model None, S/N None";"";"";"";"1024";"667";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"HardDrive 12: model hts54322, S/N e2024242cv86mm";"hitachi";"hts54322";"e2024242cv86mm";"238475";"harddrive-hitachi-hts54322-e2024242cv86mm";"e2024242cv86mm";"238475";"Workbench 11.0a2";"Success";"";"EraseBasic";"Shred";"1:16:49";"2022-08-10 10:06:14.839245+02:00";"✓ – StepRandom 1:16:49";"2018-07-03 11:15:22.257059+02:00";"2018-07-03 12:32:11.843190+02:00";"66.2";"21.8";"Workbench 11.0a2";"Short";"Failure";"";"";"0";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"Motherboard 13: model 1001pxd, S/N eee0123456720";"asustek computer inc.";"1001pxd";"eee0123456720";"";"";"";"";"GraphicCard 8: model atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller, S/N None";"intel corporation";"atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller";"";"256";"";"";"";"";"";"NetworkAdapter 5: model ar9285 wireless network adapter, S/N 74:2f:68:8b:fd:c9";"qualcomm atheros";"ar9285 wireless network adapter";"74:2f:68:8b:fd:c9";"NetworkAdapter 6: model ar8152 v2.0 fast ethernet, S/N 14:da:e9:42:f6:7b";"qualcomm atheros";"ar8152 v2.0 fast ethernet";"14:da:e9:42:f6:7b";"SoundCard 9: model nm10/ich7 family high definition audio controller, S/N None";"intel corporation";"nm10/ich7 family high definition audio controller";"";"SoundCard 10: model usb 2.0 uvc vga webcam, S/N 0x0001";"azurewave";"usb 2.0 uvc vga webcam";"0x0001";"";"";"";"";"";"";"";"";"15.7188";"10";"Abstract";"";"";"";"";"Laptop";"b8oaas048285";"1001pxd";"asustek computer inc." -"X4ZV3";"";"http://localhost/devices/X4ZV3";"";"";"";"";"";"";"";"";"";"";"laptop-asustek_computer_inc-1001pxd-b8oaas048287-14:da:e9:42:f6:7c";"Laptop";"Netbook";"b8oaas048287";"1001pxd";"asustek computer inc.";"Wed Aug 10 10:06:15 2022";"Workbench 11.0b11";"2022-08-10 10:06:15.254237+02:00";"";"";"";"";"intel atom cpu n455 @ 1.66ghz";"2048";"558558";"Processor 28: model intel atom cpu n455 @ 1.66ghz, S/N None";"intel corp.";"intel atom cpu n455 @ 1.66ghz";"";"1";"1.667";"6666.24";"164.0803";"";"";"";"";"";"";"";"";"RamModule 32: model None, S/N None";"";"";"";"1024";"667";"RamModule 33: model 48594d503131325336344350362d53362020, S/N 4f43487b";"hynix semiconductor";"48594d503131325336344350362d53362020";"4f43487b";"1024";"667";"";"";"";"";"";"";"";"";"";"";"";"";"HardDrive 34: model hts54322, S/N e2024242cv86hj";"hitachi";"hts54322";"e2024242cv86hj";"238475";"harddrive-hitachi-hts54322-e2024242cv86hj";"e2024242cv86hj";"238475";"Workbench 11.0b11";"Success";"";"EraseBasic";"Shred";"1:16:49";"2022-08-10 10:06:15.199472+02:00";"✓ – StepRandom 1:16:49";"2018-07-03 11:15:22.257059+02:00";"2018-07-03 12:32:11.843190+02:00";"66.2";"21.8";"Workbench 11.0b11";"Extended";"Failure";"";"";"0";"DataStorage 35: model wdc wd1600bevt-2, S/N wd-wx11a80w7430";"western digital";"wdc wd1600bevt-2";"wd-wx11a80w7430";"160041";"datastorage-western_digital-wdc_wd1600bevt-2-wd-wx11a80w7430";"wd-wx11a80w7430";"160041";"Workbench 11.0b11";"Failure";"";"EraseBasic";"Shred";"0:45:36";"2022-08-10 10:06:15.201582+02:00";"✓ – StepRandom 0:45:36";"2019-10-23 09:49:54.410830+02:00";"2019-10-23 10:35:31.400587+02:00";"41.6";"17.3";"Workbench 11.0b11";"Short";"Success";"5293";"195 days, 12:00:00";"4692";"SolidStateDrive 36: model wdc wd1600bevt-2, S/N wd-wx11a80w7430";"western digital";"wdc wd1600bevt-2";"wd-wx11a80w7430";"160042";"solidstatedrive-western_digital-wdc_wd1600bevt-2-wd-wx11a80w7430";"wd-wx11a80w7430";"160042";"Workbench 11.0b11";"Success";"";"EraseSectors";"Badblocks";"1:46:03";"2022-08-10 10:06:15.205281+02:00";"✓ – StepRandom 0:46:03,✓ – StepZero 1:00:00";"2019-08-19 18:48:19.690458+02:00,2019-08-19 19:34:22.690458+02:00";"2019-08-19 19:34:22.930562+02:00,2019-08-19 20:34:22.930562+02:00";"41.1";"17.1";"Workbench 11.0b11";"Short";"Success";"5231";"194 days, 17:00:00";"4673";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"Motherboard 37: model 1001pxd, S/N eee0123456789";"asustek computer inc.";"1001pxd";"eee0123456789";"";"auo ""auo""";"auo lcd monitor";"";"GraphicCard 29: model atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller, S/N None";"intel corporation";"atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller";"";"256";"";"";"";"";"";"NetworkAdapter 26: model ar9285 wireless network adapter, S/N 74:2f:68:8b:fd:c8";"qualcomm atheros";"ar9285 wireless network adapter";"74:2f:68:8b:fd:c8";"NetworkAdapter 27: model ar8152 v2.0 fast ethernet, S/N 14:da:e9:42:f6:7c";"qualcomm atheros";"ar8152 v2.0 fast ethernet";"14:da:e9:42:f6:7c";"SoundCard 30: model nm10/ich7 family high definition audio controller, S/N None";"intel corporation";"nm10/ich7 family high definition audio controller";"";"SoundCard 31: model usb 2.0 uvc vga webcam, S/N 0x0001";"azurewave";"usb 2.0 uvc vga webcam";"0x0001";"";"";"";"";"";"";"";"";"15.7188";"24";"Abstract";"";"";"";"";"Laptop";"b8oaas048287";"1001pxd";"asustek computer inc." +"E39W3";"";"http://localhost/devices/O48N2";"";"";"";"";"";"";"";"";"";"";"laptop-asustek_computer_inc-1001pxd-b8oaas048285-14:da:e9:42:f6:7b";"Laptop";"Netbook";"b8oaas048285";"1001pxd";"asustek computer inc.";"Wed Aug 10 10:06:14 2022";"Workbench 11.0a2";"2022-08-10 10:06:14.906703+02:00";"";"";"";"";"intel atom cpu n455 @ 2.66ghz";"1024";"238475";"Processor 7: model intel atom cpu n455 @ 2.66ghz, S/N None";"intel corp.";"intel atom cpu n455 @ 2.66ghz";"";"1";"2.667";"6666.24";"164.0803";"";"";"";"";"";"";"";"";"RamModule 11: model None, S/N None";"";"";"";"1024";"667";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"HardDrive 12: model hts54322, S/N e2024242cv86mm";"hitachi";"hts54322";"e2024242cv86mm";"238475";"harddrive-hitachi-hts54322-e2024242cv86mm";"e2024242cv86mm";"238475";"Workbench 11.0a2";"Success";"";"EraseBasic";"Shred";"1:16:49";"2022-08-10 10:06:14.839245+02:00";"✓ – StepRandom 1:16:49";"2018-07-03 11:15:22.257059+02:00";"2018-07-03 12:32:11.843190+02:00";"66.2";"21.8";"Workbench 11.0a2";"Short";"Failure";"";"";"0";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"Motherboard 13: model 1001pxd, S/N eee0123456720";"asustek computer inc.";"1001pxd";"eee0123456720";"";"";"";"";"GraphicCard 8: model atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller, S/N None";"intel corporation";"atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller";"";"256";"";"";"";"";"";"NetworkAdapter 5: model ar9285 wireless network adapter, S/N 74:2f:68:8b:fd:c9";"qualcomm atheros";"ar9285 wireless network adapter";"74:2f:68:8b:fd:c9";"NetworkAdapter 6: model ar8152 v2.0 fast ethernet, S/N 14:da:e9:42:f6:7b";"qualcomm atheros";"ar8152 v2.0 fast ethernet";"14:da:e9:42:f6:7b";"SoundCard 9: model nm10/ich7 family high definition audio controller, S/N None";"intel corporation";"nm10/ich7 family high definition audio controller";"";"SoundCard 10: model usb 2.0 uvc vga webcam, S/N 0x0001";"azurewave";"usb 2.0 uvc vga webcam";"0x0001";"";"";"";"";"";"";"";"";"15.7188";"10";"Abstract";"";"";"";"";"Laptop";"b8oaas048285";"1001pxd";"asustek computer inc." +"45VG4";"";"http://localhost/devices/X4ZV3";"";"";"";"";"";"";"";"";"";"";"laptop-asustek_computer_inc-1001pxd-b8oaas048287-14:da:e9:42:f6:7c";"Laptop";"Netbook";"b8oaas048287";"1001pxd";"asustek computer inc.";"Wed Aug 10 10:06:15 2022";"Workbench 11.0b11";"2022-08-10 10:06:15.254237+02:00";"";"";"";"";"intel atom cpu n455 @ 1.66ghz";"2048";"558558";"Processor 28: model intel atom cpu n455 @ 1.66ghz, S/N None";"intel corp.";"intel atom cpu n455 @ 1.66ghz";"";"1";"1.667";"6666.24";"164.0803";"";"";"";"";"";"";"";"";"RamModule 32: model None, S/N None";"";"";"";"1024";"667";"RamModule 33: model 48594d503131325336344350362d53362020, S/N 4f43487b";"hynix semiconductor";"48594d503131325336344350362d53362020";"4f43487b";"1024";"667";"";"";"";"";"";"";"";"";"";"";"";"";"HardDrive 34: model hts54322, S/N e2024242cv86hj";"hitachi";"hts54322";"e2024242cv86hj";"238475";"harddrive-hitachi-hts54322-e2024242cv86hj";"e2024242cv86hj";"238475";"Workbench 11.0b11";"Success";"";"EraseBasic";"Shred";"1:16:49";"2022-08-10 10:06:15.199472+02:00";"✓ – StepRandom 1:16:49";"2018-07-03 11:15:22.257059+02:00";"2018-07-03 12:32:11.843190+02:00";"66.2";"21.8";"Workbench 11.0b11";"Extended";"Failure";"";"";"0";"DataStorage 35: model wdc wd1600bevt-2, S/N wd-wx11a80w7430";"western digital";"wdc wd1600bevt-2";"wd-wx11a80w7430";"160041";"datastorage-western_digital-wdc_wd1600bevt-2-wd-wx11a80w7430";"wd-wx11a80w7430";"160041";"Workbench 11.0b11";"Failure";"";"EraseBasic";"Shred";"0:45:36";"2022-08-10 10:06:15.201582+02:00";"✓ – StepRandom 0:45:36";"2019-10-23 09:49:54.410830+02:00";"2019-10-23 10:35:31.400587+02:00";"41.6";"17.3";"Workbench 11.0b11";"Short";"Success";"5293";"195 days, 12:00:00";"4692";"SolidStateDrive 36: model wdc wd1600bevt-2, S/N wd-wx11a80w7430";"western digital";"wdc wd1600bevt-2";"wd-wx11a80w7430";"160042";"solidstatedrive-western_digital-wdc_wd1600bevt-2-wd-wx11a80w7430";"wd-wx11a80w7430";"160042";"Workbench 11.0b11";"Success";"";"EraseSectors";"Badblocks";"1:46:03";"2022-08-10 10:06:15.205281+02:00";"✓ – StepRandom 0:46:03,✓ – StepZero 1:00:00";"2019-08-19 18:48:19.690458+02:00,2019-08-19 19:34:22.690458+02:00";"2019-08-19 19:34:22.930562+02:00,2019-08-19 20:34:22.930562+02:00";"41.1";"17.1";"Workbench 11.0b11";"Short";"Success";"5231";"194 days, 17:00:00";"4673";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"Motherboard 37: model 1001pxd, S/N eee0123456789";"asustek computer inc.";"1001pxd";"eee0123456789";"";"auo ""auo""";"auo lcd monitor";"";"GraphicCard 29: model atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller, S/N None";"intel corporation";"atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller";"";"256";"";"";"";"";"";"NetworkAdapter 26: model ar9285 wireless network adapter, S/N 74:2f:68:8b:fd:c8";"qualcomm atheros";"ar9285 wireless network adapter";"74:2f:68:8b:fd:c8";"NetworkAdapter 27: model ar8152 v2.0 fast ethernet, S/N 14:da:e9:42:f6:7c";"qualcomm atheros";"ar8152 v2.0 fast ethernet";"14:da:e9:42:f6:7c";"SoundCard 30: model nm10/ich7 family high definition audio controller, S/N None";"intel corporation";"nm10/ich7 family high definition audio controller";"";"SoundCard 31: model usb 2.0 uvc vga webcam, S/N 0x0001";"azurewave";"usb 2.0 uvc vga webcam";"0x0001";"";"";"";"";"";"";"";"";"15.7188";"24";"Abstract";"";"";"";"";"Laptop";"b8oaas048287";"1001pxd";"asustek computer inc." diff --git a/tests/test_basic.py b/tests/test_basic.py index d4595a9c..a37437ee 100644 --- a/tests/test_basic.py +++ b/tests/test_basic.py @@ -54,6 +54,7 @@ def test_api_docs(client: Client): '/inventory/device/', '/inventory/device/add/', '/inventory/device/{id}/', + '/inventory/device/{dhid}/binding/', '/inventory/export/{export_id}/', '/inventory/lot/add/', '/inventory/lot/{id}/', @@ -68,8 +69,8 @@ def test_api_docs(client: Client): '/inventory/lot/{lot_id}/upload-snapshot/', '/inventory/snapshots/{snapshot_uuid}/', '/inventory/snapshots/', - '/inventory/tag/devices/add/', - '/inventory/tag/devices/{id}/del/', + '/inventory/tag/devices/{dhid}/add/', + '/inventory/tag/devices/{dhid}/del/', '/inventory/upload-snapshot/', '/inventory/device/edit/{id}/', '/inventory/upload-placeholder/', diff --git a/tests/test_device.py b/tests/test_device.py index 9f3b200d..a96c0276 100644 --- a/tests/test_device.py +++ b/tests/test_device.py @@ -473,14 +473,17 @@ def test_get_devices(app: Devicehub, user: UserClient): @pytest.mark.mvp -def test_get_device_permissions(app: Devicehub, user: UserClient, user2: UserClient, +@pytest.mark.usefixtures(conftest.app_context.__name__) +def test_get_device_permissions(app: Devicehub, user: UserClient, user2: UserClient, client: Client): """Checks GETting a d.Desktop with its components.""" s, _ = user.post(file('asus-eee-1000h.snapshot.11'), res=m.Snapshot) pc, res = user.get(res=d.Device, item=s['device']['devicehubID']) assert res.status_code == 200 - assert len(pc['actions']) == 7 + assert len(pc['actions']) == 0 + pc = d.Device.query.filter_by(devicehub_id=s['device']['devicehubID']).one() + assert len(pc.placeholder.binding.actions) == 7 html, _ = client.get(res=d.Device, item=s['device']['devicehubID'], accept=ANY) assert 'intel atom cpu n270 @ 1.60ghz' in html @@ -660,12 +663,15 @@ def test_cooking_mixer_api(user: UserClient): @pytest.mark.mvp +@pytest.mark.usefixtures(conftest.app_context.__name__) def test_hid_with_mac(app: Devicehub, user: UserClient): """Checks hid with mac.""" snapshot = file('asus-eee-1000h.snapshot.11') snap, _ = user.post(snapshot, res=m.Snapshot) pc, _ = user.get(res=d.Device, item=snap['device']['devicehubID']) - assert pc['hid'] == 'laptop-asustek_computer_inc-1000h-94oaaq021116-00:24:8c:7f:cf:2d' + assert pc['hid'] == 'laptop-asustek_computer_inc-1000h-94oaaq021116' + pc = d.Device.query.filter_by(devicehub_id=snap['device']['devicehubID']).one() + assert pc.placeholder.binding.hid == 'laptop-asustek_computer_inc-1000h-94oaaq021116-00:24:8c:7f:cf:2d' @pytest.mark.mvp @@ -706,6 +712,7 @@ def test_hid_with_2networkadapters(app: Devicehub, user: UserClient): @pytest.mark.mvp +@pytest.mark.usefixtures(conftest.app_context.__name__) def test_hid_with_2network_and_drop_no_mac_in_hid(app: Devicehub, user: UserClient): """Checks hid with 2 networks adapters and next drop the network is not used in hid""" snapshot = yaml2json('asus-eee-1000h.snapshot.11') @@ -715,19 +722,22 @@ def test_hid_with_2network_and_drop_no_mac_in_hid(app: Devicehub, user: UserClie network['serialNumber'] = 'a0:24:8c:7f:cf:2d' snap, _ = user.post(json_encode(snapshot), res=m.Snapshot) pc, _ = user.get(res=d.Device, item=snap['device']['devicehubID']) - assert pc['hid'] == 'laptop-asustek_computer_inc-1000h-94oaaq021116-00:24:8c:7f:cf:2d' + assert pc['hid'] == 'laptop-asustek_computer_inc-1000h-94oaaq021116' + pc = d.Device.query.filter_by(devicehub_id=snap['device']['devicehubID']).one() + assert pc.placeholder.binding.hid == 'laptop-asustek_computer_inc-1000h-94oaaq021116-00:24:8c:7f:cf:2d' snapshot['uuid'] = 'd1b70cb8-8929-4f36-99b7-fe052cec0abb' snapshot['components'] = [c for c in snapshot['components'] if c != network] user.post(json_encode(snapshot), res=m.Snapshot) devices, _ = user.get(res=d.Device) laptop = devices['items'][0] - assert laptop['hid'] == 'laptop-asustek_computer_inc-1000h-94oaaq021116-00:24:8c:7f:cf:2d' + assert pc.placeholder.binding.hid == 'laptop-asustek_computer_inc-1000h-94oaaq021116-00:24:8c:7f:cf:2d' assert len([c for c in devices['items'] if c['type'] == 'Laptop']) == 2 assert len([c for c in laptop['components'] if c['type'] == 'NetworkAdapter']) == 1 @pytest.mark.mvp +@pytest.mark.usefixtures(conftest.app_context.__name__) def test_hid_with_2network_and_drop_mac_in_hid(app: Devicehub, user: UserClient): """Checks hid with 2 networks adapters and next drop the network is used in hid""" # One tipical snapshot with 2 network cards @@ -738,7 +748,9 @@ def test_hid_with_2network_and_drop_mac_in_hid(app: Devicehub, user: UserClient) network['serialNumber'] = 'a0:24:8c:7f:cf:2d' snap, _ = user.post(json_encode(snapshot), res=m.Snapshot) pc, _ = user.get(res=d.Device, item=snap['device']['devicehubID']) - assert pc['hid'] == 'laptop-asustek_computer_inc-1000h-94oaaq021116-00:24:8c:7f:cf:2d' + assert pc['hid'] == 'laptop-asustek_computer_inc-1000h-94oaaq021116' + pc = d.Device.query.filter_by(devicehub_id=snap['device']['devicehubID']).one() + assert pc.placeholder.binding.hid == 'laptop-asustek_computer_inc-1000h-94oaaq021116-00:24:8c:7f:cf:2d' # we drop the network card then is used for to build the hid snapshot['uuid'] = 'd1b70cb8-8929-4f36-99b7-fe052cec0abb' diff --git a/tests/test_render_2_0.py b/tests/test_render_2_0.py index 31965b13..49371ef8 100644 --- a/tests/test_render_2_0.py +++ b/tests/test_render_2_0.py @@ -320,16 +320,16 @@ def test_link_tag_to_device(user3: UserClientFlask): } user3.post(uri, data=data) - body, status = user3.get('/inventory/device/') + body, status = user3.get('/inventory/device/{}/'.format(dev.dhid)) assert "tag1" in body data = { 'tag': "tag1", - 'device': dev.id, + 'device': dev.dhid, 'csrf_token': generate_csrf(), } - uri = '/inventory/tag/devices/add/' + uri = '/inventory/tag/devices/{}/add/'.format(dev.dhid) user3.post(uri, data=data) assert len(list(dev.tags)) == 1 tags = [tag.id for tag in dev.tags] @@ -406,7 +406,7 @@ def test_print_labels(user3: UserClientFlask): 'csrf_token': generate_csrf(), } - uri = '/inventory/tag/devices/add/' + uri = '/inventory/tag/devices/{}/add/'.format(dev.dhid) user3.post(uri, data=data) assert len(list(dev.tags)) == 1 @@ -419,7 +419,7 @@ def test_print_labels(user3: UserClientFlask): body, status = user3.post(uri, data=data) assert status == '200 OK' - path = "/devices/{}".format(dev.devicehub_id) + path = "/devices/{}".format(dev.dhid) assert path in body assert "tag1" in body @@ -2021,7 +2021,6 @@ def test_manual_binding(user3: UserClientFlask): 'model': "LC27T55", 'manufacturer': "Samsung", 'generation': 1, - 'weight': 0.1, 'height': 0.1, 'depth': 0.1, 'id_device_supplier': "b2", @@ -2047,17 +2046,24 @@ def test_manual_binding(user3: UserClientFlask): old_placeholder = dev_wb.binding # page binding - dhid = dev_wb.devicehub_id + dhid = dev_wb.dhid uri = f'/inventory/binding/{dhid}/sid/' body, status = user3.get(uri) assert status == '200 OK' assert 'sid' in body assert 'Confirm' in body + phid_real = dev.placeholder.phid + phid_abstract = dev_wb.binding.phid + dhid_real = dev.dhid + dhid_abstract = dev_wb.dhid + # action binding body, status = user3.post(uri, data={}) assert status == '200 OK' - assert f"Device "{dhid}" bind successfully with sid!" in body + txt = f"Device real with PHID: {phid_real} and DHID: {dhid_real} " + txt += f"bind successfully with device abstract PHID: {phid_abstract} DHID: {dhid_abstract}." + assert txt in body # check new structure assert dev_wb.binding.phid == 'sid' @@ -2145,7 +2151,7 @@ def test_unbinding(user3: UserClientFlask): old_placeholder = dev_wb.binding # page binding - dhid = dev_wb.devicehub_id + dhid = dev_wb.dhid uri = f'/inventory/binding/{dhid}/sid/' user3.get(uri) @@ -2154,11 +2160,14 @@ def test_unbinding(user3: UserClientFlask): user3.post(uri, data={}) assert dev.placeholder.binding == dev_wb + dhid = dev.dhid # action unbinding uri = '/inventory/unbinding/sid/' body, status = user3.post(uri, data={}) assert status == '200 OK' - assert 'Device "sid" unbind successfully!' in body + txt = f'Device with PHID:"sid" and DHID: {dhid} unbind successfully!' + assert txt in body + # assert 'Device "sid" unbind successfully!' in body # check new structure From 60f7ee8354285765271c75ab5d1f59c3b2fe3da4 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 31 Aug 2022 17:27:17 +0200 Subject: [PATCH 26/29] use dhid for get the devicehub_id of the real parth of a device --- ereuse_devicehub/api/views.py | 2 +- ereuse_devicehub/resources/device/models.py | 13 +++++++++---- ereuse_devicehub/resources/device/schemas.py | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ereuse_devicehub/api/views.py b/ereuse_devicehub/api/views.py index dd06042c..b4ed2032 100644 --- a/ereuse_devicehub/api/views.py +++ b/ereuse_devicehub/api/views.py @@ -75,7 +75,7 @@ class InventoryView(LoginMixin, SnapshotMixin): self.response = jsonify( { 'url': snapshot.device.url.to_text(), - 'dhid': snapshot.device.devicehub_id, + 'dhid': snapshot.device.dhid, 'sid': snapshot.sid, } ) diff --git a/ereuse_devicehub/resources/device/models.py b/ereuse_devicehub/resources/device/models.py index 7772eacc..bdf4a654 100644 --- a/ereuse_devicehub/resources/device/models.py +++ b/ereuse_devicehub/resources/device/models.py @@ -324,16 +324,13 @@ class Device(Thing): @property def public_link(self) -> str: - if self.binding: - return self.binding.device.public_link - host_url = request.host_url.strip('/') return "{}{}".format(host_url, self.url.to_text()) @property def url(self) -> urlutils.URL: """The URL where to GET this device.""" - return urlutils.URL(url_for_resource(Device, item_id=self.devicehub_id)) + return urlutils.URL(url_for_resource(Device, item_id=self.dhid)) @property def rate(self): @@ -618,6 +615,14 @@ class Device(Thing): model = self.model or '' return f'{type} {manufacturer} {model}' + @property + def dhid(self): + if self.placeholder: + return self.placeholder.device.devicehub_id + if self.binding: + return self.binding.device.devicehub_id + return self.devicehub_id + @declared_attr def __mapper_args__(cls): """Defines inheritance. diff --git a/ereuse_devicehub/resources/device/schemas.py b/ereuse_devicehub/resources/device/schemas.py index 2cc8e65d..2b9530db 100644 --- a/ereuse_devicehub/resources/device/schemas.py +++ b/ereuse_devicehub/resources/device/schemas.py @@ -114,7 +114,7 @@ class Device(Thing): sku = SanitizedStr(description=m.Device.sku.comment) image = URL(description=m.Device.image.comment) allocated = Boolean(description=m.Device.allocated.comment) - devicehub_id = SanitizedStr( + dhid = SanitizedStr( data_key='devicehubID', description=m.Device.devicehub_id.comment ) From 9bde9edc63899f01a2b9acc927839e1e342471e9 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 1 Sep 2022 11:10:37 +0200 Subject: [PATCH 27/29] fix test actions --- tests/test_action.py | 68 ++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 37 deletions(-) diff --git a/tests/test_action.py b/tests/test_action.py index c2793c91..14b9d697 100644 --- a/tests/test_action.py +++ b/tests/test_action.py @@ -251,6 +251,7 @@ def test_update_parent(): @pytest.mark.mvp +@pytest.mark.usefixtures(conftest.auth_app_context.__name__) @pytest.mark.parametrize( 'action_model_state', ( @@ -264,15 +265,18 @@ def test_update_parent(): ), ) def test_generic_action( - action_model_state: Tuple[models.Action, states.Trading], user: UserClient + action_model_state: Tuple[models.ToPrepare, states.Trading], user2: UserClient ): """Tests POSTing all generic actions.""" + user = user2 action_model, state = action_model_state snapshot, _ = user.post(file('basic.snapshot'), res=models.Snapshot) - action = {'type': action_model.t, 'devices': [snapshot['device']['id']]} + abstract = Device.query.filter(Device.id == snapshot['device']['id']).one() + real = abstract.binding.device + action = {'type': action_model.t, 'devices': [real.id]} action, _ = user.post(action, res=models.Action) - assert action['devices'][0]['id'] == snapshot['device']['id'] - device, _ = user.get(res=Device, item=snapshot['device']['devicehubID']) + assert action['devices'][0]['id'] == real.id + device, _ = user.get(res=Device, item=real.dhid) assert device['actions'][-1]['id'] == action['id'] assert device['physical'] == state.name # Check if the update of device is changed @@ -280,6 +284,7 @@ def test_generic_action( @pytest.mark.mvp +@pytest.mark.usefixtures(conftest.auth_app_context.__name__) @pytest.mark.parametrize( 'action_model', ( @@ -288,14 +293,17 @@ def test_generic_action( ), ) def test_simple_status_actions( - action_model: models.Action, user: UserClient, user2: UserClient + action_model: models.Action, user2: UserClient ): """Simple test of status action.""" + user = user2 snap, _ = user.post(file('basic.snapshot'), res=models.Snapshot) + abstract = Device.query.filter(Device.id == snap['device']['id']).one() + real = abstract.binding.device - action = {'type': action_model.t, 'devices': [snap['device']['id']]} + action = {'type': action_model.t, 'devices': [real.id]} action, _ = user.post(action, res=models.Action) - device, _ = user.get(res=Device, item=snap['device']['devicehubID']) + device, _ = user.get(res=Device, item=real.dhid) assert device['actions'][-1]['id'] == action['id'] assert action['author']['id'] == user.user['id'] assert action['rol_user']['id'] == user.user['id'] @@ -518,6 +526,7 @@ def test_recycling_container(user: UserClient): @pytest.mark.mvp +@pytest.mark.usefixtures(conftest.app_context.__name__) @pytest.mark.parametrize( 'action_model', ( @@ -528,13 +537,16 @@ def test_recycling_container(user: UserClient): def test_status_without_lot(action_model: models.Action, user: UserClient): """Test of status actions for devices without lot.""" snap, _ = user.post(file('basic.snapshot'), res=models.Snapshot) - action = {'type': action_model.t, 'devices': [snap['device']['id']]} + abstract = Device.query.filter_by(id=snap['device']['id']).first() + device_id = abstract.binding.device.id + action = {'type': action_model.t, 'devices': [device_id]} action, _ = user.post(action, res=models.Action) - device, _ = user.get(res=Device, item=snap['device']['devicehubID']) + device, _ = user.get(res=Device, item=abstract.dhid) assert device['actions'][-1]['id'] == action['id'] @pytest.mark.mvp +@pytest.mark.usefixtures(conftest.app_context.__name__) @pytest.mark.parametrize( 'action_model', ( @@ -542,17 +554,18 @@ def test_status_without_lot(action_model: models.Action, user: UserClient): for ams in [models.Recycling, models.Use, models.Refurbish, models.Management] ), ) -def test_status_in_temporary_lot(action_model: models.Action, user: UserClient): +def test_status_in_temporary_lot(action_model: models.Action, user: UserClient, app: Devicehub): """Test of status actions for devices in a temporary lot.""" snap, _ = user.post(file('basic.snapshot'), res=models.Snapshot) - device_id = snap['device']['id'] + abstract = Device.query.filter_by(id=snap['device']['id']).first() + device_id = abstract.binding.device.id lot, _ = user.post({'name': 'MyLotOut'}, res=Lot) lot, _ = user.post( {}, res=Lot, item='{}/devices'.format(lot['id']), query=[('id', device_id)] ) action = {'type': action_model.t, 'devices': [device_id]} action, _ = user.post(action, res=models.Action) - device, _ = user.get(res=Device, item=snap['device']['devicehubID']) + device, _ = user.get(res=Device, item=abstract.dhid) assert device['actions'][-1]['id'] == action['id'] @@ -991,8 +1004,9 @@ def test_licences(client: Client): def test_allocate(user: UserClient): """Tests allocate""" snapshot, _ = user.post(file('basic.snapshot'), res=models.Snapshot) - device_id = snapshot['device']['id'] - devicehub_id = snapshot['device']['devicehubID'] + abstract = Device.query.filter_by(id=snapshot['device']['id']).one() + device_id = abstract.binding.device.id + devicehub_id = abstract.dhid post_request = { "transaction": "ccc", "finalUserCode": "aabbcc", @@ -1060,8 +1074,9 @@ def test_allocate_bad_dates(user: UserClient): def test_deallocate(user: UserClient): """Tests deallocate""" snapshot, _ = user.post(file('basic.snapshot'), res=models.Snapshot) - device_id = snapshot['device']['id'] - devicehub_id = snapshot['device']['devicehubID'] + abstract = Device.query.filter_by(id=snapshot['device']['id']).one() + device_id = abstract.binding.device.id + devicehub_id = abstract.dhid post_deallocate = { "startTime": "2020-11-01T02:00:00+00:00", "transaction": "ccc", @@ -1393,27 +1408,6 @@ def test_price_custom(): assert c['price']['id'] == p['id'] -@pytest.mark.mvp -def test_price_custom_client(user: UserClient): - """As test_price_custom but creating the price through the API.""" - s = file('basic.snapshot') - snapshot, _ = user.post(s, res=models.Snapshot) - price, _ = user.post( - { - 'type': 'Price', - 'price': 25, - 'currency': Currency.EUR.name, - 'device': snapshot['device']['id'], - }, - res=models.Action, - ) - assert 25 == price['price'] - assert Currency.EUR.name == price['currency'] - - device, _ = user.get(res=Device, item=price['device']['devicehubID']) - assert 25 == device['price']['price'] - - @pytest.mark.mvp @pytest.mark.usefixtures(conftest.auth_app_context.__name__) def test_erase_physical(): From 74a8472aa165e1c2874b7d5e89a074bd3aa1f97e Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 2 Sep 2022 12:42:26 +0200 Subject: [PATCH 28/29] fix 11 test --- .../resources/documents/device_row.py | 4 +- .../templates/documents/erasure.html | 6 +- tests/files/basic.csv | 2 +- tests/files/export_devices.csv | 2 +- tests/files/proposal_extended_csv_report.csv | 4 +- tests/test_device_find.py | 10 ++- tests/test_snapshot.py | 64 +++++++++++++------ tests/test_tag.py | 11 ++-- tests/test_workbench.py | 18 ++++-- 9 files changed, 77 insertions(+), 44 deletions(-) diff --git a/ereuse_devicehub/resources/documents/device_row.py b/ereuse_devicehub/resources/documents/device_row.py index b239ee92..f0a7e8ff 100644 --- a/ereuse_devicehub/resources/documents/device_row.py +++ b/ereuse_devicehub/resources/documents/device_row.py @@ -276,10 +276,10 @@ class DeviceRow(BaseDeviceRow): software=snapshot.software.name, version=snapshot.version ) # General information about device - self['DHID'] = self.placeholder.device.devicehub_id + self['DHID'] = self.placeholder.device.dhid self['DocumentID'] = self.document_id self['Public Link'] = '{url}{id}'.format( - url=url_for('Device.main', _external=True), id=device.devicehub_id + url=url_for('Device.main', _external=True), id=device.dhid ) self['Lots'] = ', '.join([x.name for x in self.device.lots]) for i, tag in zip(range(1, 3), device.tags): diff --git a/ereuse_devicehub/resources/documents/templates/documents/erasure.html b/ereuse_devicehub/resources/documents/templates/documents/erasure.html index 5a16390c..aa586c95 100644 --- a/ereuse_devicehub/resources/documents/templates/documents/erasure.html +++ b/ereuse_devicehub/resources/documents/templates/documents/erasure.html @@ -42,13 +42,13 @@
    Computer where was erase:
    Title: {{ erasure.parent.__format__('ts') }}
    -
    DevicehubID: {{ erasure.parent.devicehub_id }}
    +
    DevicehubID: {{ erasure.parent.dhid }}
    Hid: {{ erasure.parent.hid }}
    Tags: {{ erasure.parent.tags }}
    - +
    Computer where it resides:
    Title: {{ erasure.device.parent.__format__('ts') }}
    -
    DevicehubID: {{ erasure.device.parent.devicehub_id }}
    +
    DevicehubID: {{ erasure.device.parent.dhid }}
    Hid: {{ erasure.device.parent.hid }}
    Tags: {{ erasure.device.parent.tags }}
    diff --git a/tests/files/basic.csv b/tests/files/basic.csv index 7d800ec5..f65ef805 100644 --- a/tests/files/basic.csv +++ b/tests/files/basic.csv @@ -1,2 +1,2 @@ "DHID";"DocumentID";"Public Link";"Lots";"Tag 1 Type";"Tag 1 ID";"Tag 1 Organization";"Tag 2 Type";"Tag 2 ID";"Tag 2 Organization";"Tag 3 Type";"Tag 3 ID";"Tag 3 Organization";"Device Hardware ID";"Device Type";"Device Chassis";"Device Serial Number";"Device Model";"Device Manufacturer";"Registered in";"Registered (process)";"Updated in (software)";"Updated in (web)";"Physical state";"Allocate state";"Lifecycle state";"Processor";"RAM (MB)";"Data Storage Size (MB)";"Processor 1";"Processor 1 Manufacturer";"Processor 1 Model";"Processor 1 Serial Number";"Processor 1 Number of cores";"Processor 1 Speed (GHz)";"Benchmark Processor 1 (points)";"Benchmark ProcessorSysbench Processor 1 (points)";"Processor 2";"Processor 2 Manufacturer";"Processor 2 Model";"Processor 2 Serial Number";"Processor 2 Number of cores";"Processor 2 Speed (GHz)";"Benchmark Processor 2 (points)";"Benchmark ProcessorSysbench Processor 2 (points)";"RamModule 1";"RamModule 1 Manufacturer";"RamModule 1 Model";"RamModule 1 Serial Number";"RamModule 1 Size (MB)";"RamModule 1 Speed (MHz)";"RamModule 2";"RamModule 2 Manufacturer";"RamModule 2 Model";"RamModule 2 Serial Number";"RamModule 2 Size (MB)";"RamModule 2 Speed (MHz)";"RamModule 3";"RamModule 3 Manufacturer";"RamModule 3 Model";"RamModule 3 Serial Number";"RamModule 3 Size (MB)";"RamModule 3 Speed (MHz)";"RamModule 4";"RamModule 4 Manufacturer";"RamModule 4 Model";"RamModule 4 Serial Number";"RamModule 4 Size (MB)";"RamModule 4 Speed (MHz)";"DataStorage 1";"DataStorage 1 Manufacturer";"DataStorage 1 Model";"DataStorage 1 Serial Number";"DataStorage 1 Size (MB)";"Erasure DataStorage 1";"Erasure DataStorage 1 Serial Number";"Erasure DataStorage 1 Size (MB)";"Erasure DataStorage 1 Software";"Erasure DataStorage 1 Result";"Erasure DataStorage 1 Certificate URL";"Erasure DataStorage 1 Type";"Erasure DataStorage 1 Method";"Erasure DataStorage 1 Elapsed (hours)";"Erasure DataStorage 1 Date";"Erasure DataStorage 1 Steps";"Erasure DataStorage 1 Steps Start Time";"Erasure DataStorage 1 Steps End Time";"Benchmark DataStorage 1 Read Speed (MB/s)";"Benchmark DataStorage 1 Writing speed (MB/s)";"Test DataStorage 1 Software";"Test DataStorage 1 Type";"Test DataStorage 1 Result";"Test DataStorage 1 Power cycle count";"Test DataStorage 1 Lifetime (days)";"Test DataStorage 1 Power on hours";"DataStorage 2";"DataStorage 2 Manufacturer";"DataStorage 2 Model";"DataStorage 2 Serial Number";"DataStorage 2 Size (MB)";"Erasure DataStorage 2";"Erasure DataStorage 2 Serial Number";"Erasure DataStorage 2 Size (MB)";"Erasure DataStorage 2 Software";"Erasure DataStorage 2 Result";"Erasure DataStorage 2 Certificate URL";"Erasure DataStorage 2 Type";"Erasure DataStorage 2 Method";"Erasure DataStorage 2 Elapsed (hours)";"Erasure DataStorage 2 Date";"Erasure DataStorage 2 Steps";"Erasure DataStorage 2 Steps Start Time";"Erasure DataStorage 2 Steps End Time";"Benchmark DataStorage 2 Read Speed (MB/s)";"Benchmark DataStorage 2 Writing speed (MB/s)";"Test DataStorage 2 Software";"Test DataStorage 2 Type";"Test DataStorage 2 Result";"Test DataStorage 2 Power cycle count";"Test DataStorage 2 Lifetime (days)";"Test DataStorage 2 Power on hours";"DataStorage 3";"DataStorage 3 Manufacturer";"DataStorage 3 Model";"DataStorage 3 Serial Number";"DataStorage 3 Size (MB)";"Erasure DataStorage 3";"Erasure DataStorage 3 Serial Number";"Erasure DataStorage 3 Size (MB)";"Erasure DataStorage 3 Software";"Erasure DataStorage 3 Result";"Erasure DataStorage 3 Certificate URL";"Erasure DataStorage 3 Type";"Erasure DataStorage 3 Method";"Erasure DataStorage 3 Elapsed (hours)";"Erasure DataStorage 3 Date";"Erasure DataStorage 3 Steps";"Erasure DataStorage 3 Steps Start Time";"Erasure DataStorage 3 Steps End Time";"Benchmark DataStorage 3 Read Speed (MB/s)";"Benchmark DataStorage 3 Writing speed (MB/s)";"Test DataStorage 3 Software";"Test DataStorage 3 Type";"Test DataStorage 3 Result";"Test DataStorage 3 Power cycle count";"Test DataStorage 3 Lifetime (days)";"Test DataStorage 3 Power on hours";"DataStorage 4";"DataStorage 4 Manufacturer";"DataStorage 4 Model";"DataStorage 4 Serial Number";"DataStorage 4 Size (MB)";"Erasure DataStorage 4";"Erasure DataStorage 4 Serial Number";"Erasure DataStorage 4 Size (MB)";"Erasure DataStorage 4 Software";"Erasure DataStorage 4 Result";"Erasure DataStorage 4 Certificate URL";"Erasure DataStorage 4 Type";"Erasure DataStorage 4 Method";"Erasure DataStorage 4 Elapsed (hours)";"Erasure DataStorage 4 Date";"Erasure DataStorage 4 Steps";"Erasure DataStorage 4 Steps Start Time";"Erasure DataStorage 4 Steps End Time";"Benchmark DataStorage 4 Read Speed (MB/s)";"Benchmark DataStorage 4 Writing speed (MB/s)";"Test DataStorage 4 Software";"Test DataStorage 4 Type";"Test DataStorage 4 Result";"Test DataStorage 4 Power cycle count";"Test DataStorage 4 Lifetime (days)";"Test DataStorage 4 Power on hours";"Motherboard 1";"Motherboard 1 Manufacturer";"Motherboard 1 Model";"Motherboard 1 Serial Number";"Display 1";"Display 1 Manufacturer";"Display 1 Model";"Display 1 Serial Number";"GraphicCard 1";"GraphicCard 1 Manufacturer";"GraphicCard 1 Model";"GraphicCard 1 Serial Number";"GraphicCard 1 Memory (MB)";"GraphicCard 2";"GraphicCard 2 Manufacturer";"GraphicCard 2 Model";"GraphicCard 2 Serial Number";"GraphicCard 2 Memory (MB)";"NetworkAdapter 1";"NetworkAdapter 1 Manufacturer";"NetworkAdapter 1 Model";"NetworkAdapter 1 Serial Number";"NetworkAdapter 2";"NetworkAdapter 2 Manufacturer";"NetworkAdapter 2 Model";"NetworkAdapter 2 Serial Number";"SoundCard 1";"SoundCard 1 Manufacturer";"SoundCard 1 Model";"SoundCard 1 Serial Number";"SoundCard 2";"SoundCard 2 Manufacturer";"SoundCard 2 Model";"SoundCard 2 Serial Number";"Device Rate";"Device Range";"Processor Rate";"Processor Range";"RAM Rate";"RAM Range";"Data Storage Rate";"Data Storage Range";"Benchmark RamSysbench (points)";"PHID";"Is Abstract";"Pallet";"id Supplier";"Real Info";"Real Components";"Real Type";"Real Serial Number";"Real Model";"Real Manufacturer" -"E39W3";"";"http://localhost/devices/O48N2";"";"";"";"";"";"";"";"";"";"";"desktop-d1mr-d1ml-d1s";"Desktop";"Microtower";"d1s";"d1ml";"d1mr";"Wed Aug 10 10:04:56 2022";"Workbench 11.0";"2022-08-10 10:04:56.794798+02:00";"";"";"";"";"p1ml";"0";"0";"Processor 7: model p1ml, S/N p1s";"p1mr";"p1ml";"p1s";"";"1.6";"2410.0";"";"";"";"";"";"";"";"";"";"RamModule 6: model rm1ml, S/N rm1s";"rm1mr";"rm1ml";"rm1s";"";"1333";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"GraphicCard 5: model gc1ml, S/N gc1s";"gc1mr";"gc1ml";"gc1s";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"4";"Abstract";"";"";"";"";"Desktop";"d1s";"d1ml";"d1mr" +"E39W3";"";"http://localhost/devices/E39W3";"";"";"";"";"";"";"";"";"";"";"desktop-d1mr-d1ml-d1s";"Desktop";"Microtower";"d1s";"d1ml";"d1mr";"Wed Aug 10 10:04:56 2022";"Workbench 11.0";"2022-08-10 10:04:56.794798+02:00";"";"";"";"";"p1ml";"0";"0";"Processor 7: model p1ml, S/N p1s";"p1mr";"p1ml";"p1s";"";"1.6";"2410.0";"";"";"";"";"";"";"";"";"";"RamModule 6: model rm1ml, S/N rm1s";"rm1mr";"rm1ml";"rm1s";"";"1333";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"GraphicCard 5: model gc1ml, S/N gc1s";"gc1mr";"gc1ml";"gc1s";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"4";"Abstract";"";"";"";"";"Desktop";"d1s";"d1ml";"d1mr" diff --git a/tests/files/export_devices.csv b/tests/files/export_devices.csv index ce76ab52..8e5186fc 100644 --- a/tests/files/export_devices.csv +++ b/tests/files/export_devices.csv @@ -1,2 +1,2 @@ "DHID";"DocumentID";"Public Link";"Lots";"Tag 1 Type";"Tag 1 ID";"Tag 1 Organization";"Tag 2 Type";"Tag 2 ID";"Tag 2 Organization";"Tag 3 Type";"Tag 3 ID";"Tag 3 Organization";"Device Hardware ID";"Device Type";"Device Chassis";"Device Serial Number";"Device Model";"Device Manufacturer";"Registered in";"Registered (process)";"Updated in (software)";"Updated in (web)";"Physical state";"Allocate state";"Lifecycle state";"Processor";"RAM (MB)";"Data Storage Size (MB)";"Processor 1";"Processor 1 Manufacturer";"Processor 1 Model";"Processor 1 Serial Number";"Processor 1 Number of cores";"Processor 1 Speed (GHz)";"Benchmark Processor 1 (points)";"Benchmark ProcessorSysbench Processor 1 (points)";"Processor 2";"Processor 2 Manufacturer";"Processor 2 Model";"Processor 2 Serial Number";"Processor 2 Number of cores";"Processor 2 Speed (GHz)";"Benchmark Processor 2 (points)";"Benchmark ProcessorSysbench Processor 2 (points)";"RamModule 1";"RamModule 1 Manufacturer";"RamModule 1 Model";"RamModule 1 Serial Number";"RamModule 1 Size (MB)";"RamModule 1 Speed (MHz)";"RamModule 2";"RamModule 2 Manufacturer";"RamModule 2 Model";"RamModule 2 Serial Number";"RamModule 2 Size (MB)";"RamModule 2 Speed (MHz)";"RamModule 3";"RamModule 3 Manufacturer";"RamModule 3 Model";"RamModule 3 Serial Number";"RamModule 3 Size (MB)";"RamModule 3 Speed (MHz)";"RamModule 4";"RamModule 4 Manufacturer";"RamModule 4 Model";"RamModule 4 Serial Number";"RamModule 4 Size (MB)";"RamModule 4 Speed (MHz)";"DataStorage 1";"DataStorage 1 Manufacturer";"DataStorage 1 Model";"DataStorage 1 Serial Number";"DataStorage 1 Size (MB)";"Erasure DataStorage 1";"Erasure DataStorage 1 Serial Number";"Erasure DataStorage 1 Size (MB)";"Erasure DataStorage 1 Software";"Erasure DataStorage 1 Result";"Erasure DataStorage 1 Certificate URL";"Erasure DataStorage 1 Type";"Erasure DataStorage 1 Method";"Erasure DataStorage 1 Elapsed (hours)";"Erasure DataStorage 1 Date";"Erasure DataStorage 1 Steps";"Erasure DataStorage 1 Steps Start Time";"Erasure DataStorage 1 Steps End Time";"Benchmark DataStorage 1 Read Speed (MB/s)";"Benchmark DataStorage 1 Writing speed (MB/s)";"Test DataStorage 1 Software";"Test DataStorage 1 Type";"Test DataStorage 1 Result";"Test DataStorage 1 Power cycle count";"Test DataStorage 1 Lifetime (days)";"Test DataStorage 1 Power on hours";"DataStorage 2";"DataStorage 2 Manufacturer";"DataStorage 2 Model";"DataStorage 2 Serial Number";"DataStorage 2 Size (MB)";"Erasure DataStorage 2";"Erasure DataStorage 2 Serial Number";"Erasure DataStorage 2 Size (MB)";"Erasure DataStorage 2 Software";"Erasure DataStorage 2 Result";"Erasure DataStorage 2 Certificate URL";"Erasure DataStorage 2 Type";"Erasure DataStorage 2 Method";"Erasure DataStorage 2 Elapsed (hours)";"Erasure DataStorage 2 Date";"Erasure DataStorage 2 Steps";"Erasure DataStorage 2 Steps Start Time";"Erasure DataStorage 2 Steps End Time";"Benchmark DataStorage 2 Read Speed (MB/s)";"Benchmark DataStorage 2 Writing speed (MB/s)";"Test DataStorage 2 Software";"Test DataStorage 2 Type";"Test DataStorage 2 Result";"Test DataStorage 2 Power cycle count";"Test DataStorage 2 Lifetime (days)";"Test DataStorage 2 Power on hours";"DataStorage 3";"DataStorage 3 Manufacturer";"DataStorage 3 Model";"DataStorage 3 Serial Number";"DataStorage 3 Size (MB)";"Erasure DataStorage 3";"Erasure DataStorage 3 Serial Number";"Erasure DataStorage 3 Size (MB)";"Erasure DataStorage 3 Software";"Erasure DataStorage 3 Result";"Erasure DataStorage 3 Certificate URL";"Erasure DataStorage 3 Type";"Erasure DataStorage 3 Method";"Erasure DataStorage 3 Elapsed (hours)";"Erasure DataStorage 3 Date";"Erasure DataStorage 3 Steps";"Erasure DataStorage 3 Steps Start Time";"Erasure DataStorage 3 Steps End Time";"Benchmark DataStorage 3 Read Speed (MB/s)";"Benchmark DataStorage 3 Writing speed (MB/s)";"Test DataStorage 3 Software";"Test DataStorage 3 Type";"Test DataStorage 3 Result";"Test DataStorage 3 Power cycle count";"Test DataStorage 3 Lifetime (days)";"Test DataStorage 3 Power on hours";"DataStorage 4";"DataStorage 4 Manufacturer";"DataStorage 4 Model";"DataStorage 4 Serial Number";"DataStorage 4 Size (MB)";"Erasure DataStorage 4";"Erasure DataStorage 4 Serial Number";"Erasure DataStorage 4 Size (MB)";"Erasure DataStorage 4 Software";"Erasure DataStorage 4 Result";"Erasure DataStorage 4 Certificate URL";"Erasure DataStorage 4 Type";"Erasure DataStorage 4 Method";"Erasure DataStorage 4 Elapsed (hours)";"Erasure DataStorage 4 Date";"Erasure DataStorage 4 Steps";"Erasure DataStorage 4 Steps Start Time";"Erasure DataStorage 4 Steps End Time";"Benchmark DataStorage 4 Read Speed (MB/s)";"Benchmark DataStorage 4 Writing speed (MB/s)";"Test DataStorage 4 Software";"Test DataStorage 4 Type";"Test DataStorage 4 Result";"Test DataStorage 4 Power cycle count";"Test DataStorage 4 Lifetime (days)";"Test DataStorage 4 Power on hours";"Motherboard 1";"Motherboard 1 Manufacturer";"Motherboard 1 Model";"Motherboard 1 Serial Number";"Display 1";"Display 1 Manufacturer";"Display 1 Model";"Display 1 Serial Number";"GraphicCard 1";"GraphicCard 1 Manufacturer";"GraphicCard 1 Model";"GraphicCard 1 Serial Number";"GraphicCard 1 Memory (MB)";"GraphicCard 2";"GraphicCard 2 Manufacturer";"GraphicCard 2 Model";"GraphicCard 2 Serial Number";"GraphicCard 2 Memory (MB)";"NetworkAdapter 1";"NetworkAdapter 1 Manufacturer";"NetworkAdapter 1 Model";"NetworkAdapter 1 Serial Number";"NetworkAdapter 2";"NetworkAdapter 2 Manufacturer";"NetworkAdapter 2 Model";"NetworkAdapter 2 Serial Number";"SoundCard 1";"SoundCard 1 Manufacturer";"SoundCard 1 Model";"SoundCard 1 Serial Number";"SoundCard 2";"SoundCard 2 Manufacturer";"SoundCard 2 Model";"SoundCard 2 Serial Number";"Device Rate";"Device Range";"Processor Rate";"Processor Range";"RAM Rate";"RAM Range";"Data Storage Rate";"Data Storage Range";"Benchmark RamSysbench (points)";"PHID";"Is Abstract";"Pallet";"id Supplier";"Real Info";"Real Components";"Real Type";"Real Serial Number";"Real Model";"Real Manufacturer" -"E39W3";"";"http://localhost/devices/O48N2";"";"";"";"";"";"";"";"";"";"";"laptop-asustek_computer_inc-1001pxd-b8oaas048285-14:da:e9:42:f6:7b";"Laptop";"Netbook";"b8oaas048285";"1001pxd";"asustek computer inc.";"Wed Aug 10 10:22:26 2022";"Workbench 11.0a2";"2022-08-10 10:22:26.867136+02:00";"";"";"";"";"intel atom cpu n455 @ 2.66ghz";"1024";"238475";"Processor 7: model intel atom cpu n455 @ 2.66ghz, S/N None";"intel corp.";"intel atom cpu n455 @ 2.66ghz";"";"1";"2.667";"6666.24";"164.0803";"";"";"";"";"";"";"";"";"RamModule 11: model None, S/N None";"";"";"";"1024";"667";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"HardDrive 12: model hts54322, S/N e2024242cv86mm";"hitachi";"hts54322";"e2024242cv86mm";"238475";"harddrive-hitachi-hts54322-e2024242cv86mm";"e2024242cv86mm";"238475";"Workbench 11.0a2";"Success";"";"EraseBasic";"Shred";"1:16:49";"2022-08-10 10:22:26.816392+02:00";"✓ – StepRandom 1:16:49";"2018-07-03 11:15:22.257059+02:00";"2018-07-03 12:32:11.843190+02:00";"66.2";"21.8";"Workbench 11.0a2";"Short";"Failure";"";"";"0";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"Motherboard 13: model 1001pxd, S/N eee0123456720";"asustek computer inc.";"1001pxd";"eee0123456720";"";"";"";"";"GraphicCard 8: model atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller, S/N None";"intel corporation";"atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller";"";"256";"";"";"";"";"";"NetworkAdapter 5: model ar9285 wireless network adapter, S/N 74:2f:68:8b:fd:c9";"qualcomm atheros";"ar9285 wireless network adapter";"74:2f:68:8b:fd:c9";"NetworkAdapter 6: model ar8152 v2.0 fast ethernet, S/N 14:da:e9:42:f6:7b";"qualcomm atheros";"ar8152 v2.0 fast ethernet";"14:da:e9:42:f6:7b";"SoundCard 9: model nm10/ich7 family high definition audio controller, S/N None";"intel corporation";"nm10/ich7 family high definition audio controller";"";"SoundCard 10: model usb 2.0 uvc vga webcam, S/N 0x0001";"azurewave";"usb 2.0 uvc vga webcam";"0x0001";"";"";"";"";"";"";"";"";"15.7188";"10";"Abstract";"";"";"";"";"Laptop";"b8oaas048285";"1001pxd";"asustek computer inc." +"E39W3";"";"http://localhost/devices/E39W3";"";"";"";"";"";"";"";"";"";"";"laptop-asustek_computer_inc-1001pxd-b8oaas048285-14:da:e9:42:f6:7b";"Laptop";"Netbook";"b8oaas048285";"1001pxd";"asustek computer inc.";"Wed Aug 10 10:22:26 2022";"Workbench 11.0a2";"2022-08-10 10:22:26.867136+02:00";"";"";"";"";"intel atom cpu n455 @ 2.66ghz";"1024";"238475";"Processor 7: model intel atom cpu n455 @ 2.66ghz, S/N None";"intel corp.";"intel atom cpu n455 @ 2.66ghz";"";"1";"2.667";"6666.24";"164.0803";"";"";"";"";"";"";"";"";"RamModule 11: model None, S/N None";"";"";"";"1024";"667";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"HardDrive 12: model hts54322, S/N e2024242cv86mm";"hitachi";"hts54322";"e2024242cv86mm";"238475";"harddrive-hitachi-hts54322-e2024242cv86mm";"e2024242cv86mm";"238475";"Workbench 11.0a2";"Success";"";"EraseBasic";"Shred";"1:16:49";"2022-08-10 10:22:26.816392+02:00";"✓ – StepRandom 1:16:49";"2018-07-03 11:15:22.257059+02:00";"2018-07-03 12:32:11.843190+02:00";"66.2";"21.8";"Workbench 11.0a2";"Short";"Failure";"";"";"0";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"Motherboard 13: model 1001pxd, S/N eee0123456720";"asustek computer inc.";"1001pxd";"eee0123456720";"";"";"";"";"GraphicCard 8: model atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller, S/N None";"intel corporation";"atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller";"";"256";"";"";"";"";"";"NetworkAdapter 5: model ar9285 wireless network adapter, S/N 74:2f:68:8b:fd:c9";"qualcomm atheros";"ar9285 wireless network adapter";"74:2f:68:8b:fd:c9";"NetworkAdapter 6: model ar8152 v2.0 fast ethernet, S/N 14:da:e9:42:f6:7b";"qualcomm atheros";"ar8152 v2.0 fast ethernet";"14:da:e9:42:f6:7b";"SoundCard 9: model nm10/ich7 family high definition audio controller, S/N None";"intel corporation";"nm10/ich7 family high definition audio controller";"";"SoundCard 10: model usb 2.0 uvc vga webcam, S/N 0x0001";"azurewave";"usb 2.0 uvc vga webcam";"0x0001";"";"";"";"";"";"";"";"";"15.7188";"10";"Abstract";"";"";"";"";"Laptop";"b8oaas048285";"1001pxd";"asustek computer inc." diff --git a/tests/files/proposal_extended_csv_report.csv b/tests/files/proposal_extended_csv_report.csv index 531c288b..483a9ca6 100644 --- a/tests/files/proposal_extended_csv_report.csv +++ b/tests/files/proposal_extended_csv_report.csv @@ -1,3 +1,3 @@ "DHID";"DocumentID";"Public Link";"Lots";"Tag 1 Type";"Tag 1 ID";"Tag 1 Organization";"Tag 2 Type";"Tag 2 ID";"Tag 2 Organization";"Tag 3 Type";"Tag 3 ID";"Tag 3 Organization";"Device Hardware ID";"Device Type";"Device Chassis";"Device Serial Number";"Device Model";"Device Manufacturer";"Registered in";"Registered (process)";"Updated in (software)";"Updated in (web)";"Physical state";"Allocate state";"Lifecycle state";"Processor";"RAM (MB)";"Data Storage Size (MB)";"Processor 1";"Processor 1 Manufacturer";"Processor 1 Model";"Processor 1 Serial Number";"Processor 1 Number of cores";"Processor 1 Speed (GHz)";"Benchmark Processor 1 (points)";"Benchmark ProcessorSysbench Processor 1 (points)";"Processor 2";"Processor 2 Manufacturer";"Processor 2 Model";"Processor 2 Serial Number";"Processor 2 Number of cores";"Processor 2 Speed (GHz)";"Benchmark Processor 2 (points)";"Benchmark ProcessorSysbench Processor 2 (points)";"RamModule 1";"RamModule 1 Manufacturer";"RamModule 1 Model";"RamModule 1 Serial Number";"RamModule 1 Size (MB)";"RamModule 1 Speed (MHz)";"RamModule 2";"RamModule 2 Manufacturer";"RamModule 2 Model";"RamModule 2 Serial Number";"RamModule 2 Size (MB)";"RamModule 2 Speed (MHz)";"RamModule 3";"RamModule 3 Manufacturer";"RamModule 3 Model";"RamModule 3 Serial Number";"RamModule 3 Size (MB)";"RamModule 3 Speed (MHz)";"RamModule 4";"RamModule 4 Manufacturer";"RamModule 4 Model";"RamModule 4 Serial Number";"RamModule 4 Size (MB)";"RamModule 4 Speed (MHz)";"DataStorage 1";"DataStorage 1 Manufacturer";"DataStorage 1 Model";"DataStorage 1 Serial Number";"DataStorage 1 Size (MB)";"Erasure DataStorage 1";"Erasure DataStorage 1 Serial Number";"Erasure DataStorage 1 Size (MB)";"Erasure DataStorage 1 Software";"Erasure DataStorage 1 Result";"Erasure DataStorage 1 Certificate URL";"Erasure DataStorage 1 Type";"Erasure DataStorage 1 Method";"Erasure DataStorage 1 Elapsed (hours)";"Erasure DataStorage 1 Date";"Erasure DataStorage 1 Steps";"Erasure DataStorage 1 Steps Start Time";"Erasure DataStorage 1 Steps End Time";"Benchmark DataStorage 1 Read Speed (MB/s)";"Benchmark DataStorage 1 Writing speed (MB/s)";"Test DataStorage 1 Software";"Test DataStorage 1 Type";"Test DataStorage 1 Result";"Test DataStorage 1 Power cycle count";"Test DataStorage 1 Lifetime (days)";"Test DataStorage 1 Power on hours";"DataStorage 2";"DataStorage 2 Manufacturer";"DataStorage 2 Model";"DataStorage 2 Serial Number";"DataStorage 2 Size (MB)";"Erasure DataStorage 2";"Erasure DataStorage 2 Serial Number";"Erasure DataStorage 2 Size (MB)";"Erasure DataStorage 2 Software";"Erasure DataStorage 2 Result";"Erasure DataStorage 2 Certificate URL";"Erasure DataStorage 2 Type";"Erasure DataStorage 2 Method";"Erasure DataStorage 2 Elapsed (hours)";"Erasure DataStorage 2 Date";"Erasure DataStorage 2 Steps";"Erasure DataStorage 2 Steps Start Time";"Erasure DataStorage 2 Steps End Time";"Benchmark DataStorage 2 Read Speed (MB/s)";"Benchmark DataStorage 2 Writing speed (MB/s)";"Test DataStorage 2 Software";"Test DataStorage 2 Type";"Test DataStorage 2 Result";"Test DataStorage 2 Power cycle count";"Test DataStorage 2 Lifetime (days)";"Test DataStorage 2 Power on hours";"DataStorage 3";"DataStorage 3 Manufacturer";"DataStorage 3 Model";"DataStorage 3 Serial Number";"DataStorage 3 Size (MB)";"Erasure DataStorage 3";"Erasure DataStorage 3 Serial Number";"Erasure DataStorage 3 Size (MB)";"Erasure DataStorage 3 Software";"Erasure DataStorage 3 Result";"Erasure DataStorage 3 Certificate URL";"Erasure DataStorage 3 Type";"Erasure DataStorage 3 Method";"Erasure DataStorage 3 Elapsed (hours)";"Erasure DataStorage 3 Date";"Erasure DataStorage 3 Steps";"Erasure DataStorage 3 Steps Start Time";"Erasure DataStorage 3 Steps End Time";"Benchmark DataStorage 3 Read Speed (MB/s)";"Benchmark DataStorage 3 Writing speed (MB/s)";"Test DataStorage 3 Software";"Test DataStorage 3 Type";"Test DataStorage 3 Result";"Test DataStorage 3 Power cycle count";"Test DataStorage 3 Lifetime (days)";"Test DataStorage 3 Power on hours";"DataStorage 4";"DataStorage 4 Manufacturer";"DataStorage 4 Model";"DataStorage 4 Serial Number";"DataStorage 4 Size (MB)";"Erasure DataStorage 4";"Erasure DataStorage 4 Serial Number";"Erasure DataStorage 4 Size (MB)";"Erasure DataStorage 4 Software";"Erasure DataStorage 4 Result";"Erasure DataStorage 4 Certificate URL";"Erasure DataStorage 4 Type";"Erasure DataStorage 4 Method";"Erasure DataStorage 4 Elapsed (hours)";"Erasure DataStorage 4 Date";"Erasure DataStorage 4 Steps";"Erasure DataStorage 4 Steps Start Time";"Erasure DataStorage 4 Steps End Time";"Benchmark DataStorage 4 Read Speed (MB/s)";"Benchmark DataStorage 4 Writing speed (MB/s)";"Test DataStorage 4 Software";"Test DataStorage 4 Type";"Test DataStorage 4 Result";"Test DataStorage 4 Power cycle count";"Test DataStorage 4 Lifetime (days)";"Test DataStorage 4 Power on hours";"Motherboard 1";"Motherboard 1 Manufacturer";"Motherboard 1 Model";"Motherboard 1 Serial Number";"Display 1";"Display 1 Manufacturer";"Display 1 Model";"Display 1 Serial Number";"GraphicCard 1";"GraphicCard 1 Manufacturer";"GraphicCard 1 Model";"GraphicCard 1 Serial Number";"GraphicCard 1 Memory (MB)";"GraphicCard 2";"GraphicCard 2 Manufacturer";"GraphicCard 2 Model";"GraphicCard 2 Serial Number";"GraphicCard 2 Memory (MB)";"NetworkAdapter 1";"NetworkAdapter 1 Manufacturer";"NetworkAdapter 1 Model";"NetworkAdapter 1 Serial Number";"NetworkAdapter 2";"NetworkAdapter 2 Manufacturer";"NetworkAdapter 2 Model";"NetworkAdapter 2 Serial Number";"SoundCard 1";"SoundCard 1 Manufacturer";"SoundCard 1 Model";"SoundCard 1 Serial Number";"SoundCard 2";"SoundCard 2 Manufacturer";"SoundCard 2 Model";"SoundCard 2 Serial Number";"Device Rate";"Device Range";"Processor Rate";"Processor Range";"RAM Rate";"RAM Range";"Data Storage Rate";"Data Storage Range";"Benchmark RamSysbench (points)";"PHID";"Is Abstract";"Pallet";"id Supplier";"Real Info";"Real Components";"Real Type";"Real Serial Number";"Real Model";"Real Manufacturer" -"E39W3";"";"http://localhost/devices/O48N2";"";"";"";"";"";"";"";"";"";"";"laptop-asustek_computer_inc-1001pxd-b8oaas048285-14:da:e9:42:f6:7b";"Laptop";"Netbook";"b8oaas048285";"1001pxd";"asustek computer inc.";"Wed Aug 10 10:06:14 2022";"Workbench 11.0a2";"2022-08-10 10:06:14.906703+02:00";"";"";"";"";"intel atom cpu n455 @ 2.66ghz";"1024";"238475";"Processor 7: model intel atom cpu n455 @ 2.66ghz, S/N None";"intel corp.";"intel atom cpu n455 @ 2.66ghz";"";"1";"2.667";"6666.24";"164.0803";"";"";"";"";"";"";"";"";"RamModule 11: model None, S/N None";"";"";"";"1024";"667";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"HardDrive 12: model hts54322, S/N e2024242cv86mm";"hitachi";"hts54322";"e2024242cv86mm";"238475";"harddrive-hitachi-hts54322-e2024242cv86mm";"e2024242cv86mm";"238475";"Workbench 11.0a2";"Success";"";"EraseBasic";"Shred";"1:16:49";"2022-08-10 10:06:14.839245+02:00";"✓ – StepRandom 1:16:49";"2018-07-03 11:15:22.257059+02:00";"2018-07-03 12:32:11.843190+02:00";"66.2";"21.8";"Workbench 11.0a2";"Short";"Failure";"";"";"0";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"Motherboard 13: model 1001pxd, S/N eee0123456720";"asustek computer inc.";"1001pxd";"eee0123456720";"";"";"";"";"GraphicCard 8: model atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller, S/N None";"intel corporation";"atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller";"";"256";"";"";"";"";"";"NetworkAdapter 5: model ar9285 wireless network adapter, S/N 74:2f:68:8b:fd:c9";"qualcomm atheros";"ar9285 wireless network adapter";"74:2f:68:8b:fd:c9";"NetworkAdapter 6: model ar8152 v2.0 fast ethernet, S/N 14:da:e9:42:f6:7b";"qualcomm atheros";"ar8152 v2.0 fast ethernet";"14:da:e9:42:f6:7b";"SoundCard 9: model nm10/ich7 family high definition audio controller, S/N None";"intel corporation";"nm10/ich7 family high definition audio controller";"";"SoundCard 10: model usb 2.0 uvc vga webcam, S/N 0x0001";"azurewave";"usb 2.0 uvc vga webcam";"0x0001";"";"";"";"";"";"";"";"";"15.7188";"10";"Abstract";"";"";"";"";"Laptop";"b8oaas048285";"1001pxd";"asustek computer inc." -"45VG4";"";"http://localhost/devices/X4ZV3";"";"";"";"";"";"";"";"";"";"";"laptop-asustek_computer_inc-1001pxd-b8oaas048287-14:da:e9:42:f6:7c";"Laptop";"Netbook";"b8oaas048287";"1001pxd";"asustek computer inc.";"Wed Aug 10 10:06:15 2022";"Workbench 11.0b11";"2022-08-10 10:06:15.254237+02:00";"";"";"";"";"intel atom cpu n455 @ 1.66ghz";"2048";"558558";"Processor 28: model intel atom cpu n455 @ 1.66ghz, S/N None";"intel corp.";"intel atom cpu n455 @ 1.66ghz";"";"1";"1.667";"6666.24";"164.0803";"";"";"";"";"";"";"";"";"RamModule 32: model None, S/N None";"";"";"";"1024";"667";"RamModule 33: model 48594d503131325336344350362d53362020, S/N 4f43487b";"hynix semiconductor";"48594d503131325336344350362d53362020";"4f43487b";"1024";"667";"";"";"";"";"";"";"";"";"";"";"";"";"HardDrive 34: model hts54322, S/N e2024242cv86hj";"hitachi";"hts54322";"e2024242cv86hj";"238475";"harddrive-hitachi-hts54322-e2024242cv86hj";"e2024242cv86hj";"238475";"Workbench 11.0b11";"Success";"";"EraseBasic";"Shred";"1:16:49";"2022-08-10 10:06:15.199472+02:00";"✓ – StepRandom 1:16:49";"2018-07-03 11:15:22.257059+02:00";"2018-07-03 12:32:11.843190+02:00";"66.2";"21.8";"Workbench 11.0b11";"Extended";"Failure";"";"";"0";"DataStorage 35: model wdc wd1600bevt-2, S/N wd-wx11a80w7430";"western digital";"wdc wd1600bevt-2";"wd-wx11a80w7430";"160041";"datastorage-western_digital-wdc_wd1600bevt-2-wd-wx11a80w7430";"wd-wx11a80w7430";"160041";"Workbench 11.0b11";"Failure";"";"EraseBasic";"Shred";"0:45:36";"2022-08-10 10:06:15.201582+02:00";"✓ – StepRandom 0:45:36";"2019-10-23 09:49:54.410830+02:00";"2019-10-23 10:35:31.400587+02:00";"41.6";"17.3";"Workbench 11.0b11";"Short";"Success";"5293";"195 days, 12:00:00";"4692";"SolidStateDrive 36: model wdc wd1600bevt-2, S/N wd-wx11a80w7430";"western digital";"wdc wd1600bevt-2";"wd-wx11a80w7430";"160042";"solidstatedrive-western_digital-wdc_wd1600bevt-2-wd-wx11a80w7430";"wd-wx11a80w7430";"160042";"Workbench 11.0b11";"Success";"";"EraseSectors";"Badblocks";"1:46:03";"2022-08-10 10:06:15.205281+02:00";"✓ – StepRandom 0:46:03,✓ – StepZero 1:00:00";"2019-08-19 18:48:19.690458+02:00,2019-08-19 19:34:22.690458+02:00";"2019-08-19 19:34:22.930562+02:00,2019-08-19 20:34:22.930562+02:00";"41.1";"17.1";"Workbench 11.0b11";"Short";"Success";"5231";"194 days, 17:00:00";"4673";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"Motherboard 37: model 1001pxd, S/N eee0123456789";"asustek computer inc.";"1001pxd";"eee0123456789";"";"auo ""auo""";"auo lcd monitor";"";"GraphicCard 29: model atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller, S/N None";"intel corporation";"atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller";"";"256";"";"";"";"";"";"NetworkAdapter 26: model ar9285 wireless network adapter, S/N 74:2f:68:8b:fd:c8";"qualcomm atheros";"ar9285 wireless network adapter";"74:2f:68:8b:fd:c8";"NetworkAdapter 27: model ar8152 v2.0 fast ethernet, S/N 14:da:e9:42:f6:7c";"qualcomm atheros";"ar8152 v2.0 fast ethernet";"14:da:e9:42:f6:7c";"SoundCard 30: model nm10/ich7 family high definition audio controller, S/N None";"intel corporation";"nm10/ich7 family high definition audio controller";"";"SoundCard 31: model usb 2.0 uvc vga webcam, S/N 0x0001";"azurewave";"usb 2.0 uvc vga webcam";"0x0001";"";"";"";"";"";"";"";"";"15.7188";"24";"Abstract";"";"";"";"";"Laptop";"b8oaas048287";"1001pxd";"asustek computer inc." +"E39W3";"";"http://localhost/devices/E39W3";"";"";"";"";"";"";"";"";"";"";"laptop-asustek_computer_inc-1001pxd-b8oaas048285-14:da:e9:42:f6:7b";"Laptop";"Netbook";"b8oaas048285";"1001pxd";"asustek computer inc.";"Wed Aug 10 10:06:14 2022";"Workbench 11.0a2";"2022-08-10 10:06:14.906703+02:00";"";"";"";"";"intel atom cpu n455 @ 2.66ghz";"1024";"238475";"Processor 7: model intel atom cpu n455 @ 2.66ghz, S/N None";"intel corp.";"intel atom cpu n455 @ 2.66ghz";"";"1";"2.667";"6666.24";"164.0803";"";"";"";"";"";"";"";"";"RamModule 11: model None, S/N None";"";"";"";"1024";"667";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"HardDrive 12: model hts54322, S/N e2024242cv86mm";"hitachi";"hts54322";"e2024242cv86mm";"238475";"harddrive-hitachi-hts54322-e2024242cv86mm";"e2024242cv86mm";"238475";"Workbench 11.0a2";"Success";"";"EraseBasic";"Shred";"1:16:49";"2022-08-10 10:06:14.839245+02:00";"✓ – StepRandom 1:16:49";"2018-07-03 11:15:22.257059+02:00";"2018-07-03 12:32:11.843190+02:00";"66.2";"21.8";"Workbench 11.0a2";"Short";"Failure";"";"";"0";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"Motherboard 13: model 1001pxd, S/N eee0123456720";"asustek computer inc.";"1001pxd";"eee0123456720";"";"";"";"";"GraphicCard 8: model atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller, S/N None";"intel corporation";"atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller";"";"256";"";"";"";"";"";"NetworkAdapter 5: model ar9285 wireless network adapter, S/N 74:2f:68:8b:fd:c9";"qualcomm atheros";"ar9285 wireless network adapter";"74:2f:68:8b:fd:c9";"NetworkAdapter 6: model ar8152 v2.0 fast ethernet, S/N 14:da:e9:42:f6:7b";"qualcomm atheros";"ar8152 v2.0 fast ethernet";"14:da:e9:42:f6:7b";"SoundCard 9: model nm10/ich7 family high definition audio controller, S/N None";"intel corporation";"nm10/ich7 family high definition audio controller";"";"SoundCard 10: model usb 2.0 uvc vga webcam, S/N 0x0001";"azurewave";"usb 2.0 uvc vga webcam";"0x0001";"";"";"";"";"";"";"";"";"15.7188";"10";"Abstract";"";"";"";"";"Laptop";"b8oaas048285";"1001pxd";"asustek computer inc." +"45VG4";"";"http://localhost/devices/45VG4";"";"";"";"";"";"";"";"";"";"";"laptop-asustek_computer_inc-1001pxd-b8oaas048287-14:da:e9:42:f6:7c";"Laptop";"Netbook";"b8oaas048287";"1001pxd";"asustek computer inc.";"Wed Aug 10 10:06:15 2022";"Workbench 11.0b11";"2022-08-10 10:06:15.254237+02:00";"";"";"";"";"intel atom cpu n455 @ 1.66ghz";"2048";"558558";"Processor 28: model intel atom cpu n455 @ 1.66ghz, S/N None";"intel corp.";"intel atom cpu n455 @ 1.66ghz";"";"1";"1.667";"6666.24";"164.0803";"";"";"";"";"";"";"";"";"RamModule 32: model None, S/N None";"";"";"";"1024";"667";"RamModule 33: model 48594d503131325336344350362d53362020, S/N 4f43487b";"hynix semiconductor";"48594d503131325336344350362d53362020";"4f43487b";"1024";"667";"";"";"";"";"";"";"";"";"";"";"";"";"HardDrive 34: model hts54322, S/N e2024242cv86hj";"hitachi";"hts54322";"e2024242cv86hj";"238475";"harddrive-hitachi-hts54322-e2024242cv86hj";"e2024242cv86hj";"238475";"Workbench 11.0b11";"Success";"";"EraseBasic";"Shred";"1:16:49";"2022-08-10 10:06:15.199472+02:00";"✓ – StepRandom 1:16:49";"2018-07-03 11:15:22.257059+02:00";"2018-07-03 12:32:11.843190+02:00";"66.2";"21.8";"Workbench 11.0b11";"Extended";"Failure";"";"";"0";"DataStorage 35: model wdc wd1600bevt-2, S/N wd-wx11a80w7430";"western digital";"wdc wd1600bevt-2";"wd-wx11a80w7430";"160041";"datastorage-western_digital-wdc_wd1600bevt-2-wd-wx11a80w7430";"wd-wx11a80w7430";"160041";"Workbench 11.0b11";"Failure";"";"EraseBasic";"Shred";"0:45:36";"2022-08-10 10:06:15.201582+02:00";"✓ – StepRandom 0:45:36";"2019-10-23 09:49:54.410830+02:00";"2019-10-23 10:35:31.400587+02:00";"41.6";"17.3";"Workbench 11.0b11";"Short";"Success";"5293";"195 days, 12:00:00";"4692";"SolidStateDrive 36: model wdc wd1600bevt-2, S/N wd-wx11a80w7430";"western digital";"wdc wd1600bevt-2";"wd-wx11a80w7430";"160042";"solidstatedrive-western_digital-wdc_wd1600bevt-2-wd-wx11a80w7430";"wd-wx11a80w7430";"160042";"Workbench 11.0b11";"Success";"";"EraseSectors";"Badblocks";"1:46:03";"2022-08-10 10:06:15.205281+02:00";"✓ – StepRandom 0:46:03,✓ – StepZero 1:00:00";"2019-08-19 18:48:19.690458+02:00,2019-08-19 19:34:22.690458+02:00";"2019-08-19 19:34:22.930562+02:00,2019-08-19 20:34:22.930562+02:00";"41.1";"17.1";"Workbench 11.0b11";"Short";"Success";"5231";"194 days, 17:00:00";"4673";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"Motherboard 37: model 1001pxd, S/N eee0123456789";"asustek computer inc.";"1001pxd";"eee0123456789";"";"auo ""auo""";"auo lcd monitor";"";"GraphicCard 29: model atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller, S/N None";"intel corporation";"atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller";"";"256";"";"";"";"";"";"NetworkAdapter 26: model ar9285 wireless network adapter, S/N 74:2f:68:8b:fd:c8";"qualcomm atheros";"ar9285 wireless network adapter";"74:2f:68:8b:fd:c8";"NetworkAdapter 27: model ar8152 v2.0 fast ethernet, S/N 14:da:e9:42:f6:7c";"qualcomm atheros";"ar8152 v2.0 fast ethernet";"14:da:e9:42:f6:7c";"SoundCard 30: model nm10/ich7 family high definition audio controller, S/N None";"intel corporation";"nm10/ich7 family high definition audio controller";"";"SoundCard 31: model usb 2.0 uvc vga webcam, S/N 0x0001";"azurewave";"usb 2.0 uvc vga webcam";"0x0001";"";"";"";"";"";"";"";"";"15.7188";"24";"Abstract";"";"";"";"";"Laptop";"b8oaas048287";"1001pxd";"asustek computer inc." diff --git a/tests/test_device_find.py b/tests/test_device_find.py index 646a3bb0..ae5eff5c 100644 --- a/tests/test_device_find.py +++ b/tests/test_device_find.py @@ -238,18 +238,22 @@ def test_device_search_regenerate_table(app: DeviceSearch, user: UserClient): @pytest.mark.mvp +@pytest.mark.usefixtures(conftest.app_context.__name__) def test_device_query_search(user: UserClient): # todo improve snapshot, _ = user.post(file('basic.snapshot'), res=Snapshot) + dev = Device.query.filter_by(id=snapshot['device']['id']).one() user.post(file('computer-monitor.snapshot'), res=Snapshot) user.post(file('real-eee-1001pxd.snapshot.11'), res=Snapshot) i, _ = user.get(res=Device, query=[('search', 'desktop')]) - assert i['items'][0]['id'] == snapshot['device']['id'] + assert i['items'][0]['id'] == dev.id i, _ = user.get(res=Device, query=[('search', 'intel')]) assert len(i['items']) == 1 - i, _ = user.get(res=Device, query=[('search', i['items'][0]['devicehubID'])]) + dev1 = Device.query.filter_by(id=i['items'][0]['id']).one() + i, _ = user.get(res=Device, query=[('search', dev1.devicehub_id)]) assert len(i['items']) == 1 - i, _ = user.get(res=Device, query=[('search', snapshot['device']['id'])]) + dev2 = Device.query.filter_by(id=i['items'][0]['id']).one() + i, _ = user.get(res=Device, query=[('search', dev2.devicehub_id)]) assert len(i['items']) == 1 diff --git a/tests/test_snapshot.py b/tests/test_snapshot.py index 5888b05c..bbdec86a 100644 --- a/tests/test_snapshot.py +++ b/tests/test_snapshot.py @@ -33,7 +33,7 @@ from ereuse_devicehub.resources.action.models import ( from ereuse_devicehub.resources.action.views.snapshot import save_json from ereuse_devicehub.resources.device import models as m from ereuse_devicehub.resources.device.exceptions import NeedsId -from ereuse_devicehub.resources.device.models import SolidStateDrive +from ereuse_devicehub.resources.device.models import SolidStateDrive, Device from ereuse_devicehub.resources.device.sync import ( MismatchBetweenProperties, MismatchBetweenTagsAndHid, @@ -91,6 +91,7 @@ def test_snapshot_schema(app: Devicehub): @pytest.mark.mvp +@pytest.mark.usefixtures(conftest.app_context.__name__) def test_snapshot_post(user: UserClient): """Tests the post snapshot endpoint (validation, etc), data correctness, and relationship correctness. @@ -108,11 +109,12 @@ def test_snapshot_post(user: UserClient): assert snapshot['author']['id'] == user.user['id'] assert 'actions' not in snapshot['device'] assert 'author' not in snapshot['device'] - device, _ = user.get(res=m.Device, item=snapshot['device']['devicehubID']) + dev = m.Device.query.filter_by(id=snapshot['device']['id']).one() + device, _ = user.get(res=m.Device, item=dev.devicehub_id) key = itemgetter('serialNumber') snapshot['components'].sort(key=key) device['components'].sort(key=key) - assert snapshot['components'] == device['components'] + assert {(x['id'], x['type']) for x in device['components']} == {(x['id'], x['type']) for x in snapshot['components']} assert {c['type'] for c in snapshot['components']} == { m.GraphicCard.t, @@ -190,7 +192,6 @@ def test_snapshot_power_on_hours(user: UserClient): ) errors = SnapshotsLog.query.filter().all() - snap_log = errors[1] assert len(errors) == 2 assert str(errors[0].snapshot_uuid) == snap['uuid'] assert str(errors[1].snapshot.uuid) == snap['uuid'] @@ -199,6 +200,7 @@ def test_snapshot_power_on_hours(user: UserClient): @pytest.mark.mvp +@pytest.mark.usefixtures(conftest.app_context.__name__) def test_snapshot_component_add_remove(user: UserClient): """Tests adding and removing components and some don't generate HID. All computers generate HID. @@ -221,7 +223,8 @@ def test_snapshot_component_add_remove(user: UserClient): # RateComputer.t), # perform_second_snapshot=False) pc1_id = snapshot1['device']['id'] - pc1_devicehub_id = snapshot1['device']['devicehubID'] + pc1_dev = m.Device.query.filter_by(id=pc1_id).one() + pc1_devicehub_id = pc1_dev.devicehub_id pc1, _ = user.get(res=m.Device, item=pc1_devicehub_id) update1_pc1 = pc1['updated'] # Parent contains components @@ -229,14 +232,15 @@ def test_snapshot_component_add_remove(user: UserClient): 'p1c1s', 'p1c2s', 'p1c3s', - ) + ) == tuple(x.serial_number for x in pc1_dev.binding.device.components) # Components contain parent assert all(c['parent'] == pc1_id for c in pc1['components']) # pc has three actions: Snapshot, BenchmarkProcessor and RateComputer assert len(pc1['actions']) == 2 assert pc1['actions'][1]['type'] == Snapshot.t # p1c1s has Snapshot - p1c1s, _ = user.get(res=m.Device, item=pc1['components'][0]['devicehubID']) + p1c1s_dev = m.Device.query.filter_by(id=pc1['components'][0]['id']).one() + p1c1s, _ = user.get(res=m.Device, item=p1c1s_dev.devicehub_id) assert tuple(e['type'] for e in p1c1s['actions']) == ('Snapshot',) # We register a new device @@ -249,7 +253,8 @@ def test_snapshot_component_add_remove(user: UserClient): # snapshot2 = snapshot_and_check(user, s2, action_types=('Remove', 'RateComputer'), # perform_second_snapshot=False) pc2_id = snapshot2['device']['id'] - pc2_devicehub_id = snapshot2['device']['devicehubID'] + pc2_dev = m.Device.query.filter_by(id=pc2_id).one() + pc2_devicehub_id = pc2_dev.devicehub_id pc1, _ = user.get(res=m.Device, item=pc1_devicehub_id) pc2, _ = user.get(res=m.Device, item=pc2_devicehub_id) # Check if the update_timestamp is updated @@ -269,7 +274,8 @@ def test_snapshot_component_add_remove(user: UserClient): assert all(c['parent'] == pc2_id for c in pc2['components']) assert tuple(e['type'] for e in pc2['actions']) == ('Snapshot',) # p1c2s has two Snapshots, a Remove and an Add - p1c2s, _ = user.get(res=m.Device, item=pc2['components'][0]['devicehubID']) + p1c2s_dev = m.Device.query.filter_by(id=pc2['components'][0]['id']).one() + p1c2s, _ = user.get(res=m.Device, item=p1c2s_dev.devicehub_id) assert tuple(e['type'] for e in p1c2s['actions']) == ( 'BenchmarkProcessor', 'Snapshot', @@ -299,8 +305,8 @@ def test_snapshot_component_add_remove(user: UserClient): assert tuple(get_actions_info(pc1['actions'])) == ( # id, type, components, snapshot ('BenchmarkProcessor', []), # first BenchmarkProcessor - ('Snapshot', ['p1c1s', 'p1c2s', 'p1c3s']), # first Snapshot1 - ('Remove', ['p1c2s']), # Remove Processor in Snapshot2 + ('Snapshot', ['p1c1s', 'p1c2s', 'p1c3s', 'p1c2s']), # first Snapshot1 + ('Remove', ['p1c2s', 'p1c2s']), # Remove Processor in Snapshot2 ('Snapshot', ['p1c2s', 'p1c3s']), # This Snapshot3 ) # PC2 @@ -311,12 +317,13 @@ def test_snapshot_component_add_remove(user: UserClient): 'Remove', # the processor we added in 2. ) # p1c2s has Snapshot, Remove and Add - p1c2s, _ = user.get(res=m.Device, item=pc1['components'][0]['devicehubID']) + p1c2s_dev = m.Device.query.filter_by(id=pc1['components'][0]['id']).one() + p1c2s, _ = user.get(res=m.Device, item=p1c2s_dev.devicehub_id) assert tuple(get_actions_info(p1c2s['actions'])) == ( ('BenchmarkProcessor', []), # first BenchmarkProcessor - ('Snapshot', ['p1c1s', 'p1c2s', 'p1c3s']), # First Snapshot to PC1 + ('Snapshot', ['p1c1s', 'p1c2s', 'p1c3s', 'p1c2s']), # First Snapshot to PC1 ('Snapshot', ['p1c2s', 'p2c1s']), # Second Snapshot to PC2 - ('Remove', ['p1c2s']), # ...which caused p1c2s to be removed form PC1 + ('Remove', ['p1c2s', 'p1c2s']), # ...which caused p1c2s to be removed form PC1 ('Snapshot', ['p1c2s', 'p1c3s']), # The third Snapshot to PC1 ('Remove', ['p1c2s']), # ...which caused p1c2 to be removed from PC2 ) @@ -482,6 +489,7 @@ def test_not_remove_ram_in_same_computer(user: UserClient): @pytest.mark.mvp +@pytest.mark.usefixtures(conftest.app_context.__name__) def test_erase_privacy_standards_endtime_sort(user: UserClient): """Tests a Snapshot with EraseSectors and the resulting privacy properties. @@ -520,8 +528,9 @@ def test_erase_privacy_standards_endtime_sort(user: UserClient): # The actual test storage = next(e for e in snapshot['components'] if e['type'] == SolidStateDrive.t) + db_storage = m.Device.query.filter_by(id=storage['id']).one() storage, _ = user.get( - res=m.Device, item=storage['devicehubID'] + res=m.Device, item=db_storage.devicehub_id ) # Let's get storage actions too # order: endTime ascending # erasure1/2 have an user defined time and others actions endTime = created @@ -555,17 +564,22 @@ def test_erase_privacy_standards_endtime_sort(user: UserClient): assert 'num' not in step2 assert ['HMG_IS5'] == erasure['standards'] assert storage['privacy']['type'] == 'EraseSectors' - pc, _ = user.get(res=m.Device, item=snapshot['device']['devicehubID']) + dev = m.Device.query.filter_by(id=snapshot['device']['id']).one() + pc, _ = user.get(res=m.Device, item=dev.devicehub_id) + # pc, _ = user.get(res=m.Device, item=snapshot['device']['devicehubID']) assert pc['privacy'] == [storage['privacy']] # Let's try a second erasure with an error s['uuid'] = uuid4() s['components'][0]['actions'][0]['severity'] = 'Error' snapshot, _ = user.post(json_encode(s), res=Snapshot) - storage, _ = user.get(res=m.Device, item=storage['devicehubID']) + storage, _ = user.get(res=m.Device, item=db_storage.devicehub_id) assert storage['hid'] == 'solidstatedrive-c1mr-c1ml-c1s' + assert dev.components[0].privacy.type == 'EraseSectors' assert storage['privacy']['type'] == 'EraseSectors' - pc, _ = user.get(res=m.Device, item=snapshot['device']['devicehubID']) + dev = m.Device.query.filter_by(id=snapshot['device']['id']).one() + pc, _ = user.get(res=m.Device, item=dev.devicehub_id) + # import pdb; pdb.set_trace() assert pc['privacy'] == [storage['privacy']] @@ -889,23 +903,26 @@ def test_snapshot_failed_missing_chassis(app: Devicehub, user: UserClient): @pytest.mark.mvp +@pytest.mark.usefixtures(conftest.app_context.__name__) def test_snapshot_failed_end_time_bug(app: Devicehub, user: UserClient): """This test check if the end_time = 0001-01-01 00:00:00+00:00 and then we get a /devices, this create a crash """ snapshot_file = file('asus-end_time_bug88.snapshot') snapshot, _ = user.post(res=Snapshot, data=snapshot_file) - device, _ = user.get(res=m.Device, item=snapshot['device']['devicehubID']) + dev = m.Device.query.filter_by(id=snapshot['device']['id']).one() + device, _ = user.get(res=m.Device, item=dev.devicehub_id) end_times = [x['endTime'] for x in device['actions']] assert '1970-01-02T00:00:00+00:00' in end_times - assert not '0001-01-01T00:00:00+00:00' in end_times + assert '0001-01-01T00:00:00+00:00' not in end_times tmp_snapshots = app.config['TMP_SNAPSHOTS'] shutil.rmtree(tmp_snapshots) @pytest.mark.mvp +@pytest.mark.usefixtures(conftest.app_context.__name__) def test_snapshot_not_failed_end_time_bug(app: Devicehub, user: UserClient): """This test check if the end_time != 0001-01-01 00:00:00+00:00 and then we get a /devices, this create a crash @@ -913,7 +930,8 @@ def test_snapshot_not_failed_end_time_bug(app: Devicehub, user: UserClient): snapshot_file = yaml2json('asus-end_time_bug88.snapshot') snapshot_file['endTime'] = '2001-01-01 00:00:00+00:00' snapshot, _ = user.post(res=Snapshot, data=json_encode(snapshot_file)) - device, _ = user.get(res=m.Device, item=snapshot['device']['devicehubID']) + db_dev = Device.query.filter_by(id=snapshot['device']['id']).one() + device, _ = user.get(res=m.Device, item=db_dev.devicehub_id) end_times = [x['endTime'] for x in device['actions']] assert not '1970-01-02T00:00:00+00:00' in end_times @@ -974,6 +992,7 @@ def test_snapshot_wb_lite(user: UserClient): body, res = user.post(snapshot, uri="/api/inventory/") dev = m.Device.query.filter_by(devicehub_id=body['dhid']).one() + dev = dev.placeholder.binding ssd = [x for x in dev.components if x.type == 'SolidStateDrive'][0] assert dev.manufacturer == 'lenovo' @@ -1000,6 +1019,7 @@ def test_snapshot_wb_lite_qemu(user: UserClient): assert res.status == '201 CREATED' dev = m.Device.query.filter_by(devicehub_id=body['dhid']).one() + dev = dev.placeholder.binding assert dev.manufacturer == 'qemu' assert dev.model == 'standard' assert dev.serial_number is None @@ -1235,6 +1255,7 @@ def test_snapshot_errors(user: UserClient): assert len(SnapshotsLog.query.all()) == 1 bodyLite, res = user.post(snapshot_lite, uri="/api/inventory/") dev = m.Device.query.filter_by(devicehub_id=bodyLite['dhid']).one() + dev = dev.placeholder.binding assert len(SnapshotsLog.query.all()) == 4 assert body11['device'].get('hid') == dev.hid @@ -1276,6 +1297,7 @@ def test_snapshot_errors_no_serial_number(user: UserClient): assert len(logs) == 1 assert logs[0].description == 'Ok' dev = m.Device.query.filter_by(devicehub_id=bodyLite['dhid']).one() + dev = dev.placeholder.binding assert not dev.model assert not dev.manufacturer assert not dev.serial_number diff --git a/tests/test_tag.py b/tests/test_tag.py index b30cf592..94c0f23c 100644 --- a/tests/test_tag.py +++ b/tests/test_tag.py @@ -364,13 +364,12 @@ def test_tag_secondary_workbench_link_find(user: UserClient): s = yaml2json('basic.snapshot') s['device']['tags'] = [{'id': 'foo', 'secondary': 'bar', 'type': 'Tag'}] snapshot, _ = user.post(json_encode(s), res=Snapshot) - device, _ = user.get(res=Device, item=snapshot['device']['devicehubID']) - desktop = Device.query.filter_by( - devicehub_id=snapshot['device']['devicehubID'] - ).one() + dev = Device.query.filter_by(id=snapshot['device']['id']).one() + device, _ = user.get(res=Device, item=dev.devicehub_id) + desktop = dev.binding.device assert [] == [x['id'] for x in device['tags']] - assert 'foo' in [x.id for x in desktop.binding.device.tags] - assert 'bar' in [x.secondary for x in desktop.binding.device.tags] + assert 'foo' in [x.id for x in desktop.tags] + assert 'bar' in [x.secondary for x in desktop.tags] r, _ = user.get( res=Device, query=[('search', 'foo'), ('filter', {'type': ['Computer']})] diff --git a/tests/test_workbench.py b/tests/test_workbench.py index e7ea80b8..43c293ea 100644 --- a/tests/test_workbench.py +++ b/tests/test_workbench.py @@ -16,9 +16,11 @@ from ereuse_devicehub.resources.device.exceptions import NeedsId from ereuse_devicehub.resources.device.models import Device from ereuse_devicehub.resources.tag.model import Tag from tests.conftest import file, file_workbench, json_encode, yaml2json +from tests import conftest @pytest.mark.mvp +@pytest.mark.usefixtures(conftest.app_context.__name__) def test_workbench_server_condensed(user: UserClient): """As :def:`.test_workbench_server_phases` but all the actions condensed in only one big ``Snapshot`` file, as described @@ -54,7 +56,8 @@ def test_workbench_server_condensed(user: UserClient): } assert snapshot['closed'] assert snapshot['severity'] == 'Info' - device, _ = user.get(res=Device, item=snapshot['device']['devicehubID']) + db_dev = Device.query.filter_by(id=snapshot['device']['id']).one() + device, _ = user.get(res=Device, item=db_dev.devicehub_id) assert device['dataStorageSize'] == 1100 assert device['chassis'] == 'Tower' assert device['hid'] == 'desktop-d1mr-d1ml-d1s-na1-s' @@ -175,13 +178,15 @@ def test_real_toshiba_11(user: UserClient): @pytest.mark.mvp +@pytest.mark.usefixtures(conftest.app_context.__name__) def test_snapshot_real_eee_1001pxd_with_rate(user: UserClient): """Checks the values of the device, components, actions and their relationships of a real pc. """ s = file('real-eee-1001pxd.snapshot.11') snapshot, _ = user.post(res=em.Snapshot, data=s) - pc, _ = user.get(res=Device, item=snapshot['device']['devicehubID']) + dev = Device.query.filter_by(id=snapshot['device']['id']).one() + pc, _ = user.get(res=Device, item=dev.devicehub_id) assert pc['type'] == 'Laptop' assert pc['chassis'] == 'Netbook' assert pc['model'] == '1001pxd' @@ -222,7 +227,8 @@ def test_snapshot_real_eee_1001pxd_with_rate(user: UserClient): assert cpu['speed'] == 1.667 assert 'hid' not in cpu assert pc['processorModel'] == cpu['model'] == 'intel atom cpu n455 @ 1.66ghz' - cpu, _ = user.get(res=Device, item=cpu['devicehubID']) + db_cpu = Device.query.filter_by(id=cpu['id']).one() + cpu, _ = user.get(res=Device, item=db_cpu.devicehub_id) actions = cpu['actions'] sysbench = next(e for e in actions if e['type'] == em.BenchmarkProcessorSysbench.t) assert sysbench['elapsed'] == 164 @@ -245,7 +251,8 @@ def test_snapshot_real_eee_1001pxd_with_rate(user: UserClient): ) assert gpu['manufacturer'] == 'intel corporation' assert gpu['memory'] == 256 - gpu, _ = user.get(res=Device, item=gpu['devicehubID']) + db_gpu = Device.query.filter_by(id=gpu['id']).one() + gpu, _ = user.get(res=Device, item=db_gpu.devicehub_id) action_types = tuple(e['type'] for e in gpu['actions']) assert em.BenchmarkRamSysbench.t in action_types assert em.StressTest.t in action_types @@ -264,7 +271,8 @@ def test_snapshot_real_eee_1001pxd_with_rate(user: UserClient): assert hdd['hid'] == 'harddrive-hitachi-hts54322-e2024242cv86hj' assert hdd['interface'] == 'ATA' assert hdd['size'] == 238475 - hdd, _ = user.get(res=Device, item=hdd['devicehubID']) + db_hdd = Device.query.filter_by(id=hdd['id']).one() + hdd, _ = user.get(res=Device, item=db_hdd.devicehub_id) action_types = tuple(e['type'] for e in hdd['actions']) assert em.BenchmarkRamSysbench.t in action_types assert em.StressTest.t in action_types From 74c8a48d6e79f4e2481c044595069d162a155175 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 2 Sep 2022 16:40:35 +0200 Subject: [PATCH 29/29] get erasure datas form abstract device and drop parent details --- ereuse_devicehub/resources/device/models.py | 6 +++++- ereuse_devicehub/templates/inventory/erasure.html | 12 ------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/ereuse_devicehub/resources/device/models.py b/ereuse_devicehub/resources/device/models.py index bdf4a654..f37ef586 100644 --- a/ereuse_devicehub/resources/device/models.py +++ b/ereuse_devicehub/resources/device/models.py @@ -1049,10 +1049,14 @@ class Computer(Device): """Returns the privacy of all ``DataStorage`` components when it is not None. """ + components = self.components + if self.placeholder and self.placeholder.binding: + components = self.placeholder.binding.components + return set( privacy for privacy in ( - hdd.privacy for hdd in self.components if isinstance(hdd, DataStorage) + hdd.privacy for hdd in components if isinstance(hdd, DataStorage) ) if privacy ) diff --git a/ereuse_devicehub/templates/inventory/erasure.html b/ereuse_devicehub/templates/inventory/erasure.html index 5a16390c..57fa5139 100644 --- a/ereuse_devicehub/templates/inventory/erasure.html +++ b/ereuse_devicehub/templates/inventory/erasure.html @@ -40,18 +40,6 @@
    Data storage:
    {{ erasure.device.__format__('ts') }}
    -
    Computer where was erase:
    -
    Title: {{ erasure.parent.__format__('ts') }}
    -
    DevicehubID: {{ erasure.parent.devicehub_id }}
    -
    Hid: {{ erasure.parent.hid }}
    -
    Tags: {{ erasure.parent.tags }}
    - -
    Computer where it resides:
    -
    Title: {{ erasure.device.parent.__format__('ts') }}
    -
    DevicehubID: {{ erasure.device.parent.devicehub_id }}
    -
    Hid: {{ erasure.device.parent.hid }}
    -
    Tags: {{ erasure.device.parent.tags }}
    -
    Erasure:
    {{ erasure.__format__('ts') }}
    {% if erasure.steps %}