Improve Organization list display

partners/migrations/0008_auto_20180711_0623.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-07-11 04:23
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('partners', '0007_partner_organization'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='organization',
+            options={'ordering': ['country', 'name']},
+        ),
+        migrations.AlterField(
+            model_name='partner',
+            name='organization',
+            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='partners.Organization'),
+        ),
+    ]

partners/models.py

@@ -105,6 +105,15 @@ class Organization(models.Model):
         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()
+
 
 ########################
 # Prospective Partners #
@@ -293,8 +302,8 @@ class Partner(models.Model):
     """
     institution = models.ForeignKey('partners.Institution', on_delete=models.CASCADE,
                                     blank=True, null=True)
-    organization = models.ForeignKey('partners.Organization', on_delete=models.CASCADE,
-                                     blank=True, null=True)
+    organization = models.OneToOneField('partners.Organization', on_delete=models.CASCADE,
+                                        blank=True, null=True)
     status = models.CharField(max_length=16, choices=PARTNER_STATUS, default=PARTNER_INITIATED)
     main_contact = models.ForeignKey('partners.Contact', on_delete=models.SET_NULL,
                                      blank=True, null=True, related_name='partner_main_contact')
@@ -309,6 +318,9 @@ class Partner(models.Model):
     def get_absolute_url(self):
         return reverse('partners:partner_view', args=(self.id,))
 
+    def get_latest_active_agreement(self):
+        return self.agreements.now_active().order_by('start_date').first()
+
     @property
     def has_all_contacts(self):
         """

partners/templates/partners/_organization_card.html

@@ -5,9 +5,11 @@
   <div class="row">
     <div class="col-12">
       <ul class="nav nav-tabs" id="organization-{{ org.id }}-tab" role="tablist">
+	{% if perms.scipost.can_manage_organizations %}
 	<li class="nav-item">
 	  <a class="nav-link" id="details-{{ org.id }}-tab" data-toggle="tab" href="#details-{{ org.id }}" role="tab" aria-controls="details-{{ org.id }}" aria-selected="true">Details</a>
 	</li>
+	{% 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>
 	</li>
@@ -25,10 +27,13 @@
       </ul>
 
       <div class="tab-content" id="organization-{{ org.id }}-tab">
+
+	{% 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 %}
 	</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>
@@ -71,12 +76,12 @@
 
 	<div class="tab-pane pt-4" id="partnership-{{ org.id }}" role="tabpanel" aria-labelledby="partnership-{{ org.id }}-tab">
 	  <h3>Partnership history:</h3>
-	  {% if org.partner.agreements %}
-	  {% if org.partner.agreements.now_active %}
+	  {% with agreement=org.partner.get_latest_active_agreement %}
+	  {% if agreement %}
 	  <p>This organization is currently a SciPost Supporting Partner.</p>
-	  {% else %}
-	  <p>This organization is currently <span class="text-danger">not</span> a SciPost Supporting Partner.</p>
 	  {% endif %}
+	  {% endwith %}
+	  {% if org.partner.agreements %}
 	  <table class="table">
 	    <thead>
 	      <th>Status</th>
@@ -85,7 +90,7 @@
 	      <th>Contribution/year</th>
 	    </thead>
 	    <tbody>
-	      {% for agreement in org.partner.agreements %}
+	      {% for agreement in org.partner.agreements.all %}
 	      <tr>
 		<td>{{ agreement.get_status_display }}</td>
 		<td>{{ agreement.get_duration_display }}</td>
@@ -96,7 +101,7 @@
 	    </tbody>
 	  </table>
 	  {% else %}
-	  <p>This organization has not yet become a SciPost Supporting Partner.</p>
+	  <p>This organization has <span class="text-danger">not yet</span> been as a SciPost Supporting Partner.</p>
 	  {% endif %}
 	</div>
 

partners/templates/partners/organization_list.html

@@ -3,6 +3,7 @@
 {% block pagetitle %}: Organizations{% endblock pagetitle %}
 
 {% load staticfiles %}
+{% load partners_extras %}
 
 {% block content %}
 <div class="row">
@@ -24,6 +25,7 @@
 	  <th>Acronym</th>
 	  <th>Name</th>
 	  <th>Type</th>
+	  <th>Partner?</th>
 	</tr>
       </thead>
       <tbody id="accordion" role="tablist" aria-multiselectable="true">
@@ -33,9 +35,17 @@
 	  <td>{{ org.acronym }}</td>
 	  <td>{{ org.name }}</td>
 	  <td>{{ org.get_orgtype_display }}</td>
+	  {% if org.has_current_agreement %}
+	  <td style="background-color: #32cd32;">Yes</td>
+	  {% elif org.partner.agreements %}
+	  <td style="background-color: #ff8c00;">Was</td>
+	  {% else %}
+	  <td style="background-color: #ee0000;">Not yet</td>
+	  {% 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">
+	  <td colspan="5">
 	    {% include 'partners/_organization_card.html' with org=org %}
 	  </td>
 	</tr>