API

Author: vabene1111

.idea/Graphs.iml

@@ -41,7 +41,7 @@ def __str__(self):
 
 class Graph(models.Model):
     name = models.CharField(max_length=64, default='')
-    title = models.CharField(max_length=64, default='')
+    title = models.CharField(max_length=64, default='', blank=True)
     dashboard = models.BooleanField(default=False)
     public = models.BooleanField(default=False)
     selector = models.ManyToManyField(GraphSelector)

DjangoGraphs/models.py

@@ -0,0 +1,15 @@
+from django.utils.translation import gettext as _
+from rest_framework import serializers
+
+from DjangoGraphs.models import DataEntry
+
+
+class DataEntrySerializer(serializers.ModelSerializer):
+    view_name = 'api_entry'
+
+    class Meta:
+        model = DataEntry
+        fields = ('type', 'instance', 'value', 'timestamp')
+        extra_kwargs = {
+            'url': {'view_name': 'api_entry'}
+        }

DjangoGraphs/serializers.py

@@ -12,7 +12,7 @@ class GraphTable(tables.Table):
     options = tables.TemplateColumn(
         "<a href='{% url 'delete_graph' record.id %}' class='btn btn-danger'><i class='fas fa-trash'></i></a> " +
         "<a href='{% url 'view_graph' record.id %}' class='btn btn-success'><i class='fas fa-eye'></i></a> " +
-        "<a href='{% url 'view_graph_advanced' record.id %}' class='btn btn-info'><i class='fas fa-eye'></i></a>", #TODO icon
+        "<a href='{% url 'view_graph_advanced' record.id %}' class='btn btn-info'><i class='fas fa-binoculars'></i></a>",
         verbose_name=_('Options'))
 
     class Meta:

DjangoGraphs/tables.py

@@ -71,13 +71,18 @@
                 aggregate_rollover: true,
                 mouseover: function (d, i) {
                     var pf = d3.format('.0s');
-                    //debugger;
+
                     d3.select('#graph svg .mg-active-datapoint').style('fill', 'white')
-                        .text('Header').attr("x", 0).attr("dy","1.2em");
-                    d3.select('#graph svg .mg-active-datapoint').append("tspan").attr("dy", "1em").attr("x", "0").style('fill', 'red')
-                        .text('Test 2');
-                    d3.select('#graph svg .mg-active-datapoint').append("tspan").attr("dy", "1em").attr("x", "0").style('fill', 'red')
-                        .text('Test 2');
+                        .text(moment(d.key).format('hh:mm, DD. MMM YYYY')).attr("x", 0).attr("dy","1.2em");
+
+                    for (x in d.values) {
+                        let line = d.values[x];
+                        d3.select('#graph svg .mg-active-datapoint').append("tspan").style('fill', colors[(line.index - 1)])
+                        .text( legend[(line.index - 1)] ).attr("x", 0).attr("dy","1.2em");
+
+                        d3.select('#graph svg .mg-active-datapoint').append("tspan").style('fill', 'white')
+                        .text( ' - ' + line.value + ' ' + units[(line.index - 1)]);
+                    }
                 }
             };
 

DjangoGraphs/templates/advanced_graph_view.html

@@ -63,6 +63,22 @@
                                 class="fas fa-inbox"></i> {% trans 'Instances' %}</a>
                     </div>
                 </li>
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown"
+                       aria-haspopup="true" aria-expanded="false">
+                        <i class="fas fa-exchange-alt"></i> {% trans 'API' %}
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+                        <a class="dropdown-item" href="{% url 'api-root' %}" target="_blank"><i
+                                class="fas fa-laptop-code"></i> {% trans 'API Browser' %}</a>
+                        <a class="dropdown-item" href="{% url 'api-docs:docs-index' %}" target="_blank"><i
+                                class="fas fa-book"></i> {% trans 'API Docs' %}</a>
+
+                    </div>
+                </li>
+
+
+
             {% endif %}
         </ul>
 

DjangoGraphs/templates/base.html

@@ -1,7 +1,13 @@
-from django.urls import path
+from django.db import router
+from django.urls import path, include
+from rest_framework import routers
+from rest_framework.documentation import include_docs_urls
 
 from .views import *
 
+router = routers.DefaultRouter()
+router.register(r'entry', api.DataEntrySet)
+
 urlpatterns = [
 
     path('', views.index, name='index'),
@@ -30,4 +36,10 @@
     path('delete/instance/<int:pk>/', edit.InstanceDelete.as_view(), name='delete_instance'),
 
     path('redirect/delete/<slug:name>/<int:pk>/', edit.delete_redirect, name='redirect_delete'),
+
+    # API
+    path('api/docs', include_docs_urls(title='DjangoGraphs API', public=False), name='api_docs'),
+    path('api/auth/', include('rest_framework.urls')),
+
+    path('api/', include(router.urls)),
 ]

DjangoGraphs/urls.py

@@ -2,3 +2,4 @@
 from .edit import *
 from .new import *
 from .lists import *
+from .api import *

DjangoGraphs/views/__init__.py

@@ -0,0 +1,17 @@
+from rest_framework import permissions, viewsets
+from rest_framework.response import Response
+from rest_framework.views import APIView
+
+from django.utils.translation import gettext as _
+
+from ..serializers import *
+
+
+class DataEntrySet(viewsets.ModelViewSet):
+    """
+    API endpoint that allows data entries to be viewed or edited.
+    """
+    queryset = DataEntry.objects.all()
+    serializer_class = DataEntrySerializer
+
+    permission_classes = (permissions.IsAuthenticated,)

DjangoGraphs/views/api.py

@@ -36,6 +36,7 @@
     'django.contrib.staticfiles',
     'django_tables2',
     'crispy_forms',
+    'rest_framework',
     'DjangoGraphs.apps.DjangographsConfig',
 ]
 
@@ -70,7 +71,6 @@
 
 WSGI_APPLICATION = 'Graphs.wsgi.application'
 
-
 # Database
 # https://docs.djangoproject.com/en/2.2/ref/settings/#databases
 
@@ -103,7 +103,6 @@
     },
 ]
 
-
 # Internationalization
 # https://docs.djangoproject.com/en/2.2/topics/i18n/