From 74eedb28b3d2f6a68e87d353370053d8ea86f6d1 Mon Sep 17 00:00:00 2001
From: Ryan Wyllie <ryan@moodle.com>
Date: Mon, 24 Jul 2017 06:56:29 +0000
Subject: [PATCH 01/15] MDL-57259 external: fix page url debug in fragment
 loading

---
 lib/external/externallib.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/external/externallib.php b/lib/external/externallib.php
index e038b4c08c4..6721d2af140 100644
--- a/lib/external/externallib.php
+++ b/lib/external/externallib.php
@@ -404,6 +404,8 @@ class core_external extends external_api {
         self::validate_context($context);
         $arguments['context'] = $context;
 
+        // Hack alert: Set a default URL to stop the annoying debug.
+        $PAGE->set_url('/');
         // Hack alert: Forcing bootstrap_renderer to initiate moodle page.
         $OUTPUT->header();
 

From 4defa05fdc61663d4a1766af9001b87a279ded8f Mon Sep 17 00:00:00 2001
From: Ryan Wyllie <ryan@moodle.com>
Date: Mon, 24 Jul 2017 06:53:32 +0000
Subject: [PATCH 02/15] MDL-59382 javascript: fix large styling for modals

---
 lib/amd/build/modal.min.js | 2 +-
 lib/amd/src/modal.js       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/amd/build/modal.min.js b/lib/amd/build/modal.min.js
index a469ddad71c..d1b6f8e91e8 100644
--- a/lib/amd/build/modal.min.js
+++ b/lib/amd/build/modal.min.js
@@ -1 +1 @@
-define(["jquery","core/templates","core/notification","core/key_codes","core/custom_interaction_events","core/modal_backdrop","core/event","core/modal_events"],function(a,b,c,d,e,f,g,h){var i,j={CONTAINER:'[data-region="modal-container"]',MODAL:'[data-region="modal"]',HEADER:'[data-region="header"]',TITLE:'[data-region="title"]',BODY:'[data-region="body"]',FOOTER:'[data-region="footer"]',HIDE:'[data-action="hide"]',DIALOG:"[role=dialog]",MENU_BAR:"[role=menubar]",HAS_Z_INDEX:".moodle-has-zindex",CAN_RECEIVE_FOCUS:'input:not([type="hidden"]), a[href], button, textarea, select, [tabindex]'},k={LOADING:"core/loading",BACKDROP:"core/modal_backdrop"},l=function(b){this.root=a(b),this.modal=this.root.find(j.MODAL),this.header=this.modal.find(j.HEADER),this.title=this.header.find(j.TITLE),this.body=this.modal.find(j.BODY),this.footer=this.modal.find(j.FOOTER),this.hiddenSiblings=[],this.isAttached=!1,this.bodyJS=null,this.footerJS=null,this.root.is(j.CONTAINER)||c.exception({message:"Element is not a modal container"}),this.modal.length||c.exception({message:"Container does not contain a modal"}),this.header.length||c.exception({message:"Modal is missing a header region"}),this.title.length||c.exception({message:"Modal header is missing a title region"}),this.body.length||c.exception({message:"Modal is missing a body region"}),this.footer.length||c.exception({message:"Modal is missing a footer region"}),this.registerEventListeners()};return l.prototype.attachToDOM=function(){this.isAttached||(a("body").append(this.root),this.bodyJS&&(b.runTemplateJS(this.bodyJS),this.bodyJS=null),this.footerJS&&(b.runTemplateJS(this.footerJS),this.footerJS=null),this.isAttached=!0)},l.prototype.countOtherVisibleModals=function(){var b=0;return a("body").find(j.CONTAINER).each(function(c,d){d=a(d),!this.root.is(d)&&d.hasClass("show")&&b++}.bind(this)),b},l.prototype.getBackdrop=function(){return i||(i=b.render(k.BACKDROP,{}).then(function(b){var c=a(b);return new f(c)}).fail(c.exception)),i},l.prototype.getRoot=function(){return this.root},l.prototype.getModal=function(){return this.modal},l.prototype.getTitle=function(){return this.title},l.prototype.getBody=function(){return this.body},l.prototype.getFooter=function(){return this.footer},l.prototype.setTitle=function(a){var b=this.getTitle();b.html(a)},l.prototype.setBody=function(a){var c=this.getBody();"string"==typeof a?(c.html(a),g.notifyFilterContentUpdated(c),this.getRoot().trigger(h.bodyRendered,this)):b.render(k.LOADING,{}).done(function(d){c.html(d),a.done(function(a,d){c.html(a),d&&(this.isAttached?b.runTemplateJS(d):this.bodyJS=d),g.notifyFilterContentUpdated(c),this.getRoot().trigger(h.bodyRendered,this)}.bind(this))}.bind(this))},l.prototype.setFooter=function(a){var c=this.getFooter();"string"==typeof a?c.html(a):b.render(k.LOADING,{}).done(function(d){c.html(d),a.done(function(a,d){c.html(a),d&&(this.isAttached?b.runTemplateJS(d):this.footerJS=d)}.bind(this))}.bind(this))},l.prototype.setLarge=function(){this.isLarge()||this.getRoot().addClass("large")},l.prototype.isLarge=function(){return this.getRoot().hasClass("large")},l.prototype.setSmall=function(){this.isSmall()||this.getRoot().removeClass("large")},l.prototype.isSmall=function(){return!this.getRoot().hasClass("large")},l.prototype.calculateZIndex=function(){var b=a(j.DIALOG+", "+j.MENU_BAR+", "+j.HAS_Z_INDEX),c=parseInt(this.root.css("z-index"));return b.each(function(b,d){d=a(d);var e=d.css("z-index")?parseInt(d.css("z-index")):0;e>c&&(c=e)}),c},l.prototype.isVisible=function(){return this.root.hasClass("show")},l.prototype.hasFocus=function(){var b=a(document.activeElement);return this.root.is(b)||this.root.has(b).length},l.prototype.hasTransitions=function(){return this.getRoot().hasClass("fade")},l.prototype.show=function(){this.isVisible()||(this.isAttached||this.attachToDOM(),this.getBackdrop().done(function(b){var c=this.calculateZIndex(),d=c+2,e=d-1;this.root.css("z-index",d),b.setZIndex(e),b.show(),this.root.removeClass("hide").addClass("show"),this.accessibilityShow(),this.getTitle().focus(),a("body").addClass("modal-open"),this.root.trigger(h.shown,this)}.bind(this)))},l.prototype.hide=function(){this.isVisible()&&this.getBackdrop().done(function(b){this.countOtherVisibleModals()||(b.hide(),a("body").removeClass("modal-open"));var c=parseInt(this.root.css("z-index"));this.root.css("z-index",""),b.setZIndex(c-3),this.accessibilityHide(),this.hasTransitions()?this.getRoot().one("transitionend webkitTransitionEnd oTransitionEnd",function(){this.getRoot().removeClass("show").addClass("hide")}.bind(this)):this.getRoot().removeClass("show").addClass("hide"),this.root.trigger(h.hidden,this)}.bind(this))},l.prototype.destroy=function(){this.root.remove(),this.root.trigger(h.destroyed,this)},l.prototype.accessibilityShow=function(){a("body").children().each(function(b,c){if(!this.root.is(c)){c=a(c);var d=c.attr("aria-hidden");"true"!==d&&(c.data("previous-aria-hidden",d),this.hiddenSiblings.push(c),c.attr("aria-hidden","true"))}}.bind(this)),this.root.attr("aria-hidden","false")},l.prototype.accessibilityHide=function(){this.root.attr("aria-hidden","true"),a.each(this.hiddenSiblings,function(b,c){c=a(c);var d=c.data("previous-aria-hidden");"undefined"==typeof d?c.removeAttr("aria-hidden"):c.attr("aria-hidden",d)}),this.hiddenSiblings=[]},l.prototype.handleTabLock=function(b){if(this.hasFocus()){var c=a(document.activeElement),d=this.modal.find(j.CAN_RECEIVE_FOCUS),e=d.first(),f=d.last();c.is(e)&&b.shiftKey?(f.focus(),b.preventDefault()):c.is(f)&&!b.shiftKey&&(e.focus(),b.preventDefault())}},l.prototype.registerEventListeners=function(){this.getRoot().on("keydown",function(a){this.isVisible()&&(a.keyCode==d.tab?this.handleTabLock(a):a.keyCode==d.escape&&this.hide())}.bind(this)),e.define(this.getModal(),[e.events.activate]),this.getModal().on(e.events.activate,j.HIDE,function(a,b){this.hide(),b.originalEvent.preventDefault()}.bind(this))},l});
\ No newline at end of file
+define(["jquery","core/templates","core/notification","core/key_codes","core/custom_interaction_events","core/modal_backdrop","core/event","core/modal_events"],function(a,b,c,d,e,f,g,h){var i,j={CONTAINER:'[data-region="modal-container"]',MODAL:'[data-region="modal"]',HEADER:'[data-region="header"]',TITLE:'[data-region="title"]',BODY:'[data-region="body"]',FOOTER:'[data-region="footer"]',HIDE:'[data-action="hide"]',DIALOG:"[role=dialog]",MENU_BAR:"[role=menubar]",HAS_Z_INDEX:".moodle-has-zindex",CAN_RECEIVE_FOCUS:'input:not([type="hidden"]), a[href], button, textarea, select, [tabindex]'},k={LOADING:"core/loading",BACKDROP:"core/modal_backdrop"},l=function(b){this.root=a(b),this.modal=this.root.find(j.MODAL),this.header=this.modal.find(j.HEADER),this.title=this.header.find(j.TITLE),this.body=this.modal.find(j.BODY),this.footer=this.modal.find(j.FOOTER),this.hiddenSiblings=[],this.isAttached=!1,this.bodyJS=null,this.footerJS=null,this.root.is(j.CONTAINER)||c.exception({message:"Element is not a modal container"}),this.modal.length||c.exception({message:"Container does not contain a modal"}),this.header.length||c.exception({message:"Modal is missing a header region"}),this.title.length||c.exception({message:"Modal header is missing a title region"}),this.body.length||c.exception({message:"Modal is missing a body region"}),this.footer.length||c.exception({message:"Modal is missing a footer region"}),this.registerEventListeners()};return l.prototype.attachToDOM=function(){this.isAttached||(a("body").append(this.root),this.bodyJS&&(b.runTemplateJS(this.bodyJS),this.bodyJS=null),this.footerJS&&(b.runTemplateJS(this.footerJS),this.footerJS=null),this.isAttached=!0)},l.prototype.countOtherVisibleModals=function(){var b=0;return a("body").find(j.CONTAINER).each(function(c,d){d=a(d),!this.root.is(d)&&d.hasClass("show")&&b++}.bind(this)),b},l.prototype.getBackdrop=function(){return i||(i=b.render(k.BACKDROP,{}).then(function(b){var c=a(b);return new f(c)}).fail(c.exception)),i},l.prototype.getRoot=function(){return this.root},l.prototype.getModal=function(){return this.modal},l.prototype.getTitle=function(){return this.title},l.prototype.getBody=function(){return this.body},l.prototype.getFooter=function(){return this.footer},l.prototype.setTitle=function(a){var b=this.getTitle();b.html(a)},l.prototype.setBody=function(a){var c=this.getBody();"string"==typeof a?(c.html(a),g.notifyFilterContentUpdated(c),this.getRoot().trigger(h.bodyRendered,this)):b.render(k.LOADING,{}).done(function(d){c.html(d),a.done(function(a,d){c.html(a),d&&(this.isAttached?b.runTemplateJS(d):this.bodyJS=d),g.notifyFilterContentUpdated(c),this.getRoot().trigger(h.bodyRendered,this)}.bind(this))}.bind(this))},l.prototype.setFooter=function(a){var c=this.getFooter();"string"==typeof a?c.html(a):b.render(k.LOADING,{}).done(function(d){c.html(d),a.done(function(a,d){c.html(a),d&&(this.isAttached?b.runTemplateJS(d):this.footerJS=d)}.bind(this))}.bind(this))},l.prototype.setLarge=function(){this.isLarge()||this.getModal().addClass("modal-lg")},l.prototype.isLarge=function(){return this.getModal().hasClass("modal-lg")},l.prototype.setSmall=function(){this.isSmall()||this.getModal().removeClass("modal-lg")},l.prototype.isSmall=function(){return!this.getModal().hasClass("modal-lg")},l.prototype.calculateZIndex=function(){var b=a(j.DIALOG+", "+j.MENU_BAR+", "+j.HAS_Z_INDEX),c=parseInt(this.root.css("z-index"));return b.each(function(b,d){d=a(d);var e=d.css("z-index")?parseInt(d.css("z-index")):0;e>c&&(c=e)}),c},l.prototype.isVisible=function(){return this.root.hasClass("show")},l.prototype.hasFocus=function(){var b=a(document.activeElement);return this.root.is(b)||this.root.has(b).length},l.prototype.hasTransitions=function(){return this.getRoot().hasClass("fade")},l.prototype.show=function(){this.isVisible()||(this.isAttached||this.attachToDOM(),this.getBackdrop().done(function(b){var c=this.calculateZIndex(),d=c+2,e=d-1;this.root.css("z-index",d),b.setZIndex(e),b.show(),this.root.removeClass("hide").addClass("show"),this.accessibilityShow(),this.getTitle().focus(),a("body").addClass("modal-open"),this.root.trigger(h.shown,this)}.bind(this)))},l.prototype.hide=function(){this.isVisible()&&this.getBackdrop().done(function(b){this.countOtherVisibleModals()||(b.hide(),a("body").removeClass("modal-open"));var c=parseInt(this.root.css("z-index"));this.root.css("z-index",""),b.setZIndex(c-3),this.accessibilityHide(),this.hasTransitions()?this.getRoot().one("transitionend webkitTransitionEnd oTransitionEnd",function(){this.getRoot().removeClass("show").addClass("hide")}.bind(this)):this.getRoot().removeClass("show").addClass("hide"),this.root.trigger(h.hidden,this)}.bind(this))},l.prototype.destroy=function(){this.root.remove(),this.root.trigger(h.destroyed,this)},l.prototype.accessibilityShow=function(){a("body").children().each(function(b,c){if(!this.root.is(c)){c=a(c);var d=c.attr("aria-hidden");"true"!==d&&(c.data("previous-aria-hidden",d),this.hiddenSiblings.push(c),c.attr("aria-hidden","true"))}}.bind(this)),this.root.attr("aria-hidden","false")},l.prototype.accessibilityHide=function(){this.root.attr("aria-hidden","true"),a.each(this.hiddenSiblings,function(b,c){c=a(c);var d=c.data("previous-aria-hidden");"undefined"==typeof d?c.removeAttr("aria-hidden"):c.attr("aria-hidden",d)}),this.hiddenSiblings=[]},l.prototype.handleTabLock=function(b){if(this.hasFocus()){var c=a(document.activeElement),d=this.modal.find(j.CAN_RECEIVE_FOCUS),e=d.first(),f=d.last();c.is(e)&&b.shiftKey?(f.focus(),b.preventDefault()):c.is(f)&&!b.shiftKey&&(e.focus(),b.preventDefault())}},l.prototype.registerEventListeners=function(){this.getRoot().on("keydown",function(a){this.isVisible()&&(a.keyCode==d.tab?this.handleTabLock(a):a.keyCode==d.escape&&this.hide())}.bind(this)),e.define(this.getModal(),[e.events.activate]),this.getModal().on(e.events.activate,j.HIDE,function(a,b){this.hide(),b.originalEvent.preventDefault()}.bind(this))},l});
\ No newline at end of file
diff --git a/lib/amd/src/modal.js b/lib/amd/src/modal.js
index 6cca43b0f4e..53ae0b77b40 100644
--- a/lib/amd/src/modal.js
+++ b/lib/amd/src/modal.js
@@ -315,7 +315,7 @@ define(['jquery', 'core/templates', 'core/notification', 'core/key_codes',
             return;
         }
 
-        this.getRoot().addClass('large');
+        this.getModal().addClass('modal-lg');
     };
 
     /**
@@ -325,7 +325,7 @@ define(['jquery', 'core/templates', 'core/notification', 'core/key_codes',
      * @return {bool}
      */
     Modal.prototype.isLarge = function() {
-        return this.getRoot().hasClass('large');
+        return this.getModal().hasClass('modal-lg');
     };
 
     /**
@@ -338,7 +338,7 @@ define(['jquery', 'core/templates', 'core/notification', 'core/key_codes',
             return;
         }
 
-        this.getRoot().removeClass('large');
+        this.getModal().removeClass('modal-lg');
     };
 
     /**
@@ -348,7 +348,7 @@ define(['jquery', 'core/templates', 'core/notification', 'core/key_codes',
      * @return {bool}
      */
     Modal.prototype.isSmall = function() {
-        return !this.getRoot().hasClass('large');
+        return !this.getModal().hasClass('modal-lg');
     };
 
     /**

From a50768b97f7bb040089b747b9ae36520fa9dde55 Mon Sep 17 00:00:00 2001
From: Ryan Wyllie <ryan@moodle.com>
Date: Mon, 24 Jul 2017 06:54:17 +0000
Subject: [PATCH 03/15] MDL-59382 javascript: template context can be given to
 modal factory

---
 lib/amd/build/modal_factory.min.js |  2 +-
 lib/amd/src/modal_factory.js       | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/amd/build/modal_factory.min.js b/lib/amd/build/modal_factory.min.js
index 715247b49a4..06f8a5f41d9 100644
--- a/lib/amd/build/modal_factory.min.js
+++ b/lib/amd/build/modal_factory.min.js
@@ -1 +1 @@
-define(["jquery","core/modal_events","core/modal_registry","core/modal","core/modal_save_cancel","core/modal_confirm","core/modal_cancel","core/templates","core/notification","core/custom_interaction_events"],function(a,b,c,d,e,f,g,h,i,j){var k={DEFAULT:"core/modal",SAVE_CANCEL:"core/modal_save_cancel",CONFIRM:"core/modal_confirm",CANCEL:"core/modal_cancel"},l={DEFAULT:"DEFAULT",SAVE_CANCEL:"SAVE_CANCEL",CONFIRM:"CONFIRM",CANCEL:"CANCEL"};c.register(l.DEFAULT,d,k.DEFAULT),c.register(l.SAVE_CANCEL,e,k.SAVE_CANCEL),c.register(l.CONFIRM,f,k.CONFIRM),c.register(l.CANCEL,g,k.CANCEL);var m=function(a,c){"undefined"!=typeof c&&(j.define(c,[j.events.activate]),c.on(j.events.activate,function(b,c){a.show(),c.originalEvent.preventDefault()}),a.getRoot().on(b.hidden,function(){c.focus()}))},n=function(b,c,d){c=a(c);var e=b.module,f=new e(c);return m(f,d),f},o=function(b,c){var d=b.template;return h.render(d,{}).then(function(d){var e=a(d);return n(b,e,c)}).fail(i.exception)},p=function(a,b){var d=a.type||l.DEFAULT,e=!!a.large,f=null;return f=c.get(d),f||i.exception({message:"Unable to find modal of type: "+d}),o(f,b).then(function(b){return"undefined"!=typeof a.title&&b.setTitle(a.title),"undefined"!=typeof a.body&&b.setBody(a.body),"undefined"!=typeof a.footer&&b.setFooter(a.footer),e&&b.setLarge(),b})};return{create:p,types:l}});
\ No newline at end of file
+define(["jquery","core/modal_events","core/modal_registry","core/modal","core/modal_save_cancel","core/modal_confirm","core/modal_cancel","core/templates","core/notification","core/custom_interaction_events"],function(a,b,c,d,e,f,g,h,i,j){var k={DEFAULT:"core/modal",SAVE_CANCEL:"core/modal_save_cancel",CONFIRM:"core/modal_confirm",CANCEL:"core/modal_cancel"},l={DEFAULT:"DEFAULT",SAVE_CANCEL:"SAVE_CANCEL",CONFIRM:"CONFIRM",CANCEL:"CANCEL"};c.register(l.DEFAULT,d,k.DEFAULT),c.register(l.SAVE_CANCEL,e,k.SAVE_CANCEL),c.register(l.CONFIRM,f,k.CONFIRM),c.register(l.CANCEL,g,k.CANCEL);var m=function(a,c){"undefined"!=typeof c&&(j.define(c,[j.events.activate]),c.on(j.events.activate,function(b,c){a.show(),c.originalEvent.preventDefault()}),a.getRoot().on(b.hidden,function(){c.focus()}))},n=function(b,c,d){c=a(c);var e=b.module,f=new e(c);return m(f,d),f},o=function(b,c,d){var e=b.template;return h.render(e,c).then(function(c){var e=a(c);return n(b,e,d)}).fail(i.exception)},p=function(a,b){var d=a.type||l.DEFAULT,e=!!a.large,f=null,g={};return f=c.get(d),f||i.exception({message:"Unable to find modal of type: "+d}),"undefined"!=typeof a.templateContext&&(g=a.templateContext),o(f,g,b).then(function(b){return"undefined"!=typeof a.title&&b.setTitle(a.title),"undefined"!=typeof a.body&&b.setBody(a.body),"undefined"!=typeof a.footer&&b.setFooter(a.footer),e&&b.setLarge(),b})};return{create:p,types:l}});
\ No newline at end of file
diff --git a/lib/amd/src/modal_factory.js b/lib/amd/src/modal_factory.js
index 68dedf2c832..52839b138c3 100644
--- a/lib/amd/src/modal_factory.js
+++ b/lib/amd/src/modal_factory.js
@@ -101,10 +101,10 @@ define(['jquery', 'core/modal_events', 'core/modal_registry', 'core/modal',
      * @param {object} triggerElement The trigger HTML jQuery object
      * @return {promise} Resolved with a Modal instance
      */
-    var createFromType = function(registryConf, triggerElement) {
+    var createFromType = function(registryConf, templateContext, triggerElement) {
         var templateName = registryConf.template;
 
-        return Templates.render(templateName, {})
+        return Templates.render(templateName, templateContext)
             .then(function(html) {
                 var modalElement = $(html);
                 return createFromElement(registryConf, modalElement, triggerElement);
@@ -124,6 +124,7 @@ define(['jquery', 'core/modal_events', 'core/modal_registry', 'core/modal',
         var type = modalConfig.type || TYPES.DEFAULT;
         var isLarge = modalConfig.large ? true : false;
         var registryConf = null;
+        var templateContext = {};
 
         registryConf = ModalRegistry.get(type);
 
@@ -131,7 +132,11 @@ define(['jquery', 'core/modal_events', 'core/modal_registry', 'core/modal',
             Notification.exception({message: 'Unable to find modal of type: ' + type});
         }
 
-        return createFromType(registryConf, triggerElement)
+        if (typeof modalConfig.templateContext != 'undefined') {
+            templateContext = modalConfig.templateContext;
+        }
+
+        return createFromType(registryConf, templateContext, triggerElement)
             .then(function(modal) {
                 if (typeof modalConfig.title != 'undefined') {
                     modal.setTitle(modalConfig.title);

From 6973baa31e312d30010eb7ffee755e5f5a7515a8 Mon Sep 17 00:00:00 2001
From: Ryan Wyllie <ryan@moodle.com>
Date: Mon, 24 Jul 2017 06:59:39 +0000
Subject: [PATCH 04/15] MDL-59382 form: fix name in template context

---
 lib/form/templatable_form_element.php                           | 1 +
 .../boost/templates/core_form/element-template-inline.mustache  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/form/templatable_form_element.php b/lib/form/templatable_form_element.php
index 7d8c2abb804..beb7173f7f9 100644
--- a/lib/form/templatable_form_element.php
+++ b/lib/form/templatable_form_element.php
@@ -78,6 +78,7 @@ trait templatable_form_element {
                 $otherattributes[] = $attr . '="' . s($value) . '"';
             }
         }
+        $context['name'] = $context['name'] ?: $this->getName();
         $context['extraclasses'] = $extraclasses;
         $context['type'] = $this->getType();
         $context['attributes'] = implode(' ', $otherattributes);
diff --git a/theme/boost/templates/core_form/element-template-inline.mustache b/theme/boost/templates/core_form/element-template-inline.mustache
index 88593fccdcb..55e16c5ebbd 100644
--- a/theme/boost/templates/core_form/element-template-inline.mustache
+++ b/theme/boost/templates/core_form/element-template-inline.mustache
@@ -4,7 +4,7 @@
         {{#required}}<abbr class="initialism text-danger" title="{{#str}}required{{/str}}">{{#pix}}req, core, {{#str}}required{{/str}}{{/pix}}</abbr>{{/required}}
         {{#advanced}}<abbr class="initialism text-info" title="{{#str}}advanced{{/str}}">!</abbr>{{/advanced}}
     </label>
-    <span data-fieldtype="{{element.type}}">
+    <span id="{{element.id}}" data-fieldtype="{{element.type}}">
         {{$ element }}
             <!-- Element goes here -->
         {{/ element }}

From 8e02018f1c120bd1f007eb59511620619c00d26c Mon Sep 17 00:00:00 2001
From: Ryan Wyllie <ryan@moodle.com>
Date: Mon, 24 Jul 2017 07:31:17 +0000
Subject: [PATCH 05/15] MDL-59382 calendar: fix event mapper and exporter

---
 calendar/classes/external/event_exporter.php  |  2 +-
 .../local/event/mappers/event_mapper.php      | 42 +++++++++++--------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/calendar/classes/external/event_exporter.php b/calendar/classes/external/event_exporter.php
index baa73f6a62f..ec2d938dc4a 100644
--- a/calendar/classes/external/event_exporter.php
+++ b/calendar/classes/external/event_exporter.php
@@ -71,7 +71,7 @@ class event_exporter extends exporter {
         $data->timestart = $starttimestamp;
         $data->timeduration = $endtimestamp - $starttimestamp;
         $data->timesort = $event->get_times()->get_sort_time()->getTimestamp();
-        $data->visible = $event->is_visible();
+        $data->visible = $event->is_visible() ? 1 : 0;
         $data->timemodified = $event->get_times()->get_modified_time()->getTimestamp();
 
         if ($repeats = $event->get_repeats()) {
diff --git a/calendar/classes/local/event/mappers/event_mapper.php b/calendar/classes/local/event/mappers/event_mapper.php
index a4191f2aee3..8e544dd90da 100644
--- a/calendar/classes/local/event/mappers/event_mapper.php
+++ b/calendar/classes/local/event/mappers/event_mapper.php
@@ -54,28 +54,34 @@ class event_mapper implements event_mapper_interface {
 
     public function from_legacy_event_to_event(\calendar_event $legacyevent) {
         $coalesce = function($property) use ($legacyevent) {
-            return property_exists($legacyevent, $property) ? $legacyevent->{$property} : null;
+            try {
+                return $legacyevent->$property;
+            } catch (\coding_exception $e) {
+                // The magic setter throews an exception if the
+                // property doesn't exist.
+                return null;
+            }
         };
 
         return $this->factory->create_instance(
             (object)[
-                $coalesce('id'),
-                $coalesce('name'),
-                $coalesce('description'),
-                $coalesce('format'),
-                $coalesce('courseid'),
-                $coalesce('groupid'),
-                $coalesce('userid'),
-                $coalesce('repeatid'),
-                $coalesce('modulename'),
-                $coalesce('instance'),
-                $coalesce('type'),
-                $coalesce('timestart'),
-                $coalesce('timeduration'),
-                $coalesce('timemodified'),
-                $coalesce('timesort'),
-                $coalesce('visible'),
-                $coalesce('subscription')
+                'id' => $coalesce('id'),
+                'name' => $coalesce('name'),
+                'description' => $coalesce('description'),
+                'format' => $coalesce('format'),
+                'courseid' => $coalesce('courseid'),
+                'groupid' => $coalesce('groupid'),
+                'userid' => $coalesce('userid'),
+                'repeatid' => $coalesce('repeatid'),
+                'modulename' => $coalesce('modulename'),
+                'instance' => $coalesce('instance'),
+                'eventtype' => $coalesce('eventtype'),
+                'timestart' => $coalesce('timestart'),
+                'timeduration' => $coalesce('timeduration'),
+                'timemodified' => $coalesce('timemodified'),
+                'timesort' => $coalesce('timesort'),
+                'visible' => $coalesce('visible'),
+                'subscriptionid' => $coalesce('subscriptionid')
             ]
         );
     }

From 159a2bc1fe33fa4f58ed0d1b48d5a56d0b4f6db2 Mon Sep 17 00:00:00 2001
From: Ryan Wyllie <ryan@moodle.com>
Date: Mon, 24 Jul 2017 07:35:57 +0000
Subject: [PATCH 06/15] MDL-59382 theme_boost: add title block to modal
 template

---
 theme/boost/templates/core/modal.mustache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/boost/templates/core/modal.mustache b/theme/boost/templates/core/modal.mustache
index 5b4bd0c9956..7cdb760e584 100644
--- a/theme/boost/templates/core/modal.mustache
+++ b/theme/boost/templates/core/modal.mustache
@@ -48,7 +48,7 @@
                   <span aria-hidden="true">&times;</span>
                 </button>
                 {{$header}}
-                    <h4 id="{{uniqid}}-modal-title" data-region="title" tabindex="0">{{title}}</h4>
+                    <h4 id="{{uniqid}}-modal-title" data-region="title" tabindex="0">{{$title}}{{title}}{{/title}}</h4>
                 {{/header}}
             </div>
             <div class="modal-body" data-region="body">

From 6103fd2efe1c3165f435c8ff7845932a1cff678b Mon Sep 17 00:00:00 2001
From: Ryan Wyllie <ryan@moodle.com>
Date: Mon, 24 Jul 2017 07:55:33 +0000
Subject: [PATCH 07/15] MDL-59382 calendar: rename repository and events

Renamed the calendar_repository and calendar_events to repository and
events respectively since they are already in the calendar namespace
there is no need for the redundant calendar prefix.
---
 calendar/amd/build/calendar_events.min.js     |  1 -
 calendar/amd/build/events.min.js              |  1 +
 ...ar_repository.min.js => repository.min.js} |  2 +-
 .../amd/src/{calendar_events.js => events.js} |  9 +++++---
 .../{calendar_repository.js => repository.js} | 23 +++++++++++++++++--
 5 files changed, 29 insertions(+), 7 deletions(-)
 delete mode 100644 calendar/amd/build/calendar_events.min.js
 create mode 100644 calendar/amd/build/events.min.js
 rename calendar/amd/build/{calendar_repository.min.js => repository.min.js} (54%)
 rename calendar/amd/src/{calendar_events.js => events.js} (77%)
 rename calendar/amd/src/{calendar_repository.js => repository.js} (75%)

diff --git a/calendar/amd/build/calendar_events.min.js b/calendar/amd/build/calendar_events.min.js
deleted file mode 100644
index 54965074923..00000000000
--- a/calendar/amd/build/calendar_events.min.js
+++ /dev/null
@@ -1 +0,0 @@
-define([],function(){return{deleted:"calendar-events:deleted"}});
\ No newline at end of file
diff --git a/calendar/amd/build/events.min.js b/calendar/amd/build/events.min.js
new file mode 100644
index 00000000000..938b80413b7
--- /dev/null
+++ b/calendar/amd/build/events.min.js
@@ -0,0 +1 @@
+define([],function(){return{created:"calendar-events:created",deleted:"calendar-events:deleted",updated:"calendar-events:updated",editEvent:"calendar-events:edit_event"}});
\ No newline at end of file
diff --git a/calendar/amd/build/calendar_repository.min.js b/calendar/amd/build/repository.min.js
similarity index 54%
rename from calendar/amd/build/calendar_repository.min.js
rename to calendar/amd/build/repository.min.js
index bfb5d0d72f2..27c0538ff93 100644
--- a/calendar/amd/build/calendar_repository.min.js
+++ b/calendar/amd/build/repository.min.js
@@ -1 +1 @@
-define(["jquery","core/ajax"],function(a,b){var c=function(a){var c={methodname:"core_calendar_delete_calendar_events",args:{events:[{eventid:a,repeat:1}]}};return b.call([c])[0]},d=function(a){var c={methodname:"core_calendar_get_calendar_event_by_id",args:{eventid:a}};return b.call([c])[0]};return{getEventById:d,deleteEvent:c}});
\ No newline at end of file
+define(["jquery","core/ajax"],function(a,b){var c=function(a){var c={methodname:"core_calendar_delete_calendar_events",args:{events:[{eventid:a,repeat:1}]}};return b.call([c])[0]},d=function(a){var c={methodname:"core_calendar_get_calendar_event_by_id",args:{eventid:a}};return b.call([c])[0]},e=function(a){var c={methodname:"core_calendar_submit_create_update_form",args:{formdata:a}};return b.call([c])[0]};return{getEventById:d,deleteEvent:c,submitCreateUpdateForm:e}});
\ No newline at end of file
diff --git a/calendar/amd/src/calendar_events.js b/calendar/amd/src/events.js
similarity index 77%
rename from calendar/amd/src/calendar_events.js
rename to calendar/amd/src/events.js
index bb88d81ab03..80ec8cacb41 100644
--- a/calendar/amd/src/calendar_events.js
+++ b/calendar/amd/src/events.js
@@ -14,9 +14,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Contain the events a modal can fire.
+ * Contain the events the calendar component can fire.
  *
- * @module     core_calendar/calendar_events
+ * @module     core_calendar/events
  * @class      calendar_events
  * @package    core_calendar
  * @copyright  2017 Simey Lameze <simey@moodle.com>
@@ -24,6 +24,9 @@
  */
 define([], function() {
     return {
-        deleted: 'calendar-events:deleted'
+        created: 'calendar-events:created',
+        deleted: 'calendar-events:deleted',
+        updated: 'calendar-events:updated',
+        editEvent: 'calendar-events:edit_event'
     };
 });
diff --git a/calendar/amd/src/calendar_repository.js b/calendar/amd/src/repository.js
similarity index 75%
rename from calendar/amd/src/calendar_repository.js
rename to calendar/amd/src/repository.js
index 2de4c41b8ab..0f96079b24c 100644
--- a/calendar/amd/src/calendar_repository.js
+++ b/calendar/amd/src/repository.js
@@ -16,7 +16,7 @@
 /**
  * A javascript module to handle calendar ajax actions.
  *
- * @module     core_calendar/calendar_repository
+ * @module     core_calendar/repository
  * @class      repository
  * @package    core_calendar
  * @copyright  2017 Simey Lameze <lameze@moodle.com>
@@ -65,8 +65,27 @@ define(['jquery', 'core/ajax'], function($, Ajax) {
         return Ajax.call([request])[0];
     };
 
+    /**
+     * Submit the form data for the event form.
+     *
+     * @method submitCreateUpdateForm
+     * @param {string} formdata The URL encoded values from the form
+     * @return {promise} Resolved with the new or edited event
+     */
+    var submitCreateUpdateForm = function(formdata) {
+        var request = {
+            methodname: 'core_calendar_submit_create_update_form',
+            args: {
+                formdata: formdata
+            }
+        };
+
+        return Ajax.call([request])[0];
+    };
+
     return {
         getEventById: getEventById,
-        deleteEvent: deleteEvent
+        deleteEvent: deleteEvent,
+        submitCreateUpdateForm: submitCreateUpdateForm
     };
 });

From aa0912258d58506099f67affb18575c12bee5127 Mon Sep 17 00:00:00 2001
From: Ryan Wyllie <ryan@moodle.com>
Date: Mon, 24 Jul 2017 08:01:14 +0000
Subject: [PATCH 08/15] MDL-59382 calendar: add modal to create and update
 events

---
 calendar/amd/build/calendar.min.js            |   2 +-
 calendar/amd/build/event_form.min.js          |   1 +
 calendar/amd/build/modal_event_form.min.js    |   1 +
 calendar/amd/build/summary_modal.min.js       |   2 +-
 calendar/amd/src/calendar.js                  | 305 ++++++++-----
 calendar/amd/src/event_form.js                | 282 ++++++++++++
 calendar/amd/src/modal_event_form.js          | 429 ++++++++++++++++++
 calendar/amd/src/summary_modal.js             |  96 +++-
 calendar/classes/local/event/forms/create.php | 283 ++++++++++++
 calendar/classes/local/event/forms/update.php |  60 +++
 .../mappers/create_update_form_mapper.php     | 121 +++++
 .../create_update_form_mapper_interface.php   |  55 +++
 calendar/externallib.php                      |  91 ++++
 calendar/lib.php                              | 174 ++++++-
 calendar/renderer.php                         |  19 +-
 calendar/templates/modal_event_form.mustache  |  61 +++
 calendar/tests/lib_test.php                   | 265 ++++++++++-
 lang/en/calendar.php                          |   2 +
 lang/en/moodle.php                            |   1 +
 lib/db/services.php                           |   9 +
 lib/grouplib.php                              | 144 ++++++
 lib/tests/grouplib_test.php                   | 144 ++++++
 version.php                                   |   2 +-
 23 files changed, 2392 insertions(+), 157 deletions(-)
 create mode 100644 calendar/amd/build/event_form.min.js
 create mode 100644 calendar/amd/build/modal_event_form.min.js
 create mode 100644 calendar/amd/src/event_form.js
 create mode 100644 calendar/amd/src/modal_event_form.js
 create mode 100644 calendar/classes/local/event/forms/create.php
 create mode 100644 calendar/classes/local/event/forms/update.php
 create mode 100644 calendar/classes/local/event/mappers/create_update_form_mapper.php
 create mode 100644 calendar/classes/local/event/mappers/create_update_form_mapper_interface.php
 create mode 100644 calendar/templates/modal_event_form.mustache

diff --git a/calendar/amd/build/calendar.min.js b/calendar/amd/build/calendar.min.js
index d54e1ca903b..fab055da74b 100644
--- a/calendar/amd/build/calendar.min.js
+++ b/calendar/amd/build/calendar.min.js
@@ -1 +1 @@
-define(["jquery","core/ajax","core/str","core/templates","core/notification","core/custom_interaction_events","core/modal_factory","core_calendar/summary_modal","core/modal_events","core_calendar/calendar_repository"],function(a,b,c,d,e,f,g,h,i,j){var k={ROOT:"[data-region='calendar']",EVENT_LINK:"[data-action='view-event']"},l=function(a){var b="type"+a;return c.get_string(b,"core_calendar").then(function(a){return a})},m=function(a){return c.get_string("subsource","core_calendar",a).then(function(b){return a.url?'<a href="'+a.url+'">'+b+"</a>":b})},n=function(b){j.getEventById(b).then(function(c){if(!c.event)throw new Error("Error encountered while trying to fetch calendar event with ID: "+b);var d=c.event,e=l(d.eventtype);if(d.displayeventsource){d.subscription=JSON.parse(d.subscription);var f={url:d.subscription.url,name:d.subscription.name},g=m(f);return a.when(e,g).then(function(a,b){return d.eventtype=a,d.source=b,d})}return e.then(function(a){return d.eventtype=a,d})}).then(function(a){var b={title:a.name,type:h.TYPE,body:d.render("core_calendar/event_summary_body",a)};return a.caneditevent||(b.footer=""),g.create(b)}).done(function(a){a.getRoot().on(i.hidden,function(){a.destroy()}),a.show()}).fail(e.exception)},o=function(){a(k.EVENT_LINK).click(function(b){b.preventDefault();var c=a(this).attr("data-event-id");n(c)})};return{init:function(){o()}}});
\ No newline at end of file
+define(["jquery","core/ajax","core/str","core/templates","core/notification","core/custom_interaction_events","core/modal_events","core/modal_factory","core_calendar/modal_event_form","core_calendar/summary_modal","core_calendar/repository","core_calendar/events"],function(a,b,c,d,e,f,g,h,i,j,k,l){var m={ROOT:"[data-region='calendar']",EVENT_LINK:"[data-action='view-event']",NEW_EVENT_BUTTON:"[data-action='new-event-button']"},n=function(a){var b="type"+a;return c.get_string(b,"core_calendar").then(function(a){return a})},o=function(a){return c.get_string("subsource","core_calendar",a).then(function(b){return a.url?'<a href="'+a.url+'">'+b+"</a>":b})},p=function(b){k.getEventById(b).then(function(c){if(!c.event)throw new Error("Error encountered while trying to fetch calendar event with ID: "+b);var d=c.event,e=n(d.eventtype);if(d.displayeventsource){d.subscription=JSON.parse(d.subscription);var f={url:d.subscription.url,name:d.subscription.name},g=o(f);return a.when(e,g).then(function(a,b){return d.eventtype=a,d.source=b,d})}return e.then(function(a){return d.eventtype=a,d})}).then(function(a){var b={title:a.name,type:j.TYPE,body:d.render("core_calendar/event_summary_body",a)};return a.caneditevent||(b.footer=""),h.create(b)}).done(function(a){a.getRoot().on(g.hidden,function(){a.destroy()}),a.show()}).fail(e.exception)},q=function(a){var b=a.find(m.NEW_EVENT_BUTTON),c=b.attr("data-context-id");return h.create({type:i.TYPE,large:!0,templateContext:{contextid:c}},b)},r=function(b,c){var d=a("body");d.on(l.created,function(){window.location.reload()}),d.on(l.deleted,function(){window.location.reload()}),d.on(l.updated,function(){window.location.reload()}),c.then(function(a){d.on(l.editEvent,function(b,c){a.setEventId(c),a.show()})})},s=function(){var b=a(m.ROOT);a(m.EVENT_LINK).click(function(b){b.preventDefault();var c=a(this).attr("data-event-id");p(c)});var c=q(b);r(b,c)};return{init:function(){s()}}});
\ No newline at end of file
diff --git a/calendar/amd/build/event_form.min.js b/calendar/amd/build/event_form.min.js
new file mode 100644
index 00000000000..8d2d5d69622
--- /dev/null
+++ b/calendar/amd/build/event_form.min.js
@@ -0,0 +1 @@
+define(["jquery","core/templates"],function(a,b){var c={EVENT_TYPE:'[name="eventtype"]',EVENT_COURSE_ID:'[name="courseid"]',EVENT_GROUP_COURSE_ID:'[name="groupcourseid"]',EVENT_GROUP_ID:'[name="groupid"]',FORM_GROUP:".form-group",SELECT_OPTION:"option",ADVANCED_ELEMENT:".fitem.advanced",FIELDSET_ADVANCED_ELEMENTS:"fieldset.containsadvancedelements",MORELESS_TOGGLE:".moreless-actions"},d={USER:"user",SITE:"site",COURSE:"course",GROUP:"group"},e={SHOW_ADVANCED:"event_form-show-advanced",HIDE_ADVANCED:"event_form-hide-advanced",ADVANCED_SHOWN:"event_form-advanced-shown",ADVANCED_HIDDEN:"event_form-advanced-hidden"},f=function(a){a.find(c.FIELDSET_ADVANCED_ELEMENTS).removeClass("containsadvancedelements");var d=a.find(c.MORELESS_TOGGLE);b.replaceNode(d,"","")},g=function(a){a.find(c.ADVANCED_ELEMENT).removeClass("hidden"),a.trigger(e.ADVANCED_SHOWN)},h=function(a){a.find(c.ADVANCED_ELEMENT).addClass("hidden"),a.trigger(e.ADVANCED_HIDDEN)},i=function(a){a.on(e.SHOW_ADVANCED,function(){g(a)}),a.on(e.HIDE_ADVANCED,function(){h(a)})},j=function(b){b.find(c.EVENT_GROUP_ID).find(c.SELECT_OPTION).each(function(b,c){var c=a(c),d=c.attr("value"),e=d.split("-"),f=e[0];c.attr("data-course-id",f)})},k=function(a){var b=a.find(c.EVENT_TYPE),e=b.val(),f=a.find(c.EVENT_COURSE_ID).closest(c.FORM_GROUP).removeClass("hidden"),g=a.find(c.EVENT_GROUP_COURSE_ID).closest(c.FORM_GROUP).removeClass("hidden"),h=a.find(c.EVENT_GROUP_ID).closest(c.FORM_GROUP).removeClass("hidden");switch(e){case d.COURSE:g.addClass("hidden"),h.addClass("hidden");break;case d.GROUP:f.addClass("hidden");break;default:f.addClass("hidden"),g.addClass("hidden"),h.addClass("hidden")}},l=function(a){var b=a.find(c.EVENT_TYPE);b.on("change",function(){k(a)})},m=function(b){var d=b.find(c.EVENT_GROUP_COURSE_ID),e=b.find(c.EVENT_GROUP_ID),f=e.find(c.SELECT_OPTION),g=function(){var b=d.val(),c=null;f.each(function(d,e){e=a(e),e.attr("data-course-id")==b?(e.removeClass("hidden"),e.prop("disabled",!1),null===c&&(c=d)):(e.addClass("hidden"),e.prop("disabled",!0))}),e.prop("selectedIndex",c)};d.on("change",g),g()},n=function(b,c){var d=a("#"+b);i(d),f(d),k(d),j(d),l(d),m(d),c?g(d):h(d)};return{init:n,events:e}});
\ No newline at end of file
diff --git a/calendar/amd/build/modal_event_form.min.js b/calendar/amd/build/modal_event_form.min.js
new file mode 100644
index 00000000000..78b804aa112
--- /dev/null
+++ b/calendar/amd/build/modal_event_form.min.js
@@ -0,0 +1 @@
+define(["jquery","core/event","core/str","core/notification","core/templates","core/custom_interaction_events","core/modal","core/modal_registry","core/fragment","core_calendar/events","core_calendar/repository","core_calendar/event_form"],function(a,b,c,d,e,f,g,h,i,j,k,l){var m=!1,n={MORELESS_BUTTON:'[data-action="more-less-toggle"]',SAVE_BUTTON:'[data-action="save"]',LOADING_ICON_CONTAINER:'[data-region="loading-icon-container"]'},o=function(a){g.call(this,a),this.eventId=null,this.reloadingBody=!1,this.reloadingTitle=!1,this.saveButton=this.getFooter().find(n.SAVE_BUTTON),this.moreLessButton=this.getFooter().find(n.MORELESS_BUTTON)};return o.TYPE="core_calendar-modal_event_form",o.prototype=Object.create(g.prototype),o.prototype.constructor=o,o.prototype.setEventId=function(a){this.eventId=a},o.prototype.getEventId=function(){return this.eventId},o.prototype.hasEventId=function(){return null!==this.eventId},o.prototype.getForm=function(){return this.getBody().find("form")},o.prototype.disableButtons=function(){this.saveButton.prop("disabled",!0),this.moreLessButton.prop("disabled",!0)},o.prototype.enableButtons=function(){this.saveButton.prop("disabled",!1),this.moreLessButton.prop("disabled",!1)},o.prototype.setMoreButton=function(){this.moreLessButton.attr("data-collapsed","true"),c.get_string("more","calendar").then(function(a){this.moreLessButton.text(a)}.bind(this))},o.prototype.setLessButton=function(){this.moreLessButton.attr("data-collapsed","false"),c.get_string("less","calendar").then(function(a){this.moreLessButton.text(a)}.bind(this))},o.prototype.toggleMoreLessButton=function(){var a=this.getForm();"true"==this.moreLessButton.attr("data-collapsed")?(a.trigger(l.events.SHOW_ADVANCED),this.setLessButton()):(a.trigger(l.events.HIDE_ADVANCED),this.setMoreButton())},o.prototype.reloadTitleContent=function(){return this.reloadingTitle?this.titlePromise:(this.reloadingTitle=!0,this.hasEventId()?this.titlePromise=c.get_string("editevent","calendar"):this.titlePromise=c.get_string("newevent","calendar"),this.titlePromise.then(function(a){return this.setTitle(a),a}.bind(this)).always(function(){this.reloadingTitle=!1}.bind(this)),this.titlePromise)},o.prototype.reloadBodyContent=function(a,b){if(this.reloadingBody)return this.bodyPromise;this.reloadingBody=!0,this.disableButtons();var c=this.saveButton.attr("data-context-id"),e={};return this.hasEventId()&&(e.eventid=this.getEventId()),"undefined"!=typeof a&&(e.formdata=a),e.haserror="undefined"!=typeof b&&b,this.bodyPromise=i.loadFragment("calendar","event_form",c,e),this.setBody(this.bodyPromise),this.bodyPromise.then(function(){this.enableButtons()}.bind(this))["catch"](d.exception).always(function(){this.reloadingBody=!1}.bind(this)),this.bodyPromise},o.prototype.reloadAllContent=function(){return a.when(this.reloadTitleContent(),this.reloadBodyContent())},o.prototype.show=function(){this.reloadAllContent(),g.prototype.show.call(this)},o.prototype.hide=function(){g.prototype.hide.call(this),this.setEventId(null)},o.prototype.getFormData=function(){return this.getForm().serialize()},o.prototype.save=function(){var b=this.saveButton.find(n.LOADING_ICON_CONTAINER);b.removeClass("hidden"),this.disableButtons();var c=this.getFormData();return k.submitCreateUpdateForm(c).then(function(b){return b.validationerror?this.reloadBodyContent(c,!0):(this.hide(),void(this.hasEventId()?a("body").trigger(j.updated,[b.event]):a("body").trigger(j.created,[b.event])))}.bind(this)).always(function(){b.addClass("hidden"),this.enableButtons()}.bind(this))["catch"](d.exception)},o.prototype.registerEventListeners=function(){g.prototype.registerEventListeners.call(this),this.getModal().on(f.events.activate,n.SAVE_BUTTON,function(a,b){this.getForm().submit(),b.originalEvent.preventDefault(),a.stopPropagation()}.bind(this)),this.getModal().on("submit",function(a){this.save(),a.preventDefault(),a.stopPropagation()}.bind(this)),this.getModal().on(f.events.activate,n.MORELESS_BUTTON,function(a,b){this.toggleMoreLessButton(),b.originalEvent.preventDefault(),a.stopPropagation()}.bind(this)),this.getModal().on(l.events.ADVANCED_SHOWN,function(){this.setLessButton()}.bind(this)),this.getModal().on(l.events.ADVANCED_HIDDEN,function(){this.setMoreButton()}.bind(this))},m||(h.register(o.TYPE,o,"calendar/modal_event_form"),m=!0),o});
\ No newline at end of file
diff --git a/calendar/amd/build/summary_modal.min.js b/calendar/amd/build/summary_modal.min.js
index 3c917ad3d3d..9c0bb22ee4c 100644
--- a/calendar/amd/build/summary_modal.min.js
+++ b/calendar/amd/build/summary_modal.min.js
@@ -1 +1 @@
-define(["jquery","core/str","core/notification","core/custom_interaction_events","core/modal","core/modal_registry","core/modal_factory","core/modal_events","core_calendar/calendar_repository","core_calendar/calendar_events"],function(a,b,c,d,e,f,g,h,i,j){var k=!1,l={ROOT:"[data-region='summary-modal-container']",EDIT_BUTTON:'[data-action="edit"]',DELETE_BUTTON:'[data-action="delete"]',EVENT_LINK:'[data-action="event-link"]'},m=function(a){e.call(this,a),this.getFooter().find(l.EDIT_BUTTON).length||c.exception({message:"No edit button found"}),this.getFooter().find(l.DELETE_BUTTON).length||c.exception({message:"No delete button found"})};return m.TYPE="core_calendar-event_summary",m.prototype=Object.create(e.prototype),m.prototype.constructor=m,m.prototype.registerEventListeners=function(){e.prototype.registerEventListeners.call(this);var a=g.create({type:g.types.CONFIRM},this.getFooter().find(l.DELETE_BUTTON)).then(function(a){return b.get_string("confirm").then(function(b){a.setTitle(b)}.bind(this))["catch"](c.exception),a.getRoot().on(h.yes,function(){var b=this.getBody().find(l.ROOT).attr("data-event-id");i.deleteEvent(b).done(function(){a.getRoot().trigger(j.deleted,b),window.location.reload()}).fail(c.exception)}.bind(this)),a}.bind(this));this.getRoot().on(h.bodyRendered,function(){var c=this.getBody().find(l.ROOT).attr("data-event-title");a.then(function(a){a.setBody(b.get_string("confirmeventdelete","core_calendar",c))})}.bind(this))},k||(f.register(m.TYPE,m,"core_calendar/event_summary_modal"),k=!0),m});
\ No newline at end of file
+define(["jquery","core/str","core/notification","core/custom_interaction_events","core/modal","core/modal_registry","core/modal_factory","core/modal_events","core_calendar/repository","core_calendar/events"],function(a,b,c,d,e,f,g,h,i,j){var k=!1,l={ROOT:"[data-region='summary-modal-container']",EDIT_BUTTON:'[data-action="edit"]',DELETE_BUTTON:'[data-action="delete"]'},m=function(a){e.call(this,a),this.getEditButton().length||c.exception({message:"No edit button found"}),this.getDeleteButton().length||c.exception({message:"No delete button found"})};return m.TYPE="core_calendar-event_summary",m.prototype=Object.create(e.prototype),m.prototype.constructor=m,m.prototype.getEditButton=function(){return"undefined"==typeof this.editButton&&(this.editButton=this.getFooter().find(l.EDIT_BUTTON)),this.editButton},m.prototype.getDeleteButton=function(){return"undefined"==typeof this.deleteButton&&(this.deleteButton=this.getFooter().find(l.DELETE_BUTTON)),this.deleteButton},m.prototype.getEventId=function(){return this.getBody().find(l.ROOT).attr("data-event-id")},m.prototype.registerEventListeners=function(){e.prototype.registerEventListeners.call(this);var f=g.create({type:g.types.CONFIRM},this.getDeleteButton()).then(function(b){return b.getRoot().on(h.yes,function(){var b=this.getEventId();i.deleteEvent(b).then(function(){a("body").trigger(j.deleted,[b]),this.hide()}.bind(this))["catch"](c.exception)}.bind(this)),b}.bind(this));this.getRoot().on(h.bodyRendered,function(){var a=this.getBody().find(l.ROOT).attr("data-event-title");f.then(function(c){c.setBody(b.get_string("confirmeventdelete","core_calendar",a))})}.bind(this)),d.define(this.getEditButton(),[d.events.activate]),this.getEditButton().on(d.events.activate,function(b,c){a("body").trigger(j.editEvent,[this.getEventId()]),this.hide(),b.preventDefault(),b.stopPropagation(),c.originalEvent.preventDefault(),c.originalEvent.stopPropagation()}.bind(this))},k||(f.register(m.TYPE,m,"core_calendar/event_summary_modal"),k=!0),m});
\ No newline at end of file
diff --git a/calendar/amd/src/calendar.js b/calendar/amd/src/calendar.js
index 5de63187351..a76db0e0ea3 100644
--- a/calendar/amd/src/calendar.js
+++ b/calendar/amd/src/calendar.js
@@ -14,128 +14,215 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * A javascript module to calendar events.
+ * This module is the highest level module for the calendar. It is
+ * responsible for initialising all of the components required for
+ * the calendar to run. It also coordinates the interaction between
+ * components by listening for and responding to different events
+ * triggered within the calendar UI.
  *
  * @module     core_calendar/calendar
  * @package    core_calendar
  * @copyright  2017 Simey Lameze <simey@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-define(['jquery', 'core/ajax', 'core/str', 'core/templates', 'core/notification', 'core/custom_interaction_events',
-        'core/modal_factory', 'core_calendar/summary_modal', 'core/modal_events', 'core_calendar/calendar_repository'],
-    function($, Ajax, Str, Templates, Notification, CustomEvents, ModalFactory, SummaryModal, ModalEvents, CalendarRepository) {
+define([
+            'jquery',
+            'core/ajax',
+            'core/str',
+            'core/templates',
+            'core/notification',
+            'core/custom_interaction_events',
+            'core/modal_events',
+            'core/modal_factory',
+            'core_calendar/modal_event_form',
+            'core_calendar/summary_modal',
+            'core_calendar/repository',
+            'core_calendar/events'
+        ],
+        function(
+            $,
+            Ajax,
+            Str,
+            Templates,
+            Notification,
+            CustomEvents,
+            ModalEvents,
+            ModalFactory,
+            ModalEventForm,
+            SummaryModal,
+            CalendarRepository,
+            CalendarEvents
+        ) {
 
-        var SELECTORS = {
-            ROOT: "[data-region='calendar']",
-            EVENT_LINK: "[data-action='view-event']",
-        };
+    var SELECTORS = {
+        ROOT: "[data-region='calendar']",
+        EVENT_LINK: "[data-action='view-event']",
+        NEW_EVENT_BUTTON: "[data-action='new-event-button']"
+    };
 
-        /**
-         * Get the event type lang string.
-         *
-         * @param {String} eventType The event type.
-         * @return {promise} The lang string promise.
-         */
-        var getEventType = function(eventType) {
-            var lang = 'type' + eventType;
-            return Str.get_string(lang, 'core_calendar').then(function(langStr) {
-                return langStr;
-            });
-        };
+    /**
+     * Get the event type lang string.
+     *
+     * @param {String} eventType The event type.
+     * @return {promise} The lang string promise.
+     */
+    var getEventType = function(eventType) {
+        var lang = 'type' + eventType;
+        return Str.get_string(lang, 'core_calendar').then(function(langStr) {
+            return langStr;
+        });
+    };
 
-        /**
-         * Get the event source.
-         *
-         * @param {Object} subscription The event subscription object.
-         * @return {promise} The lang string promise.
-         */
-        var getEventSource = function(subscription) {
-            return Str.get_string('subsource', 'core_calendar', subscription).then(function(langStr) {
-                if (subscription.url) {
-                    return '<a href="' + subscription.url + '">' + langStr + '</a>';
-                }
-                return langStr;
-            });
-        };
+    /**
+     * Get the event source.
+     *
+     * @param {Object} subscription The event subscription object.
+     * @return {promise} The lang string promise.
+     */
+    var getEventSource = function(subscription) {
+        return Str.get_string('subsource', 'core_calendar', subscription).then(function(langStr) {
+            if (subscription.url) {
+                return '<a href="' + subscription.url + '">' + langStr + '</a>';
+            }
+            return langStr;
+        });
+    };
 
-        /**
-         * Render the event summary modal.
-         *
-         * @param {Number} eventId The calendar event id.
-         */
-        var renderEventSummaryModal = function(eventId) {
-            // Calendar repository promise.
-            CalendarRepository.getEventById(eventId).then(function(getEventResponse) {
-                if (!getEventResponse.event) {
-                    throw new Error('Error encountered while trying to fetch calendar event with ID: ' + eventId);
-                }
-                var eventData = getEventResponse.event;
-                var eventTypePromise = getEventType(eventData.eventtype);
+    /**
+     * Render the event summary modal.
+     *
+     * @param {Number} eventId The calendar event id.
+     */
+    var renderEventSummaryModal = function(eventId) {
+        // Calendar repository promise.
+        CalendarRepository.getEventById(eventId).then(function(getEventResponse) {
+            if (!getEventResponse.event) {
+                throw new Error('Error encountered while trying to fetch calendar event with ID: ' + eventId);
+            }
+            var eventData = getEventResponse.event;
+            var eventTypePromise = getEventType(eventData.eventtype);
 
-                // If the calendar event has event source, get the source's language string/link.
-                if (eventData.displayeventsource) {
-                    eventData.subscription = JSON.parse(eventData.subscription);
-                    var eventSourceParams = {
-                        url: eventData.subscription.url,
-                        name: eventData.subscription.name
-                    };
-                    var eventSourcePromise = getEventSource(eventSourceParams);
+            // If the calendar event has event source, get the source's language string/link.
+            if (eventData.displayeventsource) {
+                eventData.subscription = JSON.parse(eventData.subscription);
+                var eventSourceParams = {
+                    url: eventData.subscription.url,
+                    name: eventData.subscription.name
+                };
+                var eventSourcePromise = getEventSource(eventSourceParams);
 
-                    // Return event data with event type and event source info.
-                    return $.when(eventTypePromise, eventSourcePromise).then(function(eventType, eventSource) {
-                        eventData.eventtype = eventType;
-                        eventData.source = eventSource;
-                        return eventData;
-                    });
-                }
-
-                // Return event data with event type info.
-                return eventTypePromise.then(function(eventType) {
+                // Return event data with event type and event source info.
+                return $.when(eventTypePromise, eventSourcePromise).then(function(eventType, eventSource) {
                     eventData.eventtype = eventType;
+                    eventData.source = eventSource;
                     return eventData;
                 });
-
-            }).then(function(eventData) {
-                // Build the modal parameters from the event data.
-                var modalParams = {
-                    title: eventData.name,
-                    type: SummaryModal.TYPE,
-                    body: Templates.render('core_calendar/event_summary_body', eventData)
-                };
-                if (!eventData.caneditevent) {
-                    modalParams.footer = '';
-                }
-                // Create the modal.
-                return ModalFactory.create(modalParams);
-
-            }).done(function(modal) {
-                // Handle hidden event.
-                modal.getRoot().on(ModalEvents.hidden, function() {
-                    // Destroy when hidden.
-                    modal.destroy();
-                });
-
-                // Finally, render the modal!
-                modal.show();
-
-            }).fail(Notification.exception);
-        };
-
-        /**
-         * Register event listeners for the module.
-         */
-        var registerEventListeners = function() {
-            // Bind click events to event links.
-            $(SELECTORS.EVENT_LINK).click(function(e) {
-                e.preventDefault();
-                var eventId = $(this).attr('data-event-id');
-                renderEventSummaryModal(eventId);
-            });
-        };
-
-        return {
-            init: function() {
-                registerEventListeners();
             }
-        };
-    });
+
+            // Return event data with event type info.
+            return eventTypePromise.then(function(eventType) {
+                eventData.eventtype = eventType;
+                return eventData;
+            });
+
+        }).then(function(eventData) {
+            // Build the modal parameters from the event data.
+            var modalParams = {
+                title: eventData.name,
+                type: SummaryModal.TYPE,
+                body: Templates.render('core_calendar/event_summary_body', eventData)
+            };
+            if (!eventData.caneditevent) {
+                modalParams.footer = '';
+            }
+            // Create the modal.
+            return ModalFactory.create(modalParams);
+
+        }).done(function(modal) {
+            // Handle hidden event.
+            modal.getRoot().on(ModalEvents.hidden, function() {
+                // Destroy when hidden.
+                modal.destroy();
+            });
+
+            // Finally, render the modal!
+            modal.show();
+
+        }).fail(Notification.exception);
+    };
+
+    /**
+     * Create the event form modal for creating new events and
+     * editing existing events.
+     *
+     * @method registerEventFormModal
+     * @param {object} root The calendar root element
+     * @return {object} The create modal promise
+     */
+    var registerEventFormModal = function(root) {
+        var newEventButton = root.find(SELECTORS.NEW_EVENT_BUTTON);
+        var contextId = newEventButton.attr('data-context-id');
+
+        return ModalFactory.create(
+            {
+                type: ModalEventForm.TYPE,
+                large: true,
+                templateContext: {
+                    contextid: contextId
+                }
+            },
+            newEventButton
+        );
+    };
+
+    /**
+     * Listen to and handle any calendar events fired by the calendar UI.
+     *
+     * @method registerCalendarEventListeners
+     * @param {object} root The calendar root element
+     * @param {object} eventFormModalPromise A promise reolved with the event form modal
+     */
+    var registerCalendarEventListeners = function(root, eventFormModalPromise) {
+        var body = $('body');
+
+        // TODO: Replace these with actual logic to update
+        // the UI without having to force a page reload.
+        body.on(CalendarEvents.created, function() { window.location.reload(); });
+        body.on(CalendarEvents.deleted, function() { window.location.reload(); });
+        body.on(CalendarEvents.updated, function() { window.location.reload(); });
+
+        eventFormModalPromise.then(function(modal) {
+            // When something within the calendar tells us the user wants
+            // to edit an event then show the event form modal.
+            body.on(CalendarEvents.editEvent, function(e, eventId) {
+                modal.setEventId(eventId);
+                modal.show();
+            });
+
+            return;
+        });
+    };
+
+    /**
+     * Register event listeners for the module.
+     */
+    var registerEventListeners = function() {
+        var root = $(SELECTORS.ROOT);
+
+        // Bind click events to event links.
+        $(SELECTORS.EVENT_LINK).click(function(e) {
+            e.preventDefault();
+            var eventId = $(this).attr('data-event-id');
+            renderEventSummaryModal(eventId);
+        });
+
+        var eventFormPromise = registerEventFormModal(root);
+        registerCalendarEventListeners(root, eventFormPromise);
+    };
+
+    return {
+        init: function() {
+            registerEventListeners();
+        }
+    };
+});
diff --git a/calendar/amd/src/event_form.js b/calendar/amd/src/event_form.js
new file mode 100644
index 00000000000..6fbd3eadfce
--- /dev/null
+++ b/calendar/amd/src/event_form.js
@@ -0,0 +1,282 @@
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * A javascript module to enhance the event form.
+ *
+ * @module     core_calendar/event_form
+ * @package    core_calendar
+ * @copyright  2017 Ryan Wyllie <ryan@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+define(['jquery', 'core/templates'], function($, Templates) {
+
+    var SELECTORS = {
+        EVENT_TYPE: '[name="eventtype"]',
+        EVENT_COURSE_ID: '[name="courseid"]',
+        EVENT_GROUP_COURSE_ID: '[name="groupcourseid"]',
+        EVENT_GROUP_ID: '[name="groupid"]',
+        FORM_GROUP: '.form-group',
+        SELECT_OPTION: 'option',
+        ADVANCED_ELEMENT: '.fitem.advanced',
+        FIELDSET_ADVANCED_ELEMENTS: 'fieldset.containsadvancedelements',
+        MORELESS_TOGGLE: '.moreless-actions'
+    };
+
+    var EVENT_TYPES = {
+        USER: 'user',
+        SITE: 'site',
+        COURSE: 'course',
+        GROUP: 'group'
+    };
+
+    var EVENTS = {
+        SHOW_ADVANCED: 'event_form-show-advanced',
+        HIDE_ADVANCED: 'event_form-hide-advanced',
+        ADVANCED_SHOWN: 'event_form-advanced-shown',
+        ADVANCED_HIDDEN: 'event_form-advanced-hidden',
+    };
+
+    /**
+     * Find the old show more / show less toggle added by the mform and destroy it.
+     * We are handling the visibility of the advanced fields with the more/less button
+     * in the footer of the modal that this form is rendered within.
+     *
+     * @method destroyOldMoreLessToggle
+     * @param {object} formElement The root form element
+     */
+    var destroyOldMoreLessToggle = function(formElement) {
+        formElement.find(SELECTORS.FIELDSET_ADVANCED_ELEMENTS).removeClass('containsadvancedelements');
+        var element = formElement.find(SELECTORS.MORELESS_TOGGLE);
+        Templates.replaceNode(element, '', '');
+    };
+
+    /**
+     * Find each of the advanced form elements and make them visible.
+     *
+     * This function triggers the ADVANCED_SHOWN event for any other
+     * component to handle (e.g. the event form modal).
+     *
+     * @method destroyOldMoreLessToggle
+     * @param {object} formElement The root form element
+     */
+    var showAdvancedElements = function(formElement) {
+        formElement.find(SELECTORS.ADVANCED_ELEMENT).removeClass('hidden');
+        formElement.trigger(EVENTS.ADVANCED_SHOWN);
+    };
+
+    /**
+     * Find each of the advanced form elements and hide them.
+     *
+     * This function triggers the ADVANCED_HIDDEN event for any other
+     * component to handle (e.g. the event form modal).
+     *
+     * @method hideAdvancedElements
+     * @param {object} formElement The root form element
+     */
+    var hideAdvancedElements = function(formElement) {
+        formElement.find(SELECTORS.ADVANCED_ELEMENT).addClass('hidden');
+        formElement.trigger(EVENTS.ADVANCED_HIDDEN);
+    };
+
+    /**
+     * Listen for any events telling this module to show or hide it's
+     * advanced elements.
+     *
+     * This function listens for SHOW_ADVANCED and HIDE_ADVANCED.
+     *
+     * @method listenForShowHideEvents
+     * @param {object} formElement The root form element
+     */
+    var listenForShowHideEvents = function(formElement) {
+        formElement.on(EVENTS.SHOW_ADVANCED, function() {
+            showAdvancedElements(formElement);
+        });
+
+        formElement.on(EVENTS.HIDE_ADVANCED, function() {
+            hideAdvancedElements(formElement);
+        });
+    };
+
+    /**
+     * Parse the group id select element in the event form and pull out
+     * the course id from the value to allow us to toggle other select
+     * elements based on the course id for the group a user selects.
+     *
+     * This is a little hacky but I couldn't find a better way to pass
+     * the course id for each group id with the limitations of mforms.
+     *
+     * The group id options are rendered with a value like:
+     * "<courseid>-<groupid>"
+     * E.g.
+     * For a group with id 10 in a course with id 3 the value of the
+     * option will be 3-10.
+     *
+     * @method parseGroupSelect
+     * @param {object} formElement The root form element
+     */
+    var parseGroupSelect = function(formElement) {
+        formElement.find(SELECTORS.EVENT_GROUP_ID)
+            .find(SELECTORS.SELECT_OPTION)
+            .each(function(index, element) {
+                var element = $(element);
+                var value = element.attr('value');
+                var splits = value.split('-');
+                var courseId = splits[0];
+
+                element.attr('data-course-id', courseId);
+            });
+    };
+
+    /**
+     * Toggle the visibility of the secondary select elements based on
+     * the event type the user has selected.
+     *
+     * There are 3 secondary select elements within the form:
+     *      - course: a list of all courses a user can add course events to
+     *      - group course: a list of all courses a user can add group events to.
+     *                      this list can be different from the course list above.
+     *      - group: a list of all groups a user can add an event to. This list will
+     *               be filtered further based on the group course selected.
+     *
+     *  There are 4 event types:
+     *      - user: none of the secondary selects should be visible.
+     *      - site: none of the secondary selects should be visible.
+     *      - course: "course" select should be visible and both "group course"
+     *                and "group" should be hidden.
+     *      - group: "group course" and "group" should be visible and "course"
+     *               should be hidden.
+     *
+     * @method hideTypeSubSelects
+     * @param {object} formElement The root form element
+     */
+    var hideTypeSubSelects = function(formElement) {
+        var typeSelect = formElement.find(SELECTORS.EVENT_TYPE);
+        var eventType = typeSelect.val();
+        var courseIdSelect = formElement.find(SELECTORS.EVENT_COURSE_ID)
+            .closest(SELECTORS.FORM_GROUP)
+            .removeClass('hidden');
+        var groupCourseIdSelect = formElement.find(SELECTORS.EVENT_GROUP_COURSE_ID)
+            .closest(SELECTORS.FORM_GROUP)
+            .removeClass('hidden');
+        var groupIdSelect = formElement.find(SELECTORS.EVENT_GROUP_ID)
+            .closest(SELECTORS.FORM_GROUP)
+            .removeClass('hidden');
+
+        // Hide the unreleated selectors for the given event type.
+        switch (eventType) {
+            case EVENT_TYPES.COURSE:
+                groupCourseIdSelect.addClass('hidden');
+                groupIdSelect.addClass('hidden');
+                break;
+            case EVENT_TYPES.GROUP:
+                courseIdSelect.addClass('hidden');
+                break;
+            default:
+                courseIdSelect.addClass('hidden');
+                groupCourseIdSelect.addClass('hidden');
+                groupIdSelect.addClass('hidden');
+        }
+    };
+
+    /**
+     * Listen for when the user changes the event type select in the
+     * form and then toggle the visibility of the appropriate secondary
+     * select elements.
+     *
+     * See: hideTypeSubSelects.
+     *
+     * @method addTypeSelectListeners
+     * @param {object} formElement The root form element
+     */
+    var addTypeSelectListeners = function(formElement) {
+        var typeSelect = formElement.find(SELECTORS.EVENT_TYPE);
+
+        typeSelect.on('change', function() {
+            hideTypeSubSelects(formElement);
+        });
+    };
+
+    /**
+     * Listen for when the user changes the group course when configuring
+     * a group event and filter the options in the group select to only
+     * show the groups available within the course the user has selected.
+     *
+     * @method addCourseGroupSelectListeners
+     * @param {object} formElement The root form element
+     */
+    var addCourseGroupSelectListeners = function(formElement) {
+        var courseGroupSelect = formElement.find(SELECTORS.EVENT_GROUP_COURSE_ID);
+        var groupSelect = formElement.find(SELECTORS.EVENT_GROUP_ID);
+        var groupSelectOptions = groupSelect.find(SELECTORS.SELECT_OPTION);
+        var filterGroupSelectOptions = function() {
+            var selectedCourseId = courseGroupSelect.val();
+            var selectedIndex = null;
+
+            groupSelectOptions.each(function(index, element) {
+                element = $(element);
+
+                if (element.attr('data-course-id') == selectedCourseId) {
+                    element.removeClass('hidden');
+                    element.prop('disabled', false);
+
+                    if (selectedIndex === null) {
+                        selectedIndex = index;
+                    }
+                } else {
+                    element.addClass('hidden');
+                    element.prop('disabled', true);
+                }
+            });
+
+            groupSelect.prop('selectedIndex', selectedIndex);
+        };
+
+        courseGroupSelect.on('change', filterGroupSelectOptions);
+        filterGroupSelectOptions();
+    };
+
+    /**
+     * Initialise all of the form enhancementds.
+     *
+     * @method init
+     * @param {string} formId The value of the form's id attribute
+     * @param {bool} hasError If the form has errors rendered form the server.
+     */
+    var init = function(formId, hasError) {
+        var formElement = $('#' + formId);
+
+        listenForShowHideEvents(formElement);
+        destroyOldMoreLessToggle(formElement);
+        hideTypeSubSelects(formElement);
+        parseGroupSelect(formElement);
+        addTypeSelectListeners(formElement);
+        addCourseGroupSelectListeners(formElement);
+
+        // If we know that the form has been rendered with server side
+        // errors then we need to display all of the elements in the form
+        // in case one of those elements has the error.
+        if (hasError) {
+            showAdvancedElements(formElement);
+        } else {
+            hideAdvancedElements(formElement);
+        }
+    };
+
+    return {
+        init: init,
+        events: EVENTS,
+    };
+});
diff --git a/calendar/amd/src/modal_event_form.js b/calendar/amd/src/modal_event_form.js
new file mode 100644
index 00000000000..64d675aec25
--- /dev/null
+++ b/calendar/amd/src/modal_event_form.js
@@ -0,0 +1,429 @@
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Contain the logic for the quick add or update event modal.
+ *
+ * @module     calendar/modal_quick_add_event
+ * @class      modal_quick_add_event
+ * @package    core
+ * @copyright  2017 Ryan Wyllie <ryan@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+define([
+            'jquery',
+            'core/event',
+            'core/str',
+            'core/notification',
+            'core/templates',
+            'core/custom_interaction_events',
+            'core/modal',
+            'core/modal_registry',
+            'core/fragment',
+            'core_calendar/events',
+            'core_calendar/repository',
+            'core_calendar/event_form'
+        ],
+        function(
+            $,
+            Event,
+            Str,
+            Notification,
+            Templates,
+            CustomEvents,
+            Modal,
+            ModalRegistry,
+            Fragment,
+            CalendarEvents,
+            Repository,
+            EventForm
+        ) {
+
+    var registered = false;
+    var SELECTORS = {
+        MORELESS_BUTTON: '[data-action="more-less-toggle"]',
+        SAVE_BUTTON: '[data-action="save"]',
+        LOADING_ICON_CONTAINER: '[data-region="loading-icon-container"]',
+    };
+
+    /**
+     * Constructor for the Modal.
+     *
+     * @param {object} root The root jQuery element for the modal
+     */
+    var ModalEventForm = function(root) {
+        Modal.call(this, root);
+        this.eventId = null;
+        this.reloadingBody = false;
+        this.reloadingTitle = false;
+        this.saveButton = this.getFooter().find(SELECTORS.SAVE_BUTTON);
+        this.moreLessButton = this.getFooter().find(SELECTORS.MORELESS_BUTTON);
+    };
+
+    ModalEventForm.TYPE = 'core_calendar-modal_event_form';
+    ModalEventForm.prototype = Object.create(Modal.prototype);
+    ModalEventForm.prototype.constructor = ModalEventForm;
+
+    /**
+     * Set the event id to the given value.
+     *
+     * @method setEventId
+     * @param {int} id The event id
+     */
+    ModalEventForm.prototype.setEventId = function(id) {
+        this.eventId = id;
+    };
+
+    /**
+     * Retrieve the current event id, if any.
+     *
+     * @method getEventId
+     * @return {int|null} The event id
+     */
+    ModalEventForm.prototype.getEventId = function() {
+        return this.eventId;
+    };
+
+    /**
+     * Check if the modal has an event id.
+     *
+     * @method hasEventId
+     * @return {bool}
+     */
+    ModalEventForm.prototype.hasEventId = function() {
+        return this.eventId !== null;
+    };
+
+    /**
+     * Get the form element from the modal.
+     *
+     * @method getForm
+     * @return {object}
+     */
+    ModalEventForm.prototype.getForm = function() {
+        return this.getBody().find('form');
+    };
+
+    /**
+     * Disable the buttons in the footer.
+     *
+     * @method disableButtons
+     */
+    ModalEventForm.prototype.disableButtons = function() {
+        this.saveButton.prop('disabled', true);
+        this.moreLessButton.prop('disabled', true);
+    };
+
+    /**
+     * Enable the buttons in the footer.
+     *
+     * @method enableButtons
+     */
+    ModalEventForm.prototype.enableButtons = function() {
+        this.saveButton.prop('disabled', false);
+        this.moreLessButton.prop('disabled', false);
+    };
+
+    /**
+     * Set the more/less button in the footer to the "more"
+     * state.
+     *
+     * @method setMoreButton
+     */
+    ModalEventForm.prototype.setMoreButton = function() {
+        this.moreLessButton.attr('data-collapsed', 'true');
+        Str.get_string('more', 'calendar').then(function(string) {
+            this.moreLessButton.text(string);
+        }.bind(this));
+    };
+
+    /**
+     * Set the more/less button in the footer to the "less"
+     * state.
+     *
+     * @method setLessButton
+     */
+    ModalEventForm.prototype.setLessButton = function() {
+        this.moreLessButton.attr('data-collapsed', 'false');
+        Str.get_string('less', 'calendar').then(function(string) {
+            this.moreLessButton.text(string);
+        }.bind(this));
+    };
+
+    /**
+     * Toggle the more/less button in the footer from the current
+     * state to it's opposite state.
+     *
+     * @method toggleMoreLessButton
+     */
+    ModalEventForm.prototype.toggleMoreLessButton = function() {
+        var form = this.getForm();
+
+        if (this.moreLessButton.attr('data-collapsed') == 'true') {
+            form.trigger(EventForm.events.SHOW_ADVANCED);
+            this.setLessButton();
+        } else {
+            form.trigger(EventForm.events.HIDE_ADVANCED);
+            this.setMoreButton();
+        }
+    };
+
+    /**
+     * Reload the title for the modal to the appropriate value
+     * depending on whether we are creating a new event or
+     * editing an existing event.
+     *
+     * @method reloadTitleContent
+     * @return {object} A promise resolved with the new title text
+     */
+    ModalEventForm.prototype.reloadTitleContent = function() {
+        if (this.reloadingTitle) {
+            return this.titlePromise;
+        }
+
+        this.reloadingTitle = true;
+
+        if (this.hasEventId()) {
+            this.titlePromise = Str.get_string('editevent', 'calendar');
+        } else {
+            this.titlePromise = Str.get_string('newevent', 'calendar');
+        }
+
+        this.titlePromise.then(function(string) {
+            this.setTitle(string);
+            return string;
+        }.bind(this))
+        .always(function() {
+            this.reloadingTitle = false;
+            return;
+        }.bind(this));
+
+        return this.titlePromise;
+    };
+
+    /**
+     * Send a request to the server to get the event_form in a fragment
+     * and render the result in the body of the modal.
+     *
+     * If serialised form data is provided then it will be sent in the
+     * request to the server to have the form rendered with the data. This
+     * is used when the form had a server side error and we need the server
+     * to re-render it for us to display the error to the user.
+     *
+     * @method reloadBodyContent
+     * @param {string} formData The serialised form data
+     * @param {bool} hasError True if we know the form data is erroneous
+     * @return {object} A promise resolved with the fragment html and js from
+     */
+    ModalEventForm.prototype.reloadBodyContent = function(formData, hasError) {
+        if (this.reloadingBody) {
+            return this.bodyPromise;
+        }
+
+        this.reloadingBody = true;
+        this.disableButtons();
+
+        var contextId = this.saveButton.attr('data-context-id');
+        var args = {};
+
+        if (this.hasEventId()) {
+            args.eventid = this.getEventId();
+        }
+
+        if (typeof formData !== 'undefined') {
+            args.formdata = formData;
+        }
+
+        args.haserror = (typeof hasError == 'undefined') ? false : hasError;
+
+        this.bodyPromise = Fragment.loadFragment('calendar', 'event_form', contextId, args);
+
+        this.setBody(this.bodyPromise);
+
+        this.bodyPromise.then(function() {
+            this.enableButtons();
+            return;
+        }.bind(this))
+        .catch(Notification.exception)
+        .always(function() {
+            this.reloadingBody = false;
+            return;
+        }.bind(this));
+
+        return this.bodyPromise;
+    };
+
+    /**
+     * Reload both the title and body content.
+     *
+     * @method reloadAllContent
+     * @return {object} promise
+     */
+    ModalEventForm.prototype.reloadAllContent = function() {
+        return $.when(this.reloadTitleContent(), this.reloadBodyContent());
+    };
+
+    /**
+     * Kick off a reload the modal content before showing it. This
+     * is to allow us to re-use the same modal for creating and
+     * editing different events within the page.
+     *
+     * We do the reload when showing the modal rather than hiding it
+     * to save a request to the server if the user closes the modal
+     * and never re-opens it.
+     *
+     * @method show
+     */
+    ModalEventForm.prototype.show = function() {
+        this.reloadAllContent();
+        Modal.prototype.show.call(this);
+    };
+
+    /**
+     * Clear the event id from the modal when it's closed so
+     * that it is loaded fresh next time it's displayed.
+     *
+     * The event id will be set by the calling code if it wants
+     * to edit a specific event.
+     *
+     * @method hide
+     */
+    ModalEventForm.prototype.hide = function() {
+        Modal.prototype.hide.call(this);
+        this.setEventId(null);
+    };
+
+    /**
+     * Get the serialised form data.
+     *
+     * @method getFormData
+     * @return {string} serialised form data
+     */
+    ModalEventForm.prototype.getFormData = function() {
+        return this.getForm().serialize();
+    };
+
+    /**
+     * Send the form data to the server to create or update
+     * an event.
+     *
+     * If there is a server side validation error then we re-request the
+     * rendered form (with the data) from the server in order to get the
+     * server side errors to display.
+     *
+     * On success the modal is hidden and the page is reloaded so that the
+     * new event will display.
+     *
+     * @method save
+     * @return {object} A promise
+     */
+    ModalEventForm.prototype.save = function() {
+        var loadingContainer = this.saveButton.find(SELECTORS.LOADING_ICON_CONTAINER);
+
+        loadingContainer.removeClass('hidden');
+        this.disableButtons();
+
+        var formData = this.getFormData();
+        // Send the form data to the server for processing.
+        return Repository.submitCreateUpdateForm(formData)
+            .then(function(response) {
+                if (response.validationerror) {
+                    // If there was a server side validation error then
+                    // we need to re-request the rendered form from the server
+                    // in order to display the error for the user.
+                    return this.reloadBodyContent(formData, true);
+                } else {
+                    // No problemo! Our work here is done.
+                    this.hide();
+
+                    // Trigger the appropriate calendar event so that the view can
+                    // be updated.
+                    if (this.hasEventId()) {
+                        $('body').trigger(CalendarEvents.updated, [response.event]);
+                    } else {
+                        $('body').trigger(CalendarEvents.created, [response.event]);
+                    }
+                }
+            }.bind(this))
+            .always(function() {
+                // Regardless of success or error we should always stop
+                // the loading icon and re-enable the buttons.
+                loadingContainer.addClass('hidden');
+                this.enableButtons();
+            }.bind(this))
+            .catch(Notification.exception);
+    };
+
+    /**
+     * Set up all of the event handling for the modal.
+     *
+     * @method registerEventListeners
+     */
+    ModalEventForm.prototype.registerEventListeners = function() {
+        // Apply parent event listeners.
+        Modal.prototype.registerEventListeners.call(this);
+
+        // When the user clicks the save button we trigger the form submission. We need to
+        // trigger an actual submission because there is some JS code in the form that is
+        // listening for this event and doing some stuff (e.g. saving draft areas etc).
+        this.getModal().on(CustomEvents.events.activate, SELECTORS.SAVE_BUTTON, function(e, data) {
+            this.getForm().submit();
+            data.originalEvent.preventDefault();
+            e.stopPropagation();
+        }.bind(this));
+
+        // Catch the submit event before it is actually processed by the browser and
+        // prevent the submission. We'll take it from here.
+        this.getModal().on('submit', function(e) {
+            this.save();
+
+            // Stop the form from actually submitting and prevent it's
+            // propagation because we have already handled the event.
+            e.preventDefault();
+            e.stopPropagation();
+        }.bind(this));
+
+        // Toggle the state of the more/less button in the footer.
+        this.getModal().on(CustomEvents.events.activate, SELECTORS.MORELESS_BUTTON, function(e, data) {
+            this.toggleMoreLessButton();
+
+            data.originalEvent.preventDefault();
+            e.stopPropagation();
+        }.bind(this));
+
+        // When the event form tells us that the advanced fields are shown
+        // then the more/less button should be set to less to allow the user
+        // to hide the advanced fields.
+        this.getModal().on(EventForm.events.ADVANCED_SHOWN, function() {
+            this.setLessButton();
+        }.bind(this));
+
+        // When the event form tells us that the advanced fields are hidden
+        // then the more/less button should be set to more to allow the user
+        // to show the advanced fields.
+        this.getModal().on(EventForm.events.ADVANCED_HIDDEN, function() {
+            this.setMoreButton();
+        }.bind(this));
+    };
+
+    // Automatically register with the modal registry the first time this module is imported so that you can create modals
+    // of this type using the modal factory.
+    if (!registered) {
+        ModalRegistry.register(ModalEventForm.TYPE, ModalEventForm, 'calendar/modal_event_form');
+        registered = true;
+    }
+
+    return ModalEventForm;
+});
diff --git a/calendar/amd/src/summary_modal.js b/calendar/amd/src/summary_modal.js
index e344d62eb8e..1b44f8d5fae 100644
--- a/calendar/amd/src/summary_modal.js
+++ b/calendar/amd/src/summary_modal.js
@@ -22,8 +22,8 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 define(['jquery', 'core/str', 'core/notification', 'core/custom_interaction_events', 'core/modal',
-    'core/modal_registry', 'core/modal_factory', 'core/modal_events', 'core_calendar/calendar_repository',
-    'core_calendar/calendar_events'],
+    'core/modal_registry', 'core/modal_factory', 'core/modal_events', 'core_calendar/repository',
+    'core_calendar/events'],
     function($, Str, Notification, CustomEvents, Modal, ModalRegistry, ModalFactory, ModalEvents, CalendarRepository,
              CalendarEvents) {
 
@@ -32,7 +32,6 @@ define(['jquery', 'core/str', 'core/notification', 'core/custom_interaction_even
         ROOT: "[data-region='summary-modal-container']",
         EDIT_BUTTON: '[data-action="edit"]',
         DELETE_BUTTON: '[data-action="delete"]',
-        EVENT_LINK: '[data-action="event-link"]'
     };
 
     /**
@@ -43,11 +42,11 @@ define(['jquery', 'core/str', 'core/notification', 'core/custom_interaction_even
     var ModalEventSummary = function(root) {
         Modal.call(this, root);
 
-        if (!this.getFooter().find(SELECTORS.EDIT_BUTTON).length) {
+        if (!this.getEditButton().length) {
             Notification.exception({message: 'No edit button found'});
         }
 
-        if (!this.getFooter().find(SELECTORS.DELETE_BUTTON).length) {
+        if (!this.getDeleteButton().length) {
             Notification.exception({message: 'No delete button found'});
         }
     };
@@ -56,6 +55,48 @@ define(['jquery', 'core/str', 'core/notification', 'core/custom_interaction_even
     ModalEventSummary.prototype = Object.create(Modal.prototype);
     ModalEventSummary.prototype.constructor = ModalEventSummary;
 
+    /**
+     * Get the edit button element from the footer. The button is cached
+     * as it's not expected to change.
+     *
+     * @method getEditButton
+     * @return {object} button element
+     */
+    ModalEventSummary.prototype.getEditButton = function() {
+        if (typeof this.editButton == 'undefined') {
+            this.editButton = this.getFooter().find(SELECTORS.EDIT_BUTTON);
+        }
+
+        return this.editButton;
+    };
+
+    /**
+     * Get the delete button element from the footer. The button is cached
+     * as it's not expected to change.
+     *
+     * @method getDeleteButton
+     * @return {object} button element
+     */
+    ModalEventSummary.prototype.getDeleteButton = function() {
+        if (typeof this.deleteButton == 'undefined') {
+            this.deleteButton = this.getFooter().find(SELECTORS.DELETE_BUTTON);
+        }
+
+        return this.deleteButton;
+    };
+
+    /**
+     * Get the id for the event being shown in this modal. This value is
+     * not cached because it will change depending on which event is
+     * being displayed.
+     *
+     * @method getEventId
+     * @return {int}
+     */
+    ModalEventSummary.prototype.getEventId = function() {
+        return this.getBody().find(SELECTORS.ROOT).attr('data-event-id');
+    };
+
     /**
      * Set up all of the event handling for the modal.
      *
@@ -64,28 +105,51 @@ define(['jquery', 'core/str', 'core/notification', 'core/custom_interaction_even
     ModalEventSummary.prototype.registerEventListeners = function() {
         // Apply parent event listeners.
         Modal.prototype.registerEventListeners.call(this);
-        var confirmPromise = ModalFactory.create({
-            type: ModalFactory.types.CONFIRM,
-        }, this.getFooter().find(SELECTORS.DELETE_BUTTON)).then(function(modal) {
-            Str.get_string('confirm').then(function(languagestring) {
-                modal.setTitle(languagestring);
-            }.bind(this)).catch(Notification.exception);
+
+        var confirmPromise = ModalFactory.create(
+            { type: ModalFactory.types.CONFIRM },
+            this.getDeleteButton()
+        ).then(function(modal) {
             modal.getRoot().on(ModalEvents.yes, function() {
-                var eventId = this.getBody().find(SELECTORS.ROOT).attr('data-event-id');
-                CalendarRepository.deleteEvent(eventId).done(function() {
-                    modal.getRoot().trigger(CalendarEvents.deleted, eventId);
-                    window.location.reload();
-                }).fail(Notification.exception);
+                var eventId = this.getEventId();
+
+                CalendarRepository.deleteEvent(eventId)
+                    .then(function() {
+                        $('body').trigger(CalendarEvents.deleted, [eventId]);
+                        this.hide();
+                    }.bind(this))
+                    .catch(Notification.exception);
             }.bind(this));
+
             return modal;
         }.bind(this));
 
+        // We have to wait for the modal to finish rendering in order to ensure that
+        // the data-event-title property is available to use as the modal title.
         this.getRoot().on(ModalEvents.bodyRendered, function() {
             var eventTitle = this.getBody().find(SELECTORS.ROOT).attr('data-event-title');
             confirmPromise.then(function(modal) {
                 modal.setBody(Str.get_string('confirmeventdelete', 'core_calendar', eventTitle));
             });
         }.bind(this));
+
+        CustomEvents.define(this.getEditButton(), [
+            CustomEvents.events.activate
+        ]);
+
+        this.getEditButton().on(CustomEvents.events.activate, function(e, data) {
+            // When the edit button is clicked we fire an event for the calendar UI to handle.
+            // We don't care how the UI chooses to handle it.
+            $('body').trigger(CalendarEvents.editEvent, [this.getEventId()]);
+            // There is nothing else for us to do so let's hide.
+            this.hide();
+
+            // We've handled this event so no need to propagate it.
+            e.preventDefault();
+            e.stopPropagation();
+            data.originalEvent.preventDefault();
+            data.originalEvent.stopPropagation();
+        }.bind(this));
     };
 
     // Automatically register with the modal registry the first time this module is imported so that you can create modals
diff --git a/calendar/classes/local/event/forms/create.php b/calendar/classes/local/event/forms/create.php
new file mode 100644
index 00000000000..4003c497b0a
--- /dev/null
+++ b/calendar/classes/local/event/forms/create.php
@@ -0,0 +1,283 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * The mform for creating a calendar event. Based on the
+ * old event form.
+ *
+ * @copyright 2017 Ryan Wyllie <ryan@moodle.com>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package calendar
+ */
+namespace core_calendar\local\event\forms;
+
+defined('MOODLE_INTERNAL') || die();
+
+require_once($CFG->dirroot.'/lib/formslib.php');
+
+/**
+ * The mform class for creating a calendar event.
+ *
+ * @copyright 2017 Ryan Wyllie <ryan@moodle.com>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class create extends \moodleform {
+    /**
+     * The form definition
+     */
+    public function definition () {
+        global $PAGE;
+
+        $mform = $this->_form;
+        $haserror = !empty($this->_customdata['haserror']);
+        $eventtypes = calendar_get_all_allowed_types();
+
+        $mform->setDisableShortforms();
+        $mform->disable_form_change_checker();
+
+        // Empty string so that the element doesn't get rendered.
+        $mform->addElement('header', 'general', '');
+
+        $this->add_default_hidden_elements($mform);
+
+        // Event name field.
+        $mform->addElement('text', 'name', get_string('eventname','calendar'), 'size="50"');
+        $mform->addRule('name', get_string('required'), 'required', null, 'client');
+        $mform->setType('name', PARAM_TEXT);
+
+        // Event time start field.
+        $mform->addElement('date_time_selector', 'timestart', get_string('date'));
+
+        // Add the select elements for the available event types.
+        $this->add_event_type_elements($mform, $eventtypes);
+
+        // ********* START OF ADVANCED ELEMENTS *********.
+        // Advanced elements are not visible to the user by default. They are
+        // displayed through the user of a show more / less button.
+        $mform->addElement('editor', 'description', get_string('eventdescription','calendar'), ['rows' => 3]);
+        $mform->setType('description', PARAM_RAW);
+        $mform->setAdvanced('description');
+
+        // Add the variety of elements allowed for selecting event duration.
+        $this->add_event_duration_elements($mform);
+
+        // Add the form elements for repeating events.
+        $this->add_event_repeat_elements($mform);
+
+        // Add the javascript required to enhance this mform. Including the show/hide of advanced elements
+        // and the display of the correct select elements for chosen event types.
+        $PAGE->requires->js_call_amd('core_calendar/event_form', 'init', [$mform->getAttribute('id'), $haserror]);
+    }
+
+    /**
+     * A bit of custom validation for this form
+     *
+     * @param array $data An assoc array of field=>value
+     * @param array $files An array of files
+     * @return array
+     */
+    public function validation($data, $files) {
+        global $DB, $CFG;
+
+        $errors = parent::validation($data, $files);
+        $coursekey = isset($data['groupcourseid']) ? 'groupcourseid' : 'courseid';
+
+        if (isset($data[$coursekey]) && $data[$coursekey] > 0) {
+            if ($course = $DB->get_record('course', ['id' => $data[$coursekey]])) {
+                if ($data['timestart'] < $course->startdate) {
+                    $errors['timestart'] = get_string('errorbeforecoursestart', 'calendar');
+                }
+            } else {
+                $errors[$coursekey] = get_string('invalidcourse', 'error');
+            }
+        }
+
+        if ($data['duration'] == 1 && $data['timestart'] > $data['timedurationuntil']) {
+            $errors['durationgroup'] = get_string('invalidtimedurationuntil', 'calendar');
+        } else if ($data['duration'] == 2 && (trim($data['timedurationminutes']) == '' || $data['timedurationminutes'] < 1)) {
+            $errors['durationgroup'] = get_string('invalidtimedurationminutes', 'calendar');
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Add the list of hidden elements that should appear in this form each
+     * time. These elements will never be visible to the user.
+     *
+     * @method add_default_hidden_elements
+     * @param MoodleQuickForm $mform
+     */
+    protected function add_default_hidden_elements($mform) {
+        global $USER;
+
+        // Add some hidden fields
+        $mform->addElement('hidden', 'id');
+        $mform->setType('id', PARAM_INT);
+        $mform->setDefault('id', 0);
+
+        $mform->addElement('hidden', 'userid');
+        $mform->setType('userid', PARAM_INT);
+        $mform->setDefault('userid', $USER->id);
+
+        $mform->addElement('hidden', 'modulename');
+        $mform->setType('modulename', PARAM_INT);
+        $mform->setDefault('modulename', '');
+
+        $mform->addElement('hidden', 'instance');
+        $mform->setType('instance', PARAM_INT);
+        $mform->setDefault('instance', 0);
+
+        $mform->addElement('hidden', 'visible');
+        $mform->setType('visible', PARAM_INT);
+        $mform->setDefault('visible', 1);
+    }
+
+    /**
+     * Add the appropriate elements for the available event types.
+     *
+     * If the only event type available is 'user' then we add a hidden
+     * element because there is nothing for the user to choose.
+     *
+     * If more than one type is available then we add the elements as
+     * follows:
+     *      - Always add the event type selector
+     *      - Elements per type:
+     *          - course: add an additional select element with each
+     *                    course as an option.
+     *          - group: add a select element for the course (different
+     *                   from the above course select) and a select
+     *                   element for the group.
+     *
+     * @method add_event_type_elements
+     * @param MoodleQuickForm $mform
+     * @param array $eventtypes The available event types for the user
+     */
+    protected function add_event_type_elements($mform, $eventtypes) {
+        $options = [];
+
+        if (isset($eventtypes['user'])) {
+            $options['user'] = get_string('user');
+        }
+        if (isset($eventtypes['group'])) {
+            $options['group'] = get_string('group');
+        }
+        if (isset($eventtypes['course'])) {
+            $options['course'] = get_string('course');
+        }
+        if (isset($eventtypes['site'])) {
+            $options['site'] = get_string('site');
+        }
+
+        // If we only have one event type and it's 'user' event then don't bother
+        // rendering the select boxes because there is no choice for the user to
+        // make.
+        if (count(array_keys($eventtypes)) == 1 && isset($eventtypes['user'])) {
+            $mform->addElement('hidden', 'eventtype');
+            $mform->setType('eventtype', PARAM_TEXT);
+            $mform->setDefault('eventtype', 'user');
+
+            // Render a static element to tell the user what type of event will
+            // be created.
+            $mform->addElement('static', 'staticeventtype', get_string('eventkind', 'calendar'), $options['user']);
+            return;
+        } else {
+            $mform->addElement('select', 'eventtype', get_string('eventkind', 'calendar'), $options);
+        }
+
+        if (isset($eventtypes['course'])) {
+            $courseoptions = [];
+            foreach ($eventtypes['course'] as $course) {
+                $courseoptions[$course->id] = format_string($course->fullname, true,
+                    ['context' => \context_course::instance($course->id)]);
+            }
+
+            $mform->addElement('select', 'courseid', get_string('course'), $courseoptions);
+            $mform->disabledIf('courseid', 'eventtype', 'noteq', 'course');
+        }
+
+        if (isset($eventtypes['group'])) {
+            $courseoptions = [];
+            foreach ($eventtypes['groupcourses'] as $course) {
+                $courseoptions[$course->id] = format_string($course->fullname, true,
+                    ['context' => \context_course::instance($course->id)]);
+            }
+
+            $mform->addElement('select', 'groupcourseid', get_string('course'), $courseoptions);
+            $mform->disabledIf('groupcourseid', 'eventtype', 'noteq', 'group');
+
+            $groupoptions = [];
+            foreach ($eventtypes['group'] as $group) {
+                // We are formatting it this way in order to provide the javascript both
+                // the course and group ids so that it can enhance the form for the user.
+                $index = "{$group->courseid}-{$group->id}";
+                $groupoptions[$index] = format_string($group->name, true,
+                    ['context' => \context_course::instance($group->courseid)]);
+            }
+
+            $mform->addElement('select', 'groupid', get_string('group'), $groupoptions);
+            $mform->disabledIf('groupid', 'eventtype', 'noteq', 'group');
+        }
+    }
+
+    /**
+     * Add the various elements to express the duration options available
+     * for an event.
+     *
+     * @method add_event_duration_elements
+     * @param MoodleQuickForm $mform
+     */
+    protected function add_event_duration_elements($mform) {
+        $group = [];
+        $group[] = $mform->createElement('radio', 'duration', null, get_string('durationnone', 'calendar'), 0);
+        $group[] = $mform->createElement('radio', 'duration', null, get_string('durationuntil', 'calendar'), 1);
+        $group[] = $mform->createElement('date_time_selector', 'timedurationuntil', '');
+        $group[] = $mform->createElement('radio', 'duration', null, get_string('durationminutes', 'calendar'), 2);
+        $group[] = $mform->createElement('text', 'timedurationminutes', get_string('durationminutes', 'calendar'));
+
+        $mform->addGroup($group, 'durationgroup', get_string('eventduration', 'calendar'), '<br />', false);
+        $mform->setAdvanced('durationgroup');
+
+        $mform->disabledIf('timedurationuntil',         'duration', 'noteq', 1);
+        $mform->disabledIf('timedurationuntil[day]',    'duration', 'noteq', 1);
+        $mform->disabledIf('timedurationuntil[month]',  'duration', 'noteq', 1);
+        $mform->disabledIf('timedurationuntil[year]',   'duration', 'noteq', 1);
+        $mform->disabledIf('timedurationuntil[hour]',   'duration', 'noteq', 1);
+        $mform->disabledIf('timedurationuntil[minute]', 'duration', 'noteq', 1);
+
+        $mform->setType('timedurationminutes', PARAM_INT);
+        $mform->disabledIf('timedurationminutes','duration','noteq', 2);
+
+        $mform->setDefault('duration', 0);
+    }
+
+    /**
+     * Add the repeat elements for the form when creating a new event.
+     *
+     * @method add_event_repeat_elements
+     * @param MoodleQuickForm $mform
+     */
+    protected function add_event_repeat_elements($mform) {
+        $mform->addElement('checkbox', 'repeat', get_string('repeatevent', 'calendar'), null);
+        $mform->addElement('text', 'repeats', get_string('repeatweeksl', 'calendar'), 'maxlength="10" size="10"');
+        $mform->setType('repeats', PARAM_INT);
+        $mform->setDefault('repeats', 1);
+        $mform->disabledIf('repeats','repeat','notchecked');
+        $mform->setAdvanced('repeat');
+        $mform->setAdvanced('repeats');
+    }
+}
diff --git a/calendar/classes/local/event/forms/update.php b/calendar/classes/local/event/forms/update.php
new file mode 100644
index 00000000000..ec8905b1185
--- /dev/null
+++ b/calendar/classes/local/event/forms/update.php
@@ -0,0 +1,60 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * The mform for updating a calendar event. Based on the
+ * old event form.
+ *
+ * @copyright 2017 Ryan Wyllie <ryan@moodle.com>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package calendar
+ */
+namespace core_calendar\local\event\forms;
+
+defined('MOODLE_INTERNAL') || die();
+
+require_once($CFG->dirroot.'/lib/formslib.php');
+
+/**
+ * The mform class for updating a calendar event.
+ *
+ * @copyright 2017 Ryan Wyllie <ryan@moodle.com>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class update extends create {
+    /**
+     * Add the repeat elements for the form when editing an existing event.
+     *
+     * @method add_event_repeat_elements
+     * @param MoodleQuickForm $mform
+     * @param stdClass $event The event properties
+     */
+    protected function add_event_repeat_elements($mform) {
+        $event = $this->_customdata['event'];
+
+        $mform->addElement('hidden', 'repeatid');
+        $mform->setType('repeatid', PARAM_INT);
+
+        $group = [];
+        $group[] = $mform->createElement('radio', 'repeateditall', null, get_string('repeateditall', 'calendar', $event->eventrepeats), 1);
+        $group[] = $mform->createElement('radio', 'repeateditall', null, get_string('repeateditthis', 'calendar'), 0);
+        $mform->addGroup($group, 'repeatgroup', get_string('repeatedevents', 'calendar'), '<br />', false);
+
+        $mform->setDefault('repeateditall', 1);
+        $mform->setAdvanced('repeatgroup');
+    }
+}
diff --git a/calendar/classes/local/event/mappers/create_update_form_mapper.php b/calendar/classes/local/event/mappers/create_update_form_mapper.php
new file mode 100644
index 00000000000..00b700237b3
--- /dev/null
+++ b/calendar/classes/local/event/mappers/create_update_form_mapper.php
@@ -0,0 +1,121 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Event create form and update form mapper.
+ *
+ * @package    core_calendar
+ * @copyright  2017 Ryan Wyllie <ryan@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace core_calendar\local\event\mappers;
+
+defined('MOODLE_INTERNAL') || die();
+
+require_once($CFG->dirroot . '/calendar/lib.php');
+
+/**
+ * Event create form and update form mapper class.
+ *
+ * This class will perform the necessary data transformations to take
+ * a legacy event and build the appropriate data structure for both the
+ * create and update event forms.
+ *
+ * It will also do the reverse transformation
+ * and take the returned form data and provide a data structure that can
+ * be used to set legacy event properties.
+ *
+ * @copyright 2017 Ryan Wyllie <ryan@moodle.com>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class create_update_form_mapper implements create_update_form_mapper_interface {
+
+    /**
+     * Generate the appropriate data for the form from a legacy event.
+     *
+     * @method from_legacy_event_to_data
+     * @param calendar_event $legacyevent
+     * @return stdClass
+     */
+    public function from_legacy_event_to_data(\calendar_event $legacyevent) {
+        $legacyevent->count_repeats();
+        $data = $legacyevent->properties(true);
+        $data->timedurationuntil = $legacyevent->timestart + $legacyevent->timeduration;
+        $data->duration = (empty($legacyevent->timeduration)) ? 0 : 1;
+
+        if ($legacyevent->eventtype == 'group') {
+            // Set up the correct value for the to display on the form.
+            $data->groupid = "{$legacyevent->courseid}-{$legacyevent->groupid}";
+            $data->groupcourseid = $legacyevent->courseid;
+        }
+
+        return $data;
+    }
+
+    /**
+     * Generate the appropriate calendar_event properties from the form data.
+     *
+     * @method from_data_to_event_properties
+     * @param stdClass $data
+     * @return stdClass
+     */
+    public function from_data_to_event_properties(\stdClass $data) {
+        $properties = clone($data);
+
+        // Undo the form definition work around to allow us to have two different
+        // course selectors present depending on which event type the user selects.
+        if (isset($data->groupcourseid)) {
+            $properties->courseid = $data->groupcourseid;
+            unset($properties->groupcourseid);
+        }
+
+        // Pull the group id back out of the value. The form saves the value
+        // as "<courseid>-<groupid>" to allow the javascript to work correctly.
+        if (isset($data->groupid)) {
+            list($courseid, $groupid) = explode('-', $data->groupid);
+            $properties->groupid = $groupid;
+        }
+
+        // Default course id if none is set.
+        if (!isset($data->courseid)) {
+            $properties->courseid = 0;
+        }
+
+        // Decode the form fields back into valid event property.
+        $properties->timeduration = $this->get_time_duration_from_form_data($data);
+
+        return $properties;
+    }
+
+    /**
+     * A helper function to calculate the time duration for an event based on
+     * the event_form data.
+     *
+     * @method get_time_duration_from_form_data
+     * @param \stdClass $data event_form data
+     * @return int
+     */
+    private function get_time_duration_from_form_data(\stdClass $data) {
+        if ($data->duration == 1) {
+            return $data->timedurationuntil- $data->timestart;
+        } else if ($data->duration == 2) {
+            return $data->timedurationminutes * MINSECS;
+        } else {
+            return 0;
+        }
+    }
+}
diff --git a/calendar/classes/local/event/mappers/create_update_form_mapper_interface.php b/calendar/classes/local/event/mappers/create_update_form_mapper_interface.php
new file mode 100644
index 00000000000..16e29029aca
--- /dev/null
+++ b/calendar/classes/local/event/mappers/create_update_form_mapper_interface.php
@@ -0,0 +1,55 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Create update form mapper interface.
+ *
+ * @package    core_calendar
+ * @copyright  2017 Ryan Wyllie <ryan@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace core_calendar\local\event\mappers;
+
+defined('MOODLE_INTERNAL') || die();
+
+require_once($CFG->dirroot . '/calendar/lib.php');
+
+/**
+ * Interface for a create_update_form_mapper class
+ *
+ * @copyright  2017 Ryan Wyllie <ryan@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+interface create_update_form_mapper_interface {
+    /**
+     * Generate the appropriate data for the form from a legacy event.
+     *
+     * @method from_legacy_event_to_data
+     * @param calendar_event $legacyevent
+     * @return stdClass
+     */
+    public function from_legacy_event_to_data(\calendar_event $legacyevent);
+
+    /**
+     * Generate the appropriate calendar_event properties from the form data.
+     *
+     * @method from_data_to_event_properties
+     * @param stdClass $data
+     * @return stdClass
+     */
+    public function from_data_to_event_properties(\stdClass $data);
+}
diff --git a/calendar/externallib.php b/calendar/externallib.php
index 6fd68d4418d..5c3bdc128e9 100644
--- a/calendar/externallib.php
+++ b/calendar/externallib.php
@@ -30,6 +30,11 @@ defined('MOODLE_INTERNAL') || die;
 require_once("$CFG->libdir/externallib.php");
 
 use \core_calendar\local\api as local_api;
+use \core_calendar\local\event\container as event_container;
+use \core_calendar\local\event\forms\create as create_event_form;
+use \core_calendar\local\event\forms\update as update_event_form;
+use \core_calendar\local\event\mappers\create_update_form_mapper;
+use \core_calendar\external\event_exporter;
 use \core_calendar\external\events_exporter;
 use \core_calendar\external\events_grouped_by_course_exporter;
 use \core_calendar\external\events_related_objects_cache;
@@ -779,4 +784,90 @@ class core_calendar_external extends external_api {
             )
         );
     }
+
+    /**
+     * Returns description of method parameters.
+     *
+     * @return external_function_parameters.
+     */
+    public static function submit_create_update_form_parameters() {
+        return new external_function_parameters(
+            [
+                'formdata' => new external_value(PARAM_RAW, 'The data from the event form'),
+            ]
+        );
+    }
+
+    /**
+     * Handles the event form submission.
+     *
+     * @param string $formdata The event form data in a URI encoded param string
+     * @return array The created or modified event
+     * @throws moodle_exception
+     */
+    public static function submit_create_update_form($formdata) {
+        global $CFG, $USER, $PAGE;
+        require_once($CFG->dirroot."/calendar/lib.php");
+
+        // Parameter validation.
+        $params = self::validate_parameters(self::submit_create_update_form_parameters(), ['formdata' => $formdata]);
+        $context = \context_user::instance($USER->id);
+        $data = [];
+
+        self::validate_context($context);
+        parse_str($params['formdata'], $data);
+
+        if (!empty($data['id'])) {
+            $eventid = clean_param($data['id'], PARAM_INT);
+            $legacyevent = calendar_event::load($eventid);
+            $legacyevent->count_repeats();
+            $formoptions = ['event' => $legacyevent];
+            $mform = new update_event_form(null, $formoptions, 'post', '', null, true, $data);
+        } else {
+            $legacyevent = null;
+            $mform = new create_event_form(null, null, 'post', '', null, true, $data);
+        }
+
+        if ($validateddata = $mform->get_data()) {
+            $formmapper = new create_update_form_mapper();
+            $properties = $formmapper->from_data_to_event_properties($validateddata);
+
+            if (is_null($legacyevent)) {
+                $legacyevent = new \calendar_event($properties);
+            }
+
+            $legacyevent->update($properties);
+
+            $eventmapper = event_container::get_event_mapper();
+            $event = $eventmapper->from_legacy_event_to_event($legacyevent);
+            $cache = new events_related_objects_cache([$event]);
+            $relatedobjects = [
+                'context' => $cache->get_context($event),
+                'course' => $cache->get_course($event),
+            ];
+            $exporter = new event_exporter($event, $relatedobjects);
+            $renderer = $PAGE->get_renderer('core_calendar');
+
+            return [ 'event' => $exporter->export($renderer) ];
+        } else {
+            return [ 'validationerror' => true ];
+        }
+    }
+
+    /**
+     * Returns description of method result value.
+     *
+     * @return external_description.
+     */
+    public static function  submit_create_update_form_returns() {
+        $eventstructure = event_exporter::get_read_structure();
+        $eventstructure->required = VALUE_OPTIONAL;
+
+        return new external_single_structure(
+            array(
+                'event' => $eventstructure,
+                'validationerror' => new external_value(PARAM_BOOL, 'Invalid form data', VALUE_DEFAULT, false),
+            )
+        );
+    }
 }
diff --git a/calendar/lib.php b/calendar/lib.php
index 94e617bc1e9..2f3bdf77dd7 100644
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -2686,8 +2686,9 @@ function calendar_set_event_type_display($type, $display = null, $user = null) {
  *
  * @param stdClass $allowed list of allowed edit for event  type
  * @param stdClass|int $course object of a course or course id
+ * @param array $groups array of groups for the given course
  */
-function calendar_get_allowed_types(&$allowed, $course = null) {
+function calendar_get_allowed_types(&$allowed, $course = null, $groups = null) {
     global $USER, $DB;
 
     $allowed = new \stdClass();
@@ -2695,6 +2696,23 @@ function calendar_get_allowed_types(&$allowed, $course = null) {
     $allowed->groups = false;
     $allowed->courses = false;
     $allowed->site = has_capability('moodle/calendar:manageentries', \context_course::instance(SITEID));
+    $getgroupsfunc = function($course, $context, $user) use ($groups) {
+        if ($course->groupmode != NOGROUPS || !$course->groupmodeforce) {
+            if (has_capability('moodle/site:accessallgroups', $context)) {
+                return is_null($groups) ? groups_get_all_groups($course->id) : $groups;
+            } else {
+                if (is_null($groups)) {
+                    return groups_get_all_groups($course->id, $user->id);
+                } else {
+                    return array_filter($groups, function($group) use ($user) {
+                        return isset($group->members[$user->id]);
+                    });
+                }
+            }
+        }
+
+        return false;
+    };
 
     if (!empty($course)) {
         if (!is_object($course)) {
@@ -2706,27 +2724,84 @@ function calendar_get_allowed_types(&$allowed, $course = null) {
 
             if (has_capability('moodle/calendar:manageentries', $coursecontext)) {
                 $allowed->courses = array($course->id => 1);
-
-                if ($course->groupmode != NOGROUPS || !$course->groupmodeforce) {
-                    if (has_capability('moodle/site:accessallgroups', $coursecontext)) {
-                        $allowed->groups = groups_get_all_groups($course->id);
-                    } else {
-                        $allowed->groups = groups_get_all_groups($course->id, $USER->id);
-                    }
-                }
+                $allowed->groups = $getgroupsfunc($course, $coursecontext, $USER);
             } else if (has_capability('moodle/calendar:managegroupentries', $coursecontext)) {
-                if ($course->groupmode != NOGROUPS || !$course->groupmodeforce) {
-                    if (has_capability('moodle/site:accessallgroups', $coursecontext)) {
-                        $allowed->groups = groups_get_all_groups($course->id);
-                    } else {
-                        $allowed->groups = groups_get_all_groups($course->id, $USER->id);
-                    }
-                }
+                $allowed->groups = $getgroupsfunc($course, $coursecontext, $USER);
             }
         }
     }
 }
 
+/**
+ * Get all of the allowed types for all of the courses and groups
+ * the logged in user belongs to.
+ *
+ * The returned array will optionally have 5 keys:
+ *      'user' : true if the logged in user can create user events
+ *      'site' : true if the logged in user can create site events
+ *      'course' : array of courses that the user can create events for
+ *      'group': array of groups that the user can create events for
+ *      'groupcourses' : array of courses that the groups belong to (can
+ *                       be different from the list in 'course'.
+ *
+ * @param array The available types for the logged in user
+ */
+function calendar_get_all_allowed_types() {
+    global $CFG, $USER;
+
+    require_once($CFG->libdir . '/enrollib.php');
+
+    $types = [];
+
+    calendar_get_allowed_types($allowed);
+
+    if ($allowed->user) {
+        $types['user'] = true;
+    }
+
+    if ($allowed->site) {
+        $types['site'] = true;
+    }
+
+    // This function warms the context cache for the course so the calls
+    // to load the course context in calendar_get_allowed_types don't result
+    // in additional DB queries.
+    $courses = enrol_get_users_courses($USER->id, true);
+    // We want to pre-fetch all of the groups for each course in a single
+    // query to avoid calendar_get_allowed_types from hitting the DB for
+    // each separate course.
+    $groups = groups_get_all_groups_for_courses($courses);
+
+    foreach ($courses as $course) {
+        $coursegroups = isset($groups[$course->id]) ? $groups[$course->id] : null;
+        calendar_get_allowed_types($allowed, $course, $coursegroups);
+
+        if (!empty($allowed->courses)) {
+            if (!isset($types['course'])) {
+                $types['course'] = [$course];
+            } else {
+                $types['course'][] = $course;
+            }
+        }
+
+        if (!empty($allowed->groups)) {
+            if (!isset($types['groupcourses'])) {
+                $types['groupcourses'] = [$course];
+            } else {
+                $types['groupcourses'][] = $course;
+            }
+
+            if (!isset($types['group'])) {
+                $types['group'] = array_values($allowed->groups);
+            } else {
+                $types['group'] = array_merge($types['group'], array_values($allowed->groups));
+            }
+        }
+    }
+
+    return $types;
+}
+
 /**
  * See if user can add calendar entries at all used to print the "New Event" button.
  *
@@ -3340,3 +3415,70 @@ function calendar_get_legacy_events($tstart, $tend, $users, $groups, $courses, $
         return $carry + [$event->get_id() => $mapper->from_event_to_stdclass($event)];
     }, []);
 }
+
+function calendar_output_fragment_event_form($args) {
+    global $CFG, $OUTPUT;
+    require_once($CFG->dirroot.'/calendar/event_form.php');
+
+    $html = '';
+    $data = null;
+    $eventid = isset($args['eventid']) ? clean_param($args['eventid'], PARAM_INT) : null;
+    $event = null;
+    $hasformdata = isset($args['formdata']) && !empty($args['formdata']);
+    $formoptions = [];
+
+    if ($hasformdata) {
+        parse_str(clean_param($args['formdata'], PARAM_TEXT), $data);
+    }
+
+    if (isset($args['haserror'])) {
+        $formoptions['haserror'] = clean_param($args['haserror'], PARAM_BOOL);
+    }
+
+    if (is_null($eventid)) {
+        $mform = new \core_calendar\local\event\forms\create(
+            null,
+            $formoptions,
+            'post',
+            '',
+            null,
+            true,
+            $data
+        );
+    } else {
+        $event = calendar_event::load($eventid);
+        $event->count_repeats();
+        $formoptions['event'] = $event;
+        $mform = new \core_calendar\local\event\forms\update(
+            null,
+            $formoptions,
+            'post',
+            '',
+            null,
+            true,
+            $data
+        );
+    }
+
+    if ($hasformdata) {
+        $mform->is_validated();
+    } else if (!is_null($event)) {
+        $mapper = new \core_calendar\local\event\mappers\create_update_form_mapper();
+        $data = $mapper->from_legacy_event_to_data($event);
+        $mform->set_data($data);
+
+        // Check to see if this event is part of a subscription or import.
+        // If so display a warning on edit.
+        if (isset($event->subscriptionid) && ($event->subscriptionid != null)) {
+            $renderable = new \core\output\notification(
+                get_string('eventsubscriptioneditwarning', 'calendar'),
+                \core\output\notification::NOTIFY_INFO
+            );
+
+            $html .= $OUTPUT->render($renderable);
+        }
+    }
+
+    $html .= $mform->render();
+    return $html;
+}
diff --git a/calendar/renderer.php b/calendar/renderer.php
index ee450e1724d..940be31519d 100644
--- a/calendar/renderer.php
+++ b/calendar/renderer.php
@@ -142,18 +142,13 @@ class core_calendar_renderer extends plugin_renderer_base {
             $time = time();
         }
 
-        $output = html_writer::start_tag('div', array('class'=>'buttons'));
-        $output .= html_writer::start_tag('form', array('action' => CALENDAR_URL . 'event.php', 'method' => 'get'));
-        $output .= html_writer::start_tag('div');
-        $output .= html_writer::empty_tag('input', array('type'=>'hidden', 'name' => 'action', 'value' => 'new'));
-        $output .= html_writer::empty_tag('input', array('type'=>'hidden', 'name' => 'course', 'value' => $courseid));
-        $output .= html_writer::empty_tag('input', array('type'=>'hidden', 'name' => 'time', 'value' => $time));
-        $attributes = array('type' => 'submit', 'value' => get_string('newevent', 'calendar'), 'class' => 'btn btn-secondary');
-        $output .= html_writer::empty_tag('input', $attributes);
-        $output .= html_writer::end_tag('div');
-        $output .= html_writer::end_tag('form');
-        $output .= html_writer::end_tag('div');
-        return $output;
+        $coursecontext = \context_course::instance($courseid);
+        $attributes = [
+            'class' => 'btn btn-secondary pull-xs-right pull-right',
+            'data-context-id' => $coursecontext->id,
+            'data-action' => 'new-event-button'
+        ];
+        return html_writer::tag('button', get_string('newevent', 'calendar'), $attributes);
     }
 
     /**
diff --git a/calendar/templates/modal_event_form.mustache b/calendar/templates/modal_event_form.mustache
new file mode 100644
index 00000000000..e99c4910dcc
--- /dev/null
+++ b/calendar/templates/modal_event_form.mustache
@@ -0,0 +1,61 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template calendar/modal_event_form
+
+    Moodle modal template with save and cancel buttons.
+
+    The purpose of this template is to render a modal.
+
+    Classes required for JS:
+    * none
+
+    Data attributes required for JS:
+    * none
+
+    Context variables required for this template:
+    * title A cleaned string (use clean_text()) to display.
+    * body HTML content for the boday
+
+    Example context (json):
+    {
+        "title": "Example save cancel modal",
+        "body": "Some example content for the body"
+    }
+}}
+
+{{< core/modal }}
+    {{$footer}}
+        <button type="button"
+                class="btn btn-secondary"
+                data-collapsed="true"
+                data-action="more-less-toggle">
+
+            {{#str}} more, calendar {{/str}}
+        </button>
+        <button type="button"
+                class="btn btn-primary"
+                data-context-id="{{contextid}}"
+                data-action="save">
+
+            {{#str}} save {{/str}}
+            <span class="hidden" data-region="loading-icon-container">
+                {{> core/loading }}
+            </span>
+        </button>
+    {{/footer}}
+{{/ core/modal }}
diff --git a/calendar/tests/lib_test.php b/calendar/tests/lib_test.php
index 2f627ede6e5..23efe023f0d 100644
--- a/calendar/tests/lib_test.php
+++ b/calendar/tests/lib_test.php
@@ -409,4 +409,267 @@ class core_calendar_lib_testcase extends advanced_testcase {
         $events = calendar_get_legacy_events($timestart, $timeend, true, true, true);
         $this->assertCount(3, $events);
     }
-}
\ No newline at end of file
+
+    public function test_calendar_get_all_allowed_types_no_types() {
+        $generator = $this->getDataGenerator();
+        $user = $generator->create_user();
+        $systemcontext = context_system::instance();
+        $sitecontext = context_course::instance(SITEID);
+        $roleid = $generator->create_role();
+
+        $generator->role_assign($roleid, $user->id, $systemcontext->id);
+        $generator->role_assign($roleid, $user->id, $sitecontext->id);
+        $this->setUser($user);
+
+        assign_capability('moodle/calendar:manageentries', CAP_PROHIBIT, $roleid, $sitecontext, true);
+        assign_capability('moodle/calendar:manageownentries', CAP_PROHIBIT, $roleid, $systemcontext, true);
+
+        $types = calendar_get_all_allowed_types();
+        $this->assertEmpty($types);
+    }
+
+    public function test_calendar_get_all_allowed_types_user() {
+        $generator = $this->getDataGenerator();
+        $user = $generator->create_user();
+        $context = context_system::instance();
+        $roleid = $generator->create_role();
+
+        $generator->role_assign($roleid, $user->id, $context->id);
+        $this->setUser($user);
+
+        assign_capability('moodle/calendar:manageownentries', CAP_ALLOW, $roleid, $context, true);
+
+        $types = calendar_get_all_allowed_types();
+        $this->assertTrue($types['user']);
+
+        assign_capability('moodle/calendar:manageownentries', CAP_PROHIBIT, $roleid, $context, true);
+
+        $types = calendar_get_all_allowed_types();
+        $this->assertArrayNotHasKey('user', $types);
+    }
+
+    public function test_calendar_get_all_allowed_types_site() {
+        $generator = $this->getDataGenerator();
+        $user = $generator->create_user();
+        $context = context_course::instance(SITEID);
+        $roleid = $generator->create_role();
+
+        $generator->role_assign($roleid, $user->id, $context->id);
+        $this->setUser($user);
+
+        assign_capability('moodle/calendar:manageentries', CAP_ALLOW, $roleid, $context, true);
+
+        $types = calendar_get_all_allowed_types();
+        $this->assertTrue($types['site']);
+
+        assign_capability('moodle/calendar:manageentries', CAP_PROHIBIT, $roleid, $context, true);
+
+        $types = calendar_get_all_allowed_types();
+        $this->assertArrayNotHasKey('site', $types);
+    }
+
+    public function test_calendar_get_all_allowed_types_course() {
+        $generator = $this->getDataGenerator();
+        $user = $generator->create_user();
+        $course1 = $generator->create_course(); // Has capability.
+        $course2 = $generator->create_course(); // Doesn't have capability.
+        $course3 = $generator->create_course(); // Not enrolled.
+        $context1 = context_course::instance($course1->id);
+        $context2 = context_course::instance($course2->id);
+        $context3 = context_course::instance($course3->id);
+        $roleid = $generator->create_role();
+        $contexts = [$context1, $context2, $context3];
+        $enrolledcourses = [$course1, $course2];
+
+        foreach ($enrolledcourses as $course) {
+            $generator->enrol_user($user->id, $course->id, 'student');
+        }
+
+        foreach ($contexts as $context) {
+            $generator->role_assign($roleid, $user->id, $context->id);
+        }
+
+        $this->setUser($user);
+
+        assign_capability('moodle/calendar:manageentries', CAP_ALLOW, $roleid, $context1, true);
+        assign_capability('moodle/calendar:manageentries', CAP_PROHIBIT, $roleid, $context2, true);
+
+        // The user only has the correct capability in course 1 so that is the only
+        // one that should be in the results.
+        $types = calendar_get_all_allowed_types();
+        $typecourses = $types['course'];
+        $this->assertCount(1, $typecourses);
+        $this->assertEquals($course1->id, $typecourses[0]->id);
+
+        assign_capability('moodle/calendar:manageentries', CAP_ALLOW, $roleid, $context2, true);
+
+        // The user only now has the correct capability in both course 1 and 2 so we
+        // expect both to be in the results.
+        $types = calendar_get_all_allowed_types();
+        $typecourses = $types['course'];
+        // Sort the results by id ascending to ensure the test is consistent
+        // and repeatable.
+        usort($typecourses, function($a, $b) {
+            $aid = $a->id;
+            $bid = $b->id;
+
+            if ($aid == $bid) {
+                return 0;
+            }
+            return ($aid < $bid) ? -1 : 1;
+        });
+
+        $this->assertCount(2, $typecourses);
+        $this->assertEquals($course1->id, $typecourses[0]->id);
+        $this->assertEquals($course2->id, $typecourses[1]->id);
+    }
+
+    public function test_calendar_get_all_allowed_types_group_no_groups() {
+        $generator = $this->getDataGenerator();
+        $user = $generator->create_user();
+        $course = $generator->create_course();
+        $context = context_course::instance($course->id);
+        $roleid = $generator->create_role();
+
+        $generator->enrol_user($user->id, $course->id, 'student');
+        $generator->role_assign($roleid, $user->id, $context->id);
+
+        $this->setUser($user);
+
+        assign_capability('moodle/calendar:manageentries', CAP_ALLOW, $roleid, $context, true);
+
+        // The user has the correct capability in the course but there are
+        // no groups so we shouldn't see a group type.
+        $types = calendar_get_all_allowed_types();
+        $typecourses = $types['course'];
+        $this->assertCount(1, $typecourses);
+        $this->assertEquals($course->id, $typecourses[0]->id);
+        $this->assertArrayNotHasKey('group', $types);
+        $this->assertArrayNotHasKey('groupcourses', $types);
+    }
+
+    public function test_calendar_get_all_allowed_types_group_no_acces_to_diff_groups() {
+        $generator = $this->getDataGenerator();
+        $user = $generator->create_user();
+        $course = $generator->create_course();
+        $context = context_course::instance($course->id);
+        $group1 = $generator->create_group(array('courseid' => $course->id));
+        $group2 = $generator->create_group(array('courseid' => $course->id));
+        $roleid = $generator->create_role();
+
+        $generator->enrol_user($user->id, $course->id, 'student');
+        $generator->role_assign($roleid, $user->id, $context->id);
+
+        $this->setUser($user);
+
+        assign_capability('moodle/calendar:manageentries', CAP_ALLOW, $roleid, $context, true);
+        assign_capability('moodle/site:accessallgroups', CAP_PROHIBIT, $roleid, $context, true);
+
+        // The user has the correct capability in the course but they aren't a member
+        // of any of the groups and don't have the accessallgroups capability.
+        $types = calendar_get_all_allowed_types();
+        $typecourses = $types['course'];
+        $this->assertCount(1, $typecourses);
+        $this->assertEquals($course->id, $typecourses[0]->id);
+        $this->assertArrayNotHasKey('group', $types);
+        $this->assertArrayNotHasKey('groupcourses', $types);
+    }
+
+    public function test_calendar_get_all_allowed_types_group_access_all_groups() {
+        $generator = $this->getDataGenerator();
+        $user = $generator->create_user();
+        $course1 = $generator->create_course();
+        $course2 = $generator->create_course();
+        $context1 = context_course::instance($course1->id);
+        $context2 = context_course::instance($course2->id);
+        $group1 = $generator->create_group(array('courseid' => $course1->id));
+        $group2 = $generator->create_group(array('courseid' => $course1->id));
+        $roleid = $generator->create_role();
+
+        $generator->enrol_user($user->id, $course1->id, 'student');
+        $generator->enrol_user($user->id, $course2->id, 'student');
+        $generator->role_assign($roleid, $user->id, $context1->id);
+        $generator->role_assign($roleid, $user->id, $context2->id);
+
+        $this->setUser($user);
+
+        assign_capability('moodle/calendar:manageentries', CAP_ALLOW, $roleid, $context1, true);
+        assign_capability('moodle/calendar:manageentries', CAP_ALLOW, $roleid, $context2, true);
+        assign_capability('moodle/site:accessallgroups', CAP_ALLOW, $roleid, $context1, true);
+        assign_capability('moodle/site:accessallgroups', CAP_ALLOW, $roleid, $context2, true);
+
+        // The user has the correct capability in the course and has
+        // the accessallgroups capability.
+        $types = calendar_get_all_allowed_types();
+        $typecourses = $types['course'];
+        $typegroups = $types['group'];
+        $typegroupcourses = $types['groupcourses'];
+        $idascfunc = function($a, $b) {
+            $aid = $a->id;
+            $bid = $b->id;
+
+            if ($aid == $bid) {
+                return 0;
+            }
+            return ($aid < $bid) ? -1 : 1;
+        };
+        // Sort the results by id ascending to ensure the test is consistent
+        // and repeatable.
+        usort($typecourses, $idascfunc);
+        usort($typegroups, $idascfunc);
+
+        $this->assertCount(2, $typecourses);
+        $this->assertEquals($course1->id, $typecourses[0]->id);
+        $this->assertEquals($course2->id, $typecourses[1]->id);
+        $this->assertCount(1, $typegroupcourses);
+        $this->assertEquals($course1->id, $typegroupcourses[0]->id);
+        $this->assertCount(2, $typegroups);
+        $this->assertEquals($group1->id, $typegroups[0]->id);
+        $this->assertEquals($group2->id, $typegroups[1]->id);
+    }
+
+    public function test_calendar_get_all_allowed_types_group_no_access_all_groups() {
+        $generator = $this->getDataGenerator();
+        $user = $generator->create_user();
+        $course = $generator->create_course();
+        $context = context_course::instance($course->id);
+        $group1 = $generator->create_group(array('courseid' => $course->id));
+        $group2 = $generator->create_group(array('courseid' => $course->id));
+        $group3 = $generator->create_group(array('courseid' => $course->id));
+        $roleid = $generator->create_role();
+
+        $generator->enrol_user($user->id, $course->id, 'student');
+        $generator->role_assign($roleid, $user->id, $context->id);
+        $generator->create_group_member(array('groupid' => $group1->id, 'userid' => $user->id));
+        $generator->create_group_member(array('groupid' => $group2->id, 'userid' => $user->id));
+
+        $this->setUser($user);
+
+        assign_capability('moodle/calendar:manageentries', CAP_ALLOW, $roleid, $context, true);
+        assign_capability('moodle/site:accessallgroups', CAP_PROHIBIT, $roleid, $context, true);
+
+        // The user has the correct capability in the course but can't access
+        // groups that they are not a member of.
+        $types = calendar_get_all_allowed_types();
+        $typegroups = $types['group'];
+        $typegroupcourses = $types['groupcourses'];
+        $idascfunc = function($a, $b) {
+            $aid = $a->id;
+            $bid = $b->id;
+
+            if ($aid == $bid) {
+                return 0;
+            }
+            return ($aid < $bid) ? -1 : 1;
+        };
+        // Sort the results by id ascending to ensure the test is consistent
+        // and repeatable.
+        usort($typegroups, $idascfunc);
+
+        $this->assertCount(1, $typegroupcourses);
+        $this->assertEquals($course->id, $typegroupcourses[0]->id);
+        $this->assertCount(2, $typegroups);
+        $this->assertEquals($group1->id, $typegroups[0]->id);
+        $this->assertEquals($group2->id, $typegroups[1]->id);
+    }
+}
diff --git a/lang/en/calendar.php b/lang/en/calendar.php
index 5fca2dcad56..60b807531a4 100644
--- a/lang/en/calendar.php
+++ b/lang/en/calendar.php
@@ -149,6 +149,7 @@ $string['importfrominstructions'] = 'Please provide either a URL to a remote cal
 $string['invalidtimedurationminutes'] = 'The duration in minutes you have entered is invalid. Please enter the duration in minutes greater than 0 or select no duration.';
 $string['invalidtimedurationuntil'] = 'The date and time you selected for duration until is before the start time of the event. Please correct this before proceeding.';
 $string['iwanttoexport'] = 'Export';
+$string['less'] = 'Less';
 $string['managesubscriptions'] = 'Manage subscriptions';
 $string['manyevents'] = '{$a} events';
 $string['mon'] = 'Mon';
@@ -157,6 +158,7 @@ $string['monthly'] = 'Monthly';
 $string['monthlyview'] = 'Monthly view';
 $string['monthnext'] = 'Next month';
 $string['monththis'] = 'This month';
+$string['more'] = 'More';
 $string['namewithsource'] = '{$a->name}({$a->source})';
 $string['never'] = 'Never';
 $string['newevent'] = 'New event';
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 6f54a708ae0..5edcbfccd1b 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -1627,6 +1627,7 @@ $string['rsserrorauth'] = 'Your RSS link does not contain a valid authentication
 $string['rsserrorguest'] = 'This feed uses guest access to access the data, but guest does not have permission to read the data. Visit the original location that this feed comes from (URL) as a valid user and get a new RSS link from there.';
 $string['rsskeyshelp'] = '<p>To ensure security and privacy, RSS feed URLs contain a special token that identifies the user they are for. This prevents other users from accessing areas of the site where they are not allowed.</p><p>The token is automatically created the first time you access an area that produces an RSS feed. If you think that your RSS feed token has been compromised, you can request a new one by clicking the reset link. Please note that your current RSS feed URLs will then become invalid.</p>';
 $string['rsstype'] = 'RSS feed for this activity';
+$string['save'] = 'Save';
 $string['saveandnext'] = 'Save and show next';
 $string['savedat'] = 'Saved at:';
 $string['savechanges'] = 'Save changes';
diff --git a/lib/db/services.php b/lib/db/services.php
index 14385ae6628..909b7fafccd 100644
--- a/lib/db/services.php
+++ b/lib/db/services.php
@@ -126,6 +126,15 @@ $functions = array(
         'ajax' => true,
         'services' => array(MOODLE_OFFICIAL_MOBILE_SERVICE),
     ),
+    'core_calendar_submit_create_update_form' => array(
+        'classname' => 'core_calendar_external',
+        'methodname' => 'submit_create_update_form',
+        'description' => 'Submit form data for event form',
+        'classpath' => 'calendar/externallib.php',
+        'type' => 'write',
+        'capabilities' => 'moodle/calendar:manageentries, moodle/calendar:manageownentries, moodle/calendar:managegroupentries',
+        'ajax' => true,
+    ),
     'core_cohort_add_cohort_members' => array(
         'classname' => 'core_cohort_external',
         'methodname' => 'add_cohort_members',
diff --git a/lib/grouplib.php b/lib/grouplib.php
index 08bee9a2be1..25d1e962f30 100644
--- a/lib/grouplib.php
+++ b/lib/grouplib.php
@@ -294,6 +294,150 @@ function groups_get_all_groups($courseid, $userid=0, $groupingid=0, $fields='g.*
     return $results;
 }
 
+/**
+ * Gets array of all groups in a set of course.
+ *
+ * @category group
+ * @param array $courses Array of course objects or course ids.
+ * @return array Array of groups indexed by course id.
+ */
+function groups_get_all_groups_for_courses($courses) {
+    global $DB;
+
+    if (empty($courses)) {
+        return [];
+    }
+
+    $groups = [];
+    $courseids = [];
+
+    foreach ($courses as $course) {
+        $courseid = is_object($course) ? $course->id : $course;
+        $groups[$courseid] = [];
+        $courseids[] = $courseid;
+    }
+
+    $groupfields = [
+        'g.id as gid',
+        'g.courseid',
+        'g.idnumber',
+        'g.name',
+        'g.description',
+        'g.descriptionformat',
+        'g.enrolmentkey',
+        'g.picture',
+        'g.hidepicture',
+        'g.timecreated',
+        'g.timemodified'
+    ];
+
+    $groupsmembersfields = [
+        'gm.id as gmid',
+        'gm.groupid',
+        'gm.userid',
+        'gm.timeadded',
+        'gm.component',
+        'gm.itemid'
+    ];
+
+    $concatidsql = $DB->sql_concat_join("'-'", ['g.id', 'COALESCE(gm.id, 0)']) . ' AS uniqid';
+    list($courseidsql, $params) = $DB->get_in_or_equal($courseids);
+    $groupfieldssql = implode(',', $groupfields);
+    $groupmembersfieldssql = implode(',', $groupsmembersfields);
+    $sql = "SELECT {$concatidsql}, {$groupfieldssql}, {$groupmembersfieldssql}
+              FROM {groups} g
+         LEFT JOIN {groups_members} gm
+                ON gm.groupid = g.id
+             WHERE g.courseid {$courseidsql}";
+
+    $results = $DB->get_records_sql($sql, $params);
+
+    // The results will come back as a flat dataset thanks to the left
+    // join so we will need to do some post processing to blow it out
+    // into a more useable data structure.
+    //
+    // This loop will extract the distinct groups from the result set
+    // and add it's list of members to the object as a property called
+    // 'members'. Then each group will be added to the result set indexed
+    // by it's course id.
+    //
+    // The resulting data structure for $groups should be:
+    // $groups = [
+    //      '1' = [
+    //          '1' => (object) [
+    //              'id' => 1,
+    //              <rest of group properties>
+    //              'members' => [
+    //                  '1' => (object) [
+    //                      <group member properties>
+    //                  ],
+    //                  '2' => (object) [
+    //                      <group member properties>
+    //                  ]
+    //              ]
+    //          ],
+    //          '2' => (object) [
+    //              'id' => 2,
+    //              <rest of group properties>
+    //              'members' => [
+    //                  '1' => (object) [
+    //                      <group member properties>
+    //                  ],
+    //                  '3' => (object) [
+    //                      <group member properties>
+    //                  ]
+    //              ]
+    //          ]
+    //      ]
+    // ]
+    foreach ($results as $key => $result) {
+        $groupid = $result->gid;
+        $courseid = $result->courseid;
+        $coursegroups = $groups[$courseid];
+        $groupsmembersid = $result->gmid;
+        $reducefunc = function($carry, $field) use ($result) {
+            // Iterate over the groups properties and pull
+            // them out into a separate object.
+            list($prefix, $field) = explode('.', $field);
+
+            if (property_exists($result, $field)) {
+                $carry[$field] = $result->{$field};
+            }
+
+            return $carry;
+        };
+
+        if (isset($coursegroups[$groupid])) {
+            $group = $coursegroups[$groupid];
+        } else {
+            $initial = [
+                'id' => $groupid,
+                'members' => []
+            ];
+            $group = (object) array_reduce(
+                $groupfields,
+                $reducefunc,
+                $initial
+            );
+        }
+
+        if (!empty($groupsmembersid)) {
+            $initial = ['id' => $groupsmembersid];
+            $groupsmembers = (object) array_reduce(
+                $groupsmembersfields,
+                $reducefunc,
+                $initial
+            );
+
+            $group->members[$groupsmembers->userid] = $groupsmembers;
+        }
+
+        $coursegroups[$groupid] = $group;
+        $groups[$courseid] = $coursegroups;
+    }
+
+    return $groups;
+}
 
 /**
  * Gets array of all groups in current user.
diff --git a/lib/tests/grouplib_test.php b/lib/tests/grouplib_test.php
index f9bfbeeea88..4679db6fcdf 100644
--- a/lib/tests/grouplib_test.php
+++ b/lib/tests/grouplib_test.php
@@ -1547,4 +1547,148 @@ class core_grouplib_testcase extends advanced_testcase {
         $this->assertCount(2, $members);    // Now I see members of group 3.
         $this->assertEquals([$user1->id, $user3->id], array_keys($members), '', 0.0, 10, true);
     }
+
+    public function test_groups_get_all_groups_for_courses_no_courses() {
+        $this->resetAfterTest(true);
+        $generator = $this->getDataGenerator();
+
+        $this->assertEquals([], groups_get_all_groups_for_courses([]));
+    }
+
+    public function test_groups_get_all_groups_for_courses_with_courses() {
+        $this->resetAfterTest(true);
+        $generator = $this->getDataGenerator();
+
+        // Create courses.
+        $course1 = $generator->create_course(); // no groups.
+        $course2 = $generator->create_course(); // one group, no members.
+        $course3 = $generator->create_course(); // one group, one member.
+        $course4 = $generator->create_course(); // one group, multiple members.
+        $course5 = $generator->create_course(); // two groups, no members.
+        $course6 = $generator->create_course(); // two groups, one member.
+        $course7 = $generator->create_course(); // two groups, multiple members.
+
+        $courses = [$course1, $course2, $course3, $course4, $course5, $course6, $course7];
+        // Create users.
+        $user1 = $generator->create_user();
+        $user2 = $generator->create_user();
+        $user3 = $generator->create_user();
+        $user4 = $generator->create_user();
+
+        // Enrol users.
+        foreach ($courses as $course) {
+            $generator->enrol_user($user1->id, $course->id);
+            $generator->enrol_user($user2->id, $course->id);
+            $generator->enrol_user($user3->id, $course->id);
+            $generator->enrol_user($user4->id, $course->id);
+        }
+
+        // Create groups.
+        $group1 = $generator->create_group(array('courseid' => $course2->id)); // no members.
+        $group2 = $generator->create_group(array('courseid' => $course3->id)); // one member.
+        $group3 = $generator->create_group(array('courseid' => $course4->id)); // multiple members.
+        $group4 = $generator->create_group(array('courseid' => $course5->id)); // no members.
+        $group5 = $generator->create_group(array('courseid' => $course5->id)); // no members.
+        $group6 = $generator->create_group(array('courseid' => $course6->id)); // one member.
+        $group7 = $generator->create_group(array('courseid' => $course6->id)); // one member.
+        $group8 = $generator->create_group(array('courseid' => $course7->id)); // multiple members.
+        $group9 = $generator->create_group(array('courseid' => $course7->id)); // multiple members.
+
+        // Assign users to groups.
+        $generator->create_group_member(array('groupid' => $group2->id, 'userid' => $user1->id));
+        $generator->create_group_member(array('groupid' => $group3->id, 'userid' => $user1->id));
+        $generator->create_group_member(array('groupid' => $group3->id, 'userid' => $user2->id));
+        $generator->create_group_member(array('groupid' => $group6->id, 'userid' => $user1->id));
+        $generator->create_group_member(array('groupid' => $group7->id, 'userid' => $user1->id));
+        $generator->create_group_member(array('groupid' => $group8->id, 'userid' => $user1->id));
+        $generator->create_group_member(array('groupid' => $group8->id, 'userid' => $user2->id));
+        $generator->create_group_member(array('groupid' => $group9->id, 'userid' => $user1->id));
+        $generator->create_group_member(array('groupid' => $group9->id, 'userid' => $user2->id));
+
+        $result = groups_get_all_groups_for_courses($courses);
+        $assertPropertiesMatch = function($expected, $actual) {
+            $props = get_object_vars($expected);
+
+            foreach ($props as $name => $val) {
+                $got = $actual->{$name};
+                $this->assertEquals(
+                    $val,
+                    $actual->{$name},
+                    "Failed asserting that {$got} equals {$val} for property {$name}"
+                );
+            }
+        };
+
+        // Course 1 has no groups.
+        $this->assertEquals([], $result[$course1->id]);
+
+        // Course 2 has one group with no members.
+        $coursegroups = $result[$course2->id];
+        $coursegroup = $coursegroups[$group1->id];
+        $this->assertCount(1, $coursegroups);
+        $this->assertEquals([], $coursegroup->members);
+        $assertPropertiesMatch($group1, $coursegroup);
+
+        // Course 3 has one group with one member.
+        $coursegroups = $result[$course3->id];
+        $coursegroup = $coursegroups[$group2->id];
+        $groupmember1 = $coursegroup->members[$user1->id];
+        $this->assertCount(1, $coursegroups);
+        $this->assertCount(1, $coursegroup->members);
+        $assertPropertiesMatch($group2, $coursegroup);
+        $this->assertEquals($user1->id, $groupmember1->userid);
+
+        // Course 4 has one group with multiple members.
+        $coursegroups = $result[$course4->id];
+        $coursegroup = $coursegroups[$group3->id];
+        $groupmember1 = $coursegroup->members[$user1->id];
+        $groupmember2 = $coursegroup->members[$user2->id];
+        $this->assertCount(1, $coursegroups);
+        $this->assertCount(2, $coursegroup->members);
+        $assertPropertiesMatch($group3, $coursegroup);
+        $this->assertEquals($user1->id, $groupmember1->userid);
+        $this->assertEquals($user2->id, $groupmember2->userid);
+
+        // Course 5 has multiple groups with no members.
+        $coursegroups = $result[$course5->id];
+        $coursegroup1 = $coursegroups[$group4->id];
+        $coursegroup2 = $coursegroups[$group5->id];
+        $this->assertCount(2, $coursegroups);
+        $this->assertEquals([], $coursegroup1->members);
+        $this->assertEquals([], $coursegroup2->members);
+        $assertPropertiesMatch($group4, $coursegroup1);
+        $assertPropertiesMatch($group5, $coursegroup2);
+
+        // Course 6 has multiple groups with one member.
+        $coursegroups = $result[$course6->id];
+        $coursegroup1 = $coursegroups[$group6->id];
+        $coursegroup2 = $coursegroups[$group7->id];
+        $group1member1 = $coursegroup1->members[$user1->id];
+        $group2member1 = $coursegroup2->members[$user1->id];
+        $this->assertCount(2, $coursegroups);
+        $this->assertCount(1, $coursegroup1->members);
+        $this->assertCount(1, $coursegroup2->members);
+        $assertPropertiesMatch($group6, $coursegroup1);
+        $assertPropertiesMatch($group7, $coursegroup2);
+        $this->assertEquals($user1->id, $group1member1->userid);
+        $this->assertEquals($user1->id, $group2member1->userid);
+
+        // Course 7 has multiple groups with multiple members.
+        $coursegroups = $result[$course7->id];
+        $coursegroup1 = $coursegroups[$group8->id];
+        $coursegroup2 = $coursegroups[$group9->id];
+        $group1member1 = $coursegroup1->members[$user1->id];
+        $group1member2 = $coursegroup1->members[$user2->id];
+        $group2member1 = $coursegroup2->members[$user1->id];
+        $group2member2 = $coursegroup2->members[$user2->id];
+        $this->assertCount(2, $coursegroups);
+        $this->assertCount(2, $coursegroup1->members);
+        $this->assertCount(2, $coursegroup2->members);
+        $assertPropertiesMatch($group8, $coursegroup1);
+        $assertPropertiesMatch($group9, $coursegroup2);
+        $this->assertEquals($user1->id, $group1member1->userid);
+        $this->assertEquals($user2->id, $group1member2->userid);
+        $this->assertEquals($user1->id, $group2member1->userid);
+        $this->assertEquals($user2->id, $group2member2->userid);
+    }
 }
diff --git a/version.php b/version.php
index 7ae262ab3e4..cf1bb369b02 100644
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2017072700.00;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2017072700.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.
 

From 81170930c245eaba87e7cf8a88ebc1fb507aebb3 Mon Sep 17 00:00:00 2001
From: Simey Lameze <simey@moodle.com>
Date: Thu, 27 Jul 2017 14:22:57 +0800
Subject: [PATCH 09/15] MDL-59382 core_calendar: change behat step

---
 calendar/tests/behat/behat_calendar.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/calendar/tests/behat/behat_calendar.php b/calendar/tests/behat/behat_calendar.php
index 2d4ecabc2d0..c77b5471bda 100644
--- a/calendar/tests/behat/behat_calendar.php
+++ b/calendar/tests/behat/behat_calendar.php
@@ -63,6 +63,9 @@ class behat_calendar extends behat_base {
         $eventname = $data->getRow(1);
         $eventname = $eventname[1];
 
+        // Click to create new event.
+        $this->execute("behat_general::i_wait_seconds", 1);
+
         // Click to create new event.
         $this->execute("behat_general::i_click_on", array(get_string('newevent', 'calendar'), "button"));
 
@@ -70,11 +73,7 @@ class behat_calendar extends behat_base {
         $this->execute("behat_forms::i_set_the_following_fields_to_these_values", $data);
 
         // Save event.
-        $this->execute("behat_forms::press_button", get_string('savechanges'));
-
-        // Check if event is created. Being last step, don't need to wait or check for exceptions.
-        $this->execute("behat_general::assert_page_contains_text", $eventname);
-
+        $this->execute("behat_forms::press_button", get_string('save'));
     }
 
     /**

From c448e19bffe6f3a6651dd0d356b83c150626bc0d Mon Sep 17 00:00:00 2001
From: Simey Lameze <simey@moodle.com>
Date: Fri, 28 Jul 2017 11:18:06 +0800
Subject: [PATCH 10/15] MDL-59382 core_calendar: fix behat failures

---
 .../tests/behat/block_calendar_month.feature  |  2 -
 .../block_calendar_upcoming_course.feature    |  7 ++-
 .../block_calendar_upcoming_dashboard.feature |  8 +--
 .../block_calendar_upcoming_frontpage.feature |  7 ++-
 calendar/tests/behat/calendar.feature         | 53 ++++++++++++++-----
 calendar/tests/behat/calendar_import.feature  | 18 ++++++-
 .../tests/behat/calendar_lookahead.feature    |  5 +-
 7 files changed, 73 insertions(+), 27 deletions(-)

diff --git a/blocks/calendar_month/tests/behat/block_calendar_month.feature b/blocks/calendar_month/tests/behat/block_calendar_month.feature
index db6f058c71a..c01b8fa39e3 100644
--- a/blocks/calendar_month/tests/behat/block_calendar_month.feature
+++ b/blocks/calendar_month/tests/behat/block_calendar_month.feature
@@ -141,7 +141,6 @@ Feature: Enable the calendar block in a course and test it's functionality
     And I add the "Calendar" block
     And I create a calendar event with form data:
       | id_eventtype | Group |
-      | id_groupid | Group 1 |
       | id_name | Group Event |
     And I log out
     Then I log in as "student1"
@@ -179,7 +178,6 @@ Feature: Enable the calendar block in a course and test it's functionality
     And I am on "Course 1" course homepage
     And I create a calendar event with form data:
       | id_eventtype | Group |
-      | id_groupid | Group 1 |
       | id_name | Group Event 1 |
     And I log out
     Then I log in as "student1"
diff --git a/blocks/calendar_upcoming/tests/behat/block_calendar_upcoming_course.feature b/blocks/calendar_upcoming/tests/behat/block_calendar_upcoming_course.feature
index d517c5f1c84..9e092bfb0d7 100644
--- a/blocks/calendar_upcoming/tests/behat/block_calendar_upcoming_course.feature
+++ b/blocks/calendar_upcoming/tests/behat/block_calendar_upcoming_course.feature
@@ -4,7 +4,7 @@ Feature: Enable the upcoming events block in a course
   As a teacher
   I can view the event in the upcoming events block
 
-  Scenario: View a global event in the upcoming events block in a course
+  Background:
     Given the following "users" exist:
       | username | firstname | lastname | email | idnumber |
       | teacher1 | Teacher | 1 | teacher1@example.com | T1 |
@@ -14,7 +14,10 @@ Feature: Enable the upcoming events block in a course
     And the following "course enrolments" exist:
       | user | course | role |
       | teacher1 | C1 | editingteacher |
-    When I log in as "admin"
+
+  @javascript
+  Scenario: View a global event in the calendar block
+    Given I log in as "admin"
     And I create a calendar event with form data:
       | id_eventtype | Site |
       | id_name | My Site Event |
diff --git a/blocks/calendar_upcoming/tests/behat/block_calendar_upcoming_dashboard.feature b/blocks/calendar_upcoming/tests/behat/block_calendar_upcoming_dashboard.feature
index ceb1898850e..0b7c739f83b 100644
--- a/blocks/calendar_upcoming/tests/behat/block_calendar_upcoming_dashboard.feature
+++ b/blocks/calendar_upcoming/tests/behat/block_calendar_upcoming_dashboard.feature
@@ -3,12 +3,14 @@ Feature: View a upcoming site event on the dashboard
   In order to view a site event
   As a student
   I can view the event in the upcoming events block
-
-  Scenario: View a global event in the upcoming events block on the dashboard
+  Background:
     Given the following "users" exist:
       | username | firstname | lastname | email | idnumber |
       | student1 | Student | 1 | student1@example.com | S1 |
-    And I log in as "admin"
+
+  @javascript
+  Scenario: View a global event in the upcoming events block on the dashboard
+    Given I log in as "admin"
     And I create a calendar event with form data:
       | id_eventtype | Site |
       | id_name | My Site Event |
diff --git a/blocks/calendar_upcoming/tests/behat/block_calendar_upcoming_frontpage.feature b/blocks/calendar_upcoming/tests/behat/block_calendar_upcoming_frontpage.feature
index a10195280c9..448b71050d4 100644
--- a/blocks/calendar_upcoming/tests/behat/block_calendar_upcoming_frontpage.feature
+++ b/blocks/calendar_upcoming/tests/behat/block_calendar_upcoming_frontpage.feature
@@ -4,11 +4,14 @@ Feature: View a site event on the frontpage
   As a teacher
   I can view the event in the upcoming events block
 
-  Scenario: View a global event in the upcoming events block on the frontpage
+  Background:
     Given the following "users" exist:
       | username | firstname | lastname | email | idnumber |
       | teacher1 | Teacher | 1 | teacher1@example.com | T1 |
-    And I log in as "admin"
+
+  @javascript
+  Scenario: View a global event in the upcoming events block on the frontpage
+    Given I log in as "admin"
     And I create a calendar event with form data:
       | id_eventtype | Site |
       | id_name | My Site Event |
diff --git a/calendar/tests/behat/calendar.feature b/calendar/tests/behat/calendar.feature
index 81689dbef7c..291c83eecdd 100644
--- a/calendar/tests/behat/calendar.feature
+++ b/calendar/tests/behat/calendar.feature
@@ -1,4 +1,4 @@
-@core @core_calendar
+@core @core_calendar @javascript
 Feature: Perform basic calendar functionality
   In order to ensure the calendar works as expected
   As an admin
@@ -10,6 +10,7 @@ Feature: Perform basic calendar functionality
       | student1 | Student | 1 | student1@example.com |
       | student2 | Student | 2 | student2@example.com |
       | student3 | Student | 3 | student3@example.com |
+      | teacher1 | Teacher | 1 | teacher1@example.com |
     And the following "courses" exist:
       | fullname | shortname | format |
       | Course 1 | C1 | topics |
@@ -17,17 +18,19 @@ Feature: Perform basic calendar functionality
       | user | course | role |
       | student1 | C1 | student |
       | student3 | C1 | student |
+      | teacher1 | C1 | teacher |
     And the following "groups" exist:
       | name | course | idnumber |
       | Group 1 | C1 | G1 |
     And the following "group members" exist:
       | user | group |
       | student1 | G1 |
-    When I log in as "admin"
-    And I am on "Course 1" course homepage with editing mode on
-    And I add the "Calendar" block
+      | teacher1 | G1 |
 
   Scenario: Create a site event
+    Given I log in as "admin"
+    And I am on "Course 1" course homepage with editing mode on
+    And I add the "Calendar" block
     And I create a calendar event with form data:
       | Type of event | site |
       | Event title | Really awesome event! |
@@ -41,8 +44,14 @@ Feature: Perform basic calendar functionality
     And I log in as "student2"
     And I follow "This month"
     And I should see "Really awesome event!"
+    And I log out
 
   Scenario: Create a course event
+    Given I log in as "admin"
+    And I am on "Course 1" course homepage with editing mode on
+    And I add the "Calendar" block
+    And I log out
+    And I log in as "teacher1"
     And I create a calendar event with form data:
       | Type of event | course |
       | Event title | Really awesome event! |
@@ -56,11 +65,16 @@ Feature: Perform basic calendar functionality
     And I log in as "student2"
     And I follow "This month"
     And I should not see "Really awesome event!"
+    And I log out
 
   Scenario: Create a group event
+    Given I log in as "admin"
+    And I am on "Course 1" course homepage with editing mode on
+    And I add the "Calendar" block
+    And I log out
+    And I log in as "teacher1"
     And I create a calendar event with form data:
       | Type of event | group |
-      | Group | Group 1 |
       | Event title | Really awesome event! |
       | Description | Come join this awesome event |
     And I log out
@@ -68,13 +82,11 @@ Feature: Perform basic calendar functionality
     And I am on "Course 1" course homepage
     And I follow "This month"
     And I follow "Really awesome event!"
-    And "Group 1" "text" should exist in the ".eventlist" "css_element"
-    And I log out
-    And I log in as "student3"
-    And I follow "This month"
-    And I should not see "Really awesome event!"
 
   Scenario: Create a user event
+    Given I log in as "admin"
+    And I am on "Course 1" course homepage with editing mode on
+    And I add the "Calendar" block
     And I create a calendar event with form data:
       | Type of event | user |
       | Event title | Really awesome event! |
@@ -86,22 +98,37 @@ Feature: Perform basic calendar functionality
     And I should not see "Really awesome event!"
 
   Scenario: Delete an event
+    Given I log in as "admin"
+    And I am on "Course 1" course homepage with editing mode on
+    And I add the "Calendar" block
+    And I log out
+    And I log in as "teacher1"
     And I create a calendar event with form data:
       | Type of event | user |
       | Event title | Really awesome event! |
       | Description | Come join this awesome event, sucka! |
-    And I click on "Delete event" "link" in the ".event div.commands" "css_element"
+    And I am on "Course 1" course homepage
+    And I follow "This month"
+    And I click on "Really awesome event!" "link"
     And I click on "Delete" "button"
+    And I click on "Yes" "button"
+    And I wait to be redirected
     And I should not see "Really awesome event!"
 
   Scenario: Edit an event
+    Given I log in as "admin"
+    And I am on "Course 1" course homepage with editing mode on
+    And I add the "Calendar" block
     And I create a calendar event with form data:
       | Type of event | user |
       | Event title | Really awesome event! |
       | Description | Come join this awesome event, sucka! |
-    And I click on "Edit event" "link" in the ".event div.commands" "css_element"
+    And I am on "Course 1" course homepage
+    And I follow "This month"
+    And I click on "Really awesome event!" "link"
+    And I click on "Edit" "button"
     And I set the following fields to these values:
       | Event title | Mediocre event :( |
       | Description | Wait, this event isn't that great. |
-    And I press "Save changes"
+    And I press "Save"
     And I should see "Mediocre event"
diff --git a/calendar/tests/behat/calendar_import.feature b/calendar/tests/behat/calendar_import.feature
index a9cedb12bcc..c9a38292e02 100644
--- a/calendar/tests/behat/calendar_import.feature
+++ b/calendar/tests/behat/calendar_import.feature
@@ -30,5 +30,19 @@ Feature: Import and edit calendar events
     And I should see "February 2017"
     And I should see "Event on 2-15-2017"
     And I should see "Event on 2-25-2017"
-    And I follow "Event on 2-15-2017"
-    And I should see "Event source: Test Import"
+    And I click on "Event on 2-15-2017" "link"
+    And I click on "Edit" "button"
+    And I set the following fields to these values:
+      | Event title    | Event on 2-20-2017 |
+      | Description    | Event on 2-20-2017 |
+      | timestart[day] | 20 |
+    And I press "Save"
+    When I view the calendar for "2" "2017"
+    Then I should see "Event on 2-20-2017"
+    And I should see "Event on 2-25-2017"
+    And I should not see "Event on 2-15-2017"
+    And I press "Manage subscriptions"
+    And I press "Remove"
+    And I view the calendar for "2" "2017"
+    And I should not see "Event on 2-25-2017"
+    And I should not see "Event on 2-20-2017"
diff --git a/calendar/tests/behat/calendar_lookahead.feature b/calendar/tests/behat/calendar_lookahead.feature
index 819d03e2b30..339fd65adf1 100644
--- a/calendar/tests/behat/calendar_lookahead.feature
+++ b/calendar/tests/behat/calendar_lookahead.feature
@@ -1,4 +1,4 @@
-@core @core_calendar
+@core @core_calendar @javascript
 Feature: Limit displayed upcoming events
   In order to filter what is displayed on the calendar
   As a user
@@ -23,10 +23,9 @@ Feature: Limit displayed upcoming events
     And I follow "This month"
     And I click on "a.next" "css_element"
     And I click on "a.next" "css_element"
-    And I create a calendar event:
+    When I create a calendar event:
       | Type of event     | course |
       | Event title       | Two months away event |
-    When I follow "C1"
     Then I should not see "Two months away event"
     And I am on site homepage
     And I follow "Preferences" in the user menu

From 705eea84d1003f2ae51f73ef0cf037af24c2a5ef Mon Sep 17 00:00:00 2001
From: Simey Lameze <simey@moodle.com>
Date: Fri, 28 Jul 2017 14:32:09 +0800
Subject: [PATCH 11/15] MDL-59382 core: make CiBoT happy.

---
 calendar/classes/local/event/forms/create.php | 22 +++---
 calendar/classes/local/event/forms/update.php |  7 +-
 .../mappers/create_update_form_mapper.php     |  9 +--
 .../create_update_form_mapper_interface.php   |  6 +-
 calendar/lib.php                              |  8 +-
 lib/grouplib.php                              | 78 ++++++++++---------
 lib/tests/grouplib_test.php                   | 26 ++++---
 7 files changed, 80 insertions(+), 76 deletions(-)

diff --git a/calendar/classes/local/event/forms/create.php b/calendar/classes/local/event/forms/create.php
index 4003c497b0a..c5e21e288a1 100644
--- a/calendar/classes/local/event/forms/create.php
+++ b/calendar/classes/local/event/forms/create.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -21,7 +20,6 @@
  *
  * @copyright 2017 Ryan Wyllie <ryan@moodle.com>
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @package calendar
  */
 namespace core_calendar\local\event\forms;
 
@@ -55,7 +53,7 @@ class create extends \moodleform {
         $this->add_default_hidden_elements($mform);
 
         // Event name field.
-        $mform->addElement('text', 'name', get_string('eventname','calendar'), 'size="50"');
+        $mform->addElement('text', 'name', get_string('eventname', 'calendar'), 'size="50"');
         $mform->addRule('name', get_string('required'), 'required', null, 'client');
         $mform->setType('name', PARAM_TEXT);
 
@@ -65,10 +63,10 @@ class create extends \moodleform {
         // Add the select elements for the available event types.
         $this->add_event_type_elements($mform, $eventtypes);
 
-        // ********* START OF ADVANCED ELEMENTS *********.
-        // Advanced elements are not visible to the user by default. They are
-        // displayed through the user of a show more / less button.
-        $mform->addElement('editor', 'description', get_string('eventdescription','calendar'), ['rows' => 3]);
+        // Start of advanced elements.
+        // Advanced elements are not visible to the user by default.
+        // They are displayed through the user of a show more / less button.
+        $mform->addElement('editor', 'description', get_string('eventdescription', 'calendar'), ['rows' => 3]);
         $mform->setType('description', PARAM_RAW);
         $mform->setAdvanced('description');
 
@@ -78,8 +76,8 @@ class create extends \moodleform {
         // Add the form elements for repeating events.
         $this->add_event_repeat_elements($mform);
 
-        // Add the javascript required to enhance this mform. Including the show/hide of advanced elements
-        // and the display of the correct select elements for chosen event types.
+        // Add the javascript required to enhance this mform.
+        // Including the show/hide of advanced elements and the display of the correct select elements for event types.
         $PAGE->requires->js_call_amd('core_calendar/event_form', 'init', [$mform->getAttribute('id'), $haserror]);
     }
 
@@ -125,7 +123,7 @@ class create extends \moodleform {
     protected function add_default_hidden_elements($mform) {
         global $USER;
 
-        // Add some hidden fields
+        // Add some hidden fields.
         $mform->addElement('hidden', 'id');
         $mform->setType('id', PARAM_INT);
         $mform->setDefault('id', 0);
@@ -260,7 +258,7 @@ class create extends \moodleform {
         $mform->disabledIf('timedurationuntil[minute]', 'duration', 'noteq', 1);
 
         $mform->setType('timedurationminutes', PARAM_INT);
-        $mform->disabledIf('timedurationminutes','duration','noteq', 2);
+        $mform->disabledIf('timedurationminutes', 'duration', 'noteq', 2);
 
         $mform->setDefault('duration', 0);
     }
@@ -276,7 +274,7 @@ class create extends \moodleform {
         $mform->addElement('text', 'repeats', get_string('repeatweeksl', 'calendar'), 'maxlength="10" size="10"');
         $mform->setType('repeats', PARAM_INT);
         $mform->setDefault('repeats', 1);
-        $mform->disabledIf('repeats','repeat','notchecked');
+        $mform->disabledIf('repeats', 'repeat', 'notchecked');
         $mform->setAdvanced('repeat');
         $mform->setAdvanced('repeats');
     }
diff --git a/calendar/classes/local/event/forms/update.php b/calendar/classes/local/event/forms/update.php
index ec8905b1185..9096b65394a 100644
--- a/calendar/classes/local/event/forms/update.php
+++ b/calendar/classes/local/event/forms/update.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -21,7 +20,6 @@
  *
  * @copyright 2017 Ryan Wyllie <ryan@moodle.com>
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @package calendar
  */
 namespace core_calendar\local\event\forms;
 
@@ -39,9 +37,7 @@ class update extends create {
     /**
      * Add the repeat elements for the form when editing an existing event.
      *
-     * @method add_event_repeat_elements
      * @param MoodleQuickForm $mform
-     * @param stdClass $event The event properties
      */
     protected function add_event_repeat_elements($mform) {
         $event = $this->_customdata['event'];
@@ -50,7 +46,8 @@ class update extends create {
         $mform->setType('repeatid', PARAM_INT);
 
         $group = [];
-        $group[] = $mform->createElement('radio', 'repeateditall', null, get_string('repeateditall', 'calendar', $event->eventrepeats), 1);
+        $group[] = $mform->createElement('radio', 'repeateditall', null, get_string('repeateditall', 'calendar',
+                $event->eventrepeats), 1);
         $group[] = $mform->createElement('radio', 'repeateditall', null, get_string('repeateditthis', 'calendar'), 0);
         $mform->addGroup($group, 'repeatgroup', get_string('repeatedevents', 'calendar'), '<br />', false);
 
diff --git a/calendar/classes/local/event/mappers/create_update_form_mapper.php b/calendar/classes/local/event/mappers/create_update_form_mapper.php
index 00b700237b3..d8ff4b1cd0c 100644
--- a/calendar/classes/local/event/mappers/create_update_form_mapper.php
+++ b/calendar/classes/local/event/mappers/create_update_form_mapper.php
@@ -47,8 +47,7 @@ class create_update_form_mapper implements create_update_form_mapper_interface {
     /**
      * Generate the appropriate data for the form from a legacy event.
      *
-     * @method from_legacy_event_to_data
-     * @param calendar_event $legacyevent
+     * @param \calendar_event $legacyevent
      * @return stdClass
      */
     public function from_legacy_event_to_data(\calendar_event $legacyevent) {
@@ -69,8 +68,7 @@ class create_update_form_mapper implements create_update_form_mapper_interface {
     /**
      * Generate the appropriate calendar_event properties from the form data.
      *
-     * @method from_data_to_event_properties
-     * @param stdClass $data
+     * @param \stdClass $data
      * @return stdClass
      */
     public function from_data_to_event_properties(\stdClass $data) {
@@ -105,13 +103,12 @@ class create_update_form_mapper implements create_update_form_mapper_interface {
      * A helper function to calculate the time duration for an event based on
      * the event_form data.
      *
-     * @method get_time_duration_from_form_data
      * @param \stdClass $data event_form data
      * @return int
      */
     private function get_time_duration_from_form_data(\stdClass $data) {
         if ($data->duration == 1) {
-            return $data->timedurationuntil- $data->timestart;
+            return $data->timedurationuntil - $data->timestart;
         } else if ($data->duration == 2) {
             return $data->timedurationminutes * MINSECS;
         } else {
diff --git a/calendar/classes/local/event/mappers/create_update_form_mapper_interface.php b/calendar/classes/local/event/mappers/create_update_form_mapper_interface.php
index 16e29029aca..6b38c7c8020 100644
--- a/calendar/classes/local/event/mappers/create_update_form_mapper_interface.php
+++ b/calendar/classes/local/event/mappers/create_update_form_mapper_interface.php
@@ -38,8 +38,7 @@ interface create_update_form_mapper_interface {
     /**
      * Generate the appropriate data for the form from a legacy event.
      *
-     * @method from_legacy_event_to_data
-     * @param calendar_event $legacyevent
+     * @param \calendar_event $legacyevent
      * @return stdClass
      */
     public function from_legacy_event_to_data(\calendar_event $legacyevent);
@@ -47,8 +46,7 @@ interface create_update_form_mapper_interface {
     /**
      * Generate the appropriate calendar_event properties from the form data.
      *
-     * @method from_data_to_event_properties
-     * @param stdClass $data
+     * @param \stdClass $data
      * @return stdClass
      */
     public function from_data_to_event_properties(\stdClass $data);
diff --git a/calendar/lib.php b/calendar/lib.php
index 2f3bdf77dd7..45d12971782 100644
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -2744,7 +2744,7 @@ function calendar_get_allowed_types(&$allowed, $course = null, $groups = null) {
  *      'groupcourses' : array of courses that the groups belong to (can
  *                       be different from the list in 'course'.
  *
- * @param array The available types for the logged in user
+ * @return array The array of allowed types.
  */
 function calendar_get_all_allowed_types() {
     global $CFG, $USER;
@@ -3416,6 +3416,12 @@ function calendar_get_legacy_events($tstart, $tend, $users, $groups, $courses, $
     }, []);
 }
 
+/**
+ * Request and render event form fragment.
+ *
+ * @param array $args The fragment arguments.
+ * @return string The rendered mform fragment.
+ */
 function calendar_output_fragment_event_form($args) {
     global $CFG, $OUTPUT;
     require_once($CFG->dirroot.'/calendar/event_form.php');
diff --git a/lib/grouplib.php b/lib/grouplib.php
index 25d1e962f30..cd48e62b837 100644
--- a/lib/grouplib.php
+++ b/lib/grouplib.php
@@ -352,44 +352,46 @@ function groups_get_all_groups_for_courses($courses) {
 
     $results = $DB->get_records_sql($sql, $params);
 
-    // The results will come back as a flat dataset thanks to the left
-    // join so we will need to do some post processing to blow it out
-    // into a more useable data structure.
-    //
-    // This loop will extract the distinct groups from the result set
-    // and add it's list of members to the object as a property called
-    // 'members'. Then each group will be added to the result set indexed
-    // by it's course id.
-    //
-    // The resulting data structure for $groups should be:
-    // $groups = [
-    //      '1' = [
-    //          '1' => (object) [
-    //              'id' => 1,
-    //              <rest of group properties>
-    //              'members' => [
-    //                  '1' => (object) [
-    //                      <group member properties>
-    //                  ],
-    //                  '2' => (object) [
-    //                      <group member properties>
-    //                  ]
-    //              ]
-    //          ],
-    //          '2' => (object) [
-    //              'id' => 2,
-    //              <rest of group properties>
-    //              'members' => [
-    //                  '1' => (object) [
-    //                      <group member properties>
-    //                  ],
-    //                  '3' => (object) [
-    //                      <group member properties>
-    //                  ]
-    //              ]
-    //          ]
-    //      ]
-    // ]
+    /** 
+     * The results will come back as a flat dataset thanks to the left
+     * join so we will need to do some post processing to blow it out
+     * into a more usable data structure.
+     *
+     * This loop will extract the distinct groups from the result set
+     * and add it's list of members to the object as a property called
+     * 'members'. Then each group will be added to the result set indexed
+     * by it's course id.
+     *
+     * The resulting data structure for $groups should be:
+     * $groups = [
+     *      '1' = [
+     *          '1' => (object) [
+     *              'id' => 1,
+     *              <rest of group properties>
+     *              'members' => [
+     *                  '1' => (object) [
+     *                      <group member properties>
+     *                  ],
+     *                  '2' => (object) [
+     *                      <group member properties>
+     *                  ]
+     *              ]
+     *          ],
+     *          '2' => (object) [
+     *              'id' => 2,
+     *              <rest of group properties>
+     *              'members' => [
+     *                  '1' => (object) [
+     *                      <group member properties>
+     *                  ],
+     *                  '3' => (object) [
+     *                      <group member properties>
+     *                  ]
+     *              ]
+     *          ]
+     *      ]
+     * ]
+     */
     foreach ($results as $key => $result) {
         $groupid = $result->gid;
         $courseid = $result->courseid;
diff --git a/lib/tests/grouplib_test.php b/lib/tests/grouplib_test.php
index 4679db6fcdf..e8aa1231e19 100644
--- a/lib/tests/grouplib_test.php
+++ b/lib/tests/grouplib_test.php
@@ -1548,6 +1548,9 @@ class core_grouplib_testcase extends advanced_testcase {
         $this->assertEquals([$user1->id, $user3->id], array_keys($members), '', 0.0, 10, true);
     }
 
+    /**
+     * Test groups_get_all_groups_for_courses() method.
+     */
     public function test_groups_get_all_groups_for_courses_no_courses() {
         $this->resetAfterTest(true);
         $generator = $this->getDataGenerator();
@@ -1555,6 +1558,9 @@ class core_grouplib_testcase extends advanced_testcase {
         $this->assertEquals([], groups_get_all_groups_for_courses([]));
     }
 
+    /**
+     * Test groups_get_all_groups_for_courses() method.
+     */
     public function test_groups_get_all_groups_for_courses_with_courses() {
         $this->resetAfterTest(true);
         $generator = $this->getDataGenerator();
@@ -1606,7 +1612,7 @@ class core_grouplib_testcase extends advanced_testcase {
         $generator->create_group_member(array('groupid' => $group9->id, 'userid' => $user2->id));
 
         $result = groups_get_all_groups_for_courses($courses);
-        $assertPropertiesMatch = function($expected, $actual) {
+        $assertpropertiesmatch = function($expected, $actual) {
             $props = get_object_vars($expected);
 
             foreach ($props as $name => $val) {
@@ -1627,7 +1633,7 @@ class core_grouplib_testcase extends advanced_testcase {
         $coursegroup = $coursegroups[$group1->id];
         $this->assertCount(1, $coursegroups);
         $this->assertEquals([], $coursegroup->members);
-        $assertPropertiesMatch($group1, $coursegroup);
+        $assertpropertiesmatch($group1, $coursegroup);
 
         // Course 3 has one group with one member.
         $coursegroups = $result[$course3->id];
@@ -1635,7 +1641,7 @@ class core_grouplib_testcase extends advanced_testcase {
         $groupmember1 = $coursegroup->members[$user1->id];
         $this->assertCount(1, $coursegroups);
         $this->assertCount(1, $coursegroup->members);
-        $assertPropertiesMatch($group2, $coursegroup);
+        $assertpropertiesmatch($group2, $coursegroup);
         $this->assertEquals($user1->id, $groupmember1->userid);
 
         // Course 4 has one group with multiple members.
@@ -1645,7 +1651,7 @@ class core_grouplib_testcase extends advanced_testcase {
         $groupmember2 = $coursegroup->members[$user2->id];
         $this->assertCount(1, $coursegroups);
         $this->assertCount(2, $coursegroup->members);
-        $assertPropertiesMatch($group3, $coursegroup);
+        $assertpropertiesmatch($group3, $coursegroup);
         $this->assertEquals($user1->id, $groupmember1->userid);
         $this->assertEquals($user2->id, $groupmember2->userid);
 
@@ -1656,8 +1662,8 @@ class core_grouplib_testcase extends advanced_testcase {
         $this->assertCount(2, $coursegroups);
         $this->assertEquals([], $coursegroup1->members);
         $this->assertEquals([], $coursegroup2->members);
-        $assertPropertiesMatch($group4, $coursegroup1);
-        $assertPropertiesMatch($group5, $coursegroup2);
+        $assertpropertiesmatch($group4, $coursegroup1);
+        $assertpropertiesmatch($group5, $coursegroup2);
 
         // Course 6 has multiple groups with one member.
         $coursegroups = $result[$course6->id];
@@ -1668,8 +1674,8 @@ class core_grouplib_testcase extends advanced_testcase {
         $this->assertCount(2, $coursegroups);
         $this->assertCount(1, $coursegroup1->members);
         $this->assertCount(1, $coursegroup2->members);
-        $assertPropertiesMatch($group6, $coursegroup1);
-        $assertPropertiesMatch($group7, $coursegroup2);
+        $assertpropertiesmatch($group6, $coursegroup1);
+        $assertpropertiesmatch($group7, $coursegroup2);
         $this->assertEquals($user1->id, $group1member1->userid);
         $this->assertEquals($user1->id, $group2member1->userid);
 
@@ -1684,8 +1690,8 @@ class core_grouplib_testcase extends advanced_testcase {
         $this->assertCount(2, $coursegroups);
         $this->assertCount(2, $coursegroup1->members);
         $this->assertCount(2, $coursegroup2->members);
-        $assertPropertiesMatch($group8, $coursegroup1);
-        $assertPropertiesMatch($group9, $coursegroup2);
+        $assertpropertiesmatch($group8, $coursegroup1);
+        $assertpropertiesmatch($group9, $coursegroup2);
         $this->assertEquals($user1->id, $group1member1->userid);
         $this->assertEquals($user2->id, $group1member2->userid);
         $this->assertEquals($user1->id, $group2member1->userid);

From 3862bcfaa32c054772f5615eb4c0f29cb14e8c35 Mon Sep 17 00:00:00 2001
From: Simey Lameze <simey@moodle.com>
Date: Tue, 1 Aug 2017 10:10:16 +0800
Subject: [PATCH 12/15] MDL-59382 theme_bootstrapbase: proper handling of large
 modals

---
 theme/bootstrapbase/less/moodle/modal.less | 10 ++++------
 theme/bootstrapbase/style/moodle.css       |  6 +++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/theme/bootstrapbase/less/moodle/modal.less b/theme/bootstrapbase/less/moodle/modal.less
index 716de8b682f..ecf0b0cd15d 100644
--- a/theme/bootstrapbase/less/moodle/modal.less
+++ b/theme/bootstrapbase/less/moodle/modal.less
@@ -28,6 +28,10 @@ body {
         border-radius: 10px;
         border: none;
 
+        &.modal-lg {
+            max-width: 900px;
+        }
+
         .modal-header {
             min-height: 13px;
             padding: 5px;
@@ -98,12 +102,6 @@ body {
             border-radius: 0 0 10px 10px;
         }
     }
-
-    &.large {
-        .modal {
-            max-width: 900px;
-        }
-    }
 }
 
 .modal-backdrop {
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index a58ef38a0a9..77d5aa202c9 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -16985,6 +16985,9 @@ body.modal-open {
   border-radius: 10px;
   border: none;
 }
+.modal-container .modal.modal-lg {
+  max-width: 900px;
+}
 .modal-container .modal .modal-header {
   min-height: 13px;
   padding: 5px;
@@ -17044,9 +17047,6 @@ body.modal-open {
   box-shadow: none;
   border-radius: 0 0 10px 10px;
 }
-.modal-container.large .modal {
-  max-width: 900px;
-}
 .modal-backdrop {
   z-index: 4049;
   background-color: #aaa;

From 63dd75229b3bfa43dec2e8f8fc6b03587972c1bb Mon Sep 17 00:00:00 2001
From: Simey Lameze <simey@moodle.com>
Date: Tue, 1 Aug 2017 12:02:35 +0800
Subject: [PATCH 13/15] MDL-59382 theme: bring the date picker forward

---
 theme/bootstrapbase/less/bootstrap/variables.less | 2 +-
 theme/bootstrapbase/less/moodle/calendar.less     | 3 +++
 theme/bootstrapbase/less/moodle/modal.less        | 2 +-
 theme/bootstrapbase/style/moodle.css              | 3 +++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/theme/bootstrapbase/less/bootstrap/variables.less b/theme/bootstrapbase/less/bootstrap/variables.less
index 220bbde37dc..934de950915 100644
--- a/theme/bootstrapbase/less/bootstrap/variables.less
+++ b/theme/bootstrapbase/less/bootstrap/variables.less
@@ -147,7 +147,7 @@
 @zindexFixedNavbar:       1030;
 @zindexModalBackdrop:     1040;
 @zindexModal:             1050;
-
+@zindexModalContainer:    4050;
 
 // Sprite icons path
 // -------------------------
diff --git a/theme/bootstrapbase/less/moodle/calendar.less b/theme/bootstrapbase/less/moodle/calendar.less
index f8f9ca5d368..cbb29dc26fe 100644
--- a/theme/bootstrapbase/less/moodle/calendar.less
+++ b/theme/bootstrapbase/less/moodle/calendar.less
@@ -22,6 +22,9 @@
 
 // Calendar restyling.
 .path-calendar {
+    #dateselector-calendar-panel {
+        z-index: @zindexModalContainer+4;
+    }
     .calendartable {
         width: 100%;
         th,
diff --git a/theme/bootstrapbase/less/moodle/modal.less b/theme/bootstrapbase/less/moodle/modal.less
index ecf0b0cd15d..819acc17a25 100644
--- a/theme/bootstrapbase/less/moodle/modal.less
+++ b/theme/bootstrapbase/less/moodle/modal.less
@@ -10,7 +10,7 @@ body {
     right: 0;
     bottom: 0;
     left: 0;
-    z-index: 4050;
+    z-index: @zindexModalContainer;
     outline: 0;
     overflow-x: hidden;
     overflow-y: auto;
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index 77d5aa202c9..52e7b7fb40d 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -5551,6 +5551,9 @@ img.iconsmall {
 .calendar_event_user {
   background-color: #dce7ec;
 }
+.path-calendar #dateselector-calendar-panel {
+  z-index: 4054;
+}
 .path-calendar .calendartable {
   width: 100%;
 }

From 22d44a63afcfe56e734eb4e3568b687e5be093e8 Mon Sep 17 00:00:00 2001
From: Ryan Wyllie <ryan@moodle.com>
Date: Wed, 2 Aug 2017 07:30:07 +0000
Subject: [PATCH 14/15] MDL-59382 calendar: fix course id for site event

---
 .../classes/local/event/mappers/create_update_form_mapper.php   | 2 +-
 calendar/externallib.php                                        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/calendar/classes/local/event/mappers/create_update_form_mapper.php b/calendar/classes/local/event/mappers/create_update_form_mapper.php
index d8ff4b1cd0c..bedcccc728f 100644
--- a/calendar/classes/local/event/mappers/create_update_form_mapper.php
+++ b/calendar/classes/local/event/mappers/create_update_form_mapper.php
@@ -89,7 +89,7 @@ class create_update_form_mapper implements create_update_form_mapper_interface {
         }
 
         // Default course id if none is set.
-        if (!isset($data->courseid)) {
+        if (!isset($properties->courseid)) {
             $properties->courseid = 0;
         }
 
diff --git a/calendar/externallib.php b/calendar/externallib.php
index 5c3bdc128e9..0edab2fe847 100644
--- a/calendar/externallib.php
+++ b/calendar/externallib.php
@@ -836,6 +836,7 @@ class core_calendar_external extends external_api {
                 $legacyevent = new \calendar_event($properties);
             }
 
+            $properties = $legacyevent->properties(true);
             $legacyevent->update($properties);
 
             $eventmapper = event_container::get_event_mapper();

From d6942fb5ba35690b5858d37e0217ca46c6110127 Mon Sep 17 00:00:00 2001
From: Ryan Wyllie <ryan@moodle.com>
Date: Thu, 3 Aug 2017 01:07:01 +0000
Subject: [PATCH 15/15] MDL-59382 calendar: fix CiBoT warnings

---
 calendar/amd/build/event_form.min.js          |  2 +-
 calendar/amd/src/calendar.js                  | 12 ++-
 calendar/amd/src/event_form.js                |  2 +-
 calendar/amd/src/modal_event_form.js          |  4 +
 calendar/amd/src/summary_modal.js             |  4 +-
 lib/grouplib.php                              | 79 +++++++++----------
 .../less/bootstrap/variables.less             |  1 -
 theme/bootstrapbase/less/moodle.less          |  3 +
 theme/bootstrapbase/less/moodle/modal.less    |  2 +-
 .../bootstrapbase/less/moodle/variables.less  |  7 ++
 10 files changed, 68 insertions(+), 48 deletions(-)
 create mode 100644 theme/bootstrapbase/less/moodle/variables.less

diff --git a/calendar/amd/build/event_form.min.js b/calendar/amd/build/event_form.min.js
index 8d2d5d69622..49c3a888ade 100644
--- a/calendar/amd/build/event_form.min.js
+++ b/calendar/amd/build/event_form.min.js
@@ -1 +1 @@
-define(["jquery","core/templates"],function(a,b){var c={EVENT_TYPE:'[name="eventtype"]',EVENT_COURSE_ID:'[name="courseid"]',EVENT_GROUP_COURSE_ID:'[name="groupcourseid"]',EVENT_GROUP_ID:'[name="groupid"]',FORM_GROUP:".form-group",SELECT_OPTION:"option",ADVANCED_ELEMENT:".fitem.advanced",FIELDSET_ADVANCED_ELEMENTS:"fieldset.containsadvancedelements",MORELESS_TOGGLE:".moreless-actions"},d={USER:"user",SITE:"site",COURSE:"course",GROUP:"group"},e={SHOW_ADVANCED:"event_form-show-advanced",HIDE_ADVANCED:"event_form-hide-advanced",ADVANCED_SHOWN:"event_form-advanced-shown",ADVANCED_HIDDEN:"event_form-advanced-hidden"},f=function(a){a.find(c.FIELDSET_ADVANCED_ELEMENTS).removeClass("containsadvancedelements");var d=a.find(c.MORELESS_TOGGLE);b.replaceNode(d,"","")},g=function(a){a.find(c.ADVANCED_ELEMENT).removeClass("hidden"),a.trigger(e.ADVANCED_SHOWN)},h=function(a){a.find(c.ADVANCED_ELEMENT).addClass("hidden"),a.trigger(e.ADVANCED_HIDDEN)},i=function(a){a.on(e.SHOW_ADVANCED,function(){g(a)}),a.on(e.HIDE_ADVANCED,function(){h(a)})},j=function(b){b.find(c.EVENT_GROUP_ID).find(c.SELECT_OPTION).each(function(b,c){var c=a(c),d=c.attr("value"),e=d.split("-"),f=e[0];c.attr("data-course-id",f)})},k=function(a){var b=a.find(c.EVENT_TYPE),e=b.val(),f=a.find(c.EVENT_COURSE_ID).closest(c.FORM_GROUP).removeClass("hidden"),g=a.find(c.EVENT_GROUP_COURSE_ID).closest(c.FORM_GROUP).removeClass("hidden"),h=a.find(c.EVENT_GROUP_ID).closest(c.FORM_GROUP).removeClass("hidden");switch(e){case d.COURSE:g.addClass("hidden"),h.addClass("hidden");break;case d.GROUP:f.addClass("hidden");break;default:f.addClass("hidden"),g.addClass("hidden"),h.addClass("hidden")}},l=function(a){var b=a.find(c.EVENT_TYPE);b.on("change",function(){k(a)})},m=function(b){var d=b.find(c.EVENT_GROUP_COURSE_ID),e=b.find(c.EVENT_GROUP_ID),f=e.find(c.SELECT_OPTION),g=function(){var b=d.val(),c=null;f.each(function(d,e){e=a(e),e.attr("data-course-id")==b?(e.removeClass("hidden"),e.prop("disabled",!1),null===c&&(c=d)):(e.addClass("hidden"),e.prop("disabled",!0))}),e.prop("selectedIndex",c)};d.on("change",g),g()},n=function(b,c){var d=a("#"+b);i(d),f(d),k(d),j(d),l(d),m(d),c?g(d):h(d)};return{init:n,events:e}});
\ No newline at end of file
+define(["jquery","core/templates"],function(a,b){var c={EVENT_TYPE:'[name="eventtype"]',EVENT_COURSE_ID:'[name="courseid"]',EVENT_GROUP_COURSE_ID:'[name="groupcourseid"]',EVENT_GROUP_ID:'[name="groupid"]',FORM_GROUP:".form-group",SELECT_OPTION:"option",ADVANCED_ELEMENT:".fitem.advanced",FIELDSET_ADVANCED_ELEMENTS:"fieldset.containsadvancedelements",MORELESS_TOGGLE:".moreless-actions"},d={USER:"user",SITE:"site",COURSE:"course",GROUP:"group"},e={SHOW_ADVANCED:"event_form-show-advanced",HIDE_ADVANCED:"event_form-hide-advanced",ADVANCED_SHOWN:"event_form-advanced-shown",ADVANCED_HIDDEN:"event_form-advanced-hidden"},f=function(a){a.find(c.FIELDSET_ADVANCED_ELEMENTS).removeClass("containsadvancedelements");var d=a.find(c.MORELESS_TOGGLE);b.replaceNode(d,"","")},g=function(a){a.find(c.ADVANCED_ELEMENT).removeClass("hidden"),a.trigger(e.ADVANCED_SHOWN)},h=function(a){a.find(c.ADVANCED_ELEMENT).addClass("hidden"),a.trigger(e.ADVANCED_HIDDEN)},i=function(a){a.on(e.SHOW_ADVANCED,function(){g(a)}),a.on(e.HIDE_ADVANCED,function(){h(a)})},j=function(b){b.find(c.EVENT_GROUP_ID).find(c.SELECT_OPTION).each(function(b,c){c=a(c);var d=c.attr("value"),e=d.split("-"),f=e[0];c.attr("data-course-id",f)})},k=function(a){var b=a.find(c.EVENT_TYPE),e=b.val(),f=a.find(c.EVENT_COURSE_ID).closest(c.FORM_GROUP).removeClass("hidden"),g=a.find(c.EVENT_GROUP_COURSE_ID).closest(c.FORM_GROUP).removeClass("hidden"),h=a.find(c.EVENT_GROUP_ID).closest(c.FORM_GROUP).removeClass("hidden");switch(e){case d.COURSE:g.addClass("hidden"),h.addClass("hidden");break;case d.GROUP:f.addClass("hidden");break;default:f.addClass("hidden"),g.addClass("hidden"),h.addClass("hidden")}},l=function(a){var b=a.find(c.EVENT_TYPE);b.on("change",function(){k(a)})},m=function(b){var d=b.find(c.EVENT_GROUP_COURSE_ID),e=b.find(c.EVENT_GROUP_ID),f=e.find(c.SELECT_OPTION),g=function(){var b=d.val(),c=null;f.each(function(d,e){e=a(e),e.attr("data-course-id")==b?(e.removeClass("hidden"),e.prop("disabled",!1),null===c&&(c=d)):(e.addClass("hidden"),e.prop("disabled",!0))}),e.prop("selectedIndex",c)};d.on("change",g),g()},n=function(b,c){var d=a("#"+b);i(d),f(d),k(d),j(d),l(d),m(d),c?g(d):h(d)};return{init:n,events:e}});
\ No newline at end of file
diff --git a/calendar/amd/src/calendar.js b/calendar/amd/src/calendar.js
index a76db0e0ea3..1843984823e 100644
--- a/calendar/amd/src/calendar.js
+++ b/calendar/amd/src/calendar.js
@@ -187,9 +187,15 @@ define([
 
         // TODO: Replace these with actual logic to update
         // the UI without having to force a page reload.
-        body.on(CalendarEvents.created, function() { window.location.reload(); });
-        body.on(CalendarEvents.deleted, function() { window.location.reload(); });
-        body.on(CalendarEvents.updated, function() { window.location.reload(); });
+        body.on(CalendarEvents.created, function() {
+            window.location.reload();
+        });
+        body.on(CalendarEvents.deleted, function() {
+            window.location.reload();
+        });
+        body.on(CalendarEvents.updated, function() {
+            window.location.reload();
+        });
 
         eventFormModalPromise.then(function(modal) {
             // When something within the calendar tells us the user wants
diff --git a/calendar/amd/src/event_form.js b/calendar/amd/src/event_form.js
index 6fbd3eadfce..e62ee638950 100644
--- a/calendar/amd/src/event_form.js
+++ b/calendar/amd/src/event_form.js
@@ -131,7 +131,7 @@ define(['jquery', 'core/templates'], function($, Templates) {
         formElement.find(SELECTORS.EVENT_GROUP_ID)
             .find(SELECTORS.SELECT_OPTION)
             .each(function(index, element) {
-                var element = $(element);
+                element = $(element);
                 var value = element.attr('value');
                 var splits = value.split('-');
                 var courseId = splits[0];
diff --git a/calendar/amd/src/modal_event_form.js b/calendar/amd/src/modal_event_form.js
index 64d675aec25..bad5ca4f945 100644
--- a/calendar/amd/src/modal_event_form.js
+++ b/calendar/amd/src/modal_event_form.js
@@ -146,6 +146,7 @@ define([
         this.moreLessButton.attr('data-collapsed', 'true');
         Str.get_string('more', 'calendar').then(function(string) {
             this.moreLessButton.text(string);
+            return;
         }.bind(this));
     };
 
@@ -159,6 +160,7 @@ define([
         this.moreLessButton.attr('data-collapsed', 'false');
         Str.get_string('less', 'calendar').then(function(string) {
             this.moreLessButton.text(string);
+            return;
         }.bind(this));
     };
 
@@ -356,6 +358,8 @@ define([
                         $('body').trigger(CalendarEvents.created, [response.event]);
                     }
                 }
+
+                return;
             }.bind(this))
             .always(function() {
                 // Regardless of success or error we should always stop
diff --git a/calendar/amd/src/summary_modal.js b/calendar/amd/src/summary_modal.js
index 1b44f8d5fae..b758f45f3dd 100644
--- a/calendar/amd/src/summary_modal.js
+++ b/calendar/amd/src/summary_modal.js
@@ -107,7 +107,9 @@ define(['jquery', 'core/str', 'core/notification', 'core/custom_interaction_even
         Modal.prototype.registerEventListeners.call(this);
 
         var confirmPromise = ModalFactory.create(
-            { type: ModalFactory.types.CONFIRM },
+            {
+                type: ModalFactory.types.CONFIRM
+            },
             this.getDeleteButton()
         ).then(function(modal) {
             modal.getRoot().on(ModalEvents.yes, function() {
diff --git a/lib/grouplib.php b/lib/grouplib.php
index cd48e62b837..8893d132200 100644
--- a/lib/grouplib.php
+++ b/lib/grouplib.php
@@ -352,46 +352,45 @@ function groups_get_all_groups_for_courses($courses) {
 
     $results = $DB->get_records_sql($sql, $params);
 
-    /** 
-     * The results will come back as a flat dataset thanks to the left
-     * join so we will need to do some post processing to blow it out
-     * into a more usable data structure.
-     *
-     * This loop will extract the distinct groups from the result set
-     * and add it's list of members to the object as a property called
-     * 'members'. Then each group will be added to the result set indexed
-     * by it's course id.
-     *
-     * The resulting data structure for $groups should be:
-     * $groups = [
-     *      '1' = [
-     *          '1' => (object) [
-     *              'id' => 1,
-     *              <rest of group properties>
-     *              'members' => [
-     *                  '1' => (object) [
-     *                      <group member properties>
-     *                  ],
-     *                  '2' => (object) [
-     *                      <group member properties>
-     *                  ]
-     *              ]
-     *          ],
-     *          '2' => (object) [
-     *              'id' => 2,
-     *              <rest of group properties>
-     *              'members' => [
-     *                  '1' => (object) [
-     *                      <group member properties>
-     *                  ],
-     *                  '3' => (object) [
-     *                      <group member properties>
-     *                  ]
-     *              ]
-     *          ]
-     *      ]
-     * ]
-     */
+    // The results will come back as a flat dataset thanks to the left
+    // join so we will need to do some post processing to blow it out
+    // into a more usable data structure.
+    //
+    // This loop will extract the distinct groups from the result set
+    // and add it's list of members to the object as a property called
+    // 'members'. Then each group will be added to the result set indexed
+    // by it's course id.
+    //
+    // The resulting data structure for $groups should be:
+    // $groups = [
+    //      '1' = [
+    //          '1' => (object) [
+    //              'id' => 1,
+    //              <rest of group properties>
+    //              'members' => [
+    //                  '1' => (object) [
+    //                      <group member properties>
+    //                  ],
+    //                  '2' => (object) [
+    //                      <group member properties>
+    //                  ]
+    //              ]
+    //          ],
+    //          '2' => (object) [
+    //              'id' => 2,
+    //              <rest of group properties>
+    //              'members' => [
+    //                  '1' => (object) [
+    //                      <group member properties>
+    //                  ],
+    //                  '3' => (object) [
+    //                      <group member properties>
+    //                  ]
+    //              ]
+    //          ]
+    //      ]
+    // ]
+    //
     foreach ($results as $key => $result) {
         $groupid = $result->gid;
         $courseid = $result->courseid;
diff --git a/theme/bootstrapbase/less/bootstrap/variables.less b/theme/bootstrapbase/less/bootstrap/variables.less
index 934de950915..a9b45917c60 100644
--- a/theme/bootstrapbase/less/bootstrap/variables.less
+++ b/theme/bootstrapbase/less/bootstrap/variables.less
@@ -147,7 +147,6 @@
 @zindexFixedNavbar:       1030;
 @zindexModalBackdrop:     1040;
 @zindexModal:             1050;
-@zindexModalContainer:    4050;
 
 // Sprite icons path
 // -------------------------
diff --git a/theme/bootstrapbase/less/moodle.less b/theme/bootstrapbase/less/moodle.less
index 0a980d04ac3..0bc21d00cee 100644
--- a/theme/bootstrapbase/less/moodle.less
+++ b/theme/bootstrapbase/less/moodle.less
@@ -3,6 +3,9 @@
 @import "fontawesome/font-awesome";
 @import "fontawesome/moodle-path";
 
+// Import the Moodle variables.
+@import "moodle/variables.less";
+
 // Old Moodle stuff from base theme.
 // Massive, needs broken up.
 @import "moodle/core";
diff --git a/theme/bootstrapbase/less/moodle/modal.less b/theme/bootstrapbase/less/moodle/modal.less
index 819acc17a25..32f89c1f95f 100644
--- a/theme/bootstrapbase/less/moodle/modal.less
+++ b/theme/bootstrapbase/less/moodle/modal.less
@@ -105,7 +105,7 @@ body {
 }
 
 .modal-backdrop {
-    z-index: 4049;
+    z-index: @zindexModalContainerBackdrop;
     background-color: #aaa;
     opacity: 0.4;
 }
diff --git a/theme/bootstrapbase/less/moodle/variables.less b/theme/bootstrapbase/less/moodle/variables.less
new file mode 100644
index 00000000000..b86ad2fcc48
--- /dev/null
+++ b/theme/bootstrapbase/less/moodle/variables.less
@@ -0,0 +1,7 @@
+// Global variables for use within Moodle's less style sheets.
+// These should be unique and not override the variables defined
+// in Bootstrap.
+
+@zindexModalContainer: 4050;
+@zindexModalContainerBackdrop: 4049;
+