Extra search form

invitations/forms.py

 from django import forms
 from django.contrib import messages
+from django.db.models import Q
 
 from journals.models import Publication
 from scipost.models import Contributor
@@ -17,6 +18,17 @@ class AcceptRequestMixin:
         super().__init__(*args, **kwargs)
 
 
+class RegistrationInvitationFilterForm(forms.Form):
+    term = forms.CharField(help_text="You may search on arXiv identifier, DOI or last name.")
+
+    def search(self, qs):
+        term = self.cleaned_data.get('term')
+        return qs.filter(
+            Q(last_name__icontains=term) |
+            Q(citation_notifications__submission__arxiv_identifier_w_vn_nr__icontains=term) |
+            Q(citation_notifications__publication__doi_label__icontains=term))
+
+
 class SuggestionSearchForm(forms.Form):
     last_name = forms.CharField()
 

invitations/templates/invitations/registrationinvitation_list.html

@@ -47,6 +47,13 @@
     <div class="col-12">
         <h2 class="highlight">Registration Invitations</h2>
     </div>
+    <div class="col-md-6">
+        <form method="get">
+            {{ search_form|bootstrap }}
+            <input class="btn btn-primary" type="submit" value="Filter">
+            <a href="{% url 'invitations:list' %}" class="btn btn-link">Reset filter</a>
+        </form>
+    </div>
     {% if is_paginated %}
         <div class="col-12">
             {% include 'partials/pagination.html' with page_obj=page_obj %}

invitations/templates/invitations/registrationinvitation_list_sent.html

@@ -16,6 +16,13 @@
 
 
 <div class="row">
+    <div class="col-12">
+        <form method="get">
+            {{ search_form|bootstrap }}
+            <input class="btn btn-primary" type="submit" value="Filter">
+            <a href="{% url 'invitations:list_sent' %}" class="btn btn-link">Reset filter</a>
+        </form>
+    </div>
     {% if is_paginated %}
         <div class="col-12">
             {% include 'partials/pagination.html' with page_obj=page_obj %}

invitations/templates/partials/invitations/registrationinvitation_table.html

 {% load scipost_extras %}
 
-<table class="table">
+<table class="table table-hover">
     <thead>
         <tr>
             <th>Name</th>
@@ -16,7 +16,10 @@
     <tbody>
         {% for invitation in invitations %}
           <tr>
-            <td>{{ invitation.last_name }}, {{ invitation.first_name }}</td>
+            <td>
+                <small><i class="fa fa-paperclip" data-toggle="tooltip" data-html="true" data-title="<ul style='margin-bottom:0; padding: 0 10px 0 20px; min-height: 20px;'>{% for cit in invitation.citation_notifications.all %}<li>{% if cit.submission %}{{ cit.submission.arxiv_identifier_w_vn_nr }}{% endif %}{% if cit.publication %}{{ cit.publication.doi_label }}{% endif %}</li>{% endfor %}</ul>"></i></small>
+                {{ invitation.last_name }}, {{ invitation.first_name }}
+            </td>
             <td>{{ invitation.email }}</td>
             <td{% if invitation.status == 'draft' %} class="text-warning"{% endif %}>{{ invitation.get_status_display }}</td>
             <td>{{ invitation.get_invitation_type_display }}</td>

invitations/views.py

@@ -8,7 +8,7 @@ from django.views.generic.edit import UpdateView, DeleteView
 
 from .forms import RegistrationInvitationForm, RegistrationInvitationReminderForm,\
     RegistrationInvitationMarkForm, RegistrationInvitationMapToContributorForm,\
-    CitationNotificationForm, SuggestionSearchForm,\
+    CitationNotificationForm, SuggestionSearchForm, RegistrationInvitationFilterForm,\
     CitationNotificationProcessForm, RegistrationInvitationAddCitationForm
 from .mixins import RequestArgumentMixin, PermissionsMixin, SaveAndSendFormMixin, SendMailFormMixin
 from .models import RegistrationInvitation, CitationNotification
@@ -23,11 +23,19 @@ class RegistrationInvitationsView(PaginationMixin, PermissionsMixin, ListView):
     queryset = RegistrationInvitation.objects.drafts().not_for_fellows()
     paginate_by = 10
     ordering = ['date_sent_last', 'last_name']
+    search_form = None
+
+    def get_queryset(self):
+        self.search_form = RegistrationInvitationFilterForm(self.request.GET or None)
+        if self.search_form.is_valid():
+            self.queryset = self.search_form.search(self.queryset)
+        return super().get_queryset()
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context['count_in_draft'] = RegistrationInvitation.objects.drafts().count()
         context['count_pending'] = RegistrationInvitation.objects.sent().count()
+        context['search_form'] = self.search_form
         return context