From 5d1844304acc4eb56d1bce039b26700f3969740b Mon Sep 17 00:00:00 2001
From: Naomi <naomirosenberguk@gmail.com>
Date: Fri, 5 Jun 2020 19:26:59 +0100
Subject: [PATCH] templating for activities

---
 modules/opencase_entities/oc_activity.page.inc  | 14 ++++++++++++++
 .../templates/oc_activity.html.twig             | 17 ++++++++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/modules/opencase_entities/oc_activity.page.inc b/modules/opencase_entities/oc_activity.page.inc
index fbd7d00..ef21805 100644
--- a/modules/opencase_entities/oc_activity.page.inc
+++ b/modules/opencase_entities/oc_activity.page.inc
@@ -22,9 +22,23 @@ use Drupal\Core\Render\Element;
 function template_preprocess_oc_activity(array &$variables) {
   // Fetch OCActivity Entity Object.
   $oc_activity = $variables['elements']['#oc_activity'];
+  $variables['id'] = $oc_activity->get('id')[0]->get('value')->getValue();
 
   // Helpful $content variable for templates.
   foreach (Element::children($variables['elements']) as $key) {
     $variables['content'][$key] = $variables['elements'][$key];
   }
+  // Separate the fields into two sections to be displayed in two columns.
+  // Remove the name (title) field as this is displayed anyway.
+  $variables['base_fields'] = array();
+  $variables['other_fields'] = array();
+  foreach (Element::children($variables['elements']) as $key) {
+    $variables['content'][$key] = $variables['elements'][$key];
+    if (in_array($key, ['activity_date_time', 'time_taken', 'description', 'user_id'])) {
+      $variables['base_fields'][$key] = $variables['elements'][$key];
+    } else {
+      $variables['other_fields'][$key] = $variables['elements'][$key];
+      unset($variables['other_fields']['name']);
+    }
+  }
 }
diff --git a/modules/opencase_entities/templates/oc_activity.html.twig b/modules/opencase_entities/templates/oc_activity.html.twig
index 20fa995..2d27e41 100644
--- a/modules/opencase_entities/templates/oc_activity.html.twig
+++ b/modules/opencase_entities/templates/oc_activity.html.twig
@@ -16,7 +16,18 @@
  */
 #}
 <div{{ attributes.addClass('oc_activity') }}>
-  {% if content %}
-    {{- content -}}
-  {% endif %}
+  <h2>{{ title }}</h2>
+  <div class="oc_entity">
+    <div class="left">
+      {{ base_fields.activity_date_time }}
+      {{ base_fields.description }}
+      {{ base_fields.time_taken }}
+      {{ base_fields.user_id }}
+    </div>
+    <div class="right">
+      {% for field in other_fields %}
+        {{ field }}
+      {% endfor %}
+    </div>
+  </div>
 </div>