From 8846a17ea788524b2e306b5fa28dab5bbd96aace Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Sat, 30 Sep 2017 21:47:03 +0200
Subject: [PATCH] Production overhaul second part
---
journals/views.py | 18 +++
production/constants.py | 56 +++++++---
production/forms.py | 91 +++++++++++++--
production/managers.py | 4 +-
.../migrations/0021_auto_20170930_1729.py | 26 +++++
.../migrations/0022_auto_20170930_1756.py | 65 +++++++++++
.../migrations/0023_auto_20170930_1759.py | 50 +++++++++
production/models.py | 29 +++--
production/signals.py | 54 +++++++--
.../partials/production_events.html | 54 ++++++---
.../partials/production_stream_card.html | 16 ++-
.../production_stream_card_completed.html | 20 +---
.../partials/stream_status_changes.html | 14 +++
.../templates/production/production.html | 105 +++++++++++++-----
production/templates/production/stream.html | 13 +++
production/urls.py | 4 +
production/views.py | 98 +++++++++++++---
.../commands/add_groups_and_permissions.py | 6 +
.../scipost/assets/css/_list_group.scss | 6 +
scipost/static/scipost/assets/css/_pool.scss | 4 -
scipost/static/scipost/assets/js/scripts.js | 16 +--
.../widgets/checkbox_option_as_btn.html | 1 -
scipost/templatetags/bootstrap.py | 10 +-
23 files changed, 619 insertions(+), 141 deletions(-)
create mode 100644 production/migrations/0021_auto_20170930_1729.py
create mode 100644 production/migrations/0022_auto_20170930_1756.py
create mode 100644 production/migrations/0023_auto_20170930_1759.py
create mode 100644 production/templates/production/partials/stream_status_changes.html
create mode 100644 production/templates/production/stream.html
diff --git a/journals/views.py b/journals/views.py
index fb5245c31..4d9c2e619 100644
--- a/journals/views.py
+++ b/journals/views.py
@@ -30,6 +30,9 @@ from comments.models import Comment
from funders.models import Funder
from submissions.models import Submission, Report
from scipost.models import Contributor
+from production.constants import PROOFS_PUBLISHED
+from production.models import ProductionEvent
+from production.signals import notify_stream_status_change
from funders.forms import FunderSelectForm, GrantSelectForm
from scipost.forms import ConfirmationForm
@@ -264,6 +267,21 @@ def validate_publication(request):
submission.status = 'published'
submission.save()
+ # Update ProductionStream
+ stream = submission.production_stream
+ if stream:
+ stream.status = PROOFS_PUBLISHED
+ stream.save()
+ if request.user.production_user:
+ prodevent = ProductionEvent(
+ stream=stream,
+ event='status',
+ comments=' published the manuscript.',
+ noted_by=request.user.production_user
+ )
+ prodevent.save()
+ notify_stream_status_change(request.user, stream, False)
+
# TODO: Create a Commentary Page
# Email authors
JournalUtils.load({'publication': publication})
diff --git a/production/constants.py b/production/constants.py
index e9453a6f7..216d60b5c 100644
--- a/production/constants.py
+++ b/production/constants.py
@@ -1,23 +1,47 @@
-PRODUCTION_STREAM_ONGOING = 'ongoing'
+PRODUCTION_STREAM_INITIATED = 'initiated'
PRODUCTION_STREAM_COMPLETED = 'completed'
+PROOFS_TASKED = 'tasked'
+PROOFS_PRODUCED = 'produced'
+PROOFS_CHECKED = 'checked'
+PROOFS_SENT = 'sent'
+PROOFS_RETURNED = 'returned'
+PROOFS_CORRECTED = 'corrected'
+PROOFS_ACCEPTED = 'accepted'
+PROOFS_PUBLISHED = 'published'
+PROOFS_CITED = 'cited'
PRODUCTION_STREAM_STATUS = (
- (PRODUCTION_STREAM_ONGOING, 'Ongoing'),
+ (PRODUCTION_STREAM_INITIATED, 'New Stream started'),
+ (PROOFS_TASKED, 'Supervisor tasked officer with proofs production'),
+ (PROOFS_PRODUCED, 'Proofs have been produced'),
+ (PROOFS_CHECKED, 'Proofs have been checked by Supervisor'),
+ (PROOFS_SENT, 'Proofs sent to Authors'),
+ (PROOFS_RETURNED, 'Proofs returned by Authors'),
+ (PROOFS_CORRECTED, 'Corrections implemented'),
+ (PROOFS_ACCEPTED, 'Authors have accepted proofs'),
+ (PROOFS_PUBLISHED, 'Paper has been published'),
+ (PROOFS_CITED, 'Cited people have been notified/invited to SciPost'),
(PRODUCTION_STREAM_COMPLETED, 'Completed'),
)
+EVENT_MESSAGE = 'message'
+EVENT_HOUR_REGISTRATION = 'registration'
PRODUCTION_EVENTS = (
- ('assigned_to_supervisor', 'Assigned by EdAdmin to Supervisor'),
- ('message_edadmin_to_supervisor', 'Message from EdAdmin to Supervisor'),
- ('message_supervisor_to_edadmin', 'Message from Supervisor to EdAdmin'),
- ('officer_tasked_with_proof_production', 'Supervisor tasked officer with proofs production'),
- ('message_supervisor_to_officer', 'Message from Supervisor to Officer'),
- ('message_officer_to_supervisor', 'Message from Officer to Supervisor'),
- ('proofs_produced', 'Proofs have been produced'),
- ('proofs_checked_by_supervisor', 'Proofs have been checked by Supervisor'),
- ('proofs_sent_to_authors', 'Proofs sent to Authors'),
- ('proofs_returned_by_authors', 'Proofs returned by Authors'),
- ('corrections_implemented', 'Corrections implemented'),
- ('authors_have_accepted_proofs', 'Authors have accepted proofs'),
- ('paper_published', 'Paper has been published'),
- ('cited_notified', 'Cited people have been notified/invited to SciPost'),
+ ('assignment', 'Assignment'),
+ ('status', 'Status change'),
+ (EVENT_MESSAGE, 'Message'),
+ (EVENT_HOUR_REGISTRATION, 'Hour registration'),
+ # ('assigned_to_supervisor', 'Assigned by EdAdmin to Supervisor'),
+ # ('message_edadmin_to_supervisor', 'Message from EdAdmin to Supervisor'),
+ # ('message_supervisor_to_edadmin', 'Message from Supervisor to EdAdmin'),
+ # ('officer_tasked_with_proof_production', 'Supervisor tasked officer with proofs production'),
+ # ('message_supervisor_to_officer', 'Message from Supervisor to Officer'),
+ # ('message_officer_to_supervisor', 'Message from Officer to Supervisor'),
+ # ('proofs_produced', 'Proofs have been produced'),
+ # ('proofs_checked_by_supervisor', 'Proofs have been checked by Supervisor'),
+ # ('proofs_sent_to_authors', 'Proofs sent to Authors'),
+ # ('proofs_returned_by_authors', 'Proofs returned by Authors'),
+ # ('corrections_implemented', 'Corrections implemented'),
+ # ('authors_have_accepted_proofs', 'Authors have accepted proofs'),
+ # ('paper_published', 'Paper has been published'),
+ # ('cited_notified', 'Cited people have been notified/invited to SciPost'),
)
diff --git a/production/forms.py b/production/forms.py
index bba5be4e7..12202657c 100644
--- a/production/forms.py
+++ b/production/forms.py
@@ -4,7 +4,9 @@ from django import forms
from django.utils.dates import MONTHS
from django.db.models import Sum
+from . import constants
from .models import ProductionUser, ProductionStream, ProductionEvent
+from .signals import notify_stream_status_change
today = datetime.datetime.today()
@@ -13,7 +15,6 @@ class ProductionEventForm(forms.ModelForm):
class Meta:
model = ProductionEvent
fields = (
- 'event',
'comments',
'duration'
)
@@ -28,6 +29,14 @@ class AssignOfficerForm(forms.ModelForm):
model = ProductionStream
fields = ('officer',)
+ def save(self, commit=True):
+ stream = super().save(False)
+ if commit:
+ if stream.status == constants.PRODUCTION_STREAM_INITIATED:
+ stream.status = constants.PROOFS_TASKED
+ stream.save()
+ return stream
+
class AssignSupervisorForm(forms.ModelForm):
class Meta:
@@ -40,6 +49,76 @@ class AssignSupervisorForm(forms.ModelForm):
user__groups__name='Production Supervisor')
+class StreamStatusForm(forms.ModelForm):
+ class Meta:
+ model = ProductionStream
+ fields = ('status',)
+
+ def __init__(self, *args, **kwargs):
+ self.current_production_user = kwargs.pop('production_user')
+ super().__init__(*args, **kwargs)
+ self.fields['status'].choices = self.get_available_statuses()
+
+ def get_available_statuses(self):
+ if self.instance.status in [constants.PRODUCTION_STREAM_INITIATED,
+ constants.PRODUCTION_STREAM_COMPLETED,
+ constants.PROOFS_ACCEPTED,
+ constants.PROOFS_CITED]:
+ # No status change can be made by User
+ return ()
+ elif self.instance.status == constants.PROOFS_TASKED:
+ return (
+ (constants.PROOFS_PRODUCED, 'Proofs have been produced'),
+ )
+ elif self.instance.status == constants.PROOFS_PRODUCED:
+ return (
+ (constants.PROOFS_CHECKED, 'Proofs have been checked by Supervisor'),
+ (constants.PROOFS_SENT, 'Proofs sent to Authors'),
+ )
+ elif self.instance.status == constants.PROOFS_CHECKED:
+ return (
+ (constants.PROOFS_SENT, 'Proofs sent to Authors'),
+ (constants.PROOFS_CORRECTED, 'Corrections implemented'),
+ )
+ elif self.instance.status == constants.PROOFS_SENT:
+ return (
+ (constants.PROOFS_RETURNED, 'Proofs returned by Authors'),
+ (constants.PROOFS_ACCEPTED, 'Authors have accepted proofs'),
+ )
+ elif self.instance.status == constants.PROOFS_RETURNED:
+ return (
+ (constants.PROOFS_CHECKED, 'Proofs have been checked by Supervisor'),
+ (constants.PROOFS_SENT, 'Proofs sent to Authors'),
+ (constants.PROOFS_CORRECTED, 'Corrections implemented'),
+ (constants.PROOFS_ACCEPTED, 'Authors have accepted proofs'),
+ )
+ elif self.instance.status == constants.PROOFS_CORRECTED:
+ return (
+ (constants.PROOFS_CHECKED, 'Proofs have been checked by Supervisor'),
+ (constants.PROOFS_SENT, 'Proofs sent to Authors'),
+ (constants.PROOFS_ACCEPTED, 'Authors have accepted proofs'),
+ )
+ elif self.instance.status == constants.PROOFS_PUBLISHED:
+ return (
+ (constants.PROOFS_CITED, 'Cited people have been notified/invited to SciPost'),
+ )
+ return ()
+
+ def save(self, commit=True):
+ stream = super().save(commit)
+ if commit:
+ event = ProductionEvent(
+ stream=stream,
+ event='status',
+ comments='Stream changed status to: {status}'.format(
+ status=stream.get_status_display()),
+ noted_by=self.current_production_user)
+ event.save()
+ notify_stream_status_change(sender=self.current_production_user.user, instance=stream,
+ created=False)
+ return stream
+
+
class UserToOfficerForm(forms.ModelForm):
class Meta:
model = ProductionUser
@@ -72,13 +151,5 @@ class ProductionUserMonthlyActiveFilter(forms.Form):
'duration': events.aggregate(total=Sum('duration')),
'user': user
})
-
- return output
- def get_events(self, officer=None):
- qs = ProductionEvent.objects.filter(duration__isnull=False,
- noted_on__month=self.cleaned_data['month'],
- noted_on__year=self.cleaned_data['year'])
- if officer:
- qs.filter(noted_by=officer)
- return qs.order_by('noted_by')
+ return output
diff --git a/production/managers.py b/production/managers.py
index 1980044f4..acaf63b52 100644
--- a/production/managers.py
+++ b/production/managers.py
@@ -1,6 +1,6 @@
from django.db import models
-from .constants import PRODUCTION_STREAM_COMPLETED, PRODUCTION_STREAM_ONGOING
+from .constants import PRODUCTION_STREAM_COMPLETED
class ProductionStreamQuerySet(models.QuerySet):
@@ -8,7 +8,7 @@ class ProductionStreamQuerySet(models.QuerySet):
return self.filter(status=PRODUCTION_STREAM_COMPLETED)
def ongoing(self):
- return self.filter(status=PRODUCTION_STREAM_ONGOING)
+ return self.exclude(status=PRODUCTION_STREAM_COMPLETED)
def filter_for_user(self, production_user):
return self.filter(officer=production_user)
diff --git a/production/migrations/0021_auto_20170930_1729.py b/production/migrations/0021_auto_20170930_1729.py
new file mode 100644
index 000000000..9ce6938c8
--- /dev/null
+++ b/production/migrations/0021_auto_20170930_1729.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-09-30 15:29
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('production', '0020_auto_20170930_0156'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='productionevent',
+ name='noted_to',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='received_events', to='production.ProductionUser'),
+ ),
+ migrations.AlterField(
+ model_name='productionevent',
+ name='event',
+ field=models.CharField(choices=[('assignment', 'Assignment'), ('message_edadmin_to_supervisor', 'Message from EdAdmin to Supervisor'), ('message_supervisor_to_edadmin', 'Message from Supervisor to EdAdmin'), ('officer_tasked_with_proof_production', 'Supervisor tasked officer with proofs production'), ('message_supervisor_to_officer', 'Message from Supervisor to Officer'), ('message_officer_to_supervisor', 'Message from Officer to Supervisor'), ('proofs_produced', 'Proofs have been produced'), ('proofs_checked_by_supervisor', 'Proofs have been checked by Supervisor'), ('proofs_sent_to_authors', 'Proofs sent to Authors'), ('proofs_returned_by_authors', 'Proofs returned by Authors'), ('corrections_implemented', 'Corrections implemented'), ('authors_have_accepted_proofs', 'Authors have accepted proofs'), ('paper_published', 'Paper has been published'), ('cited_notified', 'Cited people have been notified/invited to SciPost')], max_length=64),
+ ),
+ ]
diff --git a/production/migrations/0022_auto_20170930_1756.py b/production/migrations/0022_auto_20170930_1756.py
new file mode 100644
index 000000000..4fa6bca14
--- /dev/null
+++ b/production/migrations/0022_auto_20170930_1756.py
@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-09-30 15:56
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+def update_status(apps, schema_editor):
+ """
+ Update current Production Stream status by checking their events content.
+ """
+ ProductionStream = apps.get_model('production', 'ProductionStream')
+ for stream in ProductionStream.objects.all():
+ if stream.status == 'completed':
+ stream.status = 'completed'
+ elif stream.events.filter(event='cited_notified').exists():
+ stream.status = 'cited'
+ elif stream.events.filter(event='paper_published').exists():
+ stream.status = 'published'
+ elif stream.events.filter(event='authors_have_accepted_proofs').exists():
+ stream.status = 'accepted'
+ elif stream.events.filter(event='corrections_implemented').exists():
+ stream.status = 'corrected'
+ elif stream.events.filter(event='proofs_returned_by_authors').exists():
+ stream.status = 'returned'
+ elif stream.events.filter(event='proofs_sent_to_authors').exists():
+ stream.status = 'sent'
+ elif stream.events.filter(event='proofs_checked_by_supervisor').exists():
+ stream.status = 'checked'
+ elif stream.events.filter(event='officer_tasked_with_proof_production').exists():
+ stream.status = 'tasked'
+ else:
+ stream.status = 'initiated'
+ stream.save()
+ return
+
+
+def update_status_inverse(apps, schema_editor):
+ """
+ Reverse update statuses to only complete/ongoing by checking the status.
+ """
+ ProductionStream = apps.get_model('production', 'ProductionStream')
+ for stream in ProductionStream.objects.all():
+ if stream.status == 'completed':
+ stream.status = 'completed'
+ else:
+ stream.status == 'ongoing'
+ stream.save()
+ return
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('production', '0021_auto_20170930_1729'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='productionstream',
+ name='status',
+ field=models.CharField(choices=[('initiated', 'Initiated'), ('tasked', 'Supervisor tasked officer with proofs production'), ('produced', 'Proofs have been produced'), ('checked', 'Proofs have been checked by Supervisor'), ('sent', 'Proofs sent to Authors'), ('returned', 'Proofs returned by Authors'), ('corrected', 'Corrections implemented'), ('accepted', 'Authors have accepted proofs'), ('published', 'Paper has been published'), ('cited', 'Cited people have been notified/invited to SciPost'), ('completed', 'Completed')], default='initiated', max_length=32),
+ ),
+ migrations.RunPython(update_status, update_status_inverse)
+ ]
diff --git a/production/migrations/0023_auto_20170930_1759.py b/production/migrations/0023_auto_20170930_1759.py
new file mode 100644
index 000000000..2143c4cdf
--- /dev/null
+++ b/production/migrations/0023_auto_20170930_1759.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-09-30 15:59
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+def update_status(apps, schema_editor):
+ """
+ Update current Production Event type.
+ """
+ ProductionEvent = apps.get_model('production', 'ProductionEvent')
+ for event in ProductionEvent.objects.all():
+ if event.duration:
+ event.event = 'registration'
+ elif event.event == ['assigned_to_supervisor', 'officer_tasked_with_proof_production']:
+ event.event = 'assignment'
+ elif event.event in ['message_edadmin_to_supervisor', 'message_supervisor_to_edadmin', 'message_supervisor_to_officer', 'message_officer_to_supervisor']:
+ event.event = 'message'
+ else:
+ event.event = 'status'
+ event.save()
+ return
+
+
+def update_status_inverse(apps, schema_editor):
+ """
+ Inverse update current Production Event type. As this mapping is impossible to make,
+ it'll just all be a unique status: `Event`
+ """
+ ProductionEvent = apps.get_model('production', 'ProductionEvent')
+ for event in ProductionEvent.objects.all():
+ event.event = 'Event'
+ return
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('production', '0022_auto_20170930_1756'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='productionevent',
+ name='event',
+ field=models.CharField(choices=[('assignment', 'Assignment'), ('status', 'Status change'), ('message', 'Message'), ('registration', 'Registration hours')], max_length=64),
+ ),
+ migrations.RunPython(update_status, update_status_inverse)
+ ]
diff --git a/production/models.py b/production/models.py
index 17f2d73c4..367f99bb5 100644
--- a/production/models.py
+++ b/production/models.py
@@ -2,8 +2,10 @@ from django.db import models
from django.core.urlresolvers import reverse
from django.contrib.auth.models import User
from django.utils import timezone
+from django.utils.functional import cached_property
-from .constants import PRODUCTION_STREAM_STATUS, PRODUCTION_STREAM_ONGOING, PRODUCTION_EVENTS
+from .constants import PRODUCTION_STREAM_STATUS, PRODUCTION_STREAM_INITIATED, PRODUCTION_EVENTS,\
+ EVENT_MESSAGE, EVENT_HOUR_REGISTRATION, PRODUCTION_STREAM_COMPLETED
from .managers import ProductionStreamQuerySet, ProductionEventManager
@@ -22,11 +24,13 @@ class ProductionUser(models.Model):
class ProductionStream(models.Model):
- submission = models.OneToOneField('submissions.Submission', on_delete=models.CASCADE)
+ submission = models.OneToOneField('submissions.Submission', on_delete=models.CASCADE,
+ related_name='production_stream')
opened = models.DateTimeField(auto_now_add=True)
closed = models.DateTimeField(default=timezone.now)
- status = models.CharField(max_length=32,
- choices=PRODUCTION_STREAM_STATUS, default=PRODUCTION_STREAM_ONGOING)
+ status = models.CharField(max_length=32, choices=PRODUCTION_STREAM_STATUS,
+ default=PRODUCTION_STREAM_INITIATED)
+
officer = models.ForeignKey('production.ProductionUser', blank=True, null=True,
related_name='streams')
supervisor = models.ForeignKey('production.ProductionUser', blank=True, null=True,
@@ -45,22 +49,27 @@ class ProductionStream(models.Model):
title=self.submission.title)
def get_absolute_url(self):
- if self.status == PRODUCTION_STREAM_ONGOING:
- return reverse('production:production') + '#stream_' + str(self.id)
- return reverse('production:completed') + '#stream_' + str(self.id)
+ return reverse('production:stream', args=(self.id,))
+ @cached_property
def total_duration(self):
totdur = self.events.aggregate(models.Sum('duration'))
return totdur['duration__sum']
+ @cached_property
+ def completed(self):
+ return self.status == PRODUCTION_STREAM_COMPLETED
+
class ProductionEvent(models.Model):
stream = models.ForeignKey(ProductionStream, on_delete=models.CASCADE, related_name='events')
- event = models.CharField(max_length=64, choices=PRODUCTION_EVENTS)
+ event = models.CharField(max_length=64, choices=PRODUCTION_EVENTS, default=EVENT_MESSAGE)
comments = models.TextField(blank=True, null=True)
noted_on = models.DateTimeField(default=timezone.now)
noted_by = models.ForeignKey('production.ProductionUser', on_delete=models.CASCADE,
related_name='events')
+ noted_to = models.ForeignKey('production.ProductionUser', on_delete=models.CASCADE,
+ blank=True, null=True, related_name='received_events')
duration = models.DurationField(blank=True, null=True)
objects = ProductionEventManager()
@@ -73,3 +82,7 @@ class ProductionEvent(models.Model):
def get_absolute_url(self):
return self.stream.get_absolute_url()
+
+ @cached_property
+ def editable(self):
+ return self.event in [EVENT_MESSAGE, EVENT_HOUR_REGISTRATION] and not self.stream.completed
diff --git a/production/signals.py b/production/signals.py
index 2d17c3a33..b0ad606bc 100644
--- a/production/signals.py
+++ b/production/signals.py
@@ -1,5 +1,7 @@
from django.contrib.auth.models import Group
+from .import constants
+
from notifications.signals import notify
@@ -9,8 +11,8 @@ def notify_new_stream(sender, instance, created, **kwargs):
"""
if created:
editorial_college = Group.objects.get(name='Editorial College')
- supervisors = Group.objects.get(name='Production Supervisor')
- for recipient in supervisors.user_set.all():
+ administators = Group.objects.get(name='Editorial Administrators')
+ for recipient in administators.user_set.all():
notify.send(sender=sender, recipient=recipient, actor=editorial_college,
verb=' accepted a Submission. A new Production Stream has started.',
target=instance)
@@ -31,24 +33,54 @@ def notify_new_event(sender, instance, created, **kwargs):
if created:
stream = instance.stream
- if stream.officer != instance.noted_by:
+ if stream.officer and stream.officer != instance.noted_by:
notify.send(sender=sender, recipient=stream.officer.user,
actor=instance.noted_by.user,
verb=' created a new Production Event.', target=instance)
- if stream.supervisor != instance.noted_by:
+ if stream.supervisor and stream.supervisor != instance.noted_by:
notify.send(sender=sender, recipient=stream.supervisor.user,
actor=instance.noted_by.user,
verb=' created a new Production Event.', target=instance)
-def notify_stream_completed(sender, instance, **kwargs):
+def notify_stream_status_change(sender, instance, created, **kwargs):
"""
- Notify the production team about a Production Stream being completed.
+ Notify the production officers about a new status change for a Production Stream.
+
+ sender -- User instance
+ instance -- ProductionStream instance
"""
- stream = instance.stream
- notify.send(sender=sender, recipient=stream.officer.user,
- actor=sender, verb=' marked Production Stream as completed.', target=instance)
- notify.send(sender=sender, recipient=stream.supervisor.user,
- actor=sender, verb=' marked Production Stream as completed.', target=instance)
+ if instance.status == constants.PROOFS_ACCEPTED:
+ administators = Group.objects.get(name='Editorial Administrators')
+ for user in administators.user_set.all():
+ notify.send(sender=sender, recipient=user,
+ actor=sender,
+ verb=' has marked proofs as being accepted.', target=instance)
+ elif instance.status == constants.PROOFS_PUBLISHED:
+ if instance.supervisor:
+ notify.send(sender=sender, recipient=instance.supervisor.user,
+ actor=sender,
+ verb=' published the manuscript of your Production Stream.',
+ target=instance)
+
+ elif instance.status == constants.PRODUCTION_STREAM_COMPLETED:
+ if instance.supervisor:
+ notify.send(sender=sender, recipient=instance.supervisor.user,
+ actor=sender,
+ verb=' marked your Production Stream as completed.', target=instance)
+ if instance.officer:
+ notify.send(sender=sender, recipient=instance.officer.user,
+ actor=sender,
+ verb=' marked your Production Stream as completed.', target=instance)
+ else:
+ if instance.officer:
+ notify.send(sender=sender, recipient=instance.officer.user,
+ actor=sender,
+ verb=' changed the Production Stream status.', target=instance)
+
+ if instance.supervisor:
+ notify.send(sender=sender, recipient=instance.supervisor.user,
+ actor=sender,
+ verb=' changed the Production Stream status.', target=instance)
diff --git a/production/templates/production/partials/production_events.html b/production/templates/production/partials/production_events.html
index 4db2ab632..b3d2c0426 100644
--- a/production/templates/production/partials/production_events.html
+++ b/production/templates/production/partials/production_events.html
@@ -1,22 +1,42 @@
{% load scipost_extras %}
-<ul>
+<ul class="list-unstyled">
{% for event in events %}
- <li id="event_{{ event.id }}">
- <p class="mb-0 font-weight-bold">{{ event.get_event_display }}
- {% if not non_editable %}
- {% if event.noted_by == request.user.production_user %}
- · <a href="{% url 'production:update_event' event.id %}">Edit</a>
- · <a class="text-danger" href="{% url 'production:delete_event' event.id %}">Delete</a>
- {% endif %}
- {% endif %}
- </p>
- <p class="text-muted mb-1">noted {{ event.noted_on }} by {{ event.noted_by }}</p>
- {% if event.duration %}
- <div class="mb-2">Duration: {{ event.duration|duration }}</div>
- {% endif %}
+ <li id="event_{{ event.id }}" class="pb-2">
+ <div class="d-flex justify-content-between">
+ <div>
+ <strong>{{ event.noted_by.user.first_name }} {{ event.noted_by.user.last_name }}</strong>
+ <br>
+ {{ event.get_event_display }}
+ </div>
+ <div class="text-muted text-right d-flex justify-content-end">
+ <div>
+ {{ event.noted_on }}
+ {% if event.duration %}
+ <br>
+ <strong>Duration: {{ event.duration|duration }}</strong>
+ {% endif %}
+ </div>
+
+ {% if not non_editable %}
+ {% if event.noted_by == request.user.production_user and event.editable %}
+ <div class="pl-2">
+ <a href="{% url 'production:update_event' event.id %}"><i class="fa fa-pencil-square-o" aria-hidden="true"></i></a>
+ <a class="text-danger" href="{% url 'production:delete_event' event.id %}"><i class="fa fa-trash" aria-hidden="true"></i></a>
+ </div>
+ {% endif %}
+ {% endif %}
+ </div>
+ </div>
+
{% if event.comments %}
- <div>{{ event.comments|linebreaks }}</div>
+ <p class="mt-2 mb-0">
+ {% if event.noted_to %}
+ {{ event.noted_by.user.first_name }} {{ event.noted_by.user.first_name }} {{ event.comments|linebreaksbr }} {{ event.noted_to.user.first_name }} {{ event.noted_to.user.last_name }}.
+ {% else %}
+ {{ event.comments|linebreaksbr }}
+ {% endif %}
+ </p>
{% endif %}
</li>
{% empty %}
@@ -25,6 +45,6 @@
</ul>
{% if stream.total_duration %}
- <hr class="sm">
- <p class="pl-4 ml-3">Total duration for this stream: <strong>{{ stream.total_duration|duration }}</strong></p>
+ <hr>
+ <p class="text-right">Total duration for this stream: <strong>{{ stream.total_duration|duration }}</strong></p>
{% endif %}
diff --git a/production/templates/production/partials/production_stream_card.html b/production/templates/production/partials/production_stream_card.html
index f1f88a568..530e669e1 100644
--- a/production/templates/production/partials/production_stream_card.html
+++ b/production/templates/production/partials/production_stream_card.html
@@ -1,14 +1,22 @@
{% extends 'production/partials/production_stream_card_completed.html' %}
{% load bootstrap %}
-{% load guardian_tags %}
-
-{% get_obj_perms request.user for stream as "sub_perms" %}
{% block actions %}
+ {% include 'production/partials/stream_status_changes.html' with form=status_form stream=stream %}
+
<h3>Events</h3>
{% include 'production/partials/production_events.html' with events=stream.events.all %}
+ {% if prodevent_form and "can_work_for_stream" in sub_perms %}
+ <h3>Add message and/or hours to the Stream</h3>
+ <form action="{% url 'production:add_event' stream_id=stream.id %}" method="post" class="mb-2">
+ {% csrf_token %}
+ {{ prodevent_form|bootstrap }}
+ <input type="submit" class="btn btn-secondary" name="submit" value="Submit">
+ </form>
+ {% endif %}
+
{% if perms.scipost.can_publish_accepted_submission or perms.scipost.can_assign_production_supervisor or "can_perform_supervisory_actions" in sub_perms %}
<h3>Actions</h3>
<ul>
@@ -19,7 +27,7 @@
<form class="my-3" action="{% url 'production:add_supervisor' stream_id=stream.id %}" method="post">
{% csrf_token %}
{{ assign_supervisor_form|bootstrap_inline }}
- <input type="submit" class="btn btn-outline-primary" name="submit" value="Add officer">
+ <input type="submit" class="btn btn-outline-primary" name="submit" value="Add supervisor">
</form>
</div>
</li>
diff --git a/production/templates/production/partials/production_stream_card_completed.html b/production/templates/production/partials/production_stream_card_completed.html
index f31b37b1a..980a42168 100644
--- a/production/templates/production/partials/production_stream_card_completed.html
+++ b/production/templates/production/partials/production_stream_card_completed.html
@@ -3,14 +3,13 @@
{% get_obj_perms request.user for stream as "sub_perms" %}
-<div class="w-100" id="stream_{{stream.id}}">
+<div class="card-body py-0" id="stream_{{stream.id}}">
{% include 'submissions/_submission_card_content_sparse.html' with submission=stream.submission %}
</div>
<div class="card-body">
- <div class="row">
- <div class="{% if prodevent_form %}col-lg-7{% else %}col-12{% endif %}">
- <h3>Officers</h3>
+ <h3>Stream details</h3>
<ul>
+ <li>Status: <em>{{ stream.get_status_display }}</em></li>
{% block officers %}
<li>Production Supervisor:
{% if stream.supervisor %}
@@ -33,17 +32,4 @@
<h3>Events</h3>
{% include 'production/partials/production_events.html' with events=stream.events.all non_editable=1 %}
{% endblock %}
-
- </div>
- {% if prodevent_form and "can_work_for_stream" in sub_perms %}
- <div class="col-lg-5 mt-4 mt-lg-0">
- <h3>Add an event to this production stream:</h3>
- <form action="{% url 'production:add_event' stream_id=stream.id %}" method="post">
- {% csrf_token %}
- {{ prodevent_form|bootstrap }}
- <input type="submit" class="btn btn-secondary" name="submit" value="Submit">
- </form>
- </div>
- {% endif %}
- </div>
</div>
diff --git a/production/templates/production/partials/stream_status_changes.html b/production/templates/production/partials/stream_status_changes.html
new file mode 100644
index 000000000..0d8dabf6f
--- /dev/null
+++ b/production/templates/production/partials/stream_status_changes.html
@@ -0,0 +1,14 @@
+{% load bootstrap %}
+
+{% if perms.scipost.can_take_decisions_related_to_proofs and form.fields.status.choices|length > 0 %}
+ <h3>Change current stream status:</h3>
+ <form method="post" action="{% url 'production:update_status' stream.id %}" class="form-inline">
+ {% csrf_token %}
+ {{ form|bootstrap_inline }}
+ <div class="form-group row">
+ <div class="col-form-label col ml-2">
+ <button type="submit" class="btn btn-primary">Submit</button>
+ </div>
+ </div>
+ </form>
+{% endif %}
diff --git a/production/templates/production/production.html b/production/templates/production/production.html
index 92e6e2c49..01c76f6ea 100644
--- a/production/templates/production/production.html
+++ b/production/templates/production/production.html
@@ -49,38 +49,83 @@
</div>
</div>
- <table class="table table-hover mb-5">
- <thead class="thead-default">
- <tr>
- <th>Authors</th>
- <th>Title</th>
- <th>Accepted</th>
- <th>Latest Event</th>
- <th>Date</th>
- </tr>
- </thead>
-
- <tbody id="accordion" role="tablist" aria-multiselectable="true">
- {% for stream in streams %}
- <tr data-toggle="collapse" data-parent="#accordion" href="#collapse{{ stream.id }}" aria-expanded="true" aria-controls="collapse{{ stream.id }}" style="cursor: pointer;">
- <td>{{ stream.submission.author_list }}</td>
- <td>{{ stream.submission.title }}</td>
- <td>{{ stream.submission.acceptance_date|date:"Y-m-d" }}</td>
- <td>{{ stream.events.last.get_event_display }}</td>
- <td>{{ stream.events.last.noted_on }}</td>
- </tr>
- <tr id="collapse{{ stream.id }}" class="collapse" role="tabpanel" aria-labelledby="heading{{ stream.id }}" style="background-color: #fff;">
- <td colspan="5">
- {% include 'production/partials/production_stream_card.html' with stream=stream prodevent_form=prodevent_form assignment_form=assignment_form %}
- </td>
- </tr>
- {% empty %}
+ <div class="row">
+ <div class="col-6">
+ <ul class="list-unstyled" data-target="active-list">
+ {% for stream in streams %}
+ <li class="p-2">
+ <div class="d-flex justify-content-start">
+ <div class="icons pr-2">
+ <i class="fa fa-users" data-toggle="tooltip" data-html="true" title="" data-original-title="
+ Supervisor: {% if stream.supervisor %}{{ stream.supervisor.user.first_name }} {{ stream.supervisor.user.last_name }}{% else %}<em>Unassigned</em>{% endif %}<br>
+ Officer: {% if stream.officer %}{{ stream.officer.user.first_name }} {{ stream.officer.user.last_name }}{% else %}<em>Unassigned</em>{% endif %}
+ "></i>
+ {% if stream.supervisor.user == request.user %}
+ <i class="fa fa-info-circle" data-toggle="tooltip" data-html="true" title="" data-original-title="You are assigned as supervisor"></i>
+ {% endif %}
+ </div>
+ <div>
+ <p class="mb-1">
+ <a href="{% url 'production:stream' stream.id %}">{{ stream.submission.title }}</a><br>
+ <em>by {{ stream.submission.author_list }}</em>
+ </p>
+ <p class="card-text mb-2">
+ <a href="{% url 'production:stream' stream.id %}" data-toggle="dynamic" data-target="#details">See stream details</a>
+ </p>
+
+ <p class="label label-{% if stream.status == 'initiated' %}outline-danger{% else %}secondary{% endif %} label-sm">{{ stream.get_status_display }}</p>
+ </div>
+ </div>
+ </li>
+ {% endfor %}
+ </ul>
+
+ {% comment %}
+ <table class="table table-hover mb-5">
+ <thead class="thead-default">
<tr>
- <td colspan="5">No production streams found.</td>
+ <th>Authors</th>
+ <th>Title</th>
+ <th>Accepted</th>
+ <th>Latest Event</th>
+ <th>Date</th>
</tr>
- {% endfor %}
- </tbody>
- </table>
+ </thead>
+
+ <tbody id="accordion" role="tablist" aria-multiselectable="true">
+ {% for stream in streams %}
+ <tr data-toggle="collapse" data-parent="#accordion" href="#collapse{{ stream.id }}" aria-expanded="true" aria-controls="collapse{{ stream.id }}" style="cursor: pointer;">
+ <td>{{ stream.submission.author_list }}</td>
+ <td>{{ stream.submission.title }}</td>
+ <td>{{ stream.submission.acceptance_date|date:"Y-m-d" }}</td>
+ <td>{{ stream.events.last.get_event_display }}</td>
+ <td>{{ stream.events.last.noted_on }}</td>
+ </tr>
+ <tr id="collapse{{ stream.id }}" class="collapse" role="tabpanel" aria-labelledby="heading{{ stream.id }}" style="background-color: #fff;">
+ <td colspan="5">
+ {% include 'production/partials/production_stream_card.html' with stream=stream prodevent_form=prodevent_form assign_officer_form=assign_officer_form assign_supervisor_form=assign_supervisor_form %}
+ </td>
+ </tr>
+ {% empty %}
+ <tr>
+ <td colspan="5">No production streams found.</td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ {% endcomment %}
+ </div>
+ <div class="col-6">
+ <div class="card center-loader" id="details">
+ <div class="text-center py-4">
+ <i class="fa fa-hand-o-left fa-3x" aria-hidden="true"></i>
+
+ <h3>Choose a Stream to see more details</h3>
+ </div>
+ </div>
+
+ </div>
+ </div>
</div>
diff --git a/production/templates/production/stream.html b/production/templates/production/stream.html
new file mode 100644
index 000000000..bc70003ea
--- /dev/null
+++ b/production/templates/production/stream.html
@@ -0,0 +1,13 @@
+{% extends 'production/base.html' %}
+
+{% block breadcrumb_items %}
+ {{block.super}}
+ <span class="breadcrumb-item">Production Stream</span>
+{% endblock %}
+
+{% block content %}
+
+<h1 class="highlight">Production Stream</h1>
+{% include 'production/partials/production_stream_card.html' %}
+
+{% endblock content %}
diff --git a/production/urls.py b/production/urls.py
index 8631da56c..51af1e5d8 100644
--- a/production/urls.py
+++ b/production/urls.py
@@ -6,6 +6,10 @@ urlpatterns = [
url(r'^$', production_views.production, name='production'),
url(r'^completed$', production_views.completed, name='completed'),
url(r'^officers/new$', production_views.user_to_officer, name='user_to_officer'),
+ url(r'^streams/(?P<stream_id>[0-9]+)$',
+ production_views.stream, name='stream'),
+ url(r'^streams/(?P<stream_id>[0-9]+)/status$',
+ production_views.update_status, name='update_status'),
url(r'^streams/(?P<stream_id>[0-9]+)/events/add$',
production_views.add_event, name='add_event'),
url(r'^streams/(?P<stream_id>[0-9]+)/officer/add$',
diff --git a/production/views.py b/production/views.py
index bcafcdbe0..f33d9eeb0 100644
--- a/production/views.py
+++ b/production/views.py
@@ -11,13 +11,14 @@ from django.utils.decorators import method_decorator
from django.views.generic.edit import UpdateView, DeleteView
from guardian.core import ObjectPermissionChecker
-from guardian.shortcuts import assign_perm
+from guardian.shortcuts import assign_perm, remove_perm
-from .constants import PRODUCTION_STREAM_COMPLETED
+from . import constants
from .models import ProductionUser, ProductionStream, ProductionEvent
-from .forms import ProductionEventForm, AssignOfficerForm, UserToOfficerForm, AssignSupervisorForm
+from .forms import ProductionEventForm, AssignOfficerForm, UserToOfficerForm,\
+ AssignSupervisorForm, StreamStatusForm
from .permissions import is_production_user
-from .signals import notify_stream_completed, notify_new_stream_assignment
+from .signals import notify_stream_status_change, notify_new_stream_assignment
######################
@@ -37,17 +38,11 @@ def production(request):
streams = streams.filter_for_user(request.user.production_user)
streams = streams.order_by('opened')
- prodevent_form = ProductionEventForm()
- assign_officer_form = AssignOfficerForm()
- assign_supervisor_form = AssignSupervisorForm()
ownevents = ProductionEvent.objects.filter(
noted_by=request.user.production_user,
duration__gte=datetime.timedelta(minutes=1)).order_by('-noted_on')
context = {
'streams': streams,
- 'prodevent_form': prodevent_form,
- 'assign_officer_form': assign_officer_form,
- 'assign_supervisor_form': assign_supervisor_form,
'ownevents': ownevents,
}
if request.user.has_perm('scipost.can_view_timesheets'):
@@ -74,6 +69,36 @@ def completed(request):
return render(request, 'production/completed.html', context)
+@is_production_user()
+@permission_required('scipost.can_view_production', raise_exception=True)
+def stream(request, stream_id):
+ """
+ Overview page for specific stream.
+ """
+ streams = ProductionStream.objects.ongoing()
+ if not request.user.has_perm('scipost.can_view_all_production_streams'):
+ # Restrict stream queryset if user is not supervisor
+ streams = streams.filter_for_user(request.user.production_user)
+ stream = get_object_or_404(streams, id=stream_id)
+ prodevent_form = ProductionEventForm()
+ assign_officer_form = AssignOfficerForm()
+ assign_supervisor_form = AssignSupervisorForm()
+ status_form = StreamStatusForm(instance=stream, production_user=request.user.production_user)
+
+ context = {
+ 'stream': stream,
+ 'prodevent_form': prodevent_form,
+ 'assign_officer_form': assign_officer_form,
+ 'assign_supervisor_form': assign_supervisor_form,
+ 'status_form': status_form,
+ }
+
+ if request.GET.get('json'):
+ return render(request, 'production/partials/production_stream_card.html', context)
+ else:
+ return render(request, 'production/stream.html', context)
+
+
@is_production_user()
@permission_required('scipost.can_promote_user_to_production_officer')
def user_to_officer(request):
@@ -88,6 +113,26 @@ def user_to_officer(request):
return redirect(reverse('production:production'))
+@is_production_user()
+@permission_required('scipost.can_take_decisions_related_to_proofs', raise_exception=True)
+def update_status(request, stream_id):
+ stream = get_object_or_404(ProductionStream.objects.ongoing(), pk=stream_id)
+ checker = ObjectPermissionChecker(request.user)
+ if not checker.has_perm('can_perform_supervisory_actions', stream):
+ return redirect(reverse('production:production'))
+
+ p = request.user.production_user
+ form = StreamStatusForm(request.POST or None, instance=stream,
+ production_user=p)
+
+ if form.is_valid():
+ stream = form.save()
+ messages.warning(request, 'Production Stream succesfully changed status.')
+ else:
+ messages.warning(request, 'The status change was invalid.')
+ return redirect(stream.get_absolute_url())
+
+
@is_production_user()
@permission_required('scipost.can_view_production', raise_exception=True)
def add_event(request, stream_id):
@@ -100,6 +145,8 @@ def add_event(request, stream_id):
if prodevent_form.is_valid():
prodevent = prodevent_form.save(commit=False)
prodevent.stream = stream
+ if prodevent.duration:
+ prodevent.event = constants.EVENT_HOUR_REGISTRATION
prodevent.noted_by = request.user.production_user
prodevent.save()
else:
@@ -122,6 +169,13 @@ def add_officer(request, stream_id):
assign_perm('can_work_for_stream', officer.user, stream)
messages.success(request, 'Officer {officer} has been assigned.'.format(officer=officer))
notify_new_stream_assignment(request.user, stream, officer.user)
+ event = ProductionEvent(
+ stream=stream,
+ event='assignment',
+ comments=' tasked Production Officer with proofs production:',
+ noted_to=officer,
+ noted_by=request.user.production_user)
+ event.save()
else:
for key, error in form.errors.items():
messages.warning(request, error[0])
@@ -140,6 +194,7 @@ def remove_officer(request, stream_id, officer_id):
officer = stream.officer
stream.officer = None
stream.save()
+ remove_perm('can_work_for_stream', officer.user, stream)
messages.success(request, 'Officer {officer} has been removed.'.format(officer=officer))
return redirect(reverse('production:production'))
@@ -154,10 +209,18 @@ def add_supervisor(request, stream_id):
if form.is_valid():
form.save()
supervisor = form.cleaned_data.get('supervisor')
- assign_perm('can_work_for_stream', supervisor.user, stream)
messages.success(request, 'Supervisor {supervisor} has been assigned.'.format(
supervisor=supervisor))
notify_new_stream_assignment(request.user, stream, supervisor.user)
+ event = ProductionEvent(
+ stream=stream,
+ event='assignment',
+ comments=' assigned Production Supervisor:',
+ noted_to=supervisor,
+ noted_by=request.user.production_user)
+ event.save()
+
+ assign_perm('can_work_for_stream', supervisor.user, stream)
assign_perm('can_perform_supervisory_actions', supervisor.user, stream)
else:
for key, error in form.errors.items():
@@ -173,6 +236,8 @@ def remove_supervisor(request, stream_id, officer_id):
supervisor = stream.supervisor
stream.supervisor = None
stream.save()
+ remove_perm('can_work_for_stream', supervisor.user, stream)
+ remove_perm('can_perform_supervisory_actions', supervisor.user, stream)
messages.success(request, 'Supervisor {supervisor} has been removed.'.format(
supervisor=supervisor))
@@ -219,11 +284,18 @@ class DeleteEventView(DeleteView):
@permission_required('scipost.can_publish_accepted_submission', raise_exception=True)
def mark_as_completed(request, stream_id):
stream = get_object_or_404(ProductionStream.objects.ongoing(), pk=stream_id)
- stream.status = PRODUCTION_STREAM_COMPLETED
+ stream.status = constants.PRODUCTION_STREAM_COMPLETED
stream.closed = timezone.now()
stream.save()
- notify_stream_completed(request.user, stream)
+ prodevent = ProductionEvent(
+ stream=stream,
+ event='status',
+ comments=' marked the Production Stream as completed.',
+ noted_by=request.user.production_user
+ )
+ prodevent.save()
+ notify_stream_status_change(request.user, stream)
return redirect(reverse('production:production'))
diff --git a/scipost/management/commands/add_groups_and_permissions.py b/scipost/management/commands/add_groups_and_permissions.py
index 638a67dfa..d3bbd031c 100644
--- a/scipost/management/commands/add_groups_and_permissions.py
+++ b/scipost/management/commands/add_groups_and_permissions.py
@@ -226,6 +226,10 @@ class Command(BaseCommand):
codename='can_view_production',
name='Can view production page',
content_type=content_type)
+ can_take_decisions_related_to_proofs, created = Permission.objects.get_or_create(
+ codename='can_take_decisions_related_to_proofs',
+ name='Can take decisions related to proofs',
+ content_type=content_type)
can_publish_accepted_submission, created = Permission.objects.get_or_create(
codename='can_publish_accepted_submission',
name='Can publish accepted submission',
@@ -300,6 +304,7 @@ class Command(BaseCommand):
can_manage_reports,
can_assign_production_supervisor,
can_view_all_production_streams,
+ can_take_decisions_related_to_proofs,
])
EditorialCollege.permissions.set([
@@ -340,6 +345,7 @@ class Command(BaseCommand):
ProductionSupervisors.permissions.set([
can_assign_production_officer,
+ can_take_decisions_related_to_proofs,
can_view_all_production_streams,
can_view_docs_scipost,
can_view_production,
diff --git a/scipost/static/scipost/assets/css/_list_group.scss b/scipost/static/scipost/assets/css/_list_group.scss
index 1053f6ce7..c53b6f440 100644
--- a/scipost/static/scipost/assets/css/_list_group.scss
+++ b/scipost/static/scipost/assets/css/_list_group.scss
@@ -46,3 +46,9 @@ ul.events-list {
}
}
}
+
+ul[data-target="active-list"] {
+ li.active {
+ background-color: $gray-100;
+ }
+}
diff --git a/scipost/static/scipost/assets/css/_pool.scss b/scipost/static/scipost/assets/css/_pool.scss
index 5a59e0df5..e6844d820 100644
--- a/scipost/static/scipost/assets/css/_pool.scss
+++ b/scipost/static/scipost/assets/css/_pool.scss
@@ -32,8 +32,4 @@ $pool-flex-width: calc(100% - 40px);
padding: 5rem 0 3rem 0;
text-align: center;
}
-
- li.active {
- background-color: $gray-100;
- }
}
diff --git a/scipost/static/scipost/assets/js/scripts.js b/scipost/static/scipost/assets/js/scripts.js
index fcc6ddc4c..df1b212a3 100644
--- a/scipost/static/scipost/assets/js/scripts.js
+++ b/scipost/static/scipost/assets/js/scripts.js
@@ -21,6 +21,7 @@ var getUrlParameter = function getUrlParameter(sParam) {
};
function init_page() {
+ console.log('init!')
// Show right tab if url contains `tab` GET request
var tab = getUrlParameter('tab')
if (tab) {
@@ -31,16 +32,16 @@ function init_page() {
$("form .auto-submit input, form.auto-submit input, form.auto-submit select").on('change', function(){
$(this).parents('form').submit()
});
-}
-
-$(function(){
- // Remove all alerts in screen automatically after 15sec.
- setTimeout(function() {hide_all_alerts()}, 15000);
// Start general toggle
$('[data-toggle="toggle"]').on('click', function() {
$($(this).attr('data-target')).toggle();
});
+}
+
+$(function(){
+ // Remove all alerts in screen automatically after 15sec.
+ setTimeout(function() {hide_all_alerts()}, 15000);
// Change `tab` GET parameter for page-reload
$('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
@@ -62,13 +63,14 @@ $(function(){
$.get(url + '?json=1').done(function(data) {
// console.log('done', data);
- $(target).html(data);
+ $(target).html(data).promise().done(function() {
+ init_page();
+ });
$('[data-target="active-list"]')
.find('> li')
.removeClass('active')
$(self).parents('[data-target="active-list"] > li')
.addClass('active');
- init_page();
});
});
});
diff --git a/scipost/templates/widgets/checkbox_option_as_btn.html b/scipost/templates/widgets/checkbox_option_as_btn.html
index 191c44ea1..708be2199 100644
--- a/scipost/templates/widgets/checkbox_option_as_btn.html
+++ b/scipost/templates/widgets/checkbox_option_as_btn.html
@@ -1,4 +1,3 @@
-
{% include "django/forms/widgets/input.html" %}
<label{% if widget.attrs.id %} class="btn btn-info" for="{{ widget.attrs.id }}"{% endif %}>
{{ widget.label }}</label>
diff --git a/scipost/templatetags/bootstrap.py b/scipost/templatetags/bootstrap.py
index ef02a434f..1b8b0d0d6 100644
--- a/scipost/templatetags/bootstrap.py
+++ b/scipost/templatetags/bootstrap.py
@@ -11,7 +11,7 @@ register = template.Library()
@register.filter
-def bootstrap(element, args='2,10'):
+def bootstrap(element, args='2,10', extra_classes=''):
'''Pass arguments to tag by separating them using a comma ",".
Arguments:
@@ -31,6 +31,9 @@ def bootstrap(element, args='2,10'):
markup_classes['label'] += ' col-form-label-%s' % args.get(2)
markup_classes['form_control'] = 'form-control-%s' % args.get(2)
+ if extra_classes:
+ markup_classes['extra'] = extra_classes
+
return render(element, markup_classes)
@@ -50,6 +53,11 @@ def bootstrap_inline(element, args='2,10'):
return render(element, markup_classes)
+@register.filter
+def bootstrap_grouped(element, args='2,10'):
+ return bootstrap(element, args, 'grouped')
+
+
@register.filter
def add_input_classes(field, extra_classes=''):
if not is_checkbox(field) and not is_multiple_checkbox(field) \
--
GitLab