From a1e166e7c3a80e36f80c6e6a4ff3f6ce4b996919 Mon Sep 17 00:00:00 2001
From: Simey Lameze <simey@moodle.com>
Date: Fri, 18 Aug 2017 11:27:14 +0800
Subject: [PATCH 1/2] MDL-59674 core_calendar: add group name to event exporter

---
 calendar/classes/external/event_exporter.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/calendar/classes/external/event_exporter.php b/calendar/classes/external/event_exporter.php
index 7e4bb7c531d..6b34cda8d68 100644
--- a/calendar/classes/external/event_exporter.php
+++ b/calendar/classes/external/event_exporter.php
@@ -66,6 +66,12 @@ class event_exporter extends event_exporter_base {
             'type' => event_action_exporter::read_properties_definition(),
             'optional' => true,
         ];
+        $values['groupname'] = [
+            'type' => PARAM_RAW,
+            'optional' => true,
+            'default' => null,
+            'null' => NULL_ALLOWED
+        ];
 
         return $values;
     }
@@ -138,6 +144,15 @@ class event_exporter extends event_exporter_base {
             }
         }
 
+        if ($legacyevent->groupid) {
+            if ($group = calendar_get_group_cached($legacyevent->groupid)) {
+                $values['groupname'] = format_string($group->name, true,
+                        ['context' => \context_course::instance($group->courseid)]);
+            } else {
+                $values['groupname'] = null;
+            }
+        }
+
         return $values;
     }
 }

From 4cc382d5c7968919e242992d87bc2937d5fc10f8 Mon Sep 17 00:00:00 2001
From: Simey Lameze <simey@moodle.com>
Date: Fri, 18 Aug 2017 11:27:44 +0800
Subject: [PATCH 2/2] MDL-59674 core_calendar: add group name to summary
 template

---
 calendar/templates/event_summary_body.mustache | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/calendar/templates/event_summary_body.mustache b/calendar/templates/event_summary_body.mustache
index e5301bd87a0..376d2f1fb7f 100644
--- a/calendar/templates/event_summary_body.mustache
+++ b/calendar/templates/event_summary_body.mustache
@@ -23,7 +23,9 @@
     {
         "timestart": 1490320388,
         "description": "An random event description",
-        "eventtype": "open"
+        "eventtype": "User",
+        "source": "Ical imported",
+        "groupname": "Group 1"
     }
 }}
 <div data-region="summary-modal-container" data-event-id="{{id}}" data-event-title="{{name}}"
@@ -40,4 +42,7 @@
     {{#source}}
         <div>{{{source}}}</div>
     {{/source}}
+    {{#groupname}}
+        <div>{{{groupname}}}</div>
+    {{/groupname}}
 </div>