From b2765c76c6429600844f19426b70d4a99d34f8ae Mon Sep 17 00:00:00 2001
From: Sean Kelly <kelly@seankelly.biz>
Date: Fri, 1 Sep 2023 12:43:27 -0500
Subject: [PATCH] WIP #282

---
 .../src/edrnsite/content/_explorer.py                 | 11 ++++++++---
 .../content/templates/edrnsite.content/cde-node.html  |  5 +++++
 .../content/templatetags/edrnsite_content_tags.py     |  1 +
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/edrnsite.content/src/edrnsite/content/_explorer.py b/src/edrnsite.content/src/edrnsite/content/_explorer.py
index d900ec62..5061e50f 100644
--- a/src/edrnsite.content/src/edrnsite/content/_explorer.py
+++ b/src/edrnsite.content/src/edrnsite/content/_explorer.py
@@ -42,12 +42,15 @@ class _Node:
     '''A temporary node in a tree before getting serialized into Django objects.'''
     name: str
     description: str
+    stewardship: str
     attributes: list[_Attribute]
     children: set[object] = dataclasses.field(default_factory=set, init=False, compare=False)
     def __hash__(self):
         return hash(self.name)
     def instantiate(self, parent=None):
-        explorer_obj = CDEExplorerObject(name=self.name, description=self.description, parent=parent)
+        explorer_obj = CDEExplorerObject(
+            name=self.name, description=self.description, stewardship=self.stewardship, parent=parent
+        )
         explorer_obj.save()
         for c in self.children:
             c.instantiate(explorer_obj)
@@ -137,9 +140,10 @@ def _parse_structure(self, sheet):
         self._log('Parsing overall structure in the "Structure" tab and looking for referenced tabs')
         row_number, nodes, roots, structure = 0, {}, [], sheet['Structure']
         for name in structure['Object']:
-            description = structure['Description'][row_number]
+            description, stewardship = structure['Description'][row_number], structure['Stewardship'][row_number]
             attributes = self._parse_attributes(name, sheet)
-            nodes[name] = _Node(name, description, attributes)
+            stewardship = '' if pandas.isna(stewardship) else stewardship
+            nodes[name] = _Node(name, description, stewardship, attributes)
             row_number += 1
 
         # Now connect parents to children and gather the roots
@@ -215,6 +219,7 @@ def serve(self, request: HttpRequest) -> HttpResponse:
 class CDEExplorerObject(models.Model):
     name = models.CharField(null=False, blank=False, max_length=200, help_text='Name of this object in a CDE hierarchy')
     description = models.TextField(null=False, blank=True, help_text='A nice long description of this object')
+    stewardship = models.TextField(null=False, blank=True, help_text="Who's responsible for this object")
     parent = models.ForeignKey('self', blank=True, null=True, on_delete=models.CASCADE, related_name='children')
     page = models.ForeignKey(CDEExplorerPage, blank=True, null=True, on_delete=models.SET_NULL, related_name='root_objects')
     panels = [FieldPanel('name'), FieldPanel('description'), FieldPanel('parent'), FieldPanel('page')]
diff --git a/src/edrnsite.content/src/edrnsite/content/templates/edrnsite.content/cde-node.html b/src/edrnsite.content/src/edrnsite/content/templates/edrnsite.content/cde-node.html
index 5d6fc4f2..77ec1796 100644
--- a/src/edrnsite.content/src/edrnsite/content/templates/edrnsite.content/cde-node.html
+++ b/src/edrnsite.content/src/edrnsite/content/templates/edrnsite.content/cde-node.html
@@ -9,6 +9,11 @@ <h3>{{name}}</h3>
             <p class='small'>(No description of this object is available.)</p>
         {% endif %}
 
+        {% if stewardship %}
+            <h3>Stewardship</h3>
+            <p>{{stewardship}}</p>
+        {% endif %}
+
         {% if attributes %}
             <h4>Attributes</h4>
             <p class='small'>
diff --git a/src/edrnsite.content/src/edrnsite/content/templatetags/edrnsite_content_tags.py b/src/edrnsite.content/src/edrnsite/content/templatetags/edrnsite_content_tags.py
index 0107b941..3404b329 100644
--- a/src/edrnsite.content/src/edrnsite/content/templatetags/edrnsite_content_tags.py
+++ b/src/edrnsite.content/src/edrnsite/content/templatetags/edrnsite_content_tags.py
@@ -22,6 +22,7 @@ def render_cde_node(node: CDEExplorerObject) -> dict:
     return {
         'name': node.name,
         'description': node.description,
+        'stewardship': node.stewardship,
         'attributes': node.attributes.all(),
         'children': node.children.all().order_by('name')
     }