spacecruft
/
satnogs-db
1
0
Fork 0
Code Releases Activity

Enhance email for satellite suggestions

environments/stage/deployments/58
Pierros Papadeas 2017-12-11 11:47:10 +02:00
parent 84d4a76e88
commit c1bdf25613
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
db/base/views.py
View File

@ -2,8 +2,6 @@ import ephem
import logging import logging
from datetime import datetime from datetime import datetime
from celery.exceptions import OperationalError
from django.db.models import Count, Max from django.db.models import Count, Max
from django.conf import settings from django.conf import settings
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
@ -127,7 +125,8 @@ def suggestion(request):
# Notify admins # Notify admins
admins = User.objects.filter(is_superuser=True) admins = User.objects.filter(is_superuser=True)
site = get_current_site(request) 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' template = 'emails/new_suggestion.txt'
saturl = '{0}{1}'.format( saturl = '{0}{1}'.format(
site.domain, site.domain,
@ -135,7 +134,9 @@ def suggestion(request):
) )
data = { data = {
'satname': suggestion.satellite.name, 'satname': suggestion.satellite.name,
'saturl': saturl 'saturl': saturl,
'sitedomain': site.domain,
'contributor': suggestion.user
} }
message = render_to_string(template, {'data': data}) message = render_to_string(template, {'data': data})
for user in admins: for user in admins:
@ -179,12 +180,14 @@ def stats(request):
.annotate(count=Count('telemetry_data'), .annotate(count=Count('telemetry_data'),
latest_payload=Max('telemetry_data__timestamp')) \ latest_payload=Max('telemetry_data__timestamp')) \
.order_by('-count') .order_by('-count')
satellites_with_data = [obj for obj in Satellite.objects.all() if obj.has_telemetry_data]
observers = DemodData.objects \ observers = DemodData.objects \
.values('observer') \ .values('observer') \
.annotate(count=Count('observer'), .annotate(count=Count('observer'),
latest_payload=Max('timestamp')) \ latest_payload=Max('timestamp')) \
.order_by('-count') .order_by('-count')
return render(request, 'base/stats.html', {'satellites': satellites, return render(request, 'base/stats.html', {'satellites': satellites,
'satellites_with_data': satellites_with_data,
'observers': observers}) 'observers': observers})

4
db/templates/emails/new_suggestion.txt
View File

@ -1,7 +1,9 @@
{% extends 'emails/base.txt' %} {% extends 'emails/base.txt' %}
{% block main %} {% block main %}
New suggestion for Satellite {{ data.satname }} was submitted! New suggestion for Satellite {{ data.satname }} was submitted by user {{ data.contributor }}!
{{ data.saturl }} {{ data.saturl }}
Navigate to {{ data.sitedomain }}/admin/base/suggestion/ to review and approve it.
{% endblock %} {% endblock %}

1
requirements-dev.txt
View File

@ -8,7 +8,6 @@ coverage==4.5.1
dnspython==1.15.0 dnspython==1.15.0
docopt==0.6.1 docopt==0.6.1
docopts==0.6.1 docopts==0.6.1
email-validator==1.0.3
enum34==1.1.6 enum34==1.1.6
execnet==1.5.0 execnet==1.5.0
factory-boy==2.10.0 factory-boy==2.10.0