diff --git a/VERSION b/VERSION index 37f3e39552..43b7afdb3e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -nursix-dev-4151-ge4ae781 (2020-06-26 21:43:41) +nursix-dev-4152-gea21cf2 (2020-07-01 13:16:01) diff --git a/static/scripts/S3/S3.min.js b/static/scripts/S3/S3.min.js index 103c98851b..d9f01872e3 100644 --- a/static/scripts/S3/S3.min.js +++ b/static/scripts/S3/S3.min.js @@ -1,16 +1,16 @@ /* - 2013-2020 (c) Sahana Software Foundation + 2015-2020 (c) Sahana Software Foundation @license MIT requires jQuery 1.9.1+ requires jQuery UI 1.10 widget factory - - 2015-2020 (c) Sahana Software Foundation + requires jQuery jstree 3.0.3 + 2013-2020 (c) Sahana Software Foundation @license MIT requires jQuery 1.9.1+ requires jQuery UI 1.10 widget factory - requires jQuery jstree 3.0.3 + jQuery UI :data 1.12.1 http://jqueryui.com @@ -213,11 +213,11 @@ g&&g.call(c[0]);e()})}});return b.widget}); (function(b){"function"===typeof define&&define.amd?define(["jquery","./version"],b):b(jQuery)})(function(b){(function(){function a(b,a,e){return[parseFloat(b[0])*(l.test(b[0])?a/100:1),parseFloat(b[1])*(l.test(b[1])?e/100:1)]}function c(a){var e=a[0];return 9===e.nodeType?{width:a.width(),height:a.height(),offset:{top:0,left:0}}:b.isWindow(e)?{width:a.width(),height:a.height(),offset:{top:a.scrollTop(),left:a.scrollLeft()}}:e.preventDefault?{width:0,height:0,offset:{top:e.pageY,left:e.pageX}}:{width:a.outerWidth(), height:a.outerHeight(),offset:a.offset()}}var d,e=Math.max,f=Math.abs,h=/left|center|right/,g=/top|center|bottom/,k=/[\+\-]\d+(\.[\d]+)?%?/,m=/^\w+/,l=/%$/,n=b.fn.position;b.position={scrollbarWidth:function(){if(void 0!==d)return d;var a=b("
");var e=a.children()[0];b("body").append(a);var c=e.offsetWidth;a.css("overflow","scroll");e=e.offsetWidth;c===e&&(e=a[0].clientWidth); a.remove();return d=c-e},getScrollInfo:function(a){var e=a.isWindow||a.isDocument?"":a.element.css("overflow-x"),c=a.isWindow||a.isDocument?"":a.element.css("overflow-y");e="scroll"===e||"auto"===e&&a.width
| "}n&&(e=e+''+this._generateHTMLMinutes(a),e+=" | ");e+="||||||||
';d&&(c=d.apply(a.input?a.input[0]:null,[b]));c&&(!isNaN(parseInt(f.hour))&&b>f.hour&&(c=!1),!isNaN(parseInt(g.hour))&&b |
"+v+""}r.label&&(l+="")}}else for(n=0,m=f.length;n'+v+"";e.html(l);k&&e.val(k);g.length&&g.hide();e.hasClass("groupedopts-filter-widget")&&e.groupedopts("instance")?e.groupedopts("refresh"):e.hasClass("multiselect-filter-widget")&&e.multiselect("instance")?(e.multiselect("refresh"), +function(a,b){void 0===a&&(a=$("body").find("form.filter-form").first());a.data("noAutoSubmit",1);var c,d={},f,g,k;var l=0;for(f=b.length;l ');for(var q=0,t=n.items.length;q "+r+""}n.label&&(l+="")}}else for(m=0,p=f.length;m '+r+"";e.html(l);k&&e.val(k);g.length&&g.hide();e.hasClass("groupedopts-filter-widget")&&e.groupedopts("instance")?e.groupedopts("refresh"):e.hasClass("multiselect-filter-widget")&&e.multiselect("instance")?(e.multiselect("refresh"), e.multiselect("instance").button.show()):e.removeClass("hide").show()}}}else e.hasClass("date-filter")&&(g=f.min,h=f.max,$("#"+d+"-ge").calendarWidget("instance").option("minDateTime",g).option("maxDateTime",h).refresh(),$("#"+d+"-le").calendarWidget("instance").option("minDateTime",g).option("maxDateTime",h).refresh(),e.find(".range-picker").trigger("resize",[g,h,f.ts]))}}c.data("noAutoSubmit",0);b&&b.apply()}).fail(function(a,b,c){console.log("UNAUTHORIZED"==c?i18n.gis_requires_login:a.responseText)})}; -var m=function(a,b){$("#"+a[0].id).closest(".dt-wrapper").find(".dt-export").each(function(){var a=$(this),c=a.data("url");c&&a.data("url",k(c,b))})},l=function(a){var b=$("#"+a).find('input.filter-submit-url[type="hidden"]').first().val(),d=c[a],e;c[a]={};for(e in d){var f=$("#"+e);var h=f.is(":visible")?!0:!1;var l=d[e];f=l.needs_reload;if(h){if(f){var n=g($("#"+a));b=k(b,n);window.location.href=b}}else c[a][e]=l}for(e in d)f=$("#"+e),f.is(":visible")&&(l=d[e],f=$("#"+e),f.hasClass("dataTable")? -(a=f.dataTable(),l=l.ajaxurl,a.fnReloadAjax(l),m(a,n),$("#"+a[0].id+"_dataTable_filterURL").val(l)):f.hasClass("dl")?f.datalist("ajaxReload",l.queries):f.hasClass("map_wrapper")?S3.gis.refreshLayer("search_results",l.queries):f.hasClass("gi-container")?f.groupedItems("reload",null,l.queries):f.hasClass("pt-container")?f.pivottable("reload",null,l.queries):f.hasClass("tp-container")?f.timeplot("reload",null,l.queries):f.hasClass("s3-organizer")&&f.organizer("reload"))};S3.search.filterFormAutoSubmit= -function(a,b){a=$("#"+a);if(a.length&&b)a.on("optionChanged",function(){var a=$(this);if(!a.data("noAutoSubmit")){var c=a.data("autoSubmitTimeout");c&&clearTimeout(c);c=setTimeout(function(){t(a)},b);a.data("autoSubmitTimeout",c)}})};var n=function(){var a=new jQuery.Deferred;setTimeout(function B(){void 0!=S3.gis.maps?a.resolve("loaded"):"pending"===a.state()&&(a.notify("waiting for JS to load..."),setTimeout(B,500))},1);return a.promise()},p=function(a,b,d){void 0===d&&(d=g($("#"+a)));c.hasOwnProperty(a)|| -(c[a]={});if(!c[a].hasOwnProperty(b)){var e=$("#"+b);if(e.hasClass("dl")||e.hasClass("gi-container")||e.hasClass("pt-container")||e.hasClass("tp-container")||e.hasClass("map_wrapper")||e.hasClass("s3-organizer"))var f=null;else if(e.hasClass("dataTable")){if(e=$("input#"+b+"_configurations"),e.length)if(f=JSON.parse($(e).val()).ajaxUrl,"undefined"!=typeof f)f=k(f,d);else return}else return;c[a][b]={needs_reload:!1,ajaxurl:f,queries:d}}};S3.search.setup_hidden_widget=p;var q=function(a){a=$(a);if(a.hasClass("responsive"))(a= -a.DataTable())&&a.responsive&&a.responsive.recalc();else if(a.hasClass("doublescroll"))try{a.dataTableS3("doubleScroll")}catch(v){}},u=function(a,b){var c=b.find(".map_wrapper"),d=c.length;d?$.when(n()).then(function(){for(var b=S3.gis,e=0;e
=k;k++){var p=$("#"+c+k);if(p.length){var q=a["options"+k];q.sort();var r="";for(var u in q)if(q.hasOwnProperty(u)){b=q[u];var t=h?l[b]||b:b;r+='"}p.html(r);if(p.hasClass("groupedopts-filter-widget")&&p.groupedopts("instance"))try{p.groupedopts("refresh")}catch(W){}else p.hasClass("multiselect-filter-widget")&& -p.multiselect("instance")&&p.multiselect("refresh");k===f&&(p.next("button").removeClass("hidden").show(),b=e.next(".ui-multiselect").next(".location-filter").next(".ui-multiselect"),b.length&&(b=b.next(".location-filter").next(".ui-multiselect"),b.length&&(b.hide(),b=b.next(".location-filter").next(".ui-multiselect"),b.length&&(b.hide(),b=b.next(".location-filter").next(".ui-multiselect"),b.length&&(b.hide(),b=b.next(".location-filter").next(".ui-multiselect"),b.length&&b.hide())))))}}}}else{for(k= -d+1;5>=k;k++)if(p=$("#"+c+k),p.length)if(p.html(""),p.hasClass("groupedopts-filter-widget")&&p.groupedopts("instance"))try{p.groupedopts("refresh")}catch(W){}else p.hasClass("multiselect-filter-widget")&&p.multiselect("instance")&&p.multiselect("refresh");b=e.next(".ui-multiselect").next(".location-filter").next(".ui-multiselect");b.length&&(b.hide(),b=b.next(".location-filter").next(".ui-multiselect"),b.length&&(b.hide(),b=b.next(".location-filter").next(".ui-multiselect"),b.length&&(b.hide(),b= -b.next(".location-filter").next(".ui-multiselect"),b.length&&(b.hide(),b=b.next(".location-filter").next(".ui-multiselect"),b.length&&b.hide()))))}},t=function(a){S3.hideAlerts("warning");var b=a.attr("id"),d=a.find('input.filter-submit-url[type="hidden"]').val(),e=g(a);if(a.hasClass("filter-ajax")){a=a.find('input.filter-submit-target[type="hidden"]').val();c[b]={};a=a.split(" ");var f={},h;for(h=0;h =k;k++){var n=$("#"+c+k);if(n.length){var q=a["options"+k];q.sort();var t="";for(var r in q)if(q.hasOwnProperty(r)){b=q[r];var z=h?l[b]||b:b;t+='"}n.html(t);if(n.hasClass("groupedopts-filter-widget")&&n.groupedopts("instance"))try{n.groupedopts("refresh")}catch(W){}else n.hasClass("multiselect-filter-widget")&& +n.multiselect("instance")&&n.multiselect("refresh");k===f&&(n.next("button").removeClass("hidden").show(),b=e.next(".ui-multiselect").next(".location-filter").next(".ui-multiselect"),b.length&&(b=b.next(".location-filter").next(".ui-multiselect"),b.length&&(b.hide(),b=b.next(".location-filter").next(".ui-multiselect"),b.length&&(b.hide(),b=b.next(".location-filter").next(".ui-multiselect"),b.length&&(b.hide(),b=b.next(".location-filter").next(".ui-multiselect"),b.length&&b.hide())))))}}}}else{for(k= +d+1;5>=k;k++)if(n=$("#"+c+k),n.length)if(n.html(""),n.hasClass("groupedopts-filter-widget")&&n.groupedopts("instance"))try{n.groupedopts("refresh")}catch(W){}else n.hasClass("multiselect-filter-widget")&&n.multiselect("instance")&&n.multiselect("refresh");b=e.next(".ui-multiselect").next(".location-filter").next(".ui-multiselect");b.length&&(b.hide(),b=b.next(".location-filter").next(".ui-multiselect"),b.length&&(b.hide(),b=b.next(".location-filter").next(".ui-multiselect"),b.length&&(b.hide(),b= +b.next(".location-filter").next(".ui-multiselect"),b.length&&(b.hide(),b=b.next(".location-filter").next(".ui-multiselect"),b.length&&b.hide()))))}},u=function(a){S3.hideAlerts("warning");var b=a.attr("id"),d=a.find('input.filter-submit-url[type="hidden"]').val(),e=g(a);if(a.hasClass("filter-ajax")){a=a.find('input.filter-submit-target[type="hidden"]').val();c[b]={};a=a.split(" ");var f={},h;for(h=0;h m||m.format("M")===h.format("M");)q=m.format("YYYY"),q!=l&&(n.push({year:q,months:[]}),l=q,p++),n[p].months.push(m.format("MMM YYYY")),m.add(1,"month");for(p=0;p ';for(l=0;l '+m[l]+"";f+=""}d.before(' ");f=$("#"+k+"-cs");n=$("#"+k+"-ce");f.val(g.format("MMM YYYY"));n.val(h.format("MMM YYYY"));a();d.before(' Play '); -var u=$("#"+k+" .play"),t=$("#"+k+" .pause"),w=$("#"+k+" .stop"),z=d.data("slots");3>z.length&&u.hide();var R,D,K,F=d.rangepicker({type:"double",startValue:g.format(e),endValue:h.format(e),translateSelectLabel:function(a,b){g=new Date(d.data("min"));h=new Date(d.data("max"));R=h-g;D=a/b*R;K=new Date(+g+parseInt(D));return moment(K).format(e)}});d.before('');var E=function(a){a=a.point;return'p||p.format("M")===h.format("M");)q=p.format("YYYY"),q!=l&&(m.push({year:q,months:[]}),l=q,n++),m[n].months.push(p.format("MMM YYYY")),p.add(1,"month");for(n=0;n';for(l=0;l '+p[l]+"";f+=""}d.before(' ");f=$("#"+k+"-cs");m=$("#"+k+"-ce");f.val(g.format("MMM YYYY"));m.val(h.format("MMM YYYY"));a();d.before(' Play '); +var t=$("#"+k+" .play"),z=$("#"+k+" .pause"),u=$("#"+k+" .stop"),v=d.data("slots");3>v.length&&t.hide();var R,D,K,F=d.rangepicker({type:"double",startValue:g.format(e),endValue:h.format(e),translateSelectLabel:function(a,b){g=new Date(d.data("min"));h=new Date(d.data("max"));R=h-g;D=a/b*R;K=new Date(+g+parseInt(D));return moment(K).format(e)}});d.before('');var E=function(a){a=a.point;return'"};F.graph=function(){nv.addGraph(function(){var b=nv.models.lineChart().margin({left:0,right:0}).showLegend(!1).showYAxis(!1).showXAxis(!1);b.tooltip.contentGenerator(E);var c=a();d3.select("#"+k+"-chart svg").datum(c).call(b);nv.utils.windowResize(function(){b.update()});return b})};F.graph();var O=$("#"+k+"-ge"),S=$("#"+k+"-le"),X,P,Q,M,I,J;d.on("update",function(){X=F.getSelectValue();P=X.totalWidth;Q=X.start;M= -X.end;g=new Date(d.data("min"));h=new Date(d.data("max"));R=h-g;D=Q/P*R;I=new Date(+g+parseInt(D));O.val(moment(I).format(e));D=M/P*R;J=new Date(+g+parseInt(D));S.val(moment(J).format(e));d.closest("form").trigger("optionChanged")});f.on("change",function(){g=moment($(this).val(),"MMM YYYY");d.data("min",g.format());I=g.format(e);F.refresh({startValue:I});O.val(I);d.closest("form").trigger("optionChanged")});n.on("change",function(){h=moment($(this).val(),"MMM YYYY").endOf("month");d.data("max",h.format()); -J=h.format(e);F.refresh({endValue:J});S.val(J);d.closest("form").trigger("optionChanged")});O.on("change",function(){b()});S.on("change",function(){b()});d.on("clear",function(){F.updatePosition("100%","0%")});d.on("resize",function(a,b,c,f){d.data("min",b);d.data("max",c);F.refresh({startValue:moment(b).format(e),endValue:moment(c).format(e)});d.data("ts",f);F.graph();z=d.data("slots");2'+a.x.format(e)+''+a.y+"'+f.createText+""):b(' ');f.createTooltip&&this.create_btn.attr("title",f.createTooltip);this.load_btn&&this.load_btn.remove();this.load_btn=f.loadText?b(''+ f.loadText+""):b('');f.loadTooltip&&this.load_btn.attr("title",f.loadTooltip);this.save_btn&&this.save_btn.remove();this.save_btn=f.saveText?b(''+f.saveText+""):b('');f.saveTooltip&&this.save_btn.attr("title",f.saveTooltip);this.delete_btn&&this.delete_btn.remove();this.delete_btn=f.deleteText?b(''+f.deleteText+""): @@ -870,20 +839,15 @@ this.options.ajaxURL;h=-1!=h.search(/.*\?.*/)?h+"&delete=1":h+"?delete=1";var g= c=this.options,f=b(a).find("option");1==f.length&&f.first().hasClass("filter-manager-prompt")?(b(a).prop("disabled",!0),b(a).find("option.filter-manager-prompt").text(c.emptyHint)):(b(a).prop("disabled",!1),b(a).find("option.filter-manager-prompt").text(c.selectHint));this._showCRUDButtons()},_load:function(){var a=this.element,c=this.options.filters,f=b(a).val();f&&c.hasOwnProperty(f)&&S3.search.setCurrentFilters(b(a).closest("form"),c[f])},clear:function(){b(this.element).val("");this._cancel()}, _showCRUDButtons:function(){var a=this.options;this._hideCRUDButtons();!a.readOnly&&a.allowCreate&&this.create_btn.show();b(this.element).val()&&(a.explicitLoad&&this.load_btn.show(),a.readOnly||(a.allowUpdate&&this.save_btn.show(),a.allowDelete&&this.delete_btn.show()))},_hideCRUDButtons:function(){this.create_btn.hide();this.load_btn.hide();this.delete_btn.hide();this.save_btn.hide()},_getFilterURL:function(){var a=b(this.element).closest("form").find('input.filter-submit-url[type="hidden"]');return a.length? a.first().val():document.URL},_bindEvents:function(){var a=this;this.create_btn.click(function(){a._newFilter()});this.accept_btn.click(function(){a._accept()});this.cancel_btn.click(function(){a._cancel()});this.element.change(function(){a._showCRUDButtons();a.options.explicitLoad||a._load()});this.options.explicitLoad&&this.load_btn.click(function(){a._load()});this.save_btn.click(function(){a._save()});this.delete_btn.click(function(){a._delete()})},_unbindEvents:function(){this.create_btn&&this.create_btn.unbind("click"); -this.accept_btn&&this.accept_btn.unbind("click");this.cancel_btn&&this.cancel_btn.unbind("click");this.load_btn&&this.options.explicitLoad&&this.load_btn.unbind("click");this.save_btn&&this.save_btn.unbind("click");this.delete_btn&&this.delete_btn.unbind("click");this.element.unbind("change")}})})(jQuery);S3.supply={};S3.supply.fncPrepItem=function(b){for(var a=0;a');S3.JSONRequest[$(this).attr("id")]=$.getJSON(a,function(a){var b=a.iquantity;a=a.pquantity;var c=$('[name="item_pack_id"] option:selected').text(),f=/\(([0-9]*)\sx/.exec(c); -TotalQuantity=' / '+(b*a/(null===f?1:f[1])).toFixed(2)+" "+c+" ("+i18n.in_inv+")";$("#inv_quantity_throbber").remove();$('[name="quantity"]').after(TotalQuantity)})});b();$("#inv_recv_type").change(b);$(document).on("click",".quantity.ajax_more",function(a){a.preventDefault();a=$(this);if(a.hasClass("collapsed")){if(a.hasClass("fulfil")){var b="inv";var d="recv"}else a.hasClass("transit")?(d="send",b="inv"):a.hasClass("commit")&&(d="commit",b="req");a.after('').removeClass("collapsed").addClass("expanded"); -var e=$(".action-btn",a.parent().parent().parent()).attr("href");e=/req_item\/(\d*).*/i.exec(e)[1];e=S3.Ap.concat("/",b,"/",d,"_item_json.json/",e);$.ajax({url:e,dataType:"json",context:a}).done(function(a){RecvTable=' ';for(i=0;i
";$(".quantity_req_ajax_throbber",this.parent()).remove();this.parent().after(RecvTable)})}else a.removeClass("expanded").addClass("collapsed"),$(".recv_table",a.parent().parent()).remove()})}); -(function(b,a){var c=0;b.widget("s3.groupedopts",{options:{columns:3,emptyText:"No options available",orientation:"columns",sort:!0,table:!0,comment:""},_create:function(){var b=this.element.hide();this.id=c;c+=1;b.attr("multiple")!==a?this.multiple=!0:this.multiple=!1;this.menu=null},_init:function(){this.refresh()},_destroy:function(){this.menu.remove();this.element.show()},refresh:function(){var a=this.element,c=this.options;this.index=0;this.name="s3-groupedopts-"+this.id;this.menu&&this.menu.remove(); -this.selected=a.val();var f=a.find("optgroup");if(a.find("option").length)if(f.length)for(this.grouped=!0,this.menu=b(''),c=0;c",0===i?RecvTable+=a[0].id:(RecvURL=S3.Ap.concat("/",b,"/",d,"/",a[i].id,"/track_item"),RecvTable+="",null!==a[i].date?(RecvTable+=a[i].date.substring(0,10)+" - ",RecvTable+=a[i].name+""): -RecvTable+=" - "),RecvTable+=" "+a[i].quantity+" ";RecvTable+="'):b(''),f=a.find("option"),this._renderRows(f,this.menu);else this.grouped=!0,this.menu=b(' "); -a.after(this.menu);this._bindEvents()},hide:function(){this.menu.hide()},show:function(){this.menu.show()},visible:function(){return this.menu.is(":visible")},_renderGroup:function(a){var c=b(a).attr("label");a=b(a).find("option");a.length&&(c=b(' '+c+""),this.menu.append(c),c=this.options.table?b(''):b('