Merge pull request #72 from SmartReports/dev

bugfux
SmartReports · Dec 5, 2023 · ac368d4 · ac368d4
2 parents 748e44a + 679143c
commit ac368d4
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -30,7 +30,6 @@ httpx==0.19.0
 idna==2.10
 iniconfig==2.0.0
 kombu==5.3.4
-numpy==1.26.1
 packaging==23.2
 pandas==2.1.2
 Pillow==10.1.0

diff --git a/smartreport_app/kb_interface.py b/smartreport_app/kb_interface.py
@@ -1,5 +1,6 @@
 from .sync_db_kb import get_kpi_value
-import numpy as np
+import random
+
 
 def kb_interface(params):
     plot_type = params['chart_type']
@@ -13,7 +14,15 @@ def kb_interface(params):
         value = resp['value'][-1]
         response = {
             'value': value,  # should be only one or take the last one
-            'color' : np.random.choice(['red', 'orange', 'green'])
+            'color' : random.choice(['red', 'orange', 'green'])
+        }
+        return response
+
+    if plot_type == 'value':
+        resp = get_kpi_value(kpi_list[0]) # is only one
+        value = resp['value'][-1]
+        response = {
+            'value': value,  # should be only one or take the last one
         }
         return response
 

diff --git a/smartreport_app/models.py b/smartreport_app/models.py
@@ -18,7 +18,8 @@ class UserType(models.TextChoices):
     "pie",
     "doughnut",
     "radar",
-    "semaphore"
+    "semaphore", 
+    "value",
 )
 def DEFAULT_CHART_CHOICES():
     return [*CHART_CHOICES]

diff --git a/smartreport_app/sync_db_kb.py b/smartreport_app/sync_db_kb.py
@@ -1,6 +1,6 @@
 import requests
 from .models import Kpi
-import numpy as np
+import random
 
 
 BASE_URL = 'https://vornao.dev:8888'
@@ -63,7 +63,7 @@ def get_kpi_value(kpi_uid, start_time=0, end_time=0):
     kpi_value = {
         'data' : {
             'name' : kpi_uid,
-            'value' : np.random.rand(7)
+            'value' : [random.random() for _ in range(7)]
         }
     }
 

diff --git a/smartreport_app/views.py b/smartreport_app/views.py
@@ -135,8 +135,8 @@ def list(self, request):
             if not params["chart_type"] in kpi.allowed_charts:
                 return Response({"message": f"Kpi {kpi.pk} does not support {params['chart_type']} plot"}, status=status.HTTP_400_BAD_REQUEST)
 
-        if params["chart_type"] == "semaphore" and len(list_of_KB_uids) > 1:
-            return Response({"message": "The semaphore plot only supports one kpi"}, status=status.HTTP_400_BAD_REQUEST)
+        if params["chart_type"] in ["semaphore", "value"] and len(list_of_KB_uids) > 1:
+            return Response({"message": "This plot only supports one kpi"}, status=status.HTTP_400_BAD_REQUEST)
 
 
         # TODO implement start and end time