diff --git a/SciPost_v1/urls.py b/SciPost_v1/urls.py
index 1e99be8d609e9b9d7f2a7c9a82a403cd1f7497d7..cf31b72725a6b791465d876c88b56f0df768a757 100644
--- a/SciPost_v1/urls.py
+++ b/SciPost_v1/urls.py
@@ -15,6 +15,8 @@ from journals.viewsets import PublicationViewSetForGoogleScholar
from news.viewsets import NewsItemViewSet
from journals.constants import REGEX_CHOICES
from scipost import views as scipost_views
+from organizations.views import OrganizationListView
+
# Journal URL Regex
JOURNAL_REGEX = '(?P<doi_label>%s)' % REGEX_CHOICES
@@ -65,12 +67,11 @@ urlpatterns = [
url(r'^proceedings/', include('proceedings.urls', namespace="proceedings")),
url(r'^production/', include('production.urls', namespace="production")),
url(r'^profiles/', include('profiles.urls', namespace="profiles")),
- # TODO: partners to be deprecated in favour of sponsors
- url(r'^partners/', include('partners.urls', namespace="partners")),
url(r'^sponsors/', include('sponsors.urls', namespace="sponsors")),
url(r'^stats/', include('stats.urls', namespace="stats")),
- # Keep temporarily for historical reasons
- url(r'^supporting_partners/', include('partners.urls', namespace="_partners")),
+ # Deprecated, keep temporarily for historical reasons
+ url(r'^partners/', OrganizationListView.as_view(), name='partners'),
+ url(r'^supporting_partners/', OrganizationListView.as_view(), name='partners'),
]
if settings.DEBUG:
diff --git a/colleges/templates/colleges/_potentialfellowship_voting_table.html b/colleges/templates/colleges/_potentialfellowship_voting_table.html
index c0361456b5d40413b3777cb42316d929d799c778..84e009e541bdbda48ed66ebc7ee7a48059c5cb83 100644
--- a/colleges/templates/colleges/_potentialfellowship_voting_table.html
+++ b/colleges/templates/colleges/_potentialfellowship_voting_table.html
@@ -17,15 +17,15 @@
Click to vote:
<form action="{% url 'colleges:vote_on_potential_fellowship' potfel_id=potfel.id vote='A' %}" method="post">
{% csrf_token %}
- <input type="submit" class="agree" value="Agree {{ potfel.nr_A }} "/>
+ <input type="submit" class="agree" value="Agree {{ potfel.in_agreement.count }} "/>
</form>
<form action="{% url 'colleges:vote_on_potential_fellowship' potfel_id=potfel.id vote='N' %}" method="post">
{% csrf_token %}
- <input type="submit" class="notsure" value="Abstain {{ potfel.nr_N }}"/>
+ <input type="submit" class="notsure" value="Abstain {{ potfel.in_abstain.count }}"/>
</form>
<form action="{% url 'colleges:vote_on_potential_fellowship' potfel_id=potfel.id vote='D' %}" method="post">
{% csrf_token %}
- <input type="submit" class="disagree" value="Disagree {{ potfel.nr_D }}"/>
+ <input type="submit" class="disagree" value="Disagree {{ potfel.in_disagreement.count }}"/>
</form>
{% if request.user.contributor in potfel.in_agreement.all %}
<strong>(you have voted: Agreed)</strong>
diff --git a/colleges/views.py b/colleges/views.py
index 10b0070361a8917515cb6e7d5663a487ecec7b41..e5cf6c49720c23b42b7fc6e88b7d08e4eda9d6b4 100644
--- a/colleges/views.py
+++ b/colleges/views.py
@@ -380,11 +380,9 @@ class PotentialFellowshipListView(PermissionsMixin, PaginationMixin, ListView):
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context['potfels_to_vote_on'] = PotentialFellowship.objects.to_vote_on(
- self.request.user.contributor).annotate(
- nr_A=Count('in_agreement'), nr_N=Count('in_abstain'), nr_D=Count('in_disagreement'))
+ self.request.user.contributor)
context['potfels_voted_on'] = PotentialFellowship.objects.voted_on(
- self.request.user.contributor).annotate(
- nr_A=Count('in_agreement'), nr_N=Count('in_abstain'), nr_D=Count('in_disagreement'))
+ self.request.user.contributor)
context['subject_areas'] = SCIPOST_SUBJECT_AREAS
context['statuses'] = POTENTIAL_FELLOWSHIP_STATUSES
return context
diff --git a/finances/admin.py b/finances/admin.py
index 9cd10b6fb2e30f396022a1650c5e51610059db4e..b404eea5a7086f61c986f2d014179ff597733ab3 100644
--- a/finances/admin.py
+++ b/finances/admin.py
@@ -4,9 +4,18 @@ __license__ = "AGPL v3"
from django.contrib import admin
-from .models import Subsidy, WorkLog
+from .models import Subsidy, SubsidyAttachment, WorkLog
-admin.site.register(Subsidy)
+class SubsidyAttachmentInline(admin.TabularInline):
+ model = SubsidyAttachment
+
+
+class SubsidyAdmin(admin.ModelAdmin):
+ inlines = [SubsidyAttachmentInline,]
+
+
+admin.site.register(Subsidy, SubsidyAdmin)
+
admin.site.register(WorkLog)
diff --git a/finances/constants.py b/finances/constants.py
index b700a6f0432f14d9a2b65203fdd145b9e4fff95e..5c2d63d1a4b7e0a57dec6b4772fb0a2a92d44b55 100644
--- a/finances/constants.py
+++ b/finances/constants.py
@@ -5,14 +5,19 @@ __license__ = "AGPL v3"
import datetime
-SUBSIDY_TYPE_GRANT = 'grant'
-SUBSIDY_TYPE_PARTNERAGREEMENT = 'partneragreement'
+SUBSIDY_TYPE_SPONSORSHIPAGREEMENT = 'sponsorshipagreement'
+SUBSIDY_TYPE_INCIDENTALGRANT = 'incidentalgrant'
+SUBSIDY_TYPE_DEVELOPMENTGRANT = 'developmentgrant'
SUBSIDY_TYPE_COLLABORATION = 'collaborationagreement'
+SUBSIDY_TYPE_DONATION = 'donation'
+
SUBSIDY_TYPES = (
- (SUBSIDY_TYPE_GRANT, 'Grant'),
- (SUBSIDY_TYPE_PARTNERAGREEMENT, 'Partner Agreement'),
+ (SUBSIDY_TYPE_SPONSORSHIPAGREEMENT, 'Sponsorship Agreement'),
+ (SUBSIDY_TYPE_INCIDENTALGRANT, 'Incidental Grant'),
+ (SUBSIDY_TYPE_DEVELOPMENTGRANT, 'Development Grant'),
(SUBSIDY_TYPE_COLLABORATION, 'Collaboration Agreement'),
+ (SUBSIDY_TYPE_DONATION, 'Donation'),
)
diff --git a/finances/forms.py b/finances/forms.py
index 4320a7d73800a1d5455a83bbf689a23b5c77cf5d..4fbafdb8da41d7409469b87113160b86456da05c 100644
--- a/finances/forms.py
+++ b/finances/forms.py
@@ -15,7 +15,7 @@ from dateutil.rrule import rrule, MONTHLY
from common.forms import MonthYearWidget
from scipost.fields import UserModelChoiceField
-from .models import Subsidy, WorkLog
+from .models import Subsidy, SubsidyAttachment, WorkLog
class SubsidyForm(forms.ModelForm):
@@ -25,9 +25,24 @@ class SubsidyForm(forms.ModelForm):
model = Subsidy
fields = ['organization', 'subsidy_type', 'description',
'amount', 'amount_publicly_shown', 'status',
- 'date', 'date_until']
+ 'date', 'date_until', 'renewable', 'renewal_of']
+class SubsidyAttachmentForm(forms.ModelForm):
+ class Meta:
+ model = SubsidyAttachment
+ fields = (
+ 'subsidy',
+ 'attachment',
+ 'name',
+ 'publicly_visible',
+ )
+
+
+#############
+# Work logs #
+#############
+
class WorkLogForm(forms.ModelForm):
def __init__(self, *args, **kwargs):
self.types = kwargs.pop('log_types', False)
diff --git a/finances/migrations/0009_auto_20190214_0202.py b/finances/migrations/0009_auto_20190214_0202.py
new file mode 100644
index 0000000000000000000000000000000000000000..753137c47d7d4bf4b836cbb9662715f2b1bece7e
--- /dev/null
+++ b/finances/migrations/0009_auto_20190214_0202.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-02-14 01:02
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('finances', '0008_subsidy_amount_publicly_shown'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='subsidy',
+ name='subsidy_type',
+ field=models.CharField(choices=[('sponsorshipagreement', 'Sponsorship Agreement'), ('incidentalgrant', 'Incidental Grant'), ('developmentgrant', 'Development Grant'), ('collaborationagreement', 'Collaboration Agreement'), ('donation', 'Donation'), ('grant', 'Grant'), ('partneragreement', 'Partner Agreement')], max_length=256),
+ ),
+ ]
diff --git a/finances/migrations/0010_updatesubsidytypes.py b/finances/migrations/0010_updatesubsidytypes.py
new file mode 100644
index 0000000000000000000000000000000000000000..6088e5d3b1457539d5e65dd70c56b8d7e54aa6f2
--- /dev/null
+++ b/finances/migrations/0010_updatesubsidytypes.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-02-14 01:04
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+from finances.constants import SUBSIDY_TYPE_SPONSORSHIPAGREEMENT, SUBSIDY_TYPE_INCIDENTALGRANT
+
+def update_subsidy_types(apps, schema_editor):
+ Subsidy = apps.get_model('finances', 'Subsidy')
+
+ Subsidy.objects.filter(subsidy_type='grant').update(
+ subsidy_type=SUBSIDY_TYPE_INCIDENTALGRANT)
+ Subsidy.objects.filter(subsidy_type='partneragreement').update(
+ subsidy_type=SUBSIDY_TYPE_SPONSORSHIPAGREEMENT)
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('finances', '0009_auto_20190214_0202'),
+ ]
+
+ operations = [
+ migrations.RunPython(update_subsidy_types,
+ reverse_code=migrations.RunPython.noop),
+ ]
diff --git a/finances/migrations/0011_auto_20190214_0224.py b/finances/migrations/0011_auto_20190214_0224.py
new file mode 100644
index 0000000000000000000000000000000000000000..bdbb8e1cde12be795dd4780b36ec7f9a3b56102e
--- /dev/null
+++ b/finances/migrations/0011_auto_20190214_0224.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-02-14 01:24
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('finances', '0010_updatesubsidytypes'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='subsidy',
+ name='subsidy_type',
+ field=models.CharField(choices=[('sponsorshipagreement', 'Sponsorship Agreement'), ('incidentalgrant', 'Incidental Grant'), ('developmentgrant', 'Development Grant'), ('collaborationagreement', 'Collaboration Agreement'), ('donation', 'Donation')], max_length=256),
+ ),
+ ]
diff --git a/finances/migrations/0012_subsidyattachment.py b/finances/migrations/0012_subsidyattachment.py
new file mode 100644
index 0000000000000000000000000000000000000000..95ad7cb045d53bb282706204e2dd036704266391
--- /dev/null
+++ b/finances/migrations/0012_subsidyattachment.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-02-14 04:22
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import scipost.storage
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('finances', '0011_auto_20190214_0224'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='SubsidyAttachment',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('attachment', models.FileField(storage=scipost.storage.SecureFileStorage(), upload_to='UPLOADS/FINANCES/SUBSIDIES/ATTACHMENTS')),
+ ('name', models.CharField(max_length=128)),
+ ('publicly_visible', models.BooleanField(default=False)),
+ ('subsidy', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='attachments', to='finances.Subsidy')),
+ ],
+ ),
+ ]
diff --git a/finances/migrations/0013_subsidy_renewal_of.py b/finances/migrations/0013_subsidy_renewal_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..4e12a516903349f25e6f941df9c0a5c530f55d79
--- /dev/null
+++ b/finances/migrations/0013_subsidy_renewal_of.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-02-23 10:49
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('finances', '0012_subsidyattachment'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='subsidy',
+ name='renewal_of',
+ field=models.ManyToManyField(blank=True, related_name='renewed_by', to='finances.Subsidy'),
+ ),
+ ]
diff --git a/partners/migrations/0003_institution_css_class.py b/finances/migrations/0014_subsidy_renewable.py
similarity index 51%
rename from partners/migrations/0003_institution_css_class.py
rename to finances/migrations/0014_subsidy_renewable.py
index 86b396b467187655cd61d5f094d0e0d726f869e8..e08fe96252b20ead4b2c5367b183fe8268e9f6b8 100644
--- a/partners/migrations/0003_institution_css_class.py
+++ b/finances/migrations/0014_subsidy_renewable.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2018-01-11 17:03
+# Generated by Django 1.11.4 on 2019-02-24 05:13
from __future__ import unicode_literals
from django.db import migrations, models
@@ -8,13 +8,13 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
- ('partners', '0002_auto_20171229_1435'),
+ ('finances', '0013_subsidy_renewal_of'),
]
operations = [
migrations.AddField(
- model_name='institution',
- name='css_class',
- field=models.CharField(blank=True, max_length=256),
+ model_name='subsidy',
+ name='renewable',
+ field=models.NullBooleanField(),
),
]
diff --git a/finances/migrations/0015_auto_20190225_0747.py b/finances/migrations/0015_auto_20190225_0747.py
new file mode 100644
index 0000000000000000000000000000000000000000..f704cb1a800a732171c479b3f6e16a3282321b23
--- /dev/null
+++ b/finances/migrations/0015_auto_20190225_0747.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-02-25 06:47
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import finances.models
+import scipost.storage
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('finances', '0014_subsidy_renewable'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='subsidyattachment',
+ name='attachment',
+ field=models.FileField(storage=scipost.storage.SecureFileStorage(), upload_to=finances.models.subsidy_attachment_path),
+ ),
+ ]
diff --git a/finances/models.py b/finances/models.py
index 7cc8f07076ea1b0b4e15875a0421e7810ae5b841..47646bb9bdbac8642db7e84015233fd58c8e9999 100644
--- a/finances/models.py
+++ b/finances/models.py
@@ -2,6 +2,8 @@ __copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
+import datetime
+
from django.conf import settings
from django.contrib.contenttypes.models import ContentType
from django.contrib.contenttypes.fields import GenericForeignKey
@@ -10,9 +12,11 @@ from django.urls import reverse
from django.utils import timezone
from django.utils.html import format_html
-from .constants import SUBSIDY_TYPES, SUBSIDY_STATUS
+from .constants import SUBSIDY_TYPES, SUBSIDY_TYPE_SPONSORSHIPAGREEMENT, SUBSIDY_STATUS
from .utils import id_to_slug
+from scipost.storage import SecureFileStorage
+
class Subsidy(models.Model):
"""
@@ -21,14 +25,14 @@ class Subsidy(models.Model):
to a corresponding Subsidy instance.
This can for example be:
- - a Partners agreement
+ - a Sponsorship agreement
- an incidental grant
- a development grant for a specific purpose
- a Collaboration Agreement
- a donation
The date field represents the date at which the Subsidy was formally agreed,
- or the agreement enters into force.
+ or (e.g. for Sponsorship Agreements) the date at which the agreement enters into force.
The date_until field is optional, and represents (where applicable) the date
after which the object of the Subsidy is officially terminated.
"""
@@ -40,6 +44,9 @@ class Subsidy(models.Model):
status = models.CharField(max_length=32, choices=SUBSIDY_STATUS)
date = models.DateField()
date_until = models.DateField(blank=True, null=True)
+ renewable = models.NullBooleanField()
+ renewal_of = models.ManyToManyField('self', related_name='renewed_by',
+ symmetrical=False, blank=True)
class Meta:
verbose_name_plural = 'subsidies'
@@ -52,6 +59,76 @@ class Subsidy(models.Model):
def get_absolute_url(self):
return reverse('finances:subsidy_details', args=(self.id,))
+ @property
+ def renewal_action_date(self):
+ if self.date_until and self.subsidy_type == SUBSIDY_TYPE_SPONSORSHIPAGREEMENT:
+ return self.date_until - datetime.timedelta(days=122)
+ return '-'
+
+ @property
+ def renewal_action_date_color_class(self):
+ if self.date_until and self.renewable:
+ if self.renewed_by.exists():
+ return 'transparent'
+ today = datetime.date.today()
+ if self.date_until < today + datetime.timedelta(days=122):
+ return 'danger'
+ elif self.date_until < today + datetime.timedelta(days=153):
+ return 'warning'
+ return 'success'
+ return 'transparent'
+
+ @property
+ def date_until_color_class(self):
+ if self.date_until and self.renewable:
+ if self.renewed_by.exists():
+ return 'transparent'
+ today = datetime.date.today()
+ if self.date_until < today:
+ return 'warning'
+ else:
+ return 'success'
+ return 'transparent'
+
+
+def subsidy_attachment_path(instance, filename):
+ """
+ Save the uploaded SubsidyAttachments to country-specific folders.
+ """
+ return 'uploads/finances/subsidies/{0}/{1}/{2}'.format(
+ instance.subsidy.date.strftime('%Y'),
+ instance.subsidy.organization.country, filename)
+
+class SubsidyAttachment(models.Model):
+ """
+ A document related to a Subsidy.
+ """
+ attachment = models.FileField(upload_to=subsidy_attachment_path,
+ storage=SecureFileStorage())
+ name = models.CharField(max_length=128)
+ subsidy = models.ForeignKey('finances.Subsidy', related_name='attachments',
+ blank=True)
+ publicly_visible = models.BooleanField(default=False)
+
+ def __str__(self):
+ return '%s, attachment to %s' % (self.name, self.subsidy)
+
+ def get_absolute_url(self):
+ if self.subsidy:
+ return reverse('finances:subsidy_attachment', args=(self.subsidy.id, self.id))
+
+ def visible_to_user(self, current_user):
+ if self.publicly_visible or current_user.has_perm('scipost.can_manage_subsidies'):
+ return True
+ if self.subsidy.organization.contactrole_set.filter(contact__user=current_user).exists():
+ return True
+ return False
+
+
+###########################
+# Work hours registration #
+###########################
+
class WorkLog(models.Model):
user = models.ForeignKey(settings.AUTH_USER_MODEL)
diff --git a/finances/templates/finances/_subsidy_card.html b/finances/templates/finances/_subsidy_card.html
deleted file mode 100644
index e7168adcd386d086873b36df8789e6ba30579b51..0000000000000000000000000000000000000000
--- a/finances/templates/finances/_subsidy_card.html
+++ /dev/null
@@ -1,42 +0,0 @@
-{% load bootstrap %}
-
-{% load user_groups %}
-
-<div class="card-body">
- <div class="row">
- <div class="col-12">
-
- <h3 class="highlight">Subsidy details</h3>
- {% if perms.scipost.can_manage_subsidies %}
- <ul class="list-inline"><li class="list-inline-item"><strong>Admin actions:</strong></li>
- <li class="list-inline-item"><a href="{% url 'finances:subsidy_update' pk=subsidy.id %}"><span class="text-warning">Update</span></a></li>
- <li class="list-inline-item"><a href="{% url 'finances:subsidy_delete' pk=subsidy.id %}"><span class="text-danger">Delete</span></a></li>
- </ul>
- {% endif %}
-
- <table class="table">
- <tr>
- <td>From:</td><td>{% if subsidy.organization.details_publicly_viewable or perms.scipost.can_manage_organizations %}<a href="{{ subsidy.organization.get_absolute_url }}">{{ subsidy.organization }}</a>{% else %}{{ subsidy.organization }}{% endif %}</td>
- </tr>
- <tr>
- <td>Type:</td><td>{{ subsidy.get_subsidy_type_display }}</td>
- </tr>
- <tr>
- <td>Description:</td><td>{{ subsidy.description }}</td>
- </tr>
- <tr>
- <td>Amount:</td><td>{% if subsidy.amount_publicly_shown or perms.scipost.can_manage_subsidies %}€{{ subsidy.amount }}{% else %}-{% endif %}</td>
- </tr>
- <tr>
- <td>Date:</td><td>{{ subsidy.date }}</td>
- </tr>
- {% if subsidy.date_until %}
- <tr>
- <td>Date until:</td><td>{{ subsidy.date_until }}</td>
- </tr>
- {% endif %}
- </table>
- </div>
- </div>
-
-</div>
diff --git a/finances/templates/finances/finances.html b/finances/templates/finances/finances.html
index 5e1a1be1462125af3639edae6096047ad34662d0..adf91a6e9aab63bf54ee5ff1e384455c451cfe4e 100644
--- a/finances/templates/finances/finances.html
+++ b/finances/templates/finances/finances.html
@@ -28,6 +28,7 @@
<li><a href="{% static 'scipost/info/AnnualReports/AnnualReport_2015.pdf' %}">Annual Report 2015</a></li>
<li><a href="{% static 'scipost/info/AnnualReports/AnnualReport_2016.pdf' %}">Annual Report 2016</a></li>
<li><a href="{% static 'scipost/info/AnnualReports/AnnualReport_2017.pdf' %}">Annual Report 2017</a></li>
+ <li><a href="{% static 'scipost/info/AnnualReports/AnnualReport_2018.pdf' %}">Annual Report 2018</a></li>
</ul>
{% if perms.scipost.can_view_timesheets %}
diff --git a/finances/templates/finances/subsidy_detail.html b/finances/templates/finances/subsidy_detail.html
index ab90b4673d71649e813e958dacb25b70ad32bfee..bf585887d1fdb7e5b11cb673783baf688acdf642 100644
--- a/finances/templates/finances/subsidy_detail.html
+++ b/finances/templates/finances/subsidy_detail.html
@@ -13,10 +13,7 @@
{% block content %}
-<div class="row">
- <div class="col-12">
- {% include 'finances/_subsidy_card.html' with subsidy=subsidy %}
- </div>
-</div>
+ <h1 class="highlight">Subsidy details</h1>
+ {% include 'partials/finances/subsidy_details.html' with subsidy=subsidy %}
{% endblock content %}
diff --git a/finances/templates/finances/subsidy_list.html b/finances/templates/finances/subsidy_list.html
index 5499061ad81e2956fdb9cf82314f67fdea3a25f8..c7bf0329fd8cd205e44cc31fa3e4299a9b54f579 100644
--- a/finances/templates/finances/subsidy_list.html
+++ b/finances/templates/finances/subsidy_list.html
@@ -3,6 +3,7 @@
{% block pagetitle %}: Subsidies{% endblock pagetitle %}
{% load staticfiles %}
+{% load bootstrap %}
{% block headsup %}
<script type="text/javascript">
@@ -52,7 +53,11 @@ $(document).ready(function($) {
<a href="{% url 'finances:subsidies' %}"><i class="fa fa-sort-desc"></i></a>
{% endif %}
</th>
- <th>Date
+ {% if perms.scipost.can_manage_subsidies %}
+ <th>Status</th>
+ <th><span class="small" style="writing-mode: vertical-lr;">attachments?</span></th>
+ {% endif %}
+ <th>From date
{% if request.GET.ordering != 'asc' %}
<a href="?order_by=date&ordering=asc"><i class="fa fa-sort-asc"></i></a>
{% else %}
@@ -64,19 +69,52 @@ $(document).ready(function($) {
<a href="{% url 'finances:subsidies' %}"><i class="fa fa-sort-desc"></i></a>
{% endif %}
</th>
+ <th>Until
+ {% if request.GET.ordering != 'asc' %}
+ <a href="?order_by=until&ordering=asc"><i class="fa fa-sort-asc"></i></a>
+ {% else %}
+ <a href="{% url 'finances:subsidies' %}"><i class="fa fa-sort-asc"></i></a>
+ {% endif %}
+ {% if request.GET.ordering != 'desc' %}
+ <a href="?order_by=until&ordering=desc"><i class="fa fa-sort-desc"></i></a>
+ {% else %}
+ <a href="{% url 'finances:subsidies' %}"><i class="fa fa-sort-desc"></i></a>
+ {% endif %}
+ </th>
+ {% if perms.scipost.can_manage_subsidies %}
+ <th><span class="small" style="writing-mode: vertical-lr;">Renewable?</span></th>
+ <th><span class="small" style="writing-mode: vertical-lr;">Renewed?</span></th>
+ <th>Renewal<br/>action date</th>
+ {% endif %}
</tr>
</thead>
<tbody>
{% for subsidy in object_list %}
- <tr class="table-row" data-href="{% url 'finances:subsidy_details' pk=subsidy.id %}" style="cursor: pointer;">
- <td>{{ subsidy.organization }}</td>
- <td>{{ subsidy.get_subsidy_type_display }}</td>
+ <tr>
+ <td><a href="{{ subsidy.organization.get_absolute_url }}">{{ subsidy.organization }}</a></td>
+ <td><a href="{{ subsidy.get_absolute_url }}">{{ subsidy.get_subsidy_type_display }}</a>
+ {% if subsidy.renewal_of.all|length > 0 %}<br/><span class="small text-muted">Renewal of:<ul class="list-unstyled">{% for prevsub in subsidy.renewal_of.all %}<li><a href="{{ prevsub.get_absolute_url }}">{{ prevsub }}</a></li>{% endfor %}</ul></span>{% endif %}
+ {% if subsidy.renewed_by.all|length > 0 %}<br/><span class="small text-muted">Renewed by:<ul class="list-unstyled">{% for newsub in subsidy.renewed_by.all %}<li><a href="{{ newsub.get_absolute_url }}">{{ newsub }}</a></li>{% endfor %}</ul></span>{% endif %} </td>
<td>{% if subsidy.amount_publicly_shown or perms.scipost.can_manage_subsidies %}€{{ subsidy.amount }}{% else %}-{% endif %}</td>
+ {% if perms.scipost.can_manage_subsidies %}
+ <td>{{ subsidy.get_status_display }}</td>
+ <td>{% if subsidy.attachments.all|length > 0 %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %}</td>
+ {% endif %}
<td>{{ subsidy.date }}</td>
+ <td class="bg-{{ subsidy.date_until_color_class }}">{{ subsidy.date_until }}</td>
+ {% if perms.scipost.can_manage_subsidies %}
+ <td>
+ {% if subsidy.renewable == True %}<i class="fa fa-check-circle text-success"></i>{% elif subsidy.renewable == False %}<i class="fa fa-times-circle text-danger"></i>{% else %}<i class="fa fa-question-circle text-warning"></i>{% endif %}
+ </td>
+ <td>
+ {% if subsidy.renewed_by.all|length > 0 %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %}
+ </td>
+ <td class="bg-{{ subsidy.renewal_action_date_color_class }}">{{ subsidy.renewal_action_date }}</td>
+ {% endif %}
</tr>
{% empty %}
<tr>
- <td colspan="4">No Subsidy found</td>
+ <td colspan="5">No Subsidy found</td>
</tr>
{% endfor %}
</tbody>
diff --git a/finances/templates/finances/subsidyattachment_confirm_delete.html b/finances/templates/finances/subsidyattachment_confirm_delete.html
new file mode 100644
index 0000000000000000000000000000000000000000..282485633abebd3a4aeeda0028870cb9ab74b830
--- /dev/null
+++ b/finances/templates/finances/subsidyattachment_confirm_delete.html
@@ -0,0 +1,30 @@
+{% extends 'finances/base.html' %}
+
+{% load bootstrap %}
+
+{% block breadcrumb_items %}
+{{ block.super }}
+<span class="breadcrumb-item"><a href="{% url 'finances:subsidies' %}">Subsidies</a></span>
+<span class="breadcrumb-item">Confirm deletetion</span>
+{% endblock %}
+
+{% block pagetitle %}: Delete SubsidyAttachment{% endblock pagetitle %}
+
+{% block content %}
+<div class="row">
+ <div class="col-12">
+ <h1 class="highlight">Delete SubsidyAttachment</h1>
+ {{ object }}
+ </div>
+</div>
+<div class="row">
+ <div class="col-12">
+ <form method="post">
+ {% csrf_token %}
+ <h3 class="mb-2">Are you sure you want to delete this SubsidyAttachment?</h3>
+ <input type="submit" class="btn btn-danger" value="Yes, delete it" />
+ </form>
+ </div>
+</div>
+
+{% endblock content %}
diff --git a/finances/templates/finances/subsidyattachment_form.html b/finances/templates/finances/subsidyattachment_form.html
new file mode 100644
index 0000000000000000000000000000000000000000..667ba8229258aaafbe3d6f5b5e47f6bfd34b4ea6
--- /dev/null
+++ b/finances/templates/finances/subsidyattachment_form.html
@@ -0,0 +1,68 @@
+{% extends 'finances/base.html' %}
+
+{% load bootstrap %}
+{% load countries %}
+{% load staticfiles %}
+
+{% block breadcrumb_items %}
+{{ block.super }}
+<span class="breadcrumb-item"><a href="{% url 'finances:subsidies' %}">Subsidies</a></span>
+<span class="breadcrumb-item">{% if form.instance.id %}Update {{ form.instance }}{% else %}Add new Subsidy Attachment{% endif %}</span>
+{% endblock %}
+
+{% block pagetitle %}: SubsidyAttachments{% endblock pagetitle %}
+
+{% block headsup %}
+<link rel="stylesheet" href="{% static 'flags/sprite-hq.css' %}">
+{% endblock headsup %}
+
+{% block content %}
+<div class="row">
+ <div class="col-12">
+ <p><strong>N.B.:</strong> for Sponsorship Agreements, please adopt the following format for the file names:</p>
+ <p>
+ <em>SciPost_Sponsorship_<span class="text-muted">[year]</span>_<span class="text-muted">[2-letter country code]</span>_<span class="text-muted">[Organization acronym or short name]</span>.pdf</em><br/>in which <span class="text-muted">[year]</span> is the year of validity of the Agreement.
+ </p>
+ </div>
+</div>
+<div class="row">
+ <div class="col-2">
+ <p>Examples:</p>
+ </div>
+ <div class="col-1">
+ </div>
+ <div class="col-9">
+ <ul class="list-unstyled">
+ <li><em>SciPost_Sponsorship_2019_AU_UniMelb.pdf</em></li>
+ <li><em>SciPost_Sponsorship_2019_DE_MPDL.pdf</em></li>
+ </ul>
+ </div>
+</div>
+
+<div class="row">
+ <div class="col-3">
+ <h4>Hover on flag to view country code</h4>
+ <p class="small text-muted">[only countries with at least one Organization are listed]</p>
+ </div>
+ <div class="col-8">
+ <ul>
+ {% for code in countrycodes %}
+ {% get_country code as country_obj %}
+ <li style="display: inline-block;">
+ <i class="{{ country_obj.flag_css }}" aria-label="{{ country_obj.code }}" data-toggle="tooltip" title="{{ country_obj.name }}: {{ country_obj.code }}"></i>
+ </li>
+ {% endfor %}
+ </ul>
+ </div>
+</div>
+
+
+<div class="row">
+ <div class="col-12">
+ <form enctype="multipart/form-data" action="" method="post">
+ {% csrf_token %}
+ {{ form|bootstrap }}
+ <input type="submit" value="Submit" class="btn btn-primary">
+ </div>
+</div>
+{% endblock content %}
diff --git a/finances/templates/partials/finances/subsidy_details.html b/finances/templates/partials/finances/subsidy_details.html
new file mode 100644
index 0000000000000000000000000000000000000000..8be008e54d373a79721671b608b3e0676b617801
--- /dev/null
+++ b/finances/templates/partials/finances/subsidy_details.html
@@ -0,0 +1,97 @@
+{% load bootstrap %}
+
+{% load user_groups %}
+{% load guardian_tags %}
+{% get_obj_perms request.user for subsidy.organization as "user_org_perms" %}
+
+<div class="row">
+ <div class="col-12">
+ {% if perms.scipost.can_manage_subsidies %}
+ <ul class="list-inline"><li class="list-inline-item"><strong>Admin actions:</strong></li>
+ <li class="list-inline-item"><a href="{% url 'finances:subsidy_update' pk=subsidy.id %}"><span class="text-warning">Update</span></a></li>
+ <li class="list-inline-item"><a href="{% url 'finances:subsidy_delete' pk=subsidy.id %}"><span class="text-danger">Delete</span></a></li>
+ </ul>
+ {% endif %}
+
+ <table class="table">
+ <tr>
+ <td>From:</td><td>{% if subsidy.organization.details_publicly_viewable or perms.scipost.can_manage_organizations %}<a href="{{ subsidy.organization.get_absolute_url }}">{{ subsidy.organization }}</a>{% else %}{{ subsidy.organization }}{% endif %}</td>
+ </tr>
+ <tr>
+ <td>Type:</td><td>{{ subsidy.get_subsidy_type_display }}</td>
+ </tr>
+ <tr>
+ <td>Description:</td><td>{{ subsidy.description }}</td>
+ </tr>
+ <tr>
+ <td>Amount:</td><td>{% if subsidy.amount_publicly_shown or perms.scipost.can_manage_subsidies or "can_view_org_contacts" in user_org_perms %}€{{ subsidy.amount }}{% else %}-{% endif %}{% if perms.scipost.can_manage_subsidies or "can_view_org_contacts" in user_org_perms %} {% if subsidy.amount_publicly_shown %}<span class="text-success">publicly visible</span>{% else %}<span class="text-danger">publicly invisible</span>{% endif %} <a href="{% url 'finances:subsidy_toggle_amount_public_visibility' subsidy_id=subsidy.id %}" class="small">Make it {% if subsidy.amount_publicly_shown %}in{% endif %}visible</a>{% endif %}</td>
+ </tr>
+ <tr>
+ <td>Date:</td><td>{{ subsidy.date }}</td>
+ </tr>
+ {% if subsidy.date_until %}
+ <tr>
+ <td>Date until:</td><td>{{ subsidy.date_until }}</td>
+ </tr>
+ {% endif %}
+ {% if perms.scipost.can_manage_subsidies %}
+ <tr>
+ <td>Renewable?</td><td>{% if subsidy.renewable == True %}Yes, renewal action date: <span class="bg-{{ subsidy.renewal_action_date_color_class }}">{{ subsidy.renewal_action_date }}</span>{% elif subsidy.renewable == None %}Undetermined [please update]{% else %}No{% endif %}</td>
+ </tr>
+ <tr>
+ <td>Status</td>
+ <td>{{ subsidy.get_status_display }}</td>
+ </tr>
+ {% endif %}
+ </table>
+
+ {% if subsidy.renewal_of.all|length > 0 %}
+ <p>
+ Renewal of:<ul>{% for prevsub in subsidy.renewal_of.all %}<li><a href="{% url 'finances:subsidy_details' pk=prevsub.id %}">{{ prevsub }}</a></li>{% endfor %}</ul>
+ </p>
+ {% endif %}
+ {% if subsidy.renewed_by.all|length > 0 %}
+ <p>
+ Renewed by:<ul>{% for newsub in subsidy.renewed_by.all %}<li><a href="{% url 'finances:subsidy_details' pk=newsub.id %}">{{ newsub }}</a></li>{% endfor %}</ul>
+ </p>
+ {% endif %}
+
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-12">
+ <h3>Attachments</h3>
+ {% if perms.scipost.can_manage_subsidies %}
+ <ul>
+ <li><a href="{% url 'finances:subsidyattachment_create' subsidy_id=subsidy.id %}">Add a Subsidy Attachment</a> to this Subsidy</li>
+ </ul>
+ {% endif %}
+ <table class="table">
+ <tr>
+ <th>File name</th>
+ {% if perms.scipost.can_manage_subsidies or "can_view_org_contacts" in user_org_perms %}
+ <th>Publicly visible?</th>
+ {% endif %}
+ </tr>
+ {% for att in subsidy.attachments.all %}
+ {% if att.publicly_visible or perms.scipost.can_manage_subsidies or "can_view_org_contacts" in user_org_perms %}
+ <tr>
+ <td><a href="{{ att.get_absolute_url }}" target="_blank">{{ att.name }}</a></td>
+ {% if perms.scipost.can_manage_subsidies or "can_view_org_contacts" in user_org_perms %}
+ <td>{% if att.publicly_visible %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %} <a href="{% url 'finances:subsidy_attachment_toggle_public_visibility' attachment_id=att.id %}" class="small">Make it {% if att.publicly_visible %}in{% endif %}visible</a></td>
+ {% if perms.scipost.can_manage_subsidies %}
+ <td><a href="{% url 'finances:subsidyattachment_update' pk=att.id %}"><span class="text-warning">Update</span></a></td>
+ <td><a href="{% url 'finances:subsidyattachment_delete' pk=att.id %}"><span class="text-danger">Delete</span></a></td>
+ {% endif %}
+ {% endif %}
+ </tr>
+ {% endif %}
+ {% empty %}
+ <tr>
+ <td>No attachment found</td>
+ </tr>
+ {% endfor %}
+ </table>
+ </div>
+</div>
diff --git a/finances/urls.py b/finances/urls.py
index 31bd7da08fed250e82b94718d8467d4b6fc4dabc..ed97e7ef0f29570ec4265c19eac6368d2571a371 100644
--- a/finances/urls.py
+++ b/finances/urls.py
@@ -18,6 +18,23 @@ urlpatterns = [
url(r'^subsidies/(?P<pk>[0-9]+)/delete/$', views.SubsidyDeleteView.as_view(),
name='subsidy_delete'),
url(r'^subsidies/(?P<pk>[0-9]+)/$', views.SubsidyDetailView.as_view(), name='subsidy_details'),
+ url(r'^subsidies/(?P<subsidy_id>[0-9]+)/toggle_amount_visibility/$',
+ views.subsidy_toggle_amount_public_visibility,
+ name='subsidy_toggle_amount_public_visibility'),
+ url(r'^subsidies/(?P<subsidy_id>[0-9]+)/attachments/add/$',
+ views.SubsidyAttachmentCreateView.as_view(),
+ name='subsidyattachment_create'),
+ url(r'^subsidies/attachments/(?P<pk>[0-9]+)/update/$',
+ views.SubsidyAttachmentUpdateView.as_view(),
+ name='subsidyattachment_update'),
+ url(r'^subsidies/attachments/(?P<pk>[0-9]+)/delete/$',
+ views.SubsidyAttachmentDeleteView.as_view(),
+ name='subsidyattachment_delete'),
+ url(r'^subsidies/attachments/(?P<attachment_id>[0-9]+)/toggle_visibility/$',
+ views.subsidy_attachment_toggle_public_visibility,
+ name='subsidy_attachment_toggle_public_visibility'),
+ url(r'^subsidies/(?P<subsidy_id>[0-9]+)/attachments/(?P<attachment_id>[0-9]+)$',
+ views.subsidy_attachment, name='subsidy_attachment'),
# Timesheets
url(r'^timesheets$', views.timesheets, name='timesheets'),
diff --git a/finances/views.py b/finances/views.py
index 90f6c21037c653f2b74f6b61327f860de5d5a297..0b7939f46885888b3e1c55659a60118293425990 100644
--- a/finances/views.py
+++ b/finances/views.py
@@ -2,20 +2,24 @@ __copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
+import mimetypes
+
from django.contrib import messages
from django.contrib.auth.decorators import permission_required
from django.contrib.auth.mixins import LoginRequiredMixin
+from django.core.exceptions import PermissionDenied
from django.core.urlresolvers import reverse_lazy
-from django.http import Http404
-from django.shortcuts import render
+from django.http import Http404, HttpResponse
+from django.shortcuts import get_object_or_404, render, redirect
from django.views.generic.detail import DetailView
from django.views.generic.edit import CreateView, UpdateView, DeleteView
from django.views.generic.list import ListView
-from .forms import SubsidyForm, LogsFilter
-from .models import Subsidy, WorkLog
+from .forms import SubsidyForm, SubsidyAttachmentForm, LogsFilter
+from .models import Subsidy, SubsidyAttachment, WorkLog
from .utils import slug_to_id
+from organizations.models import Organization
from scipost.mixins import PermissionsMixin
@@ -32,7 +36,9 @@ class SubsidyCreateView(PermissionsMixin, CreateView):
model = Subsidy
form_class = SubsidyForm
template_name = 'finances/subsidy_form.html'
- success_url = reverse_lazy('finances:subsidies')
+
+ def get_success_url(self):
+ return reverse_lazy('finances:subsidy_details', kwargs={'pk': self.object.id})
class SubsidyUpdateView(PermissionsMixin, UpdateView):
@@ -43,7 +49,9 @@ class SubsidyUpdateView(PermissionsMixin, UpdateView):
model = Subsidy
form_class = SubsidyForm
template_name = 'finances/subsidy_form.html'
- success_url = reverse_lazy('finances:subsidies')
+
+ def get_success_url(self):
+ return reverse_lazy('finances:subsidy_details', kwargs={'pk': self.object.id})
class SubsidyDeleteView(PermissionsMixin, DeleteView):
@@ -69,6 +77,8 @@ class SubsidyListView(ListView):
qs = qs.filter(amount_publicly_shown=True).order_by('amount')
elif order_by == 'date':
qs = qs.order_by('date')
+ elif order_by == 'until':
+ qs = qs.order_by('date_until')
if ordering == 'desc':
qs = qs.reverse()
return qs
@@ -78,6 +88,104 @@ class SubsidyDetailView(DetailView):
model = Subsidy
+def subsidy_toggle_amount_public_visibility(request, subsidy_id):
+ """
+ Method to toggle the public visibility of the amount of a Subsidy.
+ Callable by Admin and Contacts for the relevant Organization.
+ """
+ subsidy = get_object_or_404(Subsidy, pk=subsidy_id)
+ if not (request.user.has_perm('scipost.can_manage_subsidies') or
+ request.user.has_perm('can_view_org_contacts', subsidy.organization)):
+ raise PermissionDenied
+ subsidy.amount_publicly_shown = not subsidy.amount_publicly_shown
+ subsidy.save()
+ messages.success(request, 'Amount visibility set to %s' % subsidy.amount_publicly_shown)
+ return redirect(subsidy.get_absolute_url())
+
+
+class SubsidyAttachmentCreateView(PermissionsMixin, CreateView):
+ """
+ Create a new SubsidyAttachment.
+ """
+ permission_required = 'scipost.can_manage_subsidies'
+ model = SubsidyAttachment
+ form_class = SubsidyAttachmentForm
+ template_name = 'finances/subsidyattachment_form.html'
+
+ def get_context_data(self, *args, **kwargs):
+ context = super().get_context_data(*args, **kwargs)
+ context['countrycodes'] = [code['country'] for code in list(
+ Organization.objects.all().distinct('country').values('country'))]
+ return context
+
+ def get_initial(self):
+ subsidy = get_object_or_404(Subsidy, pk=self.kwargs.get('subsidy_id'))
+ return {'subsidy': subsidy}
+
+ def get_success_url(self):
+ return reverse_lazy('finances:subsidy_details', kwargs={'pk': self.object.subsidy.id})
+
+
+class SubsidyAttachmentUpdateView(PermissionsMixin, UpdateView):
+ """
+ Update a SubsidyAttachment.
+ """
+ permission_required = 'scipost.can_manage_subsidies'
+ model = SubsidyAttachment
+ form_class = SubsidyAttachmentForm
+ template_name = 'finances/subsidyattachment_form.html'
+ success_url = reverse_lazy('finances:subsidies')
+
+ def get_context_data(self, *args, **kwargs):
+ context = super().get_context_data(*args, **kwargs)
+ context['countrycodes'] = [code['country'] for code in list(
+ Organization.objects.all().distinct('country').values('country'))]
+ return context
+
+ def get_success_url(self):
+ return reverse_lazy('finances:subsidy_details', kwargs={'pk': self.object.subsidy.id})
+
+
+class SubsidyAttachmentDeleteView(PermissionsMixin, DeleteView):
+ """
+ Delete a SubsidyAttachment.
+ """
+ permission_required = 'scipost.can_manage_subsidies'
+ model = SubsidyAttachment
+
+ def get_success_url(self):
+ return reverse_lazy('finances:subsidy_details', kwargs={'pk': self.object.subsidy.id})
+
+
+def subsidy_attachment_toggle_public_visibility(request, attachment_id):
+ """
+ Method to toggle the public visibility of an attachment to a Subsidy.
+ Callable by Admin and Contacts for the relevant Organization.
+ """
+ attachment = get_object_or_404(SubsidyAttachment, pk=attachment_id)
+ if not (request.user.has_perm('scipost.can_manage_subsidies') or
+ request.user.has_perm('can_view_org_contacts', attachment.subsidy.organization)):
+ raise PermissionDenied
+ attachment.publicly_visible = not attachment.publicly_visible
+ attachment.save()
+ messages.success(request, 'Attachment visibility set to %s' % attachment.publicly_visible)
+ return redirect(attachment.subsidy.get_absolute_url())
+
+
+def subsidy_attachment(request, subsidy_id, attachment_id):
+ attachment = get_object_or_404(SubsidyAttachment.objects,
+ subsidy__id=subsidy_id, id=attachment_id)
+ if not attachment.visible_to_user(request.user):
+ raise PermissionDenied
+ content_type, encoding = mimetypes.guess_type(attachment.attachment.path)
+ content_type = content_type or 'application/octet-stream'
+ response = HttpResponse(attachment.attachment.read(), content_type=content_type)
+ response["Content-Encoding"] = encoding
+ response['Content-Disposition'] = ('filename=%s' % attachment.name)
+ return response
+
+
+
############################
# Timesheets and Work Logs #
############################
diff --git a/funders/migrations/0007_funder_organization.py b/funders/migrations/0007_funder_organization.py
index cfc8b121ec6365712a66cbdcb8764c7b8d5316a5..9ed40fe6834695f3ffa0c42c8ea8298f5d727ccc 100644
--- a/funders/migrations/0007_funder_organization.py
+++ b/funders/migrations/0007_funder_organization.py
@@ -9,14 +9,14 @@ import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
- ('partners', '0008_auto_20180711_0623'),
+ # ('partners', '0008_auto_20180711_0623'),
('funders', '0006_auto_20180425_2212'),
]
operations = [
- migrations.AddField(
- model_name='funder',
- name='organization',
- field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='partners.Organization'),
- ),
+ # migrations.AddField(
+ # model_name='funder',
+ # name='organization',
+ # field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='partners.Organization'),
+ # ),
]
diff --git a/funders/migrations/0008_auto_20180715_0521.py b/funders/migrations/0008_auto_20180715_0521.py
index 156f8ff47b44f9492e40f0c83034b698499d4d11..f29c5a8613f00466f720a4211738fb7fd4bdd21f 100644
--- a/funders/migrations/0008_auto_20180715_0521.py
+++ b/funders/migrations/0008_auto_20180715_0521.py
@@ -13,9 +13,9 @@ class Migration(migrations.Migration):
]
operations = [
- migrations.AlterField(
- model_name='funder',
- name='organization',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='partners.Organization'),
- ),
+ # migrations.AlterField(
+ # model_name='funder',
+ # name='organization',
+ # field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='partners.Organization'),
+ # ),
]
diff --git a/funders/migrations/0010_repopulate_funder_orgs.py b/funders/migrations/0010_repopulate_funder_orgs.py
index 6810dc122155b68aad1a10b95943814cb898eee3..cb76dc99704ae44713699e7cf3870e17b2a5ed9d 100644
--- a/funders/migrations/0010_repopulate_funder_orgs.py
+++ b/funders/migrations/0010_repopulate_funder_orgs.py
@@ -9,8 +9,8 @@ def repopulate_organization_field(apps, schema_editor):
Funder = apps.get_model('funders', 'Funder')
Organization = apps.get_model('organizations', 'Organization')
- for funder in Funder.objects.filter(organization__isnull=False):
- funder.org = Organization.objects.get(name=funder.organization.name)
+ for funder in Funder.objects.filter(org__isnull=False):
+ funder.org = Organization.objects.get(name=funder.org.name)
funder.save()
diff --git a/funders/migrations/0011_remove_funder_organization.py b/funders/migrations/0011_remove_funder_organization.py
index 27ad906b0e7c1bcbc2c95fb6795c196034b7b760..63c3131820b67f912f6aea50790535e0f0ab65e1 100644
--- a/funders/migrations/0011_remove_funder_organization.py
+++ b/funders/migrations/0011_remove_funder_organization.py
@@ -12,8 +12,8 @@ class Migration(migrations.Migration):
]
operations = [
- migrations.RemoveField(
- model_name='funder',
- name='organization',
- ),
+ # migrations.RemoveField(
+ # model_name='funder',
+ # name='organization',
+ # ),
]
diff --git a/funders/migrations/0012_auto_20180922_1609.py b/funders/migrations/0012_auto_20180922_1609.py
index 42c47f6c5af7d981ea297c20cabf418ce73e4f84..23c2632e1d98fe4ec4bf892d11c67bd8567bee77 100644
--- a/funders/migrations/0012_auto_20180922_1609.py
+++ b/funders/migrations/0012_auto_20180922_1609.py
@@ -8,7 +8,7 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
- ('partners', '0017_auto_20180922_1603'),
+ # ('partners', '0017_auto_20180922_1603'),
('funders', '0011_remove_funder_organization'),
]
diff --git a/journals/managers.py b/journals/managers.py
index 82ef6d3a89929fd9155f82f1044bcb610bf74952..3d63c7666c314c5b60b7357b53577917e3e3def2 100644
--- a/journals/managers.py
+++ b/journals/managers.py
@@ -59,6 +59,7 @@ class PublicationQuerySet(models.QuerySet):
def for_journal(self, journal_name):
return self.filter(
models.Q(in_issue__in_volume__in_journal__name=journal_name) |
+ models.Q(in_issue__in_journal__name=journal_name) |
models.Q(in_journal__name=journal_name))
def most_cited(self, n_returns=5):
diff --git a/journals/migrations/0032_authoraffiliation.py b/journals/migrations/0032_authoraffiliation.py
index ea14996d0e7efaa1e5f862fb2ca018e2067e5676..545c4cc7f0fb205f202b449ebe0d7a021b9637cd 100644
--- a/journals/migrations/0032_authoraffiliation.py
+++ b/journals/migrations/0032_authoraffiliation.py
@@ -9,7 +9,7 @@ import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
- ('partners', '0005_organization'),
+ # ('partners', '0005_organization'),
('scipost', '0014_auto_20180414_2218'),
('journals', '0031_publication_abstract_jats'),
]
@@ -22,7 +22,7 @@ class Migration(migrations.Migration):
('first_name', models.CharField(max_length=64)),
('last_name', models.CharField(max_length=64)),
('contributor', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='scipost.Contributor')),
- ('organization', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='partners.Organization')),
+ # ('organization', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='partners.Organization')),
('publication', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='journals.Publication')),
('unregistered_author', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='journals.UnregisteredAuthor')),
],
diff --git a/journals/migrations/0033_publicationauthorstable_affiliations.py b/journals/migrations/0033_publicationauthorstable_affiliations.py
index ee48539a509725ce08133ec82d3747e79bdecc8a..2dfc8211cbd866edc2830bb3fbddaf20165caf3d 100644
--- a/journals/migrations/0033_publicationauthorstable_affiliations.py
+++ b/journals/migrations/0033_publicationauthorstable_affiliations.py
@@ -8,14 +8,14 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
- ('partners', '0005_organization'),
+ # ('partners', '0005_organization'),
('journals', '0032_authoraffiliation'),
]
operations = [
- migrations.AddField(
- model_name='publicationauthorstable',
- name='affiliations',
- field=models.ManyToManyField(blank=True, to='partners.Organization'),
- ),
+ # migrations.AddField(
+ # model_name='publicationauthorstable',
+ # name='affiliations',
+ # field=models.ManyToManyField(blank=True, to='partners.Organization'),
+ # ),
]
diff --git a/journals/migrations/0034_auto_20180708_1037.py b/journals/migrations/0034_auto_20180708_1037.py
index 3b042a9cc0c2d24f7f1e12feab2d1528a2829636..1d245fe66df6ac398fa98c81909e3a6a8d17693d 100644
--- a/journals/migrations/0034_auto_20180708_1037.py
+++ b/journals/migrations/0034_auto_20180708_1037.py
@@ -16,10 +16,10 @@ class Migration(migrations.Migration):
model_name='authoraffiliation',
name='contributor',
),
- migrations.RemoveField(
- model_name='authoraffiliation',
- name='organization',
- ),
+ # migrations.RemoveField(
+ # model_name='authoraffiliation',
+ # name='organization',
+ # ),
migrations.RemoveField(
model_name='authoraffiliation',
name='publication',
diff --git a/journals/migrations/0035_orgpubfraction.py b/journals/migrations/0035_orgpubfraction.py
index fc53b2e21fddabccdb2e6b3fe5977325440bd600..28f55f125bd998fa740349e33286695a139a4e64 100644
--- a/journals/migrations/0035_orgpubfraction.py
+++ b/journals/migrations/0035_orgpubfraction.py
@@ -9,7 +9,7 @@ import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
- ('partners', '0013_auto_20180715_0938'),
+ # ('partners', '0013_auto_20180715_0938'),
('journals', '0034_auto_20180708_1037'),
]
@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('fraction', models.DecimalField(decimal_places=3, max_digits=4)),
- ('organization', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='pubfractions', to='partners.Organization')),
+ # ('organization', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='pubfractions', to='partners.Organization')),
('publication', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='pubfractions', to='journals.Publication')),
],
),
diff --git a/journals/migrations/0036_auto_20180918_1723.py b/journals/migrations/0036_auto_20180918_1723.py
index 45551aeaf766b31d26ae7dbab8be7e4b4bef7081..018706dcd554d12da5b1a6301ae1b212d00c9493 100644
--- a/journals/migrations/0036_auto_20180918_1723.py
+++ b/journals/migrations/0036_auto_20180918_1723.py
@@ -8,13 +8,13 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
- ('partners', '0013_auto_20180715_0938'),
+ # ('partners', '0013_auto_20180715_0938'),
('journals', '0035_orgpubfraction'),
]
operations = [
- migrations.AlterUniqueTogether(
- name='orgpubfraction',
- unique_together=set([('organization', 'publication')]),
- ),
+ # migrations.AlterUniqueTogether(
+ # name='orgpubfraction',
+ # unique_together=set([('organization', 'publication')]),
+ # ),
]
diff --git a/journals/migrations/0039_repopulate_orgs.py b/journals/migrations/0039_repopulate_orgs.py
index 6f600059958dffac010327510eaf760d83fdc089..1a03b18c2f957ff9e344b56302e0dca3021f3a04 100644
--- a/journals/migrations/0039_repopulate_orgs.py
+++ b/journals/migrations/0039_repopulate_orgs.py
@@ -10,8 +10,8 @@ def repopulate_organization_field(apps, schema_editor):
PublicationAuthorsTable = apps.get_model('journals', 'PublicationAuthorsTable')
Organization = apps.get_model('organizations', 'Organization')
- for frac in OrgPubFraction.objects.filter(organization__isnull=False):
- frac.org = Organization.objects.get(name=frac.organization.name)
+ for frac in OrgPubFraction.objects.filter(org__isnull=False):
+ frac.org = Organization.objects.get(name=frac.org.name)
frac.save()
for tbl in PublicationAuthorsTable.objects.all():
diff --git a/journals/migrations/0040_auto_20180922_1544.py b/journals/migrations/0040_auto_20180922_1544.py
index 1ab6c74ca48d2deb40fd0075d248e9d39d525cf8..b8641770e2eaddfbedff6a8635b5c4fc993124ce 100644
--- a/journals/migrations/0040_auto_20180922_1544.py
+++ b/journals/migrations/0040_auto_20180922_1544.py
@@ -13,16 +13,16 @@ class Migration(migrations.Migration):
]
operations = [
- migrations.RemoveField(
- model_name='publicationauthorstable',
- name='affiliations',
- ),
+ # migrations.RemoveField(
+ # model_name='publicationauthorstable',
+ # name='affiliations',
+ # ),
migrations.AlterUniqueTogether(
name='orgpubfraction',
unique_together=set([('org', 'publication')]),
),
- migrations.RemoveField(
- model_name='orgpubfraction',
- name='organization',
- ),
+ # migrations.RemoveField(
+ # model_name='orgpubfraction',
+ # name='organization',
+ # ),
]
diff --git a/journals/migrations/0041_auto_20180922_1609.py b/journals/migrations/0041_auto_20180922_1609.py
index 395db5a153d2b47b3c9da56894fcebd6d522b922..a24865ab2e715671aa8e04daffa20d2c92c67fe6 100644
--- a/journals/migrations/0041_auto_20180922_1609.py
+++ b/journals/migrations/0041_auto_20180922_1609.py
@@ -8,7 +8,7 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
- ('partners', '0017_auto_20180922_1603'),
+ # ('partners', '0017_auto_20180922_1603'),
('organizations', '0002_populate_from_partners_org'),
('journals', '0040_auto_20180922_1544'),
]
diff --git a/journals/templates/xml/publication_crossref.html b/journals/templates/xml/publication_crossref.html
index 26e49c9c2dadf0e8289493cc40de4dfe8bee10b6..0a5701945658cc3195d1cc05c8c3d5da0cac2d5d 100644
--- a/journals/templates/xml/publication_crossref.html
+++ b/journals/templates/xml/publication_crossref.html
@@ -12,11 +12,11 @@
</head>
<body>
<journal>
- {% if publication.in_issue %}
+ {% if publication.in_issue.in_volume %}
<journal_metadata>
<full_title>{{ publication.in_issue.in_volume.in_journal.get_name_display }}</full_title>
<abbrev_title>{{ publication.in_issue.in_volume.in_journal.abbreviation_citation }}</abbrev_title>
- {% if publication.in_journal.issn %}<issn media_type='electronic'>{{ publication.in_journal.issn }}</issn>{% endif %}
+ {% if publication.in_issue.in_volume.in_journal.issn %}<issn media_type='electronic'>{{ publication.in_issue.in_volume.in_journal.issn }}</issn>{% endif %}
<doi_data>
<doi>{{ publication.in_issue.in_volume.in_journal.doi_string }}</doi>
<resource>https://scipost.org/{{ publication.in_issue.in_volume.in_journal.doi_string }}</resource>
@@ -31,6 +31,22 @@
</journal_volume>
<issue>{{ publication.in_issue.number }}</issue>
</journal_issue>
+ {% elif publication.in_issue.in_journal %}
+ <journal_metadata>
+ <full_title>{{ publication.in_issue.in_journal.get_name_display }}</full_title>
+ <abbrev_title>{{ publication.in_issue.in_journal.abbreviation_citation }}</abbrev_title>
+ {% if publication.in_issue.in_journal.issn %}<issn media_type='electronic'>{{ publication.in_issue.in_journal.issn }}</issn>{% endif %}
+ <doi_data>
+ <doi>{{ publication.in_issue.in_journal.doi_string }}</doi>
+ <resource>https://scipost.org/{{ publication.in_issue.in_journal.doi_string }}</resource>
+ </doi_data>
+ </journal_metadata>
+ <journal_issue>
+ <publication_date media_type='online'>
+ <year>{{ publication.publication_date|date:'Y' }}</year>
+ </publication_date>
+ <issue>{{ publication.in_issue.number }}</issue>
+ </journal_issue>
{% else %}
<journal_metadata>
<full_title>{{ publication.in_journal.get_name_display }}</full_title>
diff --git a/journals/views.py b/journals/views.py
index 6fd2c8254b7a587e8250fef34691824e80b746e4..4d54c502bfe8a41e9cf2df064148393af428c879 100644
--- a/journals/views.py
+++ b/journals/views.py
@@ -338,7 +338,7 @@ def manage_metadata(request, doi_label=None, issue_doi_label=None, journal_doi_l
publications = Publication.objects.for_journal(journal.name)
else:
# Limit the amount of Publications to still an idiot size
- publications = Publication.objects.all()[:50]
+ publications = Publication.objects.all()[:60]
# Speeds up operations by reducing the number of queries
if not isinstance(publications, list):
diff --git a/notifications/templates/notifications/partials/notification_list_popover.html b/notifications/templates/notifications/partials/notification_list_popover.html
index 2d2c399921517e693313c49aef240c415ebeff71..0082ba201a27f8c136fb461bc2794073e92307ff 100644
--- a/notifications/templates/notifications/partials/notification_list_popover.html
+++ b/notifications/templates/notifications/partials/notification_list_popover.html
@@ -25,9 +25,6 @@
<div class="links">
<a class="item {% active 'scipost:personal_page' %}" href="{% url 'scipost:personal_page' %}">Personal Page</a>
- {% if user.partner_contact or perms.scipost.can_read_partner_page %}
- <a class="item {% active 'partners:dashboard' %}" href="{% url 'partners:dashboard' %}">Partner Page</a>
- {% endif %}
{% if is_financial_admin %}
<a class="item {% active 'finances:finances' %}" href="{% url 'finances:finances' %}">Financial Administration</a>
diff --git a/organizations/admin.py b/organizations/admin.py
index 4a405966382ae20ae2223bd8e2e1309d7b0bca6c..ad400ea0d6ea65bfea3cd60b7e15a20d554c6cf6 100644
--- a/organizations/admin.py
+++ b/organizations/admin.py
@@ -4,12 +4,42 @@ __license__ = "AGPL v3"
from django.contrib import admin
-from .models import Organization
+from guardian.admin import GuardedModelAdmin
+from .models import Organization, OrganizationEvent, ContactPerson, Contact, ContactRole
-class OrganizationAdmin(admin.ModelAdmin):
+class OrganizationEventInline(admin.TabularInline):
+ model = OrganizationEvent
+ extra = 0
+
+class ContactPersonInline(admin.TabularInline):
+ model = ContactPerson
+ extra = 0
+
+class OrganizationAdmin(GuardedModelAdmin):
+ inlines = [OrganizationEventInline, ContactPersonInline,]
search_fields = ['name', 'acronym']
admin.site.register(Organization, OrganizationAdmin)
+
+
+class ContactRoleInline(admin.TabularInline):
+ model = ContactRole
+ extra = 0
+
+class ContactAdmin(admin.ModelAdmin):
+ inlines = [ContactRoleInline,]
+ search_fields = ['user__last_name', 'user__first_name', 'user__email']
+
+
+admin.site.register(Contact, ContactAdmin)
+
+
+class ContactInline(admin.TabularInline):
+ """
+ For use as an inline in User admin.
+ """
+ model = Contact
+ extra = 0
diff --git a/organizations/constants.py b/organizations/constants.py
index 6a6056ac8557cae158ec3e826c3854e3ca011110..8b581b880bfa77a336aafde1ab6fe32f290fda66 100644
--- a/organizations/constants.py
+++ b/organizations/constants.py
@@ -63,3 +63,32 @@ ORGANIZATION_STATUSES = (
(ORGSTATUS_SUPERSEDED, 'Superseded'),
(ORGSTATUS_OBSOLETE, 'Obsolete'),
)
+
+
+ORGANIZATION_EVENT_REQUESTED = 'requested'
+ORGANIZATION_EVENT_COMMENT = 'comment'
+ORGANIZATION_EVENT_EMAIL_SENT = 'email_sent'
+ORGANIZATION_EVENT_INITIATE_NEGOTIATION = 'negotiating'
+ORGANIZATION_EVENT_MARKED_AS_UNINTERESTED = 'marked_as_uninterested'
+ORGANIZATION_EVENT_PROMOTED = 'promoted'
+ORGANIZATION_STATUS_UPDATED = 'status_updated'
+ORGANIZATION_EVENTS = (
+ (ORGANIZATION_EVENT_REQUESTED, 'Requested (from online form)'),
+ (ORGANIZATION_EVENT_COMMENT, 'Comment added'),
+ (ORGANIZATION_EVENT_EMAIL_SENT, 'Email sent'),
+ (ORGANIZATION_EVENT_INITIATE_NEGOTIATION, 'Initiated negotiation'),
+ (ORGANIZATION_EVENT_MARKED_AS_UNINTERESTED, 'Marked as uninterested'),
+ (ORGANIZATION_EVENT_PROMOTED, 'Promoted to Sponsor'),
+ (ORGANIZATION_STATUS_UPDATED, 'Status updated'),
+)
+
+ROLE_GENERAL = 'gen'
+ROLE_TECH = 'tech'
+ROLE_FIN = 'fin'
+ROLE_LEG = 'leg'
+ROLE_KINDS = (
+ (ROLE_GENERAL, 'General Contact'),
+ (ROLE_TECH, 'Technical Contact'),
+ (ROLE_FIN, 'Financial Contact'),
+ (ROLE_LEG, 'Legal Contact')
+)
diff --git a/partners/decorators.py b/organizations/decorators.py
similarity index 73%
rename from partners/decorators.py
rename to organizations/decorators.py
index d446b1b7dd029c398db4bfbee476de702c148014..c517f1665dbf5befc29b5118eaa5d4155515a978 100644
--- a/partners/decorators.py
+++ b/organizations/decorators.py
@@ -6,9 +6,9 @@ from .models import Contact
def has_contact(user):
- """Requires user to be related to any Contact."""
+ """Requires user to be related to a Contact."""
try:
- user.partner_contact
+ user.org_contact
return True
except Contact.DoesNotExist:
return False
diff --git a/organizations/forms.py b/organizations/forms.py
new file mode 100644
index 0000000000000000000000000000000000000000..34e5e6ad4b39091b2ac90daa34a97b0dd7068a80
--- /dev/null
+++ b/organizations/forms.py
@@ -0,0 +1,222 @@
+__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
+__license__ = "AGPL v3"
+
+
+import datetime
+
+from django import forms
+
+from django.contrib.auth.models import User, Group
+from django.contrib.auth.password_validation import validate_password
+from django.core.exceptions import ValidationError
+from django.db import transaction
+from django.utils import timezone
+
+from guardian.shortcuts import assign_perm
+
+from .constants import ROLE_GENERAL
+from .models import OrganizationEvent, ContactPerson, Contact, ContactRole
+
+from scipost.constants import TITLE_CHOICES
+
+
+class OrganizationEventForm(forms.ModelForm):
+ class Meta:
+ model = OrganizationEvent
+ fields = ['organization', 'event', 'comments', 'noted_on', 'noted_by']
+
+
+class ContactPersonForm(forms.ModelForm):
+ class Meta:
+ model = ContactPerson
+ fields = '__all__'
+
+ def clean_email(self):
+ """
+ Check if the email is already associated to an existing ContactPerson or Contact.
+ """
+ email = self.cleaned_data['email']
+ try:
+ ContactPerson.objects.get(email=email)
+ if self.instance.pk:
+ pass # OK, this is an update
+ else:
+ self.add_error('email', 'This email is already associated to a Contact Person.')
+ except ContactPerson.DoesNotExist:
+ pass
+ try:
+ Contact.objects.get(user__email=email)
+ self.add_error('email', 'This email is already associated to a Contact.')
+ except Contact.DoesNotExist:
+ pass
+ return email
+
+
+class UpdateContactDataForm(forms.ModelForm):
+ """
+ This form is used in the scipost:update_personal_data method.
+ """
+ class Meta:
+ model = Contact
+ fields = ['title']
+
+
+class ContactForm(forms.ModelForm):
+ """
+ This Contact form is mainly used for editing Contact instances.
+ """
+ class Meta:
+ model = Contact
+ fields = ['title', 'key_expires']
+
+
+class NewContactForm(ContactForm):
+ """
+ This Contact form is used to create new Contact instances, as it will also handle
+ possible sending and activation of User instances coming with the new Contact.
+ """
+ title = forms.ChoiceField(choices=TITLE_CHOICES, label='Title')
+ first_name = forms.CharField()
+ last_name = forms.CharField()
+ email = forms.CharField()
+ existing_user = None
+
+ def __init__(self, *args, **kwargs):
+ """
+ Organization is a required argument to tell the formset which Organization
+ the Contact is being edited for in the current form.
+ """
+ self.organization = kwargs.pop('organization')
+ self.contactperson = kwargs.pop('contactperson')
+ super().__init__(*args, **kwargs)
+
+ def clean_email(self):
+ """
+ Check if User already is known in the system.
+ """
+ email = self.cleaned_data['email']
+ try:
+ self.existing_user = User.objects.get(email=email)
+ if not self.data.get('confirm_use_existing', '') == 'on':
+ # Do not give error if user wants to use existing User
+ self.add_error('email', 'This User is already registered.')
+ self.fields['confirm_use_existing'] = forms.BooleanField(
+ required=False, initial=False, label='Use the existing user instead: %s %s'
+ % (self.existing_user.first_name,
+ self.existing_user.last_name))
+ except User.DoesNotExist:
+ pass
+ return email
+
+ @transaction.atomic
+ def save(self, current_user, commit=True):
+ """
+ If existing user is found, link it to the Organization.
+ """
+ if self.existing_user and self.data.get('confirm_use_existing', '') == 'on':
+ # Create new Contact if it doesn't already exist
+ try:
+ contact = self.existing_user.org_contact
+ except Contact.DoesNotExist:
+ contact = super().save(commit=False)
+ contact.title = self.existing_user.org_contact.title
+ contact.user = self.existing_user
+ contact.save()
+ # Assign permissions and Group
+ assign_perm('can_view_org_contacts', contact.user, self.organization)
+ orgcontacts = Group.objects.get(name='Organization Contacts')
+ contact.user.groups.add(orgcontacts)
+ else:
+ # Create complete new Account (User + Contact)
+ user = User(
+ first_name=self.cleaned_data['first_name'],
+ last_name=self.cleaned_data['last_name'],
+ email=self.cleaned_data['email'],
+ username=self.cleaned_data['email'],
+ is_active=False,
+ )
+ user.save()
+ contact = Contact(
+ user=user,
+ title=self.cleaned_data['title']
+ )
+ contact.generate_key()
+ contact.save()
+
+ # Assign permissions and Group
+ assign_perm('can_view_org_contacts', user, self.organization)
+ for child in self.organization.children.all():
+ assign_perm('can_view_org_contacts', user, child)
+ orgcontacts = Group.objects.get(name='Organization Contacts')
+ user.groups.add(orgcontacts)
+
+ # Create the role with to-be-updated info
+ contactrole = ContactRole(
+ contact=contact,
+ organization=self.organization,
+ kind=[ROLE_GENERAL,],
+ date_from=timezone.now(),
+ date_until=timezone.now() + datetime.timedelta(days=3650)
+ )
+ contactrole.save()
+
+ # If upgrading from a ContactPerson, delete the latter
+ if self.contactperson:
+ self.contactperson.delete()
+
+ return contact
+
+
+class ContactActivationForm(forms.ModelForm):
+ class Meta:
+ model = User
+ fields = []
+
+ password_new = forms.CharField(label='* Password', widget=forms.PasswordInput())
+ password_verif = forms.CharField(label='* Verify password', widget=forms.PasswordInput(),
+ help_text='Your password must contain at least 8 characters')
+
+ def clean(self, *args, **kwargs):
+ try:
+ self.instance.org_contact
+ except Contact.DoesNotExist:
+ self.add_error(None, 'Your account is invalid, please contact the administrator.')
+ return super().clean(*args, **kwargs)
+
+ def clean_password(self):
+ password = self.cleaned_data.get('password_new', '')
+ try:
+ validate_password(password, self.instance)
+ except ValidationError as error_message:
+ self.add_error('password_new', error_message)
+ return password
+
+ def clean_password_verif(self):
+ if self.cleaned_data.get('password_new', '') != self.cleaned_data.get('password_verif', ''):
+ self.add_error('password_verif', 'Your password entries must match')
+ return self.cleaned_data.get('password_verif', '')
+
+ @transaction.atomic
+ def activate_user(self):
+ if self.errors:
+ return forms.ValidationError
+
+ # Activate account
+ self.instance.is_active = True
+ self.instance.set_password(self.cleaned_data['password_new'])
+ self.instance.save()
+
+ return self.instance
+
+
+class ContactRoleForm(forms.ModelForm):
+
+ class Meta:
+ model = ContactRole
+ fields = '__all__'
+
+ def __init__(self, *args, **kwargs):
+ super().__init__(*args, **kwargs)
+ if self.instance.id:
+ self.fields['organization'].disabled = True
+ self.fields['contact'].disabled = True
diff --git a/partners/management/commands/organization_update_cf_nr_associated_publications.py b/organizations/management/commands/organization_update_cf_nr_associated_publications.py
similarity index 100%
rename from partners/management/commands/organization_update_cf_nr_associated_publications.py
rename to organizations/management/commands/organization_update_cf_nr_associated_publications.py
diff --git a/organizations/migrations/0002_populate_from_partners_org.py b/organizations/migrations/0002_populate_from_partners_org.py
index a6ffbfb04bc83c9b50be73888eb5333be53436a3..073ce7f56e29655fe36e13fa26bd094ab5edb3bb 100644
--- a/organizations/migrations/0002_populate_from_partners_org.py
+++ b/organizations/migrations/0002_populate_from_partners_org.py
@@ -5,42 +5,42 @@ from __future__ import unicode_literals
from django.db import migrations
-def populate_organization_from_partners_orgs(apps, schema_editor):
- Organization = apps.get_model('organizations', 'Organization')
- PartnersOrganization = apps.get_model('partners', 'Organization')
-
- # First of all, copy each exising instace, omitting the parent and superseded_by fields
- # (since these are self-referencing ForeignKeys).
- for oldorg in PartnersOrganization.objects.all():
- org = Organization(
- orgtype=oldorg.orgtype,
- status=oldorg.status,
- name=oldorg.name,
- name_original=oldorg.name_original,
- acronym=oldorg.acronym,
- country=oldorg.country,
- address=oldorg.address,
- logo=oldorg.logo,
- css_class=oldorg.css_class,
- grid_json=oldorg.grid_json,
- crossref_json=oldorg.crossref_json,
- cf_nr_associated_publications=oldorg.cf_nr_associated_publications)
- org.save()
-
- # Now copy the ForeignKeys to self: first, parent:
- for oldorg in PartnersOrganization.objects.all():
- if oldorg.parent:
- org = Organization.objects.get(name=oldorg.name)
- parent = Organization.objects.get(name=oldorg.parent.name)
- org.parent = parent
- org.save()
- # then, superseded_by:
- for oldorg in PartnersOrganization.objects.all():
- if oldorg.superseded_by:
- org = Organization.objects.get(name=oldorg.name)
- superseded_by = Organization.objects.get(name=oldorg.superseded_by.name)
- org.superseded_by = superseded_by
- org.save()
+# def populate_organization_from_partners_orgs(apps, schema_editor):
+# Organization = apps.get_model('organizations', 'Organization')
+# PartnersOrganization = apps.get_model('partners', 'Organization')
+
+# # First of all, copy each exising instace, omitting the parent and superseded_by fields
+# # (since these are self-referencing ForeignKeys).
+# for oldorg in PartnersOrganization.objects.all():
+# org = Organization(
+# orgtype=oldorg.orgtype,
+# status=oldorg.status,
+# name=oldorg.name,
+# name_original=oldorg.name_original,
+# acronym=oldorg.acronym,
+# country=oldorg.country,
+# address=oldorg.address,
+# logo=oldorg.logo,
+# css_class=oldorg.css_class,
+# grid_json=oldorg.grid_json,
+# crossref_json=oldorg.crossref_json,
+# cf_nr_associated_publications=oldorg.cf_nr_associated_publications)
+# org.save()
+
+# # Now copy the ForeignKeys to self: first, parent:
+# for oldorg in PartnersOrganization.objects.all():
+# if oldorg.parent:
+# org = Organization.objects.get(name=oldorg.name)
+# parent = Organization.objects.get(name=oldorg.parent.name)
+# org.parent = parent
+# org.save()
+# # then, superseded_by:
+# for oldorg in PartnersOrganization.objects.all():
+# if oldorg.superseded_by:
+# org = Organization.objects.get(name=oldorg.name)
+# superseded_by = Organization.objects.get(name=oldorg.superseded_by.name)
+# org.superseded_by = superseded_by
+# org.save()
class Migration(migrations.Migration):
@@ -50,6 +50,6 @@ class Migration(migrations.Migration):
]
operations = [
- migrations.RunPython(populate_organization_from_partners_orgs,
- reverse_code=migrations.RunPython.noop),
+ # migrations.RunPython(populate_organization_from_partners_orgs,
+ # reverse_code=migrations.RunPython.noop),
]
diff --git a/organizations/migrations/0003_contact_contactperson_contactrole.py b/organizations/migrations/0003_contact_contactperson_contactrole.py
new file mode 100644
index 0000000000000000000000000000000000000000..08ae732bb27575d7233d031f6c340518a163ed0d
--- /dev/null
+++ b/organizations/migrations/0003_contact_contactperson_contactrole.py
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-02-19 06:12
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+import scipost.fields
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ('organizations', '0002_populate_from_partners_org'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Contact',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('title', models.CharField(choices=[('PR', 'Prof.'), ('DR', 'Dr'), ('MR', 'Mr'), ('MRS', 'Mrs'), ('MS', 'Ms')], max_length=4)),
+ ('activation_key', models.CharField(blank=True, max_length=40)),
+ ('key_expires', models.DateTimeField(default=django.utils.timezone.now)),
+ ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='org_contact', to=settings.AUTH_USER_MODEL)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='ContactPerson',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('title', models.CharField(choices=[('PR', 'Prof.'), ('DR', 'Dr'), ('MR', 'Mr'), ('MRS', 'Mrs'), ('MS', 'Ms')], max_length=4)),
+ ('first_name', models.CharField(max_length=64)),
+ ('last_name', models.CharField(max_length=64)),
+ ('email', models.EmailField(max_length=254)),
+ ('role', models.CharField(max_length=128)),
+ ('organization', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organizations.Organization')),
+ ],
+ ),
+ migrations.CreateModel(
+ name='ContactRole',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('kind', scipost.fields.ChoiceArrayField(base_field=models.CharField(choices=[('gen', 'General Contact'), ('tech', 'Technical Contact'), ('fin', 'Financial Contact'), ('leg', 'Legal Contact')], max_length=4), size=None)),
+ ('date_from', models.DateField()),
+ ('date_until', models.DateField()),
+ ('contact', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='roles', to='organizations.Contact')),
+ ('organization', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organizations.Organization')),
+ ],
+ ),
+ ]
diff --git a/organizations/migrations/0004_organizationevent.py b/organizations/migrations/0004_organizationevent.py
new file mode 100644
index 0000000000000000000000000000000000000000..08f127935ca354b8056889128274a61e3b07074a
--- /dev/null
+++ b/organizations/migrations/0004_organizationevent.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-02-19 07:52
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ('organizations', '0003_contact_contactperson_contactrole'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='OrganizationEvent',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('event', models.CharField(choices=[('requested', 'Requested (from online form)'), ('comment', 'Comment added'), ('email_sent', 'Email sent'), ('negotiating', 'Initiated negotiation'), ('marked_as_uninterested', 'Marked as uninterested'), ('promoted', 'Promoted to Sponsor'), ('status_updated', 'Status updated')], max_length=64)),
+ ('comments', models.TextField(blank=True)),
+ ('noted_on', models.DateTimeField(auto_now_add=True)),
+ ('noted_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+ ('organization', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organizations.Organization')),
+ ],
+ ),
+ ]
diff --git a/organizations/migrations/0005_auto_20190219_2057.py b/organizations/migrations/0005_auto_20190219_2057.py
new file mode 100644
index 0000000000000000000000000000000000000000..953eedd66add072268c319e570754ec05e918e14
--- /dev/null
+++ b/organizations/migrations/0005_auto_20190219_2057.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-02-19 19:57
+from __future__ import unicode_literals
+
+import datetime
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('organizations', '0004_organizationevent'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='organizationevent',
+ name='noted_on',
+ field=models.DateTimeField(default=datetime.date.today),
+ ),
+ ]
diff --git a/organizations/migrations/0006_auto_20190219_2058.py b/organizations/migrations/0006_auto_20190219_2058.py
new file mode 100644
index 0000000000000000000000000000000000000000..8bee7a467ac1bb1e7ac5f3f4c6724f6f813ffe7c
--- /dev/null
+++ b/organizations/migrations/0006_auto_20190219_2058.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-02-19 19:58
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('organizations', '0005_auto_20190219_2057'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='organizationevent',
+ name='noted_on',
+ field=models.DateTimeField(default=django.utils.timezone.now),
+ ),
+ ]
diff --git a/organizations/migrations/0007_auto_20190221_0553.py b/organizations/migrations/0007_auto_20190221_0553.py
new file mode 100644
index 0000000000000000000000000000000000000000..38983e2041bb709d1d55e85318739f86ca7a8be0
--- /dev/null
+++ b/organizations/migrations/0007_auto_20190221_0553.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-02-21 04:53
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('organizations', '0006_auto_20190219_2058'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='organization',
+ options={'ordering': ['country', 'name'], 'permissions': (('can_view_org_contacts', "Can view this Organization's Contacts"),)},
+ ),
+ ]
diff --git a/partners/migrations/0006_auto_20180708_2123.py b/organizations/migrations/0008_auto_20190222_1120.py
similarity index 54%
rename from partners/migrations/0006_auto_20180708_2123.py
rename to organizations/migrations/0008_auto_20190222_1120.py
index cc8756128897cb2fdbc0e30b2443ff3f21a821b3..afbad95fbed4dfdb1df9346da9fd0c3db7ed5b4d 100644
--- a/partners/migrations/0006_auto_20180708_2123.py
+++ b/organizations/migrations/0008_auto_20190222_1120.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2018-07-08 19:23
+# Generated by Django 1.11.4 on 2019-02-22 10:20
from __future__ import unicode_literals
from django.db import migrations
@@ -8,12 +8,12 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
- ('partners', '0005_organization'),
+ ('organizations', '0007_auto_20190221_0553'),
]
operations = [
migrations.AlterModelOptions(
- name='organization',
- options={'ordering': ['name']},
+ name='contact',
+ options={'ordering': ['user__last_name', 'user__first_name']},
),
]
diff --git a/organizations/migrations/0009_auto_20190223_1001.py b/organizations/migrations/0009_auto_20190223_1001.py
new file mode 100644
index 0000000000000000000000000000000000000000..c93eb96c7cc628ef24fda101a2794696bf0ea790
--- /dev/null
+++ b/organizations/migrations/0009_auto_20190223_1001.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-02-23 09:01
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('organizations', '0008_auto_20190222_1120'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='contactperson',
+ options={'ordering': ['last_name', 'first_name', 'organization']},
+ ),
+ ]
diff --git a/organizations/migrations/0010_auto_20190223_1406.py b/organizations/migrations/0010_auto_20190223_1406.py
new file mode 100644
index 0000000000000000000000000000000000000000..b7b78e4e2b0c73d1c02661e4d8c02ec759b6271c
--- /dev/null
+++ b/organizations/migrations/0010_auto_20190223_1406.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2019-02-23 13:06
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('organizations', '0009_auto_20190223_1001'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='organizationevent',
+ options={'ordering': ['-noted_on', 'organization']},
+ ),
+ ]
diff --git a/organizations/models.py b/organizations/models.py
index e2aded3dbe630b025a2c898c79cb2ba35b2d1272..79e737012952270deb8a2eaf46a96c104733eff3 100644
--- a/organizations/models.py
+++ b/organizations/models.py
@@ -3,7 +3,11 @@ __license__ = "AGPL v3"
import datetime
+import hashlib
+import random
+import string
+from django.contrib.auth.models import User
from django.contrib.postgres.fields import JSONField
from django.db import models
from django.db.models import Sum
@@ -13,9 +17,11 @@ from django.urls import reverse
from django_countries.fields import CountryField
from .constants import ORGANIZATION_TYPES, ORGTYPE_PRIVATE_BENEFACTOR,\
- ORGANIZATION_STATUSES, ORGSTATUS_ACTIVE
+ ORGANIZATION_STATUSES, ORGSTATUS_ACTIVE, ORGANIZATION_EVENTS, ROLE_KINDS
from .managers import OrganizationQuerySet
+from scipost.constants import TITLE_CHOICES
+from scipost.fields import ChoiceArrayField
from scipost.models import Contributor
from journals.models import Publication, OrgPubFraction, UnregisteredAuthor
@@ -69,6 +75,9 @@ class Organization(models.Model):
class Meta:
ordering = ['country', 'name']
+ permissions = (
+ ('can_view_org_contacts', 'Can view this Organization\'s Contacts'),
+ )
def __str__(self):
return self.name
@@ -159,6 +168,15 @@ class Organization(models.Model):
"""
return self.subsidy_set.filter(date_until__gte=datetime.date.today()).exists()
+ @property
+ def latest_subsidy_date_until(self):
+ """
+ Returns the end date of validity of the latest subsidy.
+ """
+ if self.subsidy_set:
+ return self.subsidy_set.order_by('-date_until').first().date_until
+ return '-'
+
def get_total_subsidies_obtained(self, n_years_past=None):
"""
Computes the total amount received by SciPost, in the form
@@ -175,3 +193,111 @@ class Organization(models.Model):
for agreement in self.partner.agreements.all():
contrib += agreement.offered_yearly_contribution * int(agreement.duration.days / 365)
return contrib
+
+
+
+###################################
+# Events related to Organizations #
+###################################
+
+class OrganizationEvent(models.Model):
+ """
+ Documents an event related to an Organization.
+ """
+ organization = models.ForeignKey('organizations.Organization', on_delete=models.CASCADE)
+ event = models.CharField(max_length=64, choices=ORGANIZATION_EVENTS)
+ comments = models.TextField(blank=True)
+ noted_on = models.DateTimeField(default=timezone.now)
+ noted_by = models.ForeignKey(User, on_delete=models.CASCADE)
+
+ class Meta:
+ ordering = ['-noted_on', 'organization']
+
+ def __str__(self):
+ return '%s: %s' % (str(self.organization), self.get_event_display())
+
+
+
+####################################
+# Contact persons, users and roles #
+####################################
+
+class ContactPerson(models.Model):
+ """
+ A ContactPerson instance holds information about a person who can function
+ as a contact for one or more organizations.
+ These instances are created by SPAdmin during sponsor harvesting.
+ Instances can be promoted to Contact instances, which possess login credentials.
+ """
+ organization = models.ForeignKey('organizations.Organization',
+ on_delete=models.CASCADE)
+ title = models.CharField(max_length=4, choices=TITLE_CHOICES)
+ first_name = models.CharField(max_length=64)
+ last_name = models.CharField(max_length=64)
+ email = models.EmailField()
+ role = models.CharField(max_length=128)
+
+ class Meta:
+ ordering = ['last_name', 'first_name', 'organization']
+
+ def __str__(self):
+ return "%s %s %s" % (self.get_title_display(), self.first_name, self.last_name)
+
+
+class Contact(models.Model):
+ """
+ A Contact instance is a basic User to be used for Organization-type contacts.
+ Specific Organizations are linked to Contact via the ContactRole model defined below.
+ """
+ user = models.OneToOneField(User, on_delete=models.CASCADE, unique=True,
+ related_name='org_contact')
+ title = models.CharField(max_length=4, choices=TITLE_CHOICES)
+ activation_key = models.CharField(max_length=40, blank=True)
+ key_expires = models.DateTimeField(default=timezone.now)
+
+ class Meta:
+ ordering = ['user__last_name', 'user__first_name']
+
+ def __str__(self):
+ return '%s %s, %s' % (self.get_title_display(), self.user.last_name, self.user.first_name)
+
+ def generate_key(self, feed=''):
+ """
+ Generate and save a new activation_key for the Contact, given a certain feed.
+ """
+ for i in range(5):
+ feed += random.choice(string.ascii_letters)
+ feed = feed.encode('utf8')
+ salt = self.user.username.encode('utf8')
+ self.activation_key = hashlib.sha1(salt + feed).hexdigest()
+ self.key_expires = timezone.now() + datetime.timedelta(days=2)
+
+ def save(self, *args, **kwargs):
+ if not self.activation_key:
+ self.generate_key()
+ super().save(*args, **kwargs)
+
+
+class ContactRole(models.Model):
+ """
+ A ContactRole instance links a Contact to an Organization, for a specific set of roles
+ and for a specific period in time.
+ """
+ contact = models.ForeignKey('organizations.Contact', on_delete=models.CASCADE,
+ related_name='roles')
+ organization = models.ForeignKey('organizations.Organization', on_delete=models.CASCADE)
+ kind = ChoiceArrayField(models.CharField(max_length=4, choices=ROLE_KINDS))
+ date_from = models.DateField()
+ date_until = models.DateField()
+
+ def __str__(self):
+ return '%s, %s for %s' % (self.contact, self.get_kind_display, self.organization)
+
+ @property
+ def get_kind_display(self):
+ """
+ Due to a lack of support to use get_FOO_display in a ArrayField, one has to create
+ one 'manually'.
+ """
+ choices = dict(ROLE_KINDS)
+ return ', '.join([choices[value] for index, value in enumerate(self.kind)])
diff --git a/partners/signals.py b/organizations/signals.py
similarity index 100%
rename from partners/signals.py
rename to organizations/signals.py
diff --git a/organizations/templates/organizations/_organization_card.html b/organizations/templates/organizations/_organization_card.html
index ae66514629aa3616e254b024f48e427a9cd37177..4295dea592b9cd5d64edc16490cd14fe79c896b4 100644
--- a/organizations/templates/organizations/_organization_card.html
+++ b/organizations/templates/organizations/_organization_card.html
@@ -1,5 +1,5 @@
{% load bootstrap %}
-
+{% load guardian_tags %}
{% load user_groups %}
{% load organizations_extras %}
@@ -15,6 +15,8 @@ $(document).ready(function($) {
{% is_scipost_admin request.user as is_scipost_admin %}
+{% get_obj_perms request.user for org as "user_org_perms" %}
+
<div class="card-body">
<div class="row">
@@ -24,20 +26,23 @@ $(document).ready(function($) {
<a class="nav-link" id="details-{{ org.id }}-tab" data-toggle="tab" href="#details-{{ org.id }}" role="tab" aria-controls="details-{{ org.id }}" aria-selected="true">Details</a>
</li>
<li class="nav-item">
- <a class="nav-link active" id="publications-{{ org.id }}-tab" data-toggle="tab" href="#publications-{{ org.id }}" role="tab" aria-controls="publications-{{ org.id }}" aria-selected="true">Publications{% if is_scipost_admin %} & PubFractions{% endif %}</a>
+ <a class="nav-link active" id="publications-{{ org.id }}-tab" data-toggle="tab" href="#publications-{{ org.id }}" role="tab" aria-controls="publications-{{ org.id }}" aria-selected="true">Publications{% if perms.scipost.can_manage_organizations or "can_view_org_contacts" in user_org_perms %}
+ & PubFractions{% endif %}</a>
</li>
<li class="nav-item">
<a class="nav-link" id="authors-{{ org.id }}-tab" data-toggle="tab" href="#authors-{{ org.id }}" role="tab" aria-controls="authors-{{ org.id }}" aria-selected="true">Associated Authors</a>
</li>
<li class="nav-item">
- <a class="nav-link" id="funders-{{ org.id }}-tab" data-toggle="tab" href="#funders-{{ org.id }}" role="tab" aria-controls="funders-{{ org.id }}" aria-selected="true">Funder Registry instances</a>
+ <a class="nav-link" id="support-{{ org.id }}-tab" data-toggle="tab" href="#support-{{ org.id }}" role="tab" aria-controls="support-{{ org.id }}" aria-selected="true">Support history</a>
</li>
+ {% if perms.scipost.can_manage_organizations or perms.scipost.can_add_contactperson %}
<li class="nav-item">
- <a class="nav-link" id="support-{{ org.id }}-tab" data-toggle="tab" href="#support-{{ org.id }}" role="tab" aria-controls="support-{{ org.id }}" aria-selected="true">Support history</a>
+ <a class="nav-link" id="contacts-{{ org.id }}-tab" data-toggle="tab" href="#contacts-{{ org.id }}" role="tab" aria-controls="contacts-{{ org.id }}" aria-selected="true">Contacts</a>
</li>
+ {% endif %}
{% if perms.scipost.can_manage_organizations %}
<li class="nav-item">
- <a class="nav-link" id="manage-{{ org.id }}-tab" data-toggle="tab" href="#manage-{{ org.id }}" role="tab" aria-controls="manage-{{ org.id }}" aria-selected="true">Manage</a>
+ <a class="nav-link" id="events-{{ org.id }}-tab" data-toggle="tab" href="#events-{{ org.id }}" role="tab" aria-controls="events-{{ org.id }}" aria-selected="true">Events</a>
</li>
{% endif %}
</ul>
@@ -45,14 +50,42 @@ $(document).ready(function($) {
<div class="tab-content" id="organization-{{ org.id }}-tab">
<div class="tab-pane pt-4" id="details-{{ org.id }}" role="tabpanel" aria-labelledby="details-{{ org.id }}-tab">
+ {% if perms.scipost.can_manage_organizations %}
+ <h3>Manage this organization:</h3>
+ <ul>
+ <li><a href="{% url 'organizations:organization_update' pk=org.id %}">Update</a></li>
+ <li><a href="{% url 'organizations:organization_delete' pk=org.id %}">Delete</a></li>
+ </ul>
+ <hr/>
+ {% endif %}
+
<h3>Details:</h3>
{% include 'organizations/_organization_details_contents.html' with org=org %}
+
+ <h3>Funder Registry instances associated to this Organization:</h3>
+ <ul>
+ {% for funder in org.funder_set.all %}
+ <li>{{ funder }}</li>
+ {% empty %}
+ <li>No Funder Registry instance found<br/><br/>
+ <strong class="text-danger">Without a Funder Registry instance, we cannot record funding acknowledgements to this Organization with Crossref.</strong>
+ <p>Are you a representative of this Organization? We advise you to:</p>
+ <ul>
+ <li>Make sure your Organization gets included in <a href="https://www.crossref.org/services/funder-registry/" target="_blank">Crossref's Funder Registry</a>;</li>
+ <li>After inclusion, <a href="mailto:admin@scipost.org?subject=Inclusion of {{ organization }} {% if organization.acronym %}({{ organization.acronym }}){% endif %} in the Funder Registry">contact our administration</a> with this information so that we can update our records.</li>
+ </ul>
+ </li>
+ {% endfor %}
+ </ul>
+
</div>
<div class="tab-pane show active pt-4" id="publications-{{ org.id }}" role="tabpanel" aria-labelledby="publications-{{ org.id }}-tab">
- <h3>Publications associated to this Organization{% if is_scipost_admin %} <span class="text-muted small">(with total PubFractions <i class="fa fa-info-circle" data-toggle="tooltip" data-html="true" title="" data-original-title="Fraction of a publication's funding/institutional support associated to a given Organization"></i>)</span>{% endif %}:</h3>
+ <h3>Publications associated to this Organization{% if perms.scipost.can_manage_organizations or "can_view_org_contacts" in user_org_perms %}
+ <span class="text-muted small">(with total PubFractions <i class="fa fa-info-circle" data-toggle="tooltip" data-html="true" title="" data-original-title="Fraction of a publication's funding/institutional support associated to a given Organization"></i>)</span>{% endif %}:</h3>
{% for pubyear in pubyears %}
- <h4>{{ pubyear }}{% if is_scipost_admin %} <span class="text-muted small">(total pubfractions: {{ org|pubfractions_in_year:pubyear }})</span>{% endif %}</h4>
+ <h4>{{ pubyear }}{% if perms.scipost.can_manage_organizations or "can_view_org_contacts" in user_org_perms %}
+ <span class="text-muted small">(total pubfractions: {{ org|pubfractions_in_year:pubyear }})</span>{% endif %}</h4>
<ul>
{% for publication in org.get_publications %}
{% if publication.publication_date|date:'Y'|add:"0" == pubyear %}
@@ -60,7 +93,7 @@ $(document).ready(function($) {
<a href="{{ publication.get_absolute_url }}">{{ publication.title }}</a>
<br>by {{ publication.author_list }},
<br>{{ publication.citation }}
- {% if is_scipost_admin %}
+ {% if perms.scipost.can_manage_organizations or "can_view_org_contacts" in user_org_perms %}
<br><span class="text-muted small">Pubfraction: {{ org|pubfraction_for_publication:publication }}</span>
{% endif %}
</li>
@@ -96,26 +129,10 @@ $(document).ready(function($) {
</div>
</div>
- <div class="tab-pane pt-4" id="funders-{{ org.id }}" role="tabpanel" aria-labelledby="funders-{{ org.id }}-tab">
- <h3>Funder Registry instances associated to this Organization:</h3>
- <ul>
- {% for funder in org.funder_set.all %}
- <li>{{ funder }}</li>
- {% empty %}
- <li>No Funder Registry instance found<br/><br/>
- <strong class="text-danger">Without a Funder Registry instance, we cannot record funding acknowledgements to this Organization with Crossref.</strong>
- <p>Are you a representative of this Organization? We advise you to:</p>
- <ul>
- <li>Make sure your Organization gets included in <a href="https://www.crossref.org/services/funder-registry/" target="_blank">Crossref's Funder Registry</a>;</li>
- <li>After inclusion, <a href="mailto:admin@scipost.org?subject=Inclusion of {{ organization }} {% if organization.acronym %}({{ organization.acronym }}){% endif %} in the Funder Registry">contact our administration</a> with this information so that we can update our records.</li>
- </ul>
- </li>
- {% endfor %}
- </ul>
- </div>
<div class="tab-pane pt-4" id="support-{{ org.id }}" role="tabpanel" aria-labelledby="support-{{ org.id }}-tab">
<h3>Support history</h3>
+ {% if org.subsidy_set.all|length > 0 or org.children.all|length > 0 %}
{% if org.subsidy_set.all|length > 0 %}
<p>List of the subsidies (in one form or another) which SciPost has received from this Organization. Click on a row to see more details.</p>
<table class="table table-hover mb-5">
@@ -130,66 +147,129 @@ $(document).ready(function($) {
{% for subsidy in org.subsidy_set.all %}
<tr class="table-row" data-href="{% url 'finances:subsidy_details' pk=subsidy.id %}" style="cursor: pointer;">
<td>{{ subsidy.get_subsidy_type_display }}</td>
- <td>€{{ subsidy.amount }}</td>
+ <td>{% if subsidy.amount_publicly_shown or perms.scipost.can_manage_subsidies or "can_view_org_contacts" in user_org_perms %}€{{ subsidy.amount }}{% else %}-{% endif %}</td>
<td>{{ subsidy.date }}{% if subsidy.date_until %} until {{ subsidy.date_until }}{% endif %}</td>
</tr>
{% endfor %}
<tr style="border-top: 2px solid black">
<td>Total support obtained:</td>
- <td>€{{ org.get_total_subsidies_obtained }}</td>
+ <td>{% if subsidy.amount_publicly_shown or perms.scipost.can_manage_subsidies or "can_view_org_contacts" in user_org_perms %}€{{ org.get_total_subsidies_obtained }}{% else %}-{% endif %}</td>
<td colspan="2">
</tr>
</tbody>
</table>
+ {% endif %}
+ {% if org.children.all|length > 0 %}
+ <p>See subsidies obtained from related organizations
+ <ul>
+ {% for child in org.children.all %}
+ <li><a href="{{ child.get_absolute_url }}">{{ child }}</a></li>
+ {% endfor %}
+ </ul>
+ </p>
+ {% endif %}
{% else %}
<p><strong>This Organization has <span class="text-danger">not yet</span> supported SciPost.</strong></p>
{% endif %}
+ </div>
- {% if is_scipost_admin %}
- <h3 class="text-danger">To be removed (Admin view only):</h3>
- <h3>Supporting Partner Agreements history:</h3>
- {% with agreement=org.partner.get_latest_active_agreement %}
- {% if agreement %}
- <p>This organization is currently a SciPost Supporting Partner.</p>
+ {% if perms.scipost.can_manage_organizations or perms.scipost.can_add_contactperson or "can_view_org_contacts" in user_org_perms %}
+ <div class="tab-pane pt-4" id="contacts-{{ org.id }}" role="tabpanel" aria-labelledby="contacts-{{ org.id }}-tab">
+ <h3>Contacts (with explicit role)</h3>
+ {% if perms.scipost.can_manage_organizations %}
+ <ul>
+ <li><a href="{% url 'organizations:add_contact' organization_id=org.id %}">Add a new Contact</a></li>
+ </ul>
{% endif %}
- {% endwith %}
- {% if org.partner.agreements %}
<table class="table">
- <thead>
- <th>Status</th>
- <th>Duration</th>
- <th>Start date</th>
- <th>Contribution/year</th>
- </thead>
- <tbody>
- {% for agreement in org.partner.agreements.all %}
- <tr>
- <td>{{ agreement.get_status_display }}</td>
- <td>{{ agreement.get_duration_display }}</td>
- <td>{{ agreement.start_date }}</td>
- <td>€{{ agreement.offered_yearly_contribution }}</td>
- </tr>
- {% endfor %}
- <tr style="border-top: 2px solid black">
- <td colspan="2"></td><td>Total contribution obtained:</td><td>€ {{ org.get_total_contribution_obtained }}</td></tr>
- </tbody>
+ <tr>
+ <th>Name</th>
+ <th>Kind</th>
+ <th>Date from</th>
+ <th>Date until</th>
+ {% if perms.scipost.can_manage_organizations or "can_view_org_contacts" in user_org_perms %}
+ <th>Account<br/>active?</th>
+ <th>Actions</th>
+ {% endif %}
+ </tr>
+ {% for contactrole in org.contactrole_set.all %}
+ <tr>
+ <td>{{ contactrole.contact }}</td>
+ <td>{{ contactrole.get_kind_display }}</td>
+ <td>{{ contactrole.date_from|date:"Y-m-d" }}</td>
+ <td>{{ contactrole.date_until|date:"Y-m-d" }}</td>
+ {% if perms.scipost.can_manage_organizations or "can_view_org_contacts" in user_org_perms %}
+ <td>{% if contactrole.contact.user.is_active %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %}</td>
+ <td>
+ <ul class="list-unstyled">
+ {% if perms.scipost.can_manage_organizations %}
+ <li><a href="{% url 'organizations:email_contactrole' contactrole_id=contactrole.id %}">Email (generic)</a></li>
+ <li><a href="{% url 'organizations:email_contactrole' contactrole_id=contactrole.id mail='renewal' %}">Email (subsidy renewal)</a></li>
+ {% endif %}
+ {% if perms.scipost.can_manage_organizations or "can_view_org_contacts" in user_org_perms %}
+ <li><a href="{% url 'organizations:contactrole_update' pk=contactrole.id %}"><span class="text-warning">Update</span></a></li>
+ {% endif %}
+ {% if perms.scipost.can_manage_organizations %}
+ <li><a href="{% url 'organizations:contactrole_delete' pk=contactrole.id %}"><span class="text-danger">Delete</span></a></li>
+ {% endif %}
+ </ul>
+ </td>
+ {% endif %}
+ </tr>
+ {% endfor %}
</table>
- {% else %}
- <p>This organization has <span class="text-danger">not yet</span> been a SciPost Supporting Partner.</p>
+
+ <h3>Contact persons</h3>
+ {% if perms.scipost.can_manage_organizations or perms.scipost.can_add_contactperson %}
+ <ul>
+ <li><a href="{% url 'organizations:contactperson_create' organization_id=org.id %}">Add/suggest a contact person for this Organization</a></li>
+ </ul>
{% endif %}
+ <table class="table">
+ {% for contactperson in org.contactperson_set.all %}
+ <tr>
+ <td>{{ contactperson }}</td>
+ <td>{{ contactperson.email }}</td>
+ <td>{{ contactperson.role }}</td>
+ {% if perms.scipost.can_manage_organizations or "can_view_org_contacts" in user_org_perms %}
+ <td>
+ <ul class="list-unstyled">
+ {% if perms.scipost.can_manage_organizations %}
+ <li><a href="{% url 'organizations:email_contactperson' contactperson_id=contactperson.id %}">Email (initial)</a></li>
+ <li><a href="{% url 'organizations:email_contactperson' contactperson_id=contactperson.id mail='followup' %}">Email (followup)</a></li>
+ <li><a href="{% url 'organizations:add_contact' organization_id=org.id contactperson_id=contactperson.id %}"><span class="text-success">Upgrade to Contact</span></a></li>
+ {% endif %}
+ <li><a href="{% url 'organizations:contactperson_update' pk=contactperson.id %}"><span class="text-warning">Update</span></a></li>
+ <li><a href="{% url 'organizations:contactperson_delete' pk=contactperson.id %}"><span class="text-danger">Delete</span></a></li>
+ </ul>
+ </td>
+ {% endif %}
+ </tr>
+ {% empty %}
+ <tr>
+ <td>No contact person defined</td>
+ </tr>
+ {% endfor %}
+ </table>
</div>
{% endif %}
- <div class="tab-pane pt-4" id="manage-{{ org.id }}" role="tabpanel" aria-labelledby="manage-{{ org.id }}-tab">
- {% if perms.scipost.can_manage_organizations %}
- <h3>Manage this organization:</h3>
+ {% if perms.scipost.can_manage_organizations %}
+ <div class="tab-pane pt-4" id="events-{{ org.id }}" role="tabpanel" aria-labelledby="events-{{ org.id }}-tab">
+ <h3>Events</h3>
<ul>
- <li><a href="{% url 'organizations:organization_update' pk=org.id %}">Update</a></li>
- <li><a href="{% url 'organizations:organization_delete' pk=org.id %}">Delete</a></li>
+ <li><a href="{% url 'organizations:organizationevent_create' pk=org.id %}">Add an event</a></li>
+ </ul>
+ <ul>
+ {% for event in org.organizationevent_set.all %}
+ {% include 'organizations/_organization_event_li.html' with event=event %}
+ {% empty %}
+ <li>No event found</li>
+ {% endfor %}
</ul>
- <hr/>
- {% endif %}
</div>
+ {% endif %}
+
</div>
</div>
</div>
diff --git a/partners/templates/partners/_prospartner_event_li.html b/organizations/templates/organizations/_organization_event_li.html
similarity index 100%
rename from partners/templates/partners/_prospartner_event_li.html
rename to organizations/templates/organizations/_organization_event_li.html
diff --git a/partners/templates/partners/activate_account.html b/organizations/templates/organizations/activate_account.html
similarity index 79%
rename from partners/templates/partners/activate_account.html
rename to organizations/templates/organizations/activate_account.html
index 1eb07a601fa8562cd259ddbf31f9e1a783f94c5d..aa948a06064755e8b0856c5de239e47ed08732b4 100644
--- a/partners/templates/partners/activate_account.html
+++ b/organizations/templates/organizations/activate_account.html
@@ -9,8 +9,8 @@
<h1 class="highlight">Activate Account</h1>
<div class="row justify-content-center">
<div class="col-md-8">
- <h2>{{contact.get_title_display}} {{contact.user.first_name}} {{contact.user.last_name}}</h2>
- <h3>{{contact.user.email}}</h3>
+ <h2>{{ contact.get_title_display }} {{ contact.user.first_name }} {{ contact.user.last_name }}</h2>
+ <h3>{{ contact.user.email }}</h3>
</div>
</div>
diff --git a/organizations/templates/organizations/base.html b/organizations/templates/organizations/base.html
index d90989f645ce5c61b35e66a2aecc7914abc8d157..d50b53a53c5a8f9fb988a299160323d1ac1b739c 100644
--- a/organizations/templates/organizations/base.html
+++ b/organizations/templates/organizations/base.html
@@ -2,10 +2,12 @@
{% block body_class %}{{ block.super }} organizations{% endblock %}
+
+
{% block breadcrumb %}
- <div class="container-outside header">
+ <div class="breadcrumb-container">
<div class="container">
- <nav class="breadcrumb hidden-sm-down">
+ <nav class="breadcrumb">
{% block breadcrumb_items %}
<a href="{% url 'organizations:organizations' %}" class="breadcrumb-item">Organizations</a>
{% endblock %}
diff --git a/organizations/templates/organizations/contact_detail.html b/organizations/templates/organizations/contact_detail.html
new file mode 100644
index 0000000000000000000000000000000000000000..a52811e18246fd8acd395f55a7c6ba06c5710227
--- /dev/null
+++ b/organizations/templates/organizations/contact_detail.html
@@ -0,0 +1,70 @@
+{% extends 'organizations/base.html' %}
+
+{% load bootstrap %}
+
+{% block pagetitle %}: Contact details{% endblock pagetitle %}
+
+{% block breadcrumb_items %}
+{{ block.super }}
+<span class="breadcrumb-item">Contacts</span>
+<span class="breadcrumb-item">{{ contact }}</span>
+{% endblock %}
+
+{% block content %}
+
+<div class="row">
+ <div class="col-12">
+ <h3 class="highlight">Contact details</h3>
+ <table class="table">
+ <tr>
+ <td>Name</td>
+ <td>{{ contact.user.last_name }}, {{ contact.get_title_display }} {{ contact.user.first_name }}</td>
+ </tr>
+ <tr>
+ <td>Email</td>
+ <td>{{ contact.user.email }}</td>
+ </tr>
+ <tr>
+ <td>Account active?</td>
+ <td>{% if contact.user.is_active %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %}</td>
+ </tr>
+ <tr>
+ <td>Account created</td>
+ <td>{{ contact.user.date_joined }}</td>
+ </tr>
+ <tr>
+ <td>Last login</td>
+ <td>{{ contact.user.last_login }}</td>
+ </tr>
+ </table>
+
+ <h4>Roles:</h4>
+ <table class="table">
+ <tr>
+ <th>Organization</th>
+ <th>Kind</th>
+ <th>Date from</th>
+ <th>Date until</th>
+ <th>Actions</th>
+ </tr>
+ {% for contactrole in contact.roles.all %}
+ <tr>
+ <td><a href="{{ contactrole.organization.get_absolute_url }}">{{ contactrole.organization }}</a></td>
+ <td>{{ contactrole.get_kind_display }}</td>
+ <td>{{ contactrole.date_from|date:"Y-m-d" }}</td>
+ <td>{{ contactrole.date_until|date:"Y-m-d" }}</td>
+ <td>
+ <ul class="list-unstyled">
+ {% if perms.scipost.can_manage_organizations %}
+ <li><a href="{% url 'organizations:contactrole_update' pk=contactrole.id %}"><span class="text-warning">Update</span></a></li>
+ <li><a href="{% url 'organizations:contactrole_delete' pk=contactrole.id %}"><span class="text-danger">Delete</span></a></li>
+ {% endif %}
+ </ul>
+ </td>
+ </tr>
+ {% endfor %}
+ </table>
+ </div>
+</div>
+
+{% endblock content %}
diff --git a/organizations/templates/organizations/contactperson_confirm_delete.html b/organizations/templates/organizations/contactperson_confirm_delete.html
new file mode 100644
index 0000000000000000000000000000000000000000..7f1d9fa121869dc33c2eb27baea62a79c6f9ac5d
--- /dev/null
+++ b/organizations/templates/organizations/contactperson_confirm_delete.html
@@ -0,0 +1,30 @@
+{% extends 'scipost/base.html' %}
+
+{% load bootstrap %}
+
+{% block breadcrumb_items %}
+{{ block.super }}
+<span class="breadcrumb-item"><a href="{% url 'organizations:organizations' %}">Organizations</a></span>
+<span class="breadcrumb-item">Confirm deletetion</span>
+{% endblock %}
+
+{% block pagetitle %}: Delete Contact Person{% endblock pagetitle %}
+
+{% block content %}
+<div class="row">
+ <div class="col-12">
+ <h1 class="highlight">Delete Contact Person</h1>
+ {{ object }}
+ </div>
+</div>
+<div class="row">
+ <div class="col-12">
+ <form method="post">
+ {% csrf_token %}
+ <h3 class="mb-2">Are you sure you want to delete this Contact Person?</h3>
+ <input type="submit" class="btn btn-danger" value="Yes, delete it" />
+ </form>
+ </div>
+</div>
+
+{% endblock content %}
diff --git a/organizations/templates/organizations/contactperson_form.html b/organizations/templates/organizations/contactperson_form.html
new file mode 100644
index 0000000000000000000000000000000000000000..381d45694a77df9111fb8780c0dae88e1486c279
--- /dev/null
+++ b/organizations/templates/organizations/contactperson_form.html
@@ -0,0 +1,23 @@
+{% extends 'scipost/base.html' %}
+
+{% load bootstrap %}
+
+{% block breadcrumb_items %}
+{{ block.super }}
+<span class="breadcrumb-item"><a href="{% url 'organizations:organizations' %}">Organizations</a></span>
+<span class="breadcrumb-item">{% if form.instance.id %}Update {{ form.instance }}{% else %}Add new Contact Person{% endif %}</span>
+{% endblock %}
+
+{% block pagetitle %}: Contact Person{% endblock pagetitle %}
+
+
+{% block content %}
+<div class="row">
+ <div class="col-12">
+ <form action="" method="post">
+ {% csrf_token %}
+ {{ form|bootstrap }}
+ <input type="submit" value="Submit" class="btn btn-primary">
+ </div>
+</div>
+{% endblock content %}
diff --git a/organizations/templates/organizations/contactperson_list.html b/organizations/templates/organizations/contactperson_list.html
new file mode 100644
index 0000000000000000000000000000000000000000..4267de192c21c66433bd5c2196b5f628817eb656
--- /dev/null
+++ b/organizations/templates/organizations/contactperson_list.html
@@ -0,0 +1,49 @@
+{% extends 'organizations/base.html' %}
+
+{% block pagetitle %}: Contact Persons{% endblock pagetitle %}
+
+{% load bootstrap %}
+
+{% block breadcrumb_items %}
+{{ block.super }}
+<span class="breadcrumb-item">Contact Persons</span>
+{% endblock %}
+
+{% block content %}
+
+<div class="row">
+ <div class="col-12">
+ <h3 class="highlight">Contact Persons</h3>
+ <p>Contact Persons are by definition employees of an Organization, who play a role of potential relevance to SciPost's sponsoring efforts. SciPost Admin takes charge of contacting Contact Persons listed here, to try to promote them to registered Contacts (members of the Sponsors Board).</p>
+ <p>Do you people who you think should appear on this list?</p>
+ <p>Are they not in our list of registered Contacts (which you can view on your <a href="{% url 'organizations:dashboard' %}" target="_blank">dashboard</a> under the Sponsors Board tab)?</p>
+ <p>Then please help us out: <a href="{% url 'organizations:contactperson_create' %}">add a Contact Person</a> instance.</p>
+
+ <table class="table">
+ <thead class="thead-default">
+ <tr>
+ <td>Name</td>
+ <td>Organization</td>
+ <td>Role</td>
+ <td>Actions</td>
+ </tr>
+ </thead>
+ <tbody>
+ {% for cp in object_list %}
+ <tr>
+ <td>{{ cp.last_name }}, {{ cp.get_title_display }} {{ cp.first_name }}</td>
+ <td><a href="{{ cp.organization.get_absolute_url }}">{{ cp.organization }}</a></td>
+ <td>{{ cp.role }}</td>
+ <td>
+ <ul class="list-unstyled">
+ <li><a href="{% url 'organizations:contactperson_update' pk=cp.id %}"><span class="text-warning">Update</span></a></li>
+ </ul>
+ </td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ </div>
+</div>
+
+{% endblock content %}
diff --git a/organizations/templates/organizations/contactrole_confirm_delete.html b/organizations/templates/organizations/contactrole_confirm_delete.html
new file mode 100644
index 0000000000000000000000000000000000000000..f0d3ccfbc02ab888d393c54bb93144ced7e8bf39
--- /dev/null
+++ b/organizations/templates/organizations/contactrole_confirm_delete.html
@@ -0,0 +1,30 @@
+{% extends 'scipost/base.html' %}
+
+{% load bootstrap %}
+
+{% block breadcrumb_items %}
+{{ block.super }}
+<span class="breadcrumb-item"><a href="{% url 'organizations:organizations' %}">Organizations</a></span>
+<span class="breadcrumb-item">Confirm deletetion</span>
+{% endblock %}
+
+{% block pagetitle %}: Delete ContactRole{% endblock pagetitle %}
+
+{% block content %}
+<div class="row">
+ <div class="col-12">
+ <h1 class="highlight">Delete ContactRole</h1>
+ {{ object }}
+ </div>
+</div>
+<div class="row">
+ <div class="col-12">
+ <form method="post">
+ {% csrf_token %}
+ <h3 class="mb-2">Are you sure you want to delete this ContactRole?</h3>
+ <input type="submit" class="btn btn-danger" value="Yes, delete it" />
+ </form>
+ </div>
+</div>
+
+{% endblock content %}
diff --git a/organizations/templates/organizations/contactrole_form.html b/organizations/templates/organizations/contactrole_form.html
new file mode 100644
index 0000000000000000000000000000000000000000..211764a47a2a367cf71f2e1bd0e3c63bcae587ae
--- /dev/null
+++ b/organizations/templates/organizations/contactrole_form.html
@@ -0,0 +1,28 @@
+{% extends 'scipost/base.html' %}
+
+{% load bootstrap %}
+
+{% block breadcrumb_items %}
+{{ block.super }}
+<span class="breadcrumb-item"><a href="{% url 'organizations:organizations' %}">Organizations</a></span>
+<span class="breadcrumb-item">{% if form.instance.id %}Update {{ form.instance }}{% else %}Add new ContactRole{% endif %}</span>
+{% endblock %}
+
+{% block pagetitle %}: ContactRole{% endblock pagetitle %}
+
+
+{% block content %}
+<div class="row">
+ <div class="col-12">
+ <form action="" method="post">
+ {% csrf_token %}
+ {{ form|bootstrap }}
+ <input type="submit" value="Submit" class="btn btn-primary">
+ </div>
+</div>
+{% endblock content %}
+
+{% block footer_script %}
+{{ block.super }}
+{{ form.media }}
+{% endblock footer_script %}
diff --git a/organizations/templates/organizations/dashboard.html b/organizations/templates/organizations/dashboard.html
new file mode 100644
index 0000000000000000000000000000000000000000..50201f2bc1a5cbdd2a222a361ad23c5bb0a98507
--- /dev/null
+++ b/organizations/templates/organizations/dashboard.html
@@ -0,0 +1,217 @@
+{% extends 'organizations/base.html' %}
+
+{% load bootstrap %}
+
+{% block pagetitle %}: organizations dashboard{% endblock pagetitle %}
+
+{% block headsup %}
+<script type="text/javascript">
+$(document).ready(function($) {
+ $(".table-row").click(function() {
+ window.document.location = $(this).data("href");
+ });
+});
+</script>
+{% endblock headsup %}
+
+{% block content %}
+
+<div class="row">
+ <div class="col-12">
+ {% if request.user.org_contact %}
+ <h1 class="highlight">Welcome to your Organizations dashboard, {{ request.user.org_contact.get_title_display }} {{ request.user.last_name }}</h1>
+ {% elif perms.scipost.can_manage_organizations %}
+ <h1 class="highlight">Organizations dashboard</h1>
+ {% endif %}
+ </div>
+</div>
+
+<div class="row">
+ <div class="col-12">
+ <div class="tab-nav-container">
+ <div class="tab-nav-inner">
+ <ul class="nav btn-group personal-page-nav" role="tablist">
+ {% if request.user.org_contact %}
+ <li class="nav-item btn btn-outline-secondary">
+ <a href="#account" class="nav-link" data-toggle="tab">Account</a>
+ </li>
+ <li class="nav-item btn btn-outline-secondary">
+ <a href="#own_roles" class="nav-link active" data-toggle="tab">Your roles</a>
+ </li>
+ <li class="nav-item btn btn-outline-secondary">
+ <a href="#subsidies" class="nav-link" data-toggle="tab">Subsidies<br/><span class="small text-muted">[from your Orgs]</span></a>
+ </li>
+ {% endif %}
+ <li class="nav-item btn btn-outline-secondary">
+ <a href="{% url 'finances:subsidies' %}" class="nav-link" target="_blank">Subsidies<br/><span class="small text-muted">[full list]</span></a>
+ </li>
+ <li class="nav-item btn btn-outline-secondary">
+ <a href="#board" class="nav-link" data-toggle="tab">Sponsors Board<br/><span class="small text-muted">[registered Contacts]</span></a>
+ </li>
+ <li class="nav-item btn btn-outline-secondary">
+ <a href="{% url 'organizations:contactperson_list' %}" class="nav-link" target="_blank">Contact Persons<br/><span class="small text-muted">[unregistered contacts]</span></a>
+ </li>
+ {% if perms.scipost.can_manage_organizations %}
+ <li class="nav-item btn btn-outline-secondary">
+ <a href="{% url 'organizations:organizationevent_list' %}" class="nav-link" target="_blank">Events</a>
+ </li>
+ {% endif %}
+ </ul>
+ </div>
+ </div>
+ </div>
+</div>
+
+<div class="tab-content">
+
+ <div class="tab-pane" id="account" role="tabpanel">
+ <div class="row">
+ <div class="col-12">
+ <h2 class="highlight">Your account</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-12">
+ <p>{{ request.user.org_contact }}</p>
+
+ <h3>Update your personal data or password</h3>
+ <ul>
+ <li><a href="{% url 'scipost:update_personal_data' %}">Update your personal data</a></li>
+ <li><a href="{% url 'scipost:change_password' %}">Change your password</a></li>
+ </ul>
+
+ </div>
+ </div>
+ </div>
+
+ <div class="tab-pane{% if request.user.org_contact %} active{% endif %}" id="own_roles" role="tabpanel">
+ <div class="row">
+ <div class="col-12">
+ <h2 class="highlight">Your Organizations-related roles</h2>
+ <p>Click on an Organization's name to see its details.</p>
+ <table class="table">
+ <tr>
+ <th>Organization</th>
+ <th>Role kind</th>
+ <th>Date from</th>
+ <th>Date until</th>
+ <th>Actions</th>
+ </tr>
+ {% for role in own_roles %}
+ <tr>
+ <td><a href="{{ role.organization.get_absolute_url }}">{{ role.organization }}</a></td>
+ <td>{{ role.get_kind_display }}</td>
+ <td>{{ role.date_from|date:"Y-m-d" }}</td>
+ <td>{{ role.date_until|date:"Y-m-d" }}</td>
+ <td><a href="{% url 'organizations:contactrole_update' pk=role.id %}"><span class="text-warning">Update</span></a></td>
+ </tr>
+ {% empty %}
+ <tr>
+ <td>No role has been defined</td>
+ </tr>
+ {% endfor %}
+ </table>
+ </div>
+ </div>
+ </div>
+
+ <div class="tab-pane" id="subsidies" role="tabpanel">
+ <div class="row">
+ <div class="col-12">
+ <h2 class="highlight">Subsidies from your Organizations</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-12">
+ <ul>
+ {% for role in request.user.org_contact.roles.all %}
+ <li>
+ <h4>{{ role.organization }}</h4>
+
+ {% if role.organization.subsidy_set.all|length > 0 %}
+ <p>List of the subsidies (in one form or another) which SciPost has received from this Organization. Click on a row to see more details.</p>
+ <table class="table table-hover mb-5">
+ <thead class="thead-default">
+ <tr>
+ <th>Type</th>
+ <th>Amount</th>
+ <th>Date</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for subsidy in role.organization.subsidy_set.all %}
+ <tr class="table-row" data-href="{% url 'finances:subsidy_details' pk=subsidy.id %}" style="cursor: pointer;">
+ <td>{{ subsidy.get_subsidy_type_display }}</td>
+ <td>€{{ subsidy.amount }}</td>
+ <td>{{ subsidy.date }}{% if subsidy.date_until %} until {{ subsidy.date_until }}{% endif %}</td>
+ </tr>
+ {% endfor %}
+ <tr style="border-top: 2px solid black">
+ <td>Total support obtained:</td>
+ <td>€{{ role.organization.get_total_subsidies_obtained }}</td>
+ <td colspan="2">
+ </tr>
+ </tbody>
+ </table>
+ {% else %}
+ <p><strong>This Organization has <span class="text-danger">not yet</span> supported SciPost.</strong></p>
+ {% endif %}
+ </li>
+ {% empty %}
+ <li>No Organization found</li>
+ {% endfor %}
+ </ul>
+ </div>
+ </div>
+ </div>
+
+ <div class="tab-pane" id="board" role="tabpanel">
+ <div class="row">
+ <div class="col-12">
+ <h2 class="highlight">Sponsors Board</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-12">
+ <p>The Sponsors Board is composed of all registered Organization Contacts.</p>
+ <p>Do you know people who you think should appear on this list? Help us by checking if they are already on our <a href="{% url 'organizations:contactperson_list' %}" target="_blank">list of Contact Persons</a>, and if not, please add them!</p>
+ <h3>Active Contacts</h3>
+ <table class="table">
+ <thead class="thead-default">
+ <tr>
+ <th>Name</th>
+ <th>Organization(s) / role(s)</th>
+ {% if perms.scipost.can_manage_organizations %}
+ <th>Account<br/>active?</th>
+ {% endif %}
+ </tr>
+ </thead>
+ <tbody>
+ {% for contact in contacts %}
+ <tr>
+ <td><a href="{% url 'organizations:contact_details' pk=contact.id %}">{{ contact }}</a></td>
+ <td>
+ <ul class="list-group list-group-flush">
+ {% for role in contact.roles.all %}
+ <li class="list-group-item"><a href="{{ role.organization.get_absolute_url }}" target="_blank">{{ role.organization }}</a> / {{ role.get_kind_display }}</li>
+ {% empty %}
+ <li class="list-group-item">No Organization found</li>
+ {% endfor %}
+ </ul>
+ </td>
+ {% if perms.scipost.can_manage_organizations %}
+ <td>{% if contact.user.is_active %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %}</td>
+ {% endif %}
+ </tr>
+ {% empty %}
+ <tr><td>No contact found</td></tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+
+</div>
+
+{% endblock content %}
diff --git a/partners/templates/partners/partner_add_contact.html b/organizations/templates/organizations/organization_add_contact.html
similarity index 83%
rename from partners/templates/partners/partner_add_contact.html
rename to organizations/templates/organizations/organization_add_contact.html
index cde33236f75bc734284971ed5f8805edaf364115..061b24c322ff8f7a29549585d3b227c0dd0ea22b 100644
--- a/partners/templates/partners/partner_add_contact.html
+++ b/organizations/templates/organizations/organization_add_contact.html
@@ -1,4 +1,4 @@
-{% extends 'partners/_partners_page_base.html' %}
+{% extends 'scipost/base.html' %}
{% block breadcrumb_items %}
{{block.super}}
@@ -13,7 +13,7 @@
<div class="row">
<div class="col-12">
- <h1 class="highlight">Add Contact for Partner {{partner}}</h1>
+ <h1 class="highlight">Add Contact for Organization {{ organization }}</h1>
</div>
</div>
diff --git a/organizations/templates/organizations/organization_list.html b/organizations/templates/organizations/organization_list.html
index 0077f41174301ba2fa161ec1206a7d98701782e3..4cce72c17bbb585be1092f2a5172fbaf4ce6ab1d 100644
--- a/organizations/templates/organizations/organization_list.html
+++ b/organizations/templates/organizations/organization_list.html
@@ -4,7 +4,9 @@
{% load staticfiles %}
{% load user_groups %}
+{% load add_get_parameters %}
{% load organizations_extras %}
+{% load countries %}
{% is_scipost_admin request.user as is_scipost_admin %}
@@ -16,6 +18,7 @@ $(document).ready(function($) {
});
});
</script>
+<link rel="stylesheet" href="{% static 'flags/sprite-hq.css' %}">
{% endblock headsup %}
{% block breadcrumb_items %}
@@ -30,9 +33,9 @@ $(document).ready(function($) {
{% if perms.scipost.can_manage_organizations %}
<h3>Management actions:</h3>
<ul>
+ <li><a href="{% url 'organizations:dashboard' %}">Go to the dashboard</a></li>
<li><a href="{% url 'organizations:organization_create' %}">Create a new Organization instance</a></li>
<li><a href="{% url 'funders:funders_dashboard' %}">Link Funders to Organizations</a> ({{ nr_funders_wo_organization }} found in need of linking)</li>
- <li>Link Partners to Organizations ({{ nr_partners_wo_organization }} found in need of linking)</li>
</ul>
{% endif %}
</div>
@@ -65,21 +68,38 @@ $(document).ready(function($) {
</div>
</div>
+<div class="row">
+ <div class="col-3">
+ <h3>Click on flag to view by Country</h3>
+ <p><a href="{% url 'organizations:organizations' %}">View all</a></p>
+ </div>
+ <div class="col-8">
+ <ul>
+ {% for code in countrycodes %}
+ {% get_country code as country_obj %}
+ <li style="display: inline-block;">
+ <a href="{% add_get_parameters country=code %}"><i class="{{ country_obj.flag_css }}" aria-label="{{ country_obj.code }}" data-toggle="tooltip" title="{{ country_obj.name }}"></i></a>
+ </li>
+ {% endfor %}
+ </ul>
+ </div>
+</div>
+
<div class="row">
<div class="col-12">
<table class="table table-hover mb-5">
<thead class="thead-default">
<tr>
- <th><a href="?order_by=country">Country</a></th>
- <th><a href="?order_by=name">Name</a> <small>[acronym]</small></th>
+ <th><a href="{% add_get_parameters order_by='country' %}">Country</a></th>
+ <th><a href="{% add_get_parameters order_by='name' %}">Name</a> <small>[acronym]</small></th>
<th>NAP <i class="fa fa-info-circle" data-toggle="tooltip" data-html="true" title="" data-original-title="Number of associated publications<br/>For details, click on the Organization and consult the Associated Publications tab"></i>
{% if request.GET.ordering != 'asc' %}
- <a href="?order_by=nap&ordering=asc"><i class="fa fa-sort-asc"></i></a>
+ <a href="{% add_get_parameters order_by='nap' ordering='asc' %}"><i class="fa fa-sort-asc"></i></a>
{% else %}
<a href="{% url 'organizations:organizations' %}"><i class="fa fa-sort-asc"></i></a>
{% endif %}
{% if request.GET.ordering != 'desc' %}
- <a href="?order_by=nap&ordering=desc"><i class="fa fa-sort-desc"></i></a>
+ <a href="{% add_get_parameters order_by='nap' ordering='desc' %}"><i class="fa fa-sort-desc"></i></a>
{% else %}
<a href="{% url 'organizations:organizations' %}"><i class="fa fa-sort-desc"></i></a>
{% endif %}
@@ -124,6 +144,13 @@ $(document).ready(function($) {
{% endfor %}
</tbody>
</table>
+
+ {% if is_paginated %}
+ <div class="col-12">
+ {% include 'partials/pagination.html' with page_obj=page_obj %}
+ </div>
+ {% endif %}
+
</div>
</div>
diff --git a/organizations/templates/organizations/organizationevent_form.html b/organizations/templates/organizations/organizationevent_form.html
new file mode 100644
index 0000000000000000000000000000000000000000..d100a520fa441fba12fcf9fb7ce9bf591d547ff9
--- /dev/null
+++ b/organizations/templates/organizations/organizationevent_form.html
@@ -0,0 +1,28 @@
+{% extends 'scipost/base.html' %}
+
+{% load bootstrap %}
+
+{% block breadcrumb_items %}
+{{ block.super }}
+<span class="breadcrumb-item"><a href="{% url 'organizations:organizations' %}">Organizations</a></span>
+<span class="breadcrumb-item">{% if form.instance.id %}Update {{ form.instance }}{% else %}Add new OrganizationEvent{% endif %}</span>
+{% endblock %}
+
+{% block pagetitle %}: OrganizationEvent{% endblock pagetitle %}
+
+
+{% block content %}
+<div class="row">
+ <div class="col-12">
+ <form action="" method="post">
+ {% csrf_token %}
+ {{ form|bootstrap }}
+ <input type="submit" value="Submit" class="btn btn-primary">
+ </div>
+</div>
+{% endblock content %}
+
+{% block footer_script %}
+{{ block.super }}
+{{ form.media }}
+{% endblock footer_script %}
diff --git a/organizations/templates/organizations/organizationevent_list.html b/organizations/templates/organizations/organizationevent_list.html
new file mode 100644
index 0000000000000000000000000000000000000000..85610bef6f2ae3aa5b67bd19e66f393f56eb3657
--- /dev/null
+++ b/organizations/templates/organizations/organizationevent_list.html
@@ -0,0 +1,50 @@
+{% extends 'organizations/base.html' %}
+
+{% block pagetitle %}: Organization Events{% endblock pagetitle %}
+
+{% load bootstrap %}
+
+{% block breadcrumb_items %}
+{{ block.super }}
+<span class="breadcrumb-item">Organization Events</span>
+{% endblock %}
+
+{% block content %}
+
+<div class="row">
+ <div class="col-12">
+ <h3 class="highlight">Organization Events</h3>
+
+ <table class="table">
+ <thead class="thead-default">
+ <tr>
+ <th>Organization</th>
+ <th>Event</th>
+ <th>Comments</th>
+ <th>Noted on</th>
+ <th>Noted by</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for event in object_list %}
+ <tr>
+ <td><a href="{% url 'organizations:organization_details' pk=event.organization.id %}">{{ event.organization }}</a></td>
+ <td>{{ event.get_event_display }}</td>
+ <td>{{ event.comments|linebreaks }}</td>
+ <td>{{ event.noted_on }}</td>
+ <td>{{ event.noted_by }}</td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+
+ {% if is_paginated %}
+ <div class="col-12">
+ {% include 'partials/pagination.html' with page_obj=page_obj %}
+ </div>
+ {% endif %}
+
+ </div>
+</div>
+
+{% endblock content %}
diff --git a/organizations/urls.py b/organizations/urls.py
index 5ad00b7c7a45ae2669a3ec20f83af4aec4bc9264..b3f5802083ecca92580f3d4c363ed24ec6a6a73e 100644
--- a/organizations/urls.py
+++ b/organizations/urls.py
@@ -32,4 +32,94 @@ urlpatterns = [
views.OrganizationDetailView.as_view(),
name='organization_details'
),
+ url(
+ r'^(?P<pk>[0-9]+)/orgevent/add/$',
+ views.OrganizationEventCreateView.as_view(),
+ name='organizationevent_create'
+ ),
+ url(
+ r'^organizationevents/$',
+ views.OrganizationEventListView.as_view(),
+ name='organizationevent_list'
+ ),
+ url(
+ r'^add_contactperson/(?P<organization_id>[0-9]+)/$',
+ views.ContactPersonCreateView.as_view(),
+ name='contactperson_create'
+ ),
+ url(
+ r'^contactperson/add/$',
+ views.ContactPersonCreateView.as_view(),
+ name='contactperson_create'
+ ),
+ url(
+ r'^contactperson/(?P<pk>[0-9]+)/update/$',
+ views.ContactPersonUpdateView.as_view(),
+ name='contactperson_update'
+ ),
+ url(
+ r'^contactperson/(?P<pk>[0-9]+)/delete/$',
+ views.ContactPersonDeleteView.as_view(),
+ name='contactperson_delete'
+ ),
+ url(
+ r'^contactpersons/$',
+ views.ContactPersonListView.as_view(),
+ name='contactperson_list'
+ ),
+ url(
+ r'^contactperson/(?P<contactperson_id>[0-9]+)/email/(?P<mail>followup)$',
+ views.email_contactperson,
+ name='email_contactperson'
+ ),
+ url(
+ r'^contactperson/(?P<contactperson_id>[0-9]+)/email/$',
+ views.email_contactperson,
+ name='email_contactperson'
+ ),
+ url(
+ # For upgrading a ContactPerson to a Contact
+ r'^add_contact/(?P<organization_id>[0-9]+)/(?P<contactperson_id>[0-9]+)/$',
+ views.organization_add_contact,
+ name='add_contact'
+ ),
+ url(
+ r'^add_contact/(?P<organization_id>[0-9]+)/$',
+ views.organization_add_contact,
+ name='add_contact'
+ ),
+ url(
+ r'^activate/(?P<activation_key>.+)$',
+ views.activate_account,
+ name='activate_account'
+ ),
+ url(
+ r'^dashboard/$',
+ views.dashboard,
+ name='dashboard'
+ ),
+ url(r'^contact/(?P<pk>[0-9]+)/$',
+ views.ContactDetailView.as_view(),
+ name='contact_details'
+ ),
+ url(
+ r'^contactrole/(?P<pk>[0-9]+)/update/$',
+ views.ContactRoleUpdateView.as_view(),
+ name='contactrole_update'
+ ),
+ url(
+ r'^contactrole/(?P<pk>[0-9]+)/delete/$',
+ views.ContactRoleDeleteView.as_view(),
+ name='contactrole_delete'
+ ),
+ url(
+ r'^contactrole/(?P<contactrole_id>[0-9]+)/email/(?P<mail>renewal)$',
+ views.email_contactrole,
+ name='email_contactrole'
+ ),
+ url(
+ r'^contactrole/(?P<contactrole_id>[0-9]+)/email/$',
+ views.email_contactrole,
+ name='email_contactrole'
+ ),
]
diff --git a/organizations/views.py b/organizations/views.py
index 0896d310848600ed8130d355b8bd1babfe86b6f6..df80d6f32dd7fee4722a2eae33c087c1283857c3 100644
--- a/organizations/views.py
+++ b/organizations/views.py
@@ -2,19 +2,32 @@ __copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
+from django.contrib import messages
+from django.contrib.auth.decorators import login_required
+from django.contrib.auth.mixins import UserPassesTestMixin
+from django.core.exceptions import PermissionDenied
from django.core.urlresolvers import reverse_lazy
+from django.db import transaction
+from django.shortcuts import get_object_or_404, render, reverse, redirect
from django.utils import timezone
from django.views.generic.detail import DetailView
from django.views.generic.edit import CreateView, UpdateView, DeleteView
from django.views.generic.list import ListView
-from .constants import ORGTYPE_PRIVATE_BENEFACTOR
-from .models import Organization
+from guardian.decorators import permission_required
+
+from .constants import ORGTYPE_PRIVATE_BENEFACTOR,\
+ ORGANIZATION_EVENT_COMMENT, ORGANIZATION_EVENT_EMAIL_SENT
+from .forms import OrganizationEventForm, ContactPersonForm,\
+ NewContactForm, ContactActivationForm, ContactRoleForm
+from .models import Organization, OrganizationEvent, ContactPerson, Contact, ContactRole
from funders.models import Funder
-from partners.models import Partner
+from mails.utils import DirectMailUtil
+from mails.views import MailEditingSubView
+from organizations.decorators import has_contact
-from scipost.mixins import PermissionsMixin
+from scipost.mixins import PermissionsMixin, PaginationMixin
class OrganizationCreateView(PermissionsMixin, CreateView):
@@ -48,27 +61,33 @@ class OrganizationDeleteView(PermissionsMixin, DeleteView):
success_url = reverse_lazy('organizations:organizations')
-class OrganizationListView(ListView):
+class OrganizationListView(PaginationMixin, ListView):
model = Organization
+ paginate_by = 50
def get_context_data(self, *args, **kwargs):
context = super().get_context_data(*args, **kwargs)
if self.request.user.has_perm('scipost.can_manage_organizations'):
context['nr_funders_wo_organization'] = Funder.objects.filter(organization=None).count()
- context['nr_partners_wo_organization'] = Partner.objects.filter(organization=None).count()
context['pubyears'] = range(int(timezone.now().strftime('%Y')), 2015, -1)
+ context['countrycodes'] = [code['country'] for code in list(
+ Organization.objects.all().distinct('country').values('country'))]
return context
def get_queryset(self):
qs = super().get_queryset().exclude(orgtype=ORGTYPE_PRIVATE_BENEFACTOR)
+ country = self.request.GET.get('country')
order_by = self.request.GET.get('order_by')
ordering = self.request.GET.get('ordering')
+ if country:
+ qs = qs.filter(country=country)
if order_by == 'country':
qs = qs.order_by('country')
elif order_by == 'name':
qs = qs.order_by('name')
elif order_by == 'nap':
- qs = qs.order_by('cf_nr_associated_publications')
+ qs = qs.exclude(cf_nr_associated_publications__isnull=True
+ ).order_by('cf_nr_associated_publications')
if ordering == 'desc':
qs = qs.reverse()
return qs
@@ -90,3 +109,289 @@ class OrganizationDetailView(DetailView):
if not self.request.user.has_perm('scipost.can_manage_organizations'):
queryset = queryset.exclude(orgtype=ORGTYPE_PRIVATE_BENEFACTOR)
return queryset
+
+
+class OrganizationEventCreateView(PermissionsMixin, CreateView):
+ permission_required = 'scipost.can_manage_organizations'
+ model = OrganizationEvent
+ form_class = OrganizationEventForm
+ template_name = 'organizations/organizationevent_form.html'
+
+ def get_initial(self):
+ organization = get_object_or_404(Organization, pk=self.kwargs.get('pk'))
+ return {'organization': organization,
+ 'noted_on': timezone.now,
+ 'noted_by': self.request.user}
+
+ def get_success_url(self):
+ return reverse_lazy('organizations:organization_details',
+ kwargs={'pk': self.object.organization.id})
+
+
+class OrganizationEventListView(PermissionsMixin, PaginationMixin, ListView):
+ permission_required = 'scipost.can_manage_organizations'
+ model = OrganizationEvent
+ paginate_by = 10
+
+
+class ContactPersonCreateView(PermissionsMixin, CreateView):
+ permission_required = 'scipost.can_add_contactperson'
+ model = ContactPerson
+ form_class= ContactPersonForm
+ template_name = 'organizations/contactperson_form.html'
+
+ def get_initial(self):
+ try:
+ organization = Organization.objects.get(pk=self.kwargs.get('organization_id'))
+ return {'organization': organization}
+ except Organization.DoesNotExist:
+ pass
+
+ def form_valid(self, form):
+ event = OrganizationEvent(
+ organization=form.cleaned_data['organization'],
+ event=ORGANIZATION_EVENT_COMMENT,
+ comments=('Added ContactPerson: %s %s' % (form.cleaned_data['first_name'],
+ form.cleaned_data['last_name'])),
+ noted_on=timezone.now(),
+ noted_by=self.request.user)
+ event.save()
+ return super().form_valid(form)
+
+ def get_success_url(self):
+ return reverse_lazy('organizations:organization_details',
+ kwargs={'pk': self.object.organization.id})
+
+
+class ContactPersonUpdateView(PermissionsMixin, UpdateView):
+ permission_required = 'scipost.can_add_contactperson'
+ model = ContactPerson
+ form_class= ContactPersonForm
+ template_name = 'organizations/contactperson_form.html'
+
+ def form_valid(self, form):
+ event = OrganizationEvent(
+ organization=form.cleaned_data['organization'],
+ event=ORGANIZATION_EVENT_COMMENT,
+ comments=('Updated ContactPerson: %s %s' % (form.cleaned_data['first_name'],
+ form.cleaned_data['last_name'])),
+ noted_on=timezone.now(),
+ noted_by=self.request.user)
+ event.save()
+ return super().form_valid(form)
+
+ def get_success_url(self):
+ return reverse_lazy('organizations:organization_details',
+ kwargs={'pk': self.object.organization.id})
+
+
+class ContactPersonDeleteView(UserPassesTestMixin, DeleteView):
+ model = ContactPerson
+
+ def test_func(self):
+ """
+ Allow ContactPerson delete to OrgAdmins and all Contacts for this Organization.
+ """
+ if self.request.user.has_perm('scipost.can_manage_organizations'):
+ return True
+ contactperson = get_object_or_404(ContactPerson, pk=self.kwargs.get('pk'))
+ return self.request.user.has_perm('can_view_org_contacts', contactperson.organization)
+
+ def get_success_url(self):
+ return reverse_lazy('organizations:organization_details',
+ kwargs={'pk': self.object.organization.id})
+
+
+class ContactPersonListView(PermissionsMixin, ListView):
+ permission_required = 'scipost.can_add_contactperson'
+ model = ContactPerson
+
+
+@permission_required('scipost.can_manage_organizations', return_403=True)
+@transaction.atomic
+def email_contactperson(request, contactperson_id, mail=None):
+ contactperson = get_object_or_404(ContactPerson, pk=contactperson_id)
+
+ suffix = ''
+ if mail == 'followup':
+ code = 'org_contacts/contactperson_followup_mail'
+ suffix = ' (followup)'
+ else:
+ code = 'org_contacts/contactperson_initial_mail'
+ suffix = ' (initial)'
+ mail_request = MailEditingSubView(request, mail_code=code, contactperson=contactperson)
+ if mail_request.is_valid():
+ comments = 'Email{suffix} sent to ContactPerson {name}.'.format(
+ suffix=suffix, name=contactperson)
+ event = OrganizationEvent(
+ organization=contactperson.organization,
+ event=ORGANIZATION_EVENT_EMAIL_SENT,
+ comments=comments,
+ noted_on=timezone.now(),
+ noted_by=request.user)
+ event.save()
+ messages.success(request, 'Email successfully sent.')
+ mail_request.send()
+ return redirect(contactperson.organization.get_absolute_url())
+ else:
+ return mail_request.return_render()
+
+
+@permission_required('scipost.can_manage_organizations', return_403=True)
+def organization_add_contact(request, organization_id, contactperson_id=None):
+ organization = get_object_or_404(Organization, id=organization_id)
+ if contactperson_id:
+ contactperson = get_object_or_404(ContactPerson, id=contactperson_id)
+ initial = {
+ 'title': contactperson.title,
+ 'first_name': contactperson.first_name,
+ 'last_name': contactperson.last_name,
+ 'email': contactperson.email
+ }
+ else:
+ contactperson = None
+ initial = {}
+ form = NewContactForm(request.POST or None, initial=initial,
+ organization=organization,
+ contactperson=contactperson
+ )
+ if form.is_valid():
+ contact = form.save(current_user=request.user)
+ mail_sender = DirectMailUtil(
+ mail_code='org_contacts/email_contact_for_activation',
+ contact=contact)
+ mail_sender.send()
+ for role in contact.roles.all():
+ event = OrganizationEvent(
+ organization=role.organization,
+ event=ORGANIZATION_EVENT_COMMENT,
+ comments=('Contact for %s created; activation pending' % str(contact)),
+ noted_on=timezone.now(),
+ noted_by=request.user)
+ event.save()
+ messages.success(request, '<h3>Created contact: %s</h3>Email has been sent.'
+ % str(contact))
+ return redirect(reverse('organizations:organization_details',
+ kwargs={'pk': organization.id}))
+ context = {
+ 'organization': organization,
+ 'form': form
+ }
+ return render(request, 'organizations/organization_add_contact.html', context)
+
+
+def activate_account(request, activation_key):
+ contact = get_object_or_404(Contact, user__is_active=False,
+ activation_key=activation_key,
+ user__email__icontains=request.GET.get('email', None))
+
+ # TODO: Key Expires fallback
+ form = ContactActivationForm(request.POST or None, instance=contact.user)
+ if form.is_valid():
+ form.activate_user()
+ for role in contact.roles.all():
+ event = OrganizationEvent(
+ organization=role.organization,
+ event=ORGANIZATION_EVENT_COMMENT,
+ comments=('Contact %s activated their account' % str(contact)),
+ noted_on=timezone.now(),
+ noted_by=contact.user)
+ event.save()
+ messages.success(request, '<h3>Thank you for activating your account</h3>')
+ return redirect(reverse('organizations:dashboard'))
+ context = {
+ 'contact': contact,
+ 'form': form
+ }
+ return render(request, 'organizations/activate_account.html', context)
+
+
+@login_required
+def dashboard(request):
+ """
+ Administration page for Organization Contacts.
+
+ This page is meant as a personal page for Contacts, where they will for example be able
+ to read their personal data and agreements.
+ """
+ if not (request.user.has_perm('scipost.can_manage_organizations') or
+ has_contact(request.user)):
+ raise PermissionDenied
+ context = {
+ 'contacts': Contact.objects.all()
+ }
+ if has_contact(request.user):
+ context['own_roles'] = request.user.org_contact.roles.all()
+ return render(request, 'organizations/dashboard.html', context)
+
+
+class ContactDetailView(PermissionsMixin, DetailView):
+ """
+ View details of a Contact. Accessible to Admin.
+ """
+ permission_required = 'scipost.can_manage_organizations'
+ model = Contact
+
+
+class ContactRoleUpdateView(UserPassesTestMixin, UpdateView):
+ """
+ Update a ContactRole.
+ """
+ model = ContactRole
+ form_class = ContactRoleForm
+ template_name = 'organizations/contactrole_form.html'
+
+ def test_func(self):
+ """
+ Allow ContactRole update to OrgAdmins and all Contacts for this Organization.
+ """
+ if self.request.user.has_perm('scipost.can_manage_organizations'):
+ return True
+ contactrole = get_object_or_404(ContactRole, pk=self.kwargs.get('pk'))
+ return self.request.user.has_perm('can_view_org_contacts', contactrole.organization)
+
+ def get_success_url(self):
+ return reverse_lazy('organizations:organization_details',
+ kwargs={'pk': self.object.organization.id})
+
+
+class ContactRoleDeleteView(PermissionsMixin, DeleteView):
+ """
+ Delete a ContactRole.
+ """
+ permission_required = 'scipost.can_manage_organizations'
+ model = ContactRole
+
+ def get_success_url(self):
+ return reverse_lazy('organizations:organization_details',
+ kwargs={'pk': self.object.organization.id})
+
+
+@permission_required('scipost.can_manage_organizations', return_403=True)
+@transaction.atomic
+def email_contactrole(request, contactrole_id, mail=None):
+ contactrole = get_object_or_404(ContactRole, pk=contactrole_id)
+
+ suffix = ''
+ if mail == 'renewal':
+ code = 'org_contacts/contactrole_subsidy_renewal_mail'
+ suffix = ' (subsidy renewal query)'
+ else:
+ code = 'org_contacts/contactrole_generic_mail'
+ suffix = ' (generic)'
+ mail_request = MailEditingSubView(request, mail_code=code, contactrole=contactrole)
+ if mail_request.is_valid():
+ comments = 'Email{suffix} sent to Contact {name}.'.format(
+ suffix=suffix, name=contactrole.contact)
+ event = OrganizationEvent(
+ organization=contactrole.organization,
+ event=ORGANIZATION_EVENT_EMAIL_SENT,
+ comments=comments,
+ noted_on=timezone.now(),
+ noted_by=request.user)
+ event.save()
+ messages.success(request, 'Email successfully sent.')
+ mail_request.send()
+ return redirect(contactrole.organization.get_absolute_url())
+ else:
+ return mail_request.return_render()
diff --git a/package.json b/package.json
index d1b19598bf1e9ce5f936f6408157a529a47d3e6b..49222490e65b7db14dc428bea83c8aa211799450 100644
--- a/package.json
+++ b/package.json
@@ -18,35 +18,36 @@
"author": "SciPost",
"homepage": "https://www.scipost.org",
"devDependencies": {
- "ajv": "^5.2.2",
+ "ajv": "^5.5.2",
"bootstrap": "^4.1.3",
- "clean-webpack-plugin": "^0.1.15",
- "css-loader": "^0.28.4",
+ "clean-webpack-plugin": "^0.1.19",
+ "css-loader": "^0.28.11",
"enhanced-resolve": "^3.4.1",
"exports-loader": "^0.6.4",
- "extract-text-webpack-plugin": "^3.0.0",
+ "extract-text-webpack-plugin": "^3.0.2",
"file-loader": "^0.11.2",
"imports-loader": "^0.7.1",
"jquery": "^3.3.1",
"jquery-ui": "^1.12.1",
"node-loader": "^0.6.0",
- "node-sass": "^4.4.0",
+ "node-sass": "^4.11.0",
"popper.js": "^1.14.3",
"postcss-load-config": "^1.2.0",
- "postcss-loader": "^2.0.6",
+ "postcss-loader": "^2.1.6",
"resolve-url-loader": "^1.6.1",
- "sass-loader": "^6.0.6",
- "sass-resources-loader": "^1.3.0",
- "style-loader": "^0.13.1",
- "tapable": "^0.2.8",
- "tether": "^1.4.0",
+ "sass-loader": "^6.0.7",
+ "sass-resources-loader": "^1.3.5",
+ "style-loader": "^0.13.2",
+ "tapable": "^0.2.9",
+ "tether": "^1.4.5",
"url-loader": "^1.1.1",
- "webpack": "^3.5.4",
+ "webpack": "^3.12.0",
"webpack-bundle-tracker": "^0.3.0",
"webpack-glob-entry": "^2.1.1"
},
"dependencies": {
"bootstrap-loader": "^2.2.0",
+ "nan": "git+https://github.com/nodejs/nan.git",
"npm": "^6.4.1",
"npm-install-peers": "^1.2.1",
"schema-utils": "^0.3.0"
diff --git a/partners/__init__.py b/partners/__init__.py
deleted file mode 100644
index 2f487cf4b56298795ea77bd87c3313168c6d5731..0000000000000000000000000000000000000000
--- a/partners/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
-__license__ = "AGPL v3"
-
-
-default_app_config = 'partners.apps.PartnersConfig'
diff --git a/partners/admin.py b/partners/admin.py
deleted file mode 100644
index 8e21caddeedf320a9c99787706d7b12758fa3a62..0000000000000000000000000000000000000000
--- a/partners/admin.py
+++ /dev/null
@@ -1,69 +0,0 @@
-__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
-__license__ = "AGPL v3"
-
-
-from django.contrib import admin
-
-from .models import Contact, Partner, PartnerEvent, \
- ProspectivePartner, ProspectiveContact, ProspectivePartnerEvent,\
- MembershipAgreement, ContactRequest, PartnersAttachment
-
-
-class AttachmentInline(admin.TabularInline):
- model = PartnersAttachment
-
-
-class ContactToPartnerInline(admin.TabularInline):
- model = Contact.partners.through
- extra = 0
- verbose_name = 'Contact'
- verbose_name_plural = 'Contacts'
-
-
-class ContactToUserInline(admin.StackedInline):
- model = Contact
- extra = 0
- min_num = 0
- verbose_name = 'Contact (Partners)'
-
-
-class ProspectiveContactInline(admin.TabularInline):
- model = ProspectiveContact
- extra = 0
-
-
-class ProspectivePartnerEventInline(admin.TabularInline):
- model = ProspectivePartnerEvent
- extra = 0
-
-
-class ProspectivePartnerAdmin(admin.ModelAdmin):
- inlines = (ProspectiveContactInline, ProspectivePartnerEventInline,)
- list_display = ('institution_name', 'date_received', 'date_processed', 'status')
- list_filter = ('kind', 'status')
-
-
-class PartnerEventInline(admin.TabularInline):
- model = PartnerEvent
- extra = 0
-
-
-class PartnerAdmin(admin.ModelAdmin):
- search_fields = ('institution', )
- inlines = (
- ContactToPartnerInline,
- PartnerEventInline,
- )
-
-
-class MembershipAgreementAdmin(admin.ModelAdmin):
- inlines = (
- AttachmentInline,
- )
-
-
-admin.site.register(Partner, PartnerAdmin)
-admin.site.register(Contact)
-admin.site.register(ContactRequest)
-admin.site.register(ProspectivePartner, ProspectivePartnerAdmin)
-admin.site.register(MembershipAgreement, MembershipAgreementAdmin)
diff --git a/partners/apps.py b/partners/apps.py
deleted file mode 100644
index cdbd78a574d87361a2dcfdf694a6a2ff3025d198..0000000000000000000000000000000000000000
--- a/partners/apps.py
+++ /dev/null
@@ -1,13 +0,0 @@
-__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
-__license__ = "AGPL v3"
-
-
-from django.apps import AppConfig
-
-class PartnersConfig(AppConfig):
- name = 'partners'
-
- def ready(self):
- super().ready()
-
- from . import signals
diff --git a/partners/constants.py b/partners/constants.py
deleted file mode 100644
index 6cacd5574c3b4ef9abfcfa97d588a12e69013a17..0000000000000000000000000000000000000000
--- a/partners/constants.py
+++ /dev/null
@@ -1,111 +0,0 @@
-__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
-__license__ = "AGPL v3"
-
-
-import datetime
-
-
-PARTNER_KIND_UNI_LIBRARY = 'Univ. Library'
-PARTNER_KINDS = (
- ('Res. Inst.', 'Research Institute'),
- ('Int. Fund. Agency', 'International Funding Agency'),
- ('Nat. Fund. Agency', 'National Funding Agency'),
- ('Nat. Lab.', 'National Laboratory'),
- ('Nat. Library', 'National Library'),
- ('Nat. Acad.', 'National Academy'),
- (PARTNER_KIND_UNI_LIBRARY, 'University (and its Library)'),
- ('Res. Library', 'Research Library'),
- ('Prof. Soc.', 'Professional Society'),
- ('Nat. Consor.', 'National Consortium'),
- ('Foundation', 'Foundation'),
- ('Individual', 'Individual'),
-)
-
-PROSPECTIVE_PARTNER_REQUESTED = 'requested'
-PROSPECTIVE_PARTNER_ADDED = 'added'
-PROSPECTIVE_PARTNER_APPROACHED = 'approached'
-PROSPECTIVE_PARTNER_FOLLOWED_UP = 'followuped'
-PROSPECTIVE_PARTNER_NEGOTIATING = 'negotiating'
-PROSPECTIVE_PARTNER_UNINTERESTED = 'uninterested'
-PROSPECTIVE_PARTNER_PROCESSED = 'processed'
-PROSPECTIVE_PARTNER_STATUS = (
- (PROSPECTIVE_PARTNER_REQUESTED, 'Requested (from online form)'),
- (PROSPECTIVE_PARTNER_ADDED, 'Added internally'),
- (PROSPECTIVE_PARTNER_APPROACHED, 'Approached'),
- (PROSPECTIVE_PARTNER_FOLLOWED_UP, 'Followed-up'),
- (PROSPECTIVE_PARTNER_NEGOTIATING, 'Negotiating'),
- (PROSPECTIVE_PARTNER_UNINTERESTED, 'Uninterested'),
- (PROSPECTIVE_PARTNER_PROCESSED, 'Processed into Partner'),
-)
-
-PROSPECTIVE_PARTNER_EVENT_REQUESTED = 'requested'
-PROSPECTIVE_PARTNER_EVENT_COMMENT = 'comment'
-PROSPECTIVE_PARTNER_EVENT_EMAIL_SENT = 'email_sent'
-PROSPECTIVE_PARTNER_EVENT_INITIATE_NEGOTIATION = 'negotiating'
-PROSPECTIVE_PARTNER_EVENT_MARKED_AS_UNINTERESTED = 'marked_as_uninterested'
-PROSPECTIVE_PARTNER_EVENT_PROMOTED = 'promoted'
-PROSPECTIVE_PARTNER_EVENTS = (
- (PROSPECTIVE_PARTNER_EVENT_REQUESTED, 'Requested (from online form)'),
- (PROSPECTIVE_PARTNER_EVENT_COMMENT, 'Comment added'),
- (PROSPECTIVE_PARTNER_EVENT_EMAIL_SENT, 'Email sent'),
- (PROSPECTIVE_PARTNER_EVENT_INITIATE_NEGOTIATION, 'Initiated negotiation'),
- (PROSPECTIVE_PARTNER_EVENT_MARKED_AS_UNINTERESTED, 'Marked as uninterested'),
- (PROSPECTIVE_PARTNER_EVENT_PROMOTED, 'Promoted to Partner'),
-)
-
-
-PARTNER_INITIATED = 'Initiated'
-PARTNER_STATUS = (
- (PARTNER_INITIATED, 'Initiated'),
- ('Contacted', 'Contacted'),
- ('Negotiating', 'Negotiating'),
- ('Uninterested', 'Uninterested'),
- ('Active', 'Active'),
- ('Inactive', 'Inactive'),
-)
-
-REQUEST_INITIATED = 'init'
-REQUEST_PROCESSED = 'proc'
-REQUEST_DECLINED = 'decl'
-REQUEST_STATUSES = (
- (REQUEST_INITIATED, 'Request submitted by Contact'),
- (REQUEST_PROCESSED, 'Processed'),
- (REQUEST_DECLINED, 'Declined'),
-)
-
-
-PARTNER_STATUS_UPDATE = 'status_update'
-PARTNER_EVENTS = (
- ('initial', 'Contacted (initial)'),
- (PARTNER_STATUS_UPDATE, 'Status updated'),
- ('comment', 'Comment added'),
-)
-
-CONTACT_GENERAL = 'gen'
-CONTACT_TYPES = (
- (CONTACT_GENERAL, 'General Contact'),
- ('tech', 'Technical Contact'),
- ('fin', 'Financial Contact'),
- ('leg', 'Legal Contact')
-)
-
-
-MEMBERSHIP_SUBMITTED = 'Submitted'
-MEMBERSHIP_SIGNED = 'Signed'
-MEMBERSHIP_HONOURED = 'Honoured'
-MEMBERSHIP_COMPLETED = 'Completed'
-MEMBERSHIP_AGREEMENT_STATUS = (
- (MEMBERSHIP_SUBMITTED, 'Request submitted by Partner'),
- ('Pending', 'Sent to Partner, response pending'),
- (MEMBERSHIP_SIGNED, 'Signed by Partner'),
- (MEMBERSHIP_HONOURED, 'Honoured: payment of Partner received'),
- (MEMBERSHIP_COMPLETED, 'Completed: agreement has been fulfilled'),
-)
-
-MEMBERSHIP_DURATION = (
- (datetime.timedelta(days=365), '1 year'),
- (datetime.timedelta(days=730), '2 years'),
- (datetime.timedelta(days=1095), '3 years'),
- (datetime.timedelta(days=1460), '4 years'),
- (datetime.timedelta(days=1825), '5 years'),
-)
diff --git a/partners/forms.py b/partners/forms.py
deleted file mode 100644
index 7696a6b10efae69c4a3f50f9d5d8eaea67c63d57..0000000000000000000000000000000000000000
--- a/partners/forms.py
+++ /dev/null
@@ -1,512 +0,0 @@
-__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
-__license__ = "AGPL v3"
-
-
-from django import forms
-from django.contrib.auth.models import User, Group
-from django.contrib.auth.password_validation import validate_password
-from django.core.exceptions import ValidationError
-from django.db import transaction
-from django.db.models import Q
-
-from ajax_select.fields import AutoCompleteSelectField
-
-from captcha.fields import ReCaptchaField
-from django_countries import countries
-from django_countries.widgets import CountrySelectWidget
-from django_countries.fields import LazyTypedChoiceField
-
-from .constants import PARTNER_KINDS, PROSPECTIVE_PARTNER_PROCESSED, CONTACT_TYPES,\
- PARTNER_STATUS_UPDATE, REQUEST_PROCESSED, REQUEST_DECLINED, CONTACT_GENERAL
-from .models import Partner, ProspectivePartner, ProspectiveContact, ProspectivePartnerEvent,\
- Contact, PartnerEvent, MembershipAgreement, ContactRequest,\
- PartnersAttachment
-from .utils import PartnerUtils
-
-from scipost.models import TITLE_CHOICES
-
-
-class MembershipAgreementForm(forms.ModelForm):
- class Meta:
- model = MembershipAgreement
- fields = (
- 'partner',
- 'status',
- 'date_requested',
- 'start_date',
- 'end_date',
- 'duration',
- 'offered_yearly_contribution'
- )
- widgets = {
- 'start_date': forms.TextInput(attrs={'placeholder': 'YYYY-MM-DD'}),
- 'end_date': forms.TextInput(attrs={'placeholder': 'YYYY-MM-DD'}),
- 'date_requested': forms.TextInput(attrs={'placeholder': 'YYYY-MM-DD'}),
- }
-
- def save(self, current_user, commit=True):
- agreement = super().save(commit=False)
- if commit:
- if agreement.partner and not self.instance.id:
- # Create PartnerEvent if Agreement is new
- event = PartnerEvent(
- partner=agreement.partner,
- event=PARTNER_STATUS_UPDATE,
- comments='Membership Agreement added with start date %s' % agreement.start_date,
- noted_by=current_user
- )
- event.save()
- # Save agreement afterwards to be able to detect edit/add difference
- agreement.save()
- return agreement
-
-
-class ActivationForm(forms.ModelForm):
- class Meta:
- model = User
- fields = []
-
- description = forms.CharField(max_length=256, label="Title", required=False,
- widget=forms.TextInput(attrs={
- 'placeholder': 'E.g.: Legal Agent at Stanford University'}))
- kind = forms.MultipleChoiceField(widget=forms.CheckboxSelectMultiple, label="Contact type",
- choices=CONTACT_TYPES)
- password_new = forms.CharField(label='* Password', widget=forms.PasswordInput())
- password_verif = forms.CharField(label='* Verify password', widget=forms.PasswordInput(),
- help_text='Your password must contain at least 8 characters')
-
- def __init__(self, *args, **kwargs):
- super().__init__(*args, **kwargs)
- try:
- self.fields['kind'].initial = self.instance.partner_contact.kind
- except Contact.DoesNotExist:
- pass
-
- def clean(self, *args, **kwargs):
- try:
- self.instance.partner_contact
- except Contact.DoesNotExist:
- self.add_error(None, 'Your account is invalid, please contact the administrator.')
- return super().clean(*args, **kwargs)
-
- def clean_password(self):
- password = self.cleaned_data.get('password_new', '')
- try:
- validate_password(password, self.instance)
- except ValidationError as error_message:
- self.add_error('password_new', error_message)
- return password
-
- def clean_password_verif(self):
- if self.cleaned_data.get('password_new', '') != self.cleaned_data.get('password_verif', ''):
- self.add_error('password_verif', 'Your password entries must match')
- return self.cleaned_data.get('password_verif', '')
-
- @transaction.atomic
- def activate_user(self):
- if self.errors:
- return forms.ValidationError
-
- # Activate account
- self.instance.is_active = True
- self.instance.set_password(self.cleaned_data['password_new'])
- self.instance.save()
-
- # Set fields for Contact
- self.instance.partner_contact.description = self.cleaned_data['description']
- self.instance.partner_contact.kind = self.cleaned_data['kind']
- self.instance.partner_contact.save()
-
- # Add permission groups to user
- group = Group.objects.get(name='Partners Accounts')
- self.instance.groups.add(group)
- return self.instance
-
-
-class PartnerEventForm(forms.ModelForm):
- class Meta:
- model = PartnerEvent
- fields = (
- 'event',
- 'comments',
- )
-
-
-class PartnerForm(forms.ModelForm):
- organization = AutoCompleteSelectField('organization_lookup')
-
- class Meta:
- model = Partner
- fields = (
- 'organization',
- 'status',
- 'main_contact'
- )
-
- def __init__(self, *args, **kwargs):
- super().__init__(*args, **kwargs)
- self.fields['main_contact'].queryset = self.instance.contact_set.all()
-
-
-class RequestContactForm(forms.ModelForm):
- class Meta:
- model = ContactRequest
- fields = (
- 'email',
- 'title',
- 'first_name',
- 'last_name',
- 'kind',
- )
-
-
-class ProcessRequestContactForm(RequestContactForm):
- decision = forms.ChoiceField(choices=((None, 'No decision'), ('accept', 'Accept'), ('decline', 'Decline')),
- widget=forms.RadioSelect, label='Accept or Decline')
-
- class Meta:
- model = ContactRequest
- fields = RequestContactForm.Meta.fields + ('partner',)
-
- def process_request(self, current_user):
- if self.cleaned_data['decision'] == 'accept':
- self.instance.status = REQUEST_PROCESSED
- self.instance.save()
- contactForm = NewContactForm({
- 'title': self.cleaned_data['title'],
- 'email': self.cleaned_data['email'],
- 'first_name': self.cleaned_data['first_name'],
- 'last_name': self.cleaned_data['last_name'],
- 'kind': self.cleaned_data['kind'],
- }, partner=self.cleaned_data['partner'])
- contactForm.is_valid()
- contactForm.save(current_user=current_user)
- elif self.cleaned_data['decision'] == 'decline':
- self.instance.status = REQUEST_DECLINED
- self.instance.save()
-
-
-class RequestContactFormSet(forms.BaseModelFormSet):
- def process_requests(self, current_user):
- """
- Process all requests if status is eithter accept or decline.
- """
- for form in self.forms:
- form.process_request(current_user=current_user)
-
-
-class ContactForm(forms.ModelForm):
- """
- This Contact form is mainly used for editing Contact instances.
- """
- class Meta:
- model = Contact
- fields = (
- 'kind',
- )
-
- def __init__(self, *args, **kwargs):
- super().__init__(*args, **kwargs)
- self.fields['kind'].required = False
-
-
-class NewContactForm(ContactForm):
- """
- This Contact form is used to create new Contact instances, as it will also handle
- possible sending and activation of User instances coming with the new Contact.
- """
- title = forms.ChoiceField(choices=TITLE_CHOICES, label='Title')
- first_name = forms.CharField()
- last_name = forms.CharField()
- email = forms.CharField()
- existing_user = None
-
- def __init__(self, *args, **kwargs):
- """
- Partner is a required argument to tell the formset which Partner the Contact
- is being edited for in the current form.
- """
- self.partner = kwargs.pop('partner')
- super().__init__(*args, **kwargs)
-
- def clean_email(self):
- """
- Check if User already is known in the system.
- """
- email = self.cleaned_data['email']
- try:
- self.existing_user = User.objects.get(email=email)
- if not self.data.get('confirm_use_existing', '') == 'on':
- # Do not give error if user wants to use existing User
- self.add_error('email', 'This User is already registered.')
- self.fields['confirm_use_existing'] = forms.BooleanField(
- required=False, initial=False, label='Use the existing user instead: %s %s'
- % (self.existing_user.first_name,
- self.existing_user.last_name))
- except User.DoesNotExist:
- pass
- return email
-
- @transaction.atomic
- def save(self, current_user, commit=True):
- """
- If existing user is found, add it to the Partner.
- """
- if self.existing_user and self.data.get('confirm_use_existing', '') == 'on':
- # Do not create new Contact
- try:
- # Link Contact to new Partner
- contact = self.existing_user.partner_contact
- contact.partners.add(self.partner)
- except Contact.DoesNotExist:
- # Not yet a 'Contact-User'
- contact = super().save(commit=False)
- contact.title = self.existing_user.contributor.title
- contact.user = self.existing_user
- contact.save()
- contact.partners.add(self.partner)
- return contact
-
- # Create complete new Account (User + Contact)
- user = User(
- first_name=self.cleaned_data['first_name'],
- last_name=self.cleaned_data['last_name'],
- email=self.cleaned_data['email'],
- username=self.cleaned_data['email'],
- is_active=False,
- )
- user.save()
- contact = Contact(
- user=user,
- title=self.cleaned_data['title'],
- kind=self.cleaned_data['kind']
- )
- contact.generate_key()
- contact.save()
- contact.partners.add(self.partner)
-
- # Send email for activation
- PartnerUtils.load({'contact': contact})
- PartnerUtils.email_contact_new_for_activation(current_user=current_user)
- return contact
-
-
-class ContactFormset(forms.BaseModelFormSet):
- """
- Use custom formset to make sure the delete action will not delete an entire Contact
- if the Contact still has relations with other Partners.
- """
- def __init__(self, *args, **kwargs):
- """
- Partner is a required argument to tell the formset which Partner the Contact
- is being edited for in the current form.
- """
- self.partner = kwargs.pop('partner')
- super().__init__(*args, **kwargs)
-
- def delete_existing(self, obj, commit=True):
- '''Deletes an existing model instance.'''
- if commit:
- obj.delete_or_remove_partner(self.partner)
-
-
-class PromoteToPartnerForm(forms.ModelForm):
- organization = AutoCompleteSelectField('organization_lookup')
-
- class Meta:
- model = ProspectivePartner
- fields = (
- 'kind',
- 'institution_name',
- 'country',
- )
-
- def promote_to_partner(self, current_user):
- partner = Partner(
- organization=self.cleaned_data['organization'],
- main_contact=None
- )
- partner.save()
- event = PartnerEvent(
- partner=partner,
- event=PARTNER_STATUS_UPDATE,
- comments='ProspectivePartner has been upgraded to Partner by %s %s'
- % (current_user.first_name, current_user.last_name),
- noted_by=current_user
- )
- event.save()
-
- # Close Prospect
- self.instance.status = PROSPECTIVE_PARTNER_PROCESSED
- self.instance.save()
- return partner
-
-
-class PromoteToContactForm(forms.ModelForm):
- """
- This form is used to create a new `partners.Contact`
- """
- promote = forms.BooleanField(label='Activate/Promote this contact', initial=True,
- required=False)
- kind = forms.MultipleChoiceField(widget=forms.CheckboxSelectMultiple, initial=[CONTACT_GENERAL],
- label='Contact types', choices=CONTACT_TYPES, required=False)
-
- class Meta:
- model = ProspectiveContact
- fields = (
- 'title',
- 'first_name',
- 'last_name',
- 'email',
- )
-
- def clean_email(self):
- """
- Check if email address is already used.
- """
- email = self.cleaned_data['email']
- if not self.cleaned_data.get('promote', False):
- # Don't promote the Contact
- return email
- if User.objects.filter(Q(email=email) | Q(username=email)).exists():
- self.add_error('email', 'This emailadres has already been used.')
- return email
-
- @transaction.atomic
- def promote_contact(self, partner, current_user):
- """
- Promote ProspectiveContact's to Contact's related to a certain Partner.
- The status update after promotion is handled outside this method, in the Partner model.
- """
- if not self.cleaned_data.get('promote', False):
- # Don't promote the Contact
- return
-
- # How to handle empty instances?
- if self.errors:
- return forms.ValidationError # Is this a valid exception?
-
- # Create a new User and Contact linked to the partner given
- contact_form = NewContactForm(self.cleaned_data, partner=partner)
- if contact_form.is_valid():
- return contact_form.save(current_user=current_user)
- raise forms.ValidationError('NewContactForm invalid. Please contact Admin.')
-
-
-class PromoteToContactFormset(forms.BaseModelFormSet):
- """
- This is a formset to process multiple `PromoteToContactForm`s at the same time
- designed for the 'promote prospect to partner' action.
- """
- def save(self, *args, **kwargs):
- raise DeprecationWarning(("This formset is not meant to used with the default"
- " `save` method. User the `promote_contacts` instead."))
-
- @transaction.atomic
- def promote_contacts(self, partner, current_user):
- """
- Promote ProspectiveContact's to Contact's related to a certain Partner.
- """
- contacts = []
- for form in self.forms:
- new_contact = form.promote_contact(partner, current_user)
- if new_contact:
- contacts.append(new_contact)
- try:
- partner.main_contact = contacts[0]
- except IndexError:
- # No contacts at all means no main-contact as well...
- pass
- partner.save()
- return contacts
-
-
-ContactModelFormset = forms.modelformset_factory(ProspectiveContact, PromoteToContactForm,
- formset=PromoteToContactFormset, extra=0)
-
-
-class ProspectivePartnerForm(forms.ModelForm):
- """
- This form is used to internally add a ProspectivePartner.
- If an external agent requests membership of the SPB,
- the MembershipQueryForm below is used instead.
- """
- class Meta:
- model = ProspectivePartner
- fields = ('kind', 'institution_name', 'country')
-
-
-class ProspectiveContactForm(forms.ModelForm):
- class Meta:
- model = ProspectiveContact
- fields = '__all__'
- widgets = {'prospartner': forms.HiddenInput()}
-
-
-class ProspectivePartnerEventForm(forms.ModelForm):
- class Meta:
- model = ProspectivePartnerEvent
- fields = ('event', 'comments')
- widgets = {
- 'comments': forms.Textarea(attrs={'cols': 16, 'rows': 3}),
- }
-
-
-class MembershipQueryForm(forms.Form):
- """
- This form is to be used by an agent of the prospective Partner,
- in order to request more information about potentially joining the SPB.
- """
- title = forms.ChoiceField(choices=TITLE_CHOICES, label='* Your title')
- first_name = forms.CharField(label='* Your first name', max_length=100)
- last_name = forms.CharField(label='* Your last name', max_length=100)
- email = forms.EmailField(label='* Your email address')
- role = forms.CharField(label='* Your role in your organization')
- partner_kind = forms.ChoiceField(choices=PARTNER_KINDS, label='* Partner kind')
- institution_name = forms.CharField(label='* Name of your institution')
- country = LazyTypedChoiceField(
- choices=countries, label='* Country', initial='NL',
- widget=CountrySelectWidget(layout=(
- '{widget}<img class="country-select-flag" id="{flag_id}"'
- ' style="margin: 6px 4px 0" src="{country.flag}">')))
- captcha = ReCaptchaField(attrs={'theme': 'clean'}, label='*Please verify to continue:')
-
-
-class PartnersAttachmentForm(forms.ModelForm):
- class Meta:
- model = PartnersAttachment
- fields = (
- 'name',
- 'attachment',
- )
-
- def save(self, to_object, commit=True):
- """
- This custom save method will automatically assign the file to the object
- given when its a valid instance type.
- """
- attachment = super().save(commit=False)
-
- # Formset's might save an empty Instance
- if not attachment.name or not attachment.attachment:
- return None
-
- if isinstance(to_object, MembershipAgreement):
- attachment.agreement = to_object
- else:
- raise forms.ValidationError('You cannot save Attachment to this type of object.')
- if commit:
- attachment.save()
- return attachment
-
-
-class PartnersAttachmentFormSet(forms.BaseModelFormSet):
- def save(self, to_object, commit=True):
- """
- This custom save method will automatically assign the file to the object
- given when its a valid instance type.
- """
- returns = []
- for form in self.forms:
- returns.append(form.save(to_object))
- return returns
diff --git a/partners/managers.py b/partners/managers.py
deleted file mode 100644
index 120686669ea5ec5eeed713f6e1d9922dba581fdc..0000000000000000000000000000000000000000
--- a/partners/managers.py
+++ /dev/null
@@ -1,46 +0,0 @@
-__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
-__license__ = "AGPL v3"
-
-
-from django.db import models
-from django.utils import timezone
-
-from .constants import MEMBERSHIP_SUBMITTED, PROSPECTIVE_PARTNER_PROCESSED, REQUEST_INITIATED
-
-
-class ContactRequestManager(models.Manager):
- def awaiting_processing(self):
- return self.filter(status=REQUEST_INITIATED)
-
-
-class ProspectivePartnerManager(models.Manager):
- def not_yet_partner(self):
- return self.exclude(status=PROSPECTIVE_PARTNER_PROCESSED)
-
-
-class PartnerManager(models.Manager):
- def my_partners(self, current_user):
- """
- Filter out my Partners if user is not a PartnerAdmin.
- """
- if current_user.has_perm('scipost.can_view_partners'):
- return self.all()
- return self.filter(contact=current_user.partner_contact)
-
-
-class MembershipAgreementManager(models.Manager):
- def submitted(self):
- return self.filter(status=MEMBERSHIP_SUBMITTED)
-
- def open_to_partner(self):
- return self.exclude(status=MEMBERSHIP_SUBMITTED)
-
- def now_active(self):
- return self.filter(start_date__lte=timezone.now().date(),
- end_date__gte=timezone.now().date())
-
-
-class PartnersAttachmentManager(models.Manager):
- def my_attachments(self, current_user):
- if current_user.has_perm('scipost.can_view_partners'):
- return self.all()
diff --git a/partners/migrations/0001_initial.py b/partners/migrations/0001_initial.py
deleted file mode 100644
index 12b9d7105f098e7e1624b8e1c3cfa9e235a20f6f..0000000000000000000000000000000000000000
--- a/partners/migrations/0001_initial.py
+++ /dev/null
@@ -1,136 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-12-29 13:35
-from __future__ import unicode_literals
-
-import datetime
-from django.db import migrations, models
-import django.utils.timezone
-import django_countries.fields
-import scipost.fields
-import scipost.storage
-
-
-class Migration(migrations.Migration):
-
- initial = True
-
- dependencies = [
- ]
-
- operations = [
- migrations.CreateModel(
- name='Consortium',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('name', models.CharField(max_length=128)),
- ('status', models.CharField(choices=[('Prospective', 'Prospective'), ('Active', 'Active'), ('Inactive', 'Inactive')], max_length=16)),
- ],
- options={
- 'verbose_name_plural': 'consortia',
- },
- ),
- migrations.CreateModel(
- name='Contact',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('kind', scipost.fields.ChoiceArrayField(base_field=models.CharField(choices=[('gen', 'General Contact'), ('tech', 'Technical Contact'), ('fin', 'Financial Contact'), ('leg', 'Legal Contact')], max_length=4), size=None)),
- ('title', models.CharField(choices=[('PR', 'Prof.'), ('DR', 'Dr'), ('MR', 'Mr'), ('MRS', 'Mrs'), ('MS', 'Ms')], max_length=4)),
- ('description', models.CharField(blank=True, max_length=256)),
- ('activation_key', models.CharField(blank=True, max_length=40)),
- ('key_expires', models.DateTimeField(default=django.utils.timezone.now)),
- ],
- ),
- migrations.CreateModel(
- name='ContactRequest',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('email', models.EmailField(max_length=254)),
- ('kind', scipost.fields.ChoiceArrayField(base_field=models.CharField(choices=[('gen', 'General Contact'), ('tech', 'Technical Contact'), ('fin', 'Financial Contact'), ('leg', 'Legal Contact')], max_length=4), size=None)),
- ('first_name', models.CharField(max_length=64)),
- ('last_name', models.CharField(max_length=64)),
- ('title', models.CharField(choices=[('PR', 'Prof.'), ('DR', 'Dr'), ('MR', 'Mr'), ('MRS', 'Mrs'), ('MS', 'Ms')], max_length=4)),
- ('description', models.CharField(blank=True, max_length=256)),
- ('status', models.CharField(choices=[('init', 'Request submitted by Contact'), ('proc', 'Processed'), ('decl', 'Declined')], default='init', max_length=4)),
- ],
- ),
- migrations.CreateModel(
- name='Institution',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('kind', models.CharField(choices=[('Res. Inst.', 'Research Institute'), ('Int. Fund. Agency', 'International Funding Agency'), ('Nat. Fund. Agency', 'National Funding Agency'), ('Nat. Lab.', 'National Laboratory'), ('Nat. Library', 'National Library'), ('Nat. Acad.', 'National Academy'), ('Univ. Library', 'University (and its Library)'), ('Res. Library', 'Research Library'), ('Prof. Soc.', 'Professional Society'), ('Nat. Consor.', 'National Consortium'), ('Foundation', 'Foundation'), ('Individual', 'Individual')], max_length=32)),
- ('name', models.CharField(max_length=256)),
- ('logo', models.ImageField(blank=True, upload_to='institutions/logo/%Y/')),
- ('acronym', models.CharField(max_length=16)),
- ('address', models.TextField(blank=True)),
- ('country', django_countries.fields.CountryField(max_length=2)),
- ],
- ),
- migrations.CreateModel(
- name='MembershipAgreement',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('status', models.CharField(choices=[('Submitted', 'Request submitted by Partner'), ('Pending', 'Sent to Partner, response pending'), ('Signed', 'Signed by Partner'), ('Honoured', 'Honoured: payment of Partner received'), ('Completed', 'Completed: agreement has been fulfilled')], max_length=16)),
- ('date_requested', models.DateField()),
- ('start_date', models.DateField()),
- ('end_date', models.DateField()),
- ('duration', models.DurationField(choices=[(datetime.timedelta(365), '1 year'), (datetime.timedelta(730), '2 years'), (datetime.timedelta(1095), '3 years'), (datetime.timedelta(1460), '4 years'), (datetime.timedelta(1825), '5 years')])),
- ('offered_yearly_contribution', models.SmallIntegerField(default=0, help_text="Yearly contribution in euro's (€)")),
- ],
- ),
- migrations.CreateModel(
- name='Partner',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('status', models.CharField(choices=[('Initiated', 'Initiated'), ('Contacted', 'Contacted'), ('Negotiating', 'Negotiating'), ('Uninterested', 'Uninterested'), ('Active', 'Active'), ('Inactive', 'Inactive')], default='Initiated', max_length=16)),
- ],
- ),
- migrations.CreateModel(
- name='PartnerEvent',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('event', models.CharField(choices=[('initial', 'Contacted (initial)'), ('status_update', 'Status updated'), ('comment', 'Comment added')], max_length=64)),
- ('comments', models.TextField(blank=True)),
- ('noted_on', models.DateTimeField(auto_now_add=True)),
- ],
- ),
- migrations.CreateModel(
- name='PartnersAttachment',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('attachment', models.FileField(storage=scipost.storage.SecureFileStorage(), upload_to='UPLOADS/PARTNERS/ATTACHMENTS')),
- ('name', models.CharField(max_length=128)),
- ],
- ),
- migrations.CreateModel(
- name='ProspectiveContact',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('title', models.CharField(choices=[('PR', 'Prof.'), ('DR', 'Dr'), ('MR', 'Mr'), ('MRS', 'Mrs'), ('MS', 'Ms')], max_length=4)),
- ('first_name', models.CharField(max_length=64)),
- ('last_name', models.CharField(max_length=64)),
- ('email', models.EmailField(max_length=254)),
- ('role', models.CharField(max_length=128)),
- ],
- ),
- migrations.CreateModel(
- name='ProspectivePartner',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('kind', models.CharField(choices=[('Res. Inst.', 'Research Institute'), ('Int. Fund. Agency', 'International Funding Agency'), ('Nat. Fund. Agency', 'National Funding Agency'), ('Nat. Lab.', 'National Laboratory'), ('Nat. Library', 'National Library'), ('Nat. Acad.', 'National Academy'), ('Univ. Library', 'University (and its Library)'), ('Res. Library', 'Research Library'), ('Prof. Soc.', 'Professional Society'), ('Nat. Consor.', 'National Consortium'), ('Foundation', 'Foundation'), ('Individual', 'Individual')], default='Univ. Library', max_length=32)),
- ('institution_name', models.CharField(max_length=256)),
- ('country', django_countries.fields.CountryField(max_length=2)),
- ('date_received', models.DateTimeField(auto_now_add=True)),
- ('date_processed', models.DateTimeField(blank=True, null=True)),
- ('status', models.CharField(choices=[('requested', 'Requested (from online form)'), ('added', 'Added internally'), ('approached', 'Approached'), ('followuped', 'Followed-up'), ('negotiating', 'Negotiating'), ('uninterested', 'Uninterested'), ('processed', 'Processed into Partner')], default='added', max_length=32)),
- ],
- ),
- migrations.CreateModel(
- name='ProspectivePartnerEvent',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('event', models.CharField(choices=[('requested', 'Requested (from online form)'), ('comment', 'Comment added'), ('email_sent', 'Email sent'), ('negotiating', 'Initiated negotiation'), ('marked_as_uninterested', 'Marked as uninterested'), ('promoted', 'Promoted to Partner')], max_length=64)),
- ('comments', models.TextField(blank=True)),
- ('noted_on', models.DateTimeField(auto_now_add=True)),
- ],
- ),
- ]
diff --git a/partners/migrations/0002_auto_20171229_1435.py b/partners/migrations/0002_auto_20171229_1435.py
deleted file mode 100644
index 1782e7cacd355da8872871bd2fd89060f4ee7bf5..0000000000000000000000000000000000000000
--- a/partners/migrations/0002_auto_20171229_1435.py
+++ /dev/null
@@ -1,97 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-12-29 13:35
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import scipost.models
-
-
-class Migration(migrations.Migration):
-
- initial = True
-
- dependencies = [
- ('partners', '0001_initial'),
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ('scipost', '0001_initial'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='prospectivepartnerevent',
- name='noted_by',
- field=models.ForeignKey(blank=True, null=True, on_delete=models.SET(scipost.models.get_sentinel_user), to='scipost.Contributor'),
- ),
- migrations.AddField(
- model_name='prospectivepartnerevent',
- name='prospartner',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='partners.ProspectivePartner'),
- ),
- migrations.AddField(
- model_name='prospectivecontact',
- name='prospartner',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='prospective_contacts', to='partners.ProspectivePartner'),
- ),
- migrations.AddField(
- model_name='partnersattachment',
- name='agreement',
- field=models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='attachments', to='partners.MembershipAgreement'),
- ),
- migrations.AddField(
- model_name='partnerevent',
- name='noted_by',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
- ),
- migrations.AddField(
- model_name='partnerevent',
- name='partner',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='events', to='partners.Partner'),
- ),
- migrations.AddField(
- model_name='partner',
- name='institution',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='partners.Institution'),
- ),
- migrations.AddField(
- model_name='partner',
- name='main_contact',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='partner_main_contact', to='partners.Contact'),
- ),
- migrations.AddField(
- model_name='membershipagreement',
- name='consortium',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='partners.Consortium'),
- ),
- migrations.AddField(
- model_name='membershipagreement',
- name='partner',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='agreements', to='partners.Partner'),
- ),
- migrations.AddField(
- model_name='contactrequest',
- name='partner',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='partners.Partner'),
- ),
- migrations.AddField(
- model_name='contact',
- name='consortia',
- field=models.ManyToManyField(blank=True, help_text='All Consortia for which the Contact has explicit permission to view/edit its data.', to='partners.Consortium'),
- ),
- migrations.AddField(
- model_name='contact',
- name='partners',
- field=models.ManyToManyField(help_text='All Partners (+related Institutions) the Contact is related to.', to='partners.Partner'),
- ),
- migrations.AddField(
- model_name='contact',
- name='user',
- field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='partner_contact', to=settings.AUTH_USER_MODEL),
- ),
- migrations.AddField(
- model_name='consortium',
- name='partners',
- field=models.ManyToManyField(blank=True, to='partners.Partner'),
- ),
- ]
diff --git a/partners/migrations/0004_auto_20180112_1919.py b/partners/migrations/0004_auto_20180112_1919.py
deleted file mode 100644
index 2bd79a5ac6b3cee62bb4eae8ad08f00bd7630b30..0000000000000000000000000000000000000000
--- a/partners/migrations/0004_auto_20180112_1919.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2018-01-12 18:19
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('partners', '0003_institution_css_class'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='institution',
- name='css_class',
- field=models.CharField(blank=True, max_length=256, verbose_name='Additional logo CSS class'),
- ),
- ]
diff --git a/partners/migrations/0005_organization.py b/partners/migrations/0005_organization.py
deleted file mode 100644
index 207e6297f164d7eb406c611a19dd8abfb82959d4..0000000000000000000000000000000000000000
--- a/partners/migrations/0005_organization.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2018-07-07 13:04
-from __future__ import unicode_literals
-
-import django.contrib.postgres.fields.jsonb
-from django.db import migrations, models
-import django.db.models.deletion
-import django_countries.fields
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('partners', '0004_auto_20180112_1919'),
- ]
-
- operations = [
- migrations.CreateModel(
- name='Organization',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('orgtype', models.CharField(choices=[('ResearchRnstitute', 'Research Institute'), ('InternationalFundingAgency', 'International Funding Agency'), ('NationalFundingAgency', 'Funding Agency'), ('NationalLaboratory', 'National Laboratory'), ('NationalLibrary', 'National Library'), ('NationalAcademy', 'National Academy'), ('UniversityLibrary', 'University (and its Library)'), ('ResearchLibrary', 'Research Library'), ('ProfessionalSociety', 'Professional Society'), ('InternationalConsortium', 'International Consortium'), ('NationalConsortium', 'National Consortium'), ('Foundation', 'Foundation'), ('GovernmentalMinistry', 'Governmental Ministry'), ('GovernmentalOffice', 'Governmental Office'), ('BusinessCorporation', 'Business Corporation'), ('IndividualBenefactor', 'Individual Benefactor'), ('PrivateBenefactor', 'Private Benefactor')], max_length=32)),
- ('status', models.CharField(choices=[('Active', 'Active'), ('Superseded', 'Superseded'), ('Obsolete', 'Obsolete')], default='Active', max_length=32)),
- ('name', models.CharField(help_text='Western version of name', max_length=256)),
- ('name_original', models.CharField(blank=True, help_text='Name (in original language)', max_length=256)),
- ('acronym', models.CharField(blank=True, help_text='Acronym or short name', max_length=64)),
- ('country', django_countries.fields.CountryField(max_length=2)),
- ('address', models.TextField(blank=True)),
- ('logo', models.ImageField(blank=True, upload_to='organizations/logos/')),
- ('css_class', models.CharField(blank=True, max_length=256, verbose_name='Additional logo CSS class')),
- ('grid_json', django.contrib.postgres.fields.jsonb.JSONField(blank=True, default={}, null=True)),
- ('crossref_json', django.contrib.postgres.fields.jsonb.JSONField(blank=True, default={}, null=True)),
- ('superseded_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='partners.Organization')),
- ],
- ),
- ]
diff --git a/partners/migrations/0007_partner_organization.py b/partners/migrations/0007_partner_organization.py
deleted file mode 100644
index 173e7d95e4cff8114b58377e600d437b68febb46..0000000000000000000000000000000000000000
--- a/partners/migrations/0007_partner_organization.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2018-07-10 07:23
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('partners', '0006_auto_20180708_2123'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='partner',
- name='organization',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='partners.Organization'),
- ),
- ]
diff --git a/partners/migrations/0008_auto_20180711_0623.py b/partners/migrations/0008_auto_20180711_0623.py
deleted file mode 100644
index 11d5ab39d8d1a80ba84a8eabd3076fa353e7e7e8..0000000000000000000000000000000000000000
--- a/partners/migrations/0008_auto_20180711_0623.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2018-07-11 04:23
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('partners', '0007_partner_organization'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='organization',
- options={'ordering': ['country', 'name']},
- ),
- migrations.AlterField(
- model_name='partner',
- name='organization',
- field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='partners.Organization'),
- ),
- ]
diff --git a/partners/migrations/0009_organization_cf_nr_associated_publications.py b/partners/migrations/0009_organization_cf_nr_associated_publications.py
deleted file mode 100644
index b837bf14bc96dd63022fde122d4dc48195012ad2..0000000000000000000000000000000000000000
--- a/partners/migrations/0009_organization_cf_nr_associated_publications.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2018-07-14 12:13
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('partners', '0008_auto_20180711_0623'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='organization',
- name='cf_nr_associated_publications',
- field=models.PositiveIntegerField(blank=True, help_text='NB: nr_associated_publications is a calculated field. Do not modify.', null=True),
- ),
- ]
diff --git a/partners/migrations/0010_auto_20180714_2113.py b/partners/migrations/0010_auto_20180714_2113.py
deleted file mode 100644
index 598bbd7de7c52227af204af5ee05ca0dfea53ef1..0000000000000000000000000000000000000000
--- a/partners/migrations/0010_auto_20180714_2113.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2018-07-14 19:13
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('partners', '0009_organization_cf_nr_associated_publications'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='organization',
- name='orgtype',
- field=models.CharField(choices=[('ResearchRnstitute', 'Research Institute'), ('InternationalFundingAgency', 'International Funding Agency'), ('NationalFundingAgency', 'Funding Agency'), ('NationalLaboratory', 'National Laboratory'), ('NationalLibrary', 'National Library'), ('NationalAcademy', 'National Academy'), ('UniversityLibrary', 'University (and its Library)'), ('ResearchLibrary', 'Research Library'), ('ProfessionalSociety', 'Professional Society'), ('InternationalConsortium', 'International Consortium'), ('NationalConsortium', 'National Consortium'), ('Foundation', 'Foundation'), ('GovernmentInternational', 'Government (international)'), ('GovernmentNational', 'Government (national)'), ('GovernmentProvincial', 'Government (provincial)'), ('GovernmentRegional', 'Government (regional)'), ('GovernmentMunicipal', 'Government (municipal)'), ('GovernmentalMinistry', 'Governmental Ministry'), ('GovernmentalOffice', 'Governmental Office'), ('BusinessCorporation', 'Business Corporation'), ('IndividualBenefactor', 'Individual Benefactor'), ('PrivateBenefactor', 'Private Benefactor')], max_length=32),
- ),
- ]
diff --git a/partners/migrations/0011_auto_20180715_0427.py b/partners/migrations/0011_auto_20180715_0427.py
deleted file mode 100644
index 38530c7cad147c0e357559fedf5ead6accde9a9f..0000000000000000000000000000000000000000
--- a/partners/migrations/0011_auto_20180715_0427.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2018-07-15 02:27
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('partners', '0010_auto_20180714_2113'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='organization',
- name='orgtype',
- field=models.CharField(choices=[('ResearchRnstitute', 'Research Institute'), ('InternationalFundingAgency', 'International Funding Agency'), ('NationalFundingAgency', 'National Funding Agency'), ('FundingAgencyInitiative', 'Funding Agency Initiative'), ('NationalLaboratory', 'National Laboratory'), ('NationalLibrary', 'National Library'), ('NationalAcademy', 'National Academy'), ('UniversityLibrary', 'University (and its Library)'), ('ResearchLibrary', 'Research Library'), ('ProfessionalSociety', 'Professional Society'), ('InternationalConsortium', 'International Consortium'), ('NationalConsortium', 'National Consortium'), ('Foundation', 'Foundation'), ('GovernmentInternational', 'Government (international)'), ('GovernmentNational', 'Government (national)'), ('GovernmentProvincial', 'Government (provincial)'), ('GovernmentRegional', 'Government (regional)'), ('GovernmentMunicipal', 'Government (municipal)'), ('GovernmentalMinistry', 'Governmental Ministry'), ('GovernmentalOffice', 'Governmental Office'), ('BusinessCorporation', 'Business Corporation'), ('IndividualBenefactor', 'Individual Benefactor'), ('PrivateBenefactor', 'Private Benefactor')], max_length=32),
- ),
- ]
diff --git a/partners/migrations/0012_auto_20180715_0508.py b/partners/migrations/0012_auto_20180715_0508.py
deleted file mode 100644
index 9fff5114f3588b693c61431f29e05d74933b88d4..0000000000000000000000000000000000000000
--- a/partners/migrations/0012_auto_20180715_0508.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2018-07-15 03:08
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('partners', '0011_auto_20180715_0427'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='organization',
- name='parent',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='children', to='partners.Organization'),
- ),
- migrations.AlterField(
- model_name='organization',
- name='superseded_by',
- field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='partners.Organization'),
- ),
- ]
diff --git a/partners/migrations/0013_auto_20180715_0938.py b/partners/migrations/0013_auto_20180715_0938.py
deleted file mode 100644
index 1a467497df6b37204cb04fc4c489445abf12d566..0000000000000000000000000000000000000000
--- a/partners/migrations/0013_auto_20180715_0938.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2018-07-15 07:38
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('partners', '0012_auto_20180715_0508'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='organization',
- name='superseded_by',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='partners.Organization'),
- ),
- ]
diff --git a/partners/migrations/0014_partner_org.py b/partners/migrations/0014_partner_org.py
deleted file mode 100644
index 4f098b2e0f3c4900714f05873c363a8e1a96e952..0000000000000000000000000000000000000000
--- a/partners/migrations/0014_partner_org.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2018-09-22 13:05
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('organizations', '0002_populate_from_partners_org'),
- ('partners', '0013_auto_20180715_0938'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='partner',
- name='org',
- field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organizations.Organization'),
- ),
- ]
diff --git a/partners/migrations/0015_repopulate_partner_orgs.py b/partners/migrations/0015_repopulate_partner_orgs.py
deleted file mode 100644
index 3d1ba3076b647d41da4945cb2ff548e69108e7bd..0000000000000000000000000000000000000000
--- a/partners/migrations/0015_repopulate_partner_orgs.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2018-09-22 13:05
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-def repopulate_organization_field(apps, schema_editor):
- Partner = apps.get_model('partners', 'Partner')
- Organization = apps.get_model('organizations', 'Organization')
-
- for partner in Partner.objects.filter(organization__isnull=False):
- partner.org = Organization.objects.get(name=partner.organization.name)
- partner.save()
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('partners', '0014_partner_org'),
- ]
-
- operations = [
- migrations.RunPython(repopulate_organization_field,
- reverse_code=migrations.RunPython.noop),
- ]
diff --git a/partners/migrations/0016_remove_partner_organization.py b/partners/migrations/0016_remove_partner_organization.py
deleted file mode 100644
index 971aa4b28b6bcdbc486cdccb44659dc380734c83..0000000000000000000000000000000000000000
--- a/partners/migrations/0016_remove_partner_organization.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2018-09-22 13:44
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('partners', '0015_repopulate_partner_orgs'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='partner',
- name='organization',
- ),
- ]
diff --git a/partners/migrations/0017_auto_20180922_1603.py b/partners/migrations/0017_auto_20180922_1603.py
deleted file mode 100644
index 6c41db66260ab9be8953dfa4087130f18c67f73b..0000000000000000000000000000000000000000
--- a/partners/migrations/0017_auto_20180922_1603.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2018-09-22 14:03
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('funders', '0011_remove_funder_organization'),
- ('journals', '0040_auto_20180922_1544'),
- ('partners', '0016_remove_partner_organization'),
- ('petitions', '0007_remove_petitionsignatory_organization_tbd'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='organization',
- name='parent',
- ),
- migrations.RemoveField(
- model_name='organization',
- name='superseded_by',
- ),
- migrations.DeleteModel(
- name='Organization',
- ),
- ]
diff --git a/partners/migrations/0018_auto_20180922_1609.py b/partners/migrations/0018_auto_20180922_1609.py
deleted file mode 100644
index 6ca67b78ca2c7178fe3fa0525fb669957d6a2615..0000000000000000000000000000000000000000
--- a/partners/migrations/0018_auto_20180922_1609.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2018-09-22 14:09
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('partners', '0017_auto_20180922_1603'),
- ]
-
- operations = [
- migrations.RenameField(
- model_name='partner',
- old_name='org',
- new_name='organization',
- ),
- ]
diff --git a/partners/migrations/0019_auto_20181007_1647.py b/partners/migrations/0019_auto_20181007_1647.py
deleted file mode 100644
index b3b110f7ab9ff889c6b3719866f77db8e1c78afe..0000000000000000000000000000000000000000
--- a/partners/migrations/0019_auto_20181007_1647.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2018-10-07 14:47
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('partners', '0018_auto_20180922_1609'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='contact',
- name='consortia',
- ),
- migrations.RemoveField(
- model_name='membershipagreement',
- name='consortium',
- ),
- ]
diff --git a/partners/migrations/0020_auto_20181007_1649.py b/partners/migrations/0020_auto_20181007_1649.py
deleted file mode 100644
index 540ad0e17f38e0635a3bbb2fc62ad3e858968509..0000000000000000000000000000000000000000
--- a/partners/migrations/0020_auto_20181007_1649.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2018-10-07 14:49
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('partners', '0019_auto_20181007_1647'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='consortium',
- name='partners',
- ),
- migrations.DeleteModel(
- name='Consortium',
- ),
- ]
diff --git a/partners/migrations/0021_auto_20181007_1746.py b/partners/migrations/0021_auto_20181007_1746.py
deleted file mode 100644
index c29a0a5b2e6d48fae933f6586a7d58f9e8e23331..0000000000000000000000000000000000000000
--- a/partners/migrations/0021_auto_20181007_1746.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2018-10-07 15:46
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('partners', '0020_auto_20181007_1649'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='partner',
- name='institution',
- ),
- migrations.AlterField(
- model_name='contact',
- name='partners',
- field=models.ManyToManyField(help_text='All Partners (+related Organizations) the Contact is related to.', to='partners.Partner'),
- ),
- ]
diff --git a/partners/migrations/__init__.py b/partners/migrations/__init__.py
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/partners/models.py b/partners/models.py
deleted file mode 100644
index fbcd487e7c2718392010ab830426c792a09aa6eb..0000000000000000000000000000000000000000
--- a/partners/models.py
+++ /dev/null
@@ -1,288 +0,0 @@
-__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
-__license__ = "AGPL v3"
-
-
-import datetime
-import hashlib
-import random
-import string
-
-from django.contrib.auth.models import User
-from django.contrib.postgres.fields import JSONField
-from django.db import models
-from django.db.models import Sum
-from django.utils import timezone
-from django.urls import reverse
-
-from django_countries.fields import CountryField
-
-from .constants import (
- PARTNER_KINDS, PARTNER_STATUS, MEMBERSHIP_DURATION, PARTNER_EVENTS,
- PROSPECTIVE_PARTNER_STATUS, PROSPECTIVE_PARTNER_EVENTS, MEMBERSHIP_AGREEMENT_STATUS,
- PROSPECTIVE_PARTNER_ADDED, PARTNER_KIND_UNI_LIBRARY)
-from .constants import (
- PROSPECTIVE_PARTNER_EVENT_EMAIL_SENT, PROSPECTIVE_PARTNER_APPROACHED, PARTNER_INITIATED,
- PROSPECTIVE_PARTNER_EVENT_INITIATE_NEGOTIATION, PROSPECTIVE_PARTNER_PROCESSED, CONTACT_TYPES,
- PROSPECTIVE_PARTNER_NEGOTIATING, PROSPECTIVE_PARTNER_EVENT_MARKED_AS_UNINTERESTED,
- REQUEST_STATUSES, PROSPECTIVE_PARTNER_UNINTERESTED, PROSPECTIVE_PARTNER_EVENT_PROMOTED,
- REQUEST_INITIATED)
-
-from .managers import (
- MembershipAgreementManager, ProspectivePartnerManager, PartnerManager, ContactRequestManager,
- PartnersAttachmentManager)
-
-from journals.models import Publication, PublicationAuthorsTable, OrgPubFraction
-
-from scipost.constants import TITLE_CHOICES
-from scipost.fields import ChoiceArrayField
-from scipost.models import get_sentinel_user, Contributor
-from scipost.storage import SecureFileStorage
-
-now = timezone.now()
-
-
-
-
-########################
-# Prospective Partners #
-########################
-
-class ProspectivePartner(models.Model):
- """A prospect Partner is a Partner without explicit contract with SciPost yet."""
-
- kind = models.CharField(max_length=32, choices=PARTNER_KINDS, default=PARTNER_KIND_UNI_LIBRARY)
- institution_name = models.CharField(max_length=256)
- country = CountryField()
- date_received = models.DateTimeField(auto_now_add=True)
- date_processed = models.DateTimeField(blank=True, null=True)
- status = models.CharField(max_length=32, choices=PROSPECTIVE_PARTNER_STATUS,
- default=PROSPECTIVE_PARTNER_ADDED)
-
- objects = ProspectivePartnerManager()
-
- def __str__(self):
- return '%s (received %s), %s' % (self.institution_name,
- self.date_received.strftime("%Y-%m-%d"),
- self.get_status_display())
-
- @property
- def is_promoted_to_partner(self):
- """Check if Prospect is already known to be a Partner."""
- return self.status == PROSPECTIVE_PARTNER_PROCESSED
-
- def update_status_from_event(self, event):
- if event == PROSPECTIVE_PARTNER_EVENT_EMAIL_SENT:
- self.status = PROSPECTIVE_PARTNER_APPROACHED
- elif event == PROSPECTIVE_PARTNER_EVENT_INITIATE_NEGOTIATION:
- self.status = PROSPECTIVE_PARTNER_NEGOTIATING
- elif event == PROSPECTIVE_PARTNER_EVENT_MARKED_AS_UNINTERESTED:
- self.status = PROSPECTIVE_PARTNER_UNINTERESTED
- elif event == PROSPECTIVE_PARTNER_EVENT_PROMOTED:
- self.status = PROSPECTIVE_PARTNER_PROCESSED
- self.save()
-
-
-class ProspectiveContact(models.Model):
- """
- A ProspectiveContact is a person's name and contact details, with a
- link to a Prospective Partner and a role within it.
- It does not have a corresponding User object.
- It is meant to be used internally at SciPost, during Partner mining.
- """
- prospartner = models.ForeignKey('partners.ProspectivePartner', on_delete=models.CASCADE,
- related_name='prospective_contacts')
- title = models.CharField(max_length=4, choices=TITLE_CHOICES)
- first_name = models.CharField(max_length=64)
- last_name = models.CharField(max_length=64)
- email = models.EmailField()
- role = models.CharField(max_length=128)
-
- def __str__(self):
- return "%s %s %s" % (self.get_title_display(), self.first_name, self.last_name)
-
-
-class ProspectivePartnerEvent(models.Model):
- prospartner = models.ForeignKey('partners.ProspectivePartner', on_delete=models.CASCADE)
- event = models.CharField(max_length=64, choices=PROSPECTIVE_PARTNER_EVENTS)
- comments = models.TextField(blank=True)
- noted_on = models.DateTimeField(auto_now_add=True)
- noted_by = models.ForeignKey('scipost.Contributor',
- on_delete=models.SET(get_sentinel_user),
- blank=True, null=True)
-
- def __str__(self):
- return '%s: %s' % (self.prospartner, self.get_event_display())
-
-
-###########################
-# Partner-related objects #
-###########################
-
-class ContactRequest(models.Model):
- """
- A ContactRequest request for a new Contact usually made by another Contact.
- The requests are saved to this separate model to also be able to request new
- Contact links if a Contact is already registered, but not linked to a specific Partner.
- """
- email = models.EmailField()
- kind = ChoiceArrayField(models.CharField(max_length=4, choices=CONTACT_TYPES))
- first_name = models.CharField(max_length=64)
- last_name = models.CharField(max_length=64)
- title = models.CharField(max_length=4, choices=TITLE_CHOICES)
- description = models.CharField(max_length=256, blank=True)
- partner = models.ForeignKey('partners.Partner', on_delete=models.CASCADE)
- status = models.CharField(max_length=4, choices=REQUEST_STATUSES, default=REQUEST_INITIATED)
-
- objects = ContactRequestManager()
-
- def __str__(self):
- return '%s %s %s' % (self.get_title_display(), self.first_name, self.last_name)
-
-
-class Contact(models.Model):
- """
- A Contact is a simple form of User which is meant
- to be associated to Partner objects
- (main contact, financial/technical contact etc).
- Contacts and Contributors have different rights.
- """
- user = models.OneToOneField(User, on_delete=models.CASCADE, unique=True,
- related_name='partner_contact')
- kind = ChoiceArrayField(models.CharField(max_length=4, choices=CONTACT_TYPES))
- title = models.CharField(max_length=4, choices=TITLE_CHOICES)
- description = models.CharField(max_length=256, blank=True)
- partners = models.ManyToManyField('partners.Partner',
- help_text=('All Partners (+related Organizations)'
- ' the Contact is related to.'))
- activation_key = models.CharField(max_length=40, blank=True)
- key_expires = models.DateTimeField(default=timezone.now)
-
- def __str__(self):
- return '%s %s, %s' % (self.get_title_display(), self.user.last_name, self.user.first_name)
-
- def generate_key(self, feed=''):
- """
- Generate and save a new activation_key for the Contact, given a certain feed.
- """
- for i in range(5):
- feed += random.choice(string.ascii_letters)
- feed = feed.encode('utf8')
- salt = self.user.username.encode('utf8')
- self.activation_key = hashlib.sha1(salt + feed).hexdigest()
- self.key_expires = now + datetime.timedelta(days=2)
-
- def save(self, *args, **kwargs):
- if not self.activation_key:
- self.generate_key()
- super().save(*args, **kwargs)
-
- def delete_or_remove_partner(self, partner, *args, **kwargs):
- """
- Custom `delete` method as the contact does not always need to be deleted,
- but sometimes just the link with a specific partner needs to be removed.
- """
- self.partners.remove(partner)
- if self.partners.exists():
- return self
- try:
- # User also has a Contributor-side, do not remove complete User
- self.user.contributor
- return super().delete(*args, **kwargs)
- except Contributor.DoesNotExist:
- # Remove User; casade-remove this Contact
- self.user.delete()
- return self
-
- @property
- def kind_display(self):
- """
- Due to a lack of support to use get_FOO_display in a ArrayField, one has to create
- one 'manually'.
- """
- choices = dict(CONTACT_TYPES)
- return ', '.join([choices[value] for index, value in enumerate(self.kind)])
-
-
-class Partner(models.Model):
- """
- Supporting Partners.
- These are the official Partner objects created by SciPost Admin.
- """
- organization = models.OneToOneField('organizations.Organization', on_delete=models.CASCADE,
- blank=True, null=True)
- status = models.CharField(max_length=16, choices=PARTNER_STATUS, default=PARTNER_INITIATED)
- main_contact = models.ForeignKey('partners.Contact', on_delete=models.SET_NULL,
- blank=True, null=True, related_name='partner_main_contact')
-
- objects = PartnerManager()
-
- def __str__(self):
- return self.organization.__str__() + ' (' + self.get_status_display() + ')'
-
- def get_absolute_url(self):
- return reverse('partners:partner_view', args=(self.id,))
-
- def get_latest_active_agreement(self):
- return self.agreements.now_active().order_by('start_date').first()
-
- @property
- def has_all_contacts(self):
- """
- Determine if Partner has all available Contact Types available.
- """
- raise NotImplemented
-
-
-class PartnerEvent(models.Model):
- partner = models.ForeignKey('partners.Partner', on_delete=models.CASCADE,
- related_name='events')
- event = models.CharField(max_length=64, choices=PARTNER_EVENTS)
- comments = models.TextField(blank=True)
- noted_on = models.DateTimeField(auto_now_add=True)
- noted_by = models.ForeignKey(User, on_delete=models.CASCADE)
-
- def __str__(self):
- return '%s: %s' % (str(self.partner), self.get_event_display())
-
-
-class MembershipAgreement(models.Model):
- """
- Agreement for membership of the Supporting Partners Board.
- A new instance is created each time an Agreement is made or renewed.
- """
- partner = models.ForeignKey('partners.Partner', on_delete=models.CASCADE,
- blank=True, null=True, related_name='agreements')
- status = models.CharField(max_length=16, choices=MEMBERSHIP_AGREEMENT_STATUS)
- date_requested = models.DateField()
- start_date = models.DateField()
- end_date = models.DateField()
- duration = models.DurationField(choices=MEMBERSHIP_DURATION)
- offered_yearly_contribution = models.SmallIntegerField(default=0, help_text="Yearly contribution in euro's (€)")
-
- objects = MembershipAgreementManager()
-
- def __str__(self):
- return (str(self.partner) +
- ' [' + self.get_duration_display() +
- ' from ' + self.start_date.strftime('%Y-%m-%d') + ']')
-
- def get_absolute_url(self):
- return reverse('partners:agreement_details', args=(self.id,))
-
-
-class PartnersAttachment(models.Model):
- """
- An Attachment which can (in the future) be related to a Partner, Contact, MembershipAgreement,
- etc.
- """
- attachment = models.FileField(upload_to='UPLOADS/PARTNERS/ATTACHMENTS',
- storage=SecureFileStorage())
- name = models.CharField(max_length=128)
- agreement = models.ForeignKey('partners.MembershipAgreement', related_name='attachments',
- blank=True)
-
- objects = PartnersAttachmentManager()
-
- def get_absolute_url(self):
- if self.agreement:
- return reverse('partners:agreement_attachments', args=(self.agreement.id, self.id))
diff --git a/partners/templates/partners/_agreement_card.html b/partners/templates/partners/_agreement_card.html
deleted file mode 100644
index 8e3fb69717f7b857e9d14a34b6d7c180a861444d..0000000000000000000000000000000000000000
--- a/partners/templates/partners/_agreement_card.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="card-body">
- <div class="row">
- <div class="col-md-4">
- <address>
- <h3>{{ agreement.partner.organization.name }}</h3>
- <strong>{{ agreement.partner.organization.acronym }} ({{ agreement.partner.organization.get_kind_display }})</strong><br>
- {{ agreement.partner.organization.address|linebreaks }}
- {{ agreement.partner.organization.get_country_display }}
- </address>
- </div>
- <div class="col-md-4">
- <p>Agreement Status: <span class="label label-sm label-secondary">{{ agreement.get_status_display }}</span></p>
- <p>Yearly Contribution: € {{ agreement.offered_yearly_contribution }}</p>
- </div>
- <div class="col-md-4">
- <p>Start Date: {{ agreement.start_date }}</p>
- <p>Duration: {{ agreement.get_duration_display }}</p>
- </div>
- </div>
-</div>
diff --git a/partners/templates/partners/_agreement_table.html b/partners/templates/partners/_agreement_table.html
deleted file mode 100644
index 5b6c9abaea39845da4fc7748a8bf7c97e584517c..0000000000000000000000000000000000000000
--- a/partners/templates/partners/_agreement_table.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<table class="table mt-2">
- <tr><td>Partner: </td><td><a href="{{agreement.partner.get_absolute_url}}">{{ agreement.partner }}</a></td></tr>
- <tr><td>Status: </td><td>{{ agreement.status }}</td></tr>
- <tr><td>Request date: </td><td>{{ agreement.date_requested }}</td></tr>
- <tr><td>Start date: </td><td>{{ agreement.start_date }}</td></tr>
- <tr><td>Duration: </td><td>{{ agreement.get_duration_display }}</td></tr>
- <tr><td>Yearly contribution: </td><td>€ {{ agreement.offered_yearly_contribution }}</td></tr>
-</table>
diff --git a/partners/templates/partners/_contact_info_table.html b/partners/templates/partners/_contact_info_table.html
deleted file mode 100644
index 327605c92077e499ed1736617e9d5ec632035927..0000000000000000000000000000000000000000
--- a/partners/templates/partners/_contact_info_table.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<table>
- <tbody>
- <tr><td class="pr-4">Name: </td><td> </td><td>{{ contact.get_title_display }} {{ contact.user.first_name }} {{ contact.user.last_name }}</td></tr>
- <tr><td class="pr-4">Description: </td><td> </td><td>{{ contact.description }}</td></tr>
- <tr><td class="pr-4">Contact type: </td><td> </td><td>{{ contact.kind_display }}</td></tr>
- <tr><td class="pr-4">Email: </td><td> </td><td>{{ contact.user.email }}</td></tr>
- </tbody>
-</table>
diff --git a/partners/templates/partners/_contact_li.html b/partners/templates/partners/_contact_li.html
deleted file mode 100644
index ae833db1ab029878a230dc7f306045e4bbfefeac..0000000000000000000000000000000000000000
--- a/partners/templates/partners/_contact_li.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<li>
- <h4 class="pb-0"><strong>{{ contact.get_title_display }} {{ contact.user.first_name }} {{ contact.user.last_name }}</strong> {% if not contact.user.is_active %}<span class="label label-sm label-warning">Inactive</span>{% endif %}</h4>
- <p class="text-muted mb-1">{{contact.description}}</p>
- <p>
- {{ contact.kind_display }}<br>
- <a href="mailto:{{ contact.user.email }}">{{ contact.user.email }}</a>
- </p>
-</li>
diff --git a/partners/templates/partners/_partner_card.html b/partners/templates/partners/_partner_card.html
deleted file mode 100644
index 4d97ec4274ba9782fd78d2089d80cbfb46ae921e..0000000000000000000000000000000000000000
--- a/partners/templates/partners/_partner_card.html
+++ /dev/null
@@ -1,39 +0,0 @@
-{% load bootstrap %}
-
-<div class="card-body">
- <div class="row">
- <div class="col-md-1">
- <p>{{ partner.organization.country }}</p>
- </div>
- <div class="col-md-4">
- <address>
- <h3><a href="{{partner.get_absolute_url}}">{{ partner.organization.name }}</a></h3>
- <strong>{{ partner.organization.acronym }} ({{ partner.organization.get_orgtype_display }})</strong><br>
- {{ partner.organization.address|linebreaks }}
- {{ partner.organization.get_country_display }}<br>
- Main contact: {{ partner.main_contact|default_if_none:'<em>Unknown</em>' }}
- </address>
- </div>
- <div class="col-md-4">
-
- <h3>Contacts</h3>
- <ul>
- {% for contact in partner.contact_set.all %}
- {% include 'partners/_contact_li.html' with contact=contact %}
- {% endfor %}
- </ul>
- </div>
- <div class="col-md-3">
- <h3>Actions</h3>
- <ul>
- <li><a href="{% url 'partners:partner_edit' partner.id %}">Edit Partner</a>
- {% if not partner.organization %}<span class="text-danger">please specify the Organization{% endif %}
-</li>
- <li><a href="{% url 'organizations:organization_update' partner.organization.id %}">Update the Organization</a></li>
- <li><a href="{% url 'partners:partner_add_contact' partner.id %}">Add Contact</a></li>
- <li><a href="{{ partner.get_absolute_url }}">View events ({{ partner.events.count }})</a></li>
- </ul>
-
- </div>
- </div>
-</div>
diff --git a/partners/templates/partners/_partners_page_base.html b/partners/templates/partners/_partners_page_base.html
deleted file mode 100644
index 62956ba3ea8e66a3a6b3ed58c41a721275efe3d5..0000000000000000000000000000000000000000
--- a/partners/templates/partners/_partners_page_base.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% extends 'scipost/base.html' %}
-
-{% block breadcrumb %}
- <div class="container-outside header">
- <div class="container">
- <nav class="breadcrumb hidden-sm-down">
- {% block breadcrumb_items %}
- <a href="{% url 'partners:dashboard' %}" class="breadcrumb-item">Partners Page</a>
- {% endblock %}
- </nav>
- </div>
- </div>
-{% endblock %}
-
-
-{% block pagetitle %}: Supporting Partners:{% endblock pagetitle %}
diff --git a/partners/templates/partners/_prospective_partner_card.html b/partners/templates/partners/_prospective_partner_card.html
deleted file mode 100644
index 9a56f10cd941f5f431d31d4735cacc6ce8ea2402..0000000000000000000000000000000000000000
--- a/partners/templates/partners/_prospective_partner_card.html
+++ /dev/null
@@ -1,81 +0,0 @@
-{% load bootstrap %}
-
-<div class="card-body">
- <div class="row">
- <div class="col-md-1">
- <p>{{ pp.country }}</p>
- </div>
- <div class="col-md-4">
- <h3>{{ pp.institution_name }}</h3>
- <p>({{ pp.get_kind_display }})</p>
- <p>Received {{ pp.date_received }}</p>
- {% if pp.date_processed %}
- <p>Processed {{ pp.date_processed }}</p>
- {% endif %}
- <p>{{ pp.get_status_display }}</p>
- </div>
- <div class="col-md-7">
- <ul>
- <li><a href="{% url 'partners:email_prospartner_generic' prospartner_id=pp.id %}">Compose email to a generic address</a></li>
- <li><a href="{% url 'partners:email_prospartner_generic' prospartner_id=pp.id mail='followup' %}">Compose follow-up email to a generic address</a></li>
- </ul>
- <h3>Contacts:</h3>
- <a class="d-inline-block mb-2" href="{% url 'partners:add_prospartner_contact' prospartner_id=pp.id %}">Add a contact</a>
- <table class="table">
- <thead>
- <th>Role</th>
- <th>Name</th>
- <th>Email</th>
- <th>Actions</th>
- </thead>
- <tbody>
- {% for contact in pp.prospective_contacts.all %}
- <tr>
- <td>{{ contact.role }}</td>
- <td>{{ contact.get_title_display }} {{ contact.first_name }} {{ contact.last_name }}</td>
- <td>{{ contact.email }}</td>
- <td>
- <ul>
- <li><a href="{% url 'partners:email_prospartner_contact' contact_id=contact.id %}">Compose email</a>
- <li><a href="{% url 'partners:email_prospartner_contact' contact_id=contact.id mail='followup' %}">Compose follow-up email</a>
- </ul>
- </td>
- </tr>
- {% empty %}
- <tr>
- <td colspan="3">No contacts found, <a href="{% url 'partners:add_prospartner_contact' prospartner_id=pp.id %}">add a contact</a>.</td>
- </tr>
- {% endfor %}
- </tbody>
- </table>
- </div>
- </div>
-
- <div class="row">
- <div class="col-md-6 ml-auto">
- <h3>Events</h3>
- <ul>
- {% for event in pp.prospectivepartnerevent_set.all %}
- {% include 'partners/_prospartner_event_li.html' with event=event %}
- {% empty %}
- <li>No events were found.</li>
- {% endfor %}
- </ul>
- </div>
- <div class="col-md-5">
- <h3>Add an event for this Prospective Partner</h3>
- <form class="d-block mt-2 mb-3" action="{% url 'partners:add_prospartner_event' prospartner_id=pp.id %}" method="post">
- {% csrf_token %}
- {{ ppevent_form|bootstrap }}
- <input type="submit" name="submit" value="Submit" class="btn btn-outline-secondary">
- </form>
-
- {% if not pp.is_promoted_to_partner %}
- <h3>Partner status</h3>
- <ul>
- <li><a href="{% url 'partners:promote_prospartner' pp.id %}">Upgrade prospect to partner</a></li>
- </ul>
- {% endif %}
- </div>
- </div>
-</div>
diff --git a/partners/templates/partners/add_prospartner_contact.html b/partners/templates/partners/add_prospartner_contact.html
deleted file mode 100644
index d0f72fcd09f2a36e5fe08711de296e60c9d5a98b..0000000000000000000000000000000000000000
--- a/partners/templates/partners/add_prospartner_contact.html
+++ /dev/null
@@ -1,31 +0,0 @@
-{% extends 'scipost/base.html' %}
-
-{% block pagetitle %}: Supporting Partners: add contact{% endblock pagetitle %}
-
-{% load bootstrap %}
-
-{% block content %}
-
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">Add a Contact for a Prospective Partner</h1>
- </div>
-</div>
-
-<div class="row">
- <div class="col-12">
- <h3>Add a contact for {{ prospartner.institution_name }}:</h3>
-
- <form action="{% url 'partners:add_prospartner_contact' prospartner_id=prospartner.id %}" method="post">
- {% csrf_token %}
- {{ form|bootstrap }}
- <input class="btn btn-primary" type="submit" value="Submit"/>
- </form>
-
- {% if errormessage %}
- <p class="text-danger">{{ errormessage }}</p>
- {% endif %}
- </div>
-</div>
-
-{% endblock content %}
diff --git a/partners/templates/partners/add_prospective_partner.html b/partners/templates/partners/add_prospective_partner.html
deleted file mode 100644
index 28abef26c9c5798619a3b18590ec3a74d315e180..0000000000000000000000000000000000000000
--- a/partners/templates/partners/add_prospective_partner.html
+++ /dev/null
@@ -1,38 +0,0 @@
-{% extends 'partners/_partners_page_base.html' %}
-
-{% block breadcrumb_items %}
- {{block.super}}
- <span class="breadcrumb-item">Add a Prospective Partner</span>
-{% endblock %}
-
-
-{% block pagetitle %}: Supporting Partners: add{% endblock pagetitle %}
-
-{% load bootstrap %}
-
-{% block content %}
-
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">Add a Prospective Partner</h1>
- </div>
-</div>
-
-<div class="row">
- <div class="col-12">
- <p>Please provide contact details of an appropriate representative, and details about the potential Partner.</p>
-
- <form action="{% url 'partners:add_prospective_partner' %}" method="post">
- {% csrf_token %}
- {{ form|bootstrap }}
- <input class="btn btn-primary" type="submit" value="Submit"/>
- </form>
-
- {% if errormessage %}
- <p class="text-danger">{{ errormessage }}</p>
- {% endif %}
-
- </div>
-</div>
-
-{% endblock content %}
diff --git a/partners/templates/partners/agreements_add.html b/partners/templates/partners/agreements_add.html
deleted file mode 100644
index 98116017a27ebba14dbc767a464186916c327a50..0000000000000000000000000000000000000000
--- a/partners/templates/partners/agreements_add.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% extends 'partners/_partners_page_base.html' %}
-
-{% block breadcrumb_items %}
- {{block.super}}
- <span class="breadcrumb-item">Add Membership Agreement</span>
-{% endblock %}
-
-{% block pagetitle %}{{block.super}} Add Membership Agreement{% endblock pagetitle %}
-
-{% load bootstrap %}
-
-{% block content %}
-
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">Add Membership Agreement</h1>
- </div>
-</div>
-
-<div class="row">
- <div class="col-12">
- <form method="post">
- {% csrf_token %}
- <div class="mb-5">
- {{ form|bootstrap }}
- </div>
-
- <input class="btn btn-primary" type="submit" value="Submit"/>
- </form>
- </div>
-</div>
-
-{% endblock content %}
diff --git a/partners/templates/partners/agreements_details.html b/partners/templates/partners/agreements_details.html
deleted file mode 100644
index e522ea8ab2e3a58a5b02065e300bc8bcb6448d6a..0000000000000000000000000000000000000000
--- a/partners/templates/partners/agreements_details.html
+++ /dev/null
@@ -1,51 +0,0 @@
-{% extends 'partners/_partners_page_base.html' %}
-
-{% block breadcrumb_items %}
- {{block.super}}
- <span class="breadcrumb-item">Membership Agreement details</span>
-{% endblock %}
-
-{% block pagetitle %}{{block.super}} Membership Agreement details{% endblock pagetitle %}
-
-{% load bootstrap %}
-
-{% block content %}
-
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">Membership Agreement details</h1>
- </div>
-</div>
-
-<div class="row">
- <div class="col-md-6">
- <h2>Membership Agreement</h2>
- {% include 'partners/_agreement_table.html' with agreement=agreement %}
-
- <h3>Attachments</h3>
- <ul>
- {% for file in agreement.attachments.all %}
- <li><a href="{{file.get_absolute_url}}" target="_blank">{{file.name}}</a></li>
- {% empty %}
- <li>No Attachments found.</li>
- {% endfor %}
- </ul>
- </div>
-
- {% if perms.scipost.can_manage_SPB %}
- <div class="col-12">
- <h2>Update Agreement</h2>
- <form method="post" enctype="multipart/form-data">
- {% csrf_token %}
- {{ form|bootstrap }}
-
- <h3>Attachments</h3>
- {{ attachment_formset|bootstrap }}
-
- <input class="btn btn-primary" type="submit" value="Update"/>
- </form>
- </div>
- {% endif %}
-</div>
-
-{% endblock content %}
diff --git a/partners/templates/partners/base.html b/partners/templates/partners/base.html
deleted file mode 100644
index 171e8e539105128a8127ac4af6bae0d0a6aa5063..0000000000000000000000000000000000000000
--- a/partners/templates/partners/base.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends 'scipost/base.html' %}
-
-{% block body_class %}{{ block.super }} partners{% endblock %}
-
-{% block breadcrumb %}
- <div class="container-outside header">
- <div class="container">
- <nav class="breadcrumb hidden-sm-down">
- {% block breadcrumb_items %}
- <a href="{% url 'partners:partners' %}" class="breadcrumb-item">Partners</a>
- {% endblock %}
- </nav>
- </div>
- </div>
-{% endblock %}
diff --git a/partners/templates/partners/dashboard.html b/partners/templates/partners/dashboard.html
deleted file mode 100644
index ce7dc05d2b232677ad6e0f8b37524cd508633fff..0000000000000000000000000000000000000000
--- a/partners/templates/partners/dashboard.html
+++ /dev/null
@@ -1,216 +0,0 @@
-{% extends 'scipost/base.html' %}
-
-{% load partners_extras %}
-{% load bootstrap %}
-
-{% block pagetitle %}: partner page{% endblock pagetitle %}
-
-{% block content %}
-
-
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">Welcome to your SciPost Partner Page, {{ request.user.first_name }} {{ request.user.last_name }}</h1>
- </div>
-</div>
-
-<div class="row">
- <div class="col-12">
- <div class="tab-nav-container">
- <div class="tab-nav-inner">
- <!-- Nav tabs -->
- <ul class="nav btn-group personal-page-nav" role="tablist">
- <li class="nav-item btn btn-outline-secondary">
- <a href="#account" class="nav-link active" data-toggle="tab">Account</a>
- </li>
- <li class="nav-item btn btn-outline-secondary">
- <a href="#agreements" class="nav-link" data-toggle="tab">Membership Agreements</a>
- </li>
- {% if perms.scipost.can_manage_SPB %}
- <li class="nav-item btn btn-outline-secondary">
- <a href="#prospartners" class="nav-link" data-toggle="tab">Prospective Partners</a>
- </li>
- <li class="nav-item btn btn-outline-secondary">
- <a href="#partners" class="nav-link" data-toggle="tab">Partners</a>
- </li>
- <li class="nav-item btn btn-outline-secondary">
- <a href="#global_agreements" class="nav-link" data-toggle="tab">Agreements</a>
- </li>
- {% endif %}
- </ul>
- </div>
- </div>
- </div>
-</div>
-
-<div class="tab-content">
- <!-- Tab: Account -->
- <div class="tab-pane active" id="account" role="tabpanel">
- <div class="row">
- <div class="col-12">
- <h2 class="highlight">Your Account</h2>
- </div>
- </div>
- <div class="row">
- <div class="col-md-6">
- <h3>Your personal details:</h3>
- {% include "partners/_contact_info_table.html" with contact=request.user.partner_contact %}
-
- {% if perms.scipost.can_manage_SPB %}
- <h3 class="mt-4">Administrative actions</h3>
- <ul>
- <li><a href="{% url 'partners:process_contact_requests' %}">Open Contact requests</a> ({{contact_requests_count}})</li>
- <li>Contacts awaiting validation ({{inactivate_contacts_count}})</a></li>
- </ul>
- {% endif %}
- </div>
- <div class="col-md-6">
- <h3 class="mb-2">My Partners</h3>
- <ul class="list-unstyled mb-5">
- {% for partner in request.user.partner_contact.partners.all %}
- <li class="media mb-2">
- <img class="d-flex mr-3" width="64" src="{% if partner.organization.logo %}{{partner.organization.logo.url}}{% endif %}" alt="Partner Logo">
- <div class="media-body">
- <h3 class="mt-0"><strong>{{partner.organization.name}}</strong></h3>
- <p>
- {{partner.organization.acronym}} ({{partner.organization.get_orgtype_display}})<br>
- <a href="{{partner.get_absolute_url}}">View/edit</a>
- </p>
- </div>
- </li>
- {% empty %}
- <li>No partners found. Please contact the SciPost admin.</li>
- {% endfor %}
- </ul>
-
- <h3>Update your personal data or password</h3>
-
- <ul>
- <li><a href="{% url 'scipost:update_personal_data' %}">Update your personal data</a></li>
- <li><a href="{% url 'scipost:change_password' %}">Change your password</a></li>
- </ul>
- </div>
- </div>
- </div><!-- End tab -->
-
- <!-- Tab: Agreements -->
- <div class="tab-pane" id="agreements" role="tabpanel">
- <div class="row">
- <div class="col-12">
- <h2 class="highlight">Membership Agreements</h2>
- </div>
- </div>
- <div class="row">
- <div class="col-12">
- <ul class="list-group list-group-flush">
- {% for agreement in personal_agreements %}
- <li class="list-group-item">{% include 'partners/_agreement_card.html' with agreement=agreement %}</li>
- {% empty %}
- <li class="list-group-item">No Membership Agreements found.</li>
- {% endfor %}
- </ul>
- </div>
- </div>
- </div><!-- End tab -->
-
- {% if perms.scipost.can_manage_SPB %}
- <!-- Tab: prospective partners -->
- <div class="tab-pane" id="prospartners" role="tabpanel">
- <div class="row">
- <div class="col-12">
- <h2 class="highlight">Prospective Partners</h2>
- <h3><a href="{% url 'partners:add_prospective_partner' %}">Add a prospective partner</a></h3>
- </div>
- </div>
-
- <table class="table table-hover mb-5">
- <thead class="thead-default">
- <tr>
- <th>Country</th>
- <th>Institution name</th>
- <th>Kind</th>
- <th>Status</th>
- <th>Date received</th>
- </tr>
- </thead>
-
- <tbody id="accordion" role="tablist" aria-multiselectable="true">
- {% for partner in prospective_partners %}
- <tr data-toggle="collapse" data-parent="#accordion" href="#collapse{{ partner.id }}" aria-expanded="true" aria-controls="collapse{{ partner.id }}" style="cursor: pointer;">
- <td>{{ partner.get_country_display }}</td>
- <td>{{ partner.institution_name }}</td>
- <td>{{ partner.get_kind_display }}</td>
- <td style="background-color:{{ partner.status|partnerstatuscolor }}">{{ partner.get_status_display }}</td>
- <td>{{ partner.date_received|date:"Y-m-d" }}</td>
- </tr>
- <tr id="collapse{{ partner.id }}" class="collapse" role="tabpanel" aria-labelledby="heading{{ partner.id}}" style="background-color: #fff;">
- <td colspan="5">
- {% include 'partners/_prospective_partner_card.html' with pp=partner %}
- </td>
- </tr>
- {% empty %}
- <tr>
- <td colspan="5">No prospects found.</td>
- </tr>
- {% endfor %}
- </tbody>
- </table>
- </div><!-- End tab -->
-
- <!-- Tab: Partners -->
- <div class="tab-pane" id="partners" role="tabpanel">
- <div class="row">
- <div class="col-12">
- <h2 class="highlight">Partners</h2>
- </div>
- </div>
- <div class="row">
- <div class="col-12">
- <ul class="list-group list-group-flush">
- {% for partner in partners %}
- <li class="list-group-item">{% include 'partners/_partner_card.html' with partner=partner %}</li>
- {% endfor %}
- </ul>
- </div>
- </div>
- </div><!-- End tab -->
-
- <!-- Tab: Agreements -->
- <div class="tab-pane" id="global_agreements" role="tabpanel">
- <div class="row">
- <div class="col-12">
- <h2 class="highlight">SciPost's Membership Agreements</h2>
- <h3><a href="{% url 'partners:add_agreement' %}">Add Membership Agreement</a></h3>
- </div>
- </div>
-
- <table class="table">
- <thead>
- <tr>
- <th>Partner</th>
- <th>Status</th>
- <th>Duration</th>
- <th>Start Date</th>
- </tr>
- </thead>
- <tbody>
- {% for agreement in agreements %}
- <tr>
- <td><a href="{{agreement.get_absolute_url}}">{{ agreement.partner }}</a></td>
- <td>{{ agreement.get_status_display }}</td>
- <td>{{ agreement.get_duration_display }}</td>
- <td>{{ agreement.start_date }}</td>
- </tr>
- {% empty %}
- <tr>
- <td colspan="4">No Agreements found</td>
- </tr>
- {% endfor %}
- </tbody>
- </table>
- </div><!-- End tab -->
- {% endif %}
-</div>
-
-
-{% endblock content %}
diff --git a/partners/templates/partners/email_prospartner_contact.html b/partners/templates/partners/email_prospartner_contact.html
deleted file mode 100644
index f32ea6ca65401d1c4db8458cf6ee21605f49abb2..0000000000000000000000000000000000000000
--- a/partners/templates/partners/email_prospartner_contact.html
+++ /dev/null
@@ -1,29 +0,0 @@
-{% extends 'scipost/base.html' %}
-
-{% block pagetitle %}: Supporting Partners: email contact{% endblock pagetitle %}
-
-{% load bootstrap %}
-
-{% block content %}
-
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">Email a Prospective Partner Contact</h1>
- </div>
-</div>
-
-<div class="row">
- <div class="col-12">
- <form action="{% url 'partners:email_prospartner_contact' contact_id=contact.id %}" method="post">
- {% csrf_token %}
- {{ form|bootstrap }}
- <input class="btn btn-primary" type="submit" value="Submit"/>
- </form>
-
- {% if errormessage %}
- <p class="text-danger">{{ errormessage }}</p>
- {% endif %}
- </div>
-</div>
-
-{% endblock content %}
diff --git a/partners/templates/partners/email_prospartner_generic.html b/partners/templates/partners/email_prospartner_generic.html
deleted file mode 100644
index 6732aa816ef9eb0ffc243267a11102538add437f..0000000000000000000000000000000000000000
--- a/partners/templates/partners/email_prospartner_generic.html
+++ /dev/null
@@ -1,29 +0,0 @@
-{% extends 'scipost/base.html' %}
-
-{% block pagetitle %}: Supporting Partners: email contact{% endblock pagetitle %}
-
-{% load bootstrap %}
-
-{% block content %}
-
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">Email a Prospective Partner Generic Address</h1>
- </div>
-</div>
-
-<div class="row">
- <div class="col-12">
- <form action="{% url 'partners:email_prospartner_generic' prospartner_id=prospartner.id %}" method="post">
- {% csrf_token %}
- {{ form|bootstrap }}
- <input class="btn btn-primary" type="submit" value="Submit"/>
- </form>
-
- {% if errormessage %}
- <p class="text-danger">{{ errormessage }}</p>
- {% endif %}
- </div>
-</div>
-
-{% endblock content %}
diff --git a/partners/templates/partners/membership_request.html b/partners/templates/partners/membership_request.html
deleted file mode 100644
index b06175bb734458c13441a5a4aab9ea1ecde45dd2..0000000000000000000000000000000000000000
--- a/partners/templates/partners/membership_request.html
+++ /dev/null
@@ -1,57 +0,0 @@
-{% extends 'scipost/base.html' %}
-
-{% block pagetitle %}: Supporting Partners Board: Membership request{% endblock pagetitle %}
-
-{% load bootstrap %}
-{% block content %}
-
-<script>
-$(document).ready(function(){
- $("#id_consortium_members").hide()
- $("label[for='id_consortium_members']").hide()
-
- $('select#id_partner_type').on('change', function (){
- var selection = $(this).val();
- switch(selection){
- case "Consortium":
- $("#id_consortium_members").show()
- $("label[for='id_consortium_members']").show()
- break;
- default:
- $("#id_consortium_members").hide()
- $("label[for='id_consortium_members']").hide()
- }
-});
-});
-
-</script>
-
-
-<div class="row justify-content-center">
- <div class="col-lg-10">
- <h1 class="highlight">Supporting Partners Board: Membership Request</h1>
- <p>You can hereby request further details on the process to become one of our Supporting Partners.</p>
- <p>Filling in this form does not yet constitute a binding agreement.</p>
- <p>It simply expresses your interest in considering joining our Supporting Partners Board.</p>
- <p>After filling this form, SciPost Administration will contact you with more details on Partnership.</p>
- <p><em>Note: you will automatically be considered as the contact person for this Partner.</em></p>
-
- {% if errormessage %}
- <p class="text-danger">{{ errormessage }}</p>
- {% endif %}
-
- <form action="{% url 'partners:membership_request' %}" method="post">
- {% csrf_token %}
- <h3>Please provide us the following relevant details:</h3>
- {{ query_form|bootstrap }}
- <input class="btn btn-primary" type="submit" value="Submit"/>
- </form>
-
- {% if errormessage %}
- <p class="text-danger">{{ errormessage }}</p>
- {% endif %}
- </div>
-</div>
-
-
-{% endblock content %}
diff --git a/partners/templates/partners/partner_edit.html b/partners/templates/partners/partner_edit.html
deleted file mode 100644
index 93aa56f1fc4a890b561b715284a54ca50b0a9c04..0000000000000000000000000000000000000000
--- a/partners/templates/partners/partner_edit.html
+++ /dev/null
@@ -1,68 +0,0 @@
-{% extends 'partners/_partners_page_base.html' %}
-
-{% block breadcrumb_items %}
- {{block.super}}
- <a href="{{form.instance.get_absolute_url}}" class="breadcrumb-item">Partner details</a>
- <span class="breadcrumb-item">Edit Partner</span>
-{% endblock %}
-
-{% block pagetitle %}{{block.super}} Edit Partner{% endblock pagetitle %}
-
-{% load bootstrap %}
-
-{% block content %}
-
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">Edit Partner</h1>
- </div>
-</div>
-
-<div class="row">
- <div class="col-12">
- <form method="post">
- {% csrf_token %}
- <div class="mb-5">
- {{ form|bootstrap }}
- </div>
-
- <h2>Contacts</h2>
- {{ contact_formset.management_form }}
- {% for form in contact_formset %}
- <div class="contact-form-group">
- <h3>{{form.instance}}</h3>
- <p>{{ form.instance.user.email }}</p>
- <div class="mb-3">{{ form|bootstrap }}</div>
- </div>
- {% endfor %}
-
- <input class="btn btn-primary" type="submit" value="Submit"/>
- </form>
- </div>
-</div>
-
-{% endblock content %}
-
-{% block footer_script %}
-{ block.super }}
-{{ form.media }}
-
-<script>
- function delete_hide_contact_groups(delete_input) {
- input_el = $(delete_input);
- if( input_el.prop('checked') ) {
- input_el
- .parents('.contact-form-group')
- .addClass('delete-form-group');
- } else {
- input_el
- .parents('.contact-form-group')
- .removeClass('delete-form-group');
- }
- }
-
- $('.contact-form-group [name$="DELETE"]').on('change click', function() {
- delete_hide_contact_groups(this);
- });
-</script>
-{% endblock %}
diff --git a/partners/templates/partners/partner_request_contact.html b/partners/templates/partners/partner_request_contact.html
deleted file mode 100644
index 1ef1498a5d646205b965baae4f7780cb28b0077f..0000000000000000000000000000000000000000
--- a/partners/templates/partners/partner_request_contact.html
+++ /dev/null
@@ -1,32 +0,0 @@
-{% extends 'partners/_partners_page_base.html' %}
-
-{% block breadcrumb_items %}
- {{block.super}}
- <a href="{{partner.get_absolute_url}}" class="breadcrumb-item">Partner details</a>
- <span class="breadcrumb-item">Request new Contact</span>
-{% endblock %}
-
-{% block pagetitle %}{{block.super}} Request new Contact{% endblock pagetitle %}
-
-{% load bootstrap %}
-
-{% block content %}
-
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">Request new Contact for Partner {{partner}}</h1>
- </div>
-</div>
-
-<div class="row">
- <div class="col-12">
- <form method="post">
- {% csrf_token %}
- {{ form|bootstrap }}
-
- <input class="btn btn-primary" type="submit" value="Submit"/>
- </form>
- </div>
-</div>
-
-{% endblock content %}
diff --git a/partners/templates/partners/partners_detail.html b/partners/templates/partners/partners_detail.html
deleted file mode 100644
index 0187e4780e2527f72b60d1eb90cdad2c6ffb5f81..0000000000000000000000000000000000000000
--- a/partners/templates/partners/partners_detail.html
+++ /dev/null
@@ -1,82 +0,0 @@
-{% extends 'partners/_partners_page_base.html' %}
-
-{% block breadcrumb_items %}
- {{block.super}}
- <span class="breadcrumb-item">Partner details</span>
-{% endblock %}
-
-{% block pagetitle %}{{block.super}} Partner details{% endblock pagetitle %}
-
-{% load bootstrap %}
-
-{% block content %}
-
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">Partner {{partner}}</h1>
- </div>
-</div>
-
-<div class="row">
- <div class="col-md-6">
- {% if perms.scipost.can_manage_SPB %}
- <a href="{% url 'partners:partner_edit' partner.id %}">Edit partner</a>
- {% endif %}
- <address>
- <h3>{{ partner.organization.name }}</h3>
- <strong>{{ partner.organization.acronym }} ({{ partner.organization.get_orgtype_display }})</strong><br>
- {{ partner.organization.address|linebreaks }}
- {{ partner.organization.get_country_display }}<br>
- Main contact: {{ partner.main_contact|default_if_none:'<em>Unknown</em>' }}
- </address>
-
- <h3>Membership Agreements</h3>
- <ul>
- {% for agreement in partner.agreements.all %}
- <li><a href="{{agreement.get_absolute_url}}">{{agreement}}</a></li>
- {% empty %}
- <li>No agreements found.</li>
- {% endfor %}
- </ul>
-
- <h3>Contacts</h3>
- <ul>
- {% for contact in partner.contact_set.all %}
- {% include 'partners/_contact_li.html' with contact=contact %}
- {% endfor %}
- </ul>
-
- <h3>Requested Contacts</h3>
- <ul>
- {% for contact_request in partner.contactrequest_set.awaiting_processing %}
- <li><strong>{{contact_request}}</strong> ({{contact_request.email}})</li>
- {% empty %}
- <li>All requests are processed</li>
- {% endfor %}
- </ul>
- <a href="{% url 'partners:partner_request_contact' partner.id %}">Request new Contact</a>
- </div>
- <div class="col-md-6">
- {% if perms.scipost.can_view_partners %}
- <h3>Partner Events</h3>
- <ul>
- {% for event in partner.events.all %}
- {% include 'partners/_prospartner_event_li.html' with event=event %}
- {% empty %}
- <li>No events were found.</li>
- {% endfor %}
- </ul>
-
- <hr>
- <h3>Add new Event</h3>
- <form method="post">
- {% csrf_token %}
- {{ form|bootstrap }}
-
- <input class="btn btn-primary" type="submit" value="Submit"/>
- </form>
- {% endif %}
- </div>
-</div>
-
-{% endblock content %}
diff --git a/partners/templates/partners/process_contact_requests.html b/partners/templates/partners/process_contact_requests.html
deleted file mode 100644
index 489b9a7e56120566fec2b11d419bb31342d76bcc..0000000000000000000000000000000000000000
--- a/partners/templates/partners/process_contact_requests.html
+++ /dev/null
@@ -1,59 +0,0 @@
-{% extends 'partners/_partners_page_base.html' %}
-
-{% block breadcrumb_items %}
- {{block.super}}
- <span class="breadcrumb-item">Process Contact Requests</span>
-{% endblock %}
-
-{% block pagetitle %}{{block.super}} Process Contact Requests{% endblock pagetitle %}
-
-{% load bootstrap %}
-
-{% block content %}
-
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">Process Contact Requests</h1>
- </div>
-</div>
-
-<div class="row">
- <div class="col-12">
- <form method="post">
- {% csrf_token %}
- {{ formset.management_form }}
- {% for form in formset %}
- <div class="contact-form-group">
- <h3>{{form.instance}}</h3>
- <p>{{ form.instance.user.email }}</p>
- <div class="mb-3">{{ form|bootstrap }}</div>
- </div>
- {% endfor %}
-
- <input class="btn btn-primary" type="submit" value="Submit"/>
- </form>
- </div>
-</div>
-
-{% endblock content %}
-
-{% block footer_script %}
-<script>
- function delete_hide_contact_groups(delete_input) {
- input_el = $(delete_input);
- if( input_el.prop('checked') ) {
- input_el
- .parents('.contact-form-group')
- .addClass('delete-form-group');
- } else {
- input_el
- .parents('.contact-form-group')
- .removeClass('delete-form-group');
- }
- }
-
- $('.contact-form-group [name$="DELETE"]').on('change click', function() {
- delete_hide_contact_groups(this);
- });
-</script>
-{% endblock %}
diff --git a/partners/templates/partners/promote_prospartner.html b/partners/templates/partners/promote_prospartner.html
deleted file mode 100644
index 7393a4c35fb489903b578db95af5e659475ee38f..0000000000000000000000000000000000000000
--- a/partners/templates/partners/promote_prospartner.html
+++ /dev/null
@@ -1,42 +0,0 @@
-{% extends 'partners/_partners_page_base.html' %}
-
-{% block breadcrumb_items %}
- {{block.super}}
- <span class="breadcrumb-item">Promote Prospect</span>
-{% endblock %}
-
-{% block pagetitle %}{{block.super}} Promote Prospect{% endblock pagetitle %}
-
-{% load bootstrap %}
-
-{% block content %}
-
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">Promote Prospect to Partner</h1>
- </div>
-</div>
-
-<div class="row">
- <div class="col-12">
- <form method="post">
- {% csrf_token %}
- {{ form|bootstrap }}
- {{ contact_formset.management_form }}
-
- {% for form in contact_formset %}
- <h3>Contact {{forloop.counter}}</h3>
- {{ form|bootstrap }}
- {% endfor %}
-
- <input class="btn btn-primary" type="submit" value="Submit"/>
- </form>
- </div>
-</div>
-
-{% endblock content %}
-
-{% block footer_script %}
-{ block.super }}
-{{ form.media }}
-{% endblock %}
diff --git a/partners/templates/partners/supporting_partners.html b/partners/templates/partners/supporting_partners.html
deleted file mode 100644
index 16eebaa7d1e5cb27ee9790b93b139677acd0fd7c..0000000000000000000000000000000000000000
--- a/partners/templates/partners/supporting_partners.html
+++ /dev/null
@@ -1,193 +0,0 @@
-{% extends 'partners/base.html' %}
-
-{% block pagetitle %}: Supporting Partners{% endblock pagetitle %}
-
-{% load staticfiles %}
-
-{% load scipost_extras %}
-
-
-{% block breadcrumb_items %}
-{{ block.super }}
-{% endblock %}
-
-{% block content %}
-
-<div class="container-outside header">
- <div class="container">
- <h1>SciPost Supporting Partners</h1>
- </div>
-</div>
-
-<div class="row">
- <div class="col-12">
- <h2 class="text-danger">We are deprecating our Partners pages, please go to our <a href="{% url 'sponsors:sponsors' %}">Sponsors page</a> instead.</h2>
- </div>
-</div>
-
-{% if perms.scipost.can_manage_SPB %}
- <div class="row">
- <div class="col-12">
- <a href="{% url 'partners:dashboard' %}">Manage Partners</a>
- </div>
- </div>
-{% endif %}
-
-<div class="row">
- <div class="col-12">
- <ul>
- <li>
- <p>
- <strong>Are you a scientist?</strong><br/>
- Is your institution or funding body not listed below as one of our current Supporting Partners?<br/>
- Please petition them to join by sending a librarian/director/... a personalized email, starting from this <a href="mailto:?subject=Petition to support SciPost&body={% autoescape on %}{% include 'petitions/petition_email.html' %}{% endautoescape %}&cc=partners@scipost.org">template</a>.<br/>
- You can also encourage them to join by <a href="{% url 'petitions:petition' slug='join-SPB' %}">signing our petition</a>.
- </p>
- </li>
- <li>
- <p>
- <strong>Are you a librarian, funding agency representative or other potential supporter?</strong><br/>
- Have a quick look at our <a href="{% static 'scipost/SPB/SciPost_Supporting_Partners_Board_Prospectus.pdf' %}">one-page Prospectus</a>.<br/>
- Read detailed information in the draft <a href="{% static 'scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf' %}">Partner Agreement</a>, and <a href="mailto:partners@scipost.org">contact us</a> to get further details.
- </p>
- </li>
- </ul>
- </div>
-</div>
-
-
-<div class="row">
- <div class="col-12">
- <h3>Openness at strictly minimal cost: the role of professional academics</h3>
- <p>A fundamental principle underlining all of SciPost’s activities is openness. This means in particular that SciPost guarantees free online access to all publications in all its Journals (free for readers; all articles are published under the terms of a Creative Commons license (most commonly CC-BY)), and does not charge any article processing fees for publishing (free for authors). All editorial activities are performed by professional academics as part of their normal professional duties: contributors to SciPost are demonstrably dedicated to serving their community, and to realizing the dream of true openness in scientific publishing. SciPost thus achieves the highest possible standards of academic quality and open accessibility while maintaining costs at the lowest achievable level.</p>
-
- <h3>Financing and sustainability: the role of institutional backers</h3>
- <p>Besides relying on the dedicated service of professional scientists for many of its day-to-day operations, SciPost must additionally rely on institutional backers for sustaining its professional-level publishing facilities and other activities. This backing is sought primarily from the organizations which are positively impacted by its activities, directly or indirectly: (inter)national funding agencies, universities, national/university/research libraries, academic consortia, governments and ministries, foundations, benefactors and further interested parties. This financial backing cannot take the form of article processing charges or journal subscriptions, due to SciPost’s operating principles: rather, Supporting Partners provide operating funds to SciPost via donations, these funds being pooled in order to cover maintenance and operation of the web infrastructure at SciPost.org, administration of all site-related activities, production of publications in SciPost Journals and development of new publishing-related services for the international scientific community.</p>
-
- </div>
-</div>
-
-
-
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">Supporting Partners Board</h1>
- </div>
-</div>
-
-<div class="row">
- <div class="col-12">
-
- <p>We hereby cordially invite interested parties who are supportive of SciPost's mission to join the SciPost Supporting Partners Board by signing a <a href="{% static 'scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf' %}">Partner Agreement</a>.</p>
-
- <p>Prospective partners can query for more information about Membership by filling the <a href="{% url 'partners:membership_request' %}">online query form</a>.</p>
-
- <br/>
- <p>The <a href="{% static 'scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf' %}">Partner Agreement</a> itself contains a detailed presentation of the Foundation, its activities and financial aspects. What follows is a summary of the most important points.</p>
-
- <br/>
- <p>The set of all Supporting Partners forms the SciPost Supporting Partners Board (SPB). Acting as a representative body, the SPB’s purpose is to provide the main financial backing without which SciPost could not continue carrying out its mission, to counsel it in all its operations and to help determine the initiative’s development priorities.</p>
-
- <p>The SPB has a yearly virtual general meeting, organized and chaired by a representative of the SciPost Foundation. During this meeting, SPB-related topics are discussed, recommendations to the SciPost Foundation can be put forward and voted on by Partners, and general issues on any of SciPost’s activities can be discussed.</p>
-
-
- <h3>Types of Partners</h3>
- <p>Supporting Partners can for example be:
- <ul>
- <li>International/national funding agencies</li>
- <li>National/university/research libraries</li>
- <li>Consortia (of e.g. universities or libraries)</li>
- <li>Government (through e.g. education/science ministries)</li>
- <li>Foundations</li>
- <li>Benefactors of any other type.</li>
- </ul>
- </p>
-
- <h3>Partnership benefits</h3>
- <p>All funds originating from Supporting Partners are used to provide services to the academic community as a whole: SciPost operates in a completely open fashion, and the fulfillment of the Foundation’s mission benefits academics worldwide, without any distinction.</p>
- <p>Despite the fact that all its services are provided openly, SciPost nonetheless provides its Partners with a mark of appreciation and recognition for their donations in the form of:
- <ul>
- <li>A seat on the SciPost Supporting Partners Board, including access to yearly meetings;</li>
- <li>Inclusion in the online listing of Supporting Partners on the SciPost website;</li>
- <li>Preview of further online tools planned by SciPost during their development stage. The SPB as a whole can provide feedback and request specific features.</li>
- </ul>
- </p>
-
- <h3>Financial contribution</h3>
- <p>For the financial year 2017, the contributions are set to yearly amounts of:
- <table>
- <tr>
- <td>(Inter)national funding agency:</td><td> </td>
- <td>size-dependent tailored agreement</td>
- </tr>
- <tr>
- <td>University/library:</td><td> </td>
- <td>€1000 (base; more is greatly appreciated)</td>
- </tr>
- <tr>
- <td>National consortium of universities/libraries:</td><td> </td>
- <td>10% bulk discount on the above<br/>(e.g. €3600 for 4 universities)</td>
- </tr>
- <tr>
- <td>Foundations/benefactors:</td><td> </td>
- <td>(Partner-set amount of at least €500)</td>
- </tr>
- </table>
-
- <p>Note that if the consortium itself is not a legal entity, each individual member must sign a separate Agreement.</p>
- <p>All amounts are exclusive of VAT, which will be payable by the Partner where applicable.</p>
-
- <p><strong>Sustainability - </strong> This norm allows sustainable functioning of SciPost under the expectation that individual institutions be associated to between two and three full publications per year on average (computed using authorship fractions). A Partner who is associated to more authorships and/or who generally recognizes the value of SciPost’s activities, is of course welcome to contribute more.</p>
- <p><strong>Donations - </strong>Contributions of less than €500 per year are treated as incidental donations and do not lead to the obtention of Partner benefits.</p>
- <p>Note that SciPost has been designated as a Public Benefit Organisation (PBO; in Dutch: Algemeen Nut Beogende Instelling, ANBI) by the Dutch Tax Administration. Natural and legal persons making donations to a PBO may deduct their gifts from their Dutch income tax or corporate income tax (see the PBO page of the Dutch Tax Administration).</p>
-
- <h3>Activation procedure</h3>
- <p>In order to become a Supporting Partner, one must:
- <ul>
- <li>Fill in the online <a href="{% url 'partners:membership_request' %}">membership request form</a> (the form must be filled in by an employee or associate of the prospective Partner acting as an authorized agent for the latter; personal contact details of this person will be treated confidentially).</li>
- <li>Wait for the email response from the SciPost administration, containing a Partnership Agreement offer including suggested detailed terms (start date, duration, financial contribution).</li>
- <li>After all detailed terms have been agreed upon, email a scan of the signed copy of the Partnership Agreement to SciPost.</li>
- <li>Proceed with the payment of the financial contribution, following invoicing from the SciPost Foundation.</li>
- </ul>
- </p>
-
- </div>
-</div>
-
-{% if current_agreements %}
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">Partners</h1>
- <ul class="list-unstyled mb-5">
- {% for agreement in current_agreements %}
- <li class="media mb-2">
- <img class="d-flex mr-3 {{ agreement.partner.organization.css_class }}" width="192" src="{% if agreement.partner.organization.logo %}{{agreement.partner.organization.logo.url}}{% endif %}" alt="Partner Logo">
- <div class="media-body">
- <p>
- <strong>{{ agreement.partner.organization.name }}</strong><br>
- {{ agreement.partner.organization.get_country_display }}
- </p>
- </div>
- </li>
- {% endfor %}
- </ul>
- </div>
-</div>
-{% endif %}
-
-{% if perms.scipost.can_manage_SPB %}
-{% if prospective_partners %}
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">Prospective Partners</h1>
- <ul>
- {% for agreement in prospective_agreements %}
- <li>{{ agreement }}</li>
- {% endfor %}
- </ul>
- </div>
-</div>
-{% endif %}
-{% endif %}
-
-{% endblock %}
diff --git a/partners/templatetags/partners_extras.py b/partners/templatetags/partners_extras.py
deleted file mode 100644
index 9930859ca9a4d5905beb374c4fe2311b8b9ac07c..0000000000000000000000000000000000000000
--- a/partners/templatetags/partners_extras.py
+++ /dev/null
@@ -1,40 +0,0 @@
-__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
-__license__ = "AGPL v3"
-
-
-from django import template
-
-from ..constants import PROSPECTIVE_PARTNER_REQUESTED,\
- PROSPECTIVE_PARTNER_ADDED,\
- PROSPECTIVE_PARTNER_APPROACHED,\
- PROSPECTIVE_PARTNER_NEGOTIATING,\
- PROSPECTIVE_PARTNER_UNINTERESTED,\
- PROSPECTIVE_PARTNER_PROCESSED,\
- PROSPECTIVE_PARTNER_FOLLOWED_UP
-
-register = template.Library()
-
-
-@register.filter(name='partnerstatuscolor')
-def partnerstatuscolor(status):
- color = '#333333'
- if status == PROSPECTIVE_PARTNER_REQUESTED:
- color = '#3399ff'
- elif status == PROSPECTIVE_PARTNER_ADDED:
- color = '#6699cc'
- elif status == PROSPECTIVE_PARTNER_APPROACHED:
- color = '#ffcc33'
- elif status == PROSPECTIVE_PARTNER_NEGOTIATING:
- color = '#ff8c00'
- elif status == PROSPECTIVE_PARTNER_UNINTERESTED:
- color = '#ee0000'
- elif status == PROSPECTIVE_PARTNER_PROCESSED:
- color = '#32cd32'
- elif status == PROSPECTIVE_PARTNER_FOLLOWED_UP:
- color = '#d2e3f6'
- return color
-
-
-@register.filter(name='pubfractions_in_year')
-def pubfractions_in_year(org, year):
- return org.pubfractions_in_year(int(year))
diff --git a/partners/tests.py b/partners/tests.py
deleted file mode 100644
index ddef03c4df91383dfce15a034976e3a469d77d70..0000000000000000000000000000000000000000
--- a/partners/tests.py
+++ /dev/null
@@ -1,7 +0,0 @@
-__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
-__license__ = "AGPL v3"
-
-
-from django.test import TestCase
-
-# Create your tests here.
diff --git a/partners/urls.py b/partners/urls.py
deleted file mode 100644
index 94c869e7a0a335d4da93ab8b5882e033667882b0..0000000000000000000000000000000000000000
--- a/partners/urls.py
+++ /dev/null
@@ -1,51 +0,0 @@
-__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
-__license__ = "AGPL v3"
-
-
-from django.conf.urls import url
-
-from . import views
-
-urlpatterns = [
- url(r'^$', views.supporting_partners, name='partners'),
- url(r'^dashboard$', views.dashboard, name='dashboard'),
- url(r'^membership_request$', views.membership_request, name='membership_request'),
- url(r'^process_contact_requests$', views.process_contact_requests, name='process_contact_requests'),
-
- # Prospects
- url(r'^prospects/add$', views.add_prospective_partner,
- name='add_prospective_partner'),
- url(r'^prospects/contacts/(?P<contact_id>[0-9]+)/email$',
- views.email_prospartner_contact, name='email_prospartner_contact'),
- url(r'^prospects/contacts/(?P<contact_id>[0-9]+)/email/(?P<mail>followup)$',
- views.email_prospartner_contact, name='email_prospartner_contact'),
-
- url(r'^prospects/(?P<prospartner_id>[0-9]+)/contacts/add$',
- views.add_prospartner_contact, name='add_prospartner_contact'),
- url(r'^prospects/(?P<prospartner_id>[0-9]+)/promote$',
- views.promote_prospartner, name='promote_prospartner'),
- url(r'^prospects/(?P<prospartner_id>[0-9]+)/email_generic$',
- views.email_prospartner_generic, name='email_prospartner_generic'),
- url(r'^prospects/(?P<prospartner_id>[0-9]+)/email_generic/(?P<mail>followup)$',
- views.email_prospartner_generic, name='email_prospartner_generic'),
- url(r'^prospects/(?P<prospartner_id>[0-9]+)/events/add$',
- views.add_prospartner_event, name='add_prospartner_event'),
-
- # Agreements
- url(r'agreements/new$', views.add_agreement, name='add_agreement'),
- url(r'agreements/(?P<agreement_id>[0-9]+)$', views.agreement_details,
- name='agreement_details'),
- url(r'agreements/(?P<agreement_id>[0-9]+)/attachments/(?P<attachment_id>[0-9]+)$',
- views.agreement_attachments, name='agreement_attachments'),
-
- # Users
- url(r'activate/(?P<activation_key>.+)$', views.activate_account, name='activate_account'),
-
- # Partners
- url(r'(?P<partner_id>[0-9]+)$', views.partner_view, name='partner_view'),
- url(r'(?P<partner_id>[0-9]+)/edit$', views.partner_edit, name='partner_edit'),
- url(r'(?P<partner_id>[0-9]+)/contacts/add$', views.partner_add_contact,
- name='partner_add_contact'),
- url(r'(?P<partner_id>[0-9]+)/contacts/request$', views.partner_request_contact,
- name='partner_request_contact'),
-]
diff --git a/partners/utils.py b/partners/utils.py
deleted file mode 100644
index 3bd7302312ef8a6da5c41f675cb689c4adc8cd91..0000000000000000000000000000000000000000
--- a/partners/utils.py
+++ /dev/null
@@ -1,23 +0,0 @@
-__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
-__license__ = "AGPL v3"
-
-
-from common.utils import BaseMailUtil
-
-
-class PartnerUtils(BaseMailUtil):
- mail_sender = 'partners@scipost.org'
- mail_sender_title = 'SciPost Supporting Partners'
-
-
- @classmethod
- def email_contact_new_for_activation(cls, current_user):
- """
- Email a generic address for a Contact.
-
- current_contact -- Contact object of the User who activated/created the new Contact object.
- """
- cls._send_mail(cls, 'email_contact_new_for_activation',
- [cls._context['contact'].user.email],
- 'Welcome to the SciPost Supporting Partner Board',
- extra_context={'sent_by': current_user})
diff --git a/partners/views.py b/partners/views.py
deleted file mode 100644
index 681490166f35a05449903175ffd39bbdb3bc796c..0000000000000000000000000000000000000000
--- a/partners/views.py
+++ /dev/null
@@ -1,434 +0,0 @@
-__copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
-__license__ = "AGPL v3"
-
-
-import mimetypes
-
-from django.contrib import messages
-from django.contrib.auth.decorators import login_required
-from django.core.urlresolvers import reverse_lazy
-from django.db import transaction
-from django.db.models import F
-from django.forms import modelformset_factory
-from django.http import HttpResponse
-from django.shortcuts import get_object_or_404, render, reverse, redirect
-from django.utils import timezone
-from django.views.generic.detail import DetailView
-from django.views.generic.edit import CreateView, UpdateView, DeleteView
-from django.views.generic.list import ListView
-
-from guardian.decorators import permission_required
-
-from mails.views import MailEditingSubView
-
-from .constants import PROSPECTIVE_PARTNER_REQUESTED,\
- PROSPECTIVE_PARTNER_APPROACHED, PROSPECTIVE_PARTNER_ADDED,\
- PROSPECTIVE_PARTNER_EVENT_REQUESTED, PROSPECTIVE_PARTNER_EVENT_EMAIL_SENT,\
- PROSPECTIVE_PARTNER_FOLLOWED_UP
-from .models import Partner, ProspectivePartner, ProspectiveContact, ContactRequest,\
- ProspectivePartnerEvent, MembershipAgreement, Contact, PartnersAttachment
-from .forms import ProspectivePartnerForm, ProspectiveContactForm,\
- PromoteToPartnerForm,\
- ProspectivePartnerEventForm, MembershipQueryForm,\
- PartnerForm, ContactForm, ContactFormset, ContactModelFormset,\
- NewContactForm, ActivationForm, PartnerEventForm,\
- MembershipAgreementForm, RequestContactForm, RequestContactFormSet,\
- ProcessRequestContactForm, PartnersAttachmentFormSet, PartnersAttachmentForm
-
-
-from funders.models import Funder
-
-from journals.models import Publication
-
-from scipost.mixins import PermissionsMixin
-
-
-
-def supporting_partners(request):
- current_agreements = MembershipAgreement.objects.now_active()
- context = {
- 'current_agreements': current_agreements
- }
- if request.user.groups.filter(name='Editorial Administrators').exists():
- # Show Agreements to Administrators only!
- prospective_agreements = MembershipAgreement.objects.submitted().order_by('date_requested')
- context['prospective_partners'] = prospective_agreements
- return render(request, 'partners/supporting_partners.html', context)
-
-
-@login_required
-@permission_required('scipost.can_read_partner_page', return_403=True)
-def dashboard(request):
- """Administration page for Partners and Prospective Partners.
-
- This page is meant as a personal page for Partners, where they will for example be able
- to read their personal data and agreements.
- """
- context = {}
- try:
- context['personal_agreements'] = (MembershipAgreement.objects.open_to_partner()
- .filter(partner__contact=request.user.partner_contact))
- except Contact.DoesNotExist:
- pass
-
- if request.user.has_perm('scipost.can_manage_SPB'):
- context['contact_requests_count'] = ContactRequest.objects.awaiting_processing().count()
- context['inactivate_contacts_count'] = Contact.objects.filter(user__is_active=False).count()
- context['partners'] = Partner.objects.all()
- context['prospective_partners'] = ProspectivePartner.objects.order_by(
- 'country', 'institution_name')
- context['ppevent_form'] = ProspectivePartnerEventForm()
- context['agreements'] = MembershipAgreement.objects.order_by('date_requested')
- return render(request, 'partners/dashboard.html', context)
-
-
-@transaction.atomic
-def membership_request(request):
- query_form = MembershipQueryForm(request.POST or None)
- if query_form.is_valid():
- prospartner = ProspectivePartner(
- kind=query_form.cleaned_data['partner_kind'],
- institution_name=query_form.cleaned_data['institution_name'],
- country=query_form.cleaned_data['country'],
- date_received=timezone.now(),
- status=PROSPECTIVE_PARTNER_REQUESTED,
- )
- prospartner.save()
- contact = ProspectiveContact(
- prospartner=prospartner,
- title=query_form.cleaned_data['title'],
- first_name=query_form.cleaned_data['first_name'],
- last_name=query_form.cleaned_data['last_name'],
- email=query_form.cleaned_data['email'],
- )
- contact.save()
- prospartnerevent = ProspectivePartnerEvent(
- prospartner=prospartner,
- event=PROSPECTIVE_PARTNER_EVENT_REQUESTED)
- prospartnerevent.save()
- ack_message = ('Thank you for your SPB Membership query. '
- 'We will get back to you in the very near future '
- 'with further details.')
- context = {'ack_message': ack_message}
- return render(request, 'scipost/acknowledgement.html', context)
- context = {'query_form': query_form}
- return render(request, 'partners/membership_request.html', context)
-
-
-@permission_required('scipost.can_manage_organizations', return_403=True)
-@transaction.atomic
-def promote_prospartner(request, prospartner_id):
- prospartner = get_object_or_404(ProspectivePartner.objects.not_yet_partner(),
- pk=prospartner_id)
- form = PromoteToPartnerForm(request.POST or None, instance=prospartner)
- contact_formset = ContactModelFormset(request.POST or None,
- queryset=prospartner.prospective_contacts.all())
- if form.is_valid() and contact_formset.is_valid():
- partner = form.promote_to_partner(request.user)
- contacts = contact_formset.promote_contacts(partner, request.user)
- messages.success(request, ('<h3>Upgraded Partner %s</h3>'
- '%i contacts have received a validation mail.') %
- (str(partner), len(contacts)))
- return redirect(reverse('partners:dashboard'))
- context = {'form': form, 'contact_formset': contact_formset}
- return render(request, 'partners/promote_prospartner.html', context)
-
-
-###############
-# Partner views
-###############
-@permission_required('scipost.can_view_own_partner_details', return_403=True)
-def partner_view(request, partner_id):
- partner = get_object_or_404(Partner.objects.my_partners(request.user), id=partner_id)
- form = PartnerEventForm(request.POST or None)
- if form.is_valid():
- event = form.save(commit=False)
- event.partner = partner
- event.noted_by = request.user
- event.save()
- messages.success(request, 'Added a new event to Partner.')
- return redirect(partner.get_absolute_url())
- context = {
- 'partner': partner,
- 'form': form
- }
- return render(request, 'partners/partners_detail.html', context)
-
-
-@permission_required('scipost.can_manage_SPB', return_403=True)
-@transaction.atomic
-def partner_edit(request, partner_id):
- partner = get_object_or_404(Partner, id=partner_id)
-
- # Start/fill forms
- form = PartnerForm(request.POST or None, instance=partner)
- ContactModelFormset = modelformset_factory(Contact, ContactForm, can_delete=True, extra=0,
- formset=ContactFormset)
- contact_formset = ContactModelFormset(request.POST or None, partner=partner,
- queryset=partner.contact_set.all())
-
- # Validate forms for POST request
- if form.is_valid() and contact_formset.is_valid():
- form.save()
- contact_formset.save()
- messages.success(request, 'Partner saved')
- return redirect(reverse('partners:partner_view', args=(partner.id,)))
- context = {
- 'form': form,
- 'contact_formset': contact_formset
- }
- return render(request, 'partners/partner_edit.html', context)
-
-
-@permission_required('scipost.can_manage_SPB', return_403=True)
-def partner_add_contact(request, partner_id):
- partner = get_object_or_404(Partner, id=partner_id)
- form = NewContactForm(request.POST or None, partner=partner)
- if form.is_valid():
- contact = form.save(current_user=request.user)
- messages.success(request, '<h3>Created contact: %s</h3>Email has been sent.'
- % str(contact))
- return redirect(reverse('partners:dashboard'))
- context = {
- 'partner': partner,
- 'form': form
- }
- return render(request, 'partners/partner_add_contact.html', context)
-
-
-@permission_required('scipost.can_view_own_partner_details', return_403=True)
-def partner_request_contact(request, partner_id):
- partner = get_object_or_404(Partner.objects.my_partners(request.user), id=partner_id)
- form = RequestContactForm(request.POST or None)
- if form.is_valid():
- contact_request = form.save(commit=False)
- contact_request.partner = partner
- contact_request.save()
- messages.success(request, ('<h3>Request sent</h3>'
- 'We will process your request as soon as possible.'))
- return redirect(partner.get_absolute_url())
- context = {
- 'partner': partner,
- 'form': form
- }
- return render(request, 'partners/partner_request_contact.html', context)
-
-
-@permission_required('scipost.can_manage_SPB', return_403=True)
-def process_contact_requests(request):
- form = RequestContactForm(request.POST or None)
-
- RequestContactModelFormSet = modelformset_factory(ContactRequest, ProcessRequestContactForm,
- formset=RequestContactFormSet, extra=0)
- formset = RequestContactModelFormSet(request.POST or None,
- queryset=ContactRequest.objects.awaiting_processing())
- if formset.is_valid():
- formset.process_requests(current_user=request.user)
- messages.success(request, 'Processing completed')
- return redirect(reverse('partners:process_contact_requests'))
- context = {
- 'form': form,
- 'formset': formset
- }
- return render(request, 'partners/process_contact_requests.html', context)
-
-
-
-###########################
-# Prospective Partner Views
-###########################
-
-@permission_required('scipost.can_manage_SPB', return_403=True)
-def add_prospective_partner(request):
- form = ProspectivePartnerForm(request.POST or None)
- if form.is_valid():
- pp = form.save()
- messages.success(request, 'Prospective Partner successfully added')
- return redirect(reverse('partners:add_prospartner_contact',
- kwargs={'prospartner_id': pp.id}))
- context = {'form': form}
- return render(request, 'partners/add_prospective_partner.html', context)
-
-
-@permission_required('scipost.can_manage_SPB', return_403=True)
-def add_prospartner_contact(request, prospartner_id):
- prospartner = get_object_or_404(ProspectivePartner, pk=prospartner_id)
- form = ProspectiveContactForm(request.POST or None, initial={'prospartner': prospartner})
- if form.is_valid():
- form.save()
- messages.success(request, 'Contact successfully added to Prospective Partner')
- return redirect(reverse('partners:dashboard'))
- context = {'form': form, 'prospartner': prospartner}
- return render(request, 'partners/add_prospartner_contact.html', context)
-
-
-@permission_required('scipost.can_email_prospartner_contact', return_403=True)
-@transaction.atomic
-def email_prospartner_contact(request, contact_id, mail=None):
- contact = get_object_or_404(ProspectiveContact, pk=contact_id)
-
- suffix = ''
- if mail == 'followup':
- code = 'partners_followup_mail'
- suffix = ' (followup)'
- new_status = PROSPECTIVE_PARTNER_FOLLOWED_UP
- else:
- code = 'partners_initial_mail'
- new_status = PROSPECTIVE_PARTNER_APPROACHED
- mail_request = MailEditingSubView(request, mail_code=code, contact=contact)
- if mail_request.is_valid():
- comments = 'Email{suffix} sent to {name}.'.format(suffix=suffix, name=contact)
- prospartnerevent = ProspectivePartnerEvent(
- prospartner=contact.prospartner,
- event=PROSPECTIVE_PARTNER_EVENT_EMAIL_SENT,
- comments=comments,
- noted_on=timezone.now(),
- noted_by=request.user.contributor)
- prospartnerevent.save()
- if contact.prospartner.status in [PROSPECTIVE_PARTNER_REQUESTED,
- PROSPECTIVE_PARTNER_ADDED,
- PROSPECTIVE_PARTNER_APPROACHED]:
- contact.prospartner.status = new_status
- contact.prospartner.save()
-
- messages.success(request, 'Email successfully sent.')
- mail_request.send()
- return redirect(reverse('partners:dashboard'))
- else:
- return mail_request.return_render()
-
-
-@permission_required('scipost.can_email_prospartner_contact', return_403=True)
-@transaction.atomic
-def email_prospartner_generic(request, prospartner_id, mail=None):
- prospartner = get_object_or_404(ProspectivePartner, pk=prospartner_id)
-
- suffix = ''
-
- if mail == 'followup':
- code = 'partners_followup_mail'
- suffix = ' (followup)'
- new_status = PROSPECTIVE_PARTNER_FOLLOWED_UP
- else:
- code = 'partners_initial_mail'
- new_status = PROSPECTIVE_PARTNER_APPROACHED
- mail_request = MailEditingSubView(request, mail_code=code)
- if mail_request.is_valid():
- comments = 'Email{suffix} sent to {name}.'.format(suffix=suffix,
- name=mail_request.recipients_string)
- prospartnerevent = ProspectivePartnerEvent(
- prospartner=prospartner,
- event=PROSPECTIVE_PARTNER_EVENT_EMAIL_SENT,
- comments=comments,
- noted_on=timezone.now(),
- noted_by=request.user.contributor)
- prospartnerevent.save()
- if prospartner.status in [PROSPECTIVE_PARTNER_REQUESTED,
- PROSPECTIVE_PARTNER_ADDED,
- PROSPECTIVE_PARTNER_APPROACHED]:
- prospartner.status = new_status
- prospartner.save()
-
- messages.success(request, 'Email successfully sent.')
- mail_request.send()
- return redirect(reverse('partners:dashboard'))
- else:
- return mail_request.return_render()
-
-
-@permission_required('scipost.can_manage_SPB', return_403=True)
-@transaction.atomic
-def add_prospartner_event(request, prospartner_id):
- prospartner = get_object_or_404(ProspectivePartner, pk=prospartner_id)
- if request.method == 'POST':
- ppevent_form = ProspectivePartnerEventForm(request.POST)
- if ppevent_form.is_valid():
- ppevent = ppevent_form.save(commit=False)
- ppevent.prospartner = prospartner
- ppevent.noted_by = request.user.contributor
- ppevent.save()
- prospartner.update_status_from_event(ppevent.event)
- prospartner.save()
- return redirect(reverse('partners:dashboard'))
- else:
- errormessage = 'The form was invalidly filled.'
- return render(request, 'scipost/error.html', {'errormessage': errormessage})
- errormessage = 'This view can only be posted to.'
- return render(request, 'scipost/error.html', {'errormessage': errormessage})
-
-
-############
-# Agreements
-############
-@permission_required('scipost.can_manage_SPB', return_403=True)
-def add_agreement(request):
- form = MembershipAgreementForm(request.POST or None, initial=request.GET)
- if request.POST and form.is_valid():
- agreement = form.save(request.user)
- messages.success(request, 'Membership Agreement created.')
- return redirect(agreement.get_absolute_url())
- context = {
- 'form': form
- }
- return render(request, 'partners/agreements_add.html', context)
-
-
-@permission_required('scipost.can_view_own_partner_details', return_403=True)
-def agreement_details(request, agreement_id):
- agreement = get_object_or_404(MembershipAgreement, id=agreement_id)
- context = {}
-
- if request.user.has_perm('scipost.can_manage_SPB'):
- form = MembershipAgreementForm(request.POST or None, instance=agreement)
- PartnersAttachmentFormSet
-
- PartnersAttachmentFormset = modelformset_factory(PartnersAttachment,
- PartnersAttachmentForm,
- formset=PartnersAttachmentFormSet)
- attachment_formset = PartnersAttachmentFormset(request.POST or None, request.FILES or None,
- queryset=agreement.attachments.all())
-
- context['form'] = form
- context['attachment_formset'] = attachment_formset
- if form.is_valid() and attachment_formset.is_valid():
- agreement = form.save(request.user)
- attachment_formset.save(agreement)
- messages.success(request, 'Membership Agreement updated.')
- return redirect(agreement.get_absolute_url())
-
- context['agreement'] = agreement
- return render(request, 'partners/agreements_details.html', context)
-
-
-@permission_required('scipost.can_view_own_partner_details', return_403=True)
-def agreement_attachments(request, agreement_id, attachment_id):
- attachment = get_object_or_404(PartnersAttachment.objects.my_attachments(request.user),
- agreement__id=agreement_id, id=attachment_id)
-
- content_type, encoding = mimetypes.guess_type(attachment.attachment.path)
- content_type = content_type or 'application/octet-stream'
- response = HttpResponse(attachment.attachment.read(), content_type=content_type)
- response["Content-Encoding"] = encoding
- response['Content-Disposition'] = ('filename=%s' % attachment.name)
- return response
-
-
-#########
-# Account
-#########
-def activate_account(request, activation_key):
- contact = get_object_or_404(Contact, user__is_active=False,
- activation_key=activation_key,
- user__email__icontains=request.GET.get('email', None))
-
- # TODO: Key Expires fallback
- form = ActivationForm(request.POST or None, instance=contact.user)
- if form.is_valid():
- form.activate_user()
- messages.success(request, '<h3>Thank you for registration</h3>')
- return redirect(reverse('partners:dashboard'))
- context = {
- 'contact': contact,
- 'form': form
- }
- return render(request, 'partners/activate_account.html', context)
diff --git a/petitions/migrations/0003_petitionsignatory_organization.py b/petitions/migrations/0003_petitionsignatory_organization.py
index 8d4826b40d279bed643bbf05024e1620e5b5d46c..62cdbc988189ea66638d1408747a004ba7e0adcf 100644
--- a/petitions/migrations/0003_petitionsignatory_organization.py
+++ b/petitions/migrations/0003_petitionsignatory_organization.py
@@ -9,14 +9,14 @@ import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
- ('partners', '0013_auto_20180715_0938'),
+ # ('partners', '0013_auto_20180715_0938'),
('petitions', '0002_auto_20171229_1435'),
]
operations = [
- migrations.AddField(
- model_name='petitionsignatory',
- name='organization',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='petition_signatories', to='partners.Organization'),
- ),
+ # migrations.AddField(
+ # model_name='petitionsignatory',
+ # name='organization',
+ # field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='petition_signatories', to='partners.Organization'),
+ # ),
]
diff --git a/petitions/migrations/0004_auto_20180922_1357.py b/petitions/migrations/0004_auto_20180922_1357.py
index ce83b0307c402f4cb63a37af9602a5ef527b4e0e..126354fb3f16a41c7bec6c87699457c1d2e8dec2 100644
--- a/petitions/migrations/0004_auto_20180922_1357.py
+++ b/petitions/migrations/0004_auto_20180922_1357.py
@@ -12,9 +12,9 @@ class Migration(migrations.Migration):
]
operations = [
- migrations.RenameField(
- model_name='petitionsignatory',
- old_name='organization',
- new_name='organization_tbd',
- ),
+ # migrations.RenameField(
+ # model_name='petitionsignatory',
+ # old_name='organization',
+ # new_name='organization_tbd',
+ # ),
]
diff --git a/petitions/migrations/0007_remove_petitionsignatory_organization_tbd.py b/petitions/migrations/0007_remove_petitionsignatory_organization_tbd.py
index 729a0fd107e6fd738a8a565141b1bc0f9558d195..9594860d62cee836fd1244d020dee13d6a9b28b7 100644
--- a/petitions/migrations/0007_remove_petitionsignatory_organization_tbd.py
+++ b/petitions/migrations/0007_remove_petitionsignatory_organization_tbd.py
@@ -12,8 +12,8 @@ class Migration(migrations.Migration):
]
operations = [
- migrations.RemoveField(
- model_name='petitionsignatory',
- name='organization_tbd',
- ),
+ # migrations.RemoveField(
+ # model_name='petitionsignatory',
+ # name='organization_tbd',
+ # ),
]
diff --git a/petitions/migrations/0008_auto_20180922_1432.py b/petitions/migrations/0008_auto_20180922_1432.py
index fbf3c1158d1b6e794144172763359b097d28cd43..c074f66fb67f9fce77db2167be247c44a37c782a 100644
--- a/petitions/migrations/0008_auto_20180922_1432.py
+++ b/petitions/migrations/0008_auto_20180922_1432.py
@@ -8,7 +8,7 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
- ('partners', '0017_auto_20180922_1603'),
+ # ('partners', '0017_auto_20180922_1603'),
('petitions', '0007_remove_petitionsignatory_organization_tbd'),
]
diff --git a/proceedings/templates/proceedings/proceedings_details.html b/proceedings/templates/proceedings/proceedings_details.html
index 546baa99be4fcf2054615eff715a66d6b362523d..323999529b57adfbb3f56ae54577557e26372450 100644
--- a/proceedings/templates/proceedings/proceedings_details.html
+++ b/proceedings/templates/proceedings/proceedings_details.html
@@ -16,13 +16,18 @@
{% include 'partials/proceedings/summary.html' with proceedings=proceedings %}
-{% comment %}
- <form method="post" action="{% url 'colleges:fellowship_terminate' fellowship.id %}" class="d-inline">
- {% csrf_token %}
- <button type="submit" class="btn btn-danger">Terminate Fellowship</button>
- </form>
- <a href="{% url 'colleges:fellowship_edit' fellowship.id %}" class="btn btn-info ml-2">Edit Fellowship</a>
- {% endcomment %}
+ {% comment %}
+ <form method="post" action="{% url 'colleges:fellowship_terminate' fellowship.id %}" class="d-inline">
+ {% csrf_token %}
+ <button type="submit" class="btn btn-danger">Terminate Fellowship</button>
+ </form>
+ <a href="{% url 'colleges:fellowship_edit' fellowship.id %}" class="btn btn-info ml-2">Edit Fellowship</a>
+ {% endcomment %}
+
+ <h3>Table of contents</h3>
+ <p>
+ View the table of contents in <a href="javascript:;" data-toggle="modal" data-target="#textocmodal">TeX format</a>
+ </p>
<h3 class="mt-3">All Guest Fellowships of this Proceedings</h3>
@@ -60,6 +65,7 @@
</table>
<h3>All Submissions for this Proceedings Issue</h3>
+
<table class="table table-hover">
<thead>
<tr>
@@ -82,4 +88,23 @@
</tbody>
</table>
+
+
+<div class="modal" id="textocmodal" tabindex="-1" role="dialog" aria-hidden="true" aria-labelledby="textocmodal">
+ <div class="modal-dialog modal-lg" role="document">
+ <div class="modal-content">
+ <div class="modal-body">
+ <div class="pb-4">
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+ <span aria-hidden="true">×</span>
+ </button>
+ </div>
+ <div>{% include 'proceedings/proceedings_toc.html' with proceedings=proceedings %}</div>
+ </div>
+ </div>
+ </div>
+</div>
+
+
+
{% endblock %}
diff --git a/proceedings/templates/proceedings/proceedings_toc.html b/proceedings/templates/proceedings/proceedings_toc.html
new file mode 100644
index 0000000000000000000000000000000000000000..549ac55859bfe7176e4804ea6d9affdf4c8f2355
--- /dev/null
+++ b/proceedings/templates/proceedings/proceedings_toc.html
@@ -0,0 +1,8 @@
+<pre>
+\begin{tabular}{l r}
+{% for pub in proceedings.issue.publications.all|dictsort:"paper_nr" %}
+{{ pub.title }} & {{ pub.paper_nr }} \\
+\textit{by {{ pub.author_list }} } \\ \\
+{% endfor %}
+\end{tabular}
+</pre>
diff --git a/production/templates/production/base.html b/production/templates/production/base.html
index a5e8b2070f5f6e6e3743f3ef0e3ba696c4172cfa..ca23a80a9318602f0c6d95dbddb1e11607b7d0c6 100644
--- a/production/templates/production/base.html
+++ b/production/templates/production/base.html
@@ -1,9 +1,11 @@
{% extends 'scipost/base.html' %}
+{% block container_class %}{{block.super}} pb-5{% endblock container_class %}
+
{% block breadcrumb %}
- <div class="container-outside header">
+ <div class="breadcrumb-container">
<div class="container">
- <nav class="breadcrumb hidden-sm-down">
+ <nav class="breadcrumb">
{% block breadcrumb_items %}
<a href="{% url 'production:production' %}" class="breadcrumb-item">Production page</a>
{% endblock %}
@@ -11,5 +13,3 @@
</div>
</div>
{% endblock %}
-
-{% block container_class %}{{block.super}} pb-5{% endblock container_class %}
diff --git a/profiles/templates/profiles/profile_form.html b/profiles/templates/profiles/profile_form.html
index b5e021cfcd8da36d25df6b56fd5325c926068176..3f0bd456bd6cdc7b5d380b9be7e46dce28030c32 100644
--- a/profiles/templates/profiles/profile_form.html
+++ b/profiles/templates/profiles/profile_form.html
@@ -16,7 +16,7 @@
<h4>Matching profiles found for this {{ from_type }}</h4>
<ul>
{% for matching_profile in matching_profiles %}
- <li>{{ matching_profile }} (id {{ matching_profile.id }}, {{ matching_profile.email }}) <a href="{% url 'profiles:profile_match' profile_id=matching_profile.id from_type=from_type pk=pk %}"><i class="fa fa-arrow-right"></i> Match this {{ from_type }} to this Profile</a>
+ <li><a href="{{ matching_profile.get_absolute_url }}" target="_blank">{{ matching_profile }}</a> (id {{ matching_profile.id }}, {{ matching_profile.email }}) <a href="{% url 'profiles:profile_match' profile_id=matching_profile.id from_type=from_type pk=pk %}"><i class="fa fa-arrow-right"></i> Match this {{ from_type }} to this Profile</a>
</li>
{% endfor %}
</ul>
diff --git a/requirements.txt b/requirements.txt
index afc7a6dbd63ce9627f2dd28bcb7887d4dfe8a5ab..ac91ae8017bc6b275489df1ee254ba3b972cac05 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ requests==2.18.3
# Django packages
django_ajax_selects==1.6
-django-countries==4.6.1
+django-countries==5.3.3
django-debug-toolbar==1.8
django-extensions==1.7.6
django-filter==1.0.4
diff --git a/scipost/admin.py b/scipost/admin.py
index 68435d47199dfc51210a290305d02703b8902eb7..cb6898e0c3464568292cf1bf6d33d3fef30d7f44 100644
--- a/scipost/admin.py
+++ b/scipost/admin.py
@@ -12,7 +12,7 @@ from scipost.models import Contributor, Remark,\
AuthorshipClaim, PrecookedEmail,\
EditorialCollege, EditorialCollegeFellowship, UnavailabilityPeriod
-from partners.admin import ContactToUserInline
+from organizations.admin import ContactInline
from production.admin import ProductionUserInline
from submissions.models import Submission
@@ -38,7 +38,7 @@ class ContributorInline(admin.StackedInline):
class UserAdmin(UserAdmin):
inlines = [
ContributorInline,
- ContactToUserInline,
+ ContactInline,
ProductionUserInline
]
list_display = ['username', 'email', 'first_name', 'last_name',
diff --git a/scipost/forms.py b/scipost/forms.py
index 2ef9c84f4b6547b5552bb3fea9f2e24c59d9c2a6..5dc69b01e659a18d5f815a072fd0448233a6d9b2 100644
--- a/scipost/forms.py
+++ b/scipost/forms.py
@@ -34,7 +34,7 @@ from .models import Contributor, DraftInvitation, UnavailabilityPeriod, \
from affiliations.models import Affiliation, Institution
from common.forms import MonthYearWidget, ModelChoiceFieldwithid
-from partners.decorators import has_contact
+from organizations.decorators import has_contact
from colleges.models import Fellowship, PotentialFellowshipEvent
from commentaries.models import Commentary
@@ -343,7 +343,7 @@ class AuthenticationForm(forms.Form):
if has_contributor(request.user):
return reverse_lazy('scipost:personal_page')
elif has_contact(request.user):
- return reverse_lazy('partners:dashboard')
+ return reverse_lazy('organizations:dashboard')
else:
return reverse_lazy('scipost:index')
return redirect_to
diff --git a/scipost/management/commands/add_groups_and_permissions.py b/scipost/management/commands/add_groups_and_permissions.py
index 901687f2afd869c2f3fb4d36dab65d80b0c598fe..0fb5363de4886d9e2f41ac04bd00d484cf31636a 100644
--- a/scipost/management/commands/add_groups_and_permissions.py
+++ b/scipost/management/commands/add_groups_and_permissions.py
@@ -7,7 +7,6 @@ from django.core.management.base import BaseCommand
from django.contrib.auth.models import Group, Permission
from django.contrib.contenttypes.models import ContentType
-from partners.models import Contact
from scipost.models import Contributor, DraftInvitation
from submissions.models import Report
@@ -34,37 +33,24 @@ class Command(BaseCommand):
ProductionSupervisors, created = Group.objects.get_or_create(name='Production Supervisor')
ProductionOfficers, created = Group.objects.get_or_create(name='Production Officers')
- PartnersAdmin, created = Group.objects.get_or_create(name='Partners Administrators')
- PartnersOfficers, created = Group.objects.get_or_create(name='Partners Officers')
- PartnerAccounts, created = Group.objects.get_or_create(name='Partners Accounts')
+ OrgContacts, created = Group.objects.get_or_create(name='Organization Contacts')
+
# Create Permissions
content_type = ContentType.objects.get_for_model(Contributor)
- # Supporting Partners
+ # Organizations
can_manage_organizations, created = Permission.objects.get_or_create(
codename='can_manage_organizations',
name='Can manage Organizations',
content_type=content_type)
- can_manage_SPB, created = Permission.objects.get_or_create(
- codename='can_manage_SPB',
- name='Can manage Supporting Partners Board',
- content_type=content_type)
- can_email_prospartner_contact, created = Permission.objects.get_or_create(
- codename='can_email_prospartner_contact',
- name='Can email Prospective Partner Contact',
- content_type=content_type)
- can_read_partner_page, created = Permission.objects.get_or_create(
- codename='can_read_partner_page',
- name='Can read Prospective Partner personal page',
- content_type=content_type)
- can_view_partners, created = Permission.objects.get_or_create(
- codename='can_view_partners',
- name='Can view Partner details of all Partners',
+ can_add_contactperson, created = Permission.objects.get_or_create(
+ codename='can_add_contactperson',
+ name='Can add ContactPerson',
content_type=content_type)
- can_view_own_partner_details, created = Permission.objects.get_or_create(
- codename='can_view_own_partner_details',
- name='Can view (its own) partner details',
+ can_view_contactrole_list, created = Permission.objects.get_or_create(
+ codename='can_view_contactrole_list',
+ name='Can view ContactRole list',
content_type=content_type)
# Registration and invitations
@@ -362,11 +348,13 @@ class Command(BaseCommand):
can_create_profiles,
can_view_profiles,
can_manage_ontology,
+ can_manage_organizations,
can_view_potentialfellowship_list,
can_add_potentialfellowship,
])
FinancialAdmin.permissions.set([
+ can_manage_organizations,
can_manage_subsidies,
can_view_timesheets,
])
@@ -409,6 +397,7 @@ class Command(BaseCommand):
can_create_profiles,
can_view_profiles,
can_manage_ontology,
+ can_manage_organizations,
can_view_potentialfellowship_list,
can_add_potentialfellowship,
])
@@ -474,26 +463,10 @@ class Command(BaseCommand):
can_upload_proofs,
])
- PartnersAdmin.permissions.set([
- can_manage_organizations,
- can_read_partner_page,
- can_view_own_partner_details,
- can_manage_SPB,
- can_email_prospartner_contact,
- can_view_partners,
- ])
-
- PartnersOfficers.permissions.set([
- can_read_partner_page,
- can_view_own_partner_details,
- can_manage_SPB,
- can_view_partners,
- ])
-
- PartnerAccounts.permissions.set([
- can_read_partner_page,
- can_view_own_partner_details,
- ])
+ OrgContacts.permissions.set([
+ can_add_contactperson,
+ can_view_contactrole_list,
+ ])
if verbose:
self.stdout.write(self.style.SUCCESS('Successfully created groups and permissions.'))
diff --git a/scipost/managers.py b/scipost/managers.py
index 82aec61e35eb42dac89bb7a16948175fbfbd6c35..8fe31e821eacc7ed6574fad3811bafdfbdb38ba6 100644
--- a/scipost/managers.py
+++ b/scipost/managers.py
@@ -31,6 +31,12 @@ class ContributorQuerySet(models.QuerySet):
"""Return all validated and vetted Contributors."""
return self.filter(user__is_active=True, status=NORMAL_CONTRIBUTOR)
+ def nonduplicates(self):
+ """
+ Filter out duplicate Contributors.
+ """
+ return self.exclude(duplicate_of__isnull=False)
+
def available(self):
"""Filter out the Contributors that have active unavailability periods."""
today = timezone.now().date()
diff --git a/scipost/static/scipost/info/AnnualReports/AnnualReport_2018.pdf b/scipost/static/scipost/info/AnnualReports/AnnualReport_2018.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..106bcc8c7057dbbdf4c239615a0cfef62ea7d886
Binary files /dev/null and b/scipost/static/scipost/info/AnnualReports/AnnualReport_2018.pdf differ
diff --git a/scipost/storage.py b/scipost/storage.py
index c755aa8b4ddfecd7eb6f5faa467639b2d37496d8..d2f3e0dafc4889045ff19283f90a1f28c6bfe4ed 100644
--- a/scipost/storage.py
+++ b/scipost/storage.py
@@ -10,7 +10,7 @@ from django.utils.functional import cached_property
class SecureFileStorage(FileSystemStorage):
"""
Inherit default FileStorage system to prevent files from being publicly accessible
- from an server location that is permitted to be opened without explicit permissions.
+ from a server location that is opened without this permission having been explicitly given.
"""
@cached_property
def location(self):
diff --git a/scipost/templates/partials/scipost/notification_center_modal.html b/scipost/templates/partials/scipost/notification_center_modal.html
index 7b156971adfd0fbe4d360bfdd1a4f7b7b042e1bf..51d2561efad7e1e2eafe1c10d8f21f620cda4cba 100644
--- a/scipost/templates/partials/scipost/notification_center_modal.html
+++ b/scipost/templates/partials/scipost/notification_center_modal.html
@@ -17,9 +17,6 @@
<div class="modal-body pb-2">
<ul class="list-unstyled links mb-0">
<li><a class="item {% active 'scipost:personal_page' %}" href="{% url 'scipost:personal_page' %}">Personal Page</a></li>
- {% if user.partner_contact or perms.scipost.can_read_partner_page %}
- <li><a class="item {% active 'partners:dashboard' %}" href="{% url 'partners:dashboard' %}">Partner Page</a></li>
- {% endif %}
{% if perms.scipost.can_view_timesheets %}
<li><a class="item {% active 'finances:finances' %}" href="{% url 'finances:finances' %}">Financial Administration</a></li>
diff --git a/scipost/templates/scipost/FAQ.html b/scipost/templates/scipost/FAQ.html
index 7e848aaa378a400af53bab5d56a40aef7be01528..588c9ac75651558cc56579ec588b94b1693a0754 100644
--- a/scipost/templates/scipost/FAQ.html
+++ b/scipost/templates/scipost/FAQ.html
@@ -274,7 +274,7 @@ ucts_tools/multidisciplinary/esci/">ESCI</a> (part of Web of Science's Core Coll
</a>
<div id="scipost_fields" class="collapse" role="tabpanel">
<p>The initial rollout of SciPost offers a Physics portal.</p>
- <p>Portals in other disciplines will be opened if the SciPost model proves to be successful, and when a sufficient number of <a href="{% url 'partners:partners' %}">Supporting Partners</a> have been signed up.</p>
+ <p>Portals in other disciplines will be opened if the SciPost model proves to be successful, and when a sufficient number of <a href="{% url 'sponsors:sponsors' %}">sponsors</a> have been signed up.</p>
</div>
</div>
@@ -293,7 +293,7 @@ ucts_tools/multidisciplinary/esci/">ESCI</a> (part of Web of Science's Core Coll
</a>
<div id="scipost_funded" class="collapse" role="tabpanel">
<p>SciPost operates non-commercially and purely not-for-profit, incurring minimal costs. Contributors, who are by definition all academically employed, provide all the content and perform all editorial tasks as part of their normal institutional academic duties. Operations are kept running by a team of volunteer officers, themselves academically employed.</p>
- <p>The startup phase was supported by a grant from the <a target="_blank" href="http://www.nwo.nl/en">NWO</a> in the Netherlands. Long-term operations will be financed by donations from national funding agencies, universities, societies, foundations and individuals. More information on our cost-slashing consortial scheme can be found on our <a href="{% url 'partners:partners' %}">partners page</a>. Librarians can have a look at our <a href="{% static 'scipost/SPB/SciPost_Supporting_Partners_Board_Prospectus.pdf' %}">one-page Prospectus</a>. Detailed information for prospective Partners can be found in the draft <a href="{% static 'scipost/SPB/SciPost_Supporting_Partner_Agreement.pdf' %}">Partner Agreement</a>. If you are interested in financially supporting SciPost, <a href="mailto:partners@scipost.org">contact us</a> to get further details.
+ <p>The startup phase was supported by a grant from the <a target="_blank" href="http://www.nwo.nl/en">NWO</a> in the Netherlands. Long-term operations will be financed by donations from national funding agencies, universities, societies, foundations and individuals. More information on our cost-slashing consortial scheme can be found on our <a href="{% url 'sponsors:sponsors' %}">sponsors page</a>. You can also take a look at our <a href="{% static 'sponsors/SciPost_Sponsors_Board_Prospectus.pdf' %}">one-page Prospectus</a> and at our full <a href="{% static 'sponsors/SciPost_Sponsorship_Agreement.pdf' %}">Sponsorship Agreement template</a> for more information. You might even consider petitioning your local librarian/director/... to consider sponsoring us, which you can easily do using this email <a href="mailto:?subject=Petition to support SciPost&body={% autoescape on %}{% include 'sponsors/sponsor_petition_email.html' %}{% endautoescape %}&cc=sponsors@scipost.org">template</a>.
</p>
</div>
</div>
diff --git a/scipost/templates/scipost/navbar.html b/scipost/templates/scipost/navbar.html
index 450504c4c8b1755983bb4ade0d92ab2fd570201b..27ea2e08562b974fba2a1032c2daf322d63d2c20 100644
--- a/scipost/templates/scipost/navbar.html
+++ b/scipost/templates/scipost/navbar.html
@@ -71,11 +71,11 @@
</li>
{% endif %}
{% endif %}
- {% if user.partner_contact %}
- <li class="nav-item{% if '/partners/dashboard' in request.path %} active{% endif %}">
- <span class="separator">·</span>
- <a class="nav-link" href="{% url 'partners:dashboard' %}">Partner Page →</a>
- </li>
+ {% if perms.scipost.can_manage_organizations or user.org_contact %}
+ <li class="nav-item{% if '/organizations/dashboard' in request.path %} active{% endif %}">
+ <span class="separator">·</span>
+ <a class="nav-link" href="{% url 'organizations:dashboard' %}">Orgs dashboard</a>
+ </li>
{% endif %}
<li class="nav-item navbar-counter">
<span class="separator">·</span>
diff --git a/scipost/templates/scipost/update_personal_data.html b/scipost/templates/scipost/update_personal_data.html
index bdc1ccf4e747e9f486be081eb6540e712d966bb6..1398b7e02720e06a62539396189cc6b61a3f86a5 100644
--- a/scipost/templates/scipost/update_personal_data.html
+++ b/scipost/templates/scipost/update_personal_data.html
@@ -50,6 +50,9 @@
<div class="row justify-content-center">
<div class="col-lg-6">
<h1 class="mb-3">Update your personal data</h1>
+ {% if contact_form %}
+ {{ contact_form|bootstrap }}
+ {% endif %}
{{ user_form|bootstrap }}
{% if cont_form %}
{{ cont_form|bootstrap }}
diff --git a/scipost/views.py b/scipost/views.py
index 30f2bcf017aa4a107024dc09f790be1305989594..ccedcba91b865337c7c2796314072183d1766b72 100644
--- a/scipost/views.py
+++ b/scipost/views.py
@@ -53,8 +53,9 @@ from invitations.constants import STATUS_REGISTERED
from invitations.models import RegistrationInvitation
from journals.models import Publication, PublicationAuthorsTable
from news.models import NewsItem
-from organizations.models import Organization
-from partners.models import MembershipAgreement
+from organizations.decorators import has_contact
+from organizations.models import Organization, Contact
+from organizations.forms import UpdateContactDataForm
from submissions.models import Submission, RefereeInvitation, Report, EICRecommendation
from theses.models import ThesisLink
@@ -402,7 +403,8 @@ def login_view(request):
'(our admins will verify your credentials very soon)'))
elif form.user_is_inactive():
form.add_error(None, ('Your account is not yet activated. '
- 'Please first activate your account.'))
+ 'Please first activate your account by clicking on the '
+ 'activation link we emailed you.'))
else:
form.add_error(None, 'Invalid username/password.')
context = {'form': form}
@@ -687,6 +689,8 @@ def personal_page(request, tab='account'):
contributor = Contributor.objects.select_related('user').get(user=request.user)
context['needs_validation'] = contributor.status != NORMAL_CONTRIBUTOR
except Contributor.DoesNotExist:
+ if has_contact(request.user):
+ return redirect(reverse('organizations:dashboard'))
contributor = None
if contributor:
@@ -715,7 +719,7 @@ def change_password(request):
request.user.contributor
return redirect(reverse('scipost:personal_page'))
except Contributor.DoesNotExist:
- return redirect(reverse('partners:dashboard'))
+ return redirect(reverse('scipost:index'))
return render(request, 'scipost/change_password.html', {'form': form})
@@ -744,6 +748,23 @@ def _update_personal_data_user_only(request):
return render(request, 'scipost/update_personal_data.html', context)
+def _update_personal_data_contact(request):
+ contact = Contact.objects.get(user=request.user)
+ user_form = UpdateUserDataForm(request.POST or None, instance=request.user)
+ contact_form = UpdateContactDataForm(request.POST or None, instance=contact)
+ if user_form.is_valid() and contact_form.is_valid():
+ user_form.save()
+ contact_form.save()
+ messages.success(request, 'Your personal data has been updated.')
+ return redirect(reverse('organizations:dashboard'))
+
+ context = {
+ 'user_form': user_form,
+ 'contact_form': contact_form,
+ }
+ return render(request, 'scipost/update_personal_data.html', context)
+
+
def _update_personal_data_contributor(request):
contributor = Contributor.objects.get(user=request.user)
user_form = UpdateUserDataForm(request.POST or None, instance=request.user)
@@ -771,6 +792,8 @@ def _update_personal_data_contributor(request):
def update_personal_data(request):
if has_contributor(request.user):
return _update_personal_data_contributor(request)
+ elif has_contact(request.user):
+ return _update_personal_data_contact(request)
return _update_personal_data_user_only(request)
diff --git a/submissions/admin.py b/submissions/admin.py
index aea1bbaebcf6344e6684659482892ba7dd0f569d..3d27be9bce38695553eadfe5f0e549f27b2eaf2a 100644
--- a/submissions/admin.py
+++ b/submissions/admin.py
@@ -29,13 +29,13 @@ admin.site.register(iThenticateReport, iThenticateReportAdmin)
class SubmissionAdminForm(forms.ModelForm):
authors = forms.ModelMultipleChoiceField(
required=False,
- queryset=Contributor.objects.order_by('user__last_name'))
+ queryset=Contributor.objects.nonduplicates().order_by('user__last_name'))
authors_claims = forms.ModelMultipleChoiceField(
required=False,
- queryset=Contributor.objects.order_by('user__last_name'))
+ queryset=Contributor.objects.nonduplicates().order_by('user__last_name'))
authors_false_claims = forms.ModelMultipleChoiceField(
required=False,
- queryset=Contributor.objects.order_by('user__last_name'))
+ queryset=Contributor.objects.nonduplicates().order_by('user__last_name'))
is_resubmission_of = forms.ModelChoiceField(
required=False,
queryset=Submission.objects.order_by('-preprint__identifier_w_vn_nr'))
diff --git a/partners/migrations/0022_delete_institution.py b/submissions/migrations/0052_merge_20190303_1241.py
similarity index 52%
rename from partners/migrations/0022_delete_institution.py
rename to submissions/migrations/0052_merge_20190303_1241.py
index 4a97896eb5dbc9af0d99c59306f53cf8a17b7984..f626984e8eb7f94d2e297206bc7f4b45d157386d 100644
--- a/partners/migrations/0022_delete_institution.py
+++ b/submissions/migrations/0052_merge_20190303_1241.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2018-10-07 15:48
+# Generated by Django 1.11.4 on 2019-03-03 11:41
from __future__ import unicode_literals
from django.db import migrations
@@ -8,11 +8,9 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
- ('partners', '0021_auto_20181007_1746'),
+ ('submissions', '0051_auto_20190126_2058'),
+ ('submissions', '0051_auto_20181218_2201'),
]
operations = [
- migrations.DeleteModel(
- name='Institution',
- ),
]
diff --git a/submissions/templates/submissions/pool/pool.html b/submissions/templates/submissions/pool/pool.html
index 2d5a887da3b5c7b7da51a101ad4a05155cf7a71d..7a0c10f93771f97b5804a4db40917fa3a5830d2b 100644
--- a/submissions/templates/submissions/pool/pool.html
+++ b/submissions/templates/submissions/pool/pool.html
@@ -27,7 +27,7 @@
</div>
<div class="col-6">
<div class="border border-danger p-2">
- Do you know know qualified candidates who could serve as Fellow in a College?<br/>
+ Do you know qualified candidates who could serve as Fellow in a College?<br/>
Nominate them by <a href="{% url 'colleges:potential_fellowship_create' %}">adding a Potential Fellowship</a>.
{% if nr_potfels_to_vote_on > 0 %}
<br/>
diff --git a/templates/email/email_contact_new_for_activation.html b/templates/email/email_contact_new_for_activation.html
deleted file mode 100644
index 16bfbdb90ad5d4f5ff43e0e13cb041f6c38ef3b6..0000000000000000000000000000000000000000
--- a/templates/email/email_contact_new_for_activation.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<p>Dear {{contact.get_title_display}} {{contact.user.first_name}} {{contact.user.last_name}},</p>
-
-<p>
- Many thanks for joining the SciPost Supporting Partners Board. We have now created an account for you on scipost.org, which will allow you to access all relevant information and functionalities related to the SPB.
-</p>
-<p>
- This is a personal account for you, which is linked to the Partner(s) representing your institution(s).
-</p>
-<p>
- In order to activate your account, please navigate to <a href="https://scipost.org{% url 'partners:activate_account' contact.activation_key %}?email={{contact.user.email}}">this link</a>. You will be asked to choose a password, after which you will be able to login.
-</p>
-<p>
- After logging in, you will find the main Partners page by clicking on the “Partner Page†link in the top menu on the site.
-</p>
-<p>
- The institution you represent will be listed under the “My Partners†column. Basic information about your Membership is displayed on this page. You can add additional Contacts (legal, financial, technical etc) by following the “view/edit†and then “Request new Contact†links.
-</p>
-<p>
- We are very pleased to welcome you on Board, and will be happy to answer any questions you might have.
-</p>
-<p>
- Sincerely,<br><br>
- By {% if sent_by.partner_contact %}{{sent_by.partner_contact.get_title_display}}{% elif sent_by.contributor %}{{sent_by.contributor.get_title_display}}{% else %}{{sent_by.first_name}}{% endif %} {{ sent_by.last_name }}
- on behalf of SciPost and its Supporting Partners Board
-</p>
-
-{% include 'email/_footer.html' %}
diff --git a/templates/email/email_contact_new_for_activation.txt b/templates/email/email_contact_new_for_activation.txt
deleted file mode 100644
index 54ad8929c31f643d74e8ca8b92f4179a34e144ae..0000000000000000000000000000000000000000
--- a/templates/email/email_contact_new_for_activation.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Dear {{contact.get_title_display}} {{contact.user.first_name}} {{contact.user.last_name}},
-
-Many thanks for joining the SciPost Supporting Partners Board. We have now created an account for you on scipost.org, which will allow you to access all relevant information and functionalities related to the SPB.
-
-This is a personal account for you, which is linked to the Partner(s) representing your institution(s).
-
-In order to activate your account, please navigate to:
-
-https://scipost.org{% url 'partners:activate_account' contact.activation_key %}?email={{contact.user.email}}
-
-You will be asked to choose a password, after which you will be able to login.
-
-After logging in, you will find the main Partners page by clicking on the “Partner Page†link in the top menu on the site.
-
-The institution you represent will be listed under the “My Partners†column. Basic information about your Membership is displayed on this page. You can add additional Contacts (legal, financial, technical etc) by following the “view/edit†and then “Request new Contact†links.
-
-We are very pleased to welcome you on Board, and will be happy to answer any questions you might have.
-
-Sincerely,
-
-By {% if sent_by.partner_contact %}{{sent_by.partner_contact.get_title_display}}{% elif sent_by.contributor %}{{sent_by.contributor.get_title_display}}{% else %}{{sent_by.first_name}}{% endif %} {{ sent_by.last_name }}
-on behalf of SciPost and its Supporting Partners Board
diff --git a/templates/email/fellows/email_fellow_tasklist.html b/templates/email/fellows/email_fellow_tasklist.html
index f0fc50dba9c819144f429f6bc8c7eefd5ac6e0de..adb315f44f39f6a1142e3077195e38aae1e82031 100644
--- a/templates/email/fellows/email_fellow_tasklist.html
+++ b/templates/email/fellows/email_fellow_tasklist.html
@@ -5,7 +5,7 @@
{% if nr_potfels_to_vote_on > 0 %}
<br/>
<h3>Nominations to the Editorial College</h3>
-<p>You have {{ nr_potfels_to_vote_on }} nomination{{ nr_potfels_to_vote_on|pluralize }} to vote on, please visit the <a href="{% url 'colleges:potential_fellowships' %}">Potential Fellowships</a> page to cast your vote{{ nr_potfels_to_vote_on|pluralize }}.</p>
+<p>You have {{ nr_potfels_to_vote_on }} nomination{{ nr_potfels_to_vote_on|pluralize }} to vote on, please visit the <a href="https://scipost.org{% url 'colleges:potential_fellowships' %}">Potential Fellowships</a> page to cast your vote{{ nr_potfels_to_vote_on|pluralize }}.</p>
{% endif %}
{% if recs_to_vote_on %}
diff --git a/templates/email/org_contacts/contactperson_followup_mail.html b/templates/email/org_contacts/contactperson_followup_mail.html
new file mode 100644
index 0000000000000000000000000000000000000000..0eaa8ec76b9c91fd51ccb0b1e56f625e06d51cc7
--- /dev/null
+++ b/templates/email/org_contacts/contactperson_followup_mail.html
@@ -0,0 +1,39 @@
+<p>
+ Dear {% if contactperson %}{{ contactperson.get_title_display }} {{ contactperson.last_name }}{% else %}colleagues{% endif %},
+</p>
+<p>
+ We recently contacted you concerning SciPost, to probe your organization's interest in becoming a Sponsor. With this follow-up email, I would simply like to check whether you got the original message.
+</p>
+<p>
+ <a href="https://scipost.org">SciPost</a> is a next-generation publication portal aiming to transform the business of scientific publishing. You can find a one-page summary in <a href="https://scipost.org/static/sponsors/SciPost_Sponsors_Board_Prospectus.pdf">our online prospectus</a> outlining the reasons why joining would be beneficial for your institution.
+</p>
+<p>
+ You can also find a summary of how your organization has benefitted from our activities at <a href="https://scipost.org{{ contactperson.organization.get_absolute_url }}">this link</a>.
+</p>
+<p>
+ I will be happy to provide any required further details. If you are interested, you can simply get in touch via this address (sponsors@scipost.org). I sincerely hope that SciPost will be able to count on your support.
+</p>
+<p>
+ If you not the right representative to get in touch with, could you please forward this to the right person, or let us know?
+</p>
+<p>
+ Many thanks in advance,
+</p>
+<p>
+ On behalf of the SciPost Foundation,<br><br>
+ Prof. dr Jean-Sébastien Caux<br>
+ J.S.Caux@uva.nl jscaux@scipost.org<br>
+ https://jscaux.org<br>
+ ---------------------------------------------<br>
+ Institute for Theoretical Physics<br>
+ University of Amsterdam<br>
+ Science Park 904<br>
+ 1098 XH Amsterdam<br>
+ The Netherlands<br>
+ ---------------------------------------------<br>
+ tel.: +31 (0)20 5255775<br>
+ fax: +31 (0)20 5255778<br>
+ ---------------------------------------------
+</p>
+
+{% include 'email/_footer.html' %}
diff --git a/templates/email/org_contacts/contactperson_followup_mail.json b/templates/email/org_contacts/contactperson_followup_mail.json
new file mode 100644
index 0000000000000000000000000000000000000000..2dfd72a649833a596ad48a53e21442521a6ccbfd
--- /dev/null
+++ b/templates/email/org_contacts/contactperson_followup_mail.json
@@ -0,0 +1,8 @@
+{
+ "subject": "SciPost: Sponsors",
+ "to_address": "email",
+ "bcc_to": "sponsors@scipost.org",
+ "from_address_name": "SciPost Sponsors",
+ "from_address": "sponsors@scipost.org",
+ "context_object": "contactperson"
+}
diff --git a/templates/email/org_contacts/contactperson_initial_mail.html b/templates/email/org_contacts/contactperson_initial_mail.html
new file mode 100644
index 0000000000000000000000000000000000000000..df1322cb97525cec76b75466a2f90ded34a39b61
--- /dev/null
+++ b/templates/email/org_contacts/contactperson_initial_mail.html
@@ -0,0 +1,41 @@
+<p>
+ Dear {% if contactperson %}{{ contactperson.get_title_display }} {{ contactperson.last_name }}{% else %}colleagues{% endif %},
+</p>
+<p>
+ You might by now have heard of SciPost, a not-for-profit initiative aiming to bring disruptive change to academic publishing practices.
+</p>
+<p>
+ The site is anchored at <a href="https://scipost.org">SciPost.org</a>. Many further details about SciPost, its principles, ideals and implementation can be found at the <a href="https://scipost.org/about">about page</a> and <a href="https://scipost.org/FAQ">our FAQ</a>.
+</p>
+<p>
+ You can also find a summary of how your organization has benefitted from our activities at <a href="https://scipost.org{{ contactperson.organization.get_absolute_url }}">this link</a>.
+</p>
+<p>
+ As explained on our <a href="https://scipost.org/sponsors">Sponsors page</a>, SciPost follows a completely different funding model than traditional publishers, and provides a cost-slashing alternative to existing platforms. SciPost charges neither subscription fees, nor article processing charges; its activities are instead to be collectively financed by a worldwide consortium of Sponsors, formed by institutions and organizations which directly or indirectly benefit from SciPost’s activities.
+</p>
+<p>
+ A short summary and reasons for your organization to become Sponsors are given in <a href="https://scipost.org/static/sponsors/SciPost_Sponsors_Board_Prospectus.pdf">our one-page prospectus</a>.
+</p>
+<p>
+ In <a href="https://scipost.org/static/sponsors/SciPost_Sponsorship_Agreement.pdf">the agreement template</a>, you will find many more specific details about our operations, requirements and funding strategy.
+</p>
+<p>
+ It would be a privilege to welcome your organization as a Sponsor. I am hereby contacting you to enquire whether your institution would consider joining? If you are interested, you can simply get in touch via this address (sponsors@scipost.org). I sincerely hope that SciPost will be able to count on your support.
+</p>
+
+<p>
+ On behalf of the SciPost Foundation,<br><br>
+ Prof. dr Jean-Sébastien Caux<br>
+ J.S.Caux@uva.nl<br>
+ http://jscaux.org<br>
+ ---------------------------------------------<br>
+ Institute for Theoretical Physics<br>
+ University of Amsterdam<br>
+ Science Park 904<br>
+ 1098 XH Amsterdam<br>
+ The Netherlands<br>
+ ---------------------------------------------<br>
+ tel.: +31 (0)20 5255775<br>
+ fax: +31 (0)20 5255778<br>
+ ---------------------------------------------
+</p>
diff --git a/templates/email/org_contacts/contactperson_initial_mail.json b/templates/email/org_contacts/contactperson_initial_mail.json
new file mode 100644
index 0000000000000000000000000000000000000000..2dfd72a649833a596ad48a53e21442521a6ccbfd
--- /dev/null
+++ b/templates/email/org_contacts/contactperson_initial_mail.json
@@ -0,0 +1,8 @@
+{
+ "subject": "SciPost: Sponsors",
+ "to_address": "email",
+ "bcc_to": "sponsors@scipost.org",
+ "from_address_name": "SciPost Sponsors",
+ "from_address": "sponsors@scipost.org",
+ "context_object": "contactperson"
+}
diff --git a/templates/email/org_contacts/contactrole_generic_mail.html b/templates/email/org_contacts/contactrole_generic_mail.html
new file mode 100644
index 0000000000000000000000000000000000000000..c226178ad8726da945b840e01d12a040a68f495d
--- /dev/null
+++ b/templates/email/org_contacts/contactrole_generic_mail.html
@@ -0,0 +1,6 @@
+<p>
+ Dear {{ contactrole.contact.get_title_display }} {{ contactrole.contact.user.last_name }},
+</p>
+<p>
+ On behalf of the SciPost Foundation,<br><br>
+</p>
diff --git a/templates/email/org_contacts/contactrole_generic_mail.json b/templates/email/org_contacts/contactrole_generic_mail.json
new file mode 100644
index 0000000000000000000000000000000000000000..c5b4b1ec67222ef39d899af1621e1b90c514eb20
--- /dev/null
+++ b/templates/email/org_contacts/contactrole_generic_mail.json
@@ -0,0 +1,8 @@
+{
+ "subject": "SciPost: Sponsors",
+ "to_address": "contact.user.email",
+ "bcc_to": "sponsors@scipost.org",
+ "from_address_name": "SciPost Sponsors",
+ "from_address": "sponsors@scipost.org",
+ "context_object": "contactrole"
+}
diff --git a/templates/email/org_contacts/contactrole_subsidy_renewal_mail.html b/templates/email/org_contacts/contactrole_subsidy_renewal_mail.html
new file mode 100644
index 0000000000000000000000000000000000000000..6dbbf6bf80d30b25b0e48a71db73ab97f82b8f41
--- /dev/null
+++ b/templates/email/org_contacts/contactrole_subsidy_renewal_mail.html
@@ -0,0 +1,12 @@
+<p>
+ Dear {{ contactrole.contact.get_title_display }} {{ contactrole.contact.user.last_name }},
+</p>
+<p>
+ Your organization ({{ contactrole.organization }}) has been sponsoring SciPost (see details at <a href="https://scipost.org{{ contactrole.organization.get_absolute_url }}">this link</a>), for which we are extremely grateful.
+</p>
+<p>
+ Your latest sponsorship period ends on {{ contactrole.organization.latest_subsidy_date_until }}. We would be extremely grateful for your continued support, and would hereby like to enquire whether we can start the renewal procedure.
+</p>
+<p>
+ On behalf of the SciPost Foundation,<br><br>
+</p>
diff --git a/templates/email/org_contacts/contactrole_subsidy_renewal_mail.json b/templates/email/org_contacts/contactrole_subsidy_renewal_mail.json
new file mode 100644
index 0000000000000000000000000000000000000000..544f6dbc421e82e3aef920c04588f821f4d957f3
--- /dev/null
+++ b/templates/email/org_contacts/contactrole_subsidy_renewal_mail.json
@@ -0,0 +1,8 @@
+{
+ "subject": "SciPost: Sponsorship renewal",
+ "to_address": "contact.user.email",
+ "bcc_to": "sponsors@scipost.org",
+ "from_address_name": "SciPost Sponsors",
+ "from_address": "sponsors@scipost.org",
+ "context_object": "contactrole"
+}
diff --git a/templates/email/org_contacts/email_contact_for_activation.html b/templates/email/org_contacts/email_contact_for_activation.html
new file mode 100644
index 0000000000000000000000000000000000000000..3c22cb2ba554360fc5c31a811841e6d96fc87b2a
--- /dev/null
+++ b/templates/email/org_contacts/email_contact_for_activation.html
@@ -0,0 +1,20 @@
+<p>Dear {{contact.get_title_display}} {{contact.user.last_name}},</p>
+
+<p>
+ Many thanks for sponsoring SciPost. We have now created a personal account for you on scipost.org, which will allow you to access all relevant information and functionalities related to sponsoring.
+</p>
+<p>
+ In order to activate your account, please navigate to <a href="https://scipost.org{% url 'organizations:activate_account' contact.activation_key %}?email={{contact.user.email}}">this link</a>. You will be asked to choose a password, after which you will be able to login (your username being defined as your email address).
+</p>
+<p>
+ After logging in, you will find a “Org dashboard†link in the top menu, which will take you to your info page, where you will find further links for managing your account and the associated data (in particular, the public visibility settings of your sponsorship amounts and associated documents).
+</p>
+<p>
+ We are very pleased to welcome you to SciPost, and will be happy to answer any questions you might have.
+</p>
+<p>
+ Sincerely,<br><br>
+ SciPost and its Sponsors Board
+</p>
+
+{% include 'email/_footer.html' %}
diff --git a/templates/email/org_contacts/email_contact_for_activation.json b/templates/email/org_contacts/email_contact_for_activation.json
new file mode 100644
index 0000000000000000000000000000000000000000..93aaedd2bd6b1f37ade694374b5643406860ba30
--- /dev/null
+++ b/templates/email/org_contacts/email_contact_for_activation.json
@@ -0,0 +1,8 @@
+{
+ "subject": "SciPost: account activation",
+ "to_address": "user.email",
+ "bcc_to": "sponsors@scipost.org",
+ "from_address_name": "SciPost Sponsors Admin",
+ "from_address": "sponsors@scipost.org",
+ "context_object": "contact"
+}
diff --git a/templates/email/submissions_assignment_failed.html b/templates/email/submissions_assignment_failed.html
index 382b4217405c28280daa788d592d42fab903fd3c..61cdaf624fd67871e64db86e0b71c26a6e4598c6 100644
--- a/templates/email/submissions_assignment_failed.html
+++ b/templates/email/submissions_assignment_failed.html
@@ -1,7 +1,7 @@
-<p>Dear {{ submission.submitted_by.get_title_display }} {{ submission.submitted_by.user.last_name }},</p>
+<p>Dear {{ object.submitted_by.get_title_display }} {{ object.submitted_by.user.last_name }},</p>
<p>Your recent Submission to SciPost,</p>
-<p>{{ submission.title }}</p>
-<p>by {{ submission.author_list }}</p>
+<p>{{ object.title }}</p>
+<p>by {{ object.author_list }}</p>
<p>
has unfortunately not passed the pre-screening stage.
We therefore regret to inform you that we will not
diff --git a/templates/email/submissions_assignment_failed.json b/templates/email/submissions_assignment_failed.json
index 9b1051a0bc9cdfdbf1e524a93326f6e2f45b55fd..8f6266bfddcf7d2d220c4464182689269f28fb12 100644
--- a/templates/email/submissions_assignment_failed.json
+++ b/templates/email/submissions_assignment_failed.json
@@ -1,8 +1,11 @@
{
"subject": "SciPost: pre-screening not passed",
- "to_address": "submitted_by.user.email",
- "bcc_to": "submissions@scipost.org",
- "from_address_name": "SciPost Editorial Admin",
- "from_address": "submissions@scipost.org",
- "context_object": "submission"
+ "recipient_list": [
+ "submitted_by.user.email"
+ ],
+ "bcc": [
+ "submissions@scipost.org"
+ ],
+ "from_name": "SciPost Editorial Admin",
+ "from_email": "submissions@scipost.org"
}