From 5f2a5c4f719d10bde6bff61964f28f1b953d1ece Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@puigdefabregas.eu>
Date: Fri, 14 Feb 2025 13:43:52 +0100
Subject: [PATCH] fix queries for all devices

---
 dashboard/templates/base.html | 10 +++-------
 device/models.py              | 25 +++++++++++--------------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/dashboard/templates/base.html b/dashboard/templates/base.html
index 6a26db3..83bfb54 100644
--- a/dashboard/templates/base.html
+++ b/dashboard/templates/base.html
@@ -82,16 +82,11 @@
             <ul class="nav flex-column">
 	      {% if user.is_admin %}
               <li class="nav-item">
-                <a class="admin {% if path in 'panel users states_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()">
+                <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 institution users edit_user new_user delete_user states_panel' %}expanded{% else %}collapse{% endif %}" id="ul_admin" data-bs-parent="#sidebarMenu">
-                <a class="admin {% if path in 'panel users tag_panel' %}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 tag_panel' %}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 in 'panel institution' %} active2{% endif %}" href="{% url 'admin:panel' %}">
                       {% trans 'Panel' %}
@@ -105,6 +100,7 @@
                   <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' %}">
diff --git a/device/models.py b/device/models.py
index 9eb89aa..0bd043c 100644
--- a/device/models.py
+++ b/device/models.py
@@ -139,7 +139,7 @@ class Device:
     @classmethod
     def get_all(cls, institution, offset=0, limit=None):
         sql = """
-            WITH RankedAnnotations AS (
+            WITH RankedProperties AS (
                 SELECT
                     t1.value,
                     t1.key,
@@ -148,24 +148,22 @@ class Device:
                         ORDER BY
                             CASE
                                 WHEN t1.key = 'CUSTOM_ID' THEN 1
-                                WHEN t1.key = 'hidalgo1' THEN 2
+                                WHEN t1.key = 'ereuse24' THEN 2
                                 ELSE 3
                             END,
                             t1.created DESC
                     ) AS row_num
-                FROM evidence_annotation AS t1
+                FROM evidence_systemproperty AS t1
                 WHERE t1.owner_id = {institution}
-                  AND t1.type = {type}
             )
             SELECT DISTINCT
                 value
             FROM
-                RankedAnnotations
+                RankedProperties
             WHERE
                 row_num = 1
         """.format(
             institution=institution.id,
-            type=Annotation.Type.SYSTEM,
         )
         if limit:
             sql += " limit {} offset {}".format(int(limit), int(offset))
@@ -185,7 +183,7 @@ class Device:
     def get_all_count(cls, institution):
 
         sql = """
-            WITH RankedAnnotations AS (
+            WITH RankedProperties AS (
                 SELECT
                     t1.value,
                     t1.key,
@@ -194,24 +192,23 @@ class Device:
                         ORDER BY
                             CASE
                                 WHEN t1.key = 'CUSTOM_ID' THEN 1
-                                WHEN t1.key = 'hidalgo1' THEN 2
+                                WHEN t1.key = 'ereuse24' THEN 2
                                 ELSE 3
                             END,
                             t1.created DESC
                     ) AS row_num
-                FROM evidence_annotation AS t1
-                WHERE t1.owner_id = {institution}
-                  AND t1.type = {type}
+
+                FROM evidence_systemproperty AS t1
+               WHERE t1.owner_id = {institution}
             )
             SELECT
                 COUNT(DISTINCT value)
             FROM
-                RankedAnnotations
+                RankedProperties
             WHERE
                 row_num = 1
         """.format(
-            institution=institution.id,
-            type=Annotation.Type.SYSTEM,
+            institution=institution.id
         )
         with connection.cursor() as cursor:
             cursor.execute(sql)