From c1bdf25613d5accad0e15d7c16d633cb184f637e Mon Sep 17 00:00:00 2001
From: Pierros Papadeas <pierros@papadeas.gr>
Date: Mon, 11 Dec 2017 11:47:10 +0200
Subject: [PATCH] Enhance email for satellite suggestions

---
 db/base/views.py                       | 11 +++++++----
 db/templates/emails/new_suggestion.txt |  4 +++-
 requirements-dev.txt                   |  1 -
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/db/base/views.py b/db/base/views.py
index 16c6785..3604802 100644
--- a/db/base/views.py
+++ b/db/base/views.py
@@ -2,8 +2,6 @@ import ephem
 import logging
 from datetime import datetime
 
-from celery.exceptions import OperationalError
-
 from django.db.models import Count, Max
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
@@ -127,7 +125,8 @@ def suggestion(request):
         # Notify admins
         admins = User.objects.filter(is_superuser=True)
         site = get_current_site(request)
-        subject = '[{0}] A new suggestion was submitted'.format(site.name)
+        subject = '[{0}] A new suggestion for {1} was submitted'.format(site.name,
+                                                                        suggestion.satellite.name)
         template = 'emails/new_suggestion.txt'
         saturl = '{0}{1}'.format(
             site.domain,
@@ -135,7 +134,9 @@ def suggestion(request):
         )
         data = {
             'satname': suggestion.satellite.name,
-            'saturl': saturl
+            'saturl': saturl,
+            'sitedomain': site.domain,
+            'contributor': suggestion.user
         }
         message = render_to_string(template, {'data': data})
         for user in admins:
@@ -179,12 +180,14 @@ def stats(request):
                           .annotate(count=Count('telemetry_data'),
                                     latest_payload=Max('telemetry_data__timestamp')) \
                           .order_by('-count')
+    satellites_with_data = [obj for obj in Satellite.objects.all() if obj.has_telemetry_data]
     observers = DemodData.objects \
                          .values('observer') \
                          .annotate(count=Count('observer'),
                                    latest_payload=Max('timestamp')) \
                          .order_by('-count')
     return render(request, 'base/stats.html', {'satellites': satellites,
+                                               'satellites_with_data': satellites_with_data,
                                                'observers': observers})
 
 
diff --git a/db/templates/emails/new_suggestion.txt b/db/templates/emails/new_suggestion.txt
index cfae77e..b419d85 100644
--- a/db/templates/emails/new_suggestion.txt
+++ b/db/templates/emails/new_suggestion.txt
@@ -1,7 +1,9 @@
 {% extends 'emails/base.txt' %}
 
 {% block main %}
-New suggestion for Satellite {{ data.satname }} was submitted!
+New suggestion for Satellite {{ data.satname }} was submitted by user {{ data.contributor }}!
 
 {{ data.saturl }}
+
+Navigate to {{ data.sitedomain }}/admin/base/suggestion/ to review and approve it.
 {% endblock %}
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 4916b01..52c5b94 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -8,7 +8,6 @@ coverage==4.5.1
 dnspython==1.15.0
 docopt==0.6.1
 docopts==0.6.1
-email-validator==1.0.3
 enum34==1.1.6
 execnet==1.5.0
 factory-boy==2.10.0