Merge pull request #26 from SmartReports/dev

Dev
SmartReports · Nov 11, 2023 · b3e092b · b3e092b
2 parents 0cfaa3b + 3048213
commit b3e092b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -33,4 +33,4 @@ tomli==2.0.1
 typing_extensions==4.8.0
 urllib3==2.0.7
 virtualenv==20.24.6
-whitenoise==6.6.0
+whitenoise==6.6.0
diff --git a/smartreport_app/kb_interface.py b/smartreport_app/kb_interface.py
@@ -7,15 +7,13 @@ def kb_interface(kpi_name, params):
     if plot_type == 'line':
         response = {
             'labels': ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
-            'data' : {
             'datasets': [{
                 'label': 'massa di filippo',
                 'data': [65, 59, 50, 40, 30, 20, 10],
                 'fill': False,
                 'borderColor': 'rgb(75, 192, 192)',
                 'tension': 0.1
                 }]
-            }
         }
 
         return response

diff --git a/smartreport_app/models.py b/smartreport_app/models.py
@@ -15,7 +15,8 @@ class UserType(models.TextChoices):
     "line",
     "bar",
     "pie",
-    "scatter",
+    "doughnut",
+    "radar",
 )
 
 
@@ -123,7 +124,7 @@ class DashboardLayout(models.Model):
         choices=UserType.choices,
     )
 
-    layout = models.CharField(max_length=2048)
+    layout = models.JSONField()
 
     def __str__(self):
         return self.name

diff --git a/page_render.py → smartreport_app/page_render.py b/page_render.py → smartreport_app/page_render.py