-
+ {% if config.HOMEPAGE_CARD_1_TITLE %}
+
-
Do Feature 1
+
{{ config.HOMEPAGE_CARD_1_TITLE }}
-
+ {% if config.HOMEPAGE_CARD_1_DESCRIPTION %}
+
{{ config.HOMEPAGE_CARD_1_DESCRIPTION|safe }}
+ {% endif %}
+
+ {% if config.HOMEPAGE_CARD_1_ICON %}
+
+ {% endif %}
+ {% endif %}
-
+ {% if config.HOMEPAGE_CARD_2_TITLE %}
+
-
Do Feature 2
+
{{ config.HOMEPAGE_CARD_2_TITLE }}
-
+ {% if config.HOMEPAGE_CARD_2_DESCRIPTION %}
+
{{ config.HOMEPAGE_CARD_2_DESCRIPTION|safe }}
+ {% endif %}
+
+ {% if config.HOMEPAGE_CARD_2_ICON %}
+
+ {% endif %}
+ {% endif %}
-
+ {% if config.HOMEPAGE_CARD_3_TITLE %}
+
-
Do Feature 3
+
{{ config.HOMEPAGE_CARD_3_TITLE }}
-
+ {% if config.HOMEPAGE_CARD_3_DESCRIPTION %}
+
{{ config.HOMEPAGE_CARD_3_DESCRIPTION|safe }}
+ {% endif %}
+
+ {% if config.HOMEPAGE_CARD_3_ICON %}
+
+ {% endif %}
+ {% endif %}
@@ -65,15 +92,16 @@
{% block content %}
-
About {{ settings.PROJECT_LONG_NAME }}
+
{{ config.HOMEPAGE_ABOUT_TITLE }}
- {{ settings.PROJECT_LONG_NAME }} is...
+ {{ config.HOMEPAGE_ABOUT_CONTENT|safe }}
-
+ {% get_media_prefix as MEDIA_URL %}
+
{% endblock %}
diff --git a/breccia_mapper/urls.py b/breccia_mapper/urls.py
index 59a3406..c5d5b9f 100644
--- a/breccia_mapper/urls.py
+++ b/breccia_mapper/urls.py
@@ -14,10 +14,17 @@ Including another URLconf
2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
"""
from django.contrib import admin
+from django.conf import settings
from django.urls import include, path
+from django.conf.urls.static import static
from . import views
+from constance import config
+
+admin.site.site_header = config.PROJECT_LONG_NAME + " Admin"
+admin.site.site_title = config.PROJECT_SHORT_NAME + " Admin"
+
urlpatterns = [
path('admin/',
admin.site.urls),
diff --git a/deploy/inventory.example.yml b/deploy/inventory.example.yml
index 8d305cf..8b87da6 100644
--- a/deploy/inventory.example.yml
+++ b/deploy/inventory.example.yml
@@ -1,5 +1,5 @@
all:
hosts:
example.com:
- django_debug: 1
+ django_debug: 0
django_secret_key: debug_only_g62WlORMbo8iAcV7vKCKBQ==
diff --git a/deploy/playbook.yml b/deploy/playbook.yml
index 1e19a32..b34a7c4 100644
--- a/deploy/playbook.yml
+++ b/deploy/playbook.yml
@@ -11,9 +11,13 @@
register: vagrant_dir
vars:
- project_name: mapper
+ project_name: network-mapper
project_dir: /srv/{{ project_name }}
project_src_dir: "{{ project_dir }}/src"
+ provision_superuser: false
+ superuser_username: admin
+ superuser_password: admin
+ superuser_email: email@example.com
tasks:
- name: Vagrant specific tasks
@@ -41,9 +45,10 @@
- name: Clone / update from source repos
ansible.builtin.git:
- repo: 'https://github.com/Southampton-RSG/breccia-mapper.git'
+ # repo: 'https://github.com/Southampton-RSG/breccia-mapper.git'
+ repo: 'https://github.com/mgrove36/breccia-network-mapper.git'
dest: '{{ project_src_dir }}'
- version: docker
+ version: dev # master
accept_hostkey: yes
- name: Copy template files
@@ -55,6 +60,12 @@
- Caddyfile
- docker-compose.yml
+ - name: Copy settings file
+ ansible.builtin.copy:
+ src: 'settings.ini'
+ dest: '{{ project_src_dir }}/breccia_mapper/settings.ini'
+ mode: 0600
+
- name: Create database file
ansible.builtin.file:
path: "{{ project_dir }}/db.sqlite3"
@@ -78,9 +89,21 @@
chdir: "{{ project_dir }}"
cmd: docker compose build {{ item }}
loop:
- - web
+ - server
- name: Start containers
ansible.builtin.command:
chdir: "{{ project_dir }}"
cmd: docker compose up -d
+
+ - name: Provision superuser
+ ansible.builtin.command:
+ chdir: "{{ project_dir }}"
+ cmd: sudo docker compose exec -it server /bin/bash -c "DJANGO_SUPERUSER_USERNAME='{{ superuser_username }}' DJANGO_SUPERUSER_PASSWORD='{{ superuser_password }}' DJANGO_SUPERUSER_EMAIL='{{ superuser_email }}' /app/manage.py createsuperuser --no-input"
+ when: provision_superuser
+
+ - name: Display warning about new superuser
+ debug:
+ msg:
+ - "[WARNING] A superuser has been provisioned with the username \"{{ superuser_username }}\" and password that was provided. This user has unlimited access to the network mapper."
+ when: provision_superuser
\ No newline at end of file
diff --git a/deploy/settings.example.ini b/deploy/settings.example.ini
new file mode 100644
index 0000000..2fbe05b
--- /dev/null
+++ b/deploy/settings.example.ini
@@ -0,0 +1,88 @@
+[settings]
+
+; Allowed hosts
+; Accepted values for server header in request - protects against CSRF and CSS attacks
+; Default: * if DEBUG else localhost
+# ALLOWED_HOSTS=* if DEBUG else localhost
+
+; Database URL
+; URL to database - uses format described at https://github.com/jacobian/dj-database-url
+; Default: sqlite://db.sqlite3
+# DATABASE_URL=sqlite://db.sqlite3
+
+; Database backup storage location
+; Directory where database backups should be stored
+; Default: .dbbackup
+# DBBACKUP_STORAGE_LOCATION=.dbbackup
+
+; Default language
+; Default language - used for translation - has not been enabled
+; Default: en-gb
+# LANGUAGE_CODE=en-gb
+
+; Timezone
+; Default timezone
+; Default: UTC
+# TIME_ZONE=UTC
+
+; Logging level
+; Level of messages written to log file
+; Default: INFO
+# LOG_LEVEL=INFO
+
+; Logging filename
+; Path to logfile
+; Default: debug.log
+# LOG_FILENAME=debug.log
+
+; Logging duration
+; Number of days of logs to keep - logfile is rotated out at the end of each day
+; Default: 14
+# LOG_DAYS=14
+
+; STMP host
+; Hostname of SMTP server
+; Default: None
+# EMAIL_HOST=None
+
+; Default from email address
+; Email address from which messages are sent
+; Default: None
+# DEFAULT_FROM_EMAIL=None
+
+; [DEBUG ONLY] Email file path
+; Directory where emails will be stored if not using an SMTP server
+; Default: mail.log
+# EMAIL_FILE_PATH=mail.log
+
+; SMTP username
+; Username to authenticate with SMTP server
+; Default: None
+# EMAIL_HOST_USER=None
+
+; SMTP password
+; Password to authenticate with SMTP server
+; Default: None
+# EMAIL_HOST_PASSWORD=None
+
+; SMTP port
+; Port to access on SMTP server
+; Default: 25
+# EMAIL_PORT=25
+
+; SMTP use TLS
+; Use TLS to communicate with SMTP server? Usually on port 587
+; Cannot be enabled at the same time as EMAIL_USE_SSL
+; Default: True if EMAIL_PORT == 587 else False
+# EMAIL_USE_TLS=True if EMAIL_PORT == 587 else False
+
+; SMTP use SSL
+; Use SSL to communicate with SMTP server? Usually on port 465
+; Cannot be enabled at the same time as EMAIL_USE_TLS
+; Default: True if EMAIL_PORT == 465 else False
+# EMAIL_USE_SSL=True if EMAIL_PORT == 465 else False
+
+; Google Maps API key
+; Google Maps API key to display maps of people's locations
+; Default: None
+# GOOGLE_MAPS_API_KEY=None
\ No newline at end of file
diff --git a/deploy/templates/Caddyfile.j2 b/deploy/templates/Caddyfile.j2
old mode 100644
new mode 100755
index 65cdfc4..116752a
--- a/deploy/templates/Caddyfile.j2
+++ b/deploy/templates/Caddyfile.j2
@@ -1,15 +1,16 @@
-http://* {
+:80 :443 {
root * /srv
file_server
@proxy_paths {
not path /static/*
+ not path /media/*
}
- reverse_proxy @proxy_paths http://web:8000
+ reverse_proxy @proxy_paths http://server:8000
log {
output stderr
- format single_field common_log
+ format console
}
}
\ No newline at end of file
diff --git a/deploy/templates/docker-compose.yml.j2 b/deploy/templates/docker-compose.yml.j2
old mode 100644
new mode 100755
index 08d51ee..c491585
--- a/deploy/templates/docker-compose.yml.j2
+++ b/deploy/templates/docker-compose.yml.j2
@@ -1,8 +1,9 @@
version: '3.1'
services:
- web:
- image: breccia-mapper
+ server:
+ image: breccia-network-mapper
+ container_name: network-mapper-server
build: {{ project_src_dir }}
ports:
- 8000:8000
@@ -13,9 +14,11 @@ services:
volumes:
- {{ project_dir }}/db.sqlite3:/app/db.sqlite3:z
- static_files:/app/static
+ - media_files:/app/media
caddy:
image: caddy:2
+ container_name: network-mapper-caddy
restart: unless-stopped
ports:
- 80:80
@@ -24,12 +27,14 @@ services:
- ./Caddyfile:/etc/caddy/Caddyfile:z
# Caddy serves static files collected by Django
- static_files:/srv/static:ro
+ - media_files:/srv/media:ro
- caddy_data:/data
- caddy_config:/config
depends_on:
- - web
+ - server
volumes:
caddy_data:
caddy_config:
static_files:
+ media_files:
diff --git a/docker-compose.yml b/docker-compose.yml
index c2331f0..9ff863e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,9 @@
version: '3.1'
services:
- web:
- image: breccia-mapper
+ server:
+ image: breccia-network-mapper
+ container_name: network-mapper-server
build: .
ports:
- 8000:8000
@@ -13,9 +14,11 @@ services:
volumes:
- ./db.sqlite3:/app/db.sqlite3:z
- static_files:/app/static
+ - media_files:/app/media
caddy:
image: caddy:2
+ container_name: network-mapper-caddy
restart: unless-stopped
ports:
- 80:80
@@ -24,12 +27,14 @@ services:
- ./Caddyfile:/etc/caddy/Caddyfile:z
# Caddy serves static files collected by Django
- static_files:/srv/static:ro
+ - media_files:/srv/media:ro
- caddy_data:/data
- caddy_config:/config
depends_on:
- - web
+ - server
volumes:
caddy_data:
caddy_config:
static_files:
+ media_files:
diff --git a/docs/Makefile b/docs/Makefile
new file mode 100644
index 0000000..d0c3cbf
--- /dev/null
+++ b/docs/Makefile
@@ -0,0 +1,20 @@
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line, and also
+# from the environment for the first two.
+SPHINXOPTS ?=
+SPHINXBUILD ?= sphinx-build
+SOURCEDIR = source
+BUILDDIR = build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+ @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+ @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/docs/make.bat b/docs/make.bat
new file mode 100644
index 0000000..747ffb7
--- /dev/null
+++ b/docs/make.bat
@@ -0,0 +1,35 @@
+@ECHO OFF
+
+pushd %~dp0
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+ set SPHINXBUILD=sphinx-build
+)
+set SOURCEDIR=source
+set BUILDDIR=build
+
+%SPHINXBUILD% >NUL 2>NUL
+if errorlevel 9009 (
+ echo.
+ echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+ echo.installed, then set the SPHINXBUILD environment variable to point
+ echo.to the full path of the 'sphinx-build' executable. Alternatively you
+ echo.may add the Sphinx directory to PATH.
+ echo.
+ echo.If you don't have Sphinx installed, grab it from
+ echo.https://www.sphinx-doc.org/
+ exit /b 1
+)
+
+if "%1" == "" goto help
+
+%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+goto end
+
+:help
+%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+
+:end
+popd
diff --git a/docs/source/conf.py b/docs/source/conf.py
new file mode 100644
index 0000000..b453e64
--- /dev/null
+++ b/docs/source/conf.py
@@ -0,0 +1,33 @@
+# Configuration file for the Sphinx documentation builder.
+#
+# For the full list of built-in configuration values, see the documentation:
+# https://www.sphinx-doc.org/en/master/usage/configuration.html
+
+# -- Project information -----------------------------------------------------
+# https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
+
+project = 'BRECcIA Network Mapper'
+copyright = 'Matthew Grove, University of Southampton'
+author = 'Matthew Grove'
+release = '1.1'
+
+# -- General configuration ---------------------------------------------------
+# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
+
+extensions = [
+ 'sphinx.ext.duration',
+ 'myst_parser',
+]
+
+myst_enable_extensions = ['colon_fence']
+
+templates_path = ['_templates']
+exclude_patterns = []
+
+
+
+# -- Options for HTML output -------------------------------------------------
+# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
+
+html_theme = 'sphinx_rtd_theme'
+html_static_path = ['_static']
diff --git a/docs/source/deployment.md b/docs/source/deployment.md
new file mode 100644
index 0000000..8534916
--- /dev/null
+++ b/docs/source/deployment.md
@@ -0,0 +1,147 @@
+# Deployment
+
+The BRECcIA Network Mapper can be deployed in a variety of ways, most of which utilise Docker.
+Ansible deployment has been tested on RHEL7 and RHEL8.
+
+## Development Deployment
+
+Prerequisites:
+
+- [Vagrant](https://www.vagrantup.com/)
+- [Ansible](https://www.ansible.com/)
+
+Using Vagrant, we can create a virtual machine and deploy BRECcIA Mapper using the same provisioning scripts as a production deployment.
+To deploy a local development version of BRECcIA Mapper inside a virtual machine, first navigate to the `deploy` folder:
+
+```bash
+cd deploy
+```
+
+And then set your config options for the deployment, by copying `settings.example.ini` to `settings.ini` and changing the options contained within as required.
+
+And then start the virtual machine using:
+
+```bash
+vagrant up
+```
+
+If you would like a new superuser to be provisioned when deploying the network mapper, change the following line in `playbook.yml`:
+
+```yaml
+provision_superuser: false
+```
+
+to
+
+```yaml
+provision_superuser: true
+```
+
+And change the `superuser_*` options below it as desired.
+
+Then provision the virtual machine (deploying the network mapper) using:
+
+```bash
+vagrant provision
+```
+
+This installs the network mapper and makes it available on the local machine at `http://localhost:8080`.
+If you wish to make this accessible from other devices on your local network, replace the following line in `deploy/Vagrantfile`:
+
+```ruby
+config.vm.network "forwarded_port", guest: 80, host: 8080, host_ip: "127.0.0.1"
+```
+
+with:
+
+```ruby
+config.vm.network "forwarded_port", guest: 80, host: 8080
+```
+
+To stop the virtual machine run the following, in the `deploy` directory:
+
+```
+vagrant halt
+```
+
+For further commands see the [Vagrant documentation](https://www.vagrantup.com/docs/cli).
+
+## Production Deployment
+
+### Ansible (Recommended)
+
+Prerequisites:
+
+- [Ansible](https://www.ansible.com/)
+
+:::{note}
+Deployment with Ansible has been tested on RHEL7 and RHEL8, but is compatible with other Linux distributions with minor changes to the playbook (`deploy/playbook.yml`)
+:::
+
+To deploy the BRECcIA Network Mapper with Ansible:
+
+1. Copy `settings.example.ini` to `settings.ini`
+2. Edit this file as desired. Note there is no requirement to change any of these variables, but it is recommended.
+3. Copy `inventory.example.yml` to `inventory.yml`
+4. Edit this file to reflect your Ansible setup:
+ - Use your server's hostname instead of `example.com`
+ - Replace the secret key with some text known only to you
+5. If you would like a new superuser to be provisioned for the network mapper (e.g. during initial install), edit the following line of `playbook.yml`:
+
+```yaml
+provision_superuser: false
+```
+
+to
+
+```yaml
+provision_superuser: true
+```
+
+And change the `superuser_*` options below it as desired.
+
+6. Run the Ansible playbook `playbook.yml` with this inventory file using:
+
+```
+ansible-playbook playbook.yml -i inventory.yml -K -k -u
+```
+
+This will ask for your SSH and sudo passwords for the server before deploying.
+To redeploy updates, the same command can be run again - it's safe to redeploy on top of an existing deployment.
+
+### Docker Compose
+
+Prerequisites:
+
+- [Docker Compose](https://docs.docker.com/compose) (installed by default with most [Docker](https://docker.com/) installs)
+
+:::{note}
+Deployment with Docker has been tested on RHEL7, RHEL8, and Ubuntu 22.04 LTS
+:::
+
+To deploy the BRECcIA Network Mapper with Docker:
+
+1. Copy `deploy/settings.example.ini` to `breccia_mapper/settings.ini`
+2. Edit this file as desired. Note there is no requirement to change any of these variables, but it is recommended.
+3. Create the database using:
+
+```bash
+touch db.sqlite3
+```
+
+4. Set the `DEBUG` and `SECRET_KEY` values in `docker-compose.yml`.
+ - The secret key should be a long, random string that only you know. Replace `${DJANGO_SECRET_KEY}` with this key.
+ - Debug can be `True` or `False`. Replace `${DJANGO_DEBUG}` with this value.
+ - You can also set these via environment variables on the host machine. The appropriate environment variables are `DJANGO_SECRET_KEY` and `DJANGO_DEBUG`.
+5. Start the containers with the following command (you may need to use `sudo`):
+
+```bash
+docker compose up -d
+```
+
+6. Create a superuser by running the following, and enter their details when prompted:
+
+```bash
+docker compose exec -it server /bin/bash -c "/app/manage.py createsuperuser"
+```
+
diff --git a/docs/source/index.md b/docs/source/index.md
new file mode 100644
index 0000000..2b4523f
--- /dev/null
+++ b/docs/source/index.md
@@ -0,0 +1,17 @@
+# BRECcIA Network Mapper documentation
+
+The BRECcIA Network Mapper is a web app designed to track and quantify personnel networks & relationships - primarily developed for use in research projects. It is designed for global use across many different organisations involved in a single project, and has been utilised as part of [BRECcIA](https://gcrf-breccia.com) itself.
+
+This work was funded through the "Building REsearch Capacity for sustainable water and food security In drylands of sub-saharan Africa" (BRECcIA) project which is supported by UK Research and Innovation as part of the Global Challenges Research Fund, grant number NE/P021093/1.
+
+:::{note}
+This project is still under development until April 2023.
+:::
+
+## Contents
+
+```{toctree}
+:maxdepth: 4
+:glob:
+*
+```
\ No newline at end of file
diff --git a/docs/source/requirements.txt b/docs/source/requirements.txt
new file mode 100644
index 0000000..8085d79
--- /dev/null
+++ b/docs/source/requirements.txt
@@ -0,0 +1 @@
+myst-parser
\ No newline at end of file
diff --git a/media/400x400.png b/media/400x400.png
new file mode 100644
index 0000000..8668627
Binary files /dev/null and b/media/400x400.png differ
diff --git a/media/800x500.png b/media/800x500.png
new file mode 100644
index 0000000..af408ed
Binary files /dev/null and b/media/800x500.png differ
diff --git a/people/fixtures/email_templates.json b/people/fixtures/email_templates.json
index 78a8fd2..73a4836 100644
--- a/people/fixtures/email_templates.json
+++ b/people/fixtures/email_templates.json
@@ -6,9 +6,9 @@
"description": "Default welcome email template",
"created": "2020-04-27T12:13:30.448Z",
"last_updated": "2020-04-27T14:45:27.152Z",
- "subject": "Welcome to {{settings.PROJECT_LONG_NAME}}",
- "content": "Dear {{ user.get_full_name }},\r\n\r\nWelcome to {{ settings.PROJECT_LONG_NAME }}.\r\n\r\nThanks,\r\n\r\nThe {{ settings.PROJECT_LONG_NAME }} team",
- "html_content": "{{ settings.PROJECT_LONG_NAME }}
\r\n\r\nDear {{ user.get_full_name }},\r\n\r\nWelcome to {{ settings.PROJECT_LONG_NAME }}.\r\n\r\nThanks,\r\n\r\nThe {{ settings.PROJECT_LONG_NAME }} team",
+ "subject": "Welcome to {{config.PROJECT_LONG_NAME}}",
+ "content": "Dear user,\r\n\r\nWelcome to {{ config.PROJECT_LONG_NAME }}. You can sign in at {{ config.DEPLOYMENT_URL }}.\r\n\r\nThanks,\r\n\r\nThe {{ config.PROJECT_SHORT_NAME }} team",
+ "html_content": "{{ config.PROJECT_LONG_NAME }}
Dear user,
Welcome to {{ config.PROJECT_LONG_NAME }}. You can sign in here.
Thanks,
The {{ config.PROJECT_SHORT_NAME }} team
",
"language": "",
"default_template": null
}
diff --git a/people/forms.py b/people/forms.py
old mode 100644
new mode 100755
index 925ea56..3c65243
--- a/people/forms.py
+++ b/people/forms.py
@@ -3,9 +3,10 @@
import typing
from django import forms
-from django.conf import settings
-from bootstrap_datepicker_plus import DatePickerInput
+from constance import config
+
+from bootstrap_datepicker_plus.widgets import DatePickerInput
from django_select2.forms import ModelSelect2Widget, Select2Widget, Select2MultipleWidget
from . import models
@@ -121,7 +122,7 @@ class OrganisationAnswerSetForm(forms.ModelForm, DynamicAnswerSetBase):
]
labels = {
'is_partner_organisation':
- f'Is this organisation a {settings.PARENT_PROJECT_NAME} partner organisation?'
+ f'Is this organisation a {config.PARENT_PROJECT_NAME} partner organisation?'
}
widgets = {
'countries': Select2MultipleWidget(),
@@ -185,14 +186,14 @@ class PersonAnswerSetForm(forms.ModelForm, DynamicAnswerSetBase):
widgets = {
'nationality': Select2MultipleWidget(),
'country_of_residence': Select2Widget(),
- 'organisation_started_date': DatePickerInput(format='%Y-%m-%d'),
- 'project_started_date': DatePickerInput(format='%Y-%m-%d'),
+ 'organisation_started_date': DatePickerInput(),
+ 'project_started_date': DatePickerInput(),
'latitude': forms.HiddenInput,
'longitude': forms.HiddenInput,
}
labels = {
'project_started_date':
- f'Date started on the {settings.PARENT_PROJECT_NAME} project',
+ f'Date started on the {config.PARENT_PROJECT_NAME} project',
'external_organisations':
'Please list the main organisations external to BRECcIA work that you have been working with since 1st January 2019 that are involved in food/water security in African dryland regions'
}
@@ -325,7 +326,7 @@ class OrganisationRelationshipAnswerSetForm(forms.ModelForm,
class DateForm(forms.Form):
date = forms.DateField(
required=False,
- widget=DatePickerInput(format='%Y-%m-%d'),
+ widget=DatePickerInput(),
help_text='Show relationships as they were on this date'
)
diff --git a/people/migrations/0002_add_relationship_models.py b/people/migrations/0002_add_relationship_models.py
old mode 100644
new mode 100755
index cc6c888..d448c52
--- a/people/migrations/0002_add_relationship_models.py
+++ b/people/migrations/0002_add_relationship_models.py
@@ -50,10 +50,10 @@ class Migration(migrations.Migration):
),
migrations.AddConstraint(
model_name='relationshipquestionchoice',
- constraint=models.UniqueConstraint(fields=('question', 'text'), name='unique_question_answer'),
+ constraint=models.UniqueConstraint(fields=('question', 'text'), name='unique_question_answer_relationshipquestionchoice'),
),
migrations.AddConstraint(
model_name='relationship',
- constraint=models.UniqueConstraint(fields=('source', 'target'), name='unique_relationship'),
+ constraint=models.UniqueConstraint(fields=('source', 'target'), name='unique_relationship_relationship'),
),
]
diff --git a/people/migrations/0022_refactor_person_questions.py b/people/migrations/0022_refactor_person_questions.py
old mode 100644
new mode 100755
index 2da386b..d2869d8
--- a/people/migrations/0022_refactor_person_questions.py
+++ b/people/migrations/0022_refactor_person_questions.py
@@ -50,6 +50,6 @@ class Migration(migrations.Migration):
),
migrations.AddConstraint(
model_name='personquestionchoice',
- constraint=models.UniqueConstraint(fields=('question', 'text'), name='unique_question_answer'),
+ constraint=models.UniqueConstraint(fields=('question', 'text'), name='unique_question_answer_personquestionchoice'),
),
]
diff --git a/people/migrations/0035_add_organisation_questions.py b/people/migrations/0035_add_organisation_questions.py
old mode 100644
new mode 100755
index 19fccaf..d3f0702
--- a/people/migrations/0035_add_organisation_questions.py
+++ b/people/migrations/0035_add_organisation_questions.py
@@ -56,6 +56,6 @@ class Migration(migrations.Migration):
),
migrations.AddConstraint(
model_name='organisationquestionchoice',
- constraint=models.UniqueConstraint(fields=('question', 'text'), name='unique_question_answer'),
+ constraint=models.UniqueConstraint(fields=('question', 'text'), name='unique_question_answer_organisationquestionchoice'),
),
]
diff --git a/people/migrations/0039_add_organisation_relationship.py b/people/migrations/0039_add_organisation_relationship.py
old mode 100644
new mode 100755
index 461d897..dfcd46c
--- a/people/migrations/0039_add_organisation_relationship.py
+++ b/people/migrations/0039_add_organisation_relationship.py
@@ -67,10 +67,10 @@ class Migration(migrations.Migration):
),
migrations.AddConstraint(
model_name='organisationrelationshipquestionchoice',
- constraint=models.UniqueConstraint(fields=('question', 'text'), name='unique_question_answer'),
+ constraint=models.UniqueConstraint(fields=('question', 'text'), name='unique_question_answer_organisationrelationshipquestionchoice'),
),
migrations.AddConstraint(
model_name='organisationrelationship',
- constraint=models.UniqueConstraint(fields=('source', 'target'), name='unique_relationship'),
+ constraint=models.UniqueConstraint(fields=('source', 'target'), name='unique_relationship_organisationrelationship'),
),
]
diff --git a/people/migrations/0055_remove_organisationrelationship_unique_relationship_organisationrelationship_and_more.py b/people/migrations/0055_remove_organisationrelationship_unique_relationship_organisationrelationship_and_more.py
new file mode 100755
index 0000000..ccdcce5
--- /dev/null
+++ b/people/migrations/0055_remove_organisationrelationship_unique_relationship_organisationrelationship_and_more.py
@@ -0,0 +1,119 @@
+# Generated by Django 4.1.4 on 2023-01-05 16:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('people', '0054_add_option_for_auto_negative_response'),
+ ]
+
+ operations = [
+ migrations.RemoveConstraint(
+ model_name='organisationrelationship',
+ name='unique_relationship_organisationrelationship',
+ ),
+ migrations.RemoveConstraint(
+ model_name='relationship',
+ name='unique_relationship_relationship',
+ ),
+ migrations.AlterField(
+ model_name='organisation',
+ name='id',
+ field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+ ),
+ migrations.AlterField(
+ model_name='organisationanswerset',
+ name='id',
+ field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+ ),
+ migrations.AlterField(
+ model_name='organisationquestion',
+ name='id',
+ field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+ ),
+ migrations.AlterField(
+ model_name='organisationquestionchoice',
+ name='id',
+ field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+ ),
+ migrations.AlterField(
+ model_name='organisationrelationship',
+ name='id',
+ field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+ ),
+ migrations.AlterField(
+ model_name='organisationrelationshipanswerset',
+ name='id',
+ field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+ ),
+ migrations.AlterField(
+ model_name='organisationrelationshipquestion',
+ name='id',
+ field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+ ),
+ migrations.AlterField(
+ model_name='organisationrelationshipquestionchoice',
+ name='id',
+ field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+ ),
+ migrations.AlterField(
+ model_name='person',
+ name='id',
+ field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+ ),
+ migrations.AlterField(
+ model_name='personanswerset',
+ name='id',
+ field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+ ),
+ migrations.AlterField(
+ model_name='personquestion',
+ name='id',
+ field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+ ),
+ migrations.AlterField(
+ model_name='personquestionchoice',
+ name='id',
+ field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+ ),
+ migrations.AlterField(
+ model_name='relationship',
+ name='id',
+ field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+ ),
+ migrations.AlterField(
+ model_name='relationshipanswerset',
+ name='id',
+ field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+ ),
+ migrations.AlterField(
+ model_name='relationshipquestion',
+ name='id',
+ field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+ ),
+ migrations.AlterField(
+ model_name='relationshipquestionchoice',
+ name='id',
+ field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+ ),
+ migrations.AlterField(
+ model_name='user',
+ name='first_name',
+ field=models.CharField(blank=True, max_length=150, verbose_name='first name'),
+ ),
+ migrations.AlterField(
+ model_name='user',
+ name='id',
+ field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+ ),
+ migrations.AddConstraint(
+ model_name='organisationrelationship',
+ constraint=models.UniqueConstraint(fields=('source', 'target'), name='unique_relationship_modelorganisationrelationship'),
+ ),
+ migrations.AddConstraint(
+ model_name='relationship',
+ constraint=models.UniqueConstraint(fields=('source', 'target'), name='unique_relationship_modelrelationship'),
+ ),
+ ]
diff --git a/people/models/organisation.py b/people/models/organisation.py
old mode 100644
new mode 100755
index 3156d7f..347999a
--- a/people/models/organisation.py
+++ b/people/models/organisation.py
@@ -35,6 +35,11 @@ class OrganisationQuestionChoice(QuestionChoice):
on_delete=models.CASCADE,
blank=False,
null=False)
+ class Meta(QuestionChoice.Meta):
+ constraints = [
+ models.UniqueConstraint(fields=['question', 'text'],
+ name='unique_question_answer_organisationquestionchoice')
+ ]
class Organisation(models.Model):
diff --git a/people/models/person.py b/people/models/person.py
old mode 100644
new mode 100755
index 618bbfb..fa38acd
--- a/people/models/person.py
+++ b/people/models/person.py
@@ -8,9 +8,10 @@ from django.urls import reverse
from django.utils.translation import gettext_lazy as _
from django_countries.fields import CountryField
-from django_settings_export import settings_export
from post_office import mail
+from constance import config
+
from .organisation import Organisation
from .question import AnswerSet, Question, QuestionChoice
@@ -43,10 +44,10 @@ class User(AbstractUser):
def send_welcome_email(self) -> None:
"""Send a welcome email to a new user."""
# Get exported data from settings.py first
- context = settings_export(None)
- context.update({
+ context = {
'user': self,
- })
+ 'config': config,
+ }
logger.info('Sending welcome mail to user \'%s\'', self.username)
@@ -77,6 +78,11 @@ class PersonQuestionChoice(QuestionChoice):
on_delete=models.CASCADE,
blank=False,
null=False)
+ class Meta(QuestionChoice.Meta):
+ constraints = [
+ models.UniqueConstraint(fields=['question', 'text'],
+ name='unique_question_answer_personquestionchoice')
+ ]
class Person(models.Model):
diff --git a/people/models/question.py b/people/models/question.py
old mode 100644
new mode 100755
index 5d455e1..93b8161
--- a/people/models/question.py
+++ b/people/models/question.py
@@ -92,7 +92,7 @@ class QuestionChoice(models.Model):
abstract = True
constraints = [
models.UniqueConstraint(fields=['question', 'text'],
- name='unique_question_answer')
+ name='unique_question_answer_modelquestionchoice')
]
ordering = [
'question__order',
diff --git a/people/models/relationship.py b/people/models/relationship.py
old mode 100644
new mode 100755
index 3fd703d..ecd2c98
--- a/people/models/relationship.py
+++ b/people/models/relationship.py
@@ -33,6 +33,11 @@ class RelationshipQuestionChoice(QuestionChoice):
on_delete=models.CASCADE,
blank=False,
null=False)
+ class Meta(QuestionChoice.Meta):
+ constraints = [
+ models.UniqueConstraint(fields=['question', 'text'],
+ name='unique_question_answer_relationshipquestionchoice')
+ ]
class Relationship(models.Model):
@@ -40,7 +45,7 @@ class Relationship(models.Model):
class Meta:
constraints = [
models.UniqueConstraint(fields=['source', 'target'],
- name='unique_relationship'),
+ name='unique_relationship_modelrelationship'),
]
#: Person reporting the relationship
@@ -122,6 +127,11 @@ class OrganisationRelationshipQuestionChoice(QuestionChoice):
on_delete=models.CASCADE,
blank=False,
null=False)
+ class Meta(QuestionChoice.Meta):
+ constraints = [
+ models.UniqueConstraint(fields=['question', 'text'],
+ name='unique_question_answer_organisationrelationshipquestionchoice')
+ ]
class OrganisationRelationship(models.Model):
@@ -129,7 +139,7 @@ class OrganisationRelationship(models.Model):
class Meta:
constraints = [
models.UniqueConstraint(fields=['source', 'target'],
- name='unique_relationship'),
+ name='unique_relationship_modelorganisationrelationship'),
]
#: Person reporting the relationship
diff --git a/people/templates/people/map.html b/people/templates/people/map.html
old mode 100644
new mode 100755
index 688d32e..8560ee0
--- a/people/templates/people/map.html
+++ b/people/templates/people/map.html
@@ -3,7 +3,7 @@
{% block extra_head %}
{{ map_markers|json_script:'map-markers' }}
- {% load staticfiles %}
+ {% load static %}
- {% load staticfiles %}
+ {% load static %}
{% endblock %}
\ No newline at end of file
diff --git a/people/templates/people/organisation/detail.html b/people/templates/people/organisation/detail.html
old mode 100644
new mode 100755
index 1bb6dd0..6b75af2
--- a/people/templates/people/organisation/detail.html
+++ b/people/templates/people/organisation/detail.html
@@ -3,7 +3,7 @@
{% block extra_head %}
{{ map_markers|json_script:'map-markers' }}
- {% load staticfiles %}
+ {% load static %}
diff --git a/people/templates/people/person/detail_full.html b/people/templates/people/person/detail_full.html
old mode 100644
new mode 100755
index d550fa1..c3b3651
--- a/people/templates/people/person/detail_full.html
+++ b/people/templates/people/person/detail_full.html
@@ -3,7 +3,7 @@
{% block extra_head %}
{{ map_markers|json_script:'map-markers' }}
- {% load staticfiles %}
+ {% load static %}
diff --git a/people/templates/people/relationship/detail.html b/people/templates/people/relationship/detail.html
old mode 100644
new mode 100755
index 2d4c0ee..f681941
--- a/people/templates/people/relationship/detail.html
+++ b/people/templates/people/relationship/detail.html
@@ -47,7 +47,7 @@
{% if relationship.reverse %}
-
+
{% endif %}