MDL-52754 tool_lp: Use ScaleValues AMD module in ScaleConfig
This commit is contained in:
Frederic Massart
@@ -1 +1 @@
|
||||
define(["jquery","core/notification","core/ajax","core/log","tool_lp/grade_dialogue","tool_lp/event_base","tool_lp/scalevalues"],function(a,b,c,d,e,f,g){var h=function(b,c,d,e,g,h,i,j,k){f.prototype.constructor.apply(this,[]);var l=a(b);if(!l.length)throw new Error("Could not find the trigger");this._scaleId=c,this._competencyId=d,this._userId=e,this._planId=g,this._courseId=h,this._chooseStr=i,this._canGrade=j,this._canSuggest=k,this._setUp(),l.click(function(a){a.preventDefault(),this._dialogue.display()}.bind(this)),this._planId?(this._methodName="tool_lp_grade_competency_in_plan",this._args={competencyid:this._competencyId,planid:this._planId}):this._courseId?(this._methodName="tool_lp_grade_competency_in_course",this._args={competencyid:this._competencyId,courseid:this._courseId,userid:this._userId}):(this._methodName="tool_lp_grade_competency",this._args={userid:this._userId,competencyid:this._competencyId})};return h.prototype=Object.create(f.prototype),h.prototype._setUp=function(){var a=[],d=this;window.alert("setup");var f=g.get_values(d._scaleId);f.done(function(f){a.push({value:"",name:d._chooseStr});for(var g=0;g<f.length;g++){var h=f[g];a.push({value:h.id,name:h.name})}d._dialogue=new e(a,d._canGrade,d._canSuggest),d._dialogue.on("rated",function(a,e){var f=d._args;f.grade=e.rating,f.note=e.note,f.override=!0,c.call([{methodname:d._methodName,args:f,done:function(a){d._trigger("competencyupdated",{args:f,evidence:a})}.bind(d),fail:b.exception}])}.bind(d)),d._dialogue.on("suggested",function(a,e){var f=d._args;f.grade=e.rating,f.note=e.note,f.override=!1,c.call([{methodname:d._methodName,args:f,done:function(a){d._trigger("competencyupdated",{args:f,evidence:a})}.bind(d),fail:b.exception}])}.bind(d))}).fail(b.exception)},h.prototype._scaleId=null,h.prototype._competencyId=null,h.prototype._userId=null,h.prototype._planId=null,h.prototype._courseId=null,h.prototype._chooseStr=null,h.prototype._dialogue=null,h.prototype._canGrade=null,h.prototype._canSuggest=null,h});
|
||||
define(["jquery","core/notification","core/ajax","core/log","tool_lp/grade_dialogue","tool_lp/event_base","tool_lp/scalevalues"],function(a,b,c,d,e,f,g){var h=function(b,c,d,e,g,h,i,j,k){f.prototype.constructor.apply(this,[]);var l=a(b);if(!l.length)throw new Error("Could not find the trigger");this._scaleId=c,this._competencyId=d,this._userId=e,this._planId=g,this._courseId=h,this._chooseStr=i,this._canGrade=j,this._canSuggest=k,this._setUp(),l.click(function(a){a.preventDefault(),this._dialogue.display()}.bind(this)),this._planId?(this._methodName="tool_lp_grade_competency_in_plan",this._args={competencyid:this._competencyId,planid:this._planId}):this._courseId?(this._methodName="tool_lp_grade_competency_in_course",this._args={competencyid:this._competencyId,courseid:this._courseId,userid:this._userId}):(this._methodName="tool_lp_grade_competency",this._args={userid:this._userId,competencyid:this._competencyId})};return h.prototype=Object.create(f.prototype),h.prototype._setUp=function(){var a=[],d=this,f=g.get_values(d._scaleId);f.done(function(f){a.push({value:"",name:d._chooseStr});for(var g=0;g<f.length;g++){var h=f[g];a.push({value:h.id,name:h.name})}d._dialogue=new e(a,d._canGrade,d._canSuggest),d._dialogue.on("rated",function(a,e){var f=d._args;f.grade=e.rating,f.note=e.note,f.override=!0,c.call([{methodname:d._methodName,args:f,done:function(a){d._trigger("competencyupdated",{args:f,evidence:a})}.bind(d),fail:b.exception}])}.bind(d)),d._dialogue.on("suggested",function(a,e){var f=d._args;f.grade=e.rating,f.note=e.note,f.override=!1,c.call([{methodname:d._methodName,args:f,done:function(a){d._trigger("competencyupdated",{args:f,evidence:a})}.bind(d),fail:b.exception}])}.bind(d))}).fail(b.exception)},h.prototype._scaleId=null,h.prototype._competencyId=null,h.prototype._userId=null,h.prototype._planId=null,h.prototype._courseId=null,h.prototype._chooseStr=null,h.prototype._dialogue=null,h.prototype._canGrade=null,h.prototype._canSuggest=null,h});
|
||||
+1
-1
@@ -1 +1 @@
|
||||
define(["jquery","core/notification","core/templates","core/ajax","tool_lp/dialogue"],function(a,b,c,d,e){var f=null,g=0,h=0,i=function(){if(h=a("#id_scaleid").val(),!(0>=h)){var d=a("#id_scaleid option:selected").text();m(h).done(function(){var a={scalename:d,scales:f};c.render("tool_lp/scale_configuration_page",a).done(function(a){new e(d,a,k)}).fail(b.exception)}).fail(b.exception)}},j=function(){var b=a("#tool_lp_scaleconfiguration").val();if(""!==b){var c=a.parseJSON(b),d=c.shift();if(d.scaleid===g)return c}return""},k=function(b){var c=a(b.getContent());if(g===h){var d=j();""!==d&&d.forEach(function(b){1===b.scaledefault&&a("#tool_lp_scale_default_"+b.id).attr("checked",!0),1===b.proficient&&a("#tool_lp_scale_proficient_"+b.id).attr("checked",!0)})}c.on("click",'[data-action="close"]',function(){l(),b.close()}),c.on("click",'[data-action="cancel"]',function(){b.close()})},l=function(){var b=[{scaleid:h}];f.forEach(function(c){var d=0,e=0;a("#tool_lp_scale_default_"+c.id).is(":checked")&&(d=1),a("#tool_lp_scale_proficient_"+c.id).is(":checked")&&(e=1),b.push({name:c.name,id:c.id,scaledefault:d,proficient:e})});var c=JSON.stringify(b);a("#tool_lp_scaleconfiguration").val(c),g=h},m=function(b){var c=a.Deferred(),e=d.call([{methodname:"tool_lp_get_scale_values",args:{scaleid:b}}]);return e[0].done(function(a){f=a,c.resolve(a)}).fail(function(a){c.reject(a)}),c.promise()},n=function(b){a(b.target).val()<=0?a("#id_scaleconfigbutton").prop("disabled",!0):a("#id_scaleconfigbutton").prop("disabled",!1)};return{init:function(){g=a("#id_scaleid").val(),a("#id_scaleid").on("change",n).change(),a("#id_scaleconfigbutton").click(i)}}});
|
||||
define(["jquery","core/notification","core/templates","core/ajax","tool_lp/dialogue","tool_lp/scalevalues"],function(a,b,c,d,e,f){var g=null,h=0,i=0,j=function(){if(i=a("#id_scaleid").val(),!(0>=i)){var d=a("#id_scaleid option:selected").text();n(i).done(function(){var a={scalename:d,scales:g};c.render("tool_lp/scale_configuration_page",a).done(function(a){new e(d,a,l)}).fail(b.exception)}).fail(b.exception)}},k=function(){var b=a("#tool_lp_scaleconfiguration").val();if(""!==b){var c=a.parseJSON(b),d=c.shift();if(d.scaleid===h)return c}return""},l=function(b){var c=a(b.getContent());if(h===i){var d=k();""!==d&&d.forEach(function(b){1===b.scaledefault&&a("#tool_lp_scale_default_"+b.id).attr("checked",!0),1===b.proficient&&a("#tool_lp_scale_proficient_"+b.id).attr("checked",!0)})}c.on("click",'[data-action="close"]',function(){m(),b.close()}),c.on("click",'[data-action="cancel"]',function(){b.close()})},m=function(){var b=[{scaleid:i}];g.forEach(function(c){var d=0,e=0;a("#tool_lp_scale_default_"+c.id).is(":checked")&&(d=1),a("#tool_lp_scale_proficient_"+c.id).is(":checked")&&(e=1),b.push({name:c.name,id:c.id,scaledefault:d,proficient:e})});var c=JSON.stringify(b);a("#tool_lp_scaleconfiguration").val(c),h=i},n=function(a){return f.get_values(a).then(function(a){return g=a,a})},o=function(b){a(b.target).val()<=0?a("#id_scaleconfigbutton").prop("disabled",!0):a("#id_scaleconfigbutton").prop("disabled",!1)};return{init:function(){h=a("#id_scaleid").val(),a("#id_scaleid").on("change",o).change(),a("#id_scaleconfigbutton").click(j)}}});
|
||||
+1
-1
@@ -1 +1 @@
|
||||
define(["jquery","core/ajax"],function(a,b){var c=[];return{get_values:function(d){var e=a.Deferred();return c[d]?(window.alert("cached"),e.resolve(c[d])):(window.alert("not cached"),b.call([{methodname:"tool_lp_get_scale_values",args:{scaleid:d},done:function(a){c[d]=a,e.resolve(a)},fail:e.reject}])),e.promise()}}});
|
||||
define(["jquery","core/ajax"],function(a,b){var c=[];return{get_values:function(d){var e=a.Deferred();return"undefined"==typeof c[d]?b.call([{methodname:"tool_lp_get_scale_values",args:{scaleid:d},done:function(a){c[d]=a,e.resolve(a)},fail:e.reject}]):e.resolve(c[d]),e.promise()}}});
|
||||
@@ -21,8 +21,8 @@
|
||||
* @copyright 2015 Adrian Greeve <[email protected]>
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
||||
*/
|
||||
define(['jquery', 'core/notification', 'core/templates', 'core/ajax', 'tool_lp/dialogue'],
|
||||
function($, notification, templates, ajax, Dialogue) {
|
||||
define(['jquery', 'core/notification', 'core/templates', 'core/ajax', 'tool_lp/dialogue', 'tool_lp/scalevalues'],
|
||||
function($, notification, templates, ajax, Dialogue, ModScaleValues) {
|
||||
|
||||
/** @var {Array} scalevalues ID and name of the scales. */
|
||||
var scalevalues = null;
|
||||
@@ -145,20 +145,10 @@ define(['jquery', 'core/notification', 'core/templates', 'core/ajax', 'tool_lp/d
|
||||
* @return {Promise} A deffered object with the scale values.
|
||||
*/
|
||||
var getScaleValues = function(scaleid) {
|
||||
var deferred = $.Deferred();
|
||||
var promises = ajax.call([{
|
||||
methodname: 'tool_lp_get_scale_values',
|
||||
args: {
|
||||
scaleid: scaleid
|
||||
}
|
||||
}]);
|
||||
promises[0].done(function(result) {
|
||||
scalevalues = result;
|
||||
deferred.resolve(result);
|
||||
}).fail(function(exception) {
|
||||
deferred.reject(exception);
|
||||
return ModScaleValues.get_values(scaleid).then(function(values) {
|
||||
scalevalues = values;
|
||||
return values;
|
||||
});
|
||||
return deferred.promise();
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
@@ -37,7 +37,7 @@ define(['jquery', 'core/ajax'], function($, ajax) {
|
||||
|
||||
var deferred = $.Deferred();
|
||||
|
||||
if (!localCache[scaleid]) {
|
||||
if (typeof localCache[scaleid] === 'undefined') {
|
||||
ajax.call([{
|
||||
methodname: 'tool_lp_get_scale_values',
|
||||
args: {scaleid : scaleid},
|
||||
|
||||
Reference in New Issue
Block a user