me/breccia-mapper
1
0
Fork 0
mirror of https://github.com/Southampton-RSG/breccia-mapper.git synced 2026-03-03 11:27:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

style: Fix some autoformatting issues

Browse Source
This commit is contained in:
James Graham
2020-06-26 11:45:21 +01:00
parent 387cebd0d4
commit 8689c1a204
2 changed files with 96 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

178
breccia_mapper/templates/base.html
View File

@@ -28,13 +28,13 @@
<link rel="stylesheet" href="{% static 'css/global.css' %}"> <link rel="stylesheet" href="{% static 'css/global.css' %}">
{% if 'javascript_in_head'|bootstrap_setting %} {% if 'javascript_in_head'|bootstrap_setting %}
{% if 'include_jquery'|bootstrap_setting %} {% if 'include_jquery'|bootstrap_setting %}
{# jQuery JavaScript if it is in head #} {# jQuery JavaScript if it is in head #}
{% bootstrap_jquery jquery='include_jquery'|bootstrap_setting %} {% bootstrap_jquery jquery='include_jquery'|bootstrap_setting %}
{% endif %} {% endif %}
{# Bootstrap JavaScript if it is in head #} {# Bootstrap JavaScript if it is in head #}
{% bootstrap_javascript %} {% bootstrap_javascript %}
{% endif %} {% endif %}
{% if form %} {% if form %}
@@ -48,104 +48,104 @@
<body> <body>
<div class="content" style="display: flex; flex-direction: column"> <div class="content" style="display: flex; flex-direction: column">
{% block navbar %} {% block navbar %}
<nav class="navbar navbar-expand-lg navbar-dark bg-dark"> <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
<div class="container"> <div class="container">
<a href="{% url 'index' %}" class="navbar-brand"> <a href="{% url 'index' %}" class="navbar-brand">
{{ settings.PROJECT_SHORT_NAME }} {{ settings.PROJECT_SHORT_NAME }}
</a> </a>
<button type="button" class="navbar-toggler" <button type="button" class="navbar-toggler"
data-toggle="collapse" data-target="#navbarCollapse" data-toggle="collapse" data-target="#navbarCollapse"
aria-controls="navbar-collapse" aria-expanded="false" aria-label="Toggle navbar"> aria-controls="navbar-collapse" aria-expanded="false" aria-label="Toggle navbar">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<div class="navbar-collapse collapse" id="navbarCollapse"> <div class="navbar-collapse collapse" id="navbarCollapse">
<ul class="navbar-nav mt-2 mt-lg-0"> <ul class="navbar-nav mt-2 mt-lg-0">
<li class="nav-item"> <li class="nav-item">
<a href="{% url 'people:person.list' %}" class="nav-link">People</a> <a href="{% url 'people:person.list' %}" class="nav-link">People</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{% url 'activities:activity-series.list' %}" class="nav-link">Activity Series</a> <a href="{% url 'activities:activity-series.list' %}" class="nav-link">Activity Series</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{% url 'activities:activity.list' %}" class="nav-link">Activities</a> <a href="{% url 'activities:activity.list' %}" class="nav-link">Activities</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{% url 'people:network' %}" class="nav-link">Network</a> <a href="{% url 'people:network' %}" class="nav-link">Network</a>
</li> </li>
{% if request.user.is_superuser %} {% if request.user.is_superuser %}
<li class="nav-item"> <li class="nav-item">
<a href="{% url 'export:index' %}" class="nav-link">Export</a> <a href="{% url 'export:index' %}" class="nav-link">Export</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="{% url 'admin:index' %}" class="nav-link">Admin</a> <a href="{% url 'admin:index' %}" class="nav-link">Admin</a>
</li> </li>
{% endif %} {% endif %}
</ul> </ul>
<ul class="navbar-nav mt-2 mt-lg-0 ml-auto"> <ul class="navbar-nav mt-2 mt-lg-0 ml-auto">
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}
<li class="nav-item"> <li class="nav-item">
{% if request.user.person %} {% if request.user.person %}
<a href="{% url 'people:person.profile' %}" class="nav-link"> <a href="{% url 'people:person.profile' %}" class="nav-link">
<i class="fas fa-user-circle"></i> <i class="fas fa-user-circle"></i>
{{ request.user }} {{ request.user }}
</a> </a>
{% else %}
<a href="{% url 'people:person.create' %}?user" class="nav-link">
<i class="fas fa-user-circle"></i>
{{ request.user }}
</a>
{% endif %}
</li>
<li class="nav-item">
<a href="{% url 'logout' %}" class="nav-link">
<i class="fas fa-sign-out-alt"></i>
Log Out
</a>
</li>
{% else %} {% else %}
<a href="{% url 'people:person.create' %}?user" class="nav-link"> <li class="nav-item">
<i class="fas fa-user-circle"></i> <a href="{% url 'login' %}" class="nav-link">
{{ request.user }} <i class="fas fa-sign-in-alt"></i>
</a> Log In
</a>
</li>
{% endif %} {% endif %}
</li> </ul>
</div>
<li class="nav-item">
<a href="{% url 'logout' %}" class="nav-link">
<i class="fas fa-sign-out-alt"></i>
Log Out
</a>
</li>
{% else %}
<li class="nav-item">
<a href="{% url 'login' %}" class="nav-link">
<i class="fas fa-sign-in-alt"></i>
Log In
</a>
</li>
{% endif %}
</ul>
</div> </div>
</div> </nav>
</nav>
{% endblock %} {% endblock %}
{# Global banner if config.NOTICE_TEXT is set using Constance #} {# Global banner if config.NOTICE_TEXT is set using Constance #}
{% if config.NOTICE_TEXT %} {% if config.NOTICE_TEXT %}
<div class="alert {{ config.NOTICE_CLASS }} rounded-0 mb-3" role="alert"> <div class="alert {{ config.NOTICE_CLASS }} rounded-0 mb-3" role="alert">
<h4 class="alert-heading text-center mb-0">{{ config.NOTICE_TEXT }}</h4> <h4 class="alert-heading text-center mb-0">{{ config.NOTICE_TEXT }}</h4>
</div> </div>
{% endif %} {% endif %}
{% if request.user.is_authenticated and not request.user.has_person %} {% if request.user.is_authenticated and not request.user.has_person %}
<div class="alert alert-info rounded-0" role="alert"> <div class="alert alert-info rounded-0" role="alert">
<p class="text-center mb-0"> <p class="text-center mb-0">
Your profile is currently blank. Your profile is currently blank.
Please fill in your details so you can be part of the network. Please fill in your details so you can be part of the network.
<a class="btn btn-success" <a class="btn btn-success"
href="{% url 'people:person.create' %}?user">Profile</a> href="{% url 'people:person.create' %}?user">Profile</a>
</p> </p>
</div> </div>
{% endif %} {% endif %}
{% block before_content %}{% endblock %} {% block before_content %}{% endblock %}
@@ -169,13 +169,13 @@
</footer> </footer>
{% if not 'javascript_in_head'|bootstrap_setting %} {% if not 'javascript_in_head'|bootstrap_setting %}
{% if 'include_jquery'|bootstrap_setting %} {% if 'include_jquery'|bootstrap_setting %}
{# jQuery JavaScript if it is in body #} {# jQuery JavaScript if it is in body #}
{% bootstrap_jquery jquery='include_jquery'|bootstrap_setting %} {% bootstrap_jquery jquery='include_jquery'|bootstrap_setting %}
{% endif %} {% endif %}
{# Bootstrap JavaScript if it is in body #} {# Bootstrap JavaScript if it is in body #}
{% bootstrap_javascript %} {% bootstrap_javascript %}
{% endif %} {% endif %}
{% if form %} {% if form %}

11
export/serializers/people.py
View File

@@ -46,6 +46,11 @@ class RelationshipSerializer(base.FlattenedModelSerializer):
] ]
def underscore(slug: str) -> str:
"""Replace hyphens with underscores in text."""
return slug.replace('-', '_')
class RelationshipAnswerSetSerializer(base.FlattenedModelSerializer): class RelationshipAnswerSetSerializer(base.FlattenedModelSerializer):
relationship = RelationshipSerializer() relationship = RelationshipSerializer()
@@ -64,7 +69,7 @@ class RelationshipAnswerSetSerializer(base.FlattenedModelSerializer):
# Add relationship questions to columns # Add relationship questions to columns
for question in models.RelationshipQuestion.objects.all(): for question in models.RelationshipQuestion.objects.all():
headers.append(question.slug.replace('-', '_')) headers.append(underscore(question.slug))
return headers return headers
@@ -74,9 +79,7 @@ class RelationshipAnswerSetSerializer(base.FlattenedModelSerializer):
try: try:
# Add relationship question answers to data # Add relationship question answers to data
for answer in instance.question_answers.all(): for answer in instance.question_answers.all():
rep[answer.question.slug.replace('-', rep[underscore(answer.question.slug)] = underscore(answer.slug)
'_')] = answer.slug.replace(
'-', '_')
except AttributeError: except AttributeError:
pass pass