diff --git a/submissions/management/commands/email_fellows_tasklist.py b/submissions/management/commands/email_fellows_tasklist.py index 7c79b557c1d5f40fcccec6cf8027b3995b5d32c1..36c562ecfc30fceb0e165a22d32baeec33f0a275 100644 --- a/submissions/management/commands/email_fellows_tasklist.py +++ b/submissions/management/commands/email_fellows_tasklist.py @@ -10,7 +10,7 @@ class Command(BaseCommand): help = 'Sends an email to Fellows with current and upcoming tasks list' def handle(self, *args, **kwargs): fellows = Contributor.objects.fellows( - ).filter(user__last_name__istartswith='C' # temporary limitation, to ease testing +# ).filter(user__last_name__istartswith='C' # temporary limitation, to ease testing ).order_by('user__last_name') for fellow in fellows: diff --git a/templates/email/email_fellow_tasklist.html b/templates/email/email_fellow_tasklist.html index 7af83e7ac4fee5e5786aa55efa64f0fff50d655d..4de2a66f09db57ed6bec3728afc50fae1c9690b3 100644 --- a/templates/email/email_fellow_tasklist.html +++ b/templates/email/email_fellow_tasklist.html @@ -17,14 +17,21 @@ <ul> {% for assignment in assignments_ongoing %} <li> - <div class="pool-item"> - <p class="mb-1"> - <a href="https://scipost.org{% url 'submissions:pool' assignment.submission.arxiv_identifier_w_vn_nr %}">{{ assignment.submission.title }}</a><br> - <em>by {{ assignment.submission.author_list }}</em> - </p> - <p><a href="https://scipost.org{% url 'submissions:editorial_page' assignment.submission.arxiv_identifier_w_vn_nr %}">Go to this Submission's Editorial page</a></p> - {% include 'submissions/_required_actions_block.html' with submission=assignment.submission %} - </div> + <p> + <a href="https://scipost.org{% url 'submissions:pool' assignment.submission.arxiv_identifier_w_vn_nr %}">{{ assignment.submission.title }}</a><br> + <em>by {{ assignment.submission.author_list }}</em> + </p> + <p><a href="https://scipost.org{% url 'submissions:editorial_page' assignment.submission.arxiv_identifier_w_vn_nr %}">Go to this Submission's Editorial page</a></p> + {% if assignment.submission.cycle.has_required_actions %} + <h3>Required actions:</h3> + <ul> + {% for action in assignment.submission.cycle.get_required_actions %} + <li>{{action.1}}</li> + {% empty %} + <li>No actions required</li> + {% endfor %} + </ul> + {% endif %} </li> {% endfor %} </ul> @@ -34,14 +41,12 @@ <ul> {% for assignment in assignments_upcoming_deadline %} <li> - <div class="pool-item"> - <p class="mb-1"> - <a href="https://scipost.org{% url 'submissions:pool' assignment.submission.arxiv_identifier_w_vn_nr %}">{{ assignment.submission.title }}</a><br> - <em>by {{ assignment.submission.author_list }}</em> - </p> - <p>Refereeing deadline: {{ assignment.submission.reporting_deadline|date:"Y-m-d" }}.</p> - <p><a href="https://scipost.org{% url 'submissions:editorial_page' assignment.submission.arxiv_identifier_w_vn_nr %}">Go to this Submission's Editorial page</a></p> - </div> + <p> + <a href="https://scipost.org{% url 'submissions:pool' assignment.submission.arxiv_identifier_w_vn_nr %}">{{ assignment.submission.title }}</a><br> + <em>by {{ assignment.submission.author_list }}</em> + </p> + <p>Refereeing deadline: {{ assignment.submission.reporting_deadline|date:"Y-m-d" }}.</p> + <p><a href="https://scipost.org{% url 'submissions:editorial_page' assignment.submission.arxiv_identifier_w_vn_nr %}">Go to this Submission's Editorial page</a></p> </li> {% endfor %} </ul>