[time log] [query] search task based on subject
This commit is contained in:
parent
59db6b5890
commit
9e1d120186
@ -1,5 +1,9 @@
|
|||||||
$.extend(cur_frm.cscript, {
|
wn.provide("erpnext.projects");
|
||||||
refresh: function(doc) {
|
|
||||||
|
|
||||||
|
erpnext.projects.TimeLog = wn.ui.form.Controller.extend({
|
||||||
|
setup: function() {
|
||||||
|
this.frm.set_query("task", erpnext.queries.task);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
cur_frm.cscript = new erpnext.projects.TimeLog({frm: cur_frm});
|
@ -6,3 +6,18 @@ import webnotes
|
|||||||
@webnotes.whitelist()
|
@webnotes.whitelist()
|
||||||
def get_time_log_list(doctype, txt, searchfield, start, page_len, filters):
|
def get_time_log_list(doctype, txt, searchfield, start, page_len, filters):
|
||||||
return webnotes.conn.get_values("Time Log", filters, ["name", "activity_type", "owner"])
|
return webnotes.conn.get_values("Time Log", filters, ["name", "activity_type", "owner"])
|
||||||
|
|
||||||
|
@webnotes.whitelist()
|
||||||
|
def query_task(doctype, txt, searchfield, start, page_len, filters):
|
||||||
|
search_string = "%%%s%%" % txt
|
||||||
|
order_by_string = "%s%%" % txt
|
||||||
|
return webnotes.conn.sql("""select name, subject from `tabTask`
|
||||||
|
where `%s` like %s or `subject` like %s
|
||||||
|
order by
|
||||||
|
case when `subject` like %s then 0 else 1 end,
|
||||||
|
case when `%s` like %s then 0 else 1 end,
|
||||||
|
`%s`,
|
||||||
|
subject
|
||||||
|
limit %s, %s""" %
|
||||||
|
(searchfield, "%s", "%s", "%s", searchfield, "%s", searchfield, "%s", "%s"),
|
||||||
|
(search_string, search_string, order_by_string, order_by_string, start, page_len))
|
@ -161,3 +161,7 @@ erpnext.queries.bom = function(opts) {
|
|||||||
+ " LIMIT 50"
|
+ " LIMIT 50"
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
erpnext.queries.task = function() {
|
||||||
|
return { query: "projects.utils.query_task" };
|
||||||
|
};
|
Loading…
Reference in New Issue
Block a user