Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[hub][publish] add search, fix multiple append

Browse Source
This commit is contained in:
Prateeksha Singh 2018-07-26 08:36:33 +05:30
parent 505f6f14e9
commit 1d1696080e
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/hub_node/__init__.py
View File

@ -33,8 +33,13 @@ def get_list(doctype, start=0, limit=20, fields=["*"], filters="{}", order_by=No
#### LOCAL ITEMS #### LOCAL ITEMS
@frappe.whitelist() @frappe.whitelist()
def get_valid_items(): def get_valid_items(search_value=''):
items = frappe.get_list('Item', fields=["*"]) items = frappe.get_list('Item', fields=["*"], filters={
'item_name': ['like', '%' + search_value + '%']
})
print([d.item_name for d in items])
valid_items = filter(lambda x: x.image and x.description, items) valid_items = filter(lambda x: x.image and x.description, items)
def attach_source_type(item): def attach_source_type(item):

29
erpnext/public/js/hub/hub_listing.js
View File

@ -186,6 +186,7 @@ erpnext.hub.Home = class Home extends SubPage {
} }
get_items_and_render() { get_items_and_render() {
this.$wrapper.find('.hub-card-container').empty();
this.get_items() this.get_items()
.then(r => { .then(r => {
erpnext.hub.hub_item_cache = r.message; erpnext.hub.hub_item_cache = r.message;
@ -238,6 +239,7 @@ erpnext.hub.Favourites = class Favourites extends SubPage {
} }
render(items) { render(items) {
this.$wrapper.find('.hub-card-container').empty();
const html = get_item_card_container_html(items, __('Favourites')); const html = get_item_card_container_html(items, __('Favourites'));
this.$wrapper.append(html) this.$wrapper.append(html)
} }
@ -253,6 +255,7 @@ erpnext.hub.Category = class Category extends SubPage {
} }
get_items_for_category(category) { get_items_for_category(category) {
this.$wrapper.find('.hub-card-container').empty();
return frappe.call('erpnext.hub_node.get_list', { return frappe.call('erpnext.hub_node.get_list', {
doctype: 'Hub Item', doctype: 'Hub Item',
filters: { filters: {
@ -490,6 +493,8 @@ erpnext.hub.Register = class Register extends SubPage {
} }
refresh() { refresh() {
this.$register_container.empty();
this.$form_container.empty();
this.render(); this.render();
} }
@ -615,15 +620,30 @@ erpnext.hub.Publish = class Publish extends SubPage {
this.$wrapper.find('.deselect-all').on('click', () => { this.$wrapper.find('.deselect-all').on('click', () => {
this.$wrapper.find('.hub-card').removeClass('active'); this.$wrapper.find('.hub-card').removeClass('active');
}); });
const $search_input = this.$wrapper.find('.hub-search-container input');
this.search_value = '';
$search_input.on('keydown', frappe.utils.debounce((e) => {
if (e.which === frappe.ui.keyCode.ENTER) {
this.search_value = $search_input.val();
this.get_items_and_render();
}
}, 300));
} }
refresh() { get_items_and_render() {
this.$wrapper.find('.hub-card-container').empty();
this.get_valid_items() this.get_valid_items()
.then(r => { .then(r => {
this.render(r.message); this.render(r.message);
}); });
} }
refresh() {
this.get_items_and_render();
}
render(items) { render(items) {
const items_container = $(get_item_card_container_html(items)); const items_container = $(get_item_card_container_html(items));
items_container.addClass('static').on('click', '.hub-card', (e) => { items_container.addClass('static').on('click', '.hub-card', (e) => {
@ -635,7 +655,12 @@ erpnext.hub.Publish = class Publish extends SubPage {
} }
get_valid_items() { get_valid_items() {
return frappe.call('erpnext.hub_node.get_valid_items'); return frappe.call(
'erpnext.hub_node.get_valid_items',
{
search_value: this.search_value
}
);
} }
} }