diff --git a/SciPost_v1/settings/base.py b/SciPost_v1/settings/base.py
index 7d5cb452e8c2a242f72eeaa562e17d5a9394876e..fd795df86f7fd03c84d119945edb454318955ff7 100644
--- a/SciPost_v1/settings/base.py
+++ b/SciPost_v1/settings/base.py
@@ -77,6 +77,7 @@ INSTALLED_APPS = (
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
+ 'django.contrib.sites',
'django_countries',
'django_extensions',
'django_mathjax',
@@ -105,6 +106,7 @@ INSTALLED_APPS = (
'submissions',
'theses',
'virtualmeetings',
+ 'organizations',
'proceedings',
'production',
'profiles',
@@ -113,9 +115,13 @@ INSTALLED_APPS = (
'funders',
'stats',
'petitions',
- 'webpack_loader'
+ 'sitesserved',
+ 'webpack_loader',
+ 'maintenancemode',
)
+SITE_ID = 1
+
HAYSTACK_CONNECTIONS = {
'default': {
@@ -172,6 +178,7 @@ MIDDLEWARE = (
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'django.middleware.security.SecurityMiddleware',
+ 'maintenancemode.middleware.MaintenanceModeMiddleware',
)
ROOT_URLCONF = 'SciPost_v1.urls'
@@ -373,4 +380,4 @@ CELERY_IMPORTS = ('submissions.tasks', )
# Automation.
-ED_ASSIGMENT_DT_DELTA = timedelta(hours=12)
+ED_ASSIGMENT_DT_DELTA = timedelta(hours=6)
diff --git a/SciPost_v1/urls.py b/SciPost_v1/urls.py
index c70408eb1afba5e6ae9d8adb61b2354a0f096637..a8c09ab1b766c4a5dc1257e25b12c8fddf700166 100644
--- a/SciPost_v1/urls.py
+++ b/SciPost_v1/urls.py
@@ -48,6 +48,7 @@ urlpatterns = [
url(r'^meetings/', include('virtualmeetings.urls', namespace="virtualmeetings")),
url(r'^news/', include('news.urls', namespace="news")),
url(r'^notifications/', include('notifications.urls', namespace="notifications")),
+ url(r'^organizations/', include('organizations.urls', namespace="organizations")),
url(r'^petitions/', include('petitions.urls', namespace="petitions")),
url(r'^preprints/', include('preprints.urls', namespace="preprints")),
url(r'^proceedings/', include('proceedings.urls', namespace="proceedings")),
diff --git a/colleges/migrations/0010_auto_20180917_2117.py b/colleges/migrations/0010_auto_20180917_2117.py
new file mode 100644
index 0000000000000000000000000000000000000000..e612727ec3018693530d6941884b50d5bbf30b86
--- /dev/null
+++ b/colleges/migrations/0010_auto_20180917_2117.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-09-17 19:17
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('colleges', '0009_auto_20180916_2134'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='potentialfellowshipevent',
+ name='noted_on',
+ field=models.DateTimeField(auto_now_add=True),
+ ),
+ ]
diff --git a/funders/migrations/0009_funder_org.py b/funders/migrations/0009_funder_org.py
new file mode 100644
index 0000000000000000000000000000000000000000..a195dcae2ceef7bb05edf18d821541975e30fc85
--- /dev/null
+++ b/funders/migrations/0009_funder_org.py
@@ -0,0 +1,22 @@
+# -*- 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'),
+ ('funders', '0008_auto_20180715_0521'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='funder',
+ name='org',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organizations.Organization'),
+ ),
+ ]
diff --git a/funders/migrations/0010_repopulate_funder_orgs.py b/funders/migrations/0010_repopulate_funder_orgs.py
new file mode 100644
index 0000000000000000000000000000000000000000..6810dc122155b68aad1a10b95943814cb898eee3
--- /dev/null
+++ b/funders/migrations/0010_repopulate_funder_orgs.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-09-22 13:11
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+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)
+ funder.save()
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('funders', '0009_funder_org'),
+ ]
+
+ operations = [
+ migrations.RunPython(repopulate_organization_field,
+ reverse_code=migrations.RunPython.noop),
+ ]
diff --git a/funders/migrations/0011_remove_funder_organization.py b/funders/migrations/0011_remove_funder_organization.py
new file mode 100644
index 0000000000000000000000000000000000000000..27ad906b0e7c1bcbc2c95fb6795c196034b7b760
--- /dev/null
+++ b/funders/migrations/0011_remove_funder_organization.py
@@ -0,0 +1,19 @@
+# -*- 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 = [
+ ('funders', '0010_repopulate_funder_orgs'),
+ ]
+
+ operations = [
+ 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
new file mode 100644
index 0000000000000000000000000000000000000000..42c47f6c5af7d981ea297c20cabf418ce73e4f84
--- /dev/null
+++ b/funders/migrations/0012_auto_20180922_1609.py
@@ -0,0 +1,21 @@
+# -*- 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'),
+ ('funders', '0011_remove_funder_organization'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='funder',
+ old_name='org',
+ new_name='organization',
+ ),
+ ]
diff --git a/funders/models.py b/funders/models.py
index 5639405664c65a5243ccc42b88fa345860733000..e88ea8427b35c59d568cb9cbcabc7878bcbb6039 100644
--- a/funders/models.py
+++ b/funders/models.py
@@ -23,7 +23,7 @@ class Funder(models.Model):
name = models.CharField(max_length=256)
acronym = models.CharField(max_length=32, blank=True)
identifier = models.CharField(max_length=200, unique=True)
- organization = models.ForeignKey('partners.Organization', on_delete=models.CASCADE,
+ organization = models.ForeignKey('organizations.Organization', on_delete=models.CASCADE,
blank=True, null=True)
objects = FunderQuerySet.as_manager()
diff --git a/funders/templates/funders/funder_link_organization.html b/funders/templates/funders/funder_link_organization.html
index c52c8b7d2f6ebd4f293cee6c180ef9859fc32b7a..edf30b799c829b768c34a8d9a0f467c2368805a6 100644
--- a/funders/templates/funders/funder_link_organization.html
+++ b/funders/templates/funders/funder_link_organization.html
@@ -32,7 +32,7 @@
</form>
</div>
<div class="col-2">
- <p>Can't find it in the selector? <a href="{% url 'partners:organization_create' %}" target="_blank">Add a new organization to our database</a> (opens in new window)</p>
+ <p>Can't find it in the selector? <a href="{% url 'organizations:organization_create' %}" target="_blank">Add a new organization to our database</a> (opens in new window)</p>
</div>
</div>
diff --git a/journals/admin.py b/journals/admin.py
index 2396480b44b25eb39fa3d2428190330967e23187..12529845b5a1c6f671adb3f7b55acd169c9d2a79 100644
--- a/journals/admin.py
+++ b/journals/admin.py
@@ -6,7 +6,8 @@ from django.contrib import admin, messages
from django import forms
from journals.models import UnregisteredAuthor, Journal, Volume, Issue, Publication, \
- Deposit, DOAJDeposit, GenericDOIDeposit, Reference, PublicationAuthorsTable
+ Deposit, DOAJDeposit, GenericDOIDeposit, Reference, PublicationAuthorsTable,\
+ OrgPubFraction
from scipost.models import Contributor
from submissions.models import Submission
@@ -67,12 +68,17 @@ class AuthorsInline(admin.TabularInline):
extra = 0
+class OrgPubFractionInline(admin.TabularInline):
+ model = OrgPubFraction
+ list_display = ('organization', 'publication', 'fraction')
+
+
class PublicationAdmin(admin.ModelAdmin):
search_fields = ['title', 'author_list']
list_display = ['title', 'author_list', 'in_issue', 'doi_string', 'publication_date', 'status']
date_hierarchy = 'publication_date'
list_filter = ['in_issue']
- inlines = [AuthorsInline, ReferenceInline]
+ inlines = [AuthorsInline, ReferenceInline, OrgPubFractionInline]
form = PublicationAdminForm
diff --git a/journals/forms.py b/journals/forms.py
index 774921c1314591955855462f1452e2dfd6b39223..58d59866ef25cbd9da0d8dc4b7133b046cf936ff 100644
--- a/journals/forms.py
+++ b/journals/forms.py
@@ -12,7 +12,7 @@ from datetime import datetime
from django import forms
from django.conf import settings
-from django.forms import BaseModelFormSet, modelformset_factory
+from django.forms import BaseFormSet, formset_factory, BaseModelFormSet, modelformset_factory
from django.template import loader
from django.utils import timezone
@@ -20,7 +20,8 @@ from ajax_select.fields import AutoCompleteSelectField
from .constants import STATUS_DRAFT, PUBLICATION_PREPUBLISHED, PUBLICATION_PUBLISHED
from .exceptions import PaperNumberingError
-from .models import Issue, Publication, Reference, UnregisteredAuthor, PublicationAuthorsTable
+from .models import Issue, Publication, Reference,\
+ UnregisteredAuthor, PublicationAuthorsTable, OrgPubFraction
from .utils import JournalUtils
from .signals import notify_manuscript_published
@@ -28,7 +29,7 @@ from .signals import notify_manuscript_published
from funders.models import Grant, Funder
from journals.models import Journal
from mails.utils import DirectMailUtil
-from partners.models import Organization
+from organizations.models import Organization
from production.constants import PROOFS_PUBLISHED
from production.models import ProductionEvent
from production.signals import notify_stream_status_change
@@ -125,7 +126,6 @@ PublicationAuthorOrderingFormSet = modelformset_factory(
class AuthorsTableOrganizationSelectForm(forms.ModelForm):
organization = AutoCompleteSelectField('organization_lookup')
- #organization = forms.ModelChoiceField(queryset=Organization.objects.all())
class Meta:
model = PublicationAuthorsTable
@@ -691,3 +691,36 @@ class PublicationPublishForm(RequestFormMixin, forms.ModelForm):
notify_manuscript_published(self.request.user, self.instance, False)
return self.instance
+
+
+
+class SetOrgPubFractionForm(forms.ModelForm):
+ class Meta:
+ model = OrgPubFraction
+ fields = ['organization', 'publication', 'fraction']
+
+ def __init__(self, *args, **kwargs):
+ super(SetOrgPubFractionForm, self).__init__(*args, **kwargs)
+ if self.instance.id:
+ self.fields['organization'].disabled = True
+ self.fields['publication'].widget = forms.HiddenInput()
+
+
+class BaseOrgPubFractionsFormSet(BaseModelFormSet):
+
+ def clean(self):
+ """
+ Checks that the fractions add up to one.
+ """
+ norm = 0
+ for form in self.forms:
+ form.is_valid()
+ norm += 1000 * form.cleaned_data.get('fraction', 0)
+ if norm != 1000:
+ raise forms.ValidationError('The fractions do not add up to one!')
+
+
+OrgPubFractionsFormSet = modelformset_factory(OrgPubFraction,
+ fields=('publication', 'organization', 'fraction'),
+ formset=BaseOrgPubFractionsFormSet,
+ form=SetOrgPubFractionForm, extra=0)
diff --git a/journals/migrations/0035_orgpubfraction.py b/journals/migrations/0035_orgpubfraction.py
new file mode 100644
index 0000000000000000000000000000000000000000..fc53b2e21fddabccdb2e6b3fe5977325440bd600
--- /dev/null
+++ b/journals/migrations/0035_orgpubfraction.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-09-17 19:17
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('partners', '0013_auto_20180715_0938'),
+ ('journals', '0034_auto_20180708_1037'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='OrgPubFraction',
+ 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')),
+ ('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
new file mode 100644
index 0000000000000000000000000000000000000000..45551aeaf766b31d26ae7dbab8be7e4b4bef7081
--- /dev/null
+++ b/journals/migrations/0036_auto_20180918_1723.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-09-18 15:23
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('partners', '0013_auto_20180715_0938'),
+ ('journals', '0035_orgpubfraction'),
+ ]
+
+ operations = [
+ migrations.AlterUniqueTogether(
+ name='orgpubfraction',
+ unique_together=set([('organization', 'publication')]),
+ ),
+ ]
diff --git a/journals/migrations/0037_publication_pubfractions_confirmed_by_authors.py b/journals/migrations/0037_publication_pubfractions_confirmed_by_authors.py
new file mode 100644
index 0000000000000000000000000000000000000000..480588aea5798df098ca0e1290a28d36a14b9665
--- /dev/null
+++ b/journals/migrations/0037_publication_pubfractions_confirmed_by_authors.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-09-18 18:27
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('journals', '0036_auto_20180918_1723'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='publication',
+ name='pubfractions_confirmed_by_authors',
+ field=models.BooleanField(default=False),
+ ),
+ ]
diff --git a/journals/migrations/0038_auto_20180922_1505.py b/journals/migrations/0038_auto_20180922_1505.py
new file mode 100644
index 0000000000000000000000000000000000000000..288d60fafa3ba538dea06a7638e768b28dcd9f69
--- /dev/null
+++ b/journals/migrations/0038_auto_20180922_1505.py
@@ -0,0 +1,27 @@
+# -*- 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'),
+ ('journals', '0037_publication_pubfractions_confirmed_by_authors'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='orgpubfraction',
+ name='org',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='pubfractions', to='organizations.Organization'),
+ ),
+ migrations.AddField(
+ model_name='publicationauthorstable',
+ name='affs',
+ field=models.ManyToManyField(blank=True, to='organizations.Organization'),
+ ),
+ ]
diff --git a/journals/migrations/0039_repopulate_orgs.py b/journals/migrations/0039_repopulate_orgs.py
new file mode 100644
index 0000000000000000000000000000000000000000..6f600059958dffac010327510eaf760d83fdc089
--- /dev/null
+++ b/journals/migrations/0039_repopulate_orgs.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-09-22 13:14
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+def repopulate_organization_field(apps, schema_editor):
+ OrgPubFraction = apps.get_model('journals', 'OrgPubFraction')
+ 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)
+ frac.save()
+
+ for tbl in PublicationAuthorsTable.objects.all():
+ for aff in tbl.affiliations.all():
+ org = Organization.objects.get(name=aff.name)
+ tbl.affs.add(org)
+ tbl.save()
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('journals', '0038_auto_20180922_1505'),
+ ]
+
+ operations = [
+ migrations.RunPython(repopulate_organization_field,
+ reverse_code=migrations.RunPython.noop),
+ ]
diff --git a/journals/migrations/0040_auto_20180922_1544.py b/journals/migrations/0040_auto_20180922_1544.py
new file mode 100644
index 0000000000000000000000000000000000000000..1ab6c74ca48d2deb40fd0075d248e9d39d525cf8
--- /dev/null
+++ b/journals/migrations/0040_auto_20180922_1544.py
@@ -0,0 +1,28 @@
+# -*- 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 = [
+ ('organizations', '0002_populate_from_partners_org'),
+ ('journals', '0039_repopulate_orgs'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='publicationauthorstable',
+ name='affiliations',
+ ),
+ migrations.AlterUniqueTogether(
+ name='orgpubfraction',
+ unique_together=set([('org', 'publication')]),
+ ),
+ 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
new file mode 100644
index 0000000000000000000000000000000000000000..395db5a153d2b47b3c9da56894fcebd6d522b922
--- /dev/null
+++ b/journals/migrations/0041_auto_20180922_1609.py
@@ -0,0 +1,31 @@
+# -*- 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'),
+ ('organizations', '0002_populate_from_partners_org'),
+ ('journals', '0040_auto_20180922_1544'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='orgpubfraction',
+ old_name='org',
+ new_name='organization',
+ ),
+ migrations.RenameField(
+ model_name='publicationauthorstable',
+ old_name='affs',
+ new_name='affiliations',
+ ),
+ migrations.AlterUniqueTogether(
+ name='orgpubfraction',
+ unique_together=set([('organization', 'publication')]),
+ ),
+ ]
diff --git a/journals/models.py b/journals/models.py
index 9fb6d7aaf92ce2d7c1acd7cc46795d025e63d48e..95ffaac4bc4ad643d53d1c9f5d0e3b1929d5e44b 100644
--- a/journals/models.py
+++ b/journals/models.py
@@ -7,7 +7,7 @@ from django.contrib.contenttypes.models import ContentType
from django.contrib.postgres.fields import JSONField
from django.core.exceptions import ValidationError
from django.db import models
-from django.db.models import Avg, F
+from django.db.models import Avg, Sum, F
from django.utils import timezone
from django.urls import reverse
@@ -41,7 +41,7 @@ class PublicationAuthorsTable(models.Model):
unregistered_author = models.ForeignKey('journals.UnregisteredAuthor', null=True, blank=True,
related_name='+')
contributor = models.ForeignKey('scipost.Contributor', null=True, blank=True, related_name='+')
- affiliations = models.ManyToManyField('partners.Organization', blank=True)
+ affiliations = models.ManyToManyField('organizations.Organization', blank=True)
order = models.PositiveSmallIntegerField()
class Meta:
@@ -410,6 +410,7 @@ class Publication(models.Model):
grants = models.ManyToManyField('funders.Grant', blank=True)
funders_generic = models.ManyToManyField('funders.Funder', blank=True) # not linked to a grant
institutions = models.ManyToManyField('affiliations.Institution', blank=True)
+ pubfractions_confirmed_by_authors = models.BooleanField(default=False)
# Metadata
metadata = JSONField(default={}, blank=True, null=True)
@@ -491,6 +492,17 @@ class Publication(models.Model):
return Funder.objects.filter(
models.Q(grants__publications=self) | models.Q(publications=self)).distinct()
+ def get_organizations(self):
+ """
+ Returns a queryset of all Organizations which are associated to this Publication,
+ through being in author affiliations, funders or generic funders.
+ """
+ from organizations.models import Organization
+ return Organization.objects.filter(
+ models.Q(publicationauthorstable__publication=self) |
+ models.Q(funder__grants__publications=self) |
+ models.Q(funder__publications=self)).distinct()
+
@property
def doi_string(self):
return '10.21468/' + self.doi_label
@@ -526,6 +538,11 @@ class Publication(models.Model):
def has_funding_statement(self):
return 'funding_statement' in self.metadata and self.metadata['funding_statement']
+ @property
+ def pubfractions_sum_to_1(self):
+ """ Checks that the support fractions sum up to one. """
+ return self.pubfractions.aggregate(Sum('fraction'))['fraction__sum'] == 1
+
@property
def citation(self):
"""
@@ -549,6 +566,9 @@ class Publication(models.Model):
def get_journal(self):
return self.in_journal or self.in_issue.in_volume.in_journal
+ def journal_issn(self):
+ return self.get_journal().issn
+
def get_paper_nr(self):
if self.in_journal:
return self.paper_nr
@@ -587,6 +607,28 @@ class Reference(models.Model):
return '[{}] {}, {}'.format(self.reference_number, self.authors[:30], self.citation[:30])
+class OrgPubFraction(models.Model):
+ """
+ Associates a fraction of the funding credit for a given publication to an Organization,
+ to help answer the question: who funded this research?
+
+ Fractions for a given publication should sum up to one.
+
+ This data is used to compile publicly-displayed information on Organizations
+ as well as to set suggested contributions from Partners.
+
+ To be set (ideally) during production phase, based on information provided by the authors.
+ """
+ organization = models.ForeignKey('organizations.Organization', on_delete=models.CASCADE,
+ related_name='pubfractions', blank=True, null=True)
+ publication = models.ForeignKey('journals.Publication', on_delete=models.CASCADE,
+ related_name='pubfractions')
+ fraction = models.DecimalField(max_digits=4, decimal_places=3)
+
+ class Meta:
+ unique_together = (('organization', 'publication'),)
+
+
class Deposit(models.Model):
"""
Each time a Crossref deposit is made for a Publication,
diff --git a/journals/templates/journals/allocate_orgpubfractions.html b/journals/templates/journals/allocate_orgpubfractions.html
new file mode 100644
index 0000000000000000000000000000000000000000..8fbc6be8db4818feda08abec230bb9ca2ce94a6c
--- /dev/null
+++ b/journals/templates/journals/allocate_orgpubfractions.html
@@ -0,0 +1,79 @@
+{% extends 'scipost/base.html' %}
+
+{% block pagetitle %}: Allocate support fractions{% endblock pagetitle %}
+
+{% block breadcrumb %}
+ <div class="container-outside header">
+ <div class="container">
+ <nav class="breadcrumb hidden-sm-down">
+ <a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
+ <a href="{% url 'journals:manage_metadata' %}" class="breadcrumb-item">Administration</a>
+ <a href="{% url 'journals:manage_metadata' doi_label=publication.doi_label %}" class="breadcrumb-item">{{ publication.citation }}</a>
+ <span class="breadcrumb-item active">Allocate support fractions</span>
+ </nav>
+ </div>
+ </div>
+{% endblock %}
+
+{% load bootstrap %}
+
+{% block content %}
+
+<div class="row">
+ <div class="col-12">
+ <h1 class="highlight">Allocate support fractions for <a href="{{ publication.get_absolute_url }}">{{ publication.doi_label }}</a></h1>
+ {% include 'partials/journals/publication_li_content.html' with publication=publication %}
+
+ <hr class="divider">
+
+ <h3 class="highlight">Which Organizations supported the research in this publication?</h3>
+ <p>Please indicate <strong>which Organizations should be credited with supporting the research published in this publication</strong>.<br/>Data provided here is indicative and does not need to be extremely accurate.<br/>Note however that this data <strong>is used</strong> to set the suggested level of support from external Organizations which SciPost needs to remain sustainable.<br/><br/>The Organizations listed here appear as either host institutions for the authors, or as acknowledged funders.<br/>Is the list of Organizations incomplete? <a href="mailto:edadmin@scipost.org?subject=Missing Organizations for {{ publication.doi_label }}&body=[Please provide the missing data here]">Please email EdAdmin with details</a>.</p>
+
+ <form method="post" action="{% url 'journals:allocate_orgpubfractions' doi_label=publication.doi_label %}">
+ {% csrf_token %}
+ {{ formset.management_form }}
+ <table class="table">
+ {% for form in formset %}
+ {% if forloop.first %}
+ <thead>
+ <tr>
+ {% for field in form.visible_fields %}
+ <th>{{ field.label }}</th>
+ {% endfor %}
+ </tr>
+ </thead>
+ {% endif %}
+ <tr>
+ {% for field in form.visible_fields %}
+ <td>
+ {% if forloop.first %}
+ {% for hidden in form.hidden_fields %}
+ {{ hidden }}
+ {% endfor %}
+ {% endif %}
+ {{ field.errors.as_ul }}
+ {{ field }}
+ </td>
+ {% endfor %}
+ </tr>
+ {% endfor %}
+ </table>
+ {% if formset.non_form_errors %}
+ <h4 class="text-danger">Error: {{ formset.non_form_errors }}</h4>
+ {% endif %}
+ <p>These fractions {% if publication.pubfractions_confirmed_by_authors %}<span class="text-success">have been confirmed</span>{% else %}<span class="text-danger">have not yet been confirmed</span>{% endif %} by the authors.</p>
+ <input type="submit" class="btn btn-primary" value="Save/confirm fractions">
+ </form>
+ <br/>
+ {% if perms.scipost.can_publish_accepted_submission %}
+ <ul class="ul">
+ {% if not publication.pubfractions_confirmed_by_authors %}
+ <li><a href="{% url 'journals:request_pubfrac_check' doi_label=publication.doi_label %}" class="btn btn-link">Email corresponding author to request check of this pubfraction allocation</a></li>
+ {% endif %}
+ <li><a href="{% url 'journals:manage_metadata' doi_label=publication.doi_label %}" class="btn btn-link">Back to Admin for {{ publication.doi_label }}</a></li>
+ </ul>
+ {% endif %}
+ </div>
+</div>
+
+{% endblock content %}
diff --git a/journals/templates/journals/author_affiliation_add.html b/journals/templates/journals/author_affiliation_add.html
index 0ee9710d40d7eedc59e1b1ff5a7380cb5867c408..84b44fe494b0551c6549357d8f1d5bcf188723a2 100644
--- a/journals/templates/journals/author_affiliation_add.html
+++ b/journals/templates/journals/author_affiliation_add.html
@@ -44,7 +44,7 @@
</form>
</div>
<div class="col-2">
- <p>Can't find it in the selector? <a href="{% url 'partners:organization_create' %}" target="_blank">Add a new organization to our database</a> (opens in new window)</p>
+ <p>Can't find it in the selector? <a href="{% url 'organizations:organization_create' %}" target="_blank">Add a new organization to our database</a> (opens in new window)</p>
</div>
</div>
</div>
diff --git a/journals/templates/journals/manage_metadata.html b/journals/templates/journals/manage_metadata.html
index 188e0ecb4abcc0a888dbff6e784f6bdf2dbf2c41..23b04ae30354444abbd6c36f9b0453a5991386bd 100644
--- a/journals/templates/journals/manage_metadata.html
+++ b/journals/templates/journals/manage_metadata.html
@@ -72,6 +72,7 @@ event: "focusin"
<th>Latest successful Crossref deposit</th>
<th>Deposit needs updating?</th>
<th>DOAJ</th>
+ <th>PubFracs fixed?</th>
</tr>
</thead>
@@ -90,9 +91,10 @@ event: "focusin"
<td>{{ publication|latest_successful_crossref_deposit }}</td>
<td>{{ publication.doideposit_needs_updating }}</td>
<td>{{ publication|latest_successful_DOAJ_deposit }}</td>
+ <td>{{ publication|pubfracs_fixed }}</td>
</tr>
<tr id="collapse{{ publication.id }}" class="collapse" role="tabpanel" aria-labelledby="heading{{ publication.id }}" style="background-color: #fff;">
- <td colspan="6" class="py-3">
+ <td colspan="7" class="py-3">
<div class="row">
{% if not publication.is_published %}
<div class="col-12">
@@ -220,7 +222,7 @@ event: "focusin"
</tr>
{% empty %}
<tr>
- <td colspan="6">No publications found.</td>
+ <td colspan="7">No publications found.</td>
</tr>
{% endfor %}
</tbody>
diff --git a/journals/templates/journals/manage_report_metadata.html b/journals/templates/journals/manage_report_metadata.html
index 07317f8b07546331bf04e584be4fcdad97475427..65c4229a33b0acc681dd47a233aaece3de6c0d23 100644
--- a/journals/templates/journals/manage_report_metadata.html
+++ b/journals/templates/journals/manage_report_metadata.html
@@ -23,6 +23,9 @@ event: "focusin"
<div class="rol">
<div class="col-12">
+ <a href="{% url 'journals:manage_report_metadata' %}?needing_update=True" method="GET">Only view Reports needing an update</a><br/>
+ <a href="{% url 'journals:manage_report_metadata' %}">View all Reports</a>
+ <br/><br/>
{% for page in reports.paginator.page_range %}
{% if forloop.counter != 1 %} | {% endif %}
<a href="?page={{ page }}">{{ page }}</a>
@@ -30,7 +33,6 @@ event: "focusin"
</div>
</div>
-
<table class="table table-hover mb-5">
<thead class="thead-default">
<tr>
diff --git a/journals/templates/partials/journals/admin/publication_actions.html b/journals/templates/partials/journals/admin/publication_actions.html
index 65650a191acd0e906494a0b8513eae95a7cc7c76..124a7967b1e596c378d021e9083758fff1a23511 100644
--- a/journals/templates/partials/journals/admin/publication_actions.html
+++ b/journals/templates/partials/journals/admin/publication_actions.html
@@ -10,6 +10,7 @@
<li><a href="{% url 'journals:metadata_xml_deposit' publication.doi_label 'deposit' %}">Deposit the metadata to Crossref</a></li>
<li><a href="{% url 'journals:produce_metadata_DOAJ' doi_label=publication.doi_label %}">Produce DOAJ metadata</a></li>
<li><a href="{% url 'journals:metadata_DOAJ_deposit' doi_label=publication.doi_label %}">Deposit the metadata to DOAJ</a></li>
+ <li><a href="{% url 'journals:allocate_orgpubfractions' doi_label=publication.doi_label %}">Allocate Org Pub Fractions</a></li>
<li><a href="{% url 'journals:harvest_citedby_links' publication.doi_label %}">Update Crossref cited-by links</a></li>
<li><a href="{% url 'journals:manage_metadata' doi_label=publication.doi_label %}">Metadata management page</a></li>
<li><a href="{% url 'journals:update_references' doi_label=publication.doi_label %}">Update references</a></li>
diff --git a/journals/templates/xml/publication_crossref.html b/journals/templates/xml/publication_crossref.html
index 98a53ad157bf65cca91983c0cdf094ecb47840b8..10f70218493076a53c3ac4683a8f67678b2cec0d 100644
--- a/journals/templates/xml/publication_crossref.html
+++ b/journals/templates/xml/publication_crossref.html
@@ -35,7 +35,7 @@
<journal_metadata>
<full_title>{{ publication.in_journal.get_name_display }}</full_title>
<abbrev_title>{{ publication.in_journal.abbreviation_citation }}</abbrev_title>
- <issn media_type='electronic'>{{ publication.in_journal.issn }}</issn>
+ {% if publication.in_journal.issn %}<issn media_type='electronic'>{{ publication.in_journal.issn }}</issn>{% endif %}
<doi_data>
<doi>{{ publication.in_journal.doi_string }}</doi>
<resource>https://scipost.org/{{ publication.in_journal.doi_string }}</resource>
diff --git a/journals/templatetags/journals_extras.py b/journals/templatetags/journals_extras.py
index 9d8950779ff50d3639d8abd490ab5050d2fa453e..e563322307212849ea971200baa210e618bbd92c 100644
--- a/journals/templatetags/journals_extras.py
+++ b/journals/templatetags/journals_extras.py
@@ -52,3 +52,8 @@ def latest_successful_crossref_deposit_comment(comment):
return latest.deposition_date.strftime('%Y-%m-%d')
else:
return "No successful deposit found"
+
+
+@register.filter(name='pubfracs_fixed')
+def pubfracs_fixed(publication):
+ return publication.pubfractions_confirmed_by_authors and publication.pubfractions_sum_to_1
diff --git a/journals/templatetags/lookup.py b/journals/templatetags/lookup.py
index d3f36fb2ceebf7df8ec3a6d3d9414c4e8b387d1d..6be75f8510203a570cf2b6430166ac8f6bdd15d5 100644
--- a/journals/templatetags/lookup.py
+++ b/journals/templatetags/lookup.py
@@ -10,7 +10,7 @@ from ajax_select import register, LookupChannel
from ..models import Publication
from funders.models import Funder, Grant
-from partners.models import Organization
+from organizations.models import Organization
@register('publication_lookup')
diff --git a/journals/urls/general.py b/journals/urls/general.py
index 31c9fe6f08533b8b4382db78eefcbcf1b8312617..3ddd5a071c652791c1fe0b5ac6e04bb388f02334 100644
--- a/journals/urls/general.py
+++ b/journals/urls/general.py
@@ -135,6 +135,14 @@ urlpatterns = [
journals_views.email_object_made_citable,
name='email_object_made_citable'),
+ # PubFraction allocation:
+ url(r'^allocate_orgpubfractions/(?P<doi_label>{regex})$'.format(regex=PUBLICATION_DOI_REGEX),
+ journals_views.allocate_orgpubfractions,
+ name='allocate_orgpubfractions'),
+ url(r'^request_pubfrac_check/(?P<doi_label>{regex})$'.format(regex=PUBLICATION_DOI_REGEX),
+ journals_views.request_pubfrac_check,
+ name='request_pubfrac_check'),
+
# Citedby
url(r'^admin/citedby/$',
journals_views.harvest_citedby_list,
@@ -161,4 +169,4 @@ urlpatterns = [
url(r'^comments/(?P<comment_id>[0-9]+)/mark_doi_needed/(?P<needed>[0-1])$',
journals_views.mark_comment_doi_needed,
name='mark_comment_doi_needed'),
-]
+ ]
diff --git a/journals/views.py b/journals/views.py
index 3c843d7cf0b1cb909746995011507dbe6dbf41bb..d4a59d242916b45a98b900e59cedcd3f66ff4706 100644
--- a/journals/views.py
+++ b/journals/views.py
@@ -20,6 +20,7 @@ from django.core.urlresolvers import reverse, reverse_lazy
from django.conf import settings
from django.contrib import messages
from django.db import transaction
+from django.db.models import Q
from django.http import Http404, HttpResponse
from django.utils import timezone
from django.utils.decorators import method_decorator
@@ -31,20 +32,22 @@ from django.shortcuts import get_object_or_404, get_list_or_404, render, redirec
from .constants import STATUS_DRAFT, PUBLICATION_PREPUBLISHED
from .models import Journal, Issue, Publication, Deposit, DOAJDeposit,\
- GenericDOIDeposit, PublicationAuthorsTable
+ GenericDOIDeposit, PublicationAuthorsTable, OrgPubFraction
from .forms import AbstractJATSForm, FundingInfoForm,\
UnregisteredAuthorForm, AuthorsTableOrganizationSelectForm,\
CreateMetadataXMLForm, CitationListBibitemsForm,\
ReferenceFormSet, CreateMetadataDOAJForm, DraftPublicationForm,\
PublicationGrantsForm, DraftPublicationApprovalForm, PublicationPublishForm,\
- PublicationAuthorOrderingFormSet
+ PublicationAuthorOrderingFormSet, OrgPubFractionsFormSet
from .mixins import PublicationMixin, ProdSupervisorPublicationPermissionMixin
from .utils import JournalUtils
from comments.models import Comment
from funders.forms import FunderSelectForm, GrantSelectForm
from funders.models import Grant
-from partners.models import Organization
+from mails.views import MailEditingSubView
+from organizations.models import Organization
+from submissions.constants import STATUS_PUBLISHED
from submissions.models import Submission, Report
from scipost.constants import SCIPOST_SUBJECT_AREAS
from scipost.forms import ConfirmationForm
@@ -737,6 +740,66 @@ def metadata_DOAJ_deposit(request, doi_label):
kwargs={'doi_label': publication.doi_label}))
+@login_required
+def allocate_orgpubfractions(request, doi_label):
+ """
+ Set the relative support obtained from Organizations
+ for the research contained in a Publication.
+
+ This view is accessible to EdAdmin as well as to the corresponding author
+ of the Publication.
+ """
+ publication = get_object_or_404(Publication, doi_label=doi_label)
+ if not request.user.is_authenticated:
+ raise Http404
+ elif not (request.user == publication.accepted_submission.submitted_by.user or
+ request.user.has_perm('scipost.can_publish_accepted_submission')):
+ raise Http404
+ initial = []
+ if not publication.pubfractions.all().exists():
+ # Create new OrgPubFraction objects from existing data, spreading weight evenly
+ for org in publication.get_organizations():
+ pubfrac = OrgPubFraction(publication=publication,
+ organization=org, fraction=0)
+ pubfrac.save()
+ formset = OrgPubFractionsFormSet(request.POST or None,
+ queryset=publication.pubfractions.all())
+ if formset.is_valid():
+ formset.save()
+ if request.user == publication.accepted_submission.submitted_by.user:
+ publication.pubfractions_confirmed_by_authors = True
+ publication.save()
+ messages.success(request, 'Funding fractions successfully allocated.')
+ return redirect(publication.get_absolute_url())
+ context = {
+ 'publication': publication,
+ 'formset': formset,
+ }
+ return render(request, 'journals/allocate_orgpubfractions.html', context)
+
+
+@login_required
+@permission_required('scipost.can_publish_accepted_submission', return_403=True)
+def request_pubfrac_check(request, doi_label):
+ """
+ This view is used by EdAdmin to request confirmation of the OrgPubFractions
+ for a given Publication.
+
+ This occurs post-publication, after all the affiliations and funders have
+ been confirmed.
+ """
+ publication = get_object_or_404(Publication, doi_label=doi_label)
+ mail_request = MailEditingSubView(
+ request, mail_code='authors/request_pubfrac_check', instance=publication)
+ if mail_request.is_valid():
+ messages.success(request, 'The corresponding author has been emailed.')
+ mail_request.send()
+ return redirect(reverse('journals:manage_metadata',
+ kwargs={'doi_label': publication.doi_label}))
+ else:
+ return mail_request.return_render()
+
+
@permission_required('scipost.can_publish_accepted_submission', return_403=True)
def mark_doaj_deposit_success(request, deposit_id, success):
deposit = get_object_or_404(DOAJDeposit, pk=deposit_id)
@@ -889,6 +952,12 @@ def manage_report_metadata(request):
the metadata of Reports.
"""
reports = Report.objects.all()
+ needing_update = request.GET.get('needing_update')
+ if needing_update == 'True':
+ reports = reports.filter(
+ Q(needs_doi=None) |
+ Q(needs_doi=True, doideposit_needs_updating=True)).filter(
+ submission__status=STATUS_PUBLISHED)
paginator = Paginator(reports, 25)
page = request.GET.get('page')
diff --git a/mails/views.py b/mails/views.py
index 3edfaece211d481dc122acf1e5fde210d8abff6c..441de09f6678fd0e7ae8a138c53969ec8718d538 100644
--- a/mails/views.py
+++ b/mails/views.py
@@ -80,6 +80,7 @@ class MailEditorMixin:
if not self.has_permission_to_send_mail:
# Don't use the mail form; don't send out the mail.
return super().post(request, *args, **kwargs)
+ self.object = self.get_object()
form = self.get_form()
if form.is_valid():
self.mail_form = EmailTemplateForm(request.POST or None, mail_code=self.mail_code,
diff --git a/organizations/__init__.py b/organizations/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/organizations/admin.py b/organizations/admin.py
new file mode 100644
index 0000000000000000000000000000000000000000..8d33bd306da296a3d6f985c8f8377092312dde73
--- /dev/null
+++ b/organizations/admin.py
@@ -0,0 +1,15 @@
+__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__license__ = "AGPL v3"
+
+
+from django.contrib import admin
+
+from .models import Organization
+
+
+
+class OrganizationAdmin(admin.ModelAdmin):
+ search_fields = ['name', 'acronym']
+
+
+admin.site.register(Organization, OrganizationAdmin)
diff --git a/organizations/apps.py b/organizations/apps.py
new file mode 100644
index 0000000000000000000000000000000000000000..fe588afadb395afd1f7558f333825fbfc57fe295
--- /dev/null
+++ b/organizations/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class OrganizationsConfig(AppConfig):
+ name = 'organizations'
diff --git a/organizations/constants.py b/organizations/constants.py
new file mode 100644
index 0000000000000000000000000000000000000000..06ecf272b554cd307f0c89e52bf3be7d34c81b02
--- /dev/null
+++ b/organizations/constants.py
@@ -0,0 +1,65 @@
+__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__license__ = "AGPL v3"
+
+
+import datetime
+
+ORGTYPE_RESEARCH_INSTITUTE = 'ResearchRnstitute'
+ORGTYPE_INTERNATIONAL_FUNDING_AGENCY = 'InternationalFundingAgency'
+ORGTYPE_NATIONAL_FUNDING_AGENCY = 'NationalFundingAgency'
+ORGTYPE_FUNDING_AGENCY_INITIATIVE = 'FundingAgencyInitiative'
+ORGTYPE_NATIONAL_LABORATORY = 'NationalLaboratory'
+ORGTYPE_NATIONAL_LIBRARY = 'NationalLibrary'
+ORGTYPE_NATIONAL_ACADEMY = 'NationalAcademy'
+ORGTYPE_UNIVERSITY_LIBRARY = 'UniversityLibrary'
+ORGTYPE_RESEARCH_LIBRARY = 'ResearchLibrary'
+ORGTYPE_PROFESSIONAL_SOCIETY = 'ProfessionalSociety'
+ORGTYPE_INTERNATIONAL_CONSORTIUM = 'InternationalConsortium'
+ORGTYPE_NATIONAL_CONSORTIUM = 'NationalConsortium'
+ORGTYPE_FOUNDATION = 'Foundation'
+ORGTYPE_GOVERNMENT_INTERNATIONAL = 'GovernmentInternational'
+ORGTYPE_GOVERNMENT_NATIONAL = 'GovernmentNational'
+ORGTYPE_GOVERNMENT_PROVINCIAL = 'GovernmentProvincial'
+ORGTYPE_GOVERNMENT_REGIONAL = 'GovernmentRegional'
+ORGTYPE_GOVERNMENT_MUNICIPAL = 'GovernmentMunicipal'
+ORGTYPE_GOVERNMENTAL_MINISTRY = 'GovernmentalMinistry'
+ORGTYPE_GOVERNMENTAL_OFFICE = 'GovernmentalOffice'
+ORGTYPE_BUSINESS_CORPORATION = 'BusinessCorporation'
+ORGTYPE_INDIVIDUAL_BENEFACTOR = 'IndividualBenefactor'
+ORGTYPE_PRIVATE_BENEFACTOR = 'PrivateBenefactor'
+
+ORGANIZATION_TYPES = (
+ (ORGTYPE_RESEARCH_INSTITUTE, 'Research Institute'),
+ (ORGTYPE_INTERNATIONAL_FUNDING_AGENCY, 'International Funding Agency'),
+ (ORGTYPE_NATIONAL_FUNDING_AGENCY, 'National Funding Agency'),
+ (ORGTYPE_FUNDING_AGENCY_INITIATIVE, 'Funding Agency Initiative'),
+ (ORGTYPE_NATIONAL_LABORATORY, 'National Laboratory'),
+ (ORGTYPE_NATIONAL_LIBRARY, 'National Library'),
+ (ORGTYPE_NATIONAL_ACADEMY, 'National Academy'),
+ (ORGTYPE_UNIVERSITY_LIBRARY, 'University (and its Library)'),
+ (ORGTYPE_RESEARCH_LIBRARY, 'Research Library'),
+ (ORGTYPE_PROFESSIONAL_SOCIETY, 'Professional Society'),
+ (ORGTYPE_INTERNATIONAL_CONSORTIUM, 'International Consortium'),
+ (ORGTYPE_NATIONAL_CONSORTIUM, 'National Consortium'),
+ (ORGTYPE_FOUNDATION, 'Foundation'),
+ (ORGTYPE_GOVERNMENT_INTERNATIONAL, 'Government (international)'),
+ (ORGTYPE_GOVERNMENT_NATIONAL, 'Government (national)'),
+ (ORGTYPE_GOVERNMENT_PROVINCIAL, 'Government (provincial)'),
+ (ORGTYPE_GOVERNMENT_REGIONAL, 'Government (regional)'),
+ (ORGTYPE_GOVERNMENT_MUNICIPAL, 'Government (municipal)'),
+ (ORGTYPE_GOVERNMENTAL_MINISTRY, 'Governmental Ministry'),
+ (ORGTYPE_GOVERNMENTAL_OFFICE, 'Governmental Office'),
+ (ORGTYPE_BUSINESS_CORPORATION, 'Business Corporation'),
+ (ORGTYPE_INDIVIDUAL_BENEFACTOR, 'Individual Benefactor'),
+ (ORGTYPE_PRIVATE_BENEFACTOR, 'Private Benefactor'),
+)
+
+ORGSTATUS_ACTIVE = 'Active'
+ORGSTATUS_SUPERSEDED = 'Superseded'
+ORGSTATUS_OBSOLETE = 'Obsolete'
+
+ORGANIZATION_STATUSES = (
+ (ORGSTATUS_ACTIVE, 'Active'),
+ (ORGSTATUS_SUPERSEDED, 'Superseded'),
+ (ORGSTATUS_OBSOLETE, 'Obsolete'),
+)
diff --git a/organizations/migrations/0001_initial.py b/organizations/migrations/0001_initial.py
new file mode 100644
index 0000000000000000000000000000000000000000..3b440146b940e65f5cdd0e22433fc29e721c213a
--- /dev/null
+++ b/organizations/migrations/0001_initial.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-09-22 11:21
+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):
+
+ initial = True
+
+ dependencies = [
+ ]
+
+ 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', '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)),
+ ('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)),
+ ('cf_nr_associated_publications', models.PositiveIntegerField(blank=True, help_text='NB: nr_associated_publications is a calculated field. Do not modify.', null=True)),
+ ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='children', to='organizations.Organization')),
+ ('superseded_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='organizations.Organization')),
+ ],
+ options={
+ 'ordering': ['country', 'name'],
+ },
+ ),
+ ]
diff --git a/organizations/migrations/0002_populate_from_partners_org.py b/organizations/migrations/0002_populate_from_partners_org.py
new file mode 100644
index 0000000000000000000000000000000000000000..a6ffbfb04bc83c9b50be73888eb5333be53436a3
--- /dev/null
+++ b/organizations/migrations/0002_populate_from_partners_org.py
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-09-22 11:24
+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()
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('organizations', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.RunPython(populate_organization_from_partners_orgs,
+ reverse_code=migrations.RunPython.noop),
+ ]
diff --git a/organizations/migrations/__init__.py b/organizations/migrations/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/organizations/models.py b/organizations/models.py
new file mode 100644
index 0000000000000000000000000000000000000000..60bd72d2d65230c36a32c9c734862199b48653de
--- /dev/null
+++ b/organizations/models.py
@@ -0,0 +1,137 @@
+__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__license__ = "AGPL v3"
+
+
+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 ORGANIZATION_TYPES, ORGANIZATION_STATUSES, ORGSTATUS_ACTIVE
+
+from journals.models import Publication, PublicationAuthorsTable, OrgPubFraction
+
+class Organization(models.Model):
+ """
+ An Organization instance is any type of administrative unit which SciPost
+ can interact with. Example types include universities, funding agencies,
+ research institutes etc.
+
+ All instances can only be created by SciPost administration-level personnel,
+ and can thus be considered as verified.
+
+ These objects are meant to be internally linked to all other types of
+ (possibly user-defined) objects used throughout the site (such as Institutions,
+ Partners, Affiliations, Funders etc). This enables relating all of SciPost's
+ services to the organizations which are impacted by its activities.
+
+ The data here is also meant to be cross-linked to external databases,
+ for example the Global Research Identifier Database (GRID), Crossref,
+ ORCID etc.
+ """
+ orgtype = models.CharField(max_length=32, choices=ORGANIZATION_TYPES)
+ status = models.CharField(max_length=32, choices=ORGANIZATION_STATUSES,
+ default=ORGSTATUS_ACTIVE)
+ name = models.CharField(max_length=256,
+ help_text="Western version of name")
+ name_original = models.CharField(max_length=256, blank=True,
+ help_text="Name (in original language)")
+ acronym = models.CharField(max_length=64, blank=True,
+ help_text='Acronym or short name')
+ country = CountryField()
+ address = models.TextField(blank=True)
+ logo = models.ImageField(upload_to='organizations/logos/', blank=True)
+ css_class = models.CharField(max_length=256, blank=True,
+ verbose_name="Additional logo CSS class")
+ grid_json = JSONField(default={}, blank=True, null=True) # JSON data from GRID
+ crossref_json = JSONField(default={}, blank=True, null=True) # JSON data from Crossref
+ parent = models.ForeignKey('self', blank=True, null=True,
+ on_delete=models.SET_NULL, related_name='children')
+ superseded_by = models.ForeignKey('self', blank=True, null=True,
+ on_delete=models.SET_NULL)
+ # Calculated fields (to save CPU; field name always starts with cf_)
+ # Number of associated publications; needs to be updated when any related
+ # affiliation, grant or f
+ cf_nr_associated_publications = models.PositiveIntegerField(
+ blank=True, null=True,
+ help_text='NB: nr_associated_publications is a calculated field. Do not modify.')
+
+ class Meta:
+ ordering = ['country', 'name']
+
+ def __str__(self):
+ return self.name
+
+ @property
+ def full_name(self):
+ full_name_str = ""
+ if self.name_original:
+ full_name_str += "%s / " % self.name_original
+ full_name_str += "%s" % self
+ return full_name_str
+
+ @property
+ def full_name_with_acronym(self):
+ full_name_str = ""
+ if self.acronym:
+ full_name_str += "[%s] " % self.acronym
+ return full_name_str + self.full_name
+
+ def get_absolute_url(self):
+ return reverse('organizations:organization_details', args=(self.id,))
+
+ def get_publications(self):
+ return Publication.objects.filter(
+ models.Q(authors__affiliations__in=[self]) |
+ models.Q(grants__funder__organization=self) |
+ models.Q(funders_generic__organization=self)).distinct()
+
+ def count_publications(self):
+ return self.get_publications().count()
+
+ def update_cf_nr_associated_publications(self):
+ """
+ Update the calculated field Organization:cf_nr_associated_publications.
+ """
+ self.cf_nr_associated_publications = self.count_publications()
+ self.save()
+
+ def pubfractions_in_year(self, year):
+ """
+ Returns the sum of pubfractions for the given year.
+ """
+ return OrgPubFraction.objects.filter(
+ organization=self,
+ publication__publication_date__year=year
+ ).aggregate(Sum('fraction'))['fraction__sum']
+
+ def get_contributor_authors(self):
+ return self.publicationauthorstable_set.select_related(
+ 'contributor').order_by('contributor__user__last_name')
+
+ def get_unregistered_authors(self):
+ return self.publicationauthorstable_set.select_related(
+ 'unregistered_author').order_by('unregistered_author__last_name')
+
+ @property
+ def has_current_agreement(self):
+ """
+ Check if this organization has a current Partnership agreement.
+ """
+ if not self.partner:
+ return False
+ return self.partner.agreements.now_active().exists()
+
+ def get_total_contribution_obtained(self, n_years_past=None):
+ """
+ Computes the contribution obtained from this organization,
+ summed over all time.
+ """
+ contrib = 0
+ now = timezone.now().date()
+ for agreement in self.partner.agreements.all():
+ contrib += agreement.offered_yearly_contribution * int(agreement.duration.days/365)
+ return contrib
diff --git a/partners/templates/partners/_organization_card.html b/organizations/templates/organizations/_organization_card.html
similarity index 83%
rename from partners/templates/partners/_organization_card.html
rename to organizations/templates/organizations/_organization_card.html
index 0dfa94a133921891dc5d1f74626e59da917ab14a..502d3455988f94e8eb11d8fbbf3dbdf2074a61cf 100644
--- a/partners/templates/partners/_organization_card.html
+++ b/organizations/templates/organizations/_organization_card.html
@@ -1,5 +1,7 @@
{% load bootstrap %}
+{% load organizations_extras %}
+
<div class="card-body">
<div class="row">
@@ -11,7 +13,7 @@
</li>
{% endif %}
<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">Associated Publications</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 & PubFractions</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>
@@ -34,21 +36,26 @@
{% if perms.scipost.can_manage_organizations %}
<div class="tab-pane pt-4" id="details-{{ org.id }}" role="tabpanel" aria-labelledby="details-{{ org.id }}-tab">
<h3>Details:</h3>
- {% include 'partners/_organization_details_contents.html' with org=org %}
+ {% include 'organizations/_organization_details_contents.html' with org=org %}
</div>
{% endif %}
<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:</h3>
+ <h3>Publications associated to this Organization <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>:</h3>
+ {% for pubyear in pubyears %}
+ <h4>{{ pubyear }} <span class="text-muted small">(total pubfractions: {{ org|pubfractions_in_year:pubyear }})</span></h4>
<ul>
{% for publication in org.get_publications %}
+ {% if publication.publication_date|date:'Y'|add:"0" == pubyear %}
<li>
<a href="{{ publication.get_absolute_url }}">{{ publication.title }}</a>
<br>by {{ publication.author_list }},
<br>{{ publication.citation }}
</li>
+ {% endif %}
{% endfor %}
</ul>
+ {% endfor %}
</div>
<div class="tab-pane pt-4" id="authors-{{ org.id }}" role="tabpanel" aria-labelledby="authors-{{ org.id }}-tab">
@@ -125,8 +132,8 @@
{% if perms.scipost.can_manage_organizations %}
<h3>Manage this organization:</h3>
<ul>
- <li><a href="{% url 'partners:organization_update' pk=org.id %}">Update</a></li>
- <li><a href="{% url 'partners:organization_delete' pk=org.id %}">Delete</a></li>
+ <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 %}
diff --git a/partners/templates/partners/_organization_details_contents.html b/organizations/templates/organizations/_organization_details_contents.html
similarity index 100%
rename from partners/templates/partners/_organization_details_contents.html
rename to organizations/templates/organizations/_organization_details_contents.html
diff --git a/organizations/templates/organizations/base.html b/organizations/templates/organizations/base.html
new file mode 100644
index 0000000000000000000000000000000000000000..d90989f645ce5c61b35e66a2aecc7914abc8d157
--- /dev/null
+++ b/organizations/templates/organizations/base.html
@@ -0,0 +1,15 @@
+{% extends 'scipost/base.html' %}
+
+{% block body_class %}{{ block.super }} organizations{% endblock %}
+
+{% block breadcrumb %}
+ <div class="container-outside header">
+ <div class="container">
+ <nav class="breadcrumb hidden-sm-down">
+ {% block breadcrumb_items %}
+ <a href="{% url 'organizations:organizations' %}" class="breadcrumb-item">Organizations</a>
+ {% endblock %}
+ </nav>
+ </div>
+ </div>
+{% endblock %}
diff --git a/partners/templates/partners/organization_confirm_delete.html b/organizations/templates/organizations/organization_confirm_delete.html
similarity index 100%
rename from partners/templates/partners/organization_confirm_delete.html
rename to organizations/templates/organizations/organization_confirm_delete.html
diff --git a/partners/templates/partners/organization_create.html b/organizations/templates/organizations/organization_create.html
similarity index 75%
rename from partners/templates/partners/organization_create.html
rename to organizations/templates/organizations/organization_create.html
index 2cecb460307fffd15988893c5efedd1dd7c9d2b5..c95ac6966833b1f9d9408f0bfdab13f4468263a6 100644
--- a/partners/templates/partners/organization_create.html
+++ b/organizations/templates/organizations/organization_create.html
@@ -7,7 +7,7 @@
{% block content %}
<div class="row">
<div class="col-12">
- <form action="{% url 'partners:organization_create' %}" method="post" enctype="multipart/form-data">
+ <form action="{% url 'organizations:organization_create' %}" method="post" enctype="multipart/form-data">
{% csrf_token %}
{{ form|bootstrap }}
<input type="submit" value="Submit" class="btn btn-primary">
diff --git a/organizations/templates/organizations/organization_detail.html b/organizations/templates/organizations/organization_detail.html
new file mode 100644
index 0000000000000000000000000000000000000000..10474db59bf5f62f5599f5d362ef1866c67a4458
--- /dev/null
+++ b/organizations/templates/organizations/organization_detail.html
@@ -0,0 +1,23 @@
+{% extends 'organizations/base.html' %}
+
+{% load bootstrap %}
+
+{% block pagetitle %}: Organization details{% endblock pagetitle %}
+
+{% block breadcrumb_items %}
+{{ block.super }}
+<span class="breadcrumb-item">{{ organization }}</span>
+{% endblock %}
+
+{% block content %}
+
+<h1 class="highlight">{{ organization }}</h1>
+
+<div class="row">
+ <div class="col-12">
+ {% include 'organizations/_organization_card.html' with org=organization pubyears=pubyears %}
+ </div>
+</div>
+
+
+{% endblock content %}
diff --git a/partners/templates/partners/organization_list.html b/organizations/templates/organizations/organization_list.html
similarity index 64%
rename from partners/templates/partners/organization_list.html
rename to organizations/templates/organizations/organization_list.html
index 3f3a79d72ac93f044565521255053e8f4cf9022b..75503090fc39ae834cdc9895c8ceeb736b0df162 100644
--- a/partners/templates/partners/organization_list.html
+++ b/organizations/templates/organizations/organization_list.html
@@ -1,9 +1,24 @@
-{% extends 'scipost/base.html' %}
+{% extends 'organizations/base.html' %}
{% block pagetitle %}: Organizations{% endblock pagetitle %}
{% load staticfiles %}
-{% load partners_extras %}
+{% load organizations_extras %}
+
+{% block headsup %}
+<script type="text/javascript">
+$(document).ready(function($) {
+ $(".table-row").click(function() {
+ window.document.location = $(this).data("href");
+ });
+});
+</script>
+{% endblock headsup %}
+
+{% block breadcrumb_items %}
+{{ block.super }}
+<span class="breadcrumb-item">Organizations</span>
+{% endblock %}
{% block content %}
<div class="row">
@@ -12,7 +27,7 @@
{% if perms.scipost.can_manage_organizations %}
<h3>Management actions:</h3>
<ul>
- <li><a href="{% url 'partners:organization_create' %}">Create a new Organization instance</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>
</ul>
{% endif %}
@@ -22,7 +37,30 @@
<div class="row">
<div class="col-12">
- <p>Click on a row to see more details about the Organization</p>
+ <h3>This page lists Organizations which have benefitted from SciPost's publishing activities.</h3>
+ </div>
+</div>
+
+
+<div class="row">
+ <div class="col-5">
+ <p>Organizations are linked through being in a publication's author affiliations, grant-giving agencies or explicit support acknowledgements.</p>
+ <p>For each Organization, the NAP (number of associated publications) is given (you can order in decreasing/increasing NAP using the header arrows).</p>
+ </div>
+ <div class="col-1"></div>
+ <div class="col-5">
+ <p>Click on a row to see more details about the Organization, including per-year breakdowns of:</p>
+ <ul>
+ <li>associated publications</li>
+ <li>associated support fractions</li>
+ <li>associated authors</li>
+ <li>partnership history</li>
+ </ul>
+ </div>
+</div>
+
+<div class="row">
+ <div class="col-12">
<table class="table table-hover mb-5">
<thead class="thead-default">
<tr>
@@ -35,9 +73,9 @@
<th>Partner?</th>
</tr>
</thead>
- <tbody id="accordion" role="tablist" aria-multiselectable="true">
+ <tbody>
{% for org in object_list %}
- <tr data-toggle="collapse" data-parent="#accordion" href="#collapse{{ org.id }}" aria-expanded="true" aria-controls="collapse{{ org.id }}" style="cursor: pointer;">
+ <tr class="table-row" data-href="{% url 'organizations:organization_details' pk=org.id %}" target="_blank" style="cursor: pointer;">
<td><img src="{{ org.country.flag }}" alt="{{ org.country }} flag"/> <span class="text-muted"><small>[{{ org.country }}]</small></span> {{ org.get_country_display }}</td>
<td>
{{ org.full_name }} <small>{% if org.acronym %}[{{ org.acronym }}]{% endif %}</small>
@@ -67,11 +105,6 @@
{% endif %}
<td></td>
</tr>
- <tr id="collapse{{ org.id }}" class="collapse" role="tabpanel" aria-labbeledby="heading{{ org.id }}" style="background-color: #fff;">
- <td colspan="4">
- {% include 'partners/_organization_card.html' with org=org %}
- </td>
- </tr>
{% empty %}
<tr><td colspan="4">No organizations found</td></tr>
{% endfor %}
@@ -80,4 +113,5 @@
</div>
</div>
+
{% endblock content %}
diff --git a/partners/templates/partners/organization_update.html b/organizations/templates/organizations/organization_update.html
similarity index 73%
rename from partners/templates/partners/organization_update.html
rename to organizations/templates/organizations/organization_update.html
index 2f101032dcbd303b1d0d015accacde4d67d484c4..3f1f452fc400ced1c827c11fd8dd6ff6d5b4c0ea 100644
--- a/partners/templates/partners/organization_update.html
+++ b/organizations/templates/organizations/organization_update.html
@@ -7,7 +7,7 @@
{% block content %}
<div class="row">
<div class="col-12">
- <form action="{% url 'partners:organization_update' pk=object.id %}" method="post" enctype="multipart/form-data">
+ <form action="{% url 'organizations:organization_update' pk=object.id %}" method="post" enctype="multipart/form-data">
{% csrf_token %}
{{ form|bootstrap }}
<input type="submit" value="Submit" class="btn btn-primary">
diff --git a/organizations/templatetags/organizations_extras.py b/organizations/templatetags/organizations_extras.py
new file mode 100644
index 0000000000000000000000000000000000000000..80a183688a112db69594742ba6b3e35d52817ccf
--- /dev/null
+++ b/organizations/templatetags/organizations_extras.py
@@ -0,0 +1,12 @@
+__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__license__ = "AGPL v3"
+
+
+from django import template
+
+register = template.Library()
+
+
+@register.filter(name='pubfractions_in_year')
+def pubfractions_in_year(org, year):
+ return org.pubfractions_in_year(int(year))
diff --git a/organizations/tests.py b/organizations/tests.py
new file mode 100644
index 0000000000000000000000000000000000000000..7ce503c2dd97ba78597f6ff6e4393132753573f6
--- /dev/null
+++ b/organizations/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/organizations/urls.py b/organizations/urls.py
new file mode 100644
index 0000000000000000000000000000000000000000..ecfa582c482686c60c16c2661649dd6864209707
--- /dev/null
+++ b/organizations/urls.py
@@ -0,0 +1,35 @@
+__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__license__ = "AGPL v3"
+
+
+from django.conf.urls import url
+
+from . import views
+
+urlpatterns = [
+ url(
+ r'^$',
+ views.OrganizationListView.as_view(),
+ name='organizations'
+ ),
+ url(
+ r'^add/$',
+ views.OrganizationCreateView.as_view(),
+ name='organization_create'
+ ),
+ url(
+ r'^(?P<pk>[0-9]+)/update/$',
+ views.OrganizationUpdateView.as_view(),
+ name='organization_update'
+ ),
+ url(
+ r'^(?P<pk>[0-9]+)/delete/$',
+ views.OrganizationDeleteView.as_view(),
+ name='organization_delete'
+ ),
+ url(
+ r'^(?P<pk>[0-9]+)/$',
+ views.OrganizationDetailView.as_view(),
+ name='organization_details'
+ ),
+]
diff --git a/organizations/views.py b/organizations/views.py
new file mode 100644
index 0000000000000000000000000000000000000000..8311375d3d3e2a4155608418b3d0b482010382a3
--- /dev/null
+++ b/organizations/views.py
@@ -0,0 +1,81 @@
+__copyright__ = "Copyright 2016-2018, Stichting SciPost (SciPost Foundation)"
+__license__ = "AGPL v3"
+
+
+from django.core.urlresolvers import reverse_lazy
+from django.shortcuts import render
+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 .models import Organization
+
+from funders.models import Funder
+
+from scipost.mixins import PermissionsMixin
+
+
+class OrganizationCreateView(PermissionsMixin, CreateView):
+ """
+ Create a new Organization.
+ """
+ permission_required = 'scipost.can_manage_organizations'
+ model = Organization
+ fields = '__all__'
+ template_name = 'organizations/organization_create.html'
+ success_url = reverse_lazy('organizations:organizations')
+
+
+class OrganizationUpdateView(PermissionsMixin, UpdateView):
+ """
+ Update an Organization.
+ """
+ permission_required = 'scipost.can_manage_organizations'
+ model = Organization
+ fields = '__all__'
+ template_name = 'organizations/organization_update.html'
+ success_url = reverse_lazy('organizations:organizations')
+
+
+class OrganizationDeleteView(PermissionsMixin, DeleteView):
+ """
+ Delete an Organization.
+ """
+ permission_required = 'scipost.can_manage_organizations'
+ model = Organization
+ success_url = reverse_lazy('organizations:organizations')
+
+
+class OrganizationListView(ListView):
+ model = Organization
+
+ 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['pubyears'] = range(int(timezone.now().strftime('%Y')), 2015, -1)
+ return context
+
+ def get_queryset(self):
+ qs = super().get_queryset()
+ order_by = self.request.GET.get('order_by')
+ ordering = self.request.GET.get('ordering')
+ 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')
+ if ordering == 'desc':
+ qs = qs.reverse()
+ return qs
+
+
+class OrganizationDetailView(DetailView):
+ model = Organization
+
+ def get_context_data(self, *args, **kwargs):
+ context = super().get_context_data(*args, **kwargs)
+ context['pubyears'] = range(int(timezone.now().strftime('%Y')), 2015, -1)
+ return context
diff --git a/partners/admin.py b/partners/admin.py
index acd2924df96935ed2afb7e8e5ee82f1599e48038..8e0c86879af58dd987dae79e0379034f004ab618 100644
--- a/partners/admin.py
+++ b/partners/admin.py
@@ -4,15 +4,11 @@ __license__ = "AGPL v3"
from django.contrib import admin
-from .models import Organization, Contact, Partner, Consortium, Institution,\
+from .models import Contact, Partner, Consortium, Institution,\
ProspectivePartner, ProspectiveContact, ProspectivePartnerEvent,\
MembershipAgreement, ContactRequest, PartnersAttachment
-class OrganizationAdmin(admin.ModelAdmin):
- search_fields = ['name', 'acronym']
-
-
class AttachmentInline(admin.TabularInline):
model = PartnersAttachment
@@ -60,7 +56,6 @@ class MembershipAgreementAdmin(admin.ModelAdmin):
)
-admin.site.register(Organization, OrganizationAdmin)
admin.site.register(Partner, PartnerAdmin)
admin.site.register(Consortium)
admin.site.register(Contact)
diff --git a/partners/constants.py b/partners/constants.py
index cc6c516fd76c632c4ebb6d1bb8f40c1df3b0f83d..02a5e5da0d48941562a34f07c819af79968cf471 100644
--- a/partners/constants.py
+++ b/partners/constants.py
@@ -4,67 +4,6 @@ __license__ = "AGPL v3"
import datetime
-ORGTYPE_RESEARCH_INSTITUTE = 'ResearchRnstitute'
-ORGTYPE_INTERNATIONAL_FUNDING_AGENCY = 'InternationalFundingAgency'
-ORGTYPE_NATIONAL_FUNDING_AGENCY = 'NationalFundingAgency'
-ORGTYPE_FUNDING_AGENCY_INITIATIVE = 'FundingAgencyInitiative'
-ORGTYPE_NATIONAL_LABORATORY = 'NationalLaboratory'
-ORGTYPE_NATIONAL_LIBRARY = 'NationalLibrary'
-ORGTYPE_NATIONAL_ACADEMY = 'NationalAcademy'
-ORGTYPE_UNIVERSITY_LIBRARY = 'UniversityLibrary'
-ORGTYPE_RESEARCH_LIBRARY = 'ResearchLibrary'
-ORGTYPE_PROFESSIONAL_SOCIETY = 'ProfessionalSociety'
-ORGTYPE_INTERNATIONAL_CONSORTIUM = 'InternationalConsortium'
-ORGTYPE_NATIONAL_CONSORTIUM = 'NationalConsortium'
-ORGTYPE_FOUNDATION = 'Foundation'
-ORGTYPE_GOVERNMENT_INTERNATIONAL = 'GovernmentInternational'
-ORGTYPE_GOVERNMENT_NATIONAL = 'GovernmentNational'
-ORGTYPE_GOVERNMENT_PROVINCIAL = 'GovernmentProvincial'
-ORGTYPE_GOVERNMENT_REGIONAL = 'GovernmentRegional'
-ORGTYPE_GOVERNMENT_MUNICIPAL = 'GovernmentMunicipal'
-ORGTYPE_GOVERNMENTAL_MINISTRY = 'GovernmentalMinistry'
-ORGTYPE_GOVERNMENTAL_OFFICE = 'GovernmentalOffice'
-ORGTYPE_BUSINESS_CORPORATION = 'BusinessCorporation'
-ORGTYPE_INDIVIDUAL_BENEFACTOR = 'IndividualBenefactor'
-ORGTYPE_PRIVATE_BENEFACTOR = 'PrivateBenefactor'
-
-ORGANIZATION_TYPES = (
- (ORGTYPE_RESEARCH_INSTITUTE, 'Research Institute'),
- (ORGTYPE_INTERNATIONAL_FUNDING_AGENCY, 'International Funding Agency'),
- (ORGTYPE_NATIONAL_FUNDING_AGENCY, 'National Funding Agency'),
- (ORGTYPE_FUNDING_AGENCY_INITIATIVE, 'Funding Agency Initiative'),
- (ORGTYPE_NATIONAL_LABORATORY, 'National Laboratory'),
- (ORGTYPE_NATIONAL_LIBRARY, 'National Library'),
- (ORGTYPE_NATIONAL_ACADEMY, 'National Academy'),
- (ORGTYPE_UNIVERSITY_LIBRARY, 'University (and its Library)'),
- (ORGTYPE_RESEARCH_LIBRARY, 'Research Library'),
- (ORGTYPE_PROFESSIONAL_SOCIETY, 'Professional Society'),
- (ORGTYPE_INTERNATIONAL_CONSORTIUM, 'International Consortium'),
- (ORGTYPE_NATIONAL_CONSORTIUM, 'National Consortium'),
- (ORGTYPE_FOUNDATION, 'Foundation'),
- (ORGTYPE_GOVERNMENT_INTERNATIONAL, 'Government (international)'),
- (ORGTYPE_GOVERNMENT_NATIONAL, 'Government (national)'),
- (ORGTYPE_GOVERNMENT_PROVINCIAL, 'Government (provincial)'),
- (ORGTYPE_GOVERNMENT_REGIONAL, 'Government (regional)'),
- (ORGTYPE_GOVERNMENT_MUNICIPAL, 'Government (municipal)'),
- (ORGTYPE_GOVERNMENTAL_MINISTRY, 'Governmental Ministry'),
- (ORGTYPE_GOVERNMENTAL_OFFICE, 'Governmental Office'),
- (ORGTYPE_BUSINESS_CORPORATION, 'Business Corporation'),
- (ORGTYPE_INDIVIDUAL_BENEFACTOR, 'Individual Benefactor'),
- (ORGTYPE_PRIVATE_BENEFACTOR, 'Private Benefactor'),
-)
-
-ORGSTATUS_ACTIVE = 'Active'
-ORGSTATUS_SUPERSEDED = 'Superseded'
-ORGSTATUS_OBSOLETE = 'Obsolete'
-
-ORGANIZATION_STATUSES = (
- (ORGSTATUS_ACTIVE, 'Active'),
- (ORGSTATUS_SUPERSEDED, 'Superseded'),
- (ORGSTATUS_OBSOLETE, 'Obsolete'),
-)
-
-
PARTNER_KIND_UNI_LIBRARY = 'Univ. Library'
PARTNER_KINDS = (
diff --git a/partners/management/commands/organization_update_cf_nr_associated_publications.py b/partners/management/commands/organization_update_cf_nr_associated_publications.py
index 91223e9e653514169385defdd1c7e10bb46b638c..6057f6bf7ab19c930c532a97b61c945579ff2cbf 100644
--- a/partners/management/commands/organization_update_cf_nr_associated_publications.py
+++ b/partners/management/commands/organization_update_cf_nr_associated_publications.py
@@ -4,7 +4,7 @@ __license__ = "AGPL v3"
from django.core.management.base import BaseCommand
-from partners.models import Organization
+from organizations.models import Organization
class Command(BaseCommand):
diff --git a/partners/migrations/0014_partner_org.py b/partners/migrations/0014_partner_org.py
new file mode 100644
index 0000000000000000000000000000000000000000..4f098b2e0f3c4900714f05873c363a8e1a96e952
--- /dev/null
+++ b/partners/migrations/0014_partner_org.py
@@ -0,0 +1,22 @@
+# -*- 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
new file mode 100644
index 0000000000000000000000000000000000000000..3d1ba3076b647d41da4945cb2ff548e69108e7bd
--- /dev/null
+++ b/partners/migrations/0015_repopulate_partner_orgs.py
@@ -0,0 +1,26 @@
+# -*- 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
new file mode 100644
index 0000000000000000000000000000000000000000..971aa4b28b6bcdbc486cdccb44659dc380734c83
--- /dev/null
+++ b/partners/migrations/0016_remove_partner_organization.py
@@ -0,0 +1,19 @@
+# -*- 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
new file mode 100644
index 0000000000000000000000000000000000000000..6c41db66260ab9be8953dfa4087130f18c67f73b
--- /dev/null
+++ b/partners/migrations/0017_auto_20180922_1603.py
@@ -0,0 +1,29 @@
+# -*- 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
new file mode 100644
index 0000000000000000000000000000000000000000..6ca67b78ca2c7178fe3fa0525fb669957d6a2615
--- /dev/null
+++ b/partners/migrations/0018_auto_20180922_1609.py
@@ -0,0 +1,20 @@
+# -*- 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/models.py b/partners/models.py
index 6620e1baf17ef4309002552798e5a874e4471ba6..7106748a976e5739aa8d1bf429b635714c8c2131 100644
--- a/partners/models.py
+++ b/partners/models.py
@@ -10,13 +10,12 @@ 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 ORGANIZATION_TYPES, ORGANIZATION_STATUSES, ORGSTATUS_ACTIVE
-
from .constants import (
PARTNER_KINDS, PARTNER_STATUS, CONSORTIUM_STATUS, MEMBERSHIP_DURATION, PARTNER_EVENTS,
PROSPECTIVE_PARTNER_STATUS, PROSPECTIVE_PARTNER_EVENTS, MEMBERSHIP_AGREEMENT_STATUS,
@@ -32,7 +31,7 @@ from .managers import (
MembershipAgreementManager, ProspectivePartnerManager, PartnerManager, ContactRequestManager,
PartnersAttachmentManager)
-from journals.models import Publication, PublicationAuthorsTable
+from journals.models import Publication, PublicationAuthorsTable, OrgPubFraction
from scipost.constants import TITLE_CHOICES
from scipost.fields import ChoiceArrayField
@@ -42,123 +41,6 @@ from scipost.storage import SecureFileStorage
now = timezone.now()
-#################
-# Organizations #
-#################
-
-class Organization(models.Model):
- """
- An Organization instance is any type of administrative unit which SciPost
- can interact with. Example types include universities, funding agencies,
- research institutes etc.
-
- All instances can only be created by SciPost administration-level personnel,
- and can thus be considered as verified.
-
- These objects are meant to be internally linked to all other types of
- (possibly user-defined) objects used throughout the site (such as Institutions,
- Partners, Affiliations, Funders etc). This enables relating all of SciPost's
- services to the organizations which are impacted by its activities.
-
- The data here is also meant to be cross-linked to external databases,
- for example the Global Research Identifier Database (GRID), Crossref,
- ORCID etc.
- """
- orgtype = models.CharField(max_length=32, choices=ORGANIZATION_TYPES)
- status = models.CharField(max_length=32, choices=ORGANIZATION_STATUSES,
- default=ORGSTATUS_ACTIVE)
- name = models.CharField(max_length=256,
- help_text="Western version of name")
- name_original = models.CharField(max_length=256, blank=True,
- help_text="Name (in original language)")
- acronym = models.CharField(max_length=64, blank=True,
- help_text='Acronym or short name')
- country = CountryField()
- address = models.TextField(blank=True)
- logo = models.ImageField(upload_to='organizations/logos/', blank=True)
- css_class = models.CharField(max_length=256, blank=True,
- verbose_name="Additional logo CSS class")
- grid_json = JSONField(default={}, blank=True, null=True) # JSON data from GRID
- crossref_json = JSONField(default={}, blank=True, null=True) # JSON data from Crossref
- parent = models.ForeignKey('self', blank=True, null=True,
- on_delete=models.SET_NULL, related_name='children')
- superseded_by = models.ForeignKey('self', blank=True, null=True,
- on_delete=models.SET_NULL)
- # Calculated fields (to save CPU; field name always starts with cf_)
- # Number of associated publications; needs to be updated when any related
- # affiliation, grant or f
- cf_nr_associated_publications = models.PositiveIntegerField(
- blank=True, null=True,
- help_text='NB: nr_associated_publications is a calculated field. Do not modify.')
-
- class Meta:
- ordering = ['country', 'name']
-
- def __str__(self):
- return self.name
-
- @property
- def full_name(self):
- full_name_str = ""
- if self.name_original:
- full_name_str += "%s / " % self.name_original
- full_name_str += "%s" % self
- return full_name_str
-
- @property
- def full_name_with_acronym(self):
- full_name_str = ""
- if self.acronym:
- full_name_str += "[%s] " % self.acronym
- return full_name_str + self.full_name
-
- def get_absolute_url(self):
- return reverse('partners:organization_details', args=(self.id,))
-
- def get_publications(self):
- return Publication.objects.filter(
- models.Q(authors__affiliations__in=[self]) |
- models.Q(grants__funder__organization=self) |
- models.Q(funders_generic__organization=self)).distinct()
-
- def count_publications(self):
- return self.get_publications().count()
-
- def update_cf_nr_associated_publications(self):
- """
- Update the calculated field Organization:cf_nr_associated_publications.
- """
- self.cf_nr_associated_publications = self.count_publications()
- self.save()
-
- def get_contributor_authors(self):
- return self.publicationauthorstable_set.select_related(
- 'contributor').order_by('contributor__user__last_name')
-
- def get_unregistered_authors(self):
- return self.publicationauthorstable_set.select_related(
- 'unregistered_author').order_by('unregistered_author__last_name')
-
- @property
- def has_current_agreement(self):
- """
- Check if this organization has a current Partnership agreement.
- """
- if not self.partner:
- return False
- return self.partner.agreements.now_active().exists()
-
- def get_total_contribution_obtained(self, n_years_past=None):
- """
- Computes the contribution obtained from this organization,
- summed over all time.
- """
- contrib = 0
- now = timezone.now().date()
- for agreement in self.partner.agreements.all():
- contrib += agreement.offered_yearly_contribution * int(agreement.duration.days/365)
- return contrib
-
########################
@@ -348,7 +230,7 @@ class Partner(models.Model):
"""
institution = models.ForeignKey('partners.Institution', on_delete=models.CASCADE,
blank=True, null=True)
- organization = models.OneToOneField('partners.Organization', on_delete=models.CASCADE,
+ 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,
diff --git a/partners/signals.py b/partners/signals.py
index 1a02e90e558984361007026a5426b5e617cae857..43fddbb3681a3c416fe20a20fff5d0a040138827 100644
--- a/partners/signals.py
+++ b/partners/signals.py
@@ -16,7 +16,7 @@ def funder_signal_update_org_nr_associated_publications(sender, instance, **kwar
cf_nr_associated_publications is recalculated.
BEWARE: this updates the newly linked organization, but does not unlink the
previous one if the organization is replaced (and not just added).
- The management command partners:organization_update_cf_nr_associated_publications
+ The management command organizations:organization_update_cf_nr_associated_publications
must thus be run regularly on the whole set of publications to ensure consistency.
"""
if instance.organization:
diff --git a/partners/templates/partners/base.html b/partners/templates/partners/base.html
new file mode 100644
index 0000000000000000000000000000000000000000..171e8e539105128a8127ac4af6bae0d0a6aa5063
--- /dev/null
+++ b/partners/templates/partners/base.html
@@ -0,0 +1,15 @@
+{% 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/organization_detail.html b/partners/templates/partners/organization_detail.html
deleted file mode 100644
index 2a14930aff66c75b0cf9a076c7aec99480b06610..0000000000000000000000000000000000000000
--- a/partners/templates/partners/organization_detail.html
+++ /dev/null
@@ -1,32 +0,0 @@
-{% extends 'scipost/base.html' %}
-
-{% load bootstrap %}
-
-{% block pagetitle %}: Organization details{% endblock pagetitle %}
-
-{% block breadcrumb_items %}
- {{ block.super }}
- <span class="breadcrumb-item">{{ organization }}</span>
-{% endblock %}
-
-{% block content %}
-
-<h1 class="highlight">Organization {{ organization }}</h1>
-
-
-<div class="row">
- <div class="col-12">
- <h3>Publications associated to this Organization:</h3>
- <ul>
- {% for publication in organization.get_publications %}
- <li>
- <a href="{{ publication.get_absolute_url }}">{{ publication.title }}</a>
- <br>by {{ publication.author_list }},
- <br>{{ publication.citation }}
- </li>
- {% endfor %}
- </ul>
- </div>
-</div>
-
-{% endblock content %}
diff --git a/partners/templates/partners/supporting_partners.html b/partners/templates/partners/supporting_partners.html
index 65ec345bf8684ed1818ea8830e4b57170ee8edd7..eae38ebca13b0ecc76bd581390d5f23629b964f5 100644
--- a/partners/templates/partners/supporting_partners.html
+++ b/partners/templates/partners/supporting_partners.html
@@ -1,4 +1,4 @@
-{% extends 'scipost/base.html' %}
+{% extends 'partners/base.html' %}
{% block pagetitle %}: Supporting Partners{% endblock pagetitle %}
@@ -7,17 +7,18 @@
{% load scipost_extras %}
-{% block breadcrumb %}
- <div class="container-outside header">
- <div class="container">
- <h1>SciPost Supporting Partners</h1>
- </div>
- </div>
+{% block breadcrumb_items %}
+{{ block.super }}
{% endblock %}
-
{% block content %}
+<div class="container-outside header">
+ <div class="container">
+ <h1>SciPost Supporting Partners</h1>
+ </div>
+</div>
+
{% if perms.scipost.can_manage_SPB %}
<div class="row">
<div class="col-12">
diff --git a/partners/templatetags/partners_extras.py b/partners/templatetags/partners_extras.py
index 9abcc6c3db3cc9fe593637dc478e0dd050487926..5842a2f02aa15dbf677ca11a42d337e406b0a711 100644
--- a/partners/templatetags/partners_extras.py
+++ b/partners/templatetags/partners_extras.py
@@ -33,3 +33,8 @@ def partnerstatuscolor(status):
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/urls.py b/partners/urls.py
index 0722b06bfee17a6f80bc96e8d55fa2531408f386..a11e5d3d9d9f1ab4a66370bb4ca3556ddee8fb80 100644
--- a/partners/urls.py
+++ b/partners/urls.py
@@ -12,23 +12,6 @@ urlpatterns = [
url(r'^membership_request$', views.membership_request, name='membership_request'),
url(r'^process_contact_requests$', views.process_contact_requests, name='process_contact_requests'),
- # Organizations
- url(r'^organizations/$',
- views.OrganizationListView.as_view(),
- name='organization_list'),
- url(r'^organizations/add/$',
- views.OrganizationCreateView.as_view(),
- name='organization_create'),
- url(r'^organizations/(?P<pk>[0-9]+)/update/$',
- views.OrganizationUpdateView.as_view(),
- name='organization_update'),
- url(r'^organizations/(?P<pk>[0-9]+)/delete/$',
- views.OrganizationDeleteView.as_view(),
- name='organization_delete'),
- url(r'^organizations/(?P<pk>[0-9]+)/$',
- views.OrganizationDetailView.as_view(),
- name='organization_details'),
-
# Prospects
url(r'^prospects/add$', views.add_prospective_partner,
name='add_prospective_partner'),
diff --git a/partners/views.py b/partners/views.py
index 6986f8fe39c53687d95cc8b1141291b2657d2fbe..5e61a0eb143c94601672e77e94009b2ef46229ae 100644
--- a/partners/views.py
+++ b/partners/views.py
@@ -25,8 +25,7 @@ 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 Organization,\
- Partner, ProspectivePartner, ProspectiveContact, ContactRequest,\
+from .models import Partner, ProspectivePartner, ProspectiveContact, ContactRequest,\
ProspectivePartnerEvent, MembershipAgreement, Contact, Institution,\
PartnersAttachment
from .forms import ProspectivePartnerForm, ProspectiveContactForm,\
@@ -46,65 +45,6 @@ from scipost.mixins import PermissionsMixin
-class OrganizationCreateView(PermissionsMixin, CreateView):
- """
- Create a new Organization.
- """
- permission_required = 'scipost.can_manage_organizations'
- model = Organization
- fields = '__all__'
- template_name = 'partners/organization_create.html'
- success_url = reverse_lazy('partners:organization_list')
-
-
-class OrganizationUpdateView(PermissionsMixin, UpdateView):
- """
- Update an Organization.
- """
- permission_required = 'scipost.can_manage_organizations'
- model = Organization
- fields = '__all__'
- template_name = 'partners/organization_update.html'
- success_url = reverse_lazy('partners:organization_list')
-
-
-class OrganizationDeleteView(PermissionsMixin, DeleteView):
- """
- Delete an Organization.
- """
- permission_required = 'scipost.can_manage_organizations'
- model = Organization
- success_url = reverse_lazy('partners:organization_list')
-
-
-class OrganizationListView(ListView):
- model = Organization
-
- 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()
- return context
-
- def get_queryset(self):
- qs = super().get_queryset()
- order_by = self.request.GET.get('order_by')
- ordering = self.request.GET.get('ordering')
- 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')
- if ordering == 'desc':
- qs = qs.reverse()
- return qs
-
-
-class OrganizationDetailView(DetailView):
- model = Organization
-
-
def supporting_partners(request):
current_agreements = MembershipAgreement.objects.now_active()
context = {
diff --git a/petitions/migrations/0004_auto_20180922_1357.py b/petitions/migrations/0004_auto_20180922_1357.py
new file mode 100644
index 0000000000000000000000000000000000000000..ce83b0307c402f4cb63a37af9602a5ef527b4e0e
--- /dev/null
+++ b/petitions/migrations/0004_auto_20180922_1357.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-09-22 11:57
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('petitions', '0003_petitionsignatory_organization'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='petitionsignatory',
+ old_name='organization',
+ new_name='organization_tbd',
+ ),
+ ]
diff --git a/petitions/migrations/0005_petitionsignatory_organization.py b/petitions/migrations/0005_petitionsignatory_organization.py
new file mode 100644
index 0000000000000000000000000000000000000000..9e0e8e2624a02b28affed168a060ac236ea9f70b
--- /dev/null
+++ b/petitions/migrations/0005_petitionsignatory_organization.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-09-22 11:58
+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'),
+ ('petitions', '0004_auto_20180922_1357'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='petitionsignatory',
+ name='org',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='petition_signatories', to='organizations.Organization'),
+ ),
+ ]
diff --git a/petitions/migrations/0006_repopulate_petsign_orgs.py b/petitions/migrations/0006_repopulate_petsign_orgs.py
new file mode 100644
index 0000000000000000000000000000000000000000..8231d634e8312a64f650c0ea1cd4ff9d2d8de0d8
--- /dev/null
+++ b/petitions/migrations/0006_repopulate_petsign_orgs.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-09-22 12:05
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+def repopulate_organization_field(apps, schema_editor):
+ PetitionSignatory = apps.get_model('petitions', 'PetitionSignatory')
+ Organization = apps.get_model('organizations', 'Organization')
+
+ for petsign in PetitionSignatory.objects.all():
+ if petsign.organization_tbd:
+ org = Organization.objects.get(name=petsign.organization_tbd.name)
+ petsign.org = org
+ petsign.save()
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('petitions', '0005_petitionsignatory_organization'),
+ ]
+
+ operations = [
+ migrations.RunPython(repopulate_organization_field,
+ reverse_code=migrations.RunPython.noop),
+ ]
diff --git a/petitions/migrations/0007_remove_petitionsignatory_organization_tbd.py b/petitions/migrations/0007_remove_petitionsignatory_organization_tbd.py
new file mode 100644
index 0000000000000000000000000000000000000000..729a0fd107e6fd738a8a565141b1bc0f9558d195
--- /dev/null
+++ b/petitions/migrations/0007_remove_petitionsignatory_organization_tbd.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-09-22 12:30
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('petitions', '0006_repopulate_petsign_orgs'),
+ ]
+
+ operations = [
+ 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
new file mode 100644
index 0000000000000000000000000000000000000000..fbf3c1158d1b6e794144172763359b097d28cd43
--- /dev/null
+++ b/petitions/migrations/0008_auto_20180922_1432.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-09-22 12:32
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('partners', '0017_auto_20180922_1603'),
+ ('petitions', '0007_remove_petitionsignatory_organization_tbd'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='petitionsignatory',
+ old_name='org',
+ new_name='organization',
+ ),
+ ]
diff --git a/petitions/models.py b/petitions/models.py
index 02385fb91597437b7c215d3e514e8cdb4bc0cd98..bcd50ed24d94038ca48f0720117702ce9b4a1192 100644
--- a/petitions/models.py
+++ b/petitions/models.py
@@ -39,7 +39,7 @@ class PetitionSignatory(models.Model):
email = models.EmailField()
country_of_employment = CountryField()
affiliation = models.CharField(max_length=300, verbose_name='affiliation')
- organization = models.ForeignKey('partners.Organization', blank=True, null=True,
+ organization = models.ForeignKey('organizations.Organization', blank=True, null=True,
on_delete=models.SET_NULL)
signed_on = models.DateTimeField(auto_now_add=True)
verification_key = models.CharField(max_length=40, blank=True)
diff --git a/production/templates/production/production.html b/production/templates/production/production.html
index ed1c3eed0c0112427977905fa278f17169b924d1..4c5d7dd330be40f88d76207c2f15f6917c8d04f2 100644
--- a/production/templates/production/production.html
+++ b/production/templates/production/production.html
@@ -8,6 +8,7 @@
{% load bootstrap %}
{% load scipost_extras %}
+{% load submissions_extras %}
{% block content %}
@@ -55,6 +56,7 @@
<thead>
<tr>
<th style="width: 30%;">Submission</th>
+ <th>Target Journal<br/>(Tier)</th>
<th>Status</th>
<th class="py-1">
Latest activity
@@ -77,6 +79,7 @@
<br>
by {{ stream.submission.author_list }}
</td>
+ <td>{{ stream.submission.get_submitted_to_journal_display }}{% for rec in stream.submission.eicrecommendations.all %}<br/>({{ rec|Tier }}){% endfor %}</td>
<td>
<div class="label label-{% if stream.status == 'initiated' %}outline-danger{% else %}secondary{% endif %} label-sm">{{ stream.get_status_display }}</div>
</td>
diff --git a/requirements.txt b/requirements.txt
index 63c14c58ce4d59f979e2f5e12b4e9abc8d71c7db..176e10765b2e5252f3879571ba27bc11e07e7cb3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -22,6 +22,7 @@ django-sphinxdoc==1.5.1
django-silk==2.0.0
django-recaptcha==1.3.1
django-webpack-loader==0.5
+django-maintenancemode-2==1.1.11
# Documentation Packages
diff --git a/scipost/templates/partials/scipost/personal_page/editorial_actions.html b/scipost/templates/partials/scipost/personal_page/editorial_actions.html
index c2afc314b9393f72784eec97df4f83b5de70a695..af0fe691f063ea0f99dd1c500a33b7e2c25d2fd7 100644
--- a/scipost/templates/partials/scipost/personal_page/editorial_actions.html
+++ b/scipost/templates/partials/scipost/personal_page/editorial_actions.html
@@ -50,7 +50,7 @@
<h3>SciPost Administation</h3>
<ul>
- <li><a href="{% url 'partners:organization_list' %}">Manage Organizations</a></li>
+ <li><a href="{% url 'organizations:organizations' %}">Manage Organizations</a></li>
<li><a href="{% url 'affiliations:institutions' %}">Manage Institutions database</a></li>
</ul>
{% endif %}
@@ -110,7 +110,7 @@
{% if perms.scipost.can_manage_college_composition %}
<h3>Colleges and Fellowships</h3>
<ul>
- <li><a href="{% url 'colleges:potential_fellowships' %}">Manag Potential Fellowships</a></li>
+ <li><a href="{% url 'colleges:potential_fellowships' %}">Manage Potential Fellowships</a></li>
<li><a href="{% url 'colleges:fellowships' %}">Manage Fellowships</a></li>
</ul>
{% endif %}
diff --git a/scipost/templates/partials/scipost/personal_page/publications.html b/scipost/templates/partials/scipost/personal_page/publications.html
index 302090e22d865ec6c41654a8311462e886883fb5..4a10e24f855f92dff7dd5befa7e800f8347ff364 100644
--- a/scipost/templates/partials/scipost/personal_page/publications.html
+++ b/scipost/templates/partials/scipost/personal_page/publications.html
@@ -23,7 +23,13 @@
{% for pub in own_publications %}
<li>
<div class="card card-grey card-publication" id="{{pub.doi_label}}">
- {% include 'journals/_publication_card_content.html' with publication=pub current_user=request.user %}
+ {% include 'journals/_publication_card_content.html' with publication=pub current_user=request.user %}
+ {% if request.user == pub.accepted_submission.submitted_by.user %}
+ {% if not pub.pubfractions_confirmed_by_authors or not pub.pubfractions_sum_to_1 %}
+
+ <h4 class="m-2"><a href="{% url 'journals:allocate_orgpubfractions' doi_label=pub.doi_label %}"><span class="text-danger">Intervention needed:</span> review support fractions</a></h4>
+ {% endif %}
+ {% endif %}
</div>
</li>
{% empty %}
diff --git a/sitesserved/__init__.py b/sitesserved/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/sitesserved/migrations/0001_set_SciPost_site.py b/sitesserved/migrations/0001_set_SciPost_site.py
new file mode 100644
index 0000000000000000000000000000000000000000..3f0757c78852341aa6bec93df238a9ec01c57e66
--- /dev/null
+++ b/sitesserved/migrations/0001_set_SciPost_site.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-09-23 11:35
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+def set_site_name(apps, schema_editor):
+ Sites = apps.get_model('sites', 'Site')
+ try:
+ site = Sites.objects.get(id=1)
+ except Sites.DoesNotExist:
+ site = Sites(id=1)
+ site.name = 'SciPost'
+ site.domain = 'scipost.org'
+ site.save()
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('sites', '0002_alter_domain_unique'),
+ ]
+
+ operations = [
+ migrations.RunPython(set_site_name,
+ reverse_code=migrations.RunPython.noop),
+ ]
diff --git a/sitesserved/migrations/__init__.py b/sitesserved/migrations/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/submissions/templatetags/submissions_extras.py b/submissions/templatetags/submissions_extras.py
index 15cd2988f9e5fb68dcf8a7a2cf0f3e34fcfcfe15..b8a8e4f51014572b335673b8af2d13fe2428e135 100644
--- a/submissions/templatetags/submissions_extras.py
+++ b/submissions/templatetags/submissions_extras.py
@@ -4,7 +4,7 @@ __license__ = "AGPL v3"
from django import template
-from ..constants import DECISION_FIXED
+from ..constants import DECISION_FIXED, REPORT_PUBLISH_1, REPORT_PUBLISH_2, REPORT_PUBLISH_3
from ..models import Submission, EICRecommendation
register = template.Library()
@@ -58,3 +58,15 @@ def is_voting_fellow(submission, user):
@register.filter
def citation(citable):
return citable.citation
+
+
+@register.filter
+def Tier(recommendation):
+ if recommendation.recommendation == REPORT_PUBLISH_1:
+ return 'Tier I'
+ elif recommendation.recommendation == REPORT_PUBLISH_2:
+ return 'Tier II'
+ elif recommendation.recommendation == REPORT_PUBLISH_3:
+ return 'Tier III'
+ else:
+ return 'unknown Tier'
diff --git a/templates/503.html b/templates/503.html
new file mode 100644
index 0000000000000000000000000000000000000000..f90a6dc609a41007459896c9d6c86f274ade2578
--- /dev/null
+++ b/templates/503.html
@@ -0,0 +1,13 @@
+{% extends 'scipost/base.html' %}
+
+{% block pagetitle %}: 503{% endblock pagetitle %}
+
+{% block content %}
+
+<div style="text-align: center;">
+ <img src="//scipost.org/static/scipost/images/logo_scipost_RGB_HTML_groot.png" alt="SciPost logo" width="240" style="margin-top: 20px; margin-bottom: 20px" />
+ <h1>We are currently in maintenance, please try again in a few minutes!</h1>
+ <h2>503</h2>
+</div>
+
+{% endblock %}
diff --git a/templates/email/authors/request_pubfrac_check.html b/templates/email/authors/request_pubfrac_check.html
new file mode 100644
index 0000000000000000000000000000000000000000..ff3ce909666a49b18a737e1e486baf50a6976fc2
--- /dev/null
+++ b/templates/email/authors/request_pubfrac_check.html
@@ -0,0 +1,21 @@
+<p>
+ Dear {{ publication.accepted_submission.submitted_by.get_title_display }} {{ publication.accepted_submission.submitted_by.user.last_name }},
+</p>
+<p>
+ For your recent SciPost publication,
+</p>
+<p>
+ <a href="https://scipost.org/{{ publication.get_absolute_url }}">{{ publication.title }}</a><br>
+ by {{ publication.author_list }}
+</p>
+<p>
+ we would like you to help us determine who supported the research contained in this publication. This info is of great use for our sustainability efforts. One or two minutes of your attention are all that is required.
+</p>
+<p>
+ Could we beg you to navigate (login required) to <a href="https://scipost.org{% url 'journals:allocate_orgpubfractions' doi_label=publication.doi_label %}">this page</a> and check/correct the data we have prepared?
+</p>
+<p>
+ Many thanks in advance,
+</p>
+<p>The SciPost Team</p>
+{% include 'email/_footer.html' %}
diff --git a/templates/email/authors/request_pubfrac_check.json b/templates/email/authors/request_pubfrac_check.json
new file mode 100644
index 0000000000000000000000000000000000000000..84e36057cceaa8305c3097a113c7cc4af9f9970f
--- /dev/null
+++ b/templates/email/authors/request_pubfrac_check.json
@@ -0,0 +1,8 @@
+{
+ "subject": "SciPost: please check your publication's support info",
+ "to_address": "accepted_submission.submitted_by.user.email",
+ "bcc_to": "edadmin@scipost.org",
+ "from_address_name": "SciPost Editorial Administration",
+ "from_address": "edadmin@scipost.org",
+ "context_object": "publication"
+}
diff --git a/templates/email/citation_notification.html b/templates/email/citation_notification.html
index 1bbf37624a29775f7becb39f6089ddc46312da17..6ae8b2d2d90831846a9e82877020ada2b71acffc 100644
--- a/templates/email/citation_notification.html
+++ b/templates/email/citation_notification.html
@@ -14,7 +14,7 @@ Dear {{ notification.get_title }} {{ notification.last_name }},
<ul>
{% for notification in notification.related_notifications.for_publications %}
<li>
- <a href="https://doi.org/{{ notification.publication.doi_label }}">{{ notification.publication.citation }}</a>
+ <a href="https://doi.org/{{ notification.publication.doi_string }}">{{ notification.publication.citation }}</a>
<br>
{{ notification.publication.title }}
<br>
diff --git a/templates/email/registration_invitation.html b/templates/email/registration_invitation.html
index 5a2b2a96ee3fa7a467d7b1a60efa3acfac7f0870..230facd1719775034017f36cac4a142995f11095 100644
--- a/templates/email/registration_invitation.html
+++ b/templates/email/registration_invitation.html
@@ -50,7 +50,7 @@ Dear {% if invitation.message_style == 'F' %}{{ invitation.get_title_display }}
<ul>
{% for notification in invitation.citation_notifications.for_publications %}
<li>
- <a href="https://doi.org/{{ notification.publication.doi_label }}">{{ notification.publication.citation }}</a>
+ <a href="https://doi.org/{{ notification.publication.doi_string }}">{{ notification.publication.citation }}</a>
<br>
{{ notification.publication.title }}
<br>