+ {% block messages %}
+ {% for message in messages %}
+
+
+ {{ message }}
+
+ {% endfor %}
+ {% endblock %}
+
{% block content %}{% endblock %}
diff --git a/app/templates/app/processing_node.html b/app/templates/app/processing_node.html
new file mode 100644
index 00000000..cc93dfe3
--- /dev/null
+++ b/app/templates/app/processing_node.html
@@ -0,0 +1,46 @@
+{% extends "app/logged_in_base.html" %}
+{% load i18n %}
+
+{% block content %}
+
Processing Node
+
+
+ | {% trans "Hostname" %} |
+ {{ processing_node.hostname }} |
+
+
+ | {% trans "Port" %} |
+ {{ processing_node.port }} |
+
+
+ | {% trans "API Version" %} |
+ {{ processing_node.api_version }} |
+
+
+ | {% trans "Queue Count" %} |
+ {{ processing_node.queue_count }} |
+
+
+ | {% trans "Last Refreshed" %} |
+ {{ processing_node.last_refreshed }} |
+
+
+ | {% trans "Options (JSON)" %} |
+ |
+
+
+
+{% endblock %}
diff --git a/app/urls.py b/app/urls.py
index d48170d3..5801c28d 100644
--- a/app/urls.py
+++ b/app/urls.py
@@ -4,4 +4,5 @@ from . import views
urlpatterns = [
url(r'^$', views.index, name='index'),
url(r'^dashboard/$', views.dashboard, name='dashboard'),
+ url(r'^processingnode/([\d]+)/$', views.processing_node, name='processing_node'),
]
\ No newline at end of file
diff --git a/app/views.py b/app/views.py
index f8b54bdc..71d957d2 100644
--- a/app/views.py
+++ b/app/views.py
@@ -1,5 +1,7 @@
-from django.shortcuts import render, redirect
+from django.shortcuts import render, redirect, get_object_or_404
from django.http import HttpResponse
+from nodeodm.models import ProcessingNode
+from django.contrib import messages
def index(request):
@@ -7,4 +9,16 @@ def index(request):
else 'login')
def dashboard(request):
- return render(request, 'app/dashboard.html', {'title': "Dashboard"})
\ No newline at end of file
+ return render(request, 'app/dashboard.html', {'title': 'Dashboard'})
+
+def processing_node(request, processing_node_id):
+ pn = get_object_or_404(ProcessingNode, pk=processing_node_id)
+ if not pn.update_node_info():
+ messages.add_message(request, messages.constants.WARNING, '{} seems to be offline.'.format(pn))
+
+ return render(request, 'app/processing_node.html',
+ {
+ 'title': 'Processing Node',
+ 'processing_node': pn,
+ 'available_options_json': pn.get_available_options_json()
+ })
diff --git a/nodeodm/api_client.py b/nodeodm/api_client.py
index 715f051d..97b31f1a 100644
--- a/nodeodm/api_client.py
+++ b/nodeodm/api_client.py
@@ -2,6 +2,7 @@
A wrapper around Bravado to communicate with a node-OpenDroneMap node.
"""
from bravado.client import SwaggerClient
+from bravado.exception import HTTPError
from requests import ConnectionError
class ApiClient:
@@ -15,9 +16,10 @@ class ApiClient:
if not hasattr(self, 'client'):
try:
self.client = SwaggerClient.from_url('http://{}:{}/swagger.json'.format(self.host, self.port))
- except ConnectionError as err:
+ except (ConnectionError, HTTPError) as err:
print("{}:{} seems offline: {}".format(self.host, self.port, err))
return None
+
return func(self, *args, **kwargs)
return check
diff --git a/nodeodm/models.py b/nodeodm/models.py
index f1cdb5e6..81704f27 100644
--- a/nodeodm/models.py
+++ b/nodeodm/models.py
@@ -4,6 +4,7 @@ from django.db import models
from django.contrib.postgres import fields
from django.utils import timezone
from .api_client import ApiClient
+import json
class ProcessingNode(models.Model):
hostname = models.CharField(max_length=255, help_text="Hostname where the node is located (can be an internal hostname as well)")
@@ -24,8 +25,10 @@ class ProcessingNode(models.Model):
def update_node_info(self):
"""
- Retrieves information and options from the node
- and saves it into the database
+ Retrieves information and options from the node API
+ and saves it into the database.
+
+ :returns: True if information could be updated, False otherwise
"""
info = self.api_client.info()
if info != None:
@@ -38,3 +41,11 @@ class ProcessingNode(models.Model):
self.last_refreshed = timezone.now()
self.save()
+ return True
+ return False
+
+ def get_available_options_json(self):
+ """
+ :returns available options in JSON string format
+ """
+ return json.dumps(self.available_options)
diff --git a/webodm/settings.py b/webodm/settings.py
index ee7db66e..7ae4a5c4 100644
--- a/webodm/settings.py
+++ b/webodm/settings.py
@@ -11,6 +11,7 @@ https://docs.djangoproject.com/en/1.10/ref/settings/
"""
import os
+from django.contrib.messages import constants as messages
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -136,6 +137,12 @@ LOGIN_URL = '/login/'
# File uploads
MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
+# Store flash messages in cookies
+MESSAGE_STORAGE = 'django.contrib.messages.storage.cookie.CookieStorage'
+MESSAGE_TAGS = {
+ messages.ERROR: 'danger' # Bootstrap 3 compatibility
+}
+
try:
from .local_settings import *
except ImportError: