From 49c5b8b44040769aee47b14c4f8cbecce76c29bf Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Mon, 7 Dec 2015 11:12:18 +0800
Subject: [PATCH] MDL-51967 cbe: Use the competency_summary_exporter for the
 competency dialogue.

---
 .../lp/amd/build/competencyactions.min.js     |  2 +-
 admin/tool/lp/amd/src/competencyactions.js    | 12 +++---
 admin/tool/lp/classes/external.php            | 22 +---------
 .../external/competency_summary_exporter.php  | 28 ++++++++++++-
 .../lp/classes/output/competency_summary.php  | 42 ++++++-------------
 .../output/template_competencies_page.php     | 14 ++++++-
 .../lp/templates/competency_summary.mustache  |  8 ++--
 7 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/admin/tool/lp/amd/build/competencyactions.min.js b/admin/tool/lp/amd/build/competencyactions.min.js
index 349fe34e9d3..a10f9ca0bf1 100644
--- a/admin/tool/lp/amd/build/competencyactions.min.js
+++ b/admin/tool/lp/amd/build/competencyactions.min.js
@@ -1 +1 @@
-define(["jquery","core/url","core/templates","core/notification","core/str","core/ajax","tool_lp/dragdrop-reorder","tool_lp/tree","tool_lp/dialogue","tool_lp/menubar","tool_lp/competencypicker","tool_lp/competency_outcomes","tool_lp/competencyruleconfig"],function(a,b,c,d,e,f,g,h,i,j,k,l,m){var n,o,p,q,r,s,t=null,u=null,v=null,w=function(){var c=a('[data-region="competencyactions"]').data("competency"),d={competencyframeworkid:t.getCompetencyFrameworkId(),pagecontextid:n};null!==c&&(d.parentid=c.id);var e=a.param(d);window.location=b.relativeUrl("/admin/tool/lp/editcompetency.php?"+e)},x=function(){if("undefined"==typeof v&&(v=0),v!=u){var b=a('[data-region="filtercompetencies"]').data("frameworkid"),c=f.call([{methodname:"tool_lp_set_parent_competency",args:{competencyid:u,parentid:v}},{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:b,search:a('[data-region="filtercompetencies"] input').val()}}]);c[1].done(C).fail(d.exception)}},y=function(b){var c=a(b.getContent()),d=c.find("[data-enhance=movetree]"),e=new h(d,!1);e.on("selectionchanged",function(b,c){var d=c.selected;v=a(d).data("id")}),d.show(),c.on("click",'[data-action="move"]',function(){b.close(),x()}),c.on("click",'[data-action="cancel"]',function(){b.close()})},z=function(a,b){var c;for(c=0;c<b.length;c++)b[c].parentid==a.id&&(a.haschildren=!0,b[c].children=[],b[c].haschildren=!1,a.children[a.children.length]=b[c],z(b[c],b))},A=function(){var b=a('[data-region="competencyactions"]').data("competency");u=b.id;var g=f.call([{methodname:"tool_lp_search_competencies",args:{competencyframeworkid:b.competencyframeworkid,searchtext:""}},{methodname:"tool_lp_read_competency_framework",args:{id:b.competencyframeworkid}}]);a.when.apply(null,g).done(function(a,f){var g,h=[];for(g=0;g<a.length;g++){var j=a[g];"0"==j.parentid&&(j.children=[],j.haschildren=0,h[h.length]=j,z(j,a))}e.get_strings([{key:"movecompetency",component:"tool_lp",param:b.shortname},{key:"move",component:"tool_lp"},{key:"cancel",component:"moodle"}]).done(function(a){var b={framework:f,competencies:h};c.render("tool_lp/competencies_move_tree",b).done(function(b){new i(a[0],b,y)}).fail(d.exception)}).fail(d.exception)}).fail(d.exception)},B=function(){var c=a('[data-region="competencyactions"]').data("competency"),d={competencyframeworkid:t.getCompetencyFrameworkId(),id:c.id,parentid:c.parentid,pagecontextid:n},e=a.param(d);window.location=b.relativeUrl("/admin/tool/lp/editcompetency.php?"+e)},C=function(b){c.render("tool_lp/manage_competencies_page",b).done(function(b,d){a('[data-region="managecompetencies"]').replaceWith(b),c.runTemplateJS(d)}).fail(d.exception)},D=function(b){b.preventDefault();var c=a('[data-region="filtercompetencies"]').data("frameworkid"),e=f.call([{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:c,search:a('[data-region="filtercompetencies"] input').val()}}]);e[0].done(C).fail(d.exception)},E=function(){var b=a('[data-region="competencyactions"]').data("competency"),c=f.call([{methodname:"tool_lp_move_up_competency",args:{id:b.id}},{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:b.competencyframeworkid,search:a('[data-region="filtercompetencies"] input').val()}}]);c[1].done(C).fail(d.exception)},F=function(){var b=a('[data-region="competencyactions"]').data("competency"),c=f.call([{methodname:"tool_lp_move_down_competency",args:{id:b.id}},{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:b.competencyframeworkid,search:a('[data-region="filtercompetencies"] input').val()}}]);c[1].done(C).fail(d.exception)},G=function(){var b=a('[data-region="competencyactions"]').data("competency"),g=f.call([{methodname:"tool_lp_list_courses_using_competency",args:{id:b.id}}]);g[0].done(function(a){var b={courses:a};c.render("tool_lp/linked_courses_summary",b).done(function(a){e.get_string("linkedcourses","tool_lp").done(function(b){new i(b,a,y)}).fail(d.exception)}).fail(d.exception)}).fail(d.exception)},H=function(){q=a('[data-region="competencyactions"]').data("competency"),o||(o=new k(n,q.competencyframeworkid),o.on("save",function(b,e){var g=e.competencyIds,h=[];a.each(g,function(a,b){h.push({methodname:"tool_lp_add_related_competency",args:{competencyid:b,relatedcompetencyid:q.id}})}),h.push({methodname:"tool_lp_data_for_related_competencies_section",args:{competencyid:q.id}});var i=f.call(h);i[h.length-1].then(function(b){return c.render("tool_lp/related_competencies",b).done(function(b,d){a('[data-region="relatedcompetencies"]').replaceWith(b),c.runTemplateJS(d),S()})},d.exception)})),o.setDisallowedCompetencyIDs([q.id]),o.display()},I=function(b){b.preventDefault(),q=a('[data-region="competencyactions"]').data("competency"),p.setTargetCompetencyId(q.id),p.display()},J=function(a,b){var c={id:q.id,shortname:q.shortname,idnumber:q.idnumber,description:q.description,descriptionformat:q.descriptionformat,visible:q.visible,ruletype:b.ruletype,ruleoutcome:b.ruleoutcome,ruleconfig:b.ruleconfig},e=f.call([{methodname:"tool_lp_update_competency",args:{competency:c}}]);e[0].then(function(a){a&&(q.ruletype=b.ruletype,q.ruleoutcome=b.ruleoutcome,q.ruleconfig=b.ruleconfig,V(q))},d.exception)},K=function(){var b=a('[data-region="competencyactions"]').data("competency"),c=f.call([{methodname:"tool_lp_delete_competency",args:{id:b.id}},{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:b.competencyframeworkid,search:a('[data-region="filtercompetencies"] input').val()}}]);c[1].done(C).fail(d.exception)},L=function(){var b=a('[data-region="competencyactions"]').data("competency");delete b.showdeleterelatedaction,delete b.showrelatedcompetencies,delete b.showrule,c.render("tool_lp/competency_summary",b).done(function(a){e.get_strings([{key:"confirm",component:"moodle"},{key:"deletecompetency",component:"tool_lp",param:a},{key:"delete",component:"moodle"},{key:"cancel",component:"moodle"}]).done(function(a){d.confirm(a[0],a[1],a[2],a[3],K)}).fail(d.exception)}).fail(d.exception)},M=function(b){b.originalEvent.dataTransfer.setData("text",a(b.target).parent().data("id"))},N=function(a){a.originalEvent.dataTransfer.dropEffect="move",a.preventDefault()},O=function(b){b.preventDefault(),a(this).addClass("currentdragtarget")},P=function(b){b.preventDefault(),a(this).removeClass("currentdragtarget")},Q=function(b){b.preventDefault(),u=b.originalEvent.dataTransfer.getData("text"),v=a(b.target).parent().data("id"),a(this).removeClass("currentdragtarget"),x()},R=function(b){b.preventDefault();var e=this.id.substr(11),g=a('[data-region="competencyactions"]').data("competency"),h=f.call([{methodname:"tool_lp_remove_related_competency",args:{relatedcompetencyid:e,competencyid:g.id}},{methodname:"tool_lp_data_for_related_competencies_section",args:{competencyid:g.id}}]);h[1].done(function(b){c.render("tool_lp/related_competencies",b).done(function(b){a('[data-region="relatedcompetencies"]').replaceWith(b),S()}.bind(this)).fail(d.exception)}.bind(this)).fail(d.exception)},S=function(){a('[data-action="deleterelation"]').on("click",R)},T=function(a){return"undefined"!=typeof r[a+1]},U=function(a){var b=r[a];return b||(b="competency"),b},V=function(b){var e=a.Deferred().resolve().promise(),g=a.extend({},b);g.showdeleterelatedaction=!0,g.showrelatedcompetencies=!0,g.showrule=!1,b.ruleoutcome!=l.NONE&&(e=l.getString(b.ruleoutcome).then(function(c){var d;return a.each(s,function(a,c){c.type==b.ruletype&&(d=c.name)}),[c,d]})),e.then(function(a){"undefined"!=typeof a&&(g.showrule=!0,g.rule={outcome:a[0],type:a[1]})}).then(function(){return c.render("tool_lp/competency_summary",g).then(function(b){a('[data-region="competencyinfo"]').html(b),a('[data-action="deleterelation"]').on("click",R)})}).then(function(){return c.render("tool_lp/loading",{})}).then(function(a,b){c.replaceNodeContents('[data-region="relatedcompetencies"]',a,b)}).done(function(){f.call([{methodname:"tool_lp_data_for_related_competencies_section",args:{competencyid:b.id},done:function(b){return c.render("tool_lp/related_competencies",b).done(function(b,d){a('[data-region="relatedcompetencies"]').replaceWith(b),c.runTemplateJS(d),S()})}}])}).fail(d.exception)},W=function(a){return e.get_string("taxonomy_add_"+U(a),"tool_lp")},X=function(a){return e.get_string("taxonomy_selected_"+U(a),"tool_lp")},Y=function(b,c){var d=c.selected,e=a(d).data("id"),f=a('[data-region="competencyactions"] [data-action="add"]'),g=a('[data-region="competencyactionsmenu"]'),h=a('[data-region="selected-competency"]'),i=0,k=1;if(j.closeAll(),"undefined"==typeof e)a('[data-region="competencyinfo"]').html(d.clone().children().remove().end().text()),a('[data-region="competencyactions"]').data("competency",null),g.hide();else{var l=t.getCompetency(e);i=t.getCompetencyLevel(e),k=T(i)?i+1:!1,g.show(),a('[data-region="competencyactions"]').data("competency",l),V(l)}return X(i).then(function(a){h.text(a)}),k?W(k).then(function(a){f.show().find('[data-region="term"]').text(a)}):f.hide(),b.preventDefault(),!1},Z=function(a){var b=a.split(",");return b.unshift(""),delete b[0],b};return{init:function(b,c,d,e){t=b,n=c,r=Z(d),s=e,a('[data-region="competencyactions"] [data-action="add"]').on("click",w),j.enhance(".competencyactionsmenu",{'[data-action="edit"]':B,'[data-action="delete"]':L,'[data-action="move"]':A,'[data-action="moveup"]':E,'[data-action="movedown"]':F,'[data-action="linkedcourses"]':G,'[data-action="relatedcompetencies"]':H.bind(this),'[data-action="competencyrules"]':I.bind(this)}),a('[data-region="competencyactionsmenu"]').hide(),a('[data-region="competencyactions"] [data-action="add"]').hide(),a('[data-region="filtercompetencies"]').on("submit",D);var f=a('[data-region="managecompetencies"] [data-enhance="tree"]');f.on("dragstart","li>span",M).on("dragover","li>span",N).on("dragenter","li>span",O).on("dragleave","li>span",P).on("drop","li>span",Q),b.on("selectionchanged",Y),p=new m(t,s),p.on("save",J.bind(this))}}});
\ No newline at end of file
+define(["jquery","core/url","core/templates","core/notification","core/str","core/ajax","tool_lp/dragdrop-reorder","tool_lp/tree","tool_lp/dialogue","tool_lp/menubar","tool_lp/competencypicker","tool_lp/competency_outcomes","tool_lp/competencyruleconfig"],function(a,b,c,d,e,f,g,h,i,j,k,l,m){var n,o,p,q,r,s,t=null,u=null,v=null,w=function(){var c=a('[data-region="competencyactions"]').data("competency"),d={competencyframeworkid:t.getCompetencyFrameworkId(),pagecontextid:n};null!==c&&(d.parentid=c.id);var e=a.param(d);window.location=b.relativeUrl("/admin/tool/lp/editcompetency.php?"+e)},x=function(){if("undefined"==typeof v&&(v=0),v!=u){var b=a('[data-region="filtercompetencies"]').data("frameworkid"),c=f.call([{methodname:"tool_lp_set_parent_competency",args:{competencyid:u,parentid:v}},{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:b,search:a('[data-region="filtercompetencies"] input').val()}}]);c[1].done(C).fail(d.exception)}},y=function(b){var c=a(b.getContent()),d=c.find("[data-enhance=movetree]"),e=new h(d,!1);e.on("selectionchanged",function(b,c){var d=c.selected;v=a(d).data("id")}),d.show(),c.on("click",'[data-action="move"]',function(){b.close(),x()}),c.on("click",'[data-action="cancel"]',function(){b.close()})},z=function(a,b){var c;for(c=0;c<b.length;c++)b[c].parentid==a.id&&(a.haschildren=!0,b[c].children=[],b[c].haschildren=!1,a.children[a.children.length]=b[c],z(b[c],b))},A=function(){var b=a('[data-region="competencyactions"]').data("competency");u=b.id;var g=f.call([{methodname:"tool_lp_search_competencies",args:{competencyframeworkid:b.competencyframeworkid,searchtext:""}},{methodname:"tool_lp_read_competency_framework",args:{id:b.competencyframeworkid}}]);a.when.apply(null,g).done(function(a,f){var g,h=[];for(g=0;g<a.length;g++){var j=a[g];"0"==j.parentid&&(j.children=[],j.haschildren=0,h[h.length]=j,z(j,a))}e.get_strings([{key:"movecompetency",component:"tool_lp",param:b.shortname},{key:"move",component:"tool_lp"},{key:"cancel",component:"moodle"}]).done(function(a){var b={framework:f,competencies:h};c.render("tool_lp/competencies_move_tree",b).done(function(b){new i(a[0],b,y)}).fail(d.exception)}).fail(d.exception)}).fail(d.exception)},B=function(){var c=a('[data-region="competencyactions"]').data("competency"),d={competencyframeworkid:t.getCompetencyFrameworkId(),id:c.id,parentid:c.parentid,pagecontextid:n},e=a.param(d);window.location=b.relativeUrl("/admin/tool/lp/editcompetency.php?"+e)},C=function(b){c.render("tool_lp/manage_competencies_page",b).done(function(b,d){a('[data-region="managecompetencies"]').replaceWith(b),c.runTemplateJS(d)}).fail(d.exception)},D=function(b){b.preventDefault();var c=a('[data-region="filtercompetencies"]').data("frameworkid"),e=f.call([{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:c,search:a('[data-region="filtercompetencies"] input').val()}}]);e[0].done(C).fail(d.exception)},E=function(){var b=a('[data-region="competencyactions"]').data("competency"),c=f.call([{methodname:"tool_lp_move_up_competency",args:{id:b.id}},{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:b.competencyframeworkid,search:a('[data-region="filtercompetencies"] input').val()}}]);c[1].done(C).fail(d.exception)},F=function(){var b=a('[data-region="competencyactions"]').data("competency"),c=f.call([{methodname:"tool_lp_move_down_competency",args:{id:b.id}},{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:b.competencyframeworkid,search:a('[data-region="filtercompetencies"] input').val()}}]);c[1].done(C).fail(d.exception)},G=function(){var b=a('[data-region="competencyactions"]').data("competency"),g=f.call([{methodname:"tool_lp_list_courses_using_competency",args:{id:b.id}}]);g[0].done(function(a){var b={courses:a};c.render("tool_lp/linked_courses_summary",b).done(function(a){e.get_string("linkedcourses","tool_lp").done(function(b){new i(b,a,y)}).fail(d.exception)}).fail(d.exception)}).fail(d.exception)},H=function(){q=a('[data-region="competencyactions"]').data("competency"),o||(o=new k(n,q.competencyframeworkid),o.on("save",function(b,e){var g=e.competencyIds,h=[];a.each(g,function(a,b){h.push({methodname:"tool_lp_add_related_competency",args:{competencyid:b,relatedcompetencyid:q.id}})}),h.push({methodname:"tool_lp_data_for_related_competencies_section",args:{competencyid:q.id}});var i=f.call(h);i[h.length-1].then(function(b){return c.render("tool_lp/related_competencies",b).done(function(b,d){a('[data-region="relatedcompetencies"]').replaceWith(b),c.runTemplateJS(d),S()})},d.exception)})),o.setDisallowedCompetencyIDs([q.id]),o.display()},I=function(b){b.preventDefault(),q=a('[data-region="competencyactions"]').data("competency"),p.setTargetCompetencyId(q.id),p.display()},J=function(a,b){var c={id:q.id,shortname:q.shortname,idnumber:q.idnumber,description:q.description,descriptionformat:q.descriptionformat,visible:q.visible,ruletype:b.ruletype,ruleoutcome:b.ruleoutcome,ruleconfig:b.ruleconfig},e=f.call([{methodname:"tool_lp_update_competency",args:{competency:c}}]);e[0].then(function(a){a&&(q.ruletype=b.ruletype,q.ruleoutcome=b.ruleoutcome,q.ruleconfig=b.ruleconfig,V(q))},d.exception)},K=function(){var b=a('[data-region="competencyactions"]').data("competency"),c=f.call([{methodname:"tool_lp_delete_competency",args:{id:b.id}},{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:b.competencyframeworkid,search:a('[data-region="filtercompetencies"] input').val()}}]);c[1].done(C).fail(d.exception)},L=function(){var b=a('[data-region="competencyactions"]').data("competency"),f={competency:b};c.render("tool_lp/competency_summary",f).done(function(a){e.get_strings([{key:"confirm",component:"moodle"},{key:"deletecompetency",component:"tool_lp",param:a},{key:"delete",component:"moodle"},{key:"cancel",component:"moodle"}]).done(function(a){d.confirm(a[0],a[1],a[2],a[3],K)}).fail(d.exception)}).fail(d.exception)},M=function(b){b.originalEvent.dataTransfer.setData("text",a(b.target).parent().data("id"))},N=function(a){a.originalEvent.dataTransfer.dropEffect="move",a.preventDefault()},O=function(b){b.preventDefault(),a(this).addClass("currentdragtarget")},P=function(b){b.preventDefault(),a(this).removeClass("currentdragtarget")},Q=function(b){b.preventDefault(),u=b.originalEvent.dataTransfer.getData("text"),v=a(b.target).parent().data("id"),a(this).removeClass("currentdragtarget"),x()},R=function(b){b.preventDefault();var e=this.id.substr(11),g=a('[data-region="competencyactions"]').data("competency"),h=f.call([{methodname:"tool_lp_remove_related_competency",args:{relatedcompetencyid:e,competencyid:g.id}},{methodname:"tool_lp_data_for_related_competencies_section",args:{competencyid:g.id}}]);h[1].done(function(b){c.render("tool_lp/related_competencies",b).done(function(b){a('[data-region="relatedcompetencies"]').replaceWith(b),S()}.bind(this)).fail(d.exception)}.bind(this)).fail(d.exception)},S=function(){a('[data-action="deleterelation"]').on("click",R)},T=function(a){return"undefined"!=typeof r[a+1]},U=function(a){var b=r[a];return b||(b="competency"),b},V=function(b){var e=a.Deferred().resolve().promise(),g={};g.competency=b,g.showdeleterelatedaction=!0,g.showrelatedcompetencies=!0,g.showrule=!1,b.ruleoutcome!=l.NONE&&(e=l.getString(b.ruleoutcome).then(function(c){var d;return a.each(s,function(a,c){c.type==b.ruletype&&(d=c.name)}),[c,d]})),e.then(function(a){"undefined"!=typeof a&&(g.showrule=!0,g.rule={outcome:a[0],type:a[1]})}).then(function(){return c.render("tool_lp/competency_summary",g).then(function(b){a('[data-region="competencyinfo"]').html(b),a('[data-action="deleterelation"]').on("click",R)})}).then(function(){return c.render("tool_lp/loading",{})}).then(function(a,b){c.replaceNodeContents('[data-region="relatedcompetencies"]',a,b)}).done(function(){f.call([{methodname:"tool_lp_data_for_related_competencies_section",args:{competencyid:b.id},done:function(b){return c.render("tool_lp/related_competencies",b).done(function(b,d){a('[data-region="relatedcompetencies"]').replaceWith(b),c.runTemplateJS(d),S()})}}])}).fail(d.exception)},W=function(a){return e.get_string("taxonomy_add_"+U(a),"tool_lp")},X=function(a){return e.get_string("taxonomy_selected_"+U(a),"tool_lp")},Y=function(b,c){var d=c.selected,e=a(d).data("id"),f=a('[data-region="competencyactions"] [data-action="add"]'),g=a('[data-region="competencyactionsmenu"]'),h=a('[data-region="selected-competency"]'),i=0,k=1;if(j.closeAll(),"undefined"==typeof e)a('[data-region="competencyinfo"]').html(d.clone().children().remove().end().text()),a('[data-region="competencyactions"]').data("competency",null),g.hide();else{var l=t.getCompetency(e);i=t.getCompetencyLevel(e),k=T(i)?i+1:!1,g.show(),a('[data-region="competencyactions"]').data("competency",l),V(l)}return X(i).then(function(a){h.text(a)}),k?W(k).then(function(a){f.show().find('[data-region="term"]').text(a)}):f.hide(),b.preventDefault(),!1},Z=function(a){var b=a.split(",");return b.unshift(""),delete b[0],b};return{init:function(b,c,d,e){t=b,n=c,r=Z(d),s=e,a('[data-region="competencyactions"] [data-action="add"]').on("click",w),j.enhance(".competencyactionsmenu",{'[data-action="edit"]':B,'[data-action="delete"]':L,'[data-action="move"]':A,'[data-action="moveup"]':E,'[data-action="movedown"]':F,'[data-action="linkedcourses"]':G,'[data-action="relatedcompetencies"]':H.bind(this),'[data-action="competencyrules"]':I.bind(this)}),a('[data-region="competencyactionsmenu"]').hide(),a('[data-region="competencyactions"] [data-action="add"]').hide(),a('[data-region="filtercompetencies"]').on("submit",D);var f=a('[data-region="managecompetencies"] [data-enhance="tree"]');f.on("dragstart","li>span",M).on("dragover","li>span",N).on("dragenter","li>span",O).on("dragleave","li>span",P).on("drop","li>span",Q),b.on("selectionchanged",Y),p=new m(t,s),p.on("save",J.bind(this))}}});
\ No newline at end of file
diff --git a/admin/tool/lp/amd/src/competencyactions.js b/admin/tool/lp/amd/src/competencyactions.js
index a56eb076932..a02e747d1d7 100644
--- a/admin/tool/lp/amd/src/competencyactions.js
+++ b/admin/tool/lp/amd/src/competencyactions.js
@@ -420,12 +420,11 @@ define(['jquery',
     var deleteCompetencyHandler = function() {
         var competency = $('[data-region="competencyactions"]').data('competency');
 
-        // We don't need to show related actions when showing the competency info.
-        delete competency.showdeleterelatedaction;
-        delete competency.showrelatedcompetencies;
-        delete competency.showrule;
+        var context = {
+            competency: competency
+        };
 
-        templates.render('tool_lp/competency_summary', competency)
+        templates.render('tool_lp/competency_summary', context)
            .done(function(html) {
 
                str.get_strings([
@@ -565,8 +564,9 @@ define(['jquery',
      */
     var renderCompetencySummary = function(competency) {
         var promise = $.Deferred().resolve().promise(),
-            context = $.extend({}, competency);
+            context = {};
 
+        context.competency = competency;
         context.showdeleterelatedaction = true;
         context.showrelatedcompetencies = true;
         context.showrule = false;
diff --git a/admin/tool/lp/classes/external.php b/admin/tool/lp/classes/external.php
index acfee430951..9255ba44c2b 100644
--- a/admin/tool/lp/classes/external.php
+++ b/admin/tool/lp/classes/external.php
@@ -1045,11 +1045,7 @@ class external extends external_api {
             'canmanage' => new external_value(PARAM_BOOL, 'True if this user has permission to manage competency frameworks'),
             'pagecontextid' => new external_value(PARAM_INT, 'Context id for the framework'),
             'search' => new external_value(PARAM_RAW, 'Current search string'),
-            'rulesmodules' => new external_multiple_structure(new external_single_structure(array(
-                'type' => new external_value(PARAM_RAW, 'The rule type'),
-                'amd' => new external_value(PARAM_RAW, 'The AMD module of the rule'),
-                'name' => new external_value(PARAM_TEXT, 'The name of the rule'),
-            )))
+            'rulesmodules' => new external_value(PARAM_RAW, 'JSON encoded data for rules')
         ));
 
     }
@@ -1119,21 +1115,7 @@ class external extends external_api {
      * @return \external_description
      */
     public static function data_for_competency_summary_returns() {
-        return new external_single_structure(array (
-            'framework' => competency_Framework_exporter::get_read_structure(),
-            'id' => new external_value(PARAM_INT, 'The competency id'),
-            'shortname' => new external_value(PARAM_TEXT, 'The competency shortname'),
-            'idnumber' => new external_value(PARAM_TEXT, 'The competency idnumber'),
-            'visible' => new external_value(PARAM_BOOL, 'True if competency visible'),
-            'descriptionformatted' => new external_value(PARAM_RAW, 'The competency description'),
-            'relatedcompetencies' => new external_multiple_structure(
-                competency_exporter::get_read_structure()
-            ),
-            'courses' => self::list_courses_using_competency_returns(),
-            'showrelatedcompetencies' => new external_value(PARAM_BOOL, 'Show or not the related competencies'),
-            'showcourses' => new external_value(PARAM_BOOL, 'Show or not the linked courses'),
-        ));
-
+        return competency_summary_exporter::get_read_structure();
     }
 
     /**
diff --git a/admin/tool/lp/classes/external/competency_summary_exporter.php b/admin/tool/lp/classes/external/competency_summary_exporter.php
index c1acc40305d..ff519ef4eb7 100644
--- a/admin/tool/lp/classes/external/competency_summary_exporter.php
+++ b/admin/tool/lp/classes/external/competency_summary_exporter.php
@@ -39,7 +39,9 @@ class competency_summary_exporter extends exporter {
         // We cache the context so it does not need to be retrieved from the framework every time.
         return array('context' => '\\context',
                      'competency' => '\\tool_lp\\competency',
-                     'linkedcourses' => '\\stdClass[]');
+                     'framework' => '\\tool_lp\\competency_framework',
+                     'linkedcourses' => '\\stdClass[]',
+                     'relatedcompetencies' => '\\tool_lp\\competency[]');
     }
 
     protected static function define_other_properties() {
@@ -48,17 +50,28 @@ class competency_summary_exporter extends exporter {
                 'type' => course_summary_exporter::read_properties_definition(),
                 'multiple' => true
             ),
+            'relatedcompetencies' => array(
+                'type' => competency_exporter::read_properties_definition(),
+                'multiple' => true
+            ),
             'competency' => array(
                 'type' => competency_exporter::read_properties_definition()
             ),
+            'framework' => array(
+                'type' => competency_framework_exporter::read_properties_definition()
+            ),
             'hascourses' => array(
                 'type' => PARAM_BOOL
+            ),
+            'hasrelatedcompetencies' => array(
+                'type' => PARAM_BOOL
             )
         );
     }
 
     protected function get_other_values(renderer_base $output) {
         $result = new stdClass();
+        $context = $this->related['context'];
 
         $courses = $this->related['linkedcourses'];
         $linkedcourses = array();
@@ -71,11 +84,22 @@ class competency_summary_exporter extends exporter {
         $result->linkedcourses = $linkedcourses;
         $result->hascourses = count($linkedcourses) > 0;
 
+        $relatedcompetencies = array();
+        foreach ($this->related['relatedcompetencies'] as $competency) {
+            $exporter = new competency_exporter($competency, array('context' => $context));
+            $competencyexport = $exporter->export($output);
+            array_push($relatedcompetencies, $competencyexport);
+        }
+        $result->relatedcompetencies = $relatedcompetencies;
+        $result->hasrelatedcompetencies = count($relatedcompetencies) > 0;
+
         $competency = $this->related['competency'];
-        $context = $this->related['context'];
         $exporter = new competency_exporter($competency, array('context' => $context));
         $result->competency = $exporter->export($output);
 
+        $exporter = new competency_framework_exporter($this->related['framework']);
+        $result->framework = $exporter->export($output);
+
         return (array) $result;
     }
 }
diff --git a/admin/tool/lp/classes/output/competency_summary.php b/admin/tool/lp/classes/output/competency_summary.php
index a00bbac7f21..e53a6beadf2 100644
--- a/admin/tool/lp/classes/output/competency_summary.php
+++ b/admin/tool/lp/classes/output/competency_summary.php
@@ -28,8 +28,7 @@ use templatable;
 use renderer_base;
 use stdClass;
 use tool_lp\api;
-use tool_lp\external\competency_exporter;
-use tool_lp\external\competency_framework_exporter;
+use tool_lp\external\competency_summary_exporter;
 
 /**
  * Class containing data for competency summary
@@ -51,9 +50,6 @@ class competency_summary implements renderable, templatable {
     /** @var course[] $courses List of courses. */
     protected $courses = array();
 
-    /** @var stdClass $data result exported to template. */
-    protected $data = null;
-
     /**
      * Construct this renderable.
      *
@@ -63,13 +59,10 @@ class competency_summary implements renderable, templatable {
      * @param boolean $includecourses Include or not competency courses.
      */
     public function __construct($competency, $framework, $includerelated, $includecourses) {
-        $this->data = new stdClass();
-        $this->data->showrelatedcompetencies = $includerelated;
-        $this->data->showrcourses = $includecourses;
         $this->competency = $competency;
         $this->framework = $framework;
         if ($includerelated) {
-            $this->relatedcompetencies = $this->competency->get_related_competencies();
+            $this->relatedcompetencies = api::get_related_competencies($competency->get_id());
         }
 
         if ($includecourses) {
@@ -84,28 +77,17 @@ class competency_summary implements renderable, templatable {
      * @return stdClass
      */
     public function export_for_template(renderer_base $output) {
+        $related = array(
+            'context' => $this->framework->get_context(),
+            'framework' => $this->framework,
+            'linkedcourses' => $this->courses,
+            'relatedcompetencies' => $this->relatedcompetencies,
+            'competency' => $this->competency
+        );
 
-        $frameworkexp = new competency_framework_exporter($this->framework, array('context' => $this->framework->get_context()));
-        $this->data->framework = $frameworkexp->export($output);
+        $exporter = new competency_summary_exporter($this->competency, $related);
+        $data = $exporter->export($output);
 
-        $compexp = new competency_exporter($this->competency, array('context' => $this->framework->get_context()));
-        $competency = $compexp->export($output);
-
-        $this->data->id = $competency->id;
-        $this->data->shortname = $competency->shortname;
-        $this->data->visible = $competency->visible;
-        $this->data->idnumber = $competency->idnumber;
-
-        $this->data->relatedcompetencies = array();
-        if ($this->relatedcompetencies) {
-            foreach ($this->relatedcompetencies as $competency) {
-                $compexporter = new competency_exporter($competency, array('context' => $this->framework->get_context()));
-                $this->data->relatedcompetencies[] = $compexporter->export($output);
-            }
-        }
-
-        $this->data->courses = $this->courses;
-
-        return $this->data;
+        return $data;
     }
 }
diff --git a/admin/tool/lp/classes/output/template_competencies_page.php b/admin/tool/lp/classes/output/template_competencies_page.php
index 0def3906307..5a9002bde94 100644
--- a/admin/tool/lp/classes/output/template_competencies_page.php
+++ b/admin/tool/lp/classes/output/template_competencies_page.php
@@ -86,14 +86,26 @@ class template_competencies_page implements renderable, templatable {
         $data->templateid = $this->templateid;
         $data->competencies = array();
         $contextcache = array();
+        $frameworkcache = array();
         foreach ($this->competencies as $competency) {
             if (!isset($contextcache[$competency->get_competencyframeworkid()])) {
                 $contextcache[$competency->get_competencyframeworkid()] = $competency->get_context();
             }
             $context = $contextcache[$competency->get_competencyframeworkid()];
+            if (!isset($frameworkcache[$competency->get_competencyframeworkid()])) {
+                $frameworkcache[$competency->get_competencyframeworkid()] = $competency->get_framework();
+            }
+            $framework = $frameworkcache[$competency->get_competencyframeworkid()];
 
             $courses = api::list_courses_using_competency($competency->get_id());
-            $related = array('competency' => $competency, 'linkedcourses' => $courses, 'context' => $context);
+            $relatedcompetencies = api::list_related_competencies($competency->get_id());
+            $related = array(
+                'competency' => $competency,
+                'linkedcourses' => $courses,
+                'context' => $context,
+                'relatedcompetencies' => $relatedcompetencies,
+                'framework' => $framework
+            );
             $exporter = new competency_summary_exporter(null, $related);
             $record = $exporter->export($output);
 
diff --git a/admin/tool/lp/templates/competency_summary.mustache b/admin/tool/lp/templates/competency_summary.mustache
index ef7491d8450..9fcd348ee14 100644
--- a/admin/tool/lp/templates/competency_summary.mustache
+++ b/admin/tool/lp/templates/competency_summary.mustache
@@ -1,14 +1,14 @@
-<p><strong>{{shortname}} <em>{{idnumber}}</em></strong></p>
-<p>{{description}}</p>
+<p><strong>{{competency.shortname}} <em>{{competency.idnumber}}</em></strong></p>
+<p>{{competency.description}}</p>
 
 {{#framework}}
 <p><strong>{{framework.shortname}}</strong></p>
 <p>{{framework.description}}</p>
 {{/framework}}
 
-{{^visible}}
+{{^competency.visible}}
 ( {{#str}} hidden, tool_lp{{/str}})
-{{/visible}}
+{{/competency.visible}}
 
 {{#showrelatedcompetencies}}
     {{> tool_lp/related_competencies }}