Merge branch 'main' into feature/f31-device-enviromental-impact

.dockerignore

@@ -0,0 +1,3 @@
+db
+.git
+already_configured

.editorconfig

@@ -0,0 +1,17 @@
+# repository editor configuration normalization
+# @see http://editorconfig.org/
+
+# This is the top-most .editorconfig file; do not search in parent directories.
+root = true
+
+# All files.
+[*]
+end_of_line = LF
+indent_style = space
+indent_size = 4
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.sh]
+indent_size = 8

.env.example

@@ -1,8 +1,18 @@
-DOMAIN=localhost
+####
+# DEV OPTIONS
+####
+
+DEV_DOCKER_ALWAYS_BUILD=false
+
+####
+# DEVICEHUB
+####
+
+DEVICEHUB_DOMAIN=localhost
+DEVICEHUB_PORT=8001
 DEMO=true
 # note that with DEBUG=true, logs are more verbose (include tracebacks)
 DEBUG=true
-ALLOWED_HOSTS=${DOMAIN},${DOMAIN}:8000,127.0.0.1,127.0.0.1:8000
 DPP=false
 
 STATIC_ROOT=/tmp/static/
@@ -16,6 +26,48 @@ EMAIL_BACKEND="django.core.mail.backends.smtp.EmailBackend"
 EMAIL_FILE_PATH="/tmp/app-messages"
 ENABLE_EMAIL=false
 PREDEFINED_TOKEN='5018dd65-9abd-4a62-8896-80f34ac66150'
+DEVICEHUB_ALLOWED_HOSTS=${DEVICEHUB_DOMAIN},${DEVICEHUB_DOMAIN}:${DEVICEHUB_PORT},127.0.0.1,127.0.0.1:${DEVICEHUB_PORT}
 # TODO review these vars
 #SNAPSHOTS_DIR=/path/to/TODO
 #EVIDENCES_DIR=/path/to/TODO
+#DEMO_IDHUB_DOMAIN='idhub.example.org'
+
+####
+# IDHUB
+####
+
+IDHUB_ENABLED=false
+
+IDHUB_DOMAIN=localhost
+IDHUB_PORT=9001
+IDHUB_ALLOWED_HOSTS=${IDHUB_DOMAIN},${IDHUB_DOMAIN}:${IDHUB_PORT},127.0.0.1,127.0.0.1:${IDHUB_PORT}
+IDHUB_TIME_ZONE='Europe/Madrid'
+#IDHUB_SECRET_KEY='uncomment-it-and-fill-this'
+# enable dev flags when DEVELOPMENT deployment
+# adapt to your domain in a production/reverse proxy env
+IDHUB_CSRF_TRUSTED_ORIGINS='https://idhub.example.org'
+
+# fill this section with your email credentials
+IDHUB_DEFAULT_FROM_EMAIL="user@example.org"
+IDHUB_EMAIL_HOST="smtp.example.org"
+IDHUB_EMAIL_HOST_USER="smtp_user"
+IDHUB_EMAIL_HOST_PASSWORD="smtp_passwd"
+IDHUB_EMAIL_PORT=25
+IDHUB_EMAIL_USE_TLS=True
+IDHUB_EMAIL_BACKEND="django.core.mail.backends.smtp.EmailBackend"
+
+# replace with production data
+#   this is used when IDHUB_DEPLOYMENT is not equal to DEVELOPMENT
+IDHUB_ADMIN_USER='admin'
+IDHUB_ADMIN_PASSWD='admin'
+IDHUB_ADMIN_EMAIL='admin@example.org'
+
+# this option needs to be set to 'n' to be able to make work idhub in docker
+#   by default it is set to 'y' to facilitate idhub dev when outside docker
+IDHUB_SYNC_ORG_DEV='n'
+
+# TODO that is only for testing
+IDHUB_ENABLE_EMAIL=false
+IDHUB_ENABLE_2FACTOR_AUTH=false
+IDHUB_ENABLE_DOMAIN_CHECKER=false
+IDHUB_PREDEFINED_TOKEN='27f944ce-3d58-4f48-b068-e4aa95f97c95'

.gitignore

@@ -1,4 +1,7 @@
-db.sqlite3
 env/
 __pycache__/
 .env
+
+# the following could be autogenerated by devicehub
+db.sqlite3
+example/snapshots/snapshot_workbench-script_verifiable-credential.json

action/forms.py

@@ -0,0 +1,16 @@
+from django import forms
+from .models import State
+
+
+class ChangeStateForm(forms.Form):
+    previous_state = forms.CharField(widget=forms.HiddenInput())
+    snapshot_uuid = forms.UUIDField(widget=forms.HiddenInput())
+    new_state = forms.CharField(widget=forms.HiddenInput())
+
+
+class AddNoteForm(forms.Form):
+    snapshot_uuid = forms.UUIDField(widget=forms.HiddenInput())
+    note = forms.CharField(
+        required=True,
+        widget=forms.Textarea(attrs={'rows': 4, 'maxlength': 200, 'placeholder': 'Max 200 characters'}),
+    )

action/management/commands/create_default_states.py

@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+import logging
+from django.core.management.base import BaseCommand
+from action.models import StateDefinition, Institution
+from django.utils.translation import gettext as _
+
+logger = logging.getLogger('django')
+
+class Command(BaseCommand):
+    help = 'Create default StateDefinitions for a given institution. "'
+
+    def add_arguments(self, parser):
+        parser.add_argument('institution_name', type=str, help='The name of the institution')
+
+    def handle(self, *args, **kwargs):
+        default_states = [
+            _("INBOX"),
+            _("VISUAL INSPECTION"),
+            _("REPAIR"),
+            _("INSTALL"),
+            _("TEST"),
+            _("PACKAGING"),         
+            _("DONATION"),
+            _("DISMANTLE")
+        ]
+
+        institution_name = kwargs['institution_name']
+        institution = Institution.objects.filter(name=institution_name).first()
+
+        if not institution:
+            txt = "No institution found for: %s. Please create an institution first"
+            logger.error(txt, institution.name)
+            return
+
+        for state in default_states:
+            state_def, created = StateDefinition.objects.get_or_create(
+                institution=institution,
+                state=state
+            )
+            if created:
+                self.stdout.write(self.style.SUCCESS(f'Successfully created state: {state}'))
+            else:
+                self.stdout.write(self.style.WARNING(f'State already exists: {state}'))

action/migrations/0001_initial.py

@@ -0,0 +1,83 @@
+# Generated by Django 5.0.6 on 2024-12-11 18:05
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ("user", "0001_initial"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="State",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("date", models.DateTimeField(auto_now_add=True)),
+                ("state", models.CharField(max_length=50)),
+                ("snapshot_uuid", models.UUIDField()),
+                (
+                    "institution",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        to="user.institution",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+        ),
+        migrations.CreateModel(
+            name="StateDefinition",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("order", models.PositiveIntegerField(default=0)),
+                ("state", models.CharField(max_length=50)),
+                (
+                    "institution",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="user.institution",
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ["order"],
+            },
+        ),
+        migrations.AddConstraint(
+            model_name="statedefinition",
+            constraint=models.UniqueConstraint(
+                fields=("institution", "state"), name="unique_institution_state"
+            ),
+        ),
+    ]

action/migrations/0002_devicelog_note.py

@@ -0,0 +1,89 @@
+# Generated by Django 5.0.6 on 2024-12-17 19:40
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("action", "0001_initial"),
+        ("user", "0001_initial"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="DeviceLog",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("date", models.DateTimeField(auto_now_add=True)),
+                ("event", models.CharField(max_length=255)),
+                ("snapshot_uuid", models.UUIDField()),
+                (
+                    "institution",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="user.institution",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ["-date"],
+            },
+        ),
+        migrations.CreateModel(
+            name="Note",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("date", models.DateTimeField(auto_now_add=True)),
+                ("description", models.TextField()),
+                ("snapshot_uuid", models.UUIDField()),
+                (
+                    "institution",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="user.institution",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ["-date"],
+            },
+        ),
+    ]

action/models.py

@@ -1,3 +1,83 @@
-from django.db import models
+from django.db import models, connection
+from django.db.models import Max
+from user.models import User, Institution
+from django.core.exceptions import ValidationError
 
-# Create your models here.
+class State(models.Model):
+    date = models.DateTimeField(auto_now_add=True)
+    institution = models.ForeignKey(Institution, on_delete=models.SET_NULL, null=True)
+    user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True)
+
+    state = models.CharField(max_length=50)
+    snapshot_uuid = models.UUIDField()
+
+    def clean(self):
+        if not StateDefinition.objects.filter(institution=self.institution, state=self.state).exists():
+            raise ValidationError(f"The state '{self.state}' is not valid for the institution '{self.institution.name}'.")
+
+    def save(self, *args, **kwargs):
+        self.clean()
+        super().save(*args, **kwargs)
+
+    def __str__(self):
+        return f"{self.institution.name} - {self.state} - {self.snapshot_uuid}"
+
+
+class StateDefinition(models.Model):
+    institution = models.ForeignKey(Institution, on_delete=models.CASCADE)
+
+    order = models.PositiveIntegerField(default=0)
+    state = models.CharField(max_length=50)
+
+    class Meta:
+        ordering = ['order']
+        constraints = [
+            models.UniqueConstraint(fields=['institution', 'state'], name='unique_institution_state')
+        ]
+
+    def save(self, *args, **kwargs):
+        if not self.pk:
+            # set the order to be last
+            max_order = StateDefinition.objects.filter(institution=self.institution).aggregate(Max('order'))['order__max']
+            self.order = (max_order or 0) + 1
+        super().save(*args, **kwargs)
+
+
+    def delete(self, *args, **kwargs):
+        institution = self.institution
+        order = self.order
+        super().delete(*args, **kwargs)
+        # Adjust the order of other instances
+        StateDefinition.objects.filter(institution=institution, order__gt=order).update(order=models.F('order') - 1)
+
+
+    def __str__(self):
+        return f"{self.institution.name} - {self.state}"
+
+
+class Note(models.Model):
+    institution = models.ForeignKey(Institution, on_delete=models.CASCADE)
+    user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, blank=True)
+    date = models.DateTimeField(auto_now_add=True)
+    description = models.TextField()
+    snapshot_uuid = models.UUIDField()
+
+    class Meta:
+        ordering = ['-date']
+
+    def __str__(self):
+        return f" Note: {self.description}, by {self.user.username} @ {self.user.institution} - {self.date}, for {self.snapshot_uuid}"
+
+
+class DeviceLog(models.Model):
+    institution = models.ForeignKey(Institution, on_delete=models.CASCADE)
+    user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, blank=True)
+    date = models.DateTimeField(auto_now_add=True)
+    event = models.CharField(max_length=255)
+    snapshot_uuid = models.UUIDField()
+
+    class Meta:
+        ordering = ['-date']
+
+    def __str__(self):
+        return f"{self.event} by {self.user.username} @ {self.institution.name} - {self.date}, for {self.snapshot_uuid}"

action/urls.py

@@ -1 +1,12 @@
 from django.urls import path, include
+from action import views
+
+app_name = 'action'
+
+urlpatterns = [
+
+    path("new/", views.ChangeStateView.as_view(), name="change_state"),
+    path('note/add/', views.AddNoteView.as_view(), name='add_note'),
+    path('note/edit/<int:pk>', views.UpdateNoteView.as_view(), name='update_note'),
+    path('note/delete/<int:pk>', views.DeleteNoteView.as_view(), name='delete_note'),
+]

action/views.py

@@ -1 +1,141 @@
-# from django.shortcuts import render
+from django.views import View
+from django.shortcuts import redirect, get_object_or_404
+from django.contrib import messages
+from action.forms import ChangeStateForm, AddNoteForm
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.views.generic.edit import DeleteView, CreateView, UpdateView, FormView
+from django.urls import reverse_lazy
+from django.utils.translation import gettext_lazy as _
+from action.models import State, StateDefinition, Note, DeviceLog
+from device.models import Device
+
+
+class ChangeStateView(LoginRequiredMixin, FormView):
+    form_class = ChangeStateForm
+
+    def form_valid(self, form):
+        previous_state = form.cleaned_data['previous_state']
+        new_state = form.cleaned_data['new_state']
+        snapshot_uuid = form.cleaned_data['snapshot_uuid']
+
+        State.objects.create(
+            snapshot_uuid=snapshot_uuid,
+            state=new_state,
+            user=self.request.user,
+            institution=self.request.user.institution,
+        )
+
+        message = _("<Created> State '{}'. Previous State: '{}'").format(new_state, previous_state)
+        DeviceLog.objects.create(
+            snapshot_uuid=snapshot_uuid,
+            event=message,
+            user=self.request.user,
+            institution=self.request.user.institution,
+        )
+        messages.success(self.request, _("State successfully changed from '{}' to '{}'").format(previous_state, new_state))
+        return super().form_valid(form)
+
+    def form_invalid(self, form):
+        messages.error(self.request, _("There was an error with your submission."))
+        return redirect(self.get_success_url())
+
+    def get_success_url(self):
+        return self.request.META.get('HTTP_REFERER') or reverse_lazy('device:details')
+
+
+class AddNoteView(LoginRequiredMixin, FormView):
+    form_class = AddNoteForm
+
+    def form_valid(self, form):
+        note_text = form.cleaned_data['note']
+        snapshot_uuid = form.cleaned_data['snapshot_uuid']
+        Note.objects.create(
+            snapshot_uuid=snapshot_uuid,
+            description=note_text,
+            user=self.request.user,
+            institution=self.request.user.institution,
+        )
+
+        message = _("<Created> Note: '{}'").format(note_text)
+        DeviceLog.objects.create(
+            snapshot_uuid=snapshot_uuid,
+            event=message,
+            user=self.request.user,
+            institution=self.request.user.institution,
+        )
+        messages.success(self.request, _("Note has been added"))
+        return super().form_valid(form)
+
+    def form_invalid(self, form):
+        messages.error(self.request, _("There was an error with your submission."))
+        return redirect(self.get_success_url())
+
+    def get_success_url(self):
+        return self.request.META.get('HTTP_REFERER') or reverse_lazy('device:details')
+
+
+class UpdateNoteView(LoginRequiredMixin, UpdateView):
+    model = Note
+    fields = ['description']
+    pk_url_kwarg = 'pk'
+
+    def form_valid(self, form):
+        old_description = self.get_object().description
+        new_description = self.object.description
+        snapshot_uuid = self.object.snapshot_uuid
+
+        if old_description != new_description:
+            message = _("<Updated> Note. Old Description: '{}'. New Description: '{}'").format(old_description, new_description)
+            DeviceLog.objects.create(
+                snapshot_uuid=snapshot_uuid,
+                event=message,
+                user=self.request.user,
+                institution=self.request.user.institution,
+            )
+            messages.success(self.request, "Note has been updated.")
+        return super().form_valid(form)
+
+    def form_invalid(self, form):
+        new_description = form.cleaned_data.get('description', '').strip()
+        if not new_description:
+            messages.error(self.request, _("Note cannot be empty."))
+        super().form_invalid(form)
+        return redirect(self.get_success_url())
+
+    def get_success_url(self):
+        return self.request.META.get('HTTP_REFERER', reverse_lazy('device:details'))
+
+
+class DeleteNoteView(LoginRequiredMixin, View):
+    model = Note
+
+    def post(self, request, *args, **kwargs):
+        self.pk = kwargs['pk']
+        referer = request.META.get('HTTP_REFERER')
+        if not referer:
+            raise Http404("No referer header found")
+
+        self.object = get_object_or_404(
+            self.model,
+            pk=self.pk,
+            institution=self.request.user.institution
+        )
+        description = self.object.description
+        snapshot_uuid= self.object.snapshot_uuid
+
+        if request.user != self.object.user and not request.user.is_admin:
+            messages.error(request, _("You do not have permission to delete this note."))
+            return redirect(referer)
+
+        message = _("<Deleted> Note. Description: '{}'. ").format(description)
+        DeviceLog.objects.create(
+            snapshot_uuid=snapshot_uuid,
+            event=message,
+            user=request.user,
+            institution=request.user.institution,
+        )
+        messages.warning(self.request, _("Note '{}' deleted successfully.").format(description))
+
+        self.object.delete()
+
+        return redirect(referer)

admin/forms.py

@@ -0,0 +1,5 @@
+from django import forms
+
+
+class OrderingStateForm(forms.Form):
+    ordering = forms.CharField()

admin/templates/lot_tag_panel.html

@@ -0,0 +1,173 @@
+{% extends "base.html" %}
+{% load i18n django_bootstrap5 %}
+
+{% block content %}
+<div class="row">
+  <div class="col">
+    <h3>{{ subtitle }}</h3>
+  </div>
+  <div class="col text-end">
+    <button type="button" class="btn btn-green-admin" data-bs-toggle="modal" data-bs-target="#addLotTagModal">
+      {% trans "Add" %}
+    </button>
+  </div>
+</div>
+<div class="row mt-4">
+  <div class="col">
+    {% if lot_tags_edit %}
+  <table class="table table-hover table-bordered align-middle">
+  <thead class="table-light">
+    <tr>
+      <th scope="col">{% trans "Lot Group Name" %}
+      </th>
+      <th scope="col" width="15%" class="text-center">{% trans "Actions" %}
+      </th>
+    </tr>
+  </thead>
+  <tbody id="sortable_list">
+    {% for tag in lot_tags_edit %}
+      <tr>
+        <td class="font-monospace">
+          {{ tag.name }}
+        </td>
+
+        <!-- action buttons -->
+        <td>
+          <div class="btn-group float-end">
+            <button
+              type="button"
+              class="btn btn-sm btn-outline-info d-flex align-items-center"
+              data-bs-toggle="modal"  data-bs-target="#editLotTagModal{{ tag.id }}">
+              <i class="bi bi-pencil me-1"></i>
+              {% trans 'Edit' %}
+            </button>
+            <button
+              type="button" class="btn btn-sm btn-outline-danger d-flex align-items-center"
+              data-bs-toggle="modal"
+              data-bs-target="#deleteLotTagModal{{ tag.id }}" >
+              <i class="bi bi-trash me-1"></i>
+              {% trans 'Delete' %}
+            </button>
+          </div>
+        </td>
+      </tr>
+    {% endfor %}
+  </tbody>
+  </table>
+
+
+    {% else %}
+      <div class="alert alert-primary text-center mt-5" role="alert">
+        {% trans "No Lot Groups found on current organization" %}
+      </div>
+    {% endif %}
+  </div>
+</div>
+
+<!-- add lot tag Modal -->
+<div class="modal fade" id="addLotTagModal" tabindex="-1" aria-labelledby="addLoTagModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="addLotTagModalLabel">{% trans "Add Lot Group" %}</h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+
+        <form method="post" action="{% url 'admin:add_lot_tag' %}">
+          {% csrf_token %}
+          <div class="mb-3">
+            <label for="lotTagInput" class="form-label">{% trans "Tag" %}</label>
+            <input type="text" class="form-control" id="lotTagInput" name="name" maxlength="50" required>
+            <div class="form-text">{% trans "Maximum 50 characters." %}</div>
+          </div>
+          <div class="modal-footer">
+            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans "Close" %}</button>
+            <button type="submit" class="btn btn-primary">{% trans "Add Lot tag" %}</button>
+          </div>
+        </form>
+
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- Edit Lot Group Modals -->
+{% for tag in lot_tags_edit %}
+<div class="modal fade" id="editLotTagModal{{ tag.id }}" tabindex="-1" aria-labelledby="editLotTagModalLabel{{ tag.id }}" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <form method="post" action="{% url 'admin:edit_lot_tag' tag.id %}">
+        {% csrf_token %}
+        <div class="modal-header">
+          <h5 class="modal-title" id="editLotTagModalLabel{{ tag.id }}">
+            {% trans "Edit Lot Group" %}
+          </h5>
+          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans 'Close' %}"></button>
+        </div>
+        <div class="modal-body">
+          <div class="mb-3">
+            <label for="editLotTagInput{{ tag.id }}" class="form-label">{% trans "Tag" %}</label>
+            <input type="text" class="form-control" id="editLotTagInput{{ tag.id }}" name="name" maxlength="50" value="{{ tag.name }}" required>
+            <div class="form-text">{% trans "Maximum 50 characters." %}</div>
+          </div>
+
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans "Cancel" %}</button>
+          <button type="submit" class="btn btn-green-admin">{% trans "Save Changes" %}</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+{% endfor %}
+
+
+<!-- delete lot tag definition Modal -->
+{% for tag in lot_tags_edit %}
+<div class="modal fade" id="deleteLotTagModal{{ tag.id }}" tabindex="-1" aria-labelledby="deleteLotTagModalLabel{{ tag.id }}" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title fw-bold" id="deleteLotTagModalLabel{{ tag.id }}">
+          {% trans "Delete Lot Group" %}
+        </h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans 'Close' %}"></button>
+      </div>
+      <div class="modal-body">
+	{% if tag.lot_set.first %}
+        <div class="alert alert-warning text-center" role="alert">
+            {% trans "Failed to remove Lot Group, it is not empty" %}
+        </div>
+	{% endif %}
+        <div class="d-flex align-items-center border rounded p-3 mt-3">
+          <div>
+            <p class="mb-0 fw-bold">{{ tag.name }}</p>
+          </div>
+        </div>
+      </div>
+
+      <div class="modal-footer">
+        <form method="post" action="{% url 'admin:delete_lot_tag' tag.pk %}">
+          {% csrf_token %}
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
+            {% trans "Cancel" %}
+          </button>
+	  {% if tag.lot_set.first %}
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
+            {% trans "Delete" %}
+          </button>
+  	  {% else %}
+          <button type="submit" class="btn btn-danger">
+            {% trans "Delete" %}
+          </button>
+  	  {% endif %}
+        </form>
+      </div>
+    </div>
+  </div>
+</div>
+
+{% endfor %}
+{% endblock %}

admin/templates/states_panel.html

@@ -0,0 +1,233 @@
+{% extends "base.html" %}
+{% load i18n django_bootstrap5 %}
+
+{% block content %}
+<div class="row">
+  <div class="col">
+    <h3>{{ subtitle }}</h3>
+  </div>
+  <div class="col text-end">
+    <button type="button" class="btn btn-green-admin" data-bs-toggle="modal" data-bs-target="#addStateModal">
+      {% trans "Add" %}
+    </button>
+  </div>
+</div>
+<div class="row mt-4">
+  <div class="col">
+    {% if state_definitions %}
+  <table class="table table-hover table-bordered align-middle">
+    <caption class="text-muted small">
+      {% trans 'Move and drag state definitions to reorder' %}
+    </caption>
+  <thead class="table-light">
+    <tr>
+      <th scope="col" width="1%" class="text-start">
+      </th>
+      <th scope="col" width="5%" class="text-center">
+      #</th>
+      <th scope="col">{% trans "State Definition" %}
+      </th>
+      <th scope="col" width="15%" class="text-center">{% trans "Actions" %}
+      </th>
+    </tr>
+  </thead>
+  <tbody id="sortable_list">
+    {% for state_definition in state_definitions %}
+      <tr
+        data-lookup="{{ state_definition.id }}"
+        style="cursor: grab;"
+        class="align-items-center">
+
+        <td class="">
+          <i class="bi bi-grip-vertical" aria-hidden="true">
+            </i>
+        </td>
+        <td class="text-center">
+          <strong>{{ state_definition.order }} </strong>
+        </td>
+        <td class="font-monospace">
+          {{ state_definition.state }}
+        </td>
+
+        <!-- action buttons -->
+        <td>
+          <div class="btn-group float-end">
+            <button 
+              type="button" 
+              class="btn btn-sm btn-outline-info d-flex align-items-center" 
+              data-bs-toggle="modal"  data-bs-target="#editStateModal{{ state_definition.id }}">
+              <i class="bi bi-pencil me-1"></i>
+              {% trans 'Edit' %}
+            </button>
+            <button 
+              type="button" class="btn btn-sm btn-outline-danger d-flex align-items-center" 
+              data-bs-toggle="modal" 
+              data-bs-target="#deleteStateModal{{ state_definition.id }}" >
+              <i class="bi bi-trash me-1"></i>
+              {% trans 'Delete' %}
+            </button>
+          </div>
+        </td>
+      </tr>
+    {% endfor %}
+  </tbody>
+  </table>
+
+  <form id="orderingForm" method="post" action="{% url 'admin:update_state_order' %}">
+        {% csrf_token %}
+        <input type="hidden" id="orderingInput" name="ordering">
+         <button id="saveOrderBtn" class="btn btn-success mt-5 float-start collapse" >{% trans "Update Order" %}</button>
+      </form>
+
+
+    {% else %}  
+      <div class="alert alert-primary text-center mt-5" role="alert">
+        {% trans "No states found on current organization" %}
+      </div>
+    {% endif %}
+  </div>
+</div>
+
+<!-- add state definition Modal -->
+<div class="modal fade" id="addStateModal" tabindex="-1" aria-labelledby="addStateModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="addStateModalLabel">{% trans "Add State Definition" %}</h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+
+        <form method="post" action="{%url 'admin:add_state_definition'%}">
+          {% csrf_token %}
+          <div class="mb-3">
+            <label for="stateInput" class="form-label">{% trans "State" %}</label>
+            <input type="text" class="form-control" id="stateInput" name="state" maxlength="50" required>
+            <div class="form-text">{% trans "Maximum 50 characters." %}</div>
+          </div>
+          <div class="modal-footer">
+            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans "Close" %}</button>
+            <button type="submit" class="btn btn-primary">{% trans "Add state definition" %}</button>
+          </div>
+        </form>
+
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- Edit State Definition Modals -->
+{% for state_definition in state_definitions %}
+<div class="modal fade" id="editStateModal{{ state_definition.id }}" tabindex="-1" aria-labelledby="editStateModalLabel{{ state_definition.id }}" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <form method="post" action="{% url 'admin:edit_state_definition' state_definition.id %}">
+        {% csrf_token %}
+        <div class="modal-header">
+          <h5 class="modal-title" id="editStateModalLabel{{ state_definition.id }}">
+            {% trans "Edit State Definition" %}
+          </h5>
+          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans 'Close' %}"></button>
+        </div>
+        <div class="modal-body">
+          <div class="alert alert-warning text-center" role="alert">
+            {% trans "Existing devices with this state will not have their state names changed." %}
+          </div>
+          <div class="mb-3">
+            <label for="editStateInput{{ state_definition.id }}" class="form-label">{% trans "State" %}</label>
+            <input type="text" class="form-control" id="editStateInput{{ state_definition.id }}" name="state" maxlength="50" value="{{ state_definition.state }}" required>
+            <div class="form-text">{% trans "Maximum 50 characters." %}</div>
+          </div>
+
+        <p class="text-muted text-end">{% trans "Any changes in order will not be saved." %}</p>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans "Cancel" %}</button>
+          <button type="submit" class="btn btn-green-admin">{% trans "Save Changes" %}</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+{% endfor %}
+
+
+<!-- delete state definition Modal -->
+{% for state_definition in state_definitions %}
+<div class="modal fade" id="deleteStateModal{{ state_definition.id }}" tabindex="-1" aria-labelledby="deleteStateModalLabel{{ state_definition.id }}" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title fw-bold" id="deleteStateModalLabel{{ state_definition.id }}">
+          {% trans "Delete State Definition" %}
+        </h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans 'Close' %}"></button>
+      </div>
+      <div class="modal-body">
+        <div class="alert alert-warning text-center" role="alert">
+            {% trans "Devices with a State of this description will not have their State altered" %}
+          </div>
+        <div class="d-flex align-items-center border rounded p-3 mt-3">
+          <span class="badge bg-secondary me-3 display-6">{{ state_definition.order }}</span>
+          <div>
+            <p class="mb-0 fw-bold">{{ state_definition.state }}</p>
+          </div>
+        </div>
+
+        <p class="text-muted text-end mt-3">{% trans "Any changes in order will not be saved." %}</p>
+
+      </div>
+
+      <div class="modal-footer">
+        <form method="post" action="{% url 'admin:delete_state_definition' state_definition.pk %}">
+          {% csrf_token %}
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
+            {% trans "Cancel" %}
+          </button>
+          <button type="submit" class="btn btn-danger">
+            {% trans "Delete" %}
+          </button>
+        </form>
+      </div>
+    </div>
+  </div>
+</div>
+
+{% endfor %}
+
+
+<script>
+  //following https://dev.to/nemecek_f/django-how-to-let-user-re-order-sort-table-of-content-with-drag-and-drop-3nlp
+  const saveOrderingButton = document.getElementById('saveOrderBtn');
+  const orderingForm = document.getElementById('orderingForm');
+  const formInput = orderingForm.querySelector('#orderingInput');
+  const sortable_table = document.getElementById('sortable_list');
+
+  const sortable = new Sortable(sortable_table, {
+      animation: 150,
+      swapThreshold: 0.10,
+      onChange: () => {
+        //TODO: change hide/show animation to a nicer one 
+        const collapse = new bootstrap.Collapse(saveOrderingButton, {
+          toggle: false
+        });
+        collapse.show();
+      }
+    });
+
+ function saveOrdering() {
+    const rows = sortable_table.querySelectorAll('tr');
+    let ids = [];
+    for (let row of rows) {
+        ids.push(row.dataset.lookup);
+    }
+    formInput.value = ids.join(',');
+    orderingForm.submit();
+ }
+
+ saveOrderingButton.addEventListener('click', saveOrdering);
+
+</script>
+
+
+{% endblock %}

admin/urls.py

@@ -10,4 +10,13 @@ urlpatterns = [
     path("users/edit/<int:pk>", views.EditUserView.as_view(), name="edit_user"),
     path("users/delete/<int:pk>", views.DeleteUserView.as_view(), name="delete_user"),
     path("institution/<int:pk>", views.InstitutionView.as_view(), name="institution"),
+    path("states/", views.StatesPanelView.as_view(), name="states_panel"),
+    path("states/add", views.AddStateDefinitionView.as_view(), name="add_state_definition"),
+    path("states/delete/<int:pk>", views.DeleteStateDefinitionView.as_view(), name='delete_state_definition'),
+    path("states/update_order/", views.UpdateStateOrderView.as_view(), name='update_state_order'),
+    path("states/edit/<int:pk>/", views.UpdateStateDefinitionView.as_view(), name='edit_state_definition'),
+    path("lot/", views.LotTagPanelView.as_view(), name="tag_panel"),
+    path("lot/add", views.AddLotTagView.as_view(), name="add_lot_tag"),
+    path("lot/delete/<int:pk>", views.DeleteLotTagView.as_view(), name='delete_lot_tag'),
+    path("lot/edit/<int:pk>/", views.UpdateLotTagView.as_view(), name='edit_lot_tag'),
 ]

admin/views.py

@@ -1,16 +1,24 @@
+import logging
 from smtplib import SMTPException
+from django.contrib import messages
 from django.urls import reverse_lazy
-from django.shortcuts import get_object_or_404
+from django.shortcuts import get_object_or_404, redirect, Http404
 from django.utils.translation import gettext_lazy as _
-from django.views.generic.base import TemplateView
+from django.contrib.messages.views import SuccessMessageMixin
+from django.views.generic.base import TemplateView, ContextMixin
 from django.views.generic.edit import (
     CreateView,
     UpdateView,
     DeleteView,
 )
+from django.core.exceptions import ValidationError
+from django.db import IntegrityError,   transaction
 from dashboard.mixins import DashboardView, Http403
+from admin.forms import OrderingStateForm
 from user.models import User, Institution
 from admin.email import NotifyActivateUserByEmail
+from action.models import StateDefinition
+from lot.models import LotTag
 
 
 class AdminView(DashboardView):
@@ -105,6 +113,99 @@ class EditUserView(AdminView, UpdateView):
         return kwargs
 
 
+class LotTagPanelView(AdminView, TemplateView):
+    template_name = "lot_tag_panel.html"
+    title = _("Lot Groups Panel")
+    breadcrumb = _("admin / Lot Groups Panel")
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        lot_tags = LotTag.objects.filter(
+            owner=self.request.user.institution
+        )
+        context.update({"lot_tags_edit": lot_tags})
+        return context
+
+
+class AddLotTagView(AdminView, CreateView):
+    template_name = "lot_tag_panel.html"
+    title = _("New lot group Definition")
+    breadcrumb = "Admin / New lot tag"
+    success_url = reverse_lazy('admin:tag_panel')
+    model = LotTag
+    fields = ('name',)
+
+    def form_valid(self, form):
+        form.instance.owner = self.request.user.institution
+        form.instance.user = self.request.user
+        name = form.instance.name
+        if LotTag.objects.filter(name=name).first():
+            msg = _(f"The name '{name}' exist.")
+            messages.error(self.request, msg)
+            return redirect(self.success_url)
+
+        response = super().form_valid(form)
+        messages.success(self.request, _("Lot Group successfully added."))
+        return response
+
+
+class DeleteLotTagView(AdminView, DeleteView):
+    model = LotTag
+    success_url = reverse_lazy('admin:tag_panel')
+
+    def post(self, request, *args, **kwargs):
+        pk = kwargs.get('pk')
+        self.object = get_object_or_404(
+            self.model,
+            owner=self.request.user.institution,
+            pk=pk
+        )
+
+        if self.object.lot_set.first():
+            msg = _('This group have lots. Impossible to delete.')
+            messages.warning(self.request, msg)
+            return redirect(reverse_lazy('admin:tag_panel'))
+
+        if self.object.inbox:
+            msg = f"The lot group '{self.object.name}'"
+            msg += " is INBOX, so it cannot be deleted, only renamed."
+            messages.error(self.request, msg)
+            return redirect(self.success_url)
+
+        response = super().delete(request, *args, **kwargs)
+        msg = _('Lot Group has been deleted.')
+        messages.success(self.request, msg)
+        return response
+
+
+class UpdateLotTagView(AdminView, UpdateView):
+    model = LotTag
+    template_name = 'lot_tag_panel.html'
+    fields = ['name']
+    success_url = reverse_lazy('admin:tag_panel')
+
+    def get_form_kwargs(self):
+        pk = self.kwargs.get('pk')
+        self.object = get_object_or_404(
+            self.model,
+            owner=self.request.user.institution,
+            pk=pk
+        )
+        return super().get_form_kwargs()
+
+    def form_valid(self, form):
+        name = form.instance.name
+        if LotTag.objects.filter(name=name).first():
+            msg = _(f"The name '{name}' exist.")
+            messages.error(self.request, msg)
+            return redirect(self.success_url)
+
+        response = super().form_valid(form)
+        msg = _("Lot Group updated successfully.")
+        messages.success(self.request, msg)
+        return response
+
+
 class InstitutionView(AdminView, UpdateView):
     template_name = "institution.html"
     title = _("Edit institution")
@@ -117,10 +218,114 @@ class InstitutionView(AdminView, UpdateView):
         "logo",
         "location",
         "responsable_person",
-        "supervisor_person"
+        "supervisor_person",
+        "algorithm"
     )
 
     def get_form_kwargs(self):
         self.object = self.request.user.institution
         kwargs = super().get_form_kwargs()
         return kwargs
+
+
+class StateDefinitionContextMixin(ContextMixin):
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context.update({
+            "state_definitions": StateDefinition.objects.filter(institution=self.request.user.institution).order_by('order'),
+            "help_text": _('State definitions are the custom finite states that a device can be in.'),
+        })
+        return context
+
+
+class StatesPanelView(AdminView, StateDefinitionContextMixin, TemplateView):
+    template_name = "states_panel.html"
+    title = _("States Panel")
+    breadcrumb = _("admin / States Panel") + " /"
+
+
+class AddStateDefinitionView(AdminView, StateDefinitionContextMixin, CreateView):
+    template_name = "states_panel.html"
+    title = _("New State Definition")
+    breadcrumb = "Admin / New state"
+    success_url = reverse_lazy('admin:states_panel')
+    model = StateDefinition
+    fields = ('state',)
+
+    def form_valid(self, form):
+        form.instance.institution = self.request.user.institution
+        form.instance.user = self.request.user
+        try:
+            response = super().form_valid(form)
+            messages.success(self.request, _("State definition successfully added."))
+            return response
+        except IntegrityError:
+            messages.error(self.request, _("State is already defined."))
+            return self.form_invalid(form)
+
+    def form_invalid(self, form):
+        super().form_invalid(form)
+        return redirect(self.success_url)
+
+
+class DeleteStateDefinitionView(AdminView, StateDefinitionContextMixin, SuccessMessageMixin, DeleteView):
+    model = StateDefinition
+    success_url = reverse_lazy('admin:states_panel')
+
+    def get_success_message(self, cleaned_data):
+        return f'State definition: {self.object.state}, has been deleted'
+
+    def form_valid(self, form):
+        if not self.object.institution == self.request.user.institution:
+            raise Http404
+
+        return super().form_valid(form)
+
+
+class UpdateStateOrderView(AdminView, TemplateView):
+    success_url = reverse_lazy('admin:states_panel')
+
+    def post(self, request, *args, **kwargs):
+        form = OrderingStateForm(request.POST)
+
+        if form.is_valid():
+            ordered_ids = form.cleaned_data["ordering"].split(',')
+
+            with transaction.atomic():
+                current_order = 1
+                _log = []
+                for lookup_id in ordered_ids:
+                    state_definition = StateDefinition.objects.get(id=lookup_id)
+                    state_definition.order = current_order
+                    state_definition.save()
+                    _log.append(f"{state_definition.state} (ID: {lookup_id} -> Order: {current_order})")
+                    current_order += 1
+
+            messages.success(self.request, _("Order changed succesfuly."))
+            return redirect(self.success_url)
+        else:
+            return Http404
+
+
+class UpdateStateDefinitionView(AdminView, UpdateView):
+    model = StateDefinition
+    template_name = 'states_panel.html'
+    fields = ['state']
+    success_url = reverse_lazy('admin:states_panel')
+    pk_url_kwarg = 'pk'
+
+    def get_queryset(self):
+        return StateDefinition.objects.filter(institution=self.request.user.institution)
+
+    def form_valid(self, form):
+        try:
+            response = super().form_valid(form)
+            messages.success(self.request, _("State definition updated successfully."))
+            return response
+        except IntegrityError:
+            messages.error(self.request, _("State is already defined."))
+            return self.form_invalid(form)
+
+    def form_invalid(self, form):
+        super().form_invalid(form)
+        return redirect(self.get_success_url())

api/urls.py

@@ -7,7 +7,7 @@ app_name = 'api'
 
 urlpatterns = [
     path('v1/snapshot/', views.NewSnapshotView.as_view(), name='new_snapshot'),
-    path('v1/annotation/<str:pk>/', views.AddAnnotationView.as_view(), name='new_annotation'),
+    path('v1/property/<str:pk>/', views.AddPropertyView.as_view(), name='new_property'),
     path('v1/device/<str:pk>/', views.DetailsDeviceView.as_view(), name='device'),
     path('v1/tokens/', views.TokenView.as_view(), name='tokens'),
     path('v1/tokens/new', views.TokenNewView.as_view(), name='new_token'),

api/views.py

@@ -21,7 +21,7 @@ from django.views.generic.edit import (
 from utils.save_snapshots import move_json, save_in_disk
 from django.views.generic.edit import View
 from dashboard.mixins import DashboardView
-from evidence.models import Annotation
+from evidence.models import SystemProperty, UserProperty
 from evidence.parse_details import ParseSnapshot
 from evidence.parse import Build
 from device.models import Device
@@ -90,15 +90,15 @@ class NewSnapshotView(ApiMixing):
             ev_uuid = data["credentialSubject"].get("uuid")
 
         if not ev_uuid:
-            txt = "error: the snapshot not have uuid"
+            txt = "error: the snapshot does not have an uuid"
             logger.error("%s", txt)
             return JsonResponse({'status': txt}, status=500)
 
-        exist_annotation = Annotation.objects.filter(
+        exist_property = SystemProperty.objects.filter(
             uuid=ev_uuid
         ).first()
 
-        if exist_annotation:
+        if exist_property:
             txt = "error: the snapshot {} exist".format(ev_uuid)
             logger.warning("%s", txt)
             return JsonResponse({'status': txt}, status=500)
@@ -115,25 +115,24 @@ class NewSnapshotView(ApiMixing):
             text = "fail: It is not possible to parse snapshot"
             return JsonResponse({'status': text}, status=500)
 
-        annotation = Annotation.objects.filter(
+        prop = SystemProperty.objects.filter(
             uuid=ev_uuid,
-            type=Annotation.Type.SYSTEM,
             # TODO this is hardcoded, it should select the user preferred algorithm
-            key="hidalgo1",
+            key="ereuse24",
             owner=self.tk.owner.institution
         ).first()
 
 
-        if not annotation:
-            logger.error("Error: No annotation for uuid: %s", ev_uuid)
+        if not prop:
+            logger.error("Error: No property  for uuid: %s", ev_uuid)
             return JsonResponse({'status': 'fail'}, status=500)
 
-        url_args = reverse_lazy("device:details", args=(annotation.value,))
+        url_args = reverse_lazy("device:details", args=(prop.value,))
         url = request.build_absolute_uri(url_args)
 
         response = {
             "status": "success",
-            "dhid": annotation.value[:6].upper(),
+            "dhid": prop.value[:6].upper(),
             "url": url,
             # TODO replace with public_url when available
             "public_url": url
@@ -259,22 +258,21 @@ class DetailsDeviceView(ApiMixing):
                 "components": snapshot.get("components"),
             })
 
-        uuids = Annotation.objects.filter(
+        uuids = SystemProperty.objects.filter(
             owner=self.tk.owner.institution,
             value=self.pk
         ).values("uuid")
 
-        annotations = Annotation.objects.filter(
+        properties = UserProperty.objects.filter(
             uuid__in=uuids,
             owner=self.tk.owner.institution,
-            type = Annotation.Type.USER
         ).values_list("key", "value")
 
-        data.update({"annotations": list(annotations)})
+        data.update({"properties": list(properties)})
         return data
 
 
-class AddAnnotationView(ApiMixing):
+class AddPropertyView(ApiMixing):
 
     def post(self, request, *args, **kwargs):
         response = self.auth()
@@ -283,13 +281,12 @@ class AddAnnotationView(ApiMixing):
 
         self.pk = kwargs['pk']
         institution = self.tk.owner.institution
-        self.annotation = Annotation.objects.filter(
+        self.property = SystemProperty.objects.filter(
             owner=institution,
             value=self.pk,
-            type=Annotation.Type.SYSTEM
         ).first()
 
-        if not self.annotation:
+        if not self.property:
             return JsonResponse({}, status=404)
 
         try:
@@ -300,10 +297,9 @@ class AddAnnotationView(ApiMixing):
             logger.error("Invalid Snapshot of user %s", self.tk.owner)
             return JsonResponse({'error': 'Invalid JSON'}, status=500)
 
-        Annotation.objects.create(
-            uuid=self.annotation.uuid,
+        UserProperty.objects.create(
+            uuid=self.property.uuid,
             owner=self.tk.owner.institution,
-            type = Annotation.Type.USER,
             key = key,
             value = value
         )

dashboard/mixins.py

@@ -6,8 +6,9 @@ from django.core.exceptions import PermissionDenied
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.views.generic.base import TemplateView
 from device.models import Device
-from evidence.models import Annotation
+from evidence.models import SystemProperty
 from lot.models import LotTag
+from action.models import StateDefinition
 
 
 class Http403(PermissionDenied):
@@ -32,6 +33,9 @@ class DashboardView(LoginRequiredMixin):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
+        lot_tags = LotTag.objects.filter(
+            owner=self.request.user.institution,
+        )
         context.update({
             "commit_id": settings.COMMIT,
             'title': self.title,
@@ -41,7 +45,7 @@ class DashboardView(LoginRequiredMixin):
             'section': self.section,
             'path': resolve(self.request.path).url_name,
             'user': self.request.user,
-            'lot_tags': LotTag.objects.filter(owner=self.request.user.institution)
+            'lot_tags': lot_tags
         })
         return context
 
@@ -49,7 +53,7 @@ class DashboardView(LoginRequiredMixin):
         dev_ids = self.request.session.pop("devices", [])
 
         self._devices = []
-        for x in Annotation.objects.filter(value__in=dev_ids).filter(
+        for x in SystemProperty.objects.filter(value__in=dev_ids).filter(
                 owner=self.request.user.institution
         ).distinct():
             self._devices.append(Device(id=x.value))

dashboard/templates/base.html

@@ -18,6 +18,7 @@
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.1/font/bootstrap-icons.css">
     <link rel="stylesheet" href= "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css">
     <link href="{% static "/css/bootstrap.min.css" %}" rel="stylesheet">
+    <script src="{% static 'js/Sortable.min.js' %}"></script>
 
     <style>
       .bd-placeholder-img {
@@ -81,46 +82,61 @@
             <ul class="nav flex-column">
 	      {% if user.is_admin %}
               <li class="nav-item">
-                <a class="admin {% if path in 'panel users' %}active {% endif %}nav-link fw-bold" data-bs-toggle="collapse" data-bs-target="#ul_admin" aria-expanded="false" aria-controls="ul_admin" href="javascript:void()">
+                <a class="admin {% if path in 'panel users states_panel tag_panel edit_user delete_user new_user institution' %}active {% endif %}nav-link fw-bold" data-bs-toggle="collapse" data-bs-target="#ul_admin" aria-expanded="false" aria-controls="ul_admin" href="javascript:void()">
                   <i class="bi bi-person-fill-gear icon_sidebar"></i>
                   {% trans 'Admin' %}
                 </a>
-                <ul class="flex-column mb-2 ul_sidebar accordion-collapse {% if path in 'panel users' %}expanded{% else %}collapse{% endif %}" id="ul_admin" data-bs-parent="#sidebarMenu">
+                <ul class="flex-column mb-2 ul_sidebar accordion-collapse {% if path in 'panel users tag_panel states_panel' %}expanded{% else %}collapse{% endif %}" id="ul_admin" data-bs-parent="#sidebarMenu">
                   <li class="nav-item">
-                    <a class="nav-link{% if path == 'panel' %} active2{% endif %}" href="{% url 'admin:panel' %}">
+                    <a class="nav-link{% if path in 'panel institution' %} active2{% endif %}" href="{% url 'admin:panel' %}">
                       {% trans 'Panel' %}
                     </a>
                   </li>
                   <li class="nav-item">
-                    <a class="nav-link{% if path == 'users' %} active2{% endif %}" href="{% url 'admin:users' %}">
+                    <a class="nav-link{% if path in 'users edit_user new_user delete_user' %} active2{% endif %}" href="{% url 'admin:users' %}">
                       {% trans 'Users' %}
                     </a>
                   </li>
+                  <li class="nav-item">
+                    <a class="nav-link{% if path == 'states_panel' %} active2{% endif %}" href="{% url 'admin:states_panel' %}">
+                      {% trans 'States' %}
+		    </a>
+                  </li>
+		  <li class="nav-item">
+                    <a class="nav-link{% if path == 'tag_panel' %} active2{% endif %}" href="{% url 'admin:tag_panel' %}">
+                      {% trans 'Lot Groups' %}
+                    </a>
+                  </li>
                 </ul>
               </li>
 	      {% endif %}
               <li class="nav-item">
-                <a class="admin {% if path == 'unassigned_devices' %}active {% endif %}nav-link fw-bold" data-bs-toggle="collapse" data-bs-target="#ul_devices" aria-expanded="false" aria-controls="ul_devices" href="javascript:void()">
+                <a class="admin {% if path in 'all_device' %}active {% endif %}nav-link fw-bold" data-bs-toggle="collapse" data-bs-target="#ul_device" aria-expanded="false" aria-controls="ul_lots" href="javascript:void()">
                   <i class="bi bi-laptop icon_sidebar"></i>
-                  {% trans 'Devices' %}
+                  {% trans 'Device' %}
                 </a>
-                <ul class="flex-column mb-2 ul_sidebar accordion-collapse {% if path == 'unassigned_devices' %}expanded{% else %}collapse{% endif %}" id="ul_devices" data-bs-parent="#sidebarMenu">
-                  <li class="nav-item">
-                    <a class="nav-link{% if path == 'unassigned_devices' %} active2{% endif %}" href="{% url 'dashboard:unassigned_devices' %}">
-                      {% trans 'Unassigned devices' %}
+                <ul class="flex-column mb-2 ul_sidebar accordion-collapse {% if path in 'all_device' %}expanded{% else %}collapse{% endif %}" id="ul_device" data-bs-parent="#sidebarMenu">
+		  <li class="nav-item">
+                    <a class="nav-link{% if path == 'all_device' %} active2{% endif %}" href="{% url 'dashboard:all_device' %}">
+                      {% trans 'All' %}
                     </a>
                   </li>
                 </ul>
               </li>
               <li class="nav-item">
-                <a class="admin {% if path == 'tag' %}active {% endif %}nav-link fw-bold" data-bs-toggle="collapse" data-bs-target="#ul_lots" aria-expanded="false" aria-controls="ul_lots" href="javascript:void()">
+                <a class="admin {% if path == 'tags' or path == 'lot' or path in 'unassigned dashboard' %}active {% endif %}nav-link fw-bold" data-bs-toggle="collapse" data-bs-target="#ul_lots" aria-expanded="false" aria-controls="ul_lots" href="javascript:void()">
                   <i class="bi bi-database icon_sidebar"></i>
                   {% trans 'Lots' %}
                 </a>
-                <ul class="flex-column mb-2 ul_sidebar accordion-collapse {% if path == 'tag' %}expanded{% else %}collapse{% endif %}" id="ul_lots" data-bs-parent="#sidebarMenu">
+                <ul class="flex-column mb-2 ul_sidebar accordion-collapse {% if path == 'tags' or path == 'lot' or path in 'unassigned dashboard' %}expanded{% else %}collapse{% endif %}" id="ul_lots" data-bs-parent="#sidebarMenu">
+
                   {% for tag in lot_tags %}
                   <li class="nav-items">
-                    <a class="nav-link{% if path == 'tag' %} active2{% endif %}" href="{% url 'lot:tag' tag.id %}">
+		  {% if tag.inbox %}
+                    <a class="nav-link{% if path == 'unassigned' %} active2{% endif %}" href="{% url 'dashboard:unassigned' %}">
+		  {% else %}
+                    <a class="nav-link{% if path == 'tags' %} active2{% endif %}" href="{% url 'lot:tags' tag.id %}">
+		  {% endif %}
                       {{ tag.name }}
                     </a>
                   </li>
@@ -128,37 +144,29 @@
                 </ul>
               </li>
               <li class="nav-item">
-                <a class="admin {% if path in 'upload list' %}active {% endif %}nav-link fw-bold" data-bs-toggle="collapse" data-bs-target="#ul_evidences" aria-expanded="false" aria-controls="ul_evidences" href="javascript:void()">
+                <a class="admin {% if path in 'upload list import add' %}active {% endif %}nav-link fw-bold" data-bs-toggle="collapse" data-bs-target="#ul_evidences" aria-expanded="false" aria-controls="ul_evidences" href="javascript:void()">
                   <i class="bi bi-usb-drive icon_sidebar"></i>
                   {% trans 'Evidences' %}
                 </a>
-                <ul class="flex-column mb-2 ul_sidebar accordion-collapse {% if path in 'upload list' %}expanded{% else %}collapse{% endif %}" id="ul_evidences" data-bs-parent="#sidebarMenu">
-                  <li class="nav-item">
-                    <a class="nav-link{% if path == 'upload' %} active2{% endif %}" href="{% url 'evidence:upload' %}">
-                      {% trans 'Upload one' %}
-                    </a>
-                  </li>
+                <ul class="flex-column mb-2 ul_sidebar accordion-collapse {% if path in 'upload list import add' %}expanded{% else %}collapse{% endif %}" id="ul_evidences" data-bs-parent="#sidebarMenu">
                   <li class="nav-item">
                     <a class="nav-link{% if path == 'list' %} active2{% endif %}" href="{% url 'evidence:list' %}">
-                      {% trans 'Old evidences' %}
+                      {% trans 'List of evidences' %}
+                    </a>
+                  </li>
+                  <li class="nav-item">
+                    <a class="nav-link{% if path == 'upload' %} active2{% endif %}" href="{% url 'evidence:upload' %}">
+                      {% trans 'Upload with JSON file' %}
                     </a>
                   </li>
-                </ul>
-              </li>
-              <li class="nav-item">
-                <a class="admin {% if path in 'import add' %}active {% endif %}nav-link fw-bold" data-bs-toggle="collapse" data-bs-target="#ul_placeholders" aria-expanded="false" aria-controls="ul_placeholders" href="javascript:void()">
-                  <i class="bi-menu-button-wide icon_sidebar"></i>
-                  {% trans 'Placeholders' %}
-                </a>
-                <ul class="flex-column mb-2 ul_sidebar accordion-collapse {% if path in 'import add' %}expanded{% else %}collapse{% endif %}" id="ul_placeholders" data-bs-parent="#sidebarMenu">
                   <li class="nav-item">
                     <a class="nav-link{% if path == 'import' %} active2{% endif %}" href="{% url 'evidence:import' %}">
-                      {% trans 'Upload Spreadsheet' %}
+                      {% trans 'Upload with Spreadsheet' %}
                     </a>
                   </li>
                   <li class="nav-item">
                     <a class="nav-link{% if path == 'add' %} active2{% endif %}" href="{% url 'device:add' %}">
-                      {% trans 'Create one' %}
+                      {% trans 'Upload with Web Form' %}
                     </a>
                   </li>
                 </ul>
@@ -178,12 +186,18 @@
             {% endfor %}
           {% endblock messages %}
           <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2">
-            <h1 class="h2">{{ title }}</h1>
+            <h1 class="h2">{{ title }}
+              {% if help_text %}
+              <span class="ms-1" data-bs-toggle="tooltip" data-bs-placement="right" title="{{ help_text }}">
+                <i class="fas fa-question-circle text-secondary h6 align-top"></i>
+              </span>
+            {% endif %}
+            </h1>
 
-	    <form method="post" action="{% url 'dashboard:search' %}">
+	          <form method="get" action="{% url 'dashboard:search' %}">
               {% csrf_token %}
               <div class="input-group rounded">
-                <input type="search" name="search" class="form-control rounded" placeholder="Search your device..." aria-label="Search" aria-describedby="search-addon" />
+                <input type="search" name="search" class="form-control rounded" {% if search %}value="{{ search }}" {% endif %}placeholder="Search your device..." aria-label="Search" aria-describedby="search-addon" />
         	<span class="input-group-text border-0" id="search-addon">
         	  <i class="fas fa-search"></i>
         	</span>
@@ -221,4 +235,13 @@
     {% block extrascript %}{% endblock %}
     {% endblock %}
   </body>
+
+  <script>
+     //If help_text is passed to the view as context, a hover-able help icon is displayed
+      var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
+      var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
+        return new bootstrap.Tooltip(tooltipTriggerEl);
+      });
+  </script>
+
 </html>

dashboard/templates/pagination.html

@@ -4,12 +4,12 @@
 <ul class="pagination">
   {% if page_number > 1 %}
   <li class="previous">
-    <a type="button" class="btn btn-grey border border-dark" href="?page=1&limit={{ limit }}">
+    <a type="button" class="btn btn-grey border border-dark" href="?page=1&limit={{ limit }}{% if search %}&search={{ search }}{% endif %}">
       &laquo;
     </a>
   </li>
   <li class="previous">
-    <a type="button" class="btn btn-grey border border-dark" href="?page={{ page_number|add:-1 }}&limit={{ limit }}">
+    <a type="button" class="btn btn-grey border border-dark" href="?page={{ page_number|add:-1 }}&limit={{ limit }}{% if search %}&search={{ search }}{% endif %}">
       {% trans 'Previous' %}
     </a>
   </li>
@@ -24,7 +24,7 @@
        {% if p == page_number or p == "..." %}
           href="#">
        {% else %}
-          href="?page={{ p }}&limit={{ limit }}">
+          href="?page={{ p }}&limit={{ limit }}{% if search %}&search={{ search }}{% endif %}">
        {% endif %}
           {{ p }}
      </a>
@@ -34,12 +34,12 @@
 
   {% if page_number < total_pages %}
   <li class="previous">
-    <a type="button" class="btn btn-grey border border-dark" href="?page={{ page_number|add:+1 }}&limit={{ limit }}">
+    <a type="button" class="btn btn-grey border border-dark" href="?page={{ page_number|add:+1 }}&limit={{ limit }}{% if search %}&search={{ search }}{% endif %}">
       {% trans 'Next' %}
     </a>
   </li>
   <li class="previous">
-    <a type="button" class="btn btn-grey border border-dark" href="?page={{ total_pages }}&limit={{ limit }}">
+    <a type="button" class="btn btn-grey border border-dark" href="?page={{ total_pages }}&limit={{ limit }}{% if search %}&search={{ search }}{% endif %}">
       &raquo;
     </a>
   </li>

dashboard/templates/unassigned_devices.html

@@ -9,20 +9,14 @@
     <h3>{{ subtitle }}</h3>
   </div>
   <div class="col text-center">
-    {% if lot %}
-    <a href="{% url 'lot:documents' object.id %}" type="button" class="btn btn-green-admin">
-      <i class="bi bi-folder2"></i>
-      {% trans 'Documents' %}
-    </a>
-    {% endif %}
     <a href="{# url 'dashboard:exports' object.id #}" type="button" class="btn btn-green-admin">
       <i class="bi bi-reply"></i>
       {% trans 'Exports' %}
     </a>
     {% if lot %}
-    <a href="{% url 'lot:annotations' object.id %}" type="button" class="btn btn-green-admin">
+    <a href="{% url 'lot:properties' object.id %}" type="button" class="btn btn-green-admin">
       <i class="bi bi-tag"></i>
-      {% trans 'Annotations' %}
+      {% trans 'properties' %}
     </a>
     {% endif %}
   </div>
@@ -31,6 +25,9 @@
 <div class="dataTable-container">
   <form method="post">
   {% csrf_token %}
+
+  Lot actions: <button class="btn btn-green-admin" type="submit" name="url" value="{% url 'lot:add_devices' %}">Add</button> <button class="btn btn-green-admin" type="submit" value="{% url 'lot:del_devices' %}" name="url">Remove</button>
+
   <table class="table">
     <thead>
       <tr>
@@ -49,6 +46,9 @@
         <th scope="col" data-sortable="">
           model
         </th>
+        <th scope="col" data-sortable="">
+          updated
+        </th>
       </tr>
     </thead>
     {% for dev in devices %}
@@ -75,16 +75,18 @@
             {{ dev.model }}
 	  {% endif %}
         </td>
+        <td>
+            {{ dev.updated }}
+        </td>
       </tr>
     </tbody>
     {% endfor %}
   </table>
-  <button class="btn btn-green-admin" type="submit" value="{% url 'lot:del_devices' %}" name="url">Remove</button> <button class="btn btn-green-admin" type="submit" name="url" value="{% url 'lot:add_devices' %}">add</button>
   </form>
 </div>
 <div class="row mt-3">
   <div class="col">
-    {% render_pagination page total_pages limit %}
+    {% render_pagination page total_pages limit search %}
   </div>
 </div>
 {% endblock %}

dashboard/templatetags/paginacion.py

@@ -3,7 +3,7 @@ from django import template
 register = template.Library()
 
 @register.inclusion_tag('pagination.html')
-def render_pagination(page_number, total_pages, limit=10):
+def render_pagination(page_number, total_pages, limit=10, search=None):
     """
     Template tag for render pagination
 
@@ -16,5 +16,6 @@ def render_pagination(page_number, total_pages, limit=10):
     return {
         'page_number': page_number,
         'total_pages': total_pages,
-        'limit': limit
+        'limit': limit,
+        "search": search,
     }

dashboard/urls.py

@@ -4,7 +4,8 @@ from dashboard import views
 app_name = 'dashboard'
 
 urlpatterns = [
-    path("", views.UnassignedDevicesView.as_view(), name="unassigned_devices"),
+    path("", views.UnassignedDevicesView.as_view(), name="unassigned"),
+    path("all", views.AllDevicesView.as_view(), name="all_device"),
     path("<int:pk>/", views.LotDashboardView.as_view(), name="lot"),
     path("search", views.SearchView.as_view(), name="search"),
 ]

dashboard/views.py

@@ -6,7 +6,7 @@ from django.shortcuts import Http404
 from django.db.models import Q
 
 from dashboard.mixins import InventaryMixin, DetailsMixin
-from evidence.models import Annotation
+from evidence.models import SystemProperty
 from evidence.xapian import search
 from device.models import Device
 from lot.models import Lot
@@ -22,6 +22,16 @@ class UnassignedDevicesView(InventaryMixin):
         return Device.get_unassigned(self.request.user.institution, offset, limit)
 
 
+class AllDevicesView(InventaryMixin):
+    template_name = "unassigned_devices.html"
+    section = "All"
+    title = _("All Devices")
+    breadcrumb = "Devices / All Devices"
+
+    def get_devices(self, user, offset, limit):
+        return Device.get_all(self.request.user.institution, offset, limit)
+
+
 class LotDashboardView(InventaryMixin, DetailsMixin):
     template_name = "unassigned_devices.html"
     section = "dashboard_lot"
@@ -42,8 +52,18 @@ class LotDashboardView(InventaryMixin, DetailsMixin):
             "device_id", flat=True
         ).distinct()
 
-        chids_page = chids[offset:offset+limit]
-        return [Device(id=x) for x in chids_page], chids.count()
+        props = SystemProperty.objects.filter(
+            owner=self.request.user.institution,
+            value__in=chids
+        ).order_by("-created")
+
+        chids_ordered = []
+        for x in props:
+            if x.value not in chids_ordered:
+                chids_ordered.append(x.value)
+
+        chids_page = chids_ordered[offset:offset+limit]
+        return [Device(id=x) for x in chids_page], len(chids_ordered)
 
 
 class SearchView(InventaryMixin):
@@ -52,9 +72,20 @@ class SearchView(InventaryMixin):
     title = _("Search Devices")
     breadcrumb = "Devices / Search Devices"
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        search_params = self.request.GET.urlencode(),
+        search =  self.request.GET.get("search")
+        if search:
+            context.update({
+                'search_params': search_params,
+                'search': search
+            })
+
+        return context
+
     def get_devices(self, user, offset, limit):
-        post = dict(self.request.POST)
-        query = post.get("search")
+        query = dict(self.request.GET).get("search")
 
         if not query:
             return [], 0
@@ -65,6 +96,12 @@ class SearchView(InventaryMixin):
             offset,
             limit
         )
+        count = search(
+            self.request.user.institution,
+            query[0],
+            0,
+            9999
+        ).size()
 
         if not matches or not matches.size():
             return self.search_hids(query, offset, limit)
@@ -74,22 +111,22 @@ class SearchView(InventaryMixin):
 
         for x in matches:
             # devices.append(self.get_annotations(x))
-            dev = self.get_annotations(x)
+            dev = self.get_properties(x)
             if dev.id not in dev_id:
                 devices.append(dev)
                 dev_id.append(dev.id)
 
-        count = matches.size()
         # TODO fix of pagination, the count is not correct
         return devices, count
 
-    def get_annotations(self, xp):
+    def get_properties(self, xp):
         snap = json.loads(xp.document.get_data())
         if snap.get("credentialSubject"):
             uuid = snap["credentialSubject"]["uuid"]
         else:
             uuid = snap["uuid"]
-        return Device.get_annotation_from_uuid(uuid, self.request.user.institution)
+
+        return Device.get_properties_from_uuid(uuid, self.request.user.institution)
 
     def search_hids(self, query, offset, limit):
         qry = Q()
@@ -98,8 +135,7 @@ class SearchView(InventaryMixin):
             if i:
                 qry |= Q(value__startswith=i)
 
-        chids = Annotation.objects.filter(
-            type=Annotation.Type.SYSTEM,
+        chids = SystemProperty.objects.filter(
             owner=self.request.user.institution
         ).filter(
             qry

device/forms.py

@@ -1,5 +1,5 @@
 from django import forms
-from utils.device import create_annotation, create_doc, create_index
+from utils.device import create_property, create_doc, create_index
 from utils.save_snapshots import move_json, save_in_disk
 
 
@@ -59,7 +59,7 @@ class BaseDeviceFormSet(forms.BaseFormSet):
         
         path_name = save_in_disk(doc, self.user.institution.name, place="placeholder")
         create_index(doc, self.user)
-        create_annotation(doc, user, commit=commit)
+        create_property(doc, user, commit=commit)
         move_json(path_name, self.user.institution.name, place="placeholder")
         
         return doc

device/models.py

@@ -1,8 +1,9 @@
 from django.db import models, connection
 
 from utils.constants import ALGOS
-from evidence.models import Annotation, Evidence
+from evidence.models import SystemProperty, UserProperty, Evidence
 from lot.models import DeviceLot
+from action.models import State
 
 
 class Device:
@@ -30,7 +31,7 @@ class Device:
         self.shortid = self.pk[:6].upper()
         self.algorithm = None
         self.owner = None
-        self.annotations = []
+        self.properties = []
         self.hids = []
         self.uuids = []
         self.evidences = []
@@ -39,61 +40,48 @@ class Device:
         self.get_last_evidence()
 
     def initial(self):
-        self.get_annotations()
+        self.get_properties()
         self.get_uuids()
         self.get_hids()
         self.get_evidences()
         self.get_lots()
 
-    def get_annotations(self):
-        if self.annotations:
-            return self.annotations
+    def get_properties(self):
+        if self.properties:
+            return self.properties
 
-        self.annotations = Annotation.objects.filter(
-            type=Annotation.Type.SYSTEM,
+        self.properties = SystemProperty.objects.filter(
             value=self.id
         ).order_by("-created")
 
-        if self.annotations.count():
-            self.algorithm = self.annotations[0].key
-            self.owner = self.annotations[0].owner
+        if self.properties.count():
+            self.algorithm = self.properties[0].key
+            self.owner = self.properties[0].owner
 
-        return self.annotations
+        return self.properties
 
-    def get_user_annotations(self):
+    def get_user_properties(self):
         if not self.uuids:
             self.get_uuids()
 
-        annotations = Annotation.objects.filter(
+        user_properties = UserProperty.objects.filter(
             uuid__in=self.uuids,
             owner=self.owner,
-            type=Annotation.Type.USER
+            type=UserProperty.Type.USER,
         )
-        return annotations
-
-    def get_user_documents(self):
-        if not self.uuids:
-            self.get_uuids()
-
-        annotations = Annotation.objects.filter(
-            uuid__in=self.uuids,
-            owner=self.owner,
-            type=Annotation.Type.DOCUMENT
-        )
-        return annotations
+        return user_properties
 
     def get_uuids(self):
-        for a in self.get_annotations():
+        for a in self.get_properties():
             if a.uuid not in self.uuids:
                 self.uuids.append(a.uuid)
 
     def get_hids(self):
-        annotations = self.get_annotations()
+        properties = self.get_properties()
 
         algos = list(ALGOS.keys())
         algos.append('CUSTOM_ID')
-        self.hids = list(set(annotations.filter(
-            type=Annotation.Type.SYSTEM,
+        self.hids = list(set(properties.filter(
             key__in=algos,
         ).values_list("value", flat=True)))
 
@@ -111,12 +99,12 @@ class Device:
             self.last_evidence = Evidence(self.uuid)
             return
 
-        annotations = self.get_annotations()
-        if not annotations.count():
+        properties = self.get_properties()
+        if not properties.count():
             return
-        annotation = annotations.first()
-        self.last_evidence = Evidence(annotation.uuid)
-        self.uuid = annotation.uuid
+        prop = properties.first()
+
+        self.last_evidence = Evidence(prop.uuid)
 
     def is_eraseserver(self):
         if not self.uuids:
@@ -124,13 +112,13 @@ class Device:
         if not self.uuids:
             return False
 
-        annotation = Annotation.objects.filter(
+        prop = UserProperty.objects.filter(
             uuid__in=self.uuids,
             owner=self.owner,
-            type=Annotation.Type.ERASE_SERVER
+            type=UserProperty.Type.ERASE_SERVER
         ).first()
 
-        if annotation:
+        if prop:
             return True
         return False
 
@@ -139,43 +127,46 @@ class Device:
             return self.uuid
         return self.uuids[0]
 
+    def get_current_state(self):
+        uuid = self.last_uuid
+
+        return State.objects.filter(snapshot_uuid=uuid).order_by('-date').first()
+
     def get_lots(self):
         self.lots = [
             x.lot for x in DeviceLot.objects.filter(device_id=self.id)]
 
     @classmethod
-    def get_unassigned(cls, institution, offset=0, limit=None):
-
+    def get_all(cls, institution, offset=0, limit=None):
         sql = """
-            WITH RankedAnnotations AS (
+            WITH RankedProperties AS (
                 SELECT
                     t1.value,
                     t1.key,
+                    t1.created,
                     ROW_NUMBER() OVER (
                         PARTITION BY t1.uuid
                         ORDER BY
                             CASE
                                 WHEN t1.key = 'CUSTOM_ID' THEN 1
-                                WHEN t1.key = 'hidalgo1' THEN 2
-                                ELSE 3
+                                WHEN t1.key = '{algorithm}' THEN 2
                             END,
                             t1.created DESC
                     ) AS row_num
-                FROM evidence_annotation AS t1
-                LEFT JOIN lot_devicelot AS t2 ON t1.value = t2.device_id
-                WHERE t2.device_id IS NULL
-                  AND t1.owner_id = {institution}
-                  AND t1.type = {type}
+                FROM evidence_systemproperty AS t1
+                WHERE t1.owner_id = {institution}
+                  AND t1.key IN ('CUSTOM_ID', '{algorithm}')
             )
             SELECT DISTINCT
                 value
             FROM
-                RankedAnnotations
+                RankedProperties
             WHERE
                 row_num = 1
+            ORDER BY created DESC
         """.format(
             institution=institution.id,
-            type=Annotation.Type.SYSTEM,
+            algorithm=institution.algorithm,
         )
         if limit:
             sql += " limit {} offset {}".format(int(limit), int(offset))
@@ -188,6 +179,94 @@ class Device:
             annotations = cursor.fetchall()
 
         devices = [cls(id=x[0]) for x in annotations]
+        count = cls.get_all_count(institution)
+        return devices, count
+
+    @classmethod
+    def get_all_count(cls, institution):
+
+        sql = """
+            WITH RankedProperties AS (
+                SELECT
+                    t1.value,
+                    t1.key,
+                    t1.created,
+                    ROW_NUMBER() OVER (
+                        PARTITION BY t1.uuid
+                        ORDER BY
+                            CASE
+                                WHEN t1.key = 'CUSTOM_ID' THEN 1
+                                WHEN t1.key = '{algorithm}' THEN 2
+                            END,
+                            t1.created DESC
+                    ) AS row_num
+
+                FROM evidence_systemproperty AS t1
+               WHERE t1.owner_id = {institution}
+                  AND t1.key IN ('CUSTOM_ID', '{algorithm}')
+            )
+            SELECT
+                COUNT(DISTINCT value)
+            FROM
+                RankedProperties
+            WHERE
+                row_num = 1
+            ORDER BY created DESC
+        """.format(
+            institution=institution.id,
+            algorithm=institution.algorithm
+        )
+        with connection.cursor() as cursor:
+            cursor.execute(sql)
+            return cursor.fetchall()[0][0]
+
+
+    @classmethod
+    def get_unassigned(cls, institution, offset=0, limit=None):
+
+        sql = """
+            WITH RankedProperties AS (
+                SELECT
+                    t1.value,
+                    t1.key,
+                    t1.created,
+                    ROW_NUMBER() OVER (
+                        PARTITION BY t1.uuid
+                        ORDER BY
+                            CASE
+                                WHEN t1.key = 'CUSTOM_ID' THEN 1
+                                WHEN t1.key = '{algorithm}' THEN 2
+                            END,
+                            t1.created DESC
+                    ) AS row_num
+                FROM evidence_systemproperty AS t1
+                LEFT JOIN lot_devicelot AS t2 ON t1.value = t2.device_id
+                WHERE t2.device_id IS NULL
+                  AND t1.owner_id = {institution}
+                  AND t1.key IN ('CUSTOM_ID', '{algorithm}')
+            )
+            SELECT DISTINCT
+                value
+            FROM
+                RankedProperties
+            WHERE
+                row_num = 1
+            ORDER BY created DESC
+        """.format(
+            institution=institution.id,
+            algorithm=institution.algorithm
+        )
+        if limit:
+            sql += " limit {} offset {}".format(int(limit), int(offset))
+
+        sql += ";"
+
+        properties = []
+        with connection.cursor() as cursor:
+            cursor.execute(sql)
+            properties = cursor.fetchall()
+
+        devices = [cls(id=x[0]) for x in properties]
         count = cls.get_unassigned_count(institution)
         return devices, count
 
@@ -195,82 +274,82 @@ class Device:
     def get_unassigned_count(cls, institution):
 
         sql = """
-            WITH RankedAnnotations AS (
+            WITH RankedProperties AS (
                 SELECT
                     t1.value,
                     t1.key,
+                    t1.created,
                     ROW_NUMBER() OVER (
                         PARTITION BY t1.uuid
                         ORDER BY
                             CASE
                                 WHEN t1.key = 'CUSTOM_ID' THEN 1
-                                WHEN t1.key = 'hidalgo1' THEN 2
-                                ELSE 3
+                                WHEN t1.key = '{algorithm}' THEN 2
                             END,
                             t1.created DESC
                     ) AS row_num
-                FROM evidence_annotation AS t1
+                FROM evidence_systemproperty AS t1
                 LEFT JOIN lot_devicelot AS t2 ON t1.value = t2.device_id
                 WHERE t2.device_id IS NULL
                   AND t1.owner_id = {institution}
-                  AND t1.type = {type}
+                  AND t1.key IN ('CUSTOM_ID', '{algorithm}')
             )
             SELECT
                 COUNT(DISTINCT value)
             FROM
-                RankedAnnotations
+                RankedProperties
             WHERE
                 row_num = 1
+            ORDER BY created DESC
         """.format(
             institution=institution.id,
-            type=Annotation.Type.SYSTEM,
+            algorithm=institution.algorithm
         )
         with connection.cursor() as cursor:
             cursor.execute(sql)
             return cursor.fetchall()[0][0]
 
     @classmethod
-    def get_annotation_from_uuid(cls, uuid, institution):
+    def get_properties_from_uuid(cls, uuid, institution):
         sql = """
-            WITH RankedAnnotations AS (
+            WITH RankedProperties AS (
                 SELECT
                     t1.value,
                     t1.key,
+                    t1.created,
                     ROW_NUMBER() OVER (
                         PARTITION BY t1.uuid
                         ORDER BY
                             CASE
                                 WHEN t1.key = 'CUSTOM_ID' THEN 1
-                                WHEN t1.key = 'hidalgo1' THEN 2
-                                ELSE 3
+                                WHEN t1.key = '{algorithm}' THEN 2
                             END,
                             t1.created DESC
                     ) AS row_num
-                FROM evidence_annotation AS t1
-                LEFT JOIN lot_devicelot AS t2 ON t1.value = t2.device_id
-                WHERE t2.device_id IS NULL
-                  AND t1.owner_id = {institution}
-                  AND t1.type = {type}
+                FROM evidence_systemproperty AS t1
+                WHERE t1.owner_id = {institution}
                   AND t1.uuid = '{uuid}'
+                  AND t1.key IN ('CUSTOM_ID', '{algorithm}')
             )
             SELECT DISTINCT
                 value
             FROM
-                RankedAnnotations
+                RankedProperties
             WHERE
-                row_num = 1;
+                row_num = 1
+            ORDER BY created DESC
         """.format(
             uuid=uuid.replace("-", ""),
             institution=institution.id,
-            type=Annotation.Type.SYSTEM,
+            algorithm=institution.algorithm,
         )
 
-        annotations = []
+        properties = []
         with connection.cursor() as cursor:
             cursor.execute(sql)
-            annotations = cursor.fetchall()
+            properties = cursor.fetchall()
 
-        return cls(id=annotations[0][0])
+        return cls(id=properties[0][0])
 
     @property
     def is_websnapshot(self):
@@ -287,6 +366,12 @@ class Device:
         self.get_last_evidence()
         return self.last_evidence.get_manufacturer()
 
+    @property
+    def updated(self):
+        """get timestamp from last evidence created"""
+        self.get_last_evidence()
+        return self.last_evidence.get_time_created()
+
     @property
     def serial_number(self):
         self.get_last_evidence()
@@ -307,11 +392,15 @@ class Device:
 
     @property
     def version(self):
-        if not self.last_evidence:
-            self.get_last_evidence()
+        self.get_last_evidence()
         return self.last_evidence.get_version()
 
     @property
     def components(self):
         self.get_last_evidence()
         return self.last_evidence.get_components()
+
+    @property
+    def did_document(self):
+        self.get_last_evidence()
+        return self.last_evidence.get_did_document()

device/templates/details.html

@@ -2,11 +2,60 @@
 {% load i18n %}
 
 {% block content %}
-  <div class="row">
-    <div class="col">
-      <h3>{{ object.shortid }}</h3>
+<!-- Top bar buttons -->
+<div class="row">
+  <div class="col">
+    <h3>{{ object.shortid }}</h3>
+  </div>
+  <div class="col text-end">
+    <div class="btn-group" role="group" aria-label="Actions">
+
+      <!-- change state button -->
+      {% if state_definitions %}
+      <div class="dropdown ms-2">
+        <a class="btn btn-green-admin dropdown-toggle" id="addStateDropdown" data-bs-toggle="dropdown" aria-expanded="false">
+          {% trans "Change state" %}
+          {% if device_states %}
+            ({{ device_states.0.state }})
+          {% else %}
+            ( {% trans "None" %} )
+            {% endif %}
+        </a>
+        <ul class="dropdown-menu" aria-labelledby="addStateDropdown" style="width: 100%;">
+          {% for state in state_definitions %}
+            <li style="width: 100%;">
+              <form id="changeStateForm{{ state.id }}" method="post" action="{% url 'action:change_state' %}">
+                {% csrf_token %}
+                <input type="hidden" name="previous_state" value="{{ device_states.0.state|default:"nil" }}">
+                <input type="hidden" name="snapshot_uuid" value="{{ object.last_uuid }}">
+                <input type="hidden" name="new_state" value="{{ state.state }}">
+
+                <a class="dropdown-item d-flex justify-content-between align-items-center" href="#" onclick="document.getElementById('changeStateForm{{ state.id }}').submit(); return false;">
+                  <span class="font-monospace">{{ state.state }}</span>
+                  <span class="badge bg-secondary rounded-pill-sm">{{ forloop.counter }}</span>
+                </a>
+              </form>
+            </li>
+          {% endfor %}
+        </ul>
+      </div>
+      {% else %}
+        <button class="btn btn-green-admin" type="button" disabled>
+          <i class="bi bi-plus"></i> {% trans "Change state" %}
+          {% if device_states %}
+            ({{ device_states.0.state }})
+          {% endif %}
+        </button>
+      {% endif %}
+      <!-- Add note button -->
+      <button class="btn btn-yellow ms-2" type="button" data-bs-toggle="modal" data-bs-target="#addNoteModal">
+        <i class="bi bi-sticky"></i> {% trans "Add a note" %}
+      </button>
+
     </div>
   </div>
+</div>
+
 
   <div class="row">
     <div class="col">
@@ -15,10 +64,7 @@
           <a href="#details" class="nav-link active" data-bs-toggle="tab" data-bs-target="#details">{% trans 'General details' %}</a>
         </li>
         <li class="nav-item">
-          <a href="#annotations" class="nav-link" data-bs-toggle="tab" data-bs-target="#annotations">{% trans 'User annotations' %}</a>
-        </li>
-        <li class="nav-item">
-          <a href="#documents" class="nav-link" data-bs-toggle="tab" data-bs-target="#documents">{% trans 'Documents' %}</a>
+          <a href="#user_properties" class="nav-link" data-bs-toggle="tab" data-bs-target="#user_properties">{% trans 'Properties' %}</a>
         </li>
         <li class="nav-item">
           <a href="#lots" class="nav-link" data-bs-toggle="tab" data-bs-target="#lots">{% trans 'Lots' %}</a>
@@ -38,313 +84,53 @@
           <a class="nav-link" href="{% url 'device:device_web' object.id %}" target="_blank">Web</a>
         </li>
         <li class="nav-item">
-          <a href="#environmental_impact" class="nav-link" data-bs-toggle="tab" data-bs-target="#environmental_impact">{% trans 'Environmental impact' %}</a>
+          <a href="#log" class="nav-link" data-bs-toggle="tab" data-bs-target="#log">{% trans 'Log' %}</a>
         </li>
       </ul>
     </div>
   </div>
+  <div class="tab-content pt-4">
 
-  <div class="tab-content pt-2">
-    <div class="tab-pane fade show active" id="details">
-      <h5 class="card-title">{% trans 'Details' %}</h5>
-      <div class="row mb-3">
-        <div class="col-lg-3 col-md-4 label">Phid</div>
-        <div class="col-lg-9 col-md-8">{{ object.id }}</div>
-      </div>
+  {% include 'tabs/general_details.html' %}
 
-      {% if object.is_eraseserver %}
-        <div class="row mb-3">
-          <div class="col-lg-3 col-md-4 label">
-            {% trans 'Is a erase server' %}
-          </div>
-          <div class="col-lg-9 col-md-8"></div>
+  {% include 'tabs/log.html' %}
+
+  {% include 'tabs/user_properties.html' %}
+
+  {% include 'tabs/lots.html' %}
+
+  {% include 'tabs/components.html' %}
+
+  {% include 'tabs/evidences.html' %}
+
+  {% include 'tabs/dpps.html' %}
+
+  <!-- Add a note popup -->
+  <div class="modal fade" id="addNoteModal" tabindex="-1" aria-labelledby="addNoteModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h5 class="modal-title" id="addNoteModalLabel">{% trans "Add a Note" %}</h5>
+          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans 'Close' %}"></button>
         </div>
-      {% endif %}
-
-      <div class="row mb-1">
-        <div class="col-lg-3 col-md-4 label">Type</div>
-        <div class="col-lg-9 col-md-8">{{ object.type }}</div>
-      </div>
-
-      {% if object.is_websnapshot and object.last_user_evidence %}
-        {% for k, v in object.last_user_evidence %}
-          <div class="row mb-1">
-            <div class="col-lg-3 col-md-4 label">{{ k }}</div>
-            <div class="col-lg-9 col-md-8">{{ v|default:'' }}</div>
-          </div>
-        {% endfor %}
-      {% else %}
-        <div class="row mb-1">
-          <div class="col-lg-3 col-md-4 label">
-            {% trans 'Manufacturer' %}
-          </div>
-          <div class="col-lg-9 col-md-8">{{ object.manufacturer|default:'' }}</div>
-        </div>
-
-        <div class="row mb-1">
-          <div class="col-lg-3 col-md-4 label">
-            {% trans 'Model' %}
-          </div>
-          <div class="col-lg-9 col-md-8">{{ object.model|default:'' }}</div>
-        </div>
-
-        <div class="row mb-1">
-          <div class="col-lg-3 col-md-4 label">
-            {% trans 'Version' %}
-          </div>
-          <div class="col-lg-9 col-md-8">{{ object.version|default:'' }}</div>
-        </div>
-
-        <div class="row mb-1">
-          <div class="col-lg-3 col-md-4 label">
-            {% trans 'Serial Number' %}
-          </div>
-          <div class="col-lg-9 col-md-8">{{ object.serial_number|default:'' }}</div>
-        </div>
-      {% endif %}
-
-      <div class="row mb-3">
-        <div class="col-lg-3 col-md-4 label">
-          {% trans 'Identifiers' %}
-        </div>
-      </div>
-      {% for chid in object.hids %}
-        <div class="row mb-3">
-          <div class="col">{{ chid|default:'' }}</div>
-        </div>
-      {% endfor %}
-    </div>
-
-    <div class="tab-pane fade" id="annotations">
-      <div class="btn-group mt-1 mb-3">
-        <a href="{% url 'device:add_annotation' object.pk %}" class="btn btn-primary">
-          <i class="bi bi-plus"></i>
-          {% trans 'Add new annotation' %}
-        </a>
-      </div>
-
-      <h5 class="card-title">{% trans 'Annotations' %}</h5>
-      <table class="table table-striped">
-        <thead>
-          <tr>
-            <th scope="col">
-              {% trans 'Key' %}
-            </th>
-            <th scope="col">
-              {% trans 'Value' %}
-            </th>
-            <th scope="col" data-type="date" data-format="YYYY-MM-DD HH:mm">
-              {% trans 'Created on' %}
-            </th>
-            <th></th>
-            <th></th>
-          </tr>
-        </thead>
-        <tbody>
-          {% for a in object.get_user_annotations %}
-            <tr>
-              <td>{{ a.key }}</td>
-              <td>{{ a.value }}</td>
-              <td>{{ a.created }}</td>
-              <td></td>
-              <td></td>
-            </tr>
-          {% endfor %}
-        </tbody>
-      </table>
-    </div>
-
-    <div class="tab-pane fade" id="documents">
-      <div class="btn-group mt-1 mb-3">
-        <a href="{% url 'device:add_document' object.pk %}" class="btn btn-primary">
-          <i class="bi bi-plus"></i>
-          {% trans 'Add new document' %}
-        </a>
-      </div>
-
-      <h5 class="card-title">{% trans 'Documents' %}</h5>
-      <table class="table table-striped">
-        <thead>
-          <tr>
-            <th scope="col">
-              {% trans 'Key' %}
-            </th>
-            <th scope="col">
-              {% trans 'Value' %}
-            </th>
-            <th scope="col" data-type="date" data-format="YYYY-MM-DD HH:mm">
-              {% trans 'Created on' %}
-            </th>
-            <th></th>
-            <th></th>
-          </tr>
-        </thead>
-        <tbody>
-          {% for a in object.get_user_documents %}
-            <tr>
-              <td>{{ a.key }}</td>
-              <td>{{ a.value }}</td>
-              <td>{{ a.created }}</td>
-              <td></td>
-              <td></td>
-            </tr>
-          {% endfor %}
-        </tbody>
-      </table>
-    </div>
-
-    <div class="tab-pane fade" id="lots">
-      {% for tag in lot_tags %}
-        <h5 class="card-title">{{ tag }}</h5>
-        {% for lot in object.lots %}
-          {% if lot.type == tag %}
-            <div class="row mb-3">
-              <div class="col">
-                <a href="{% url 'dashboard:lot' lot.id %}">{{ lot.name }}</a>
-              </div>
+        <div class="modal-body">
+          <form method="post" action="{% url 'action:add_note' %}">
+            {% csrf_token %}
+            <div class="mb-3">
+              <input type="hidden" name="snapshot_uuid" value="{{ object.last_uuid }}">
+              <label for="noteDescription" class="form-label">{% trans "Note" %}</label>
+              <textarea class="form-control" id="noteDescription" name="note" placeholder="Max 250 characters" name="note" rows="3" required></textarea>
             </div>
-          {% endif %}
-        {% endfor %}
-      {% endfor %}
-    </div>
-
-    <div class="tab-pane fade" id="components">
-      <h5 class="card-title">{% trans 'Components last evidence' %}</h5>
-      <div class="list-group col-6">
-        {% for c in object.components %}
-          <div class="list-group-item">
-            <div class="d-flex w-100 justify-content-between">
-              <h5 class="mb-1">{{ c.type }}</h5>
-              <small class="text-muted">{{ evidence.created }}</small>
+            <div class="modal-footer">
+              <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans "Cancel" %}</button>
+              <button type="submit" class="btn btn-green-admin">{% trans "Save Note" %}</button>
             </div>
-            <p class="mb-1">
-              {% for k, v in c.items %}
-                {% if k not in 'actions,type' %}
-                  {{ k }}: {{ v }}<br />
-                {% endif %}
-              {% endfor %}
-            </p>
-          </div>
-        {% endfor %}
-      </div>
-    </div>
-
-    <div class="tab-pane fade" id="evidences">
-      <h5 class="card-title">{% trans 'List of evidences' %}</h5>
-      <div class="list-group col-6">
-        {% for snap in object.evidences %}
-          <div class="list-group-item">
-            <div class="d-flex w-100 justify-content-between">
-              <small class="text-muted">{{ snap.created }}</small>
-            </div>
-            <p class="mb-1">
-              <a href="{% url 'evidence:details' snap.uuid %}">{{ snap.uuid }}</a>
-            </p>
-          </div>
-        {% endfor %}
-      </div>
-    </div>
-
-    <div class="tab-pane fade" id="environmental_impact">
-      <div class="container-fluid py-3">
-        <div class="d-flex justify-content-end mb-3">
-          <a class="btn btn-success">
-            <i class="bi bi-file-earmark-pdf"></i>
-            {% trans 'Export to PDF' %}
-          </a>
-        </div>
-
-        <div class="row g-4 mb-4">
-          <div class="col-md-4">
-            <div class="card h-100 border-success">
-              <div class="card-body text-center">
-                <div class="mb-3">
-                  <i class="bi bi-arrow-down-circle text-success" style="font-size: 2rem;"></i>
-                </div>
-                <h5 class="card-title text-success">Carbon Reduction</h5>
-                <h2 class="mb-2">{{ impact.carbon_saved }}</h2>
-                <p class="card-text text-muted">kg CO₂e saved</p>
-              </div>
-            </div>
-          </div>
-
-          <div class="col-md-4">
-            <div class="card h-100 border-danger">
-              <div class="card-body text-center">
-                <div class="mb-3">
-                  <i class="bi bi-cloud-fill text-danger" style="font-size: 2rem;"></i>
-                </div>
-                <h5 class="card-title text-danger">Carbon Consumed</h5>
-                <h2 class="mb-2">{{ impact.co2_emissions }}</h2>
-                <p class="card-text text-muted">kg CO₂e consumed</p>
-              </div>
-            </div>
-          </div>
-
-          <div class="col-md-4">
-            <div class="card h-100 border-success">
-              <div class="card-body text-center">
-                <div class="mb-3">
-                  <i class="bi bi-recycle text-success" style="font-size: 2rem;"></i>
-                </div>
-                <h5 class="card-title text-success">Additional Impact Metric</h5>
-                <h2 class="mb-2">85%</h2>
-                <p class="card-text text-muted">whatever</p>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <div class="row">
-          <div class="col">
-            <div class="card">
-              <div class="card-body">
-                <h5 class="card-title">Impact Details</h5>
-                <div class="table-responsive">
-                  <table class="table table-bordered">
-                    <tbody>
-                      <tr>
-                        <th scope="row" class="bg-light" style="width: 30%;">Manufacturing Impact Avoided</th>
-                        <td>
-                          <span class="text-success">{{ impact.carbon_saved }}</span> kg CO₂e
-                          <br />
-                          <small class="text-muted">Based on average laptop manufacturing emissions</small>
-                        </td>
-                      </tr>
-                    </tbody>
-                  </table>
-                </div>
-
-                <div class="mt-3">
-                  <h6>Calculation Method</h6>
-                  <small class="text-muted">Based on industry standards X Y and Z</small>
-                </div>
-              </div>
-            </div>
-          </div>
+          </form>
         </div>
       </div>
     </div>
-
-    {% if dpps %}
-      <div class="tab-pane fade" id="dpps">
-        <h5 class="card-title">{% trans 'List of dpps' %}</h5>
-        <div class="list-group col">
-          {% for d in dpps %}
-            <div class="list-group-item">
-              <div class="d-flex w-100 justify-content-between">
-                <small class="text-muted">{{ d.timestamp }}</small>
-                <span>{{ d.type }}</span>
-              </div>
-              <p class="mb-1">
-                <a href="{% url 'did:device_web' d.signature %}">{{ d.signature }}</a>
-              </p>
-            </div>
-          {% endfor %}
-        </div>
-      </div>
-    {% endif %}
   </div>
+
 {% endblock %}
 
 {% block extrascript %}

device/templates/new_device.html

@@ -78,7 +78,7 @@
     {% endfor %}
   </div>
   <div class="container">
-    <a class="btn btn-grey" href="{% url 'dashboard:unassigned_devices' %}">{% translate "Cancel" %}</a>
+    <a class="btn btn-grey" href="{% url 'dashboard:unassigned' %}">{% translate "Cancel" %}</a>
     <input class="btn btn-green-admin" type="submit" name="submit" value="{% translate 'Save' %}" />
   </div>
 

device/templates/new_user_property.html

@@ -36,7 +36,7 @@
     {% endfor %}
   </div>
   <div class="container">
-    <a class="btn btn-grey" href="{% url 'dashboard:unassigned_devices' %}">{% translate "Cancel" %}</a>
+    <a class="btn btn-grey" href="{% url 'device:details' pk %}#user_properties">{% translate "Cancel" %}</a>
     <input class="btn btn-green-admin" type="submit" name="submit" value="{% translate 'Save' %}" />
   </div>
 

device/templates/physical_properties.html

@@ -1,251 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-
-{% block content %}
-<div class="row">
-  <div class="col">
-    <h3>{{ object.pk }}</h3>
-  </div>
-</div>
-
-<div class="row">
-  <div class="col">
-    <div class="nav nav-tabs nav-tabs-bordered">
-      <li class="nav-items">
-        <a class="nav-link" href="{% url 'device:details' device.pk %}">General details</a>
-      </li>
-      <li class="nav-items">
-        <button class="nav-link active" data-bs-toggle="tab" data-bs-target="#physicalproperties">Physical properties</button>
-      </li>
-      <li class="nav-items">
-        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#documents">Documents</button>
-      </li>
-      <li class="nav-items">
-        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#lots">Lots</button>
-      </li>
-      <li class="nav-items">
-        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#status">Status</button>
-      </li>
-      <li class="nav-items">
-        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#components">Components</button>
-      </li>
-      <li class="nav-items">
-        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#traceabiliy">Traceability log</button>
-      </li>
-      <li class="nav-items">
-        <a class="nav-link" href="">Web</a>
-      </li>
-
-    </div>
-  </div>
-</div>
-<div class="tab-content pt-2">
-
-  <div class="tab-pane fade profile-overview" id="details">
-    <h5 class="card-title">Details</h5>
-    <div class="row mb-3">
-      <div class="col-lg-3 col-md-4 label ">
-        (<a href="/inventory/device/edit/4W8D3/">Edit Device</a>)
-      </div>
-      <div class="col-lg-9 col-md-8">
-        {%if object.hid %}Snapshot{% else %}Placeholder{% endif %}
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="col-lg-3 col-md-4 label ">Phid</div>
-      <div class="col-lg-9 col-md-8">{{ object.id }}</div>
-    </div>
-
-    <div class="row">
-      <div class="col-lg-3 col-md-4 label ">Id device internal</div>
-      <div class="col-lg-9 col-md-8"></div>
-    </div>
-
-    <div class="row">
-      <div class="col-lg-3 col-md-4 label ">Type</div>
-      <div class="col-lg-9 col-md-8">{{ object.type }}</div>
-    </div>
-
-    <div class="row">
-      <div class="col-lg-3 col-md-4 label">Manufacturer</div>
-      <div class="col-lg-9 col-md-8">{{ object.manufacturer|default:"" }}</div>
-    </div>
-
-    <div class="row">
-      <div class="col-lg-3 col-md-4 label">Model</div>
-      <div class="col-lg-9 col-md-8">{{ object.model|default:"" }}</div>
-    </div>
-
-    <div class="row">
-      <div class="col-lg-3 col-md-4 label">Part Number</div>
-      <div class="col-lg-9 col-md-8">{{ object.part_number|default:"" }}</div>
-    </div>
-
-    <div class="row">
-      <div class="col-lg-3 col-md-4 label">Serial Number</div>
-      <div class="col-lg-9 col-md-8">{{ object.serial_number|default:"" }}</div>
-    </div>
-  </div>
-
-  <div class="tab-pane fade show active" id="physicalproperties">
-    <h5 class="card-title">Physical Properties</h5>
-    <div class="row mb-3">
-      <div class="col-lg-3 col-md-4 label ">
-        (<a href="{% url 'device:physical_edit' object.pk %}">Edit Physical Properties</a>)
-      </div>
-    </div>
-    
-    <div class="row mb-3">
-      <div class="col-lg-3 col-md-4 label ">
-        {% load django_bootstrap5 %}
-        <form role="form" method="post">
-        {% csrf_token %}
-        {% if form.errors %}
-        <div class="alert alert-danger alert-icon alert-icon-border alert-dismissible" role="alert">
-          <div class="icon"><span class="mdi mdi-close-circle-o"></span></div>
-          <div class="message">
-            {% for field, error in form.errors.items %}
-              {{ error }}<br />
-            {% endfor %}
-            <button class="btn-close" type="button" data-dismiss="alert" aria-label="Close"></button>
-          </div>
-        </div>
-        {% endif %}
-        {% bootstrap_form form %}
-        <div class="form-actions-no-box">
-          <a class="btn btn-grey" href="{% url 'device:details' device.pk %}">{% translate "Cancel" %}</a>
-          <input class="btn btn-green-admin" type="submit" name="submit" value="{% translate 'Save' %}" />
-        </div>
-
-        </form>
-      </div>
-    </div>
-  </div>
-
-
-  <div class="tab-pane fade profile-overview" id="lots">
-    <h5 class="card-title">Incoming Lots</h5>
-
-    <div class="row">
-    
-    </div>
-
-    <h5 class="card-title">Outgoing Lots</h5>
-
-    <div class="row">
-    
-    </div>
-
-    <h5 class="card-title">Temporary Lots</h5>
-
-    <div class="row">
-    
-    </div>
-  </div>
-
-  <div class="tab-pane fade profile-overview" id="documents">
-    <div class="btn-group dropdown ml-1 mt-1" uib-dropdown="">
-      <a href="/inventory/device/4W8D3/document/add/" class="btn btn-primary">
-        <i class="bi bi-plus"></i>
-        Add new document
-        <span class="caret"></span>
-      </a>
-    </div>
-
-    <h5 class="card-title">Documents</h5>
-    <table class="table">
-      <thead>
-        <tr>
-          <th scope="col">File</th>
-          <th scope="col">Type</th>
-          <th scope="col">Description</th>
-          <th scope="col" data-type="date" data-format="YYYY-MM-DD hh:mm">Uploaded on</th>
-          <th></th>
-          <th></th>
-        </tr>
-      </thead>
-      <tbody>
-        
-      </tbody>
-    </table>
-  </div>
-
-  <div class="tab-pane fade profile-overview" id="status">
-    <h5 class="card-title">Status Details</h5>
-    <div class="row">
-      <div class="col-lg-3 col-md-4 label">Physical State</div>
-      <div class="col-lg-9 col-md-8">
-          
-      </div>
-    </div>
-    <div class="row">
-      <div class="col-lg-3 col-md-4 label">Lifecycle State</div>
-      <div class="col-lg-9 col-md-8">
-          
-      </div>
-    </div>
-    <div class="row">
-      <div class="col-lg-3 col-md-4 label">Allocated State</div>
-      <div class="col-lg-9 col-md-8">
-          
-      </div>
-    </div>
-  </div>
-
-  <div class="tab-pane fade profile-overview" id="traceability">
-    <h5 class="card-title">Traceability log Details</h5>
-    <div class="list-group col-6">
-      
-      <div class="list-group-item d-flex justify-content-between align-items-center">
-        Snapshot ✓
-        <small class="text-muted">14:07 23-06-2024</small>
-      </div>
-      
-      <div class="list-group-item d-flex justify-content-between align-items-center">
-        EraseCrypto ✓
-        <small class="text-muted">14:07 23-06-2024</small>
-      </div>
-      
-      <div class="list-group-item d-flex justify-content-between align-items-center">
-        EraseCrypto ✓
-        <small class="text-muted">14:07 23-06-2024</small>
-      </div>
-      
-    </div>
-  </div>
-
-  <div class="tab-pane fade profile-overview" id="components">
-    <h5 class="card-title">Components Snapshot</h5>
-    <div class="list-group col-6">
-      
-      <div class="list-group-item">
-        <div class="d-flex w-100 justify-content-between">
-          <h5 class="mb-1">Motherboard</h5>
-          <small class="text-muted">14:07 23-06-2024</small>
-        </div>
-        <p class="mb-1">
-          hp<br />
-          890e<br />
-        </p>
-        <small class="text-muted">
-        </small>
-      </div>
-        
-      <div class="list-group-item">
-        <div class="d-flex w-100 justify-content-between">
-          <h5 class="mb-1">NetworkAdapter</h5>
-          <small class="text-muted">14:07 23-06-2024</small>
-        </div>
-        <p class="mb-1">
-          realtek semiconductor co., ltd.<br />
-          rtl8852ae 802.11ax pcie wireless network adapter<br />
-        </p>
-        <small class="text-muted">
-        </small>
-      </div>
-      
-    </div>
-  </div>
-</div>
-{% endblock %}

device/templates/tabs/components.html

@@ -0,0 +1,27 @@
+
+{% load i18n %}
+
+<div class="tab-pane fade" id="components">
+    <h5 class="card-title">{% trans 'Components last evidence' %}
+    </h5>
+      <div class="list-group col-6">
+        {% for c in object.components %}
+          <div class="list-group-item">
+            <div class="d-flex w-100 justify-content-between">
+                <h5 class="mb-1">{{ c.type }}
+                </h5>
+                <small class="text-muted">{{ evidence.created }}
+                </small>
+            </div>
+            <p class="mb-1">
+              {% for k, v in c.items %}
+                {% if k not in 'actions,type' %}
+                    {{ k }}: {{ v }}
+                    <br />
+                {% endif %}
+              {% endfor %}
+            </p>
+          </div>
+        {% endfor %}
+      </div>
+    </div>

device/templates/tabs/dpps.html

@@ -0,0 +1,18 @@
+{% load i18n %}
+
+<div class="tab-pane fade" id="dpps">
+  <h5 class="card-title">{% trans 'List of dpps' %}</h5>
+  <div class="list-group col">
+    {% for d in dpps %}
+      <div class="list-group-item">
+        <div class="d-flex w-100 justify-content-between">
+          <small class="text-muted">{{ d.2.timestamp }}</small>
+          <span>{{ d.2.type }}</span>
+        </div>
+        <p class="mb-1">
+          <a href="{% url 'did:device_web' d.0 %}">{{ d.1 }}...</a>
+        </p>
+      </div>
+    {% endfor %}
+  </div>
+</div>

device/templates/tabs/evidences.html

@@ -0,0 +1,34 @@
+
+{% load i18n %}
+
+    <div class="tab-pane fade" id="evidences">
+      <h5 class="card-title">{% trans 'List of evidences' %}</h5>
+      <div class="list-group col">
+	  <table class="table">
+           <thead>
+             <tr>
+               <th scope="col">uuid</th>
+               <th scope="col">Did Document</th>
+               <th scope="col">{% trans "Date" %}</th>
+             </tr>
+           </thead>
+           <tbody>
+	     {% for snap in object.evidences %}
+             <tr>
+               <td>
+                  <a href="{% url 'evidence:details' snap.uuid %}">{{ snap.uuid }}</a>
+	       </td>
+               <td>
+		 {% if snap.did_document %}
+		 <a href="{{ snap.did_document }}" target="_blank">DID</a>
+		 {% endif %}
+	       </td>
+               <td>
+                 <small class="text-muted">{{ snap.created }}</small>
+	       </td>
+             </tr>
+	     {% endfor %}
+           </tbody>
+         </table>
+      </div>
+    </div>

device/templates/tabs/general_details.html

@@ -0,0 +1,81 @@
+
+{% load i18n %}
+
+<!-- Device Details -->
+    <div class="tab-pane fade show active" id="details">
+          <h5 class="card-title">{% trans 'Details' %}
+          </h5>
+          <hr>
+          <div class="row mb-3">
+            <div class="col-sm-4 text-muted fw-bold">{% trans 'Phid' %}
+            </div>
+            <div class="col-sm-8">{{ object.id }}
+            </div>
+          </div>
+
+          {% if object.is_eraseserver %}
+          <div class="row mb-3">
+            <div class="col-sm-4 text-muted fw-bold">{% trans 'Is an erase server' %}
+            </div>
+            <div class="col-sm-8">{% trans 'Yes' %}
+            </div>
+          </div>
+          {% endif %}
+
+          <div class="row mb-3">
+            <div class="col-sm-4 text-muted fw-bold">{% trans 'Type' %}
+            </div>
+            <div class="col-sm-8">{{ object.type }}
+            </div>
+          </div>
+
+          {% if object.is_websnapshot and object.last_user_evidence %}
+            {% for k, v in object.last_user_evidence.items %}
+            <div class="row mb-3">
+              <div class="col-sm-4 text-muted fw-bold">{{ k }}
+              </div>
+              <div class="col-sm-8">{{ v|default:'' }}
+              </div>
+            </div>
+            {% endfor %}
+          {% else %}
+          <div class="row mb-3">
+            <div class="col-sm-4 text-muted fw-bold">{% trans 'Manufacturer' %}
+            </div>
+            <div class="col-sm-8">{{ object.manufacturer|default:'' }}
+            </div>
+          </div>
+
+          <div class="row mb-3">
+            <div class="col-sm-4 text-muted fw-bold">{% trans 'Model' %}
+            </div>
+            <div class="col-sm-8">{{ object.model|default:'' }}
+            </div>
+          </div>
+
+          <div class="row mb-3">
+            <div class="col-sm-4 text-muted fw-bold">
+              {% trans 'Version' %}
+            </div>
+            <div class="col-sm-8">{{ object.version|default:'' }}</div>
+          </div>
+
+          <div class="row mb-3">
+            <div class="col-sm-4 text-muted fw-bold">{% trans 'Serial Number' %}
+            </div>
+            <div class="col-sm-8">{{ object.serial_number|default:'' }}
+            </div>
+          </div>
+          {% endif %}
+
+          <div class="row mb-3">
+            <div class="col-sm-4 text-muted fw-bold">{% trans 'Identifiers' %}
+            </div>
+            <div class="col-sm-8">
+              {% for chid in object.hids %}
+                <div>{{ chid|default:'' }}
+                </div>
+              {% endfor %}
+            </div>
+        </div>
+      </div>

device/templates/tabs/log.html

@@ -0,0 +1,28 @@
+{% load i18n %}
+
+<div class="tab-pane fade" id="log">
+  <div class="table-responsive">
+    <table class="table table-striped table-hover table-bordered bg-gradient">
+      <thead >
+        <tr>
+          <th scope="col">{% trans 'Date' %}</th>
+          <th scope="col">{% trans 'Event' %}</th>
+          <th scope="col">{% trans 'User' %}</th>
+        </tr>
+      </thead>    
+      <tbody>
+        {% for log in device_logs %}
+        <tr>
+          <td width="13%">{{ log.date|date:"M j, Y, H:i" }}</td>
+          <td class="fst-italic">{{ log.event }}</td>
+          <td>{{ log.user.get_full_name|default:log.user.username }}</td>
+        </tr> 
+        {% empty %} 
+        <tr>
+          <td colspan="3" class="text-center">{% trans 'No logs recorded.' %}</td>
+        </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+  </div>
+</div>

device/templates/tabs/lots.html

@@ -0,0 +1,19 @@
+
+{% load i18n %}
+
+<div class="tab-pane fade" id="lots">
+      {% for tag in lot_tags %}
+          <h5 class="card-title">{{ tag }}
+          </h5>
+        {% for lot in object.lots %}
+          {% if lot.type == tag %}
+            <div class="row mb-3">
+              <div class="col">
+                  <a href="{% url 'dashboard:lot' lot.id %}">{{ lot.name }}
+                  </a>
+              </div>
+            </div>
+          {% endif %}
+        {% endfor %}
+      {% endfor %}
+    </div>

device/templates/tabs/user_properties.html

@@ -0,0 +1,131 @@
+
+{% load i18n %}
+
+<div class="tab-pane fade" id="user_properties">
+    <div class="d-flex justify-content-end mt-1 mb-3">
+      <a href="{% url 'device:add_user_property' object.pk %}"
+        class="btn btn-green-admin d-flex align-items-center">
+        <i class="bi bi-plus me-1"></i>
+        {% trans 'New user property' %}
+      </a>
+    </div>
+
+      <h5 class="card-title">{% trans 'User properties' %}</h5>
+
+      <table class="table table-hover table-bordered table-responsive align-middle">
+        <thead class="table-light">
+          <tr>
+            <th scope="col">{% trans 'Key' %}</th>
+            <th scope="col">{% trans 'Value' %}</th>
+            <th scope="col" data-type="date" class="text-end" data-format="YYYY-MM-DD HH:mm">{% trans 'Created on' %}</th>
+            <th scope="col" width="5%" class="text-end" title="{% trans 'Actions' %}"></th>
+          </tr>
+        </thead>
+        <tbody>
+          {% for a in object.get_user_properties %}
+            <tr>
+                <td>{{ a.key }}
+                </td>
+                <td>{{ a.value }}
+                </td>
+                <td class="text-end">{{ a.created }}
+                </td>
+              <td>
+                <div class="btn-group ">
+                  <button
+                    type="button"
+                    class="btn btn-sm btn-outline-info d-flex align-items-center" data-bs-toggle="modal"
+                    data-bs-target="#editModal{{ a.id }}" >
+                    <i class="bi bi-pencil me-1"></i>
+                    {% trans 'Edit' %}
+                  </button>
+                  <button
+                    type="button"
+                    class="btn btn-sm btn-outline-danger d-flex align-items-center"
+                    data-bs-toggle="modal" data-bs-target="#deleteModal{{ a.id }}">
+                    <i class="bi bi-trash me-1"></i>
+                    {% trans 'Delete' %}
+                  </button>
+                </div>
+              </td>
+            </tr>
+          {% endfor %}
+        </tbody>
+      </table>
+    </div>
+
+<!-- pop up modal for delete confirmation -->
+{% for a in object.get_user_properties %}
+<div class="modal fade" id="deleteModal{{ a.id }}" tabindex="-1" aria-labelledby="deleteModalLabel{{ a.id }}" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered">
+    <div class="modal-content">
+      <div class="modal-header">
+          <h5 class="modal-title" id="deleteModalLabel{{ a.id }}">{% trans "Confirm Deletion" %}
+          </h5>
+          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
+          </button>
+      </div>
+      <div class="modal-body">
+          <p>
+              <strong>{% trans "Key:" %}
+              </strong> {{ a.key }}
+          </p>
+          <p>
+              <strong>{% trans "Value:" %}
+              </strong> {{ a.value }}
+          </p>
+          <p>
+              <strong>{% trans "Created on:" %}
+              </strong> {{ a.created }}
+          </p>
+      </div>
+      <div class="modal-footer justify-content-center">
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans "Cancel" %}
+          </button>
+        <form method="post" action="{% url 'device:delete_user_property' object.id a.id %}">
+          {% csrf_token %}
+            <button type="submit" class="btn btn-danger">{% trans "Delete" %}
+            </button>
+        </form>
+      </div>
+    </div>
+  </div>
+</div>
+{% endfor %}
+
+<!-- popup modals for edit button -->
+{% for a in object.get_user_properties %}
+<div class="modal fade" id="editModal{{ a.id }}" tabindex="-1" aria-labelledby="editModalLabel{{ a.id }}" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered">
+    <div class="modal-content">
+      <div class="modal-header">
+          <h5 class="modal-title" id="editModalLabel{{ a.id }}">{% trans "Edit User Property" %}
+          </h5>
+          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
+          </button>
+      </div>
+      <div class="modal-body">
+        <form id="editForm{{ a.id }}" method="post" action="{% url 'device:update_user_property' object.id a.id %}">
+          {% csrf_token %}
+          <div class="mb-3">
+              <label for="key" class="form-label">{% trans "Key" %}
+              </label>
+            <input type="text" class="form-control" id="key" name="key" value="{{ a.key }}">
+          </div>
+          <div class="mb-3">
+              <label for="value" class="form-label">{% trans "Value" %}
+              </label>
+            <input type="text" class="form-control" id="value" name="value" value="{{ a.value }}">
+          </div>
+          <div class="modal-footer justify-content-center">
+              <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans "Cancel" %}
+              </button>
+              <button type="submit" class="btn btn-primary">{% trans "Save changes" %}
+              </button>
+          </div>
+        </form>
+      </div>
+    </div>
+  </div>
+</div>
+{% endfor %}

device/urls.py

@@ -7,7 +7,11 @@ urlpatterns = [
     path("add/", views.NewDeviceView.as_view(), name="add"),
     path("edit/<str:pk>/", views.EditDeviceView.as_view(), name="edit"),
     path("<str:pk>/", views.DetailsView.as_view(), name="details"),
-    path("<str:pk>/annotation/add", views.AddAnnotationView.as_view(), name="add_annotation"),
-    path("<str:pk>/document/add", views.AddDocumentView.as_view(), name="add_document"),
-    path("<str:pk>/public/", views.PublicDeviceWebView.as_view(), name="device_web")
+    path("<str:pk>/user_property/add",
+         views.AddUserPropertyView.as_view(), name="add_user_property"),
+    path("<str:device_id>/user_property/<int:pk>/delete",
+         views.DeleteUserPropertyView.as_view(), name="delete_user_property"),
+    path("<str:device_id>/user_property/<int:pk>/update",
+         views.UpdateUserPropertyView.as_view(), name="update_user_property"),
+    path("<str:pk>/public/", views.PublicDeviceWebView.as_view(), name="device_web"),
 ]

device/views.py

@@ -1,16 +1,23 @@
+import json
+import logging
+
 from django.http import JsonResponse
 from django.conf import settings
+from django.db import IntegrityError
 from django.urls import reverse_lazy
-from django.shortcuts import get_object_or_404, Http404
+from django.contrib import messages
+from django.shortcuts import get_object_or_404, redirect, Http404
 from django.utils.translation import gettext_lazy as _
 from django.views.generic.edit import (
     CreateView,
     UpdateView,
     FormView,
+    DeleteView,
 )
 from django.views.generic.base import TemplateView
+from action.models import StateDefinition, State, DeviceLog, Note
 from dashboard.mixins import DashboardView, Http403
-from evidence.models import Annotation
+from evidence.models import UserProperty, SystemProperty
 from lot.models import LotTag
 from device.models import Device
 from device.forms import DeviceFormSet
@@ -20,11 +27,21 @@ if settings.DPP:
     from dpp.api_dlt import PROOF_TYPE
 
 
+class DeviceLogMixin(DashboardView):
+
+    def log_registry(self, _uuid, msg):
+        DeviceLog.objects.create(
+            snapshot_uuid=_uuid,
+            event=msg,
+            user=self.request.user,
+            institution=self.request.user.institution
+        )
+
 class NewDeviceView(DashboardView, FormView):
     template_name = "new_device.html"
     title = _("New Device")
     breadcrumb = "Device / New Device"
-    success_url = reverse_lazy('dashboard:unassigned_devices')
+    success_url = reverse_lazy('dashboard:unassigned')
     form_class = DeviceFormSet
 
     def form_valid(self, form):
@@ -37,41 +54,12 @@ class NewDeviceView(DashboardView, FormView):
         return response
 
 
-# class AddToLotView(DashboardView, FormView):
-#     template_name = "list_lots.html"
-#     title = _("Add to lots")
-#     breadcrumb = "lot / add to lots"
-#     success_url = reverse_lazy('dashboard:unassigned_devices')
-#     form_class = LotsForm
-
-#     def get_context_data(self, **kwargs):
-#         context = super().get_context_data(**kwargs)
-#         lots = Lot.objects.filter(owner=self.request.user)
-#         lot_tags = LotTag.objects.filter(owner=self.request.user)
-#         context.update({
-#             'lots': lots,
-#             'lot_tags':lot_tags,
-#         })
-#         return context
-
-#     def get_form(self):
-#         form = super().get_form()
-#         form.fields["lots"].queryset = Lot.objects.filter(owner=self.request.user)
-#         return form
-
-#     def form_valid(self, form):
-#         form.devices = self.get_session_devices()
-#         form.save()
-#         response = super().form_valid(form)
-#         return response
-
-
 class EditDeviceView(DashboardView, UpdateView):
     template_name = "new_device.html"
     title = _("Update Device")
     breadcrumb = "Device / Update Device"
     success_url = reverse_lazy('dashboard:unassigned_devices')
-    model = Annotation
+    model = SystemProperty
 
     def get_form_kwargs(self):
         pk = self.kwargs.get('pk')
@@ -89,7 +77,7 @@ class DetailsView(DashboardView, TemplateView):
     template_name = "details.html"
     title = _("Device")
     breadcrumb = "Device / Details"
-    model = Annotation
+    model = SystemProperty
 
     def get(self, request, *args, **kwargs):
         self.pk = kwargs['pk']
@@ -107,7 +95,7 @@ class DetailsView(DashboardView, TemplateView):
         lot_tags = LotTag.objects.filter(owner=self.request.user.institution)
         dpps = []
         if settings.DPP:
-            dpps = Proof.objects.filter(
+            _dpps = Proof.objects.filter(
                 uuid__in=self.object.uuids,
                 type=PROOF_TYPE["IssueDPP"]
             )
@@ -116,12 +104,29 @@ class DetailsView(DashboardView, TemplateView):
         )
         enviromental_impact = enviromental_impact_algorithm.get_device_environmental_impact(
             self.object)
+            for x in _dpps:
+                dpp = "{}:{}".format(self.pk, x.signature)
+                dpps.append((dpp, x.signature[:10], x))
+
+        last_evidence = self.object.get_last_evidence()
+        uuids = self.object.uuids
+        state_definitions = StateDefinition.objects.filter(
+            institution=self.request.user.institution
+        ).order_by('order')
+        device_states = State.objects.filter(snapshot_uuid__in=uuids).order_by('-date')
+        device_logs = DeviceLog.objects.filter(
+            snapshot_uuid__in=uuids).order_by('-date')
+        device_notes = Note.objects.filter(snapshot_uuid__in=uuids).order_by('-date')
         context.update({
             'object': self.object,
-            'snapshot': self.object.get_last_evidence(),
+            'snapshot': last_evidence,
             'lot_tags': lot_tags,
             'impact': enviromental_impact,
             'dpps': dpps,
+            "state_definitions": state_definitions,
+            "device_states": device_states,
+            "device_logs": device_logs,
+            "device_notes": device_notes,
         })
         return context
 
@@ -182,67 +187,120 @@ class PublicDeviceWebView(TemplateView):
         return JsonResponse(device_data)
 
 
-class AddAnnotationView(DashboardView, CreateView):
-    template_name = "new_annotation.html"
-    title = _("New annotation")
-    breadcrumb = "Device / New annotation"
-    success_url = reverse_lazy('dashboard:unassigned_devices')
-    model = Annotation
+class AddUserPropertyView(DeviceLogMixin, CreateView):
+    template_name = "new_user_property.html"
+    title = _("New User Property")
+    breadcrumb = "Device / New Property"
+    model = UserProperty
     fields = ("key", "value")
 
     def form_valid(self, form):
         form.instance.owner = self.request.user.institution
         form.instance.user = self.request.user
-        form.instance.uuid = self.annotation.uuid
-        form.instance.type = Annotation.Type.USER
-        response = super().form_valid(form)
-        return response
+        form.instance.uuid = self.property.uuid
+        form.instance.type = UserProperty.Type.USER
+
+        try:
+            response = super().form_valid(form)
+            messages.success(self.request, _("Property successfully added."))
+            log_message = _("<Created> UserProperty: {}: {}".format(
+                form.instance.key,
+                form.instance.value
+            ))
+
+            self.log_registry(form.instance.uuid, log_message)
+            return response
+        except IntegrityError:
+            messages.error(self.request, _("Property is already defined."))
+            return self.form_invalid(form)
 
     def get_form_kwargs(self):
         pk = self.kwargs.get('pk')
         institution = self.request.user.institution
-        self.annotation = Annotation.objects.filter(
-            owner=institution,
-            value=pk,
-            type=Annotation.Type.SYSTEM
-        ).first()
-
-        if not self.annotation:
+        self.property = SystemProperty.objects.filter(
+            owner=institution, value=pk).first()
+        if not self.property:
             raise Http404
 
-        self.success_url = reverse_lazy('device:details', args=[pk])
-        kwargs = super().get_form_kwargs()
-        return kwargs
+        return super().get_form_kwargs()
+
+    def get_success_url(self):
+        pk = self.kwargs.get('pk')
+        return reverse_lazy('device:details', args=[pk]) + "#user_properties"
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['pk'] = self.kwargs.get('pk')
+        return context
 
 
-class AddDocumentView(DashboardView, CreateView):
-    template_name = "new_annotation.html"
-    title = _("New Document")
-    breadcrumb = "Device / New document"
-    success_url = reverse_lazy('dashboard:unassigned_devices')
-    model = Annotation
+class UpdateUserPropertyView(DeviceLogMixin, UpdateView):
+    template_name = "new_user_property.html"
+    title = _("Update User Property")
+    breadcrumb = "Device / Update Property"
+    model = UserProperty
     fields = ("key", "value")
 
-    def form_valid(self, form):
-        form.instance.owner = self.request.user.institution
-        form.instance.user = self.request.user
-        form.instance.uuid = self.annotation.uuid
-        form.instance.type = Annotation.Type.DOCUMENT
-        response = super().form_valid(form)
-        return response
-
     def get_form_kwargs(self):
         pk = self.kwargs.get('pk')
         institution = self.request.user.institution
-        self.annotation = Annotation.objects.filter(
-            owner=institution,
-            value=pk,
-            type=Annotation.Type.SYSTEM
-        ).first()
+        self.object = get_object_or_404(UserProperty, owner=institution, pk=pk)
+        self.old_key = self.object.key
+        self.old_value = self.object.value
+        return super().get_form_kwargs()
 
-        if not self.annotation:
-            raise Http404
+    def form_valid(self, form):
+        new_key = form.cleaned_data['key']
+        new_value = form.cleaned_data['value']
 
-        self.success_url = reverse_lazy('device:details', args=[pk])
-        kwargs = super().get_form_kwargs()
-        return kwargs
+        try:
+            super().form_valid(form)
+            messages.success(self.request, _("Property updated successfully."))
+            log_message = _("<Updated> UserProperty: {}: {} to {}: {}".format(
+                self.old_key,
+                self.old_value,
+                new_key,
+                new_value
+            ))
+            self.log_registry(form.instance.uuid, log_message)
+            # return response
+            return redirect(self.get_success_url())
+        except IntegrityError:
+            messages.error(self.request, _("Property is already defined."))
+            return self.form_invalid(form)
+
+    def form_invalid(self, form):
+        super().form_invalid(form)
+        return redirect(self.get_success_url())
+
+    def get_success_url(self):
+        pk = self.kwargs.get('device_id')
+        return reverse_lazy('device:details', args=[pk]) + "#user_properties"
+
+
+class DeleteUserPropertyView(DeviceLogMixin, DeleteView):
+    model = UserProperty
+
+    def get_queryset(self):
+        return UserProperty.objects.filter(owner=self.request.user.institution)
+
+    #using post() method because delete() method from DeleteView has some issues
+    # with messages framework
+    def post(self, request, *args, **kwargs):
+        pk = self.kwargs.get('pk')
+        institution = self.request.user.institution
+        self.object = get_object_or_404(UserProperty, owner=institution, pk=pk)
+        self.object.delete()
+
+        msg = _("<Deleted> User Property: {}:{}".format(
+            self.object.key,
+            self.object.value
+        ))
+        self.log_registry(self.object.uuid, msg)
+        messages.info(self.request, _("User property deleted successfully."))
+
+        return redirect(self.get_success_url())
+
+    def get_success_url(self):
+        pk = self.kwargs.get('device_id')
+        return reverse_lazy('device:details', args=[pk]) + "#user_properties"

dhub/settings.py

@@ -65,6 +65,7 @@ ENABLE_EMAIL = config("ENABLE_EMAIL", default=True, cast=bool)
 
 EVIDENCES_DIR = config("EVIDENCES_DIR", default=os.path.join(BASE_DIR, "db"))
 
+
 # Application definition
 
 INSTALLED_APPS = [
@@ -77,16 +78,13 @@ INSTALLED_APPS = [
     'django_extensions',
     'django_bootstrap5',
     'django_tables2',
-    "rest_framework",
     "login",
     "user",
     "device",
     "evidence",
-    "action",
-    "tag",
     "lot",
-    "documents",
     "dashboard",
+    "action",
     "admin",
     "api",
     "environmental_impact"
@@ -216,6 +214,10 @@ LOGGING = {
             '()': CustomFormatter,
             'format': '%(levelname)s %(asctime)s %(message)s'
         },
+        'verbose': {
+            'format': '{levelname} {asctime} {module} {message}',
+            'style': '{',
+        },
     },
     "handlers": {
         "console": {
@@ -238,7 +240,7 @@ LOGGING = {
             "handlers": ["console"],
             "level": "ERROR",
             "propagate": False,
-        }
+        },
     }
 }
 

dhub/urls.py

@@ -22,6 +22,7 @@ urlpatterns = [
     path("", include("login.urls")),
     path("dashboard/", include("dashboard.urls")),
     path("evidence/", include("evidence.urls")),
+    path('action/', include('action.urls')),
     path("device/", include("device.urls")),
     path("admin/", include("admin.urls")),
     path("user/", include("user.urls")),

did/views.py

@@ -106,10 +106,10 @@ class PublicDeviceWebView(TemplateView):
             'device': {},
         }
         dev = Build(self.object.last_evidence.doc, None, check=True)
-        doc = dev.get_phid()
+        doc = dev.build.get_doc()
         data['document'] = json.dumps(doc)
-        data['device'] = dev.device
-        data['components'] = dev.components
+        data['device'] = dev.build.device
+        data['components'] = dev.build.components
 
         self.object.get_evidences()
         last_dpp = Proof.objects.filter(
@@ -118,7 +118,7 @@ class PublicDeviceWebView(TemplateView):
 
         key = self.pk
         if last_dpp:
-            key = last_dpp.signature
+            key += ":"+last_dpp.signature
 
         url = "https://{}/did/{}".format(
             self.request.get_host(),
@@ -135,17 +135,17 @@ class PublicDeviceWebView(TemplateView):
         for d in self.object.evidences:
             d.get_doc()
             dev = Build(d.doc, None, check=True)
-            doc = dev.get_phid()
+            doc = dev.build.get_doc()
             ev = json.dumps(doc)
-            phid = dev.get_signature(doc)
+            phid = dev.sign(ev)
             dpp = "{}:{}".format(self.pk, phid)
             rr = {
                 'dpp': dpp,
                 'document': ev,
                 'algorithm': ALGORITHM,
                 'manufacturer DPP': '',
-                'device': dev.device,
-                'components': dev.components
+                'device': dev.build.device,
+                'components': dev.build.components
             }
 
             tmpl = dpp_tmpl.copy()

docker-compose.yml

@@ -1,17 +1,59 @@
 services:
   devicehub-django:
     init: true
+    image: farga.pangea.org/ereuse/devicehub-django:latest
     build:
+      context: .
       dockerfile: docker/devicehub-django.Dockerfile
     environment:
       - DEBUG=${DEBUG:-false}
-      - DOMAIN=${DOMAIN:-localhost}
-      - ALLOWED_HOSTS=${ALLOWED_HOSTS:-$DOMAIN}
+      - DOMAIN=${DEVICEHUB_DOMAIN:-localhost}
+      - PORT=${DEVICEHUB_PORT:-8000}
+      - ALLOWED_HOSTS=${DEVICEHUB_ALLOWED_HOSTS:-$DEVICEHUB_DOMAIN}
       - DEMO=${DEMO:-false}
+      - DEMO_IDHUB_DOMAIN=${DEMO_IDHUB_DOMAIN:-}
+      - DEMO_IDHUB_PREDEFINED_TOKEN=${IDHUB_PREDEFINED_TOKEN:-}
       - PREDEFINED_TOKEN=${PREDEFINED_TOKEN:-}
       - DPP=${DPP:-false}
+    # TODO manage volumes dev vs prod
     volumes:
       - .:/opt/devicehub-django
     ports:
-      - 8000:8000
+      - ${DEVICEHUB_PORT:-8000}:${DEVICEHUB_PORT:-8000}
 
+  # TODO add database service for idhub, meanwhile sqlite
+
+  idhub:
+    # https://docs.docker.com/compose/how-tos/profiles/
+    profiles: [idhub]
+    init: true
+    image: farga.pangea.org/ereuse/idhub:latest
+    environment:
+      - DOMAIN=${IDHUB_DOMAIN:-localhost}
+      - ALLOWED_HOSTS=${IDHUB_ALLOWED_HOSTS:-$IDHUB_DOMAIN}
+      - DEBUG=true
+      - DEMO=${DEMO:-false}
+      - INITIAL_ADMIN_EMAIL=${IDHUB_ADMIN_EMAIL}
+      - INITIAL_ADMIN_PASSWORD=${IDHUB_ADMIN_PASSWD}
+      - CREATE_TEST_USERS=true
+      - ENABLE_EMAIL=${IDHUB_ENABLE_EMAIL:-true}
+      - ENABLE_2FACTOR_AUTH=${IDHUB_ENABLE_2FACTOR_AUTH:-true}
+      - ENABLE_DOMAIN_CHECKER=${IDHUB_ENABLE_DOMAIN_CHECKER:-true}
+      - PREDEFINED_TOKEN=${IDHUB_PREDEFINED_TOKEN:-}
+      - SECRET_KEY=${IDHUB_SECRET_KEY:-publicsecretisnotsecureVtmKBfxpVV47PpBCF2Nzz2H6qnbd}
+      - STATIC_ROOT=${IDHUB_STATIC_ROOT:-/static/}
+      - MEDIA_ROOT=${IDHUB_MEDIA_ROOT:-/media/}
+      - PORT=${IDHUB_PORT:-9001}
+      - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL}
+      - EMAIL_HOST=${IDHUB_EMAIL_HOST}
+      - EMAIL_HOST_USER=${IDHUB_EMAIL_HOST_USER}
+      - EMAIL_HOST_PASSWORD=${IDHUB_EMAIL_HOST_PASSWORD}
+      - EMAIL_PORT=${IDHUB_EMAIL_PORT}
+      - EMAIL_USE_TLS=${IDHUB_EMAIL_USE_TLS}
+      - EMAIL_BACKEND=${IDHUB_EMAIL_BACKEND}
+      - SUPPORTED_CREDENTIALS=['Snapshot']
+      - SYNC_ORG_DEV=${IDHUB_SYNC_ORG_DEV}
+    ports:
+      - 9001:9001
+
+  # TODO add database service for idhub, meanwhile sqlite

docker-reset.sh

@@ -19,12 +19,24 @@ main() {
                 cp -v .env.example .env
                 echo "WARNING: .env was not there, .env.example was copied, this only happens once"
         fi
+
+        # load vars
+        . ./.env
+
+        if [ "${IDHUB_ENABLED:-}" = 'true' ]; then
+                export COMPOSE_PROFILES='idhub'
+        fi
         # remove old database
         rm -vfr ./db/*
         # deactivate configured flag
         rm -vfr ./already_configured
         docker compose down -v
-        docker compose build
+        if [ "${DEV_DOCKER_ALWAYS_BUILD:-}" = 'true' ]; then
+                docker compose pull --ignore-buildable
+                docker compose build
+        else
+                docker compose pull
+        fi
         docker compose up ${detach_arg:-}
 }
 

docker/devicehub-django.Dockerfile

@@ -6,6 +6,7 @@ RUN apt update && \
     python3-xapian \
     git \
     sqlite3 \
+    curl \
     jq \
     time \
     vim \
@@ -37,6 +38,7 @@ RUN pip install -i https://test.pypi.org/simple/ ereuseapitest==0.0.14
 #   Set PYTHONPATH to include the directory with the xapian module
 ENV PYTHONPATH="${PYTHONPATH}:/usr/lib/python3/dist-packages"
 
+COPY . .
 COPY docker/devicehub-django.entrypoint.sh /
 
 RUN chown -R app:app /opt/devicehub-django

docker/devicehub-django.entrypoint.sh

@@ -42,19 +42,6 @@ gen_env_vars() {
                 export API_RESOLVER='http://id_index_api:3012'
                 # TODO hardcoded
                 export ID_FEDERATED='DH1'
-                # propagate to .env
-                dpp_env_vars="$(cat <<END
-API_DLT=${API_DLT}
-API_DLT_TOKEN=${API_DLT_TOKEN}
-API_RESOLVER=${API_RESOLVER}
-ID_FEDERATED=${ID_FEDERATED}
-END
-)"
-        # generate config using env vars from docker
-        # TODO rethink if this is needed because now this is django, not flask
-        cat > .env <<END
-${dpp_env_vars:-}
-END
         fi
 }
 
@@ -118,8 +105,53 @@ END
         ./manage.py dlt_register_user "${DATASET_FILE}"
 }
 
+# wait until idhub api is prepared to received requests
+wait_idhub() {
+        echo "Start waiting idhub API"
+        while true; do
+                result="$(curl -s "${url}" \
+                               | jq -r .error \
+                               || echo "Reported errors, idhub API is still not ready")"
+
+                if [ "${result}" = "Invalid request method" ]; then
+                        break
+                        sleep 2
+                else
+                        echo "Waiting idhub API"
+                        sleep 3
+                fi
+        done
+}
+
+demo__send_to_sign_credential() {
+        filepath="${1}"
+        # hashlib.sha3_256 of PREDEFINED_TOKEN for idhub
+        DEMO_IDHUB_PREDEFINED_TOKEN="${DEMO_IDHUB_PREDEFINED_TOKEN:-}"
+        auth_header="Authorization: Bearer ${DEMO_IDHUB_PREDEFINED_TOKEN}"
+        json_header='Content-Type: application/json'
+        curl -s -X POST \
+             -H "${json_header}" \
+             -H "${auth_header}" \
+             -d @"${filepath}" \
+             "${url}" \
+                | jq -r .data
+}
+
+run_demo() {
+        if [ "${DEMO_IDHUB_DOMAIN:-}" ]; then
+                DEMO_IDHUB_DOMAIN="${DEMO_IDHUB_DOMAIN:-}"
+                # this demo only works with FQDN domain (with no ports)
+                url="https://${DEMO_IDHUB_DOMAIN}/webhook/sign/"
+                wait_idhub
+                demo__send_to_sign_credential \
+                        'example/demo-snapshots-vc/snapshot_pre-verifiable-credential.json' \
+                        > 'example/snapshots/snapshot_workbench-script_verifiable-credential.json'
+        fi
+        /usr/bin/time ./manage.py up_snapshots example/snapshots/ "${INIT_USER}"
+}
+
 config_phase() {
-	# TODO review this flag file
+        # TODO review this flag file
         init_flagfile="${program_dir}/already_configured"
         if [ ! -f "${init_flagfile}" ]; then
 
@@ -132,7 +164,7 @@ config_phase() {
                         # 12, 13, 14
                         config_dpp_part1
 
-                        # cleanup other spnapshots and copy dlt/dpp snapshots
+                        # cleanup other snapshots and copy dlt/dpp snapshots
                         # TODO make this better
                         rm example/snapshots/*
                         cp example/dpp-snapshots/*.json example/snapshots/
@@ -140,7 +172,7 @@ config_phase() {
 
                 # # 15. Add inventory snapshots for user "${INIT_USER}".
                 if [ "${DEMO:-}" = 'true' ]; then
-                        /usr/bin/time ./manage.py up_snapshots example/snapshots/ "${INIT_USER}"
+                        run_demo
                 fi
 
                 # remain next command as the last operation for this if conditional
@@ -155,9 +187,11 @@ check_app_is_there() {
 }
 
 deploy() {
-        # TODO this is weird, find better workaround
-        git config --global --add safe.directory "${program_dir}"
-        export COMMIT=$(git log --format="%H %ad" --date=iso -n 1)
+        if [ -d /opt/devicehub-django/.git ]; then
+                # TODO this is weird, find better workaround
+                git config --global --add safe.directory "${program_dir}"
+                export COMMIT=$(git log --format="%H %ad" --date=iso -n 1)
+        fi
 
         if [ "${DEBUG:-}" = 'true' ]; then
                 ./manage.py print_settings
@@ -173,6 +207,9 @@ deploy() {
                 # move the migrate thing in docker entrypoint
                 #   inspired by https://medium.com/analytics-vidhya/django-with-docker-and-docker-compose-python-part-2-8415976470cc
                 echo "INFO detected NEW deployment"
+                if [ ! -d "${program_dir}/db/" ]; then
+                        mkdir -p "${program_dir}/db/"
+                fi
                 ./manage.py migrate
                 config_phase
         fi

documents/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.

documents/apps.py

@@ -1,6 +0,0 @@
-from django.apps import AppConfig
-
-
-class DocumentsConfig(AppConfig):
-    default_auto_field = "django.db.models.BigAutoField"
-    name = "documents"

documents/models.py

@@ -1,3 +0,0 @@
-from django.db import models
-
-# Create your models here.

documents/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

documents/views.py

@@ -1,3 +0,0 @@
-from django.shortcuts import render
-
-# Create your views here.

dpp/views.py

@@ -24,7 +24,7 @@ class ProofView(View):
             return JsonResponse({}, status=404)
 
         dev = Build(ev.doc, None, check=True)
-        doc = dev.get_phid()
+        doc = dev.build.get_doc()
 
         data = {
             "algorithm": ALGORITHM,

evidence/forms.py

@@ -4,12 +4,13 @@ import pandas as pd
 from django import forms
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
-from utils.device import create_annotation, create_doc, create_index
+from utils.device import create_property, create_doc, create_index
 from utils.forms import MultipleFileField
 from device.models import Device
 from evidence.parse import Build
-from evidence.models import Annotation
+from evidence.models import SystemProperty, UserProperty
 from utils.save_snapshots import move_json, save_in_disk
+from action.models import DeviceLog
 
 
 class UploadForm(forms.Form):
@@ -30,11 +31,11 @@ class UploadForm(forms.Form):
             try:
                 file_json = json.loads(file_data)
                 snap = Build(file_json, None, check=True)
-                exist_annotation = Annotation.objects.filter(
+                exists_property = SystemProperty.objects.filter(
                     uuid=snap.uuid
                 ).first()
 
-                if exist_annotation:
+                if exists_property:
                     raise ValidationError(
                         _("The snapshot already exists"),
                         code="duplicate_snapshot",
@@ -57,7 +58,9 @@ class UploadForm(forms.Form):
 
         for ev in self.evidences:
             path_name = save_in_disk(ev[1], user.institution.name)
-            Build(ev[1], user)
+            build = Build
+            file_json = ev[1]
+            build(file_json, user)
             move_json(path_name, user.institution.name)
 
 
@@ -68,9 +71,8 @@ class UserTagForm(forms.Form):
         self.pk = None
         self.uuid = kwargs.pop('uuid', None)
         self.user = kwargs.pop('user')
-        instance = Annotation.objects.filter(
+        instance = SystemProperty.objects.filter(
             uuid=self.uuid,
-            type=Annotation.Type.SYSTEM,
             key='CUSTOM_ID',
             owner=self.user.institution
         ).first()
@@ -86,9 +88,8 @@ class UserTagForm(forms.Form):
         if not data:
             return False
         self.tag = data
-        self.instance = Annotation.objects.filter(
+        self.instance = SystemProperty.objects.filter(
             uuid=self.uuid,
-            type=Annotation.Type.SYSTEM,
             key='CUSTOM_ID',
             owner=self.user.institution
         ).first()
@@ -100,20 +101,31 @@ class UserTagForm(forms.Form):
             return
 
         if self.instance:
+            old_value = self.instance.value
             if not self.tag:
+                message =_("<Deleted> Evidence Tag. Old Value: '{}'").format(old_value)
                 self.instance.delete()
-            self.instance.value = self.tag
-            self.instance.save()
-            return
+            else:
+                self.instance.value = self.tag
+                self.instance.save()
+                if old_value != self.tag:
+                    message=_("<Updated> Evidence Tag. Old Value: '{}'. New Value: '{}'").format(old_value, self.tag)
+        else:
+            message =_("<Created> Evidence Tag. Value: '{}'").format(self.tag)
+            SystemProperty.objects.create(
+                uuid=self.uuid,
+                key='CUSTOM_ID',
+                value=self.tag,
+                owner=self.user.institution,
+                user=self.user
+            )
         
-        Annotation.objects.create(
-            uuid=self.uuid,
-            type=Annotation.Type.SYSTEM,
-            key='CUSTOM_ID',
-            value=self.tag,
-            owner=self.user.institution,
-            user=self.user
-        )
+        DeviceLog.objects.create(
+                snapshot_uuid=self.uuid,
+                event= message,
+                user=self.user,
+                institution=self.user.institution
+            )
 
 
 class ImportForm(forms.Form):
@@ -164,8 +176,8 @@ class ImportForm(forms.Form):
         table = []
         for row in self.rows:
             doc = create_doc(row)
-            annotation = create_annotation(doc, self.user)
-            table.append((doc, annotation))
+            property = create_property(doc, self.user)
+            table.append((doc, property))
 
         if commit:
             for doc, cred in table:
@@ -186,9 +198,9 @@ class EraseServerForm(forms.Form):
         self.pk = None
         self.uuid = kwargs.pop('uuid', None)
         self.user = kwargs.pop('user')
-        instance = Annotation.objects.filter(
+        instance = UserProperty.objects.filter(
             uuid=self.uuid,
-            type=Annotation.Type.ERASE_SERVER,
+            type=UserProperty.Type.ERASE_SERVER,
             key='ERASE_SERVER',
             owner=self.user.institution
         ).first()
@@ -201,9 +213,9 @@ class EraseServerForm(forms.Form):
 
     def clean(self):
         self.erase_server = self.cleaned_data.get('erase_server', False)
-        self.instance = Annotation.objects.filter(
+        self.instance = UserProperty.objects.filter(
             uuid=self.uuid,
-            type=Annotation.Type.ERASE_SERVER,
+            type=UserProperty.Type.ERASE_SERVER,
             key='ERASE_SERVER',
             owner=self.user.institution
         ).first()
@@ -222,9 +234,9 @@ class EraseServerForm(forms.Form):
         if self.instance:
             return
 
-        Annotation.objects.create(
+        UserProperty.objects.create(
             uuid=self.uuid,
-            type=Annotation.Type.ERASE_SERVER,
+            type=UserProperty.Type.ERASE_SERVER,
             key='ERASE_SERVER',
             value=self.erase_server,
             owner=self.user.institution,

evidence/legacy_parse.py

@@ -0,0 +1,74 @@
+import json
+import logging
+
+from dmidecode import DMIParse
+from json_repair import repair_json
+from evidence.mixin_parse import BuildMix
+from evidence.legacy_parse_details import get_lshw_child, ParseSnapshot
+from utils.constants import CHASSIS_DH
+
+
+logger = logging.getLogger('django')
+
+
+def get_mac(lshw):
+    try:
+        if type(lshw) is dict:
+            hw = lshw
+        else:
+            hw = json.loads(lshw)
+    except json.decoder.JSONDecodeError:
+        hw = json.loads(repair_json(lshw))
+
+    nets = []
+    get_lshw_child(hw, nets, 'network')
+
+    nets_sorted = sorted(nets, key=lambda x: x['businfo'])
+
+    if nets_sorted:
+        mac = nets_sorted[0]['serial']
+        logger.debug("The snapshot has the following MAC: %s" , mac)
+        return mac
+
+
+class Build(BuildMix):
+    # This parse is for get info from snapshots created with
+    # workbench-script but builded for send to devicehub-teal
+
+    def get_details(self):
+        dmidecode_raw = self.json["data"]["dmidecode"]
+        self.dmi = DMIParse(dmidecode_raw)
+
+        self.manufacturer = self.dmi.manufacturer().strip()
+        self.model = self.dmi.model().strip()
+        self.chassis = self.get_chassis_dh()
+        self.serial_number = self.dmi.serial_number()
+        self.sku = self.get_sku()
+        self.type = self.chassis
+        self.version = self.get_version()
+
+    def get_chassis_dh(self):
+        chassis = self.get_chassis()
+        lower_type = chassis.lower()
+        for k, v in CHASSIS_DH.items():
+            if lower_type in v:
+                return k
+        return self.default
+
+    def get_sku(self):
+        return self.dmi.get("System")[0].get("SKU Number", "n/a").strip()
+
+    def get_chassis(self):
+        return self.dmi.get("Chassis")[0].get("Type", '_virtual') #
+
+    def get_version(self):
+        return self.dmi.get("System")[0].get("Verson", '_virtual')
+
+    def _get_components(self):
+        data = ParseSnapshot(self.json)
+        self.device = data.device
+        self.components = data.components
+
+        self.device.pop("actions", None)
+        for c in self.components:
+            c.pop("actions", None)

evidence/legacy_parse_details.py

@@ -0,0 +1,503 @@
+import json
+import logging
+import numpy as np
+
+from datetime import datetime
+from dmidecode import DMIParse
+from json_repair import repair_json
+
+from utils.constants import CHASSIS_DH, DATASTORAGEINTERFACE
+
+
+logger = logging.getLogger('django')
+
+
+def get_lshw_child(child, nets, component):
+    try:
+        if child.get('id') == component:
+            nets.append(child)
+        if child.get('children'):
+            [get_lshw_child(x, nets, component) for x in child['children']]
+    except Exception:
+        return []
+
+class ParseSnapshot:
+    def __init__(self, snapshot, default="n/a"):
+        self.default = default
+        self.dmidecode_raw = snapshot["data"].get("dmidecode", "{}")
+        self.smart_raw = snapshot["data"].get("disks", [])
+        self.hwinfo_raw = snapshot["data"].get("hwinfo", "")
+        self.lshw_raw = snapshot["data"].get("lshw", {}) or {}
+        self.lscpi_raw = snapshot["data"].get("lspci", "")
+        self.device = {"actions": []}
+        self.components = []
+        self.monitors = []
+
+        self.dmi = DMIParse(self.dmidecode_raw)
+        self.smart = self.loads(self.smart_raw)
+        self.lshw = self.loads(self.lshw_raw)
+        self.hwinfo = self.parse_hwinfo()
+
+        self.set_computer()
+        self.get_hwinfo_monitors()
+        self.set_components()
+        self.snapshot_json = {
+            "type": "Snapshot",
+            "device": self.device,
+            "software": snapshot["software"],
+            "components": self.components,
+            "uuid": snapshot['uuid'],
+            "version": snapshot['version'],
+            "endTime": snapshot["timestamp"],
+            "elapsed": 1,
+        }
+
+    def set_computer(self):
+        self.device['manufacturer'] = self.dmi.manufacturer().strip()
+        self.device['model'] = self.dmi.model().strip()
+        self.device['serialNumber'] = self.dmi.serial_number()
+        self.device['type'] = self.get_type()
+        self.device['sku'] = self.get_sku()
+        self.device['version'] = self.get_version()
+        self.device['system_uuid'] = self.get_uuid()
+        self.device['family'] = self.get_family()
+        self.device['chassis'] = self.get_chassis_dh()
+
+    def set_components(self):
+        self.get_cpu()
+        self.get_ram()
+        self.get_mother_board()
+        self.get_graphic()
+        self.get_data_storage()
+        self.get_display()
+        self.get_sound_card()
+        self.get_networks()
+
+    def get_cpu(self):
+        for cpu in self.dmi.get('Processor'):
+            serial = cpu.get('Serial Number')
+            if serial == 'Not Specified' or not serial:
+                serial = cpu.get('ID').replace(' ', '')
+            self.components.append(
+                {
+                    "actions": [],
+                    "type": "Processor",
+                    "speed": self.get_cpu_speed(cpu),
+                    "cores": int(cpu.get('Core Count', 1)),
+                    "model": cpu.get('Version'),
+                    "threads": int(cpu.get('Thread Count', 1)),
+                    "manufacturer": cpu.get('Manufacturer'),
+                    "serialNumber": serial,
+                    "brand": cpu.get('Family'),
+                    "address": self.get_cpu_address(cpu),
+                    "bogomips": self.get_bogomips(),
+                }
+            )
+
+    def get_ram(self):
+        for ram in self.dmi.get("Memory Device"):
+            if ram.get('size') == 'No Module Installed':
+                continue
+            if not ram.get("Speed"):
+                continue
+
+            self.components.append(
+                {
+                    "actions": [],
+                    "type": "RamModule",
+                    "size": self.get_ram_size(ram),
+                    "speed": self.get_ram_speed(ram),
+                    "manufacturer": ram.get("Manufacturer", self.default),
+                    "serialNumber": ram.get("Serial Number", self.default),
+                    "interface": ram.get("Type", "DDR"),
+                    "format": ram.get("Form Factor", "DIMM"),
+                    "model": ram.get("Part Number", self.default),
+                }
+            )
+
+    def get_mother_board(self):
+        for moder_board in self.dmi.get("Baseboard"):
+            self.components.append(
+                {
+                    "actions": [],
+                    "type": "Motherboard",
+                    "version": moder_board.get("Version"),
+                    "serialNumber": moder_board.get("Serial Number", "").strip(),
+                    "manufacturer": moder_board.get("Manufacturer", "").strip(),
+                    "biosDate": self.get_bios_date(),
+                    "ramMaxSize": self.get_max_ram_size(),
+                    "ramSlots": len(self.dmi.get("Memory Device")),
+                    "slots": self.get_ram_slots(),
+                    "model": moder_board.get("Product Name", "").strip(),
+                    "firewire": self.get_firmware_num(),
+                    "pcmcia": self.get_pcmcia_num(),
+                    "serial": self.get_serial_num(),
+                    "usb": self.get_usb_num(),
+                }
+            )
+
+    def get_graphic(self):
+        displays = []
+        get_lshw_child(self.lshw, displays, 'display')
+
+        for c in displays:
+            if not c['configuration'].get('driver', None):
+                continue
+
+            self.components.append(
+                {
+                    "actions": [],
+                    "type": "GraphicCard",
+                    "memory": "",
+                    "manufacturer": c.get("vendor", self.default),
+                    "model": c.get("product", self.default),
+                    "serialNumber": c.get("serial", self.default),
+                }
+            )
+
+    def get_data_storage(self):
+        for sm in self.smart:
+            if sm.get('smartctl', {}).get('exit_status') == 1:
+                continue
+            model = sm.get('model_name')
+            manufacturer = None
+            hours = sm.get("power_on_time", {}).get("hours", 0)
+            if model and len(model.split(" ")) > 1:
+                mm = model.split(" ")
+                model = mm[-1]
+                manufacturer = " ".join(mm[:-1])
+
+            self.components.append(
+                {
+                    "actions": self.sanitize(sm),
+                    "type": self.get_data_storage_type(sm),
+                    "model": model,
+                    "manufacturer": manufacturer,
+                    "serialNumber": sm.get('serial_number'),
+                    "size": self.get_data_storage_size(sm),
+                    "variant": sm.get("firmware_version"),
+                    "interface": self.get_data_storage_interface(sm),
+                    "hours": hours,
+                }
+            )
+
+    def sanitize(self, action):
+        return []
+
+    def get_bogomips(self):
+        if not self.hwinfo:
+            return self.default
+
+        bogomips = 0
+        for row in self.hwinfo:
+            for cel in row:
+                if 'BogoMips' in cel:
+                    try:
+                        bogomips += float(cel.split(":")[-1])
+                    except Exception:
+                        pass
+        return bogomips
+
+    def get_networks(self):
+        networks = []
+        get_lshw_child(self.lshw, networks, 'network')
+
+        for c in networks:
+            capacity = c.get('capacity')
+            wireless = bool(c.get('configuration', {}).get('wireless', False))
+            self.components.append(
+                {
+                    "actions": [],
+                    "type": "NetworkAdapter",
+                    "model": c.get('product'),
+                    "manufacturer": c.get('vendor'),
+                    "serialNumber": c.get('serial'),
+                    "speed": capacity,
+                    "variant": c.get('version', 1),
+                    "wireless": wireless or False,
+                    "integrated": "PCI:0000:00" in c.get("businfo", ""),
+                }
+            )
+
+    def get_sound_card(self):
+        multimedias = []
+        get_lshw_child(self.lshw, multimedias, 'multimedia')
+
+        for c in multimedias:
+            self.components.append(
+                {
+                    "actions": [],
+                    "type": "SoundCard",
+                    "model": c.get('product'),
+                    "manufacturer": c.get('vendor'),
+                    "serialNumber": c.get('serial'),
+                }
+            )
+
+    def get_display(self):  # noqa: C901
+        TECHS = 'CRT', 'TFT', 'LED', 'PDP', 'LCD', 'OLED', 'AMOLED'
+
+        for c in self.monitors:
+            resolution_width, resolution_height = (None,) * 2
+            refresh, serial, model, manufacturer, size = (None,) * 5
+            year, week, production_date = (None,) * 3
+
+            for x in c:
+                if "Vendor: " in x:
+                    manufacturer = x.split('Vendor: ')[-1].strip()
+                if "Model: " in x:
+                    model = x.split('Model: ')[-1].strip()
+                if "Serial ID: " in x:
+                    serial = x.split('Serial ID: ')[-1].strip()
+                if "   Resolution: " in x:
+                    rs = x.split('   Resolution: ')[-1].strip()
+                    if 'x' in rs:
+                        resolution_width, resolution_height = [
+                            int(r) for r in rs.split('x')
+                        ]
+                if "Frequencies: " in x:
+                    try:
+                        refresh = int(float(x.split(',')[-1].strip()[:-3]))
+                    except Exception:
+                        pass
+                if 'Year of Manufacture' in x:
+                    year = x.split(': ')[1]
+
+                if 'Week of Manufacture' in x:
+                    week = x.split(': ')[1]
+
+                if "Size: " in x:
+                    size = self.get_size_monitor(x)
+            technology = next((t for t in TECHS if t in c[0]), None)
+
+            if year and week:
+                d = '{} {} 0'.format(year, week)
+                production_date = datetime.strptime(d, '%Y %W %w').isoformat()
+
+            self.components.append(
+                {
+                    "actions": [],
+                    "type": "Display",
+                    "model": model,
+                    "manufacturer": manufacturer,
+                    "serialNumber": serial,
+                    'size': size,
+                    'resolutionWidth': resolution_width,
+                    'resolutionHeight': resolution_height,
+                    "productionDate": production_date,
+                    'technology': technology,
+                    'refreshRate': refresh,
+                }
+            )
+
+    def get_hwinfo_monitors(self):
+        for c in self.hwinfo:
+            monitor = None
+            external = None
+            for x in c:
+                if 'Hardware Class: monitor' in x:
+                    monitor = c
+                if 'Driver Info' in x:
+                    external = c
+
+            if monitor and not external:
+                self.monitors.append(c)
+
+    def get_size_monitor(self, x):
+        i = 1 / 25.4
+        t = x.split('Size: ')[-1].strip()
+        tt = t.split('mm')
+        if not tt:
+            return 0
+        sizes = tt[0].strip()
+        if 'x' not in sizes:
+            return 0
+        w, h = [int(x) for x in sizes.split('x')]
+        return "{:.2f}".format(np.sqrt(w**2 + h**2) * i)
+
+    def get_cpu_address(self, cpu):
+        default = 64
+
+        try:
+            for ch in self.lshw.get('children', []):
+                for c in ch.get('children', []):
+                    if c['class'] == 'processor':
+                        return c.get('width', default)
+        except:
+            return default
+        return default
+
+    def get_usb_num(self):
+        return len(
+            [
+                u
+                for u in self.dmi.get("Port Connector")
+                if "USB" in u.get("Port Type", "").upper()
+            ]
+        )
+
+    def get_serial_num(self):
+        return len(
+            [
+                u
+                for u in self.dmi.get("Port Connector")
+                if "SERIAL" in u.get("Port Type", "").upper()
+            ]
+        )
+
+    def get_firmware_num(self):
+        return len(
+            [
+                u
+                for u in self.dmi.get("Port Connector")
+                if "FIRMWARE" in u.get("Port Type", "").upper()
+            ]
+        )
+
+    def get_pcmcia_num(self):
+        return len(
+            [
+                u
+                for u in self.dmi.get("Port Connector")
+                if "PCMCIA" in u.get("Port Type", "").upper()
+            ]
+        )
+
+    def get_bios_date(self):
+        return self.dmi.get("BIOS")[0].get("Release Date", self.default)
+
+    def get_firmware(self):
+        return self.dmi.get("BIOS")[0].get("Firmware Revision", '1')
+
+    def get_max_ram_size(self):
+        size = 0
+        for slot in self.dmi.get("Physical Memory Array"):
+            capacity = slot.get("Maximum Capacity", '0').split(" ")[0]
+            size += int(capacity)
+
+        return size
+
+    def get_ram_slots(self):
+        slots = 0
+        for x in self.dmi.get("Physical Memory Array"):
+            slots += int(x.get("Number Of Devices", 0))
+        return slots
+
+    def get_ram_size(self, ram):
+        memory = ram.get("Size", "0")
+        return memory
+
+    def get_ram_speed(self, ram):
+        size = ram.get("Speed", "0")
+        return size
+
+    def get_cpu_speed(self, cpu):
+        speed = cpu.get('Max Speed', "0")
+        return speed
+
+    def get_sku(self):
+        return self.dmi.get("System")[0].get("SKU Number", self.default).strip()
+
+    def get_version(self):
+        return self.dmi.get("System")[0].get("Version", self.default).strip()
+
+    def get_uuid(self):
+        return self.dmi.get("System")[0].get("UUID", '').strip()
+
+    def get_family(self):
+        return self.dmi.get("System")[0].get("Family", '')
+
+    def get_chassis(self):
+        return self.dmi.get("Chassis")[0].get("Type", '_virtual')
+
+    def get_type(self):
+        chassis_type = self.get_chassis()
+        return self.translation_to_devicehub(chassis_type)
+
+    def translation_to_devicehub(self, original_type):
+        lower_type = original_type.lower()
+        CHASSIS_TYPE = {
+            'Desktop': [
+                'desktop',
+                'low-profile',
+                'tower',
+                'docking',
+                'all-in-one',
+                'pizzabox',
+                'mini-tower',
+                'space-saving',
+                'lunchbox',
+                'mini',
+                'stick',
+            ],
+            'Laptop': [
+                'portable',
+                'laptop',
+                'convertible',
+                'tablet',
+                'detachable',
+                'notebook',
+                'handheld',
+                'sub-notebook',
+            ],
+            'Server': ['server'],
+            'Computer': ['_virtual'],
+        }
+        for k, v in CHASSIS_TYPE.items():
+            if lower_type in v:
+                return k
+        return self.default
+
+    def get_chassis_dh(self):
+        chassis = self.get_chassis()
+        lower_type = chassis.lower()
+        for k, v in CHASSIS_DH.items():
+            if lower_type in v:
+                return k
+        return self.default
+
+    def get_data_storage_type(self, x):
+        # TODO @cayop add more SSDS types
+        SSDS = ["nvme"]
+        SSD = 'SolidStateDrive'
+        HDD = 'HardDrive'
+        type_dev = x.get('device', {}).get('type')
+        trim = x.get('trim', {}).get("supported") in [True, "true"]
+        return SSD if type_dev in SSDS or trim else HDD
+
+    def get_data_storage_interface(self, x):
+        interface = x.get('device', {}).get('protocol', 'ATA')
+        if interface.upper() in DATASTORAGEINTERFACE:
+            return interface.upper()
+
+        txt = "Sid: {}, interface {} is not in DataStorageInterface Enum".format(
+            self.sid, interface
+        )
+        self.errors("{}".format(txt))
+
+    def get_data_storage_size(self, x):
+        return x.get('user_capacity', {}).get('bytes')
+
+    def parse_hwinfo(self):
+        hw_blocks = self.hwinfo_raw.split("\n\n")
+        return [x.split("\n") for x in hw_blocks]
+
+    def loads(self, x):
+        if isinstance(x, str):
+            try:
+                try:
+                    hw = json.loads(x)
+                except json.decoder.JSONDecodeError:
+                    hw = json.loads(repair_json(x))
+                return hw
+            except Exception as ss:
+                logger.warning("%s", ss)
+                return {}
+        return x
+
+    def errors(self, txt=None):
+        if not txt:
+            return self._errors
+
+        logger.error(txt)
+        self._errors.append("%s", txt)

evidence/management/commands/reindex.py

@@ -5,7 +5,7 @@ import logging
 from django.core.management.base import BaseCommand
 from django.conf import settings
 
-from utils.device import create_annotation, create_doc, create_index
+from utils.device import create_property, create_doc, create_index
 from user.models import Institution
 from evidence.parse import Build
 
@@ -70,7 +70,7 @@ class Command(BaseCommand):
     def build_placeholder(self, s, user, f_path):
             try:
                 create_index(s, user)
-                create_annotation(s, user, commit=True)
+                create_property(s, user, commit=True)
             except Exception as err:
                 txt = "In placeholder %s \n%s"
                 logger.warning(txt, f_path, err)

evidence/management/commands/up_snapshots.py

@@ -4,7 +4,6 @@ import logging
 
 from django.core.management.base import BaseCommand
 from django.contrib.auth import get_user_model
-from django.conf import settings
 
 from utils.save_snapshots import move_json, save_in_disk
 from evidence.parse import Build

evidence/migrations/0003_systemproperty_userproperty_delete_annotation_and_more.py

@@ -0,0 +1,107 @@
+# Generated by Django 5.0.6 on 2024-12-10 19:37
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("evidence", "0002_alter_annotation_type"),
+        ("user", "0001_initial"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="SystemProperty",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created", models.DateTimeField(auto_now_add=True)),
+                ("key", models.CharField(max_length=256)),
+                ("value", models.CharField(max_length=256)),
+                ("uuid", models.UUIDField()),
+                (
+                    "owner",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="user.institution",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+        ),
+        migrations.CreateModel(
+            name="UserProperty",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created", models.DateTimeField(auto_now_add=True)),
+                ("key", models.CharField(max_length=256)),
+                ("value", models.CharField(max_length=256)),
+                ("uuid", models.UUIDField()),
+                (
+                    "type",
+                    models.SmallIntegerField(
+                        choices=[(1, "User"), (2, "Document"), (3, "EraseServer")],
+                        default=1,
+                    ),
+                ),
+                (
+                    "owner",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="user.institution",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+        ),
+        migrations.DeleteModel(
+            name="Annotation",
+        ),
+        migrations.AddConstraint(
+            model_name="systemproperty",
+            constraint=models.UniqueConstraint(
+                fields=("key", "uuid"), name="system_unique_type_key_uuid"
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name="userproperty",
+            constraint=models.UniqueConstraint(
+                fields=("key", "uuid", "type"), name="user_unique_type_key_uuid"
+            ),
+        ),
+    ]

evidence/migrations/0004_remove_userproperty_user_unique_type_key_uuid.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.0.6 on 2024-12-18 12:11
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("evidence", "0003_systemproperty_userproperty_delete_annotation_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name="userproperty",
+            name="user_unique_type_key_uuid",
+        ),
+    ]

evidence/migrations/0005_alter_userproperty_type.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.0.6 on 2025-01-29 11:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("evidence", "0004_remove_userproperty_user_unique_type_key_uuid"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="userproperty",
+            name="type",
+            field=models.SmallIntegerField(
+                choices=[(1, "User"), (2, "EraseServer")], default=1
+            ),
+        ),
+    ]

evidence/migrations/0006_userproperty_userproperty_unique_type_key_uuid.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.0.6 on 2025-01-30 17:52
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('evidence', '0005_alter_userproperty_type'),
+        ('user', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddConstraint(
+            model_name='userproperty',
+            constraint=models.UniqueConstraint(fields=('key', 'uuid'), name='userproperty_unique_type_key_uuid'),
+        ),
+    ]

evidence/mixin_parse.py

@@ -0,0 +1,64 @@
+import logging
+from django.conf import settings
+
+from utils.constants import ALGOS
+
+
+logger = logging.getLogger('django')
+
+
+class BuildMix:
+    def __init__(self, evidence_json):
+        self.json = evidence_json
+        self.uuid = self.json.get('uuid')
+        self.manufacturer = ""
+        self.model = ""
+        self.serial_number = ""
+        self.chassis = ""
+        self.sku = ""
+        self.mac = ""
+        self.type = ""
+        self.version = ""
+        self.default = ""
+        self.algorithms = {}
+        if not self.uuid:
+            logger.error("snapshot without UUID. Software {}".format(self.json.get("software")))
+            return
+        self.get_details()
+        self.generate_chids()
+
+    def get_hid(self, algo):
+        algorithm = ALGOS.get(algo, [])
+        hid = ""
+        for f in algorithm:
+            if hasattr(self, f):
+                hid += getattr(self, f) or ''
+        return hid
+
+    def generate_chids(self):
+        self.algorithms = {}
+        for k in ALGOS.keys():
+            if not settings.DPP and k == 'ereuse22':
+                continue
+
+            self.algorithms[k] = self.get_hid(k)
+
+    def get_doc(self):
+        self._get_components()
+
+        components = sorted(self.components, key=lambda x: x.get("type"))
+        device = self.algorithms.get('ereuse22')
+
+        doc = [("computer", device)]
+
+        for c in components:
+            doc.append((c.get("type"), self.get_id_hw_dpp(c)))
+
+        return doc
+
+    def get_id_hw_dpp(self, d):
+        algorithm = ALGOS.get("ereuse22", [])
+        hid = ""
+        for f in algorithm:
+            hid += d.get(f, '')
+        return hid

evidence/models.py

@@ -4,32 +4,51 @@ import hashlib
 from dmidecode import DMIParse
 from django.db import models
 
+
+from django.db.models import Q
 from utils.constants import STR_EXTEND_SIZE, CHASSIS_DH
 from evidence.xapian import search
-from evidence.parse_details import ParseSnapshot, get_inxi, get_inxi_key
+from evidence.parse_details import ParseSnapshot
+from evidence.normal_parse_details import get_inxi, get_inxi_key
 from user.models import User, Institution
 
 
-class Annotation(models.Model):
-    class Type(models.IntegerChoices):
-        SYSTEM = 0, "System"
-        USER = 1, "User"
-        DOCUMENT = 2, "Document"
-        ERASE_SERVER = 3, "EraseServer"
-
+class Property(models.Model):
     created = models.DateTimeField(auto_now_add=True)
-    uuid = models.UUIDField()
     owner = models.ForeignKey(Institution, on_delete=models.CASCADE)
     user = models.ForeignKey(
         User, on_delete=models.SET_NULL, null=True, blank=True)
-    type = models.SmallIntegerField(choices=Type)
     key = models.CharField(max_length=STR_EXTEND_SIZE)
     value = models.CharField(max_length=STR_EXTEND_SIZE)
 
+    class Meta:
+        #Only for shared behaviour, it is not a table
+        abstract = True
+
+
+class SystemProperty(Property):
+    uuid = models.UUIDField()
+
     class Meta:
         constraints = [
             models.UniqueConstraint(
-                fields=["type", "key", "uuid"], name="unique_type_key_uuid")
+                fields=["key", "uuid"], name="system_unique_type_key_uuid")
+        ]
+
+
+class UserProperty(Property):
+
+    class Type(models.IntegerChoices):
+        USER = 1, "User"
+        ERASE_SERVER = 2, "EraseServer"
+
+    uuid = models.UUIDField()
+    type = models.SmallIntegerField(choices=Type, default=Type.USER)
+
+    class Meta:
+        constraints = [
+            models.UniqueConstraint(
+                fields=["key", "uuid"], name="userproperty_unique_type_key_uuid")
         ]
 
 
@@ -41,22 +60,22 @@ class Evidence:
         self.created = None
         self.dmi = None
         self.inxi = None
-        self.annotations = []
+        self.properties = []
         self.components = []
         self.default = "n/a"
 
         self.get_owner()
         self.get_time()
 
-    def get_annotations(self):
-        self.annotations = Annotation.objects.filter(
+    def get_properties(self):
+        self.properties = SystemProperty.objects.filter(
             uuid=self.uuid
         ).order_by("created")
 
     def get_owner(self):
-        if not self.annotations:
-            self.get_annotations()
-        a = self.annotations.first()
+        if not self.properties:
+            self.get_properties()
+        a = self.properties.first()
         if a:
             self.owner = a.owner
 
@@ -92,7 +111,7 @@ class Evidence:
                     self.inxi = ev["output"]
         else:
             dmidecode_raw = self.doc["data"]["dmidecode"]
-            inxi_raw = self.doc["data"]["inxi"]
+            inxi_raw = self.doc.get("data", {}).get("inxi")
             self.dmi = DMIParse(dmidecode_raw)
             try:
                 self.inxi = json.loads(inxi_raw)
@@ -116,9 +135,11 @@ class Evidence:
         if not self.doc:
             self.get_doc()
         self.created = self.doc.get("endTime")
-
         if not self.created:
-            self.created = self.annotations.last().created
+            self.created = self.get_time_created()
+
+    def get_time_created(self):
+        return self.properties.last().created.isoformat()
 
     def get_components(self):
         if self.is_legacy():
@@ -134,7 +155,7 @@ class Evidence:
             return list(self.doc.get('kv').values())[0]
 
         if self.is_legacy():
-            return self.doc['device']['manufacturer']
+            return self.doc.get('device', {}).get('manufacturer', '')
 
         if self.inxi:
             return self.device_manufacturer
@@ -149,7 +170,7 @@ class Evidence:
             return list(self.doc.get('kv').values())[1]
 
         if self.is_legacy():
-            return self.doc['device']['model']
+            return self.doc.get('device', {}).get('model', '')
 
         if self.inxi:
             return self.device_model
@@ -158,7 +179,7 @@ class Evidence:
 
     def get_chassis(self):
         if self.is_legacy():
-            return self.doc['device']['model']
+            return self.doc.get('device', {}).get('model', '')
 
         if self.inxi:
             return self.device_chassis
@@ -173,7 +194,7 @@ class Evidence:
 
     def get_serial_number(self):
         if self.is_legacy():
-            return self.doc['device']['serialNumber']
+            return self.doc.get('device', {}).get('serialNumber', '')
 
         if self.inxi:
             return self.device_serial_number
@@ -188,15 +209,13 @@ class Evidence:
 
     @classmethod
     def get_all(cls, user):
-        return Annotation.objects.filter(
+        return SystemProperty.objects.filter(
             owner=user.institution,
-            type=Annotation.Type.SYSTEM,
-            key="hidalgo1",
+            key="ereuse24",
         ).order_by("-created").values_list("uuid", "created").distinct()
 
     def set_components(self):
-        snapshot = ParseSnapshot(self.doc).snapshot_json
-        self.components = snapshot['components']
+        self.components = ParseSnapshot(self.doc).components
 
     def is_legacy(self):
         if self.doc.get("credentialSubject"):
@@ -206,3 +225,14 @@ class Evidence:
 
     def is_web_snapshot(self):
         return self.doc.get("type") == "WebSnapshot"
+
+    def did_document(self):
+        if not self.doc.get("credentialSubject"):
+            return ''
+        did = self.doc.get('issuer')
+        if not "did:web" in did:
+            return ''
+
+        return  "https://{}/did.json".format(
+            did.split("did:web:")[1].replace(":", "/")
+        )

evidence/normal_parse.py

@@ -0,0 +1,76 @@
+import json
+import logging
+
+from evidence.mixin_parse import BuildMix
+from evidence.normal_parse_details import get_inxi_key, get_inxi, ParseSnapshot
+
+
+logger = logging.getLogger('django')
+
+
+def get_mac(inxi):
+    nets = get_inxi_key(inxi, "Network")
+    n_nets = len(nets) - 1
+
+    for i in range(0, n_nets):
+        if i + 1 > n_nets:
+            break
+
+        n = nets[i]
+        iface = nets[i + 1]
+        if get_inxi(n, "port"):
+            return get_inxi(iface, 'mac')
+
+
+class Build(BuildMix):
+
+    def get_details(self):
+        self.from_credential()
+        try:
+            self.inxi = self.json["data"]["inxi"]
+            if isinstance(self.inxi, str):
+                self.inxi = json.loads(self.inxi)
+        except Exception:
+            logger.error("No inxi in snapshot %s", self.uuid)
+            return ""
+
+        machine = get_inxi_key(self.inxi, 'Machine')
+        for m in machine:
+            system = get_inxi(m, "System")
+            if system:
+                self.manufacturer = system
+                self.model = get_inxi(m, "product")
+                self.serial_number = get_inxi(m, "serial")
+                self.type = get_inxi(m, "Type")
+                self.chassis = self.type
+                self.version = get_inxi(m, "v")
+            else:
+                self.sku = get_inxi(m, "part-nu")
+
+        self.mac = get_mac(self.inxi) or ""
+        if not self.mac:
+            txt = "Could not retrieve MAC address in snapshot %s"
+            logger.warning(txt, self.uuid)
+
+    def from_credential(self):
+        if not self.json.get("credentialSubject"):
+            return
+
+        self.uuid = self.json.get("credentialSubject", {}).get("uuid")
+        self.json.update(self.json["credentialSubject"])
+        if self.json.get("evidence"):
+            self.json["data"] = {}
+            for ev in self.json["evidence"]:
+                k = ev.get("operation")
+                if not k:
+                    continue
+                self.json["data"][k] = ev.get("output")
+
+    def _get_components(self):
+        data = ParseSnapshot(self.json)
+        self.device = data.device
+        self.components = data.components
+
+        self.device.pop("actions", None)
+        for c in self.components:
+            c.pop("actions", None)

evidence/normal_parse_details.py

@@ -0,0 +1,410 @@
+import json
+import logging
+
+from dmidecode import DMIParse
+
+
+logger = logging.getLogger('django')
+
+
+def get_inxi_key(inxi, component):
+    for n in inxi:
+        for k, v in n.items():
+            if component in k:
+                return v
+
+
+def get_inxi(n, name):
+    for k, v in n.items():
+        if f"#{name}" in k:
+            return v
+
+    return ""
+
+
+class ParseSnapshot:
+    def __init__(self, snapshot, default="n/a"):
+        self.default = default
+        self.dmidecode_raw = snapshot.get("data", {}).get("dmidecode", "{}")
+        self.smart_raw = snapshot.get("data", {}).get("smartctl", [])
+        self.inxi_raw = snapshot.get("data", {}).get("inxi", "") or ""
+        for ev in snapshot.get("evidence", []):
+            if "dmidecode" == ev.get("operation"):
+                self.dmidecode_raw = ev["output"]
+            if "inxi" == ev.get("operation"):
+                self.inxi_raw = ev["output"]
+            if "smartctl" == ev.get("operation"):
+                self.smart_raw = ev["output"]
+        data = snapshot
+        if snapshot.get("credentialSubject"):
+            data = snapshot["credentialSubject"]
+
+        self.device = {"actions": []}
+        self.components = []
+
+        self.dmi = DMIParse(self.dmidecode_raw)
+        self.smart = self.loads(self.smart_raw)
+        self.inxi = self.loads(self.inxi_raw)
+
+        self.set_computer()
+        self.set_components()
+        self.snapshot_json = {
+            "type": "Snapshot",
+            "device": self.device,
+            "software": data["software"],
+            "components": self.components,
+            "uuid": data['uuid'],
+            "endTime": data["timestamp"],
+            "elapsed": 1,
+        }
+
+    def set_computer(self):
+        machine = get_inxi_key(self.inxi, 'Machine') or []
+        for m in machine:
+            system = get_inxi(m, "System")
+            if system:
+                self.device['manufacturer'] = system
+                self.device['model'] = get_inxi(m, "product")
+                self.device['serialNumber'] = get_inxi(m, "serial")
+                self.device['type'] = get_inxi(m, "Type")
+                self.device['chassis'] = self.device['type']
+                self.device['version'] = get_inxi(m, "v")
+            else:
+                self.device['system_uuid'] = get_inxi(m, "uuid")
+                self.device['sku'] = get_inxi(m, "part-nu")
+
+    def set_components(self):
+        self.get_mother_board()
+        self.get_cpu()
+        self.get_ram()
+        self.get_graphic()
+        self.get_display()
+        self.get_networks()
+        self.get_sound_card()
+        self.get_data_storage()
+        self.get_battery()
+
+    def get_mother_board(self):
+        machine = get_inxi_key(self.inxi, 'Machine') or []
+        mb = {"type": "Motherboard",}
+        for m in machine:
+            bios_date = get_inxi(m, "date")
+            if not bios_date:
+                continue
+            mb["manufacturer"] = get_inxi(m, "Mobo")
+            mb["model"] = get_inxi(m, "model")
+            mb["serialNumber"] = get_inxi(m, "serial")
+            mb["version"] = get_inxi(m, "v")
+            mb["biosDate"] = bios_date
+            mb["biosVersion"] = self.get_bios_version()
+            mb["firewire"]: self.get_firmware_num()
+            mb["pcmcia"]: self.get_pcmcia_num()
+            mb["serial"]: self.get_serial_num()
+            mb["usb"]: self.get_usb_num()
+
+            self.get_ram_slots(mb)
+
+        self.components.append(mb)
+
+    def get_ram_slots(self, mb):
+        memory = get_inxi_key(self.inxi, 'Memory') or []
+        for m in memory:
+            slots = get_inxi(m, "slots")
+            if not slots:
+                continue
+            mb["slots"] = slots
+            mb["ramSlots"] = get_inxi(m, "modules")
+            mb["ramMaxSize"] = get_inxi(m, "capacity")
+
+
+    def get_cpu(self):
+        cpu = get_inxi_key(self.inxi, 'CPU') or []
+        cp = {"type": "Processor"}
+        vulnerabilities = []
+        for c in cpu:
+            base = get_inxi(c, "model")
+            if base:
+                cp["model"] = get_inxi(c, "model")
+                cp["arch"] = get_inxi(c, "arch")
+                cp["bits"] = get_inxi(c, "bits")
+                cp["gen"] = get_inxi(c, "gen")
+                cp["family"] = get_inxi(c, "family")
+                cp["date"] = get_inxi(c, "built")
+                continue
+            des = get_inxi(c, "L1")
+            if des:
+                cp["L1"] = des
+                cp["L2"] = get_inxi(c, "L2")
+                cp["L3"] = get_inxi(c, "L3")
+                cp["cpus"] = get_inxi(c, "cpus")
+                cp["cores"] = get_inxi(c, "cores")
+                cp["threads"] = get_inxi(c, "threads")
+                continue
+            bogo = get_inxi(c, "bogomips")
+            if bogo:
+                cp["bogomips"] = bogo
+                cp["base/boost"] = get_inxi(c, "base/boost")
+                cp["min/max"] = get_inxi(c, "min/max")
+                cp["ext-clock"] = get_inxi(c, "ext-clock")
+                cp["volts"] = get_inxi(c, "volts")
+                continue
+            ctype = get_inxi(c, "Type")
+            if ctype:
+                v = {"Type": ctype}
+                status = get_inxi(c, "status")
+                if status:
+                    v["status"] = status
+                mitigation = get_inxi(c, "mitigation")
+                if mitigation:
+                    v["mitigation"] = mitigation
+                vulnerabilities.append(v)
+
+        self.components.append(cp)
+
+
+    def get_ram(self):
+        memory = get_inxi_key(self.inxi, 'Memory') or []
+        mem = {"type": "RamModule"}
+
+        for m in memory:
+            base = get_inxi(m, "System RAM")
+            if base:
+                mem["size"] = get_inxi(m, "total")
+            slot = get_inxi(m, "manufacturer")
+            if slot:
+                mem["manufacturer"] = slot
+                mem["model"] = get_inxi(m, "part-no")
+                mem["serialNumber"] = get_inxi(m, "serial")
+                mem["speed"] = get_inxi(m, "speed")
+                mem["bits"] = get_inxi(m, "data")
+                mem["interface"] = get_inxi(m, "type")
+            module = get_inxi(m, "modules")
+            if module:
+                mem["modules"] = module
+
+        self.components.append(mem)
+
+    def get_graphic(self):
+        graphics = get_inxi_key(self.inxi, 'Graphics') or []
+
+        for c in graphics:
+            if not get_inxi(c, "Device") or not get_inxi(c, "vendor"):
+                continue
+
+            self.components.append(
+                {
+                    "type": "GraphicCard",
+                    "memory": self.get_memory_video(c),
+                    "manufacturer": get_inxi(c, "vendor"),
+                    "model": get_inxi(c, "Device"),
+                    "arch": get_inxi(c, "arch"),
+                    "serialNumber": get_inxi(c, "serial"),
+                    "integrated": True if get_inxi(c, "port") else False
+                }
+            )
+
+    def get_battery(self):
+        bats = get_inxi_key(self.inxi, 'Battery') or []
+        for b in bats:
+            self.components.append(
+                {
+                    "type": "Battery",
+                    "model": get_inxi(b, "model"),
+                    "serialNumber": get_inxi(b, "serial"),
+                    "condition": get_inxi(b, "condition"),
+                    "cycles": get_inxi(b, "cycles"),
+                    "volts": get_inxi(b, "volts")
+                }
+            )
+
+    def get_memory_video(self, c):
+        memory = get_inxi_key(self.inxi, 'Memory') or []
+
+        for m in memory:
+            igpu = get_inxi(m, "igpu")
+            agpu = get_inxi(m, "agpu")
+            ngpu = get_inxi(m, "ngpu")
+            gpu = get_inxi(m, "gpu")
+            if igpu or agpu or gpu or ngpu:
+                return igpu or agpu or gpu or ngpu
+
+        return self.default
+
+    def get_data_storage(self):
+        hdds= get_inxi_key(self.inxi, 'Drives') or []
+        for d in hdds:
+            usb = get_inxi(d, "type")
+            if usb == "USB":
+                continue
+
+            serial = get_inxi(d, "serial")
+            if serial:
+                hd = {
+                    "type": "Storage",
+                    "manufacturer": get_inxi(d, "vendor"),
+                    "model": get_inxi(d, "model"),
+                    "serialNumber": get_inxi(d, "serial"),
+                    "size": get_inxi(d, "size"),
+                    "speed": get_inxi(d, "speed"),
+                    "interface": get_inxi(d, "tech"),
+                    "firmware": get_inxi(d, "fw-rev")
+                }
+                rpm = get_inxi(d, "rpm")
+                if rpm:
+                    hd["rpm"] = rpm
+
+                family = get_inxi(d, "family")
+                if family:
+                    hd["family"] = family
+
+                sata = get_inxi(d, "sata")
+                if sata:
+                    hd["sata"] = sata
+
+                continue
+
+
+            cycles = get_inxi(d, "cycles")
+            if cycles:
+                hd['cycles'] = cycles
+                hd["health"] = get_inxi(d, "health")
+                hd["time of used"] = get_inxi(d, "on")
+                hd["read used"] = get_inxi(d, "read-units")
+                hd["written used"] = get_inxi(d, "written-units")
+
+                self.components.append(hd)
+                continue
+
+            hd = {}
+
+    def sanitize(self, action):
+        return []
+
+    def get_networks(self):
+        nets = get_inxi_key(self.inxi, "Network") or []
+        for i in range(0, len(nets)-1):
+            n = nets[i]
+            model = get_inxi(n, "Device")
+            if not model:
+                continue
+
+            interface = ''
+            for k in n.keys():
+                if "port" in k:
+                    interface = "Integrated"
+                if "pcie" in k:
+                    interface = "PciExpress"
+                if get_inxi(n, "type") == "USB":
+                    interface = "USB"
+
+            manufacturer = get_inxi(n, "manufacturer")
+            speed = get_inxi(n, "speed")
+            mac = ""
+
+            if len(nets) > i+1:
+                iface = nets[i+1]
+                mac = get_inxi(iface, 'mac')
+                if not speed:
+                    speed = get_inxi(iface, "speed")
+
+            self.components.append({
+                    "type": "NetworkAdapter",
+                    "model": model,
+                    "manufacturer": manufacturer,
+                    "serialNumber": mac,
+                    "speed": speed,
+                    "interface": interface,
+                })
+
+
+    def get_sound_card(self):
+        audio = get_inxi_key(self.inxi, "Audio") or []
+
+        for c in audio:
+            model = get_inxi(c, "Device")
+            if not model:
+                continue
+
+            self.components.append(
+                {
+                    "type": "SoundCard",
+                    "model": model,
+                    "manufacturer": get_inxi(c, 'vendor'),
+                    "serialNumber": get_inxi(c, 'serial'),
+                }
+            )
+
+    def get_display(self):
+        graphics = get_inxi_key(self.inxi, "Graphics") or []
+        for c in graphics:
+            if not get_inxi(c, "Monitor"):
+                continue
+
+            self.components.append(
+                {
+                    "type": "Display",
+                    "model": get_inxi(c, "model"),
+                    "manufacturer": get_inxi(c, "vendor"),
+                    "serialNumber": get_inxi(c, "serial"),
+                    'size': get_inxi(c, "size"),
+                    'diagonal': get_inxi(c, "diag"),
+                    'resolution': get_inxi(c, "res"),
+                    "date": get_inxi(c, "built"),
+                    'ratio': get_inxi(c, "ratio"),
+                }
+            )
+
+    def get_usb_num(self):
+        return len(
+            [
+                u
+                for u in self.dmi.get("Port Connector")
+                if "USB" in u.get("Port Type", "").upper()
+            ]
+        )
+
+    def get_serial_num(self):
+        return len(
+            [
+                u
+                for u in self.dmi.get("Port Connector")
+                if "SERIAL" in u.get("Port Type", "").upper()
+            ]
+        )
+
+    def get_firmware_num(self):
+        return len(
+            [
+                u
+                for u in self.dmi.get("Port Connector")
+                if "FIRMWARE" in u.get("Port Type", "").upper()
+            ]
+        )
+
+    def get_pcmcia_num(self):
+        return len(
+            [
+                u
+                for u in self.dmi.get("Port Connector")
+                if "PCMCIA" in u.get("Port Type", "").upper()
+            ]
+        )
+
+    def get_bios_version(self):
+        return self.dmi.get("BIOS")[0].get("BIOS Revision", '1')
+
+    def loads(self, x):
+        if isinstance(x, str):
+            try:
+                return json.loads(x)
+            except Exception as ss:
+                logger.warning("%s", ss)
+                return {}
+        return x
+
+    def errors(self, txt=None):
+        if not txt:
+            return self._errors
+
+        logger.error(txt)
+        self._errors.append("%s", txt)

evidence/old_parse.py

@@ -0,0 +1,28 @@
+import logging
+
+from evidence.mixin_parse import BuildMix
+
+
+logger = logging.getLogger('django')
+
+
+class Build(BuildMix):
+    # This parse is for get info from snapshots created with old workbench
+    # normaly is worbench 11
+
+    def get_details(self):
+        self.device = self.json.get('device', {})
+        self.manufacturer = self.device.get("manufacturer", '')
+        self.model = self.device.get("model", '')
+        self.chassis = self.device.get("chassis", '')
+        self.serial_number = self.device.get("serialNumber", '')
+        self.sku = self.device.get("sku", '')
+        self.type = self.device.get("type", '')
+        self.version = self.device.get("version", '')
+
+    def _get_components(self):
+        self.components = self.json.get("components", [])
+
+        self.device.pop("actions", None)
+        for c in self.components:
+            c.pop("actions", None)

evidence/old_parse_details.py

@@ -0,0 +1,13 @@
+import logging
+
+
+logger = logging.getLogger('django')
+
+
+class ParseSnapshot:
+    def __init__(self, snapshot, default="n/a"):
+        self.default = default
+        self.snapshot_json = snapshot
+
+        self.device = snapshot.get("device")
+        self.components = snapshot.get("components")

evidence/parse.py

@@ -2,12 +2,14 @@ import json
 import hashlib
 import logging
 
-from dmidecode import DMIParse
+from evidence import legacy_parse
+from evidence import old_parse
+from evidence import normal_parse
 from evidence.parse_details import ParseSnapshot
 
-from evidence.models import Annotation
+from evidence.models import SystemProperty
 from evidence.xapian import index
-from evidence.parse_details import get_inxi_key, get_inxi
+from evidence.normal_parse_details import get_inxi_key, get_inxi
 from django.conf import settings
 
 if settings.DPP:
@@ -24,32 +26,38 @@ def get_mac(inxi):
         if get_inxi(n, "port"):
             return get_inxi(iface, 'mac')
 
-
 class Build:
     def __init__(self, evidence_json, user, check=False):
+        """
+        This Build do the save in xapian as document, in Annotations and do
+        register in dlt if is configured for that.
+
+        We have 4 cases for parser diferents snapshots than come from workbench.
+        1) worbench 11 is old_parse.
+        2) legacy is the worbench-script when create a snapshot for devicehub-teal
+        3) some snapshots come as a credential. In this case is parsed as normal_parse
+        4) normal snapshot from worbench-script is the most basic and is parsed as normal_parse
+        """
         self.evidence = evidence_json.copy()
-        self.json = evidence_json.copy()
+        self.uuid = self.evidence.get('uuid')
+        self.user = user
 
         if evidence_json.get("credentialSubject"):
-            self.json.update(evidence_json["credentialSubject"])
-        if evidence_json.get("evidence"):
-            self.json["data"] = {}
-            for ev in evidence_json["evidence"]:
-                k = ev.get("operation")
-                if not k:
-                    continue
-                self.json["data"][k] = ev.get("output")
-
-        self.uuid = self.json['uuid']
-        self.user = user
-        self.hid = None
-        self.chid = None
-        self.phid = self.get_signature(self.json)
-        self.generate_chids()
+            self.build = normal_parse.Build(evidence_json)
+            self.uuid = evidence_json.get("credentialSubject", {}).get("uuid")
+        elif evidence_json.get("software") != "workbench-script":
+            self.build = old_parse.Build(evidence_json)
+        elif evidence_json.get("data",{}).get("lshw"):
+            self.build = legacy_parse.Build(evidence_json)
+        else:
+            self.build = normal_parse.Build(evidence_json)
 
         if check:
             return
 
+        if not self.build.uuid:
+            return
+
         self.index()
         self.create_annotations()
         if settings.DPP:
@@ -59,125 +67,32 @@ class Build:
         snap = json.dumps(self.evidence)
         index(self.user.institution, self.uuid, snap)
 
-    def generate_chids(self):
-        self.algorithms = {
-            'hidalgo1': self.get_hid_14(),
-            'legacy_dpp': self.get_chid_dpp(),
-        }
-
-    def get_hid_14(self):
-        if self.json.get("software") == "workbench-script":
-            hid = self.get_hid(self.json)
-        else:
-            device = self.json['device']
-            manufacturer = device.get("manufacturer", '')
-            model = device.get("model", '')
-            chassis = device.get("chassis", '')
-            serial_number = device.get("serialNumber", '')
-            sku = device.get("sku", '')
-            hid = f"{manufacturer}{model}{chassis}{serial_number}{sku}"
-
-        self.chid = hashlib.sha3_256(hid.encode()).hexdigest()
-        return self.chid
-
-    def get_chid_dpp(self):
-        if self.json.get("software") == "workbench-script":
-            device = ParseSnapshot(self.json).device
-        else:
-            device = self.json['device']
-
-        hid = self.get_id_hw_dpp(device)
-        self.chid = hashlib.sha3_256(hid.encode("utf-8")).hexdigest()
-        return self.chid
-
-    def get_id_hw_dpp(self, d):
-        manufacturer = d.get("manufacturer", '')
-        model = d.get("model", '')
-        chassis = d.get("chassis", '')
-        serial_number = d.get("serialNumber", '')
-        sku = d.get("sku", '')
-        typ = d.get("type", '')
-        version = d.get("version", '')
-
-        return f"{manufacturer}{model}{chassis}{serial_number}{sku}{typ}{version}"
-
-    def get_phid(self):
-        if self.json.get("software") == "workbench-script":
-            data = ParseSnapshot(self.json)
-            self.device = data.device
-            self.components = data.components
-        else:
-            self.device = self.json.get("device")
-            self.components = self.json.get("components", [])
-
-        self.device.pop("actions", None)
-        for c in self.components:
-            c.pop("actions", None)
-
-        device = self.get_id_hw_dpp(self.device)
-        components = sorted(self.components, key=lambda x: x.get("type"))
-        doc = [("computer", device)]
-
-        for c in components:
-            doc.append((c.get("type"), self.get_id_hw_dpp(c)))
-
-        return doc
-
     def create_annotations(self):
-        annotation = Annotation.objects.filter(
+        prop = SystemProperty.objects.filter(
                 uuid=self.uuid,
                 owner=self.user.institution,
-                type=Annotation.Type.SYSTEM,
         )
 
-        if annotation:
+        if prop:
             txt = "Warning: Snapshot %s already registered (annotation exists)"
             logger.warning(txt, self.uuid)
             return
 
-        for k, v in self.algorithms.items():
-            Annotation.objects.create(
+        for k, v in self.build.algorithms.items():
+            SystemProperty.objects.create(
                 uuid=self.uuid,
                 owner=self.user.institution,
                 user=self.user,
-                type=Annotation.Type.SYSTEM,
                 key=k,
-                value=v
+                value=self.sign(v)
             )
 
-    def get_hid(self, snapshot):
-        try:
-            self.inxi = self.json["data"]["inxi"]
-            if isinstance(self.inxi, str):
-                self.inxi = json.loads(self.inxi)
-        except Exception:
-            logger.error("No inxi in snapshot %s", self.uuid)
-            return ""
-
-        machine = get_inxi_key(self.inxi, 'Machine')
-        for m in machine:
-            system = get_inxi(m, "System")
-            if system:
-                manufacturer = system
-                model = get_inxi(m, "product")
-                serial_number = get_inxi(m, "serial")
-                chassis = get_inxi(m, "Type")
-            else:
-                sku = get_inxi(m, "part-nu")
-
-        mac = get_mac(self.inxi) or ""
-        if not mac:
-            txt = "Could not retrieve MAC address in snapshot %s"
-            logger.warning(txt, snapshot['uuid'])
-            return f"{manufacturer}{model}{chassis}{serial_number}{sku}"
-
-        return f"{manufacturer}{model}{chassis}{serial_number}{sku}{mac}"
-
-    def get_signature(self, doc):
-        return hashlib.sha3_256(json.dumps(doc).encode()).hexdigest()
+    def sign(self, doc):
+        return hashlib.sha3_256(doc.encode()).hexdigest()
 
     def register_device_dlt(self):
-        chid = self.algorithms.get('legacy_dpp')
-        phid = self.get_signature(self.get_phid())
+        legacy_dpp = self.build.algorithms.get('ereuse22')
+        chid = self.sign(legacy_dpp)
+        phid = self.sign(json.dumps(self.build.get_doc()))
         register_device_dlt(chid, phid, self.uuid, self.user)
         register_passport_dlt(chid, phid, self.uuid, self.user)

evidence/parse_details.py

@@ -1,407 +1,38 @@
-import re
-import json
 import logging
-import numpy as np
 
-from datetime import datetime
-from dmidecode import DMIParse
-
-from utils.constants import CHASSIS_DH, DATASTORAGEINTERFACE
+from evidence import (
+    legacy_parse_details,
+    normal_parse_details,
+    old_parse_details
+)
 
 
 logger = logging.getLogger('django')
 
 
-def get_inxi_key(inxi, component):
-    for n in inxi:
-        for k, v in n.items():
-            if component in k:
-                return v
-
-
-def get_inxi(n, name):
-    for k, v in n.items():
-        if f"#{name}" in k:
-            return v
-
-    return ""
-
-
 class ParseSnapshot:
     def __init__(self, snapshot, default="n/a"):
-        self.default = default
-        self.dmidecode_raw = snapshot.get("data", {}).get("dmidecode", "{}")
-        self.smart_raw = snapshot.get("data", {}).get("smartctl", [])
-        self.inxi_raw = snapshot.get("data", {}).get("inxi", "") or ""
-        for ev in snapshot.get("evidence", []):
-            if "dmidecode" == ev.get("operation"):
-                self.dmidecode_raw = ev["output"]
-            if "inxi" == ev.get("operation"):
-                self.inxi_raw = ev["output"]
-            if "smartctl" == ev.get("operation"):
-                self.smart_raw = ev["output"]
-        data = snapshot
-        if snapshot.get("credentialSubject"):
-            data = snapshot["credentialSubject"]
+       if snapshot.get("credentialSubject"):
+           self.build = normal_parse_details.ParseSnapshot(
+               snapshot,
+               default=default
+           )
+       elif snapshot.get("software") != "workbench-script":
+           self.build = old_parse_details.ParseSnapshot(
+               snapshot,
+               default=default
+           )
+       elif snapshot.get("data",{}).get("lshw"):
+           self.build = legacy_parse_details.ParseSnapshot(
+               snapshot,
+               default=default
+           )
+       else:
+           self.build = normal_parse_details.ParseSnapshot(
+               snapshot,
+               default=default
+           )
 
-        self.device = {"actions": []}
-        self.components = []
-
-        self.dmi = DMIParse(self.dmidecode_raw)
-        self.smart = self.loads(self.smart_raw)
-        self.inxi = self.loads(self.inxi_raw)
-
-        self.set_computer()
-        self.set_components()
-        self.snapshot_json = {
-            "type": "Snapshot",
-            "device": self.device,
-            "software": data["software"],
-            "components": self.components,
-            "uuid": data['uuid'],
-            "endTime": data["timestamp"],
-            "elapsed": 1,
-        }
-
-    def set_computer(self):
-        machine = get_inxi_key(self.inxi, 'Machine') or []
-        for m in machine:
-            system = get_inxi(m, "System")
-            if system:
-                self.device['manufacturer'] = system
-                self.device['model'] = get_inxi(m, "product")
-                self.device['serialNumber'] = get_inxi(m, "serial")
-                self.device['type'] = get_inxi(m, "Type")
-                self.device['chassis'] = self.device['type']
-                self.device['version'] = get_inxi(m, "v")
-            else:
-                self.device['system_uuid'] = get_inxi(m, "uuid")
-                self.device['sku'] = get_inxi(m, "part-nu")
-
-    def set_components(self):
-        self.get_mother_board()
-        self.get_cpu()
-        self.get_ram()
-        self.get_graphic()
-        self.get_display()
-        self.get_networks()
-        self.get_sound_card()
-        self.get_data_storage()
-        self.get_battery()
-
-    def get_mother_board(self):
-        machine = get_inxi_key(self.inxi, 'Machine') or []
-        mb = {"type": "Motherboard",}
-        for m in machine:
-            bios_date = get_inxi(m, "date")
-            if not bios_date:
-                continue
-            mb["manufacturer"] = get_inxi(m, "Mobo")
-            mb["model"] = get_inxi(m, "model")
-            mb["serialNumber"] = get_inxi(m, "serial")
-            mb["version"] = get_inxi(m, "v")
-            mb["biosDate"] = bios_date
-            mb["biosVersion"] = self.get_bios_version()
-            mb["firewire"]: self.get_firmware_num()
-            mb["pcmcia"]: self.get_pcmcia_num()
-            mb["serial"]: self.get_serial_num()
-            mb["usb"]: self.get_usb_num()
-
-            self.get_ram_slots(mb)
-
-        self.components.append(mb)
-
-    def get_ram_slots(self, mb):
-        memory = get_inxi_key(self.inxi, 'Memory') or []
-        for m in memory:
-            slots = get_inxi(m, "slots")
-            if not slots:
-                continue
-            mb["slots"] = slots
-            mb["ramSlots"] = get_inxi(m, "modules")
-            mb["ramMaxSize"] = get_inxi(m, "capacity")
-
-
-    def get_cpu(self):
-        cpu = get_inxi_key(self.inxi, 'CPU') or []
-        cp = {"type": "Processor"}
-        vulnerabilities = []
-        for c in cpu:
-            base = get_inxi(c, "model")
-            if base:
-                cp["model"] = get_inxi(c, "model")
-                cp["arch"] = get_inxi(c, "arch")
-                cp["bits"] = get_inxi(c, "bits")
-                cp["gen"] = get_inxi(c, "gen")
-                cp["family"] = get_inxi(c, "family")
-                cp["date"] = get_inxi(c, "built")
-                continue
-            des = get_inxi(c, "L1")
-            if des:
-                cp["L1"] = des
-                cp["L2"] = get_inxi(c, "L2")
-                cp["L3"] = get_inxi(c, "L3")
-                cp["cpus"] = get_inxi(c, "cpus")
-                cp["cores"] = get_inxi(c, "cores")
-                cp["threads"] = get_inxi(c, "threads")
-                continue
-            bogo = get_inxi(c, "bogomips")
-            if bogo:
-                cp["bogomips"] = bogo
-                cp["base/boost"] = get_inxi(c, "base/boost")
-                cp["min/max"] = get_inxi(c, "min/max")
-                cp["ext-clock"] = get_inxi(c, "ext-clock")
-                cp["volts"] = get_inxi(c, "volts")
-                continue
-            ctype = get_inxi(c, "Type")
-            if ctype:
-                v = {"Type": ctype}
-                status = get_inxi(c, "status")
-                if status:
-                    v["status"] = status
-                mitigation = get_inxi(c, "mitigation")
-                if mitigation:
-                    v["mitigation"] = mitigation
-                vulnerabilities.append(v)
-
-        self.components.append(cp)
-
-
-    def get_ram(self):
-        memory = get_inxi_key(self.inxi, 'Memory') or []
-        mem = {"type": "RamModule"}
-
-        for m in memory:
-            base = get_inxi(m, "System RAM")
-            if base:
-                mem["size"] = get_inxi(m, "total")
-            slot = get_inxi(m, "manufacturer")
-            if slot:
-                mem["manufacturer"] = slot
-                mem["model"] = get_inxi(m, "part-no")
-                mem["serialNumber"] = get_inxi(m, "serial")
-                mem["speed"] = get_inxi(m, "speed")
-                mem["bits"] = get_inxi(m, "data")
-                mem["interface"] = get_inxi(m, "type")
-            module = get_inxi(m, "modules")
-            if module:
-                mem["modules"] = module
-
-        self.components.append(mem)
-
-    def get_graphic(self):
-        graphics = get_inxi_key(self.inxi, 'Graphics') or []
-
-        for c in graphics:
-            if not get_inxi(c, "Device") or not get_inxi(c, "vendor"):
-                continue
-
-            self.components.append(
-                {
-                    "type": "GraphicCard",
-                    "memory": self.get_memory_video(c),
-                    "manufacturer": get_inxi(c, "vendor"),
-                    "model": get_inxi(c, "Device"),
-                    "arch": get_inxi(c, "arch"),
-                    "serialNumber": get_inxi(c, "serial"),
-                    "integrated": True if get_inxi(c, "port") else False
-                }
-            )
-
-    def get_battery(self):
-        bats = get_inxi_key(self.inxi, 'Battery') or []
-        for b in bats:
-            self.components.append(
-                {
-                    "type": "Battery",
-                    "model": get_inxi(b, "model"),
-                    "serialNumber": get_inxi(b, "serial"),
-                    "condition": get_inxi(b, "condition"),
-                    "cycles": get_inxi(b, "cycles"),
-                    "volts": get_inxi(b, "volts")
-                }
-            )
-
-    def get_memory_video(self, c):
-        memory = get_inxi_key(self.inxi, 'Memory') or []
-
-        for m in memory:
-            igpu = get_inxi(m, "igpu")
-            agpu = get_inxi(m, "agpu")
-            ngpu = get_inxi(m, "ngpu")
-            gpu = get_inxi(m, "gpu")
-            if igpu or agpu or gpu or ngpu:
-                return igpu or agpu or gpu or ngpu
-
-        return self.default
-
-    def get_data_storage(self):
-        hdds= get_inxi_key(self.inxi, 'Drives') or []
-        for d in hdds:
-            usb = get_inxi(d, "type")
-            if usb == "USB":
-                continue
-
-            serial = get_inxi(d, "serial")
-            if serial:
-                hd = {
-                    "type": "Storage",
-                    "manufacturer": get_inxi(d, "vendor"),
-                    "model": get_inxi(d, "model"),
-                    "serialNumber": get_inxi(d, "serial"),
-                    "size": get_inxi(d, "size"),
-                    "speed": get_inxi(d, "speed"),
-                    "interface": get_inxi(d, "tech"),
-                    "firmware": get_inxi(d, "fw-rev")
-                }
-                rpm = get_inxi(d, "rpm")
-                if rpm:
-                    hd["rpm"] = rpm
-
-                family = get_inxi(d, "family")
-                if family:
-                    hd["family"] = family
-
-                sata = get_inxi(d, "sata")
-                if sata:
-                    hd["sata"] = sata
-
-                continue
-
-
-            cycles = get_inxi(d, "cycles")
-            if cycles:
-                hd['cycles'] = cycles
-                hd["health"] = get_inxi(d, "health")
-                hd["time of used"] = get_inxi(d, "on")
-                hd["read used"] = get_inxi(d, "read-units")
-                hd["written used"] = get_inxi(d, "written-units")
-
-                self.components.append(hd)
-                continue
-
-            hd = {}
-
-    def sanitize(self, action):
-        return []
-
-    def get_networks(self):
-        nets = get_inxi_key(self.inxi, "Network") or []
-        networks = [(nets[i], nets[i + 1]) for i in range(0, len(nets) - 1, 2)]
-
-        for n, iface in networks:
-            model = get_inxi(n, "Device")
-            if not model:
-                continue
-
-            interface = ''
-            for k in n.keys():
-                if "port" in k:
-                    interface = "Integrated"
-                if "pcie" in k:
-                    interface = "PciExpress"
-                if get_inxi(n, "type") == "USB":
-                    interface = "USB"
-
-            self.components.append(
-                {
-                    "type": "NetworkAdapter",
-                    "model": model,
-                    "manufacturer": get_inxi(n, 'vendor'),
-                    "serialNumber": get_inxi(iface, 'mac'),
-                    "speed": get_inxi(n, "speed"),
-                    "interface": interface,
-                }
-            )
-
-    def get_sound_card(self):
-        audio = get_inxi_key(self.inxi, "Audio") or []
-
-        for c in audio:
-            model = get_inxi(c, "Device")
-            if not model:
-                continue
-
-            self.components.append(
-                {
-                    "type": "SoundCard",
-                    "model": model,
-                    "manufacturer": get_inxi(c, 'vendor'),
-                    "serialNumber": get_inxi(c, 'serial'),
-                }
-            )
-
-    def get_display(self):
-        graphics = get_inxi_key(self.inxi, "Graphics") or []
-        for c in graphics:
-            if not get_inxi(c, "Monitor"):
-                continue
-
-            self.components.append(
-                {
-                    "type": "Display",
-                    "model": get_inxi(c, "model"),
-                    "manufacturer": get_inxi(c, "vendor"),
-                    "serialNumber": get_inxi(c, "serial"),
-                    'size': get_inxi(c, "size"),
-                    'diagonal': get_inxi(c, "diag"),
-                    'resolution': get_inxi(c, "res"),
-                    "date": get_inxi(c, "built"),
-                    'ratio': get_inxi(c, "ratio"),
-                }
-            )
-
-    def get_usb_num(self):
-        return len(
-            [
-                u
-                for u in self.dmi.get("Port Connector")
-                if "USB" in u.get("Port Type", "").upper()
-            ]
-        )
-
-    def get_serial_num(self):
-        return len(
-            [
-                u
-                for u in self.dmi.get("Port Connector")
-                if "SERIAL" in u.get("Port Type", "").upper()
-            ]
-        )
-
-    def get_firmware_num(self):
-        return len(
-            [
-                u
-                for u in self.dmi.get("Port Connector")
-                if "FIRMWARE" in u.get("Port Type", "").upper()
-            ]
-        )
-
-    def get_pcmcia_num(self):
-        return len(
-            [
-                u
-                for u in self.dmi.get("Port Connector")
-                if "PCMCIA" in u.get("Port Type", "").upper()
-            ]
-        )
-
-    def get_bios_version(self):
-        return self.dmi.get("BIOS")[0].get("BIOS Revision", '1')
-
-    def loads(self, x):
-        if isinstance(x, str):
-            try:
-                return json.loads(x)
-            except Exception as ss:
-                logger.warning("%s", ss)
-                return {}
-        return x
-
-    def errors(self, txt=None):
-        if not txt:
-            return self._errors
-
-        logger.error(txt)
-        self._errors.append("%s", txt)
+       self.default = default
+       self.device = self.build.snapshot_json.get("device")
+       self.components = self.build.snapshot_json.get("components")

evidence/serializers.py

@@ -1,43 +0,0 @@
-from rest_framework import serializers
-from evidence.models import EvidenceJson
-
-import json
-
-from django.views.decorators.csrf import csrf_exempt
-from django.http import JsonResponse
-from evidence.parse import Parse
-
-class EvidenceSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = EvidenceJson
-        fields = ['id', 'title', 'content']
-
-@csrf_exempt
-def webhook_verify(request):
-    if request.method == 'POST':
-        auth_header = request.headers.get('Authorization')
-        if not auth_header or not auth_header.startswith('Bearer '):
-            return JsonResponse({'error': 'Invalid authorization'}, status=401)
-
-        token = auth_header.split(' ')[1]
-        tk = Token.objects.filter(token=token).first()
-        if not tk:
-            return JsonResponse({'error': 'Invalid authorization'}, status=401)
-
-        try:
-            data = json.loads(request.body)
-        except json.JSONDecodeError:
-            return JsonResponse({'error': 'Invalid JSON'}, status=400)
-
-        try:
-            device = Parse(data)
-        except Exception:
-            return JsonResponse({'error': 'Invalid JSON'}, status=400)
-
-        if not device:
-            return JsonResponse({'error': 'Invalid JSON'}, status=400)
-        
-        return JsonResponse({"result": "Ok"}, status=200)
-
-
-    return JsonResponse({'error': 'Invalid request method'}, status=400)

evidence/templates/ev_details.html

@@ -45,9 +45,8 @@
             </th>
           </tr>
         </thead>
-        {% for snap in object.annotations %}
+        {% for snap in object.properties %}
         <tbody>
-        {% if snap.type == 0 %}
           <tr>
             <td>
               {{ snap.key }}
@@ -63,7 +62,6 @@
               </small>
             </td>
           </tr>
-        {% endif %}
         </tbody>
         {% endfor %}
       </table>
@@ -94,7 +92,7 @@
 	    </div>
 	    {% if form.tag.value %}
 	    <div class="col-1">
-	      <a class="btn btn-yellow" href="{% url 'evidence:delete_annotation' form.pk %}">{% translate "Delete" %}</a>
+	      <a class="btn btn-yellow" href="{% url 'evidence:delete_tag' form.pk %}">{% translate "Delete" %}</a>
 	    </div>
 	    {% endif %}
 	  </div>

evidence/templates/upload.html

@@ -22,7 +22,7 @@
 
 {% bootstrap_form form alert_error_type="none" error_css_class="alert alert-danger alert-icon alert-icon-border" %}
       <div class="form-actions-no-box">
-  <a class="btn btn-grey"       href="{% url 'dashboard:unassigned_devices' %}">{% translate "Cancel" %}</a>
+  <a class="btn btn-grey"       href="{% url 'dashboard:unassigned' %}">{% translate "Cancel" %}</a>
   <input class="btn btn-green-admin" type="submit" name="submit" value="{% translate 'Save' %}" />
 </div>
 

evidence/urls.py

@@ -20,5 +20,5 @@ urlpatterns = [
     path("<uuid:pk>", views.EvidenceView.as_view(), name="details"),
     path("<uuid:pk>/eraseserver", views.EraseServerView.as_view(), name="erase_server"),
     path("<uuid:pk>/download", views.DownloadEvidenceView.as_view(), name="download"),
-    path('annotation/<int:pk>/del', views.AnnotationDeleteView.as_view(), name='delete_annotation'),
+    path("tag/<str:pk>/delete", views.DeleteEvidenceTagView.as_view(), name="delete_tag"),
 ]

evidence/views.py

@@ -12,8 +12,9 @@ from django.views.generic.edit import (
     FormView,
 )
 
+from action.models import DeviceLog
 from dashboard.mixins import  DashboardView, Http403
-from evidence.models import Evidence, Annotation
+from evidence.models import SystemProperty, UserProperty, Evidence
 from evidence.forms import (
     UploadForm,
     UserTagForm,
@@ -95,7 +96,7 @@ class EvidenceView(DashboardView, FormView):
         if self.object.owner != self.request.user.institution:
             raise Http403
 
-        self.object.get_annotations()
+        self.object.get_properties()
         return super().get(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
@@ -141,33 +142,6 @@ class DownloadEvidenceView(DashboardView, TemplateView):
         return response
 
 
-class AnnotationDeleteView(DashboardView, DeleteView):
-    model = Annotation
-
-    def get(self, request, *args, **kwargs):
-        self.pk = kwargs['pk']
-
-        try:
-            referer = self.request.META["HTTP_REFERER"]
-            path_referer = urlparse(referer).path
-            resolver_match = resolve(path_referer)
-            url_name = resolver_match.view_name
-            kwargs_view = resolver_match.kwargs
-        except:
-            # if is not possible resolve the reference path return 404
-            raise Http404
-
-        self.object = get_object_or_404(
-            self.model,
-            pk=self.pk,
-            owner=self.request.user.institution
-        )
-        self.object.delete()
-
-
-        return redirect(url_name, **kwargs_view)
-
-
 class EraseServerView(DashboardView, FormView):
     template_name = "ev_eraseserver.html"
     section = "evidences"
@@ -182,7 +156,7 @@ class EraseServerView(DashboardView, FormView):
         if self.object.owner != self.request.user.institution:
             raise Http403
 
-        self.object.get_annotations()
+        self.object.get_properties()
         return super().get(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
@@ -211,3 +185,35 @@ class EraseServerView(DashboardView, FormView):
     def get_success_url(self):
         success_url = reverse_lazy('evidence:details', args=[self.pk])
         return success_url
+
+
+class DeleteEvidenceTagView(DashboardView, DeleteView):
+    model = SystemProperty
+
+    def get_queryset(self):
+        # only those with 'CUSTOM_ID'
+        return SystemProperty.objects.filter(owner=self.request.user.institution, key='CUSTOM_ID')
+
+    def get(self, request, *args, **kwargs):
+        self.object = self.get_object()
+
+        message = _("<Deleted> Evidence Tag: {}").format(self.object.value) 
+        DeviceLog.objects.create(
+            snapshot_uuid=self.object.uuid,
+            event=message,
+            user=self.request.user,
+            institution=self.request.user.institution
+        )
+        self.object.delete()        
+
+        messages.info(self.request, _("Evicende Tag deleted successfully."))
+        return self.handle_success()
+
+    def handle_success(self):
+        return redirect(self.get_success_url())
+
+    def get_success_url(self):
+        return self.request.META.get(
+            'HTTP_REFERER', 
+            reverse_lazy('evidence:details', args=[self.object.uuid])
+        )

login/views.py

@@ -17,17 +17,17 @@ class LoginView(auth_views.LoginView):
     template_name = 'login.html'
     extra_context = {
         'title': _('Login'),
-        'success_url': reverse_lazy('dashboard:unassigned_devices'),
+        'success_url': reverse_lazy('dashboard:unassigned'),
         'commit_id': settings.COMMIT,
     }
 
     def get(self, request, *args, **kwargs):
         self.extra_context['success_url'] = request.GET.get(
             'next',
-            reverse_lazy('dashboard:unassigned_devices')
+            reverse_lazy('dashboard:unassigned')
         )
         if not self.request.user.is_anonymous:
-            return redirect(reverse_lazy('dashboard:unassigned_devices'))
+            return redirect(reverse_lazy('dashboard:unassigned'))
 
         return super().get(request, *args, **kwargs)
 
@@ -72,4 +72,3 @@ class PasswordResetView(auth_views.PasswordResetView):
         except Exception as err:
             logger.error(err)
         return HttpResponseRedirect(self.success_url)
-

lot/migrations/0003_lotproperty_delete_lotannotation_and_more.py

@@ -0,0 +1,77 @@
+# Generated by Django 5.0.6 on 2024-12-10 19:37
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("lot", "0002_alter_lot_closed"),
+        ("user", "0001_initial"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="LotProperty",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created", models.DateTimeField(auto_now_add=True)),
+                ("key", models.CharField(max_length=256)),
+                ("value", models.CharField(max_length=256)),
+                (
+                    "type",
+                    models.SmallIntegerField(
+                        choices=[
+                            (0, "System"),
+                            (1, "User"),
+                            (2, "Document"),
+                            (3, "EraseServer"),
+                        ],
+                        default=1,
+                    ),
+                ),
+                (
+                    "lot",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to="lot.lot"
+                    ),
+                ),
+                (
+                    "owner",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="user.institution",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+        ),
+        migrations.DeleteModel(
+            name="LotAnnotation",
+        ),
+        migrations.AddConstraint(
+            model_name="lotproperty",
+            constraint=models.UniqueConstraint(
+                fields=("key", "lot", "type"), name="lot_unique_type_key_lot"
+            ),
+        ),
+    ]

lot/migrations/0004_remove_lotproperty_lot_unique_type_key_lot_and_more.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.0.6 on 2024-12-18 12:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("lot", "0003_lotproperty_delete_lotannotation_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name="lotproperty",
+            name="lot_unique_type_key_lot",
+        ),
+        migrations.AlterField(
+            model_name="lotproperty",
+            name="type",
+            field=models.SmallIntegerField(
+                choices=[(0, "System"), (1, "User"), (2, "Document")], default=1
+            ),
+        ),
+    ]

lot/migrations/0005_alter_lotproperty_type.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.0.6 on 2025-01-29 11:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("lot", "0004_remove_lotproperty_lot_unique_type_key_lot_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="lotproperty",
+            name="type",
+            field=models.SmallIntegerField(
+                choices=[(0, "System"), (1, "User")], default=1
+            ),
+        ),
+    ]

lot/migrations/0006_lotproperty_property_unique_type_key_lot.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.0.6 on 2025-01-31 10:33
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lot', '0005_alter_lotproperty_type'),
+        ('user', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddConstraint(
+            model_name='lotproperty',
+            constraint=models.UniqueConstraint(fields=('key', 'lot'), name='property_unique_type_key_lot'),
+        ),
+    ]

lot/migrations/0007_lottag_inbox.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0.6 on 2025-02-17 10:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lot', '0006_lotproperty_property_unique_type_key_lot'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='lottag',
+            name='inbox',
+            field=models.BooleanField(default=False),
+        ),
+    ]

lot/models.py

@@ -7,14 +7,15 @@ from utils.constants import (
 )
 
 from user.models import User, Institution
+from evidence.models import Property
 # from device.models import Device
-# from evidence.models import Annotation
 
 
 class LotTag(models.Model):
     name = models.CharField(max_length=STR_SIZE, blank=False, null=False)
     owner = models.ForeignKey(Institution, on_delete=models.CASCADE)
     user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, blank=True)
+    inbox = models.BooleanField(default=False)
 
     def __str__(self):
         return self.name
@@ -45,17 +46,17 @@ class Lot(models.Model):
         for d in DeviceLot.objects.filter(lot=self, device_id=v):
             d.delete()
 
-
-class LotAnnotation(models.Model):
-    class Type(models.IntegerChoices):
-        SYSTEM= 0, "System"
-        USER = 1, "User"
-        DOCUMENT = 2, "Document"
-
-    created = models.DateTimeField(auto_now_add=True)
+class LotProperty(Property):
     lot  = models.ForeignKey(Lot, on_delete=models.CASCADE)
-    owner = models.ForeignKey(Institution, on_delete=models.CASCADE)
-    user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, blank=True)
-    type =  models.SmallIntegerField(choices=Type) 
-    key = models.CharField(max_length=STR_EXTEND_SIZE)
-    value = models.CharField(max_length=STR_EXTEND_SIZE)
+
+    class Type(models.IntegerChoices):
+        SYSTEM = 0, "System"
+        USER = 1, "User"
+
+    type = models.SmallIntegerField(choices=Type.choices, default=Type.USER)
+
+    class Meta:
+        constraints = [
+            models.UniqueConstraint(
+                fields=["key", "lot"], name="property_unique_type_key_lot")
+        ]

lot/templates/annotations.html

@@ -1,48 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-
-{% block content %}
-<div class="row">
-  <div class="col">
-    <h3>Lot {{ lot.name }}</h3>
-  </div>
-</div>
-
-<div class="row">
-  <div class="tab-pane fade show active" id="details">
-    <div class="btn-group dropdown ml-1 mt-1" uib-dropdown="">
-      <a href="{% url 'lot:add_annotation' lot.pk %}" class="btn btn-primary">
-
-        <i class="bi bi-plus"></i>
-        Add new annotation
-        <span class="caret"></span>
-      </a>
-    </div>
-
-    <h5 class="card-title mt-2">Annotations</h5>
-    <table class="table table-striped">
-      <thead>
-        <tr>
-          <th scope="col">Key</th>
-          <th scope="col">Value</th>
-          <th scope="col" data-type="date" data-format="YYYY-MM-DD hh:mm">Created on</th>
-          <th></th>
-          <th></th>
-        </tr>
-      </thead>
-      <tbody>
-	{% for a in annotations %}
-      <tr>
-        <td>{{ a.key }}</td>
-        <td>{{ a.value }}</td>
-        <td>{{ a.created }}</td>
-        <td></td>
-        <td></td>
-      </tr>
-      {% endfor %}
-        
-      </tbody>
-    </table>
-  </div>
-</div>
-{% endblock %}

lot/templates/delete_lot.html

@@ -30,7 +30,7 @@
 {% endif %}
 {% bootstrap_form form %}
 <div class="form-actions-no-box">
-  <a class="btn btn-grey" href="{% url 'dashboard:unassigned_devices' %}">{% translate "Cancel" %}</a>
+  <a class="btn btn-grey" href="{% url 'dashboard:unassigned' %}">{% translate "Cancel" %}</a>
   <input class="btn btn-green-admin" type="submit" name="submit" value="{% translate 'Delete' %}" />
 </div>
 

lot/templates/documents.html

@@ -1,48 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-
-{% block content %}
-<div class="row">
-  <div class="col">
-    <h3>Lot {{ lot.name }}</h3>
-  </div>
-</div>
-
-<div class="row">
-  <div class="tab-pane fade show active" id="details">
-    <div class="btn-group dropdown ml-1 mt-1" uib-dropdown="">
-      <a href="{% url 'lot:add_document' lot.pk %}" class="btn btn-primary">
-
-        <i class="bi bi-plus"></i>
-        Add new document
-        <span class="caret"></span>
-      </a>
-    </div>
-
-    <h5 class="card-title mt-2">Documents</h5>
-    <table class="table table-striped">
-      <thead>
-        <tr>
-          <th scope="col">Key</th>
-          <th scope="col">Value</th>
-          <th scope="col" data-type="date" data-format="YYYY-MM-DD hh:mm">Created on</th>
-          <th></th>
-          <th></th>
-        </tr>
-      </thead>
-      <tbody>
-	{% for a in documents %}
-      <tr>
-        <td>{{ a.key }}</td>
-        <td>{{ a.value }}</td>
-        <td>{{ a.created }}</td>
-        <td></td>
-        <td></td>
-      </tr>
-      {% endfor %}
-        
-      </tbody>
-    </table>
-  </div>
-</div>
-{% endblock %}

lot/templates/list_lots.html

@@ -11,20 +11,26 @@
 <form method="post">
   {% csrf_token %}
 
-{% for tag in lot_tags %}
-<div class="row">
-  <div class="col-lg-3 col-md-4 label ">{{ tag }}</div>
-</div>
-
-{% for lot in lots %}
-{% if lot.type == tag %}
-<div class="row">
-  <div class="col-lg-3 col-md-4 label "><input type="checkbox" name="lots" value="{{ lot.id }}" /></div>
-  <div class="col-lg-3 col-md-4 label ">{{ lot.name }}</div>
-</div>
-{% endif %}
-{% endfor %}
-{% endfor %}
+<table class="table">
+  <thead>
+    <tr>
+      <th>Select</th>
+      <th>Lot Group / Lot</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for tag in lot_tags %}
+    {% for lot in lots %}
+    {% if lot.type == tag %}
+    <tr>
+      <td><input type="checkbox" name="lots" value="{{ lot.id }}" /></td>
+      <td>{{ tag }}/{{ lot.name }}</td>
+    </tr>
+    {% endif %}
+    {% endfor %}
+    {% endfor %}
+  </tbody>
+</table>
 
   <button class="btn btn-green-admin" type="submit">Save</button>
 </form>

lot/templates/new_lot.html

@@ -24,7 +24,7 @@
 {% endif %}
 {% bootstrap_form form %}
 <div class="form-actions-no-box">
-  <a class="btn btn-grey" href="{% url 'dashboard:unassigned_devices' %}">{% translate "Cancel" %}</a>
+  <a class="btn btn-grey" href="{% url 'dashboard:unassigned' %}">{% translate "Cancel" %}</a>
   <input class="btn btn-green-admin" type="submit" name="submit" value="{% translate 'Save' %}" />
 </div>
 

lot/templates/new_property.html

@@ -36,7 +36,7 @@
     {% endfor %}
   </div>
   <div class="container">
-    <a class="btn btn-grey" href="{% url 'dashboard:unassigned_devices' %}">{% translate "Cancel" %}</a>
+    <a class="btn btn-grey" href="{% url 'lot:properties' lot_id %}">{% translate "Cancel" %}</a>
     <input class="btn btn-green-admin" type="submit" name="submit" value="{% translate 'Save' %}" />
   </div>
 

lot/templates/properties.html

@@ -0,0 +1,106 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block content %}
+<div class="row">
+  <div class="col">
+    <h3>Lot {{ lot.name }}</h3>
+  </div>
+</div>
+
+<div class="row">
+  <div class="tab-pane fade show active" id="details">
+    <div class="d-flex justify-content-end mt-1 mb-3">
+      <a href="{% url 'lot:add_property' lot.pk %}" class="btn btn-green-admin d-flex align-items-center">
+
+        <i class="bi bi-plus"></i>
+        Add new lot Property
+        <span class="caret"></span>
+      </a>
+    </div>
+
+    <h5 class="card-title mt-2">Properties</h5>
+    <table class="table table-hover table-bordered table-responsive align-middle">
+      <thead class="table-light">
+        <tr>
+          <th scope="col">{% trans 'Key' %}</th>
+          <th scope="col">{% trans 'Value' %}</th>
+          <th scope="col" data-type="date" class="text-end" data-format="YYYY-MM-DD HH:mm">{% trans 'Created on' %}</th>
+          <th scope="col" width="5%" class="text-end"></th>
+	</tr>
+      </thead>
+      <tbody>
+        {% for a in properties %}
+        <tr>
+          <td>{{ a.key }}</td>
+          <td>{{ a.value }}</td>
+	  <td class="text-end">{{ a.created }}</td>
+	  <td>
+	    <div class="btn-group ">
+              <button type="button" class="btn btn-sm btn-outline-info d-flex align-items-center" data-bs-toggle="modal" data-bs-target="#editPropertyModal{{ a.id }}">
+                <i class="bi bi-pencil me-1"></i>
+                {% trans 'Edit' %}
+              </button>
+              <button type="button" class="btn btn-sm btn-outline-danger d-flex align-items-center" data-bs-toggle="modal" data-bs-target="#deletePropertyModal{{ a.id }}">
+                <i class="bi bi-trash me-1"></i>
+                {% trans 'Delete' %}
+              </button>
+            </div>
+	  </td>
+        </tr>
+
+        <div class="modal fade" id="editPropertyModal{{ a.id }}" tabindex="-1" aria-labelledby="editPropertyModalLabel{{ a.id }}" aria-hidden="true">
+          <div class="modal-dialog">
+            <div class="modal-content">
+              <div class="modal-header">
+                <h5 class="modal-title" id="editPropertyModalLabel{{ a.id }}">{% trans "Edit Property" %}</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans 'Close' %}"></button>
+              </div>
+              <div class="modal-body">
+                <form method="post" action="{% url 'lot:update_property' a.id %}">
+                  {% csrf_token %}
+                  <div class="mb-3">
+                    <label for="propertyKey{{ a.id }}" class="form-label">{% trans "Key" %}</label>
+                    <input type="text" class="form-control" id="propertyKey{{ a.id }}" name="key" value="{{ a.key }}" required>
+                  </div>
+                  <div class="mb-3">
+                    <label for="propertyValue{{ a.id }}" class="form-label">{% trans "Value" %}</label>
+                    <input type="text" class="form-control" id="propertyValue{{ a.id }}" name="value" value="{{ a.value }}" required>
+                  </div>
+                  <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans "Cancel" %}</button>
+                    <button type="submit" class="btn btn-primary">{% trans "Save changes" %}</button>
+                  </div>
+                </form>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div class="modal fade" id="deletePropertyModal{{ a.id }}" tabindex="-1" aria-labelledby="deletePropertyModalLabel{{ a.id }}" aria-hidden="true">
+          <div class="modal-dialog">
+            <div class="modal-content">
+              <div class="modal-header">
+                <h5 class="modal-title" id="deletePropertyModalLabel{{ a.id }}">{% trans "Delete Property" %}</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans 'Close' %}"></button>
+              </div>
+              <div class="modal-body">
+                <p>{% trans "Are you sure you want to delete this property?" %}</p>
+              </div>
+              <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans "Cancel" %}</button>
+                <form method="post" action="{% url 'lot:delete_property' a.id %}">
+                  {% csrf_token %}
+                  <button type="submit" class="btn btn-danger">{% trans "Delete" %}</button>
+                </form>
+              </div>
+            </div>
+          </div>
+        </div>
+      {% endfor %}
+
+      </tbody>
+    </table>
+  </div>
+</div>
+{% endblock %}

lot/urls.py

@@ -9,9 +9,9 @@ urlpatterns = [
     path("edit/<int:pk>/", views.EditLotView.as_view(), name="edit"),
     path("add/devices/", views.AddToLotView.as_view(), name="add_devices"),
     path("del/devices/", views.DelToLotView.as_view(), name="del_devices"),
-    path("tag/<int:pk>/", views.LotsTagsView.as_view(), name="tag"),
-    path("<int:pk>/document/", views.LotDocumentsView.as_view(), name="documents"),
-    path("<int:pk>/document/add", views.LotAddDocumentView.as_view(), name="add_document"),
-    path("<int:pk>/annotation", views.LotAnnotationsView.as_view(), name="annotations"),
-    path("<int:pk>/annotation/add", views.LotAddAnnotationView.as_view(), name="add_annotation"),
+    path("group/<int:pk>/", views.LotsTagsView.as_view(), name="tags"),
+    path("<int:pk>/property", views.LotPropertiesView.as_view(), name="properties"),
+    path("<int:pk>/property/add", views.AddLotPropertyView.as_view(), name="add_property"),
+    path("<int:pk>/property/update", views.UpdateLotPropertyView.as_view(), name="update_property"),
+    path("<int:pk>/property/delete", views.DeleteLotPropertyView.as_view(), name="delete_property"),
 ]

lot/views.py

@@ -1,5 +1,7 @@
+from django.db import IntegrityError
 from django.urls import reverse_lazy
-from django.shortcuts import get_object_or_404
+from django.shortcuts import get_object_or_404, redirect, Http404
+from django.contrib import messages
 from django.utils.translation import gettext_lazy as _
 from django.views.generic.base import TemplateView
 from django.views.generic.edit import (
@@ -9,15 +11,14 @@ from django.views.generic.edit import (
     FormView,
 )
 from dashboard.mixins import DashboardView
-from lot.models import Lot, LotTag, LotAnnotation
+from lot.models import Lot, LotTag, LotProperty
 from lot.forms import LotsForm
 
-
 class NewLotView(DashboardView, CreateView):
     template_name = "new_lot.html"
     title = _("New lot")
     breadcrumb = "lot / New lot"
-    success_url = reverse_lazy('dashboard:unassigned_devices')
+    success_url = reverse_lazy('dashboard:unassigned')
     model = Lot
     fields = (
         "type",
@@ -27,6 +28,14 @@ class NewLotView(DashboardView, CreateView):
         "closed",
     )
 
+    def get_form(self):
+        form = super().get_form()
+        form.fields["type"].queryset = LotTag.objects.filter(
+            owner=self.request.user.institution,
+            inbox=False
+        )
+        return form
+
     def form_valid(self, form):
         form.instance.owner = self.request.user.institution
         form.instance.user = self.request.user
@@ -38,7 +47,7 @@ class DeleteLotView(DashboardView, DeleteView):
     template_name = "delete_lot.html"
     title = _("Delete lot")
     breadcrumb = "lot / Delete lot"
-    success_url = reverse_lazy('dashboard:unassigned_devices')
+    success_url = reverse_lazy('dashboard:unassigned')
     model = Lot
     fields = (
         "type",
@@ -57,7 +66,7 @@ class EditLotView(DashboardView, UpdateView):
     template_name = "new_lot.html"
     title = _("Edit lot")
     breadcrumb = "Lot / Edit lot"
-    success_url = reverse_lazy('dashboard:unassigned_devices')
+    success_url = reverse_lazy('dashboard:unassigned')
     model = Lot
     fields = (
         "type",
@@ -78,12 +87,20 @@ class EditLotView(DashboardView, UpdateView):
         kwargs = super().get_form_kwargs()
         return kwargs
 
+    def get_form(self):
+        form = super().get_form()
+        form.fields["type"].queryset = LotTag.objects.filter(
+            owner=self.request.user.institution,
+            inbox=False
+        )
+        return form
+
 
 class AddToLotView(DashboardView, FormView):
     template_name = "list_lots.html"
     title = _("Add to lots")
     breadcrumb = "lot / add to lots"
-    success_url = reverse_lazy('dashboard:unassigned_devices')
+    success_url = reverse_lazy('dashboard:unassigned')
     form_class = LotsForm
 
     def get_context_data(self, **kwargs):
@@ -98,7 +115,8 @@ class AddToLotView(DashboardView, FormView):
 
     def get_form(self):
         form = super().get_form()
-        form.fields["lots"].queryset = Lot.objects.filter(owner=self.request.user.institution)
+        form.fields["lots"].queryset = Lot.objects.filter(
+            owner=self.request.user.institution)
         return form
 
     def form_valid(self, form):
@@ -123,7 +141,7 @@ class LotsTagsView(DashboardView, TemplateView):
     template_name = "lots.html"
     title = _("lots")
     breadcrumb = _("lots") + " /"
-    success_url = reverse_lazy('dashboard:unassigned_devices')
+    success_url = reverse_lazy('dashboard:unassigned')
 
     def get_context_data(self, **kwargs):
         self.pk = kwargs.get('pk')
@@ -132,7 +150,9 @@ class LotsTagsView(DashboardView, TemplateView):
         self.title += " {}".format(tag.name)
         self.breadcrumb += " {}".format(tag.name)
         show_closed = self.request.GET.get('show_closed', 'false') == 'true'
-        lots = Lot.objects.filter(owner=self.request.user.institution).filter(type=tag, closed=show_closed)
+        lots = Lot.objects.filter(owner=self.request.user.institution).filter(
+            type=tag, closed=show_closed
+        )
         context.update({
             'lots': lots,
             'title': self.title,
@@ -142,95 +162,115 @@ class LotsTagsView(DashboardView, TemplateView):
         return context
 
 
-class LotAddDocumentView(DashboardView, CreateView):
-    template_name = "new_annotation.html"
-    title = _("New Document")
-    breadcrumb = "Device / New document"
-    success_url = reverse_lazy('dashboard:unassigned_devices')
-    model = LotAnnotation
-    fields = ("key", "value")
-
-    def form_valid(self, form):
-        form.instance.owner = self.request.user.institution
-        form.instance.user = self.request.user
-        form.instance.lot = self.lot
-        form.instance.type = LotAnnotation.Type.DOCUMENT
-        response = super().form_valid(form)
-        return response
-
-    def get_form_kwargs(self):
-        pk = self.kwargs.get('pk')
-        self.lot = get_object_or_404(Lot, pk=pk, owner=self.request.user.institution)
-        self.success_url = reverse_lazy('lot:documents', args=[pk])
-        kwargs = super().get_form_kwargs()
-        return kwargs
-
-
-class LotDocumentsView(DashboardView, TemplateView):
-    template_name = "documents.html"
-    title = _("New Document")
-    breadcrumb = "Device / New document"
+class LotPropertiesView(DashboardView, TemplateView):
+    template_name = "properties.html"
+    title = _("New Lot Property")
+    breadcrumb = "Lot / New property"
 
     def get_context_data(self, **kwargs):
         self.pk = kwargs.get('pk')
         context = super().get_context_data(**kwargs)
         lot = get_object_or_404(Lot, owner=self.request.user.institution, id=self.pk)
-        documents = LotAnnotation.objects.filter(
+        properties = LotProperty.objects.filter(
             lot=lot,
             owner=self.request.user.institution,
-            type=LotAnnotation.Type.DOCUMENT,
+            type=LotProperty.Type.USER,
         )
         context.update({
             'lot': lot,
-            'documents': documents,
+            'properties': properties,
             'title': self.title,
             'breadcrumb': self.breadcrumb
         })
         return context
 
 
-class LotAnnotationsView(DashboardView, TemplateView):
-    template_name = "annotations.html"
-    title = _("New Annotation")
-    breadcrumb = "Device / New annotation"
-
-    def get_context_data(self, **kwargs):
-        self.pk = kwargs.get('pk')
-        context = super().get_context_data(**kwargs)
-        lot = get_object_or_404(Lot, owner=self.request.user.institution, id=self.pk)
-        annotations = LotAnnotation.objects.filter(
-            lot=lot,
-            owner=self.request.user.institution,
-            type=LotAnnotation.Type.USER,
-        )
-        context.update({
-            'lot': lot,
-            'annotations': annotations,
-            'title': self.title,
-            'breadcrumb': self.breadcrumb
-        })
-        return context
-
-
-class LotAddAnnotationView(DashboardView, CreateView):
-    template_name = "new_annotation.html"
-    title = _("New Annotation")
-    breadcrumb = "Device / New annotation"
+class AddLotPropertyView(DashboardView, CreateView):
+    template_name = "new_property.html"
+    title = _("New Lot Property")
+    breadcrumb = "Device / New property"
     success_url = reverse_lazy('dashboard:unassigned_devices')
-    model = LotAnnotation
+    model = LotProperty
     fields = ("key", "value")
 
     def form_valid(self, form):
         form.instance.owner = self.request.user.institution
         form.instance.user = self.request.user
         form.instance.lot = self.lot
-        form.instance.type = LotAnnotation.Type.USER
-        response = super().form_valid(form)
-        return response
+        form.instance.type = LotProperty.Type.USER
+        try:
+            response = super().form_valid(form)
+            messages.success(self.request, _("Property successfully added."))
+            return response
+        except IntegrityError:
+            messages.error(self.request, _("Property is already defined."))
+            return self.form_invalid(form)
 
     def get_form_kwargs(self):
         pk = self.kwargs.get('pk')
         self.lot = get_object_or_404(Lot, pk=pk, owner=self.request.user.institution)
-        self.success_url = reverse_lazy('lot:annotations', args=[pk])
+        self.success_url = reverse_lazy('lot:properties', args=[pk])
         kwargs = super().get_form_kwargs()
         return kwargs
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['lot_id'] = self.lot.id
+        return context
+
+
+class UpdateLotPropertyView(DashboardView, UpdateView):
+    template_name = "properties.html"
+    title = _("Update lot Property")
+    breadcrumb = "Lot / Update Property"
+    model = LotProperty
+    fields = ("key", "value")
+
+    def get_form_kwargs(self):
+        pk = self.kwargs.get('pk')
+        lot_property = get_object_or_404(
+            LotProperty,
+            pk=pk,
+            owner=self.request.user.institution
+        )
+
+        if not lot_property:
+            raise Http404
+
+        lot_pk = lot_property.lot.pk
+        self.success_url = reverse_lazy('lot:properties', args=[lot_pk])
+        kwargs = super().get_form_kwargs()
+        kwargs['instance'] = lot_property
+        return kwargs
+
+    def form_valid(self, form):
+        try:
+            response = super().form_valid(form)
+            messages.success(self.request, _("Property updated successfully."))
+            return response
+        except IntegrityError:
+            messages.error(self.request, _("Property is already defined."))
+            return self.form_invalid(form)
+
+    def form_invalid(self, form):
+        super().form_invalid(form)
+        return redirect(self.get_success_url())
+
+
+class DeleteLotPropertyView(DashboardView, DeleteView):
+    model = LotProperty
+
+    def post(self, request, *args, **kwargs):
+        self.pk = kwargs['pk']
+        self.object = get_object_or_404(
+            self.model,
+            pk=self.pk,
+            owner=self.request.user.institution
+        )
+        lot_pk = self.object.lot.pk
+        self.object.delete()
+        messages.success(self.request, _("Lot property deleted successfully."))
+        self.success_url = reverse_lazy('lot:properties', args=[lot_pk])
+
+        # Redirect back to the original URL
+        return redirect(self.success_url)