From b73e2dcb2d9ba71960769f0fe959ff3a25aa6a79 Mon Sep 17 00:00:00 2001
From: James Graham <j.graham@software.ac.uk>
Date: Mon, 1 Mar 2021 14:43:16 +0000
Subject: [PATCH] feat: add organisations to network view

See #78
---
 people/serializers.py                | 11 ++++++++++-
 people/templates/people/network.html | 18 ++++++++++++++++++
 people/views/network.py              |  3 +++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/people/serializers.py b/people/serializers.py
index f11004e..2303068 100644
--- a/people/serializers.py
+++ b/people/serializers.py
@@ -15,7 +15,16 @@ class PersonSerializer(serializers.ModelSerializer):
             'name',
         ]
 
-        
+
+class OrganisationSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = models.Organisation
+        fields = [
+            'pk',
+            'name',
+        ]
+
+
 class RelationshipSerializer(serializers.ModelSerializer):
     source = PersonSerializer()
     target = PersonSerializer()
diff --git a/people/templates/people/network.html b/people/templates/people/network.html
index 0901d13..411740d 100644
--- a/people/templates/people/network.html
+++ b/people/templates/people/network.html
@@ -53,6 +53,8 @@
     -->
     {{ person_set|json_script:'person-set-data' }}
 
+    {{ organisation_set|json_script:'organisation-set-data' }}
+
     {{ relationship_set|json_script:'relationship-set-data' }}
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/cytoscape/3.14.0/cytoscape.min.js"
@@ -102,6 +104,22 @@
                 })
             }
 
+            // Load organisations and add to graph
+            var organisation_set = JSON.parse(document.getElementById('organisation-set-data').textContent);
+
+            for (var item of organisation_set) {
+                cy.add({
+                    group: 'nodes',
+                    data: {
+                        id: 'organisation-' + item.pk.toString(),
+                        name: item.name
+                    },
+                    style: {
+                        shape: 'rectangle'
+                    }
+                })
+            }
+
             // Load relationships and add to graph
             var relationship_set = JSON.parse(document.getElementById('relationship-set-data').textContent);
 
diff --git a/people/views/network.py b/people/views/network.py
index 58addd2..d2a483e 100644
--- a/people/views/network.py
+++ b/people/views/network.py
@@ -75,6 +75,9 @@ class NetworkView(LoginRequiredMixin, FormView):
         context['person_set'] = serializers.PersonSerializer(
             models.Person.objects.all(), many=True).data
 
+        context['organisation_set'] = serializers.OrganisationSerializer(
+            models.Organisation.objects.all(), many=True).data
+
         context['relationship_set'] = serializers.RelationshipSerializer(
             models.Relationship.objects.filter(
                 pk__in=relationship_answerset_set.values_list('relationship',