Relationships As Source
@@ -207,3 +158,6 @@
{% endblock %}
+
+{% block extra_script %}
+{% endblock %}
diff --git a/people/templates/people/person/includes/answer_set.html b/people/templates/people/person/includes/answer_set.html
new file mode 100644
index 0000000..8bcb346
--- /dev/null
+++ b/people/templates/people/person/includes/answer_set.html
@@ -0,0 +1,59 @@
+
+
+
+ Question
+ Answer
+
+
+
+
+ {% if answer_set.nationality %}
+ Nationality {{ answer_set.nationality.name }}
+ {% endif %}
+
+ {% if answer_set.country_of_residence %}
+ Country of Residence {{ answer_set.country_of_residence.name }} Organisation {{ answer_set.organisation }} Organisation Started Date {{ answer_set.organisation_started_date }} Job Title {{ answer_set.job_title }} Discipline(s) {{ answer_set.disciplines }}
+ Project Themes
+
+ {% for theme in answer_set.themes.all %}
+ {{ theme }}{% if not forloop.last %}, {% endif %}
+ {% endfor %}
+
+
+ {% endif %}
+
+ {% for answer in answer_set.question_answers.all %}
+
+ {{ answer.question }}
+ {{ answer }}
+
+
+ {% empty %}
+
+ No records
+
+ {% endfor %}
+
+
+
+
Last updated: {{ answer_set.timestamp }}
diff --git a/people/templates/people/person/map.html b/people/templates/people/person/map.html
new file mode 100644
index 0000000..78c7803
--- /dev/null
+++ b/people/templates/people/person/map.html
@@ -0,0 +1,28 @@
+{% extends 'base.html' %}
+
+{% block extra_head %}
+ {{ map_markers|json_script:'map-markers' }}
+
+ {% load staticfiles %}
+
+
+
+{% endblock %}
+
+{% block content %}
+
+
+
+ People
+
+ Map
+
+
+
+
Map
+
+
+
+{% endblock %}
diff --git a/people/templates/people/person/update.html b/people/templates/people/person/update.html
index 980f5a9..db4e256 100644
--- a/people/templates/people/person/update.html
+++ b/people/templates/people/person/update.html
@@ -1,5 +1,16 @@
{% extends 'base.html' %}
+{% block extra_head %}
+ {% load staticfiles %}
+ {{ map_markers|json_script:'map-markers' }}
+
+
+
+
+
+{% endblock %}
+
{% block content %}
@@ -22,11 +33,21 @@
{% csrf_token %}
{% load bootstrap4 %}
- {% bootstrap_form form %}
+ {% bootstrap_form form exclude='latitude,longitude' %}
+
+ {% bootstrap_field form.latitude %}
+ {% bootstrap_field form.longitude %}
{% buttons %}
Submit
{% endbuttons %}
+
+
+ ',
+ views.organisation.OrganisationDetailView.as_view(),
+ name='organisation.detail'),
+
+ path('organisations//update',
+ views.organisation.OrganisationUpdateView.as_view(),
+ name='organisation.update'),
+
path('profile/',
views.person.ProfileView.as_view(),
name='person.profile'),
@@ -38,6 +54,10 @@ urlpatterns = [
views.relationship.RelationshipUpdateView.as_view(),
name='relationship.update'),
+ path('map',
+ views.person.PersonMapView.as_view(),
+ name='person.map'),
+
path('network',
views.network.NetworkView.as_view(),
name='network'),
diff --git a/people/views/__init__.py b/people/views/__init__.py
index e7ddb60..26a117e 100644
--- a/people/views/__init__.py
+++ b/people/views/__init__.py
@@ -4,6 +4,7 @@ Views for displaying or manipulating models within the `people` app.
from . import (
network,
+ organisation,
person,
relationship
)
@@ -11,6 +12,7 @@ from . import (
__all__ = [
'network',
+ 'organisation',
'person',
'relationship',
]
diff --git a/people/views/organisation.py b/people/views/organisation.py
new file mode 100644
index 0000000..c67542d
--- /dev/null
+++ b/people/views/organisation.py
@@ -0,0 +1,60 @@
+import typing
+
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.views.generic import CreateView, DetailView, ListView, UpdateView
+
+from people import forms, models
+
+
+class OrganisationCreateView(LoginRequiredMixin, CreateView):
+ """View to create a new instance of :class:`Organisation`."""
+ model = models.Organisation
+ template_name = 'people/organisation/create.html'
+ form_class = forms.OrganisationForm
+
+
+class OrganisationListView(LoginRequiredMixin, ListView):
+ """View displaying a list of :class:`organisation` objects."""
+ model = models.Organisation
+ template_name = 'people/organisation/list.html'
+
+
+class OrganisationDetailView(LoginRequiredMixin, DetailView):
+ """View displaying details of a :class:`Organisation`."""
+ model = models.Organisation
+ context_object_name = 'organisation'
+ template_name = 'people/organisation/detail.html'
+
+ def get_context_data(self,
+ **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
+ """Add map marker to context."""
+ context = super().get_context_data(**kwargs)
+
+ context['map_markers'] = [{
+ 'name': self.object.name,
+ 'lat': self.object.latitude,
+ 'lng': self.object.longitude,
+ }]
+
+ return context
+
+
+class OrganisationUpdateView(LoginRequiredMixin, UpdateView):
+ """View for updating a :class:`Organisation` record."""
+ model = models.Organisation
+ context_object_name = 'organisation'
+ template_name = 'people/organisation/update.html'
+ form_class = forms.OrganisationForm
+
+ def get_context_data(self,
+ **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
+ """Add map marker to context."""
+ context = super().get_context_data(**kwargs)
+
+ context['map_markers'] = [{
+ 'name': self.object.name,
+ 'lat': self.object.latitude,
+ 'lng': self.object.longitude,
+ }]
+
+ return context
diff --git a/people/views/person.py b/people/views/person.py
index c495a86..73f2e3b 100644
--- a/people/views/person.py
+++ b/people/views/person.py
@@ -2,7 +2,10 @@
Views for displaying or manipulating instances of :class:`Person`.
"""
+import typing
+
from django.contrib.auth.mixins import LoginRequiredMixin
+from django.urls import reverse
from django.utils import timezone
from django.views.generic import CreateView, DetailView, ListView, UpdateView
@@ -54,42 +57,101 @@ class ProfileView(permissions.UserIsLinkedPersonMixin, DetailView):
# pk was not provided in URL
return self.request.user.person
+ def get_context_data(self,
+ **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
+ """Add current :class:`PersonAnswerSet` to context."""
+ context = super().get_context_data(**kwargs)
+
+ context['answer_set'] = self.object.current_answers
+ context['map_markers'] = [get_map_data(self.object)]
+
+ return context
+
class PersonUpdateView(permissions.UserIsLinkedPersonMixin, UpdateView):
"""View for updating a :class:`Person` record."""
- model = models.PersonAnswerSet
+ model = models.Person
+ context_object_name = 'person'
template_name = 'people/person/update.html'
form_class = forms.PersonAnswerSetForm
- def get_test_person(self) -> models.Person:
- """Get the person instance which should be used for access control checks."""
- return models.Person.objects.get(pk=self.kwargs.get('pk'))
-
- def get(self, request, *args, **kwargs):
- self.person = models.Person.objects.get(pk=self.kwargs.get('pk'))
-
- return super().get(request, *args, **kwargs)
-
- def post(self, request, *args, **kwargs):
- self.person = models.Person.objects.get(pk=self.kwargs.get('pk'))
-
- return super().post(request, *args, **kwargs)
-
- def get_context_data(self, **kwargs):
+ def get_context_data(self,
+ **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
context = super().get_context_data(**kwargs)
- context['person'] = self.person
+ context['map_markers'] = [get_map_data(self.object)]
return context
+ def get_initial(self) -> typing.Dict[str, typing.Any]:
+ try:
+ previous_answers = self.object.current_answers.as_dict()
+
+ except AttributeError:
+ previous_answers = {}
+
+ previous_answers.update({
+ 'person_id': self.object.id,
+ })
+
+ return previous_answers
+
+ def get_form_kwargs(self) -> typing.Dict[str, typing.Any]:
+ """Remove instance from form kwargs as it's a person, but expects a PersonAnswerSet."""
+ kwargs = super().get_form_kwargs()
+ kwargs.pop('instance')
+
+ return kwargs
+
def form_valid(self, form):
"""Mark any previous answer sets as replaced."""
response = super().form_valid(form)
now_date = timezone.now().date()
+ # Saving the form made self.object a PersonAnswerSet - so go up, then back down
# Shouldn't be more than one after initial updates after migration
- for answer_set in self.person.answer_sets.exclude(pk=self.object.pk):
+ for answer_set in self.object.person.answer_sets.exclude(
+ pk=self.object.pk):
answer_set.replaced_timestamp = now_date
answer_set.save()
return response
+
+
+def get_map_data(person: models.Person) -> typing.Dict[str, typing.Any]:
+ """Prepare data to mark people on a map."""
+ answer_set = person.current_answers
+ organisation = getattr(answer_set, 'organisation', None)
+
+ try:
+ country = answer_set.country_of_residence.name
+
+ except AttributeError:
+ country = None
+
+ return {
+ 'name': person.name,
+ 'lat': getattr(answer_set, 'latitude', None),
+ 'lng': getattr(answer_set, 'longitude', None),
+ 'organisation': getattr(organisation, 'name', None),
+ 'org_lat': getattr(organisation, 'latitude', None),
+ 'org_lng': getattr(organisation, 'longitude', None),
+ 'country': country,
+ 'url': reverse('people:person.detail', kwargs={'pk': person.pk})
+ }
+
+
+class PersonMapView(LoginRequiredMixin, ListView):
+ """View displaying a map of :class:`Person` locations."""
+ model = models.Person
+ template_name = 'people/person/map.html'
+
+ def get_context_data(self,
+ **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
+ context = super().get_context_data(**kwargs)
+
+ context['map_markers'] = [
+ get_map_data(person) for person in self.object_list
+ ]
+
+ return context
diff --git a/roles/defaults/main.yml b/roles/defaults/main.yml
new file mode 100644
index 0000000..bf12883
--- /dev/null
+++ b/roles/defaults/main.yml
@@ -0,0 +1,4 @@
+---
+db_name: 'breccia'
+db_user: 'breccia'
+db_pass: 'breccia'
diff --git a/roles/webserver/defaults/main.yml b/roles/webserver/defaults/main.yml
index 5d9fbcf..bc0d0af 100644
--- a/roles/webserver/defaults/main.yml
+++ b/roles/webserver/defaults/main.yml
@@ -14,6 +14,8 @@ venv_dir: '{{ project_dir }}/venv'
web_user: nginx
web_group: nginx
db_name: '{{ project_name }}'
+db_user: 'breccia'
+db_pass: 'breccia'
display_short_name: 'BRECcIA'
display_long_name: 'BRECcIA Mapper'
\ No newline at end of file
diff --git a/roles/webserver/templates/settings.j2 b/roles/webserver/templates/settings.j2
index f99d88e..e9ccb89 100644
--- a/roles/webserver/templates/settings.j2
+++ b/roles/webserver/templates/settings.j2
@@ -23,3 +23,7 @@ DEFAULT_FROM_EMAIL={{ default_from_email }}
{% if email_port is defined %}
EMAIL_PORT={{ email_port }}
{% endif %}
+
+{% if google_maps_api_key is defined %}
+GOOGLE_MAPS_API_KEY={{ google_maps_api_key }}
+{% endif %}