From e0b48248f02c975268d28d41ba244d437156a0fc Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@puigdefabregas.eu>
Date: Thu, 20 Feb 2025 17:50:35 +0100
Subject: [PATCH 1/3] add timestamp iso 8601

---
 device/models.py   | 2 +-
 evidence/models.py | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/device/models.py b/device/models.py
index 22b13dc..3c7c04c 100644
--- a/device/models.py
+++ b/device/models.py
@@ -360,7 +360,7 @@ class Device:
     def updated(self):
         """get timestamp from last evidence created"""
         self.get_last_evidence()
-        return self.last_evidence.created
+        return self.last_evidence.get_time_created()
 
     @property
     def serial_number(self):
diff --git a/evidence/models.py b/evidence/models.py
index a056736..f7f3f52 100644
--- a/evidence/models.py
+++ b/evidence/models.py
@@ -135,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.properties.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():

From afced90f19200d6cee871a18baf02e1cbff35e5f Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@puigdefabregas.eu>
Date: Thu, 20 Feb 2025 18:10:37 +0100
Subject: [PATCH 2/3] fix edit lot

---
 lot/views.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lot/views.py b/lot/views.py
index a64405f..341f15b 100644
--- a/lot/views.py
+++ b/lot/views.py
@@ -87,6 +87,14 @@ 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"

From 8b644da29a868a77a7318ac523fb9ad1202480fa Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@puigdefabregas.eu>
Date: Thu, 20 Feb 2025 18:11:06 +0100
Subject: [PATCH 3/3] fix inbox duplicate

---
 dashboard/mixins.py           | 2 --
 dashboard/templates/base.html | 9 ++++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/dashboard/mixins.py b/dashboard/mixins.py
index ecfe417..c95e808 100644
--- a/dashboard/mixins.py
+++ b/dashboard/mixins.py
@@ -35,10 +35,8 @@ class DashboardView(LoginRequiredMixin):
         context = super().get_context_data(**kwargs)
         lot_tags = LotTag.objects.filter(
             owner=self.request.user.institution,
-            inbox=False
         )
         context.update({
-            "inbox": LotTag.objects.get(inbox=True).name,
             "commit_id": settings.COMMIT,
             'title': self.title,
             'subtitle': self.subtitle,
diff --git a/dashboard/templates/base.html b/dashboard/templates/base.html
index 38822d2..abe23a0 100644
--- a/dashboard/templates/base.html
+++ b/dashboard/templates/base.html
@@ -129,15 +129,14 @@
                   {% trans 'Lots' %}
                 </a>
                 <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">
-		  <li class="nav-item">
-                    <a class="nav-link{% if path == 'unassigned' %} active2{% endif %}" href="{% url 'dashboard:unassigned' %}">
-		      {{ inbox }}
-                    </a>
-                  </li>
 
                   {% for tag in lot_tags %}
                   <li class="nav-items">
+		  {% 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>