diff --git a/availability/condition/date/classes/frontend.php b/availability/condition/date/classes/frontend.php index abca3e6446b..ce91d037990 100644 --- a/availability/condition/date/classes/frontend.php +++ b/availability/condition/date/classes/frontend.php @@ -49,7 +49,7 @@ class frontend extends \core_availability\frontend { protected function get_javascript_strings() { return array('ajaxerror', 'direction_before', 'direction_from', 'direction_until', - 'direction_label'); + 'direction_label', 'error_dateconflict'); } /** diff --git a/availability/condition/date/lang/en/availability_date.php b/availability/condition/date/lang/en/availability_date.php index 98072a0d57f..9f0fc6c2889 100644 --- a/availability/condition/date/lang/en/availability_date.php +++ b/availability/condition/date/lang/en/availability_date.php @@ -28,6 +28,7 @@ $string['direction_from'] = 'from'; $string['direction_label'] = 'Direction'; $string['direction_until'] = 'until'; $string['description'] = 'Prevent access until (or from) a specified date and time.'; +$string['error_dateconflict'] = 'Conflicts with other date restrictions'; $string['full_from'] = 'It is after {$a}'; $string['full_from_date'] = 'It is on or after {$a}'; $string['full_until'] = 'It is before {$a}'; diff --git a/availability/condition/date/yui/build/moodle-availability_date-form/moodle-availability_date-form-debug.js b/availability/condition/date/yui/build/moodle-availability_date-form/moodle-availability_date-form-debug.js index c4eb06b60d1..e1ab688d539 100644 --- a/availability/condition/date/yui/build/moodle-availability_date-form/moodle-availability_date-form-debug.js +++ b/availability/condition/date/yui/build/moodle-availability_date-form/moodle-availability_date-form-debug.js @@ -142,5 +142,84 @@ M.availability_date.form.fillValue = function(value, node) { value.t = parseInt(node.getData('time'), 10); }; +/** + * List out Date node value in an array node. + * + * This will go through all array node and list from earlier date node to current date node. + * + * @method convertTreeDateValue + * @param {array} tree Tree node to convert + * @param {array} arrayDateNode + * @param {array} currentNode current node. + * + * @return {array} arrayDateNode + */ +M.availability_date.form.convertTreeDateValue = function(tree, arrayDateNode, currentNode) { + var shouldSkip = false; + tree.forEach(function(node) { + if (shouldSkip) { + return; + } + if (node.type === 'date') { + // We go through all tree node, if we meet the current node then return. + if (node.t === parseInt(currentNode.getData('time'), 10) + && currentNode.one('select[name=direction]').get('value') == node.d) { + shouldSkip = true; + return; + } + arrayDateNode.push(node); + } else if (node.type === undefined) { + M.availability_date.form.convertTreeDateValue(node.c, arrayDateNode, currentNode); + } + }); + return arrayDateNode; +}; + +/** + * Check current node. + * + * This will check current date node with all date node in tree node. + * + * @method checkConditionDate + * @param {array} currentNode The curent node. + * + * @return {boolean} error Return true if the date is conflict. + */ +M.availability_date.form.checkConditionDate = function(currentNode) { + var error = false; + if (M.core_availability.form.rootList.getValue().op === '&') { + var jsValue = M.core_availability.form.rootList.getValue().c; + var arrayDateNode = M.availability_date.form.convertTreeDateValue(jsValue, [], currentNode); + var currentNodeDirection = currentNode.one('select[name=direction]').get('value'); + var currentNodeTime = parseInt(currentNode.getData('time'), 10); + arrayDateNode.forEach(function(checkNode) { + // Validate if the date is conflict. + if (checkNode.d === '<') { + if (currentNodeDirection === '>=' && currentNodeTime >= checkNode.t) { + error = true; + } + } else { + if (currentNodeDirection === '<' && currentNodeTime <= checkNode.t) { + error = true; + } + } + return error; + }); + return error; + } else { + if (currentNode.one('div > .badge-warning')) { + currentNode.one('div > .badge-warning').remove(); + } + return error; + } +}; + +M.availability_date.form.fillErrors = function(errors, node) { + var error = M.availability_date.form.checkConditionDate(node); + if (error) { + errors.push('availability_date:error_dateconflict'); + } +}; + }, '@VERSION@', {"requires": ["base", "node", "event", "io", "moodle-core_availability-form"]}); diff --git a/availability/condition/date/yui/build/moodle-availability_date-form/moodle-availability_date-form-min.js b/availability/condition/date/yui/build/moodle-availability_date-form/moodle-availability_date-form-min.js index 04b294fb600..57b4ba56ae3 100644 --- a/availability/condition/date/yui/build/moodle-availability_date-form/moodle-availability_date-form-min.js +++ b/availability/condition/date/yui/build/moodle-availability_date-form/moodle-availability_date-form-min.js @@ -1 +1 @@ -YUI.add("moodle-availability_date-form",function(o,e){M.availability_date=M.availability_date||{},M.availability_date.form=o.Object(M.core_availability.plugin),M.availability_date.form.initInner=function(e,a){this.html=e,this.defaultTime=a},M.availability_date.form.getNode=function(e){var t,i,a=''+M.util.get_string("direction_before","availability_date")+' "+this.html,n=o.Node.create(""+a+"");return e.t!==undefined?(n.setData("time",e.t),n.all("select:not([name=direction])").each(function(e){e.set("disabled",!0)}),a=M.cfg.wwwroot+"/availability/condition/date/ajax.php?action=fromtime&time="+e.t,o.io(a,{on:{success:function(e,a){var t,i,l=o.JSON.parse(a.responseText);for(t in l)(i=n.one("select[name=x\\["+t+"\\]]")).set("value",""+l[t]),i.set("disabled",!1)},failure:function(){window.alert(M.util.get_string("ajaxerror","availability_date"))}}})):n.setData("time",this.defaultTime),e.d!==undefined&&n.one("select[name=direction]").set("value",e.d),M.availability_date.form.addedEvents||(M.availability_date.form.addedEvents=!0,(a=o.one(".availability-field")).delegate("change",function(){M.core_availability.form.update()},".availability_date select[name=direction]"),a.delegate("change",function(){M.availability_date.form.updateTime(this.ancestor("span.availability_date"))},".availability_date select:not([name=direction])")),n.one("a[href=#]")&&(M.form.dateselector.init_single_date_selector(n),t=n.one("select[name=x\\[year\\]]"),i=t.set,t.set=function(e,a){i.call(t,e,a),"selectedIndex"===e&&setTimeout(function(){M.availability_date.form.updateTime(n)},0)}),n},M.availability_date.form.updateTime=function(t){var e=M.cfg.wwwroot+"/availability/condition/date/ajax.php?action=totime&year="+t.one("select[name=x\\[year\\]]").get("value")+"&month="+t.one("select[name=x\\[month\\]]").get("value")+"&day="+t.one("select[name=x\\[day\\]]").get("value")+"&hour="+t.one("select[name=x\\[hour\\]]").get("value")+"&minute="+t.one("select[name=x\\[minute\\]]").get("value");o.io(e,{on:{success:function(e,a){t.setData("time",a.responseText),M.core_availability.form.update()},failure:function(){window.alert(M.util.get_string("ajaxerror","availability_date"))}}})},M.availability_date.form.fillValue=function(e,a){e.d=a.one("select[name=direction]").get("value"),e.t=parseInt(a.getData("time"),10)}},"@VERSION@",{requires:["base","node","event","io","moodle-core_availability-form"]}); \ No newline at end of file +YUI.add("moodle-availability_date-form",function(o,e){M.availability_date=M.availability_date||{},M.availability_date.form=o.Object(M.core_availability.plugin),M.availability_date.form.initInner=function(e,a){this.html=e,this.defaultTime=a},M.availability_date.form.getNode=function(e){var t,i,a=''+M.util.get_string("direction_before","availability_date")+' "+this.html,n=o.Node.create(""+a+"");return e.t!==undefined?(n.setData("time",e.t),n.all("select:not([name=direction])").each(function(e){e.set("disabled",!0)}),a=M.cfg.wwwroot+"/availability/condition/date/ajax.php?action=fromtime&time="+e.t,o.io(a,{on:{success:function(e,a){var t,i,l=o.JSON.parse(a.responseText);for(t in l)(i=n.one("select[name=x\\["+t+"\\]]")).set("value",""+l[t]),i.set("disabled",!1)},failure:function(){window.alert(M.util.get_string("ajaxerror","availability_date"))}}})):n.setData("time",this.defaultTime),e.d!==undefined&&n.one("select[name=direction]").set("value",e.d),M.availability_date.form.addedEvents||(M.availability_date.form.addedEvents=!0,(a=o.one(".availability-field")).delegate("change",function(){M.core_availability.form.update()},".availability_date select[name=direction]"),a.delegate("change",function(){M.availability_date.form.updateTime(this.ancestor("span.availability_date"))},".availability_date select:not([name=direction])")),n.one("a[href=#]")&&(M.form.dateselector.init_single_date_selector(n),t=n.one("select[name=x\\[year\\]]"),i=t.set,t.set=function(e,a){i.call(t,e,a),"selectedIndex"===e&&setTimeout(function(){M.availability_date.form.updateTime(n)},0)}),n},M.availability_date.form.updateTime=function(t){var e=M.cfg.wwwroot+"/availability/condition/date/ajax.php?action=totime&year="+t.one("select[name=x\\[year\\]]").get("value")+"&month="+t.one("select[name=x\\[month\\]]").get("value")+"&day="+t.one("select[name=x\\[day\\]]").get("value")+"&hour="+t.one("select[name=x\\[hour\\]]").get("value")+"&minute="+t.one("select[name=x\\[minute\\]]").get("value");o.io(e,{on:{success:function(e,a){t.setData("time",a.responseText),M.core_availability.form.update()},failure:function(){window.alert(M.util.get_string("ajaxerror","availability_date"))}}})},M.availability_date.form.fillValue=function(e,a){e.d=a.one("select[name=direction]").get("value"),e.t=parseInt(a.getData("time"),10)},M.availability_date.form.convertTreeDateValue=function(e,a,t){var i=!1;return e.forEach(function(e){i||("date"===e.type?e.t!==parseInt(t.getData("time"),10)||t.one("select[name=direction]").get("value")!=e.d?a.push(e):i=!0:e.type===undefined&&M.availability_date.form.convertTreeDateValue(e.c,a,t))}),a},M.availability_date.form.checkConditionDate=function(e){var a,t,i,l=!1;return"&"===M.core_availability.form.rootList.getValue().op?(a=M.core_availability.form.rootList.getValue().c,a=M.availability_date.form.convertTreeDateValue(a,[],e),t=e.one("select[name=direction]").get("value"),i=parseInt(e.getData("time"),10),a.forEach(function(e){return"<"===e.d?">="===t&&i>=e.t&&(l=!0):"<"===t&&i<=e.t&&(l=!0),l})):e.one("div > .badge-warning")&&e.one("div > .badge-warning").remove(),l},M.availability_date.form.fillErrors=function(e,a){M.availability_date.form.checkConditionDate(a)&&e.push("availability_date:error_dateconflict")}},"@VERSION@",{requires:["base","node","event","io","moodle-core_availability-form"]}); \ No newline at end of file diff --git a/availability/condition/date/yui/build/moodle-availability_date-form/moodle-availability_date-form.js b/availability/condition/date/yui/build/moodle-availability_date-form/moodle-availability_date-form.js index c4eb06b60d1..e1ab688d539 100644 --- a/availability/condition/date/yui/build/moodle-availability_date-form/moodle-availability_date-form.js +++ b/availability/condition/date/yui/build/moodle-availability_date-form/moodle-availability_date-form.js @@ -142,5 +142,84 @@ M.availability_date.form.fillValue = function(value, node) { value.t = parseInt(node.getData('time'), 10); }; +/** + * List out Date node value in an array node. + * + * This will go through all array node and list from earlier date node to current date node. + * + * @method convertTreeDateValue + * @param {array} tree Tree node to convert + * @param {array} arrayDateNode + * @param {array} currentNode current node. + * + * @return {array} arrayDateNode + */ +M.availability_date.form.convertTreeDateValue = function(tree, arrayDateNode, currentNode) { + var shouldSkip = false; + tree.forEach(function(node) { + if (shouldSkip) { + return; + } + if (node.type === 'date') { + // We go through all tree node, if we meet the current node then return. + if (node.t === parseInt(currentNode.getData('time'), 10) + && currentNode.one('select[name=direction]').get('value') == node.d) { + shouldSkip = true; + return; + } + arrayDateNode.push(node); + } else if (node.type === undefined) { + M.availability_date.form.convertTreeDateValue(node.c, arrayDateNode, currentNode); + } + }); + return arrayDateNode; +}; + +/** + * Check current node. + * + * This will check current date node with all date node in tree node. + * + * @method checkConditionDate + * @param {array} currentNode The curent node. + * + * @return {boolean} error Return true if the date is conflict. + */ +M.availability_date.form.checkConditionDate = function(currentNode) { + var error = false; + if (M.core_availability.form.rootList.getValue().op === '&') { + var jsValue = M.core_availability.form.rootList.getValue().c; + var arrayDateNode = M.availability_date.form.convertTreeDateValue(jsValue, [], currentNode); + var currentNodeDirection = currentNode.one('select[name=direction]').get('value'); + var currentNodeTime = parseInt(currentNode.getData('time'), 10); + arrayDateNode.forEach(function(checkNode) { + // Validate if the date is conflict. + if (checkNode.d === '<') { + if (currentNodeDirection === '>=' && currentNodeTime >= checkNode.t) { + error = true; + } + } else { + if (currentNodeDirection === '<' && currentNodeTime <= checkNode.t) { + error = true; + } + } + return error; + }); + return error; + } else { + if (currentNode.one('div > .badge-warning')) { + currentNode.one('div > .badge-warning').remove(); + } + return error; + } +}; + +M.availability_date.form.fillErrors = function(errors, node) { + var error = M.availability_date.form.checkConditionDate(node); + if (error) { + errors.push('availability_date:error_dateconflict'); + } +}; + }, '@VERSION@', {"requires": ["base", "node", "event", "io", "moodle-core_availability-form"]}); diff --git a/availability/condition/date/yui/src/form/js/form.js b/availability/condition/date/yui/src/form/js/form.js index 1d1656c6ac2..ca0ca736d44 100644 --- a/availability/condition/date/yui/src/form/js/form.js +++ b/availability/condition/date/yui/src/form/js/form.js @@ -139,3 +139,82 @@ M.availability_date.form.fillValue = function(value, node) { value.d = node.one('select[name=direction]').get('value'); value.t = parseInt(node.getData('time'), 10); }; + +/** + * List out Date node value in an array node. + * + * This will go through all array node and list from earlier date node to current date node. + * + * @method convertTreeDateValue + * @param {array} tree Tree node to convert + * @param {array} arrayDateNode + * @param {array} currentNode current node. + * + * @return {array} arrayDateNode + */ +M.availability_date.form.convertTreeDateValue = function(tree, arrayDateNode, currentNode) { + var shouldSkip = false; + tree.forEach(function(node) { + if (shouldSkip) { + return; + } + if (node.type === 'date') { + // We go through all tree node, if we meet the current node then return. + if (node.t === parseInt(currentNode.getData('time'), 10) + && currentNode.one('select[name=direction]').get('value') == node.d) { + shouldSkip = true; + return; + } + arrayDateNode.push(node); + } else if (node.type === undefined) { + M.availability_date.form.convertTreeDateValue(node.c, arrayDateNode, currentNode); + } + }); + return arrayDateNode; +}; + +/** + * Check current node. + * + * This will check current date node with all date node in tree node. + * + * @method checkConditionDate + * @param {array} currentNode The curent node. + * + * @return {boolean} error Return true if the date is conflict. + */ +M.availability_date.form.checkConditionDate = function(currentNode) { + var error = false; + if (M.core_availability.form.rootList.getValue().op === '&') { + var jsValue = M.core_availability.form.rootList.getValue().c; + var arrayDateNode = M.availability_date.form.convertTreeDateValue(jsValue, [], currentNode); + var currentNodeDirection = currentNode.one('select[name=direction]').get('value'); + var currentNodeTime = parseInt(currentNode.getData('time'), 10); + arrayDateNode.forEach(function(checkNode) { + // Validate if the date is conflict. + if (checkNode.d === '<') { + if (currentNodeDirection === '>=' && currentNodeTime >= checkNode.t) { + error = true; + } + } else { + if (currentNodeDirection === '<' && currentNodeTime <= checkNode.t) { + error = true; + } + } + return error; + }); + return error; + } else { + if (currentNode.one('div > .badge-warning')) { + currentNode.one('div > .badge-warning').remove(); + } + return error; + } +}; + +M.availability_date.form.fillErrors = function(errors, node) { + var error = M.availability_date.form.checkConditionDate(node); + if (error) { + errors.push('availability_date:error_dateconflict'); + } +}; diff --git a/availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-debug.js b/availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-debug.js index f7eb56944a4..34c0df0af14 100644 --- a/availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-debug.js +++ b/availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-debug.js @@ -971,7 +971,21 @@ M.core_availability.Item.prototype.fillErrors = function(errors) { // If any errors were added, add the marker to this item. var errorLabel = this.node.one('> .badge-warning'); if (errors.length !== before && !errorLabel.get('firstChild')) { - errorLabel.appendChild(document.createTextNode(M.util.get_string('invalid', 'availability'))); + var errorString = ''; + // Fetch the last error code from the array of errors and split using the ':' delimiter. + var langString = errors[errors.length - 1].split(':'); + var component = langString[0]; + var identifier = langString[1]; + // If get_string can't find the string, it will return the string in this format. + var undefinedString = '[[' + identifier + ',' + component + ']]'; + // Get the lang string. + errorString = M.util.get_string(identifier, component); + if (errorString === undefinedString) { + // Use a generic invalid input message when the error lang string cannot be loaded. + errorString = M.util.get_string('invalid', 'availability'); + } + // Show the error string. + errorLabel.appendChild(document.createTextNode(errorString)); } else if (errors.length === before && errorLabel.get('firstChild')) { errorLabel.get('firstChild').remove(); } diff --git a/availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js b/availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js index 741ff3fac1d..7d341375412 100644 --- a/availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js +++ b/availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js @@ -1,3 +1,3 @@ YUI.add("moodle-core_availability-form",function(d,i){M.core_availability=M.core_availability||{},M.core_availability.form={plugins:{},field:null,mainDiv:null,rootList:null,idCounter:0,restrictByGroup:null,init:function(i){var t,e,a,l,n;for(t in i)e=i[t],(a=M[e[0]].form).init.apply(a,e);if(this.field=d.one("#id_availabilityconditionsjson"),this.field.setAttribute("aria-hidden","true"),this.mainDiv=d.Node.create('
'),this.field.insert(this.mainDiv,"after"),n=null,""!==(l=this.field.get("value")))try{n=d.JSON.parse(l)}catch(o){this.field.set("value","")}this.rootList=new M.core_availability.List(n,!0),this.mainDiv.appendChild(this.rootList.node),this.update(),this.rootList.renumber(),this.mainDiv.setAttribute("aria-live","polite"),this.field.ancestor("form").on("submit",function(){this.mainDiv.all("input,textarea,select").set("disabled",!0)},this),this.restrictByGroup=d.one("#restrictbygroup"),this.restrictByGroup&&(this.restrictByGroup.on("click",this.addRestrictByGroup,this),l=d.one("#id_groupmode"),n=d.one("#id_groupingid"),l&&l.on("change",this.updateRestrictByGroup,this),n&&n.on("change",this.updateRestrictByGroup,this),this.updateRestrictByGroup())},update:function(){var i=this.rootList.getValue(),t=[];this.rootList.fillErrors(t),0!==t.length&&(i.errors=t),this.field.set("value",d.JSON.stringify(i)),this.updateRestrictByGroup()},updateRestrictByGroup:function(){var i,t,e,a;this.restrictByGroup&&("&"!==this.rootList.getValue().op||(this.rootList.hasItemOfType("group")||this.rootList.hasItemOfType("grouping"))?this.restrictByGroup.set("disabled",!0):(i=d.one("#id_groupmode"),t=d.one("#id_groupingid"),e=1===Number(this.restrictByGroup.getData("groupavailability")),a=1===Number(this.restrictByGroup.getData("groupingavailability")),i&&0!==Number(i.get("value"))&&e||t&&0!==Number(t.get("value"))&&a?this.restrictByGroup.set("disabled",!1):this.restrictByGroup.set("disabled",!0)))},addRestrictByGroup:function(i){var t,e,a,l;i.preventDefault(),i=d.one("#id_groupmode"),t=d.one("#id_groupingid"),e=1===Number(this.restrictByGroup.getData("groupavailability")),a=1===Number(this.restrictByGroup.getData("groupingavailability")),t&&0!==Number(t.get("value"))&&a?l=new M.core_availability.Item({type:"grouping",id:Number(t.get("value"))},!0):i&&e&&(l=new M.core_availability.Item({type:"group"},!0)),null!==l&&(this.rootList.addChild(l),this.update(),this.rootList.renumber(),this.rootList.updateHtml())}},M.core_availability.plugin={allowAdd:!1,init:function(i,t,e){i=i.replace(/^availability_/,"");this.allowAdd=t,(M.core_availability.form.plugins[i]=this).initInner.apply(this,e)},initInner:function(){},getNode:function(){throw"getNode not implemented"},fillValue:function(){throw"fillValue not implemented"},fillErrors:function(){},focusAfterAdd:function(i){i.one("input:not([disabled]),select:not([disabled])").focus()}},M.core_availability.List=function(i,t,e){var a,l,n;if(this.children=[],t!==undefined&&(this.root=t),this.node=d.Node.create('

'+M.util.get_string("listheader_sign_before","availability")+' '+M.util.get_string("listheader_single","availability")+''+M.util.get_string("listheader_multi_before","availability")+' "+M.util.get_string("listheader_multi_after","availability")+'
'+M.util.get_string("none","moodle")+'
'),t||this.node.addClass("availability-childlist d-sm-flex align-items-center"),this.inner=this.node.one("> .availability-inner"),a=!0,t?(i&&i.show!==undefined&&(a=i.show),this.eyeIcon=new M.core_availability.EyeIcon(!1,a),this.node.one(".availability-header").get("firstChild").insert(this.eyeIcon.span,"before")):e&&(i&&i.showc!==undefined&&(a=i.showc),this.eyeIcon=new M.core_availability.EyeIcon(!1,a),this.inner.insert(this.eyeIcon.span,"before")),t||(e=new M.core_availability.DeleteIcon(this),(a=this.node.one(".availability-none")).appendChild(document.createTextNode(" ")),a.appendChild(e.span),a.appendChild(d.Node.create(''+M.util.get_string("invalid","availability")+""))),(t=d.Node.create('")).on("click",function(){this.clickAdd()},this),this.node.one("div.availability-button").appendChild(t),i){switch(i.op){case"&":case"|":this.node.one(".availability-neg").set("value","");break;case"!&":case"!|":this.node.one(".availability-neg").set("value","!")}switch(i.op){case"&":case"!&":this.node.one(".availability-op").set("value","&");break;case"|":case"!|":this.node.one(".availability-op").set("value","|")}for(l=0;l')),this.children.push(i),this.inner.one(".availability-children").appendChild(i.node)},M.core_availability.List.prototype.focusAfterAdd=function(){this.inner.one("button").focus()},M.core_availability.List.prototype.isIndividualShowIcons=function(){var i,t;if(!this.root)throw"Can only call this on root list";return i="!"===this.node.one(".availability-neg").get("value"),t="|"===this.node.one(".availability-op").get("value"),!i&&!t||i&&t},M.core_availability.List.prototype.renumber=function(i){var t,e={count:this.children.length},a=i===undefined?e.number="":(e.number=i+":",i+"."),i=M.util.get_string("setheading","availability",e);for(this.node.one("> h3").set("innerHTML",i),t=0;t .availability-children").removeAttribute("aria-hidden"),this.inner.one("> .availability-none").setAttribute("aria-hidden","true"),this.inner.one("> .availability-header").removeAttribute("aria-hidden"),1 .availability-children").setAttribute("aria-hidden","true"),this.inner.one("> .availability-none").removeAttribute("aria-hidden"),this.inner.one("> .availability-header").setAttribute("aria-hidden","true")),this.root){for(i=this.isIndividualShowIcons(),t=0;t .availability-children > .availability-connector span.label").each(function(i){i.set("innerHTML",a)})},M.core_availability.List.prototype.deleteDescendant=function(i){for(var t,e,a=0;a .availability-children").removeChild(e),M.core_availability.form.update(),this.updateHtml(),this.inner.one("> .availability-button").one("button").focus(),!0;if(t instanceof M.core_availability.List&&t.deleteDescendant(i))return!0}return!1},M.core_availability.List.prototype.clickAdd=function(){var i,t,e,a,l,n=d.Node.create('
    "),o=n.one("button"),s={dialog:null},r=n.one("ul");for(l in M.core_availability.form.plugins)M.core_availability.form.plugins[l].allowAdd&&(i=d.Node.create('
  • '),(e=d.Node.create('
    ")).on("click",this.getAddHandler(l,s),this),i.appendChild(e),a=d.Node.create('
    "),i.appendChild(a),r.appendChild(i));i=d.Node.create('
  • '),(e=d.Node.create('
    ")).on("click",this.getAddHandler(null,s),this),i.appendChild(e),a=d.Node.create('
    "),i.appendChild(a),r.appendChild(i),n={headerContent:M.util.get_string("addrestriction","availability"),bodyContent:n,additionalBaseClass:"availability-dialogue",draggable:!0,modal:!0,closeButton:!1,width:"450px"},s.dialog=new M.core.dialogue(n),s.dialog.show(),o.on("click",function(){s.dialog.destroy(),this.inner.one("> .availability-button").one("button").focus()},this)},M.core_availability.List.prototype.getAddHandler=function(t,e){return function(){var i=t?new M.core_availability.Item({type:t,creating:!0},this.root):new M.core_availability.List({c:[],showc:!0},!1,this.root);this.addChild(i),M.core_availability.form.update(),M.core_availability.form.rootList.renumber(),this.updateHtml(),e.dialog.destroy(),i.focusAfterAdd()}},M.core_availability.List.prototype.getValue=function(){var i,t={};for(t.op=this.node.one(".availability-neg").get("value")+this.node.one(".availability-op").get("value"),t.c=[],i=0;i'+M.util.get_string("missingplugin","availability")+"")):(this.plugin=M.core_availability.form.plugins[i.type],this.pluginNode=this.plugin.getNode(i),this.pluginNode.addClass("availability_"+i.type)),this.node=d.Node.create('

    '),t&&(t=!0,i.showc!==undefined&&(t=i.showc),this.eyeIcon=new M.core_availability.EyeIcon(!0,t),this.node.appendChild(this.eyeIcon.span)),this.pluginNode.addClass("availability-plugincontrols"),this.node.appendChild(this.pluginNode),i=new M.core_availability.DeleteIcon(this),this.node.appendChild(i.span),this.node.appendChild(document.createTextNode(" ")),this.node.appendChild(d.Node.create(''))},M.core_availability.Item.prototype.getValue=function(){var i={type:this.pluginType};return this.plugin&&this.plugin.fillValue(i,this.pluginNode),i},M.core_availability.Item.prototype.fillErrors=function(i){var t,e=i.length;this.plugin?this.plugin.fillErrors(i,this.pluginNode):i.push("core_availability:item_unknowntype"),t=this.node.one("> .badge-warning"),i.length===e||t.get("firstChild")?i.length===e&&t.get("firstChild")&&t.get("firstChild").remove():t.appendChild(document.createTextNode(M.util.get_string("invalid","availability")))},M.core_availability.Item.prototype.renumber=function(i){var t={number:i};this.plugin?t.type=M.util.get_string("title","availability_"+this.pluginType):t.type="["+this.pluginType+"]",t.number=i+":",i=M.util.get_string("itemheading","availability",t),this.node.one("> h3").set("innerHTML",i)},M.core_availability.Item.prototype.focusAfterAdd=function(){this.plugin.focusAfterAdd(this.pluginNode)},M.core_availability.Item.prototype.pluginType=null,M.core_availability.Item.prototype.plugin=null,M.core_availability.Item.prototype.eyeIcon=null,M.core_availability.Item.prototype.node=null,M.core_availability.Item.prototype.pluginNode=null,M.core_availability.EyeIcon=function(i,t){var e,a,l,n;this.individual=i,this.span=d.Node.create(''),e=d.Node.create(""),this.span.appendChild(e),a=i?"_individual":"_all",l=function(){var i=M.util.get_string("hidden"+a,"availability");e.set("src",M.util.image_url("i/show","core")),e.set("alt",i),this.span.set("title",i+" • "+M.util.get_string("show_verb","availability"))},n=function(){var i=M.util.get_string("shown"+a,"availability");e.set("src",M.util.image_url("i/hide","core")),e.set("alt",i),this.span.set("title",i+" • "+M.util.get_string("hide_verb","availability"))},(t?n:l).call(this),this.span.on("click",i=function(i){i.preventDefault(),(this.isHidden()?n:l).call(this),M.core_availability.form.update()},this),this.span.on("key",i,"up:32",this),this.span.on("key",function(i){i.preventDefault()},"down:32",this)},M.core_availability.EyeIcon.prototype.individual=!1,M.core_availability.EyeIcon.prototype.span=null,M.core_availability.EyeIcon.prototype.isHidden=function(){var i=this.individual?"_individual":"_all",i=M.util.get_string("hidden"+i,"availability");return this.span.one("img").get("alt")===i},M.core_availability.DeleteIcon=function(t){var i;this.span=d.Node.create(''),i=d.Node.create(''+M.util.get_string('),this.span.appendChild(i),this.span.on("click",i=function(i){i.preventDefault(),M.core_availability.form.rootList.deleteDescendant(t),M.core_availability.form.rootList.renumber()},this),this.span.on("key",i,"up:32",this),this.span.on("key",function(i){i.preventDefault()},"down:32",this)},M.core_availability.DeleteIcon.prototype.span=null},"@VERSION@",{requires:["base","node","event","event-delegate","panel","moodle-core-notification-dialogue","json"]}); \ No newline at end of file +)this.children[t].fillErrors(i)},M.core_availability.List.prototype.hasItemOfType=function(i){for(var t,e=0;e'+M.util.get_string("missingplugin","availability")+"")):(this.plugin=M.core_availability.form.plugins[i.type],this.pluginNode=this.plugin.getNode(i),this.pluginNode.addClass("availability_"+i.type)),this.node=d.Node.create('

    '),t&&(t=!0,i.showc!==undefined&&(t=i.showc),this.eyeIcon=new M.core_availability.EyeIcon(!0,t),this.node.appendChild(this.eyeIcon.span)),this.pluginNode.addClass("availability-plugincontrols"),this.node.appendChild(this.pluginNode),i=new M.core_availability.DeleteIcon(this),this.node.appendChild(i.span),this.node.appendChild(document.createTextNode(" ")),this.node.appendChild(d.Node.create(''))},M.core_availability.Item.prototype.getValue=function(){var i={type:this.pluginType};return this.plugin&&this.plugin.fillValue(i,this.pluginNode),i},M.core_availability.Item.prototype.fillErrors=function(i){var t,e,a,l=i.length;this.plugin?this.plugin.fillErrors(i,this.pluginNode):i.push("core_availability:item_unknowntype"),t=this.node.one("> .badge-warning"),i.length===l||t.get("firstChild")?i.length===l&&t.get("firstChild")&&t.get("firstChild").remove():(l="",e=(i=i[i.length-1].split(":"))[0],a="[["+(i=i[1])+","+e+"]]",(l=M.util.get_string(i,e))===a&&(l=M.util.get_string("invalid","availability")),t.appendChild(document.createTextNode(l)))},M.core_availability.Item.prototype.renumber=function(i){var t={number:i};this.plugin?t.type=M.util.get_string("title","availability_"+this.pluginType):t.type="["+this.pluginType+"]",t.number=i+":",i=M.util.get_string("itemheading","availability",t),this.node.one("> h3").set("innerHTML",i)},M.core_availability.Item.prototype.focusAfterAdd=function(){this.plugin.focusAfterAdd(this.pluginNode)},M.core_availability.Item.prototype.pluginType=null,M.core_availability.Item.prototype.plugin=null,M.core_availability.Item.prototype.eyeIcon=null,M.core_availability.Item.prototype.node=null,M.core_availability.Item.prototype.pluginNode=null,M.core_availability.EyeIcon=function(i,t){var e,a,l,n;this.individual=i,this.span=d.Node.create('    '),e=d.Node.create(""),this.span.appendChild(e),a=i?"_individual":"_all",l=function(){var i=M.util.get_string("hidden"+a,"availability");e.set("src",M.util.image_url("i/show","core")),e.set("alt",i),this.span.set("title",i+" • "+M.util.get_string("show_verb","availability"))},n=function(){var i=M.util.get_string("shown"+a,"availability");e.set("src",M.util.image_url("i/hide","core")),e.set("alt",i),this.span.set("title",i+" • "+M.util.get_string("hide_verb","availability"))},(t?n:l).call(this),this.span.on("click",i=function(i){i.preventDefault(),(this.isHidden()?n:l).call(this),M.core_availability.form.update()},this),this.span.on("key",i,"up:32",this),this.span.on("key",function(i){i.preventDefault()},"down:32",this)},M.core_availability.EyeIcon.prototype.individual=!1,M.core_availability.EyeIcon.prototype.span=null,M.core_availability.EyeIcon.prototype.isHidden=function(){var i=this.individual?"_individual":"_all",i=M.util.get_string("hidden"+i,"availability");return this.span.one("img").get("alt")===i},M.core_availability.DeleteIcon=function(t){var i;this.span=d.Node.create(''),i=d.Node.create(''+M.util.get_string('),this.span.appendChild(i),this.span.on("click",i=function(i){i.preventDefault(),M.core_availability.form.rootList.deleteDescendant(t),M.core_availability.form.rootList.renumber()},this),this.span.on("key",i,"up:32",this),this.span.on("key",function(i){i.preventDefault()},"down:32",this)},M.core_availability.DeleteIcon.prototype.span=null},"@VERSION@",{requires:["base","node","event","event-delegate","panel","moodle-core-notification-dialogue","json"]}); \ No newline at end of file diff --git a/availability/yui/build/moodle-core_availability-form/moodle-core_availability-form.js b/availability/yui/build/moodle-core_availability-form/moodle-core_availability-form.js index f7eb56944a4..34c0df0af14 100644 --- a/availability/yui/build/moodle-core_availability-form/moodle-core_availability-form.js +++ b/availability/yui/build/moodle-core_availability-form/moodle-core_availability-form.js @@ -971,7 +971,21 @@ M.core_availability.Item.prototype.fillErrors = function(errors) { // If any errors were added, add the marker to this item. var errorLabel = this.node.one('> .badge-warning'); if (errors.length !== before && !errorLabel.get('firstChild')) { - errorLabel.appendChild(document.createTextNode(M.util.get_string('invalid', 'availability'))); + var errorString = ''; + // Fetch the last error code from the array of errors and split using the ':' delimiter. + var langString = errors[errors.length - 1].split(':'); + var component = langString[0]; + var identifier = langString[1]; + // If get_string can't find the string, it will return the string in this format. + var undefinedString = '[[' + identifier + ',' + component + ']]'; + // Get the lang string. + errorString = M.util.get_string(identifier, component); + if (errorString === undefinedString) { + // Use a generic invalid input message when the error lang string cannot be loaded. + errorString = M.util.get_string('invalid', 'availability'); + } + // Show the error string. + errorLabel.appendChild(document.createTextNode(errorString)); } else if (errors.length === before && errorLabel.get('firstChild')) { errorLabel.get('firstChild').remove(); } diff --git a/availability/yui/src/form/js/form.js b/availability/yui/src/form/js/form.js index 3fcd5c013e9..5e5e7399598 100644 --- a/availability/yui/src/form/js/form.js +++ b/availability/yui/src/form/js/form.js @@ -969,7 +969,21 @@ M.core_availability.Item.prototype.fillErrors = function(errors) { // If any errors were added, add the marker to this item. var errorLabel = this.node.one('> .badge-warning'); if (errors.length !== before && !errorLabel.get('firstChild')) { - errorLabel.appendChild(document.createTextNode(M.util.get_string('invalid', 'availability'))); + var errorString = ''; + // Fetch the last error code from the array of errors and split using the ':' delimiter. + var langString = errors[errors.length - 1].split(':'); + var component = langString[0]; + var identifier = langString[1]; + // If get_string can't find the string, it will return the string in this format. + var undefinedString = '[[' + identifier + ',' + component + ']]'; + // Get the lang string. + errorString = M.util.get_string(identifier, component); + if (errorString === undefinedString) { + // Use a generic invalid input message when the error lang string cannot be loaded. + errorString = M.util.get_string('invalid', 'availability'); + } + // Show the error string. + errorLabel.appendChild(document.createTextNode(errorString)); } else if (errors.length === before && errorLabel.get('firstChild')) { errorLabel.get('firstChild').remove(); }