@@ -215,10 +238,12 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
head ? $row.addClass('list-item--head')
: $row = $(`
`).append($row);
- return $row;
- },
- render_result_list: function(results, more = 0, empty=true) {
+ $(".modal-dialog .list-item--head").css("z-index", 0);
+ return $row;
+ }
+
+ render_result_list(results, more = 0, empty = true) {
var me = this;
var more_btn = me.dialog.fields_dict.more_btn.$wrapper;
@@ -240,44 +265,44 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
});
if (frappe.flags.auto_scroll) {
- this.$results.animate({scrollTop: me.$results.prop('scrollHeight')}, 500);
+ this.$results.animate({ scrollTop: me.$results.prop('scrollHeight') }, 500);
}
- },
+ }
- empty_list: function() {
+ empty_list() {
+ // Store all checked items
let checked = this.get_checked_items().map(item => {
return {
...item,
checked: true
- }
+ };
});
+
+ // Remove **all** items
this.$results.find('.list-item-container').remove();
+
+ // Rerender checked items
this.render_result_list(checked, 0, false);
- },
+ }
- get_results: function() {
+ get_results() {
let me = this;
+ let filters = this.get_query ? this.get_query().filters : {} || {};
+ let filter_fields = [];
- let filters = this.get_query ? this.get_query().filters : {};
- let filter_fields = [me.date_field];
- if($.isArray(this.setters)) {
- for (let df of this.setters) {
- filters[df.fieldname] = me.dialog.fields_dict[df.fieldname].get_value() || undefined;
- me.args[df.fieldname] = filters[df.fieldname];
- filter_fields.push(df.fieldname);
- }
- } else {
- Object.keys(this.setters).forEach(function(setter) {
- filters[setter] = me.dialog.fields_dict[setter].get_value() || undefined;
+ Object.keys(this.setters).forEach(function (setter) {
+ var value = me.dialog.fields_dict[setter].get_value();
+ if (me.dialog.fields_dict[setter].df.fieldtype == "Data" && value) {
+ filters[setter] = ["like", "%" + value + "%"];
+ } else {
+ filters[setter] = value || undefined;
me.args[setter] = filters[setter];
filter_fields.push(setter);
- });
- }
+ }
+ });
- let date_val = this.dialog.fields_dict["date_range"].get_value();
- if(date_val) {
- filters[this.date_field] = ['between', date_val];
- }
+ let filter_group = this.get_custom_filters();
+ Object.assign(filters, filter_group);
let args = {
doctype: me.doctype,
@@ -288,13 +313,13 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
page_length: this.page_length + 1,
query: this.get_query ? this.get_query().query : '',
as_dict: 1
- }
+ };
frappe.call({
type: "GET",
- method:'frappe.desk.search.search_widget',
+ method: 'frappe.desk.search.search_widget',
no_spinner: true,
args: args,
- callback: function(r) {
+ callback: function (r) {
let more = 0;
me.results = [];
if (r.values.length) {
@@ -302,30 +327,13 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
r.values.pop();
more = 1;
}
- r.values.forEach(function(result) {
- if(me.date_field in result) {
- result["Date"] = result[me.date_field]
- }
+ r.values.forEach(function (result) {
result.checked = 0;
- result.parsed_date = Date.parse(result["Date"]);
me.results.push(result);
});
- me.results.map( (result) => {
- result["Date"] = frappe.format(result["Date"], {"fieldtype":"Date"});
- })
-
- me.results.sort((a, b) => {
- return a.parsed_date - b.parsed_date;
- });
-
- // Preselect oldest entry
- if (me.start < 1 && r.values.length === 1) {
- me.results[0].checked = 1;
- }
}
me.render_result_list(me.results, more);
}
});
- },
-
-});
\ No newline at end of file
+ }
+};
\ No newline at end of file
diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js
index 7d2c20c693..50109f010d 100644
--- a/frappe/public/js/frappe/utils/utils.js
+++ b/frappe/public/js/frappe/utils/utils.js
@@ -823,3 +823,115 @@ if (!Array.prototype.uniqBy) {
}
});
}
+
+// Pluralize
+String.prototype.plural = function(revert) {
+ const plural = {
+ "(quiz)$": "$1zes",
+ "^(ox)$": "$1en",
+ "([m|l])ouse$": "$1ice",
+ "(matr|vert|ind)ix|ex$": "$1ices",
+ "(x|ch|ss|sh)$": "$1es",
+ "([^aeiouy]|qu)y$": "$1ies",
+ "(hive)$": "$1s",
+ "(?:([^f])fe|([lr])f)$": "$1$2ves",
+ "(shea|lea|loa|thie)f$": "$1ves",
+ sis$: "ses",
+ "([ti])um$": "$1a",
+ "(tomat|potat|ech|her|vet)o$": "$1oes",
+ "(bu)s$": "$1ses",
+ "(alias)$": "$1es",
+ "(octop)us$": "$1i",
+ "(ax|test)is$": "$1es",
+ "(us)$": "$1es",
+ "([^s]+)$": "$1s",
+ };
+
+ const singular = {
+ "(quiz)zes$": "$1",
+ "(matr)ices$": "$1ix",
+ "(vert|ind)ices$": "$1ex",
+ "^(ox)en$": "$1",
+ "(alias)es$": "$1",
+ "(octop|vir)i$": "$1us",
+ "(cris|ax|test)es$": "$1is",
+ "(shoe)s$": "$1",
+ "(o)es$": "$1",
+ "(bus)es$": "$1",
+ "([m|l])ice$": "$1ouse",
+ "(x|ch|ss|sh)es$": "$1",
+ "(m)ovies$": "$1ovie",
+ "(s)eries$": "$1eries",
+ "([^aeiouy]|qu)ies$": "$1y",
+ "([lr])ves$": "$1f",
+ "(tive)s$": "$1",
+ "(hive)s$": "$1",
+ "(li|wi|kni)ves$": "$1fe",
+ "(shea|loa|lea|thie)ves$": "$1f",
+ "(^analy)ses$": "$1sis",
+ "((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$":
+ "$1$2sis",
+ "([ti])a$": "$1um",
+ "(n)ews$": "$1ews",
+ "(h|bl)ouses$": "$1ouse",
+ "(corpse)s$": "$1",
+ "(us)es$": "$1",
+ s$: "",
+ };
+
+ const irregular = {
+ move: "moves",
+ foot: "feet",
+ goose: "geese",
+ sex: "sexes",
+ child: "children",
+ man: "men",
+ tooth: "teeth",
+ person: "people",
+ };
+
+ const uncountable = [
+ "sheep",
+ "fish",
+ "deer",
+ "moose",
+ "series",
+ "species",
+ "money",
+ "rice",
+ "information",
+ "equipment",
+ ];
+
+ // save some time in the case that singular and plural are the same
+ if (uncountable.indexOf(this.toLowerCase()) >= 0) return this;
+
+ // check for irregular forms
+ let word;
+ let pattern;
+ let replace;
+ for (word in irregular) {
+ if (revert) {
+ pattern = new RegExp(irregular[word] + "$", "i");
+ replace = word;
+ } else {
+ pattern = new RegExp(word + "$", "i");
+ replace = irregular[word];
+ }
+ if (pattern.test(this)) return this.replace(pattern, replace);
+ }
+
+ let array;
+ if (revert) array = singular;
+ else array = plural;
+
+ // check for matches using regular expressions
+ let reg;
+ for (reg in array) {
+ pattern = new RegExp(reg, "i");
+
+ if (pattern.test(this)) return this.replace(pattern, array[reg]);
+ }
+
+ return this;
+};
\ No newline at end of file