Tom Blauwendraat
6 years ago
10 changed files with 281 additions and 253 deletions
-
50web_tree_date_search/README.rst
-
19web_tree_date_search/__init__.py
-
27web_tree_date_search/__openerp__.py
-
BINweb_tree_date_search/static/description/icon.png
-
20web_tree_date_search/static/src/css/web_tree_date_search.css
-
178web_tree_date_search/static/src/js/search.js
-
196web_tree_date_search/static/src/js/web_tree_date_search.js
-
19web_tree_date_search/static/src/xml/search.xml
-
19web_tree_date_search/static/src/xml/web_tree_date_search.xml
-
4web_tree_date_search/views/assets_backend.xml
@ -1,18 +1 @@ |
|||||
############################################################################## |
|
||||
# |
|
||||
# Copyright (c) 2015 Noviat nv/sa (www.noviat.com) |
|
||||
# |
|
||||
# This program is free software: you can redistribute it and/or modify |
|
||||
# it under the terms of the GNU Affero General Public License as published |
|
||||
# by the Free Software Foundation, either version 3 of the License, or |
|
||||
# (at your option) any later version. |
|
||||
# |
|
||||
# This program is distributed in the hope that it will be useful, |
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||
# GNU Affero General Public License for more details. |
|
||||
# |
|
||||
# You should have received a copy of the GNU Affero General Public License |
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
||||
# |
|
||||
############################################################################## |
|
||||
|
# -*- coding: utf-8 -*- |
After Width: 128 | Height: 128 | Size: 3.9 KiB |
@ -0,0 +1,20 @@ |
|||||
|
div.web_tree_date_search_toolbar { |
||||
|
margin-bottom:0px; |
||||
|
} |
||||
|
|
||||
|
div.web_tree_date_search_field { |
||||
|
min-width: 208px; margin-left:4px; |
||||
|
} |
||||
|
|
||||
|
div.web_tree_date_search_field div.oe_form { |
||||
|
margin-right:3px; display: inline; |
||||
|
} |
||||
|
|
||||
|
input.web_tree_date_search_input { |
||||
|
height: 23px; |
||||
|
} |
||||
|
|
||||
|
input.web_tree_date_search_input_date { |
||||
|
width: 105px; |
||||
|
} |
||||
|
|
@ -1,178 +0,0 @@ |
|||||
// @@@ web_tree_date_search custom JS @@@
|
|
||||
// #############################################################################
|
|
||||
//
|
|
||||
// Copyright (c) 2015 Noviat nv/sa (www.noviat.com)
|
|
||||
//
|
|
||||
// This program is free software: you can redistribute it and/or modify
|
|
||||
// it under the terms of the GNU Affero General Public License as published
|
|
||||
// by the Free Software Foundation, either version 3 of the License, or
|
|
||||
// (at your option) any later version.
|
|
||||
//
|
|
||||
// This program is distributed in the hope that it will be useful,
|
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||
// GNU Affero General Public License for more details.
|
|
||||
//
|
|
||||
// You should have received a copy of the GNU Affero General Public License
|
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||
//
|
|
||||
// #############################################################################
|
|
||||
|
|
||||
|
|
||||
openerp.web_tree_date_search = function(instance) { |
|
||||
var _t = instance.web._t, |
|
||||
_lt = instance.web._lt; |
|
||||
var QWeb = instance.web.qweb; |
|
||||
|
|
||||
instance.web.ListView.include({ |
|
||||
init: function(parent, dataset, view_id, options) { |
|
||||
this._super.apply(this, arguments); |
|
||||
if ("dates_filter" in dataset.context){ |
|
||||
this.dates_filter = dataset.context["dates_filter"]; |
|
||||
this.current_date_from = []; |
|
||||
this.current_date_to = []; |
|
||||
} |
|
||||
this.tree_date_search_loaded = false; |
|
||||
}, |
|
||||
do_load_state: function(state, warm) { |
|
||||
var ui_toolbar_loc = $('.ui-toolbar:last'); |
|
||||
if (this.dates_filter && this.dates_filter.length > 0){ |
|
||||
ui_toolbar_loc.show(); |
|
||||
} |
|
||||
else{ |
|
||||
if (ui_toolbar_loc.children().length == 0) |
|
||||
ui_toolbar_loc.hide(); |
|
||||
} |
|
||||
return this._super.apply(this, arguments); |
|
||||
}, |
|
||||
load_list: function(data) { |
|
||||
var self = this; |
|
||||
var tmp = this._super.apply(this, arguments); |
|
||||
if (!this.tree_date_search_loaded){ |
|
||||
this.date_field_data = []; |
|
||||
for (i in this.dates_filter){ |
|
||||
var date_field = this.dates_filter[i]; |
|
||||
for (col in this.columns){ |
|
||||
if (this.columns[col].name == date_field){ |
|
||||
this.date_field_data[date_field] = [] |
|
||||
this.date_field_data[date_field][0] = this.columns[col].string; |
|
||||
this.date_field_data[date_field][1] = this.columns[col].type; |
|
||||
break; |
|
||||
} |
|
||||
} |
|
||||
} |
|
||||
if (this.dates_filter && this.dates_filter.length > 0){ |
|
||||
this.$el.parent().prepend(QWeb.render('TreeDateSearch', {widget: this})); |
|
||||
var ui_toolbar_loc = $('.ui-toolbar:last'); |
|
||||
ui_toolbar_loc.show(); |
|
||||
for (i in this.dates_filter){ |
|
||||
var date_field = this.dates_filter[i]; |
|
||||
var date_string = this.date_field_data[date_field][0] |
|
||||
var date_type = this.date_field_data[date_field][1] |
|
||||
|
|
||||
self.columns |
|
||||
var date_div = QWeb.render('TreeDateSearchField', {'field_name': date_string}); |
|
||||
var toolbar_height = ui_toolbar_loc.height(); |
|
||||
|
|
||||
ui_toolbar_loc.append(date_div); |
|
||||
$('div.oe_form_dropdown_section:last span:eq(0)').addClass('oe_date_filter_from_' + date_field); |
|
||||
$('div.oe_form_dropdown_section:last span:eq(1)').addClass('oe_date_filter_to_' + date_field); |
|
||||
|
|
||||
this.value = new (instance.web.search.custom_filters.get_object(date_type)) |
|
||||
(this, {"selectable":true, |
|
||||
"name":"oe_date_filter_from_" + date_field, |
|
||||
"type": date_type, |
|
||||
"string":date_string}); |
|
||||
var value_loc = $('.oe_date_filter_from_' + date_field + ':last').show().empty(); |
|
||||
this.value.appendTo(value_loc); |
|
||||
|
|
||||
this.value = new (instance.web.search.custom_filters.get_object(date_type)) |
|
||||
(this, {"selectable":true, |
|
||||
"name":"oe_date_filter_to_" + date_field, |
|
||||
"type": date_type, |
|
||||
"string":date_string}); |
|
||||
var value_loc = $('.oe_date_filter_to_' + date_field + ':last').show().empty(); |
|
||||
this.value.appendTo(value_loc); |
|
||||
|
|
||||
var oe_date_filter_from = $('.oe_date_filter_from_' + date_field + ':last .oe_datepicker_master'); |
|
||||
var oe_date_filter_to = $('.oe_date_filter_to_' + date_field + ':last .oe_datepicker_master'); |
|
||||
if (date_type == 'date'){ |
|
||||
oe_date_filter_from.css("width", "105px"); |
|
||||
oe_date_filter_to.css("width", "105px"); |
|
||||
} |
|
||||
oe_date_filter_from.css("height", "23px"); |
|
||||
oe_date_filter_to.css("height", "23px"); |
|
||||
// In 2 line to fit with account move line tree view
|
|
||||
if (toolbar_height < 40){ |
|
||||
var $elem1 = oe_date_filter_from.parent().parent().parent().parent().parent(); |
|
||||
var $elem = $elem1.find("h4"); |
|
||||
$elem.css("display", "inline"); |
|
||||
} |
|
||||
oe_date_filter_from.attr("placeholder", _t("From")); |
|
||||
oe_date_filter_to.attr("placeholder", _t("To")); |
|
||||
|
|
||||
// on_change
|
|
||||
oe_date_filter_from.change(function() { |
|
||||
var elem = this.parentElement.parentElement.parentElement.className; |
|
||||
var res = elem.split("oe_date_filter_from_"); |
|
||||
self.current_date_from[res[1]] = this.value === '' ? null : this.value; |
|
||||
if (self.current_date_from[res[1]]){ |
|
||||
self.current_date_from[res[1]] = instance.web.parse_value( |
|
||||
self.current_date_from[res[1]], {"widget": date_type}); |
|
||||
} |
|
||||
self.do_search(self.last_domain, self.last_context, self.last_group_by); |
|
||||
}); |
|
||||
oe_date_filter_to.change(function() { |
|
||||
var elem = this.parentElement.parentElement.parentElement.className; |
|
||||
var res = elem.split("oe_date_filter_to_"); |
|
||||
self.current_date_to[res[1]] = this.value === '' ? null : this.value; |
|
||||
if (self.current_date_to[res[1]]){ |
|
||||
self.current_date_to[res[1]] = instance.web.parse_value( |
|
||||
self.current_date_to[res[1]], {"widget": date_type}); |
|
||||
} |
|
||||
self.do_search(self.last_domain, self.last_context, self.last_group_by); |
|
||||
}); |
|
||||
this.on('edit:after', this, function () { |
|
||||
oe_date_filter_from.attr('disabled', 'disabled'); |
|
||||
oe_date_filter_to.attr('disabled', 'disabled'); |
|
||||
}); |
|
||||
this.on('save:after cancel:after', this, function () { |
|
||||
oe_date_filter_from.removeAttr('disabled'); |
|
||||
oe_date_filter_to.removeAttr('disabled'); |
|
||||
}); |
|
||||
} |
|
||||
} |
|
||||
else{ |
|
||||
// Only hide current if it's empty
|
|
||||
// Work from tree view to tree view with or withouth date_filters
|
|
||||
// Work from tree view to wizard with or withouth date_filters
|
|
||||
var ui_toolbar_loc = $('.ui-toolbar:last'); |
|
||||
if (ui_toolbar_loc.children().length == 0) |
|
||||
ui_toolbar_loc.hide(); |
|
||||
} |
|
||||
this.tree_date_search_loaded = true; |
|
||||
} |
|
||||
return tmp; |
|
||||
}, |
|
||||
do_search: function(domain, context, group_by) { |
|
||||
this.last_domain = domain; |
|
||||
this.last_context = context; |
|
||||
this.last_group_by = group_by; |
|
||||
domain = this.get_dates_filter_domain(domain); |
|
||||
return this._super(domain, context, group_by); |
|
||||
}, |
|
||||
get_dates_filter_domain: function(last_domain) { |
|
||||
var domain = []; |
|
||||
for (from in this.current_date_from){ |
|
||||
if (this.current_date_from[from]) |
|
||||
domain.push([from, '>=', this.current_date_from[from]]); |
|
||||
} |
|
||||
for (to in this.current_date_to){ |
|
||||
if (this.current_date_to[to]) |
|
||||
domain.push([to, '<=', this.current_date_to[to]]); |
|
||||
} |
|
||||
return new instance.web.CompoundDomain(last_domain, domain); |
|
||||
}, |
|
||||
}); |
|
||||
|
|
||||
}; |
|
@ -0,0 +1,196 @@ |
|||||
|
// Copyright (c) 2015 Noviat nv/sa (www.noviat.com)
|
||||
|
|
||||
|
openerp.web_tree_date_search = function(instance) { |
||||
|
var _t = instance.web._t, |
||||
|
_lt = instance.web._lt; |
||||
|
var QWeb = instance.web.qweb; |
||||
|
|
||||
|
instance.web.ListView.include({ |
||||
|
init: function(parent, dataset, view_id, options) { |
||||
|
this._super.apply(this, arguments); |
||||
|
if ("dates_filter" in dataset.context){ |
||||
|
this.dates_filter = dataset.context["dates_filter"]; |
||||
|
this.current_date_from = []; |
||||
|
this.current_date_to = []; |
||||
|
} |
||||
|
this.tree_date_search_loaded = false; |
||||
|
}, |
||||
|
do_load_state: function(state, warm) { |
||||
|
var ui_toolbar_loc = $('.ui-toolbar:last'); |
||||
|
if (this.dates_filter && this.dates_filter.length > 0){ |
||||
|
ui_toolbar_loc.show(); |
||||
|
} |
||||
|
else{ |
||||
|
if (ui_toolbar_loc.children().length == 0) |
||||
|
ui_toolbar_loc.hide(); |
||||
|
} |
||||
|
return this._super.apply(this, arguments); |
||||
|
}, |
||||
|
load_list: function(data) { |
||||
|
var self = this; |
||||
|
var ret = this._super.apply(this, arguments); |
||||
|
|
||||
|
// dont run if already loaded
|
||||
|
if (this.tree_date_search_loaded) |
||||
|
return ret; |
||||
|
|
||||
|
this.date_field_data = []; |
||||
|
for (i in this.dates_filter) { |
||||
|
var date_field = this.dates_filter[i]; |
||||
|
for (col in this.columns){ |
||||
|
if (this.columns[col].name == date_field){ |
||||
|
this.date_field_data[date_field] = [ |
||||
|
this.columns[col].string, |
||||
|
this.columns[col].type |
||||
|
] |
||||
|
break; |
||||
|
} |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
var custom_filters = instance.web.search.custom_filters; |
||||
|
var INPUT_SELECTOR = ' .oe_datepicker_master'; |
||||
|
if (this.dates_filter && this.dates_filter.length > 0) { |
||||
|
this.$el.parent().prepend(QWeb.render( |
||||
|
'web_tree_date_search_toolbar', {widget: this})); |
||||
|
var ui_toolbar_loc = $('.ui-toolbar:last'); |
||||
|
ui_toolbar_loc.show(); |
||||
|
for (i in this.dates_filter) { |
||||
|
var date_field = this.dates_filter[i]; |
||||
|
var date_string = this.date_field_data[date_field][0]; |
||||
|
var date_type = this.date_field_data[date_field][1]; |
||||
|
|
||||
|
// add search form to toolbar
|
||||
|
var date_div = QWeb.render('web_tree_date_search_field', { |
||||
|
'field_name': date_string |
||||
|
}); |
||||
|
var toolbar_height = ui_toolbar_loc.height(); |
||||
|
ui_toolbar_loc.append(date_div); |
||||
|
|
||||
|
// assign classes to 'from' and 'to' spans
|
||||
|
var from_class = 'oe_date_filter_from_' + date_field, |
||||
|
to_class = 'oe_date_filter_to_' + date_field, |
||||
|
from_selector = '.' + from_class + ':last', |
||||
|
to_selector = '.' + to_class + ':last', |
||||
|
spans = $('div.oe_form_dropdown_section:last span'); |
||||
|
spans.eq(0).addClass(from_class); |
||||
|
spans.eq(1).addClass(to_class); |
||||
|
|
||||
|
// add date input elements to each
|
||||
|
function add_input_element(_class, selector) { |
||||
|
var value = new (custom_filters.get_object(date_type))( |
||||
|
this, { |
||||
|
"selectable": true, |
||||
|
"name": _class, |
||||
|
"type": date_type, |
||||
|
"string": date_string |
||||
|
} |
||||
|
); |
||||
|
var value_loc = $(selector).show().empty(); |
||||
|
value.appendTo(value_loc); |
||||
|
return value; |
||||
|
} |
||||
|
this.value = add_input_element(from_class, from_selector); |
||||
|
this.value = add_input_element(to_class, to_selector); |
||||
|
|
||||
|
// sizing of the input elements
|
||||
|
var input_from = $(from_selector + INPUT_SELECTOR); |
||||
|
var input_to = $(to_selector + INPUT_SELECTOR); |
||||
|
if (date_type == 'date') { |
||||
|
input_from.addClass('web_tree_date_search_input_date'); |
||||
|
input_to.addClass('web_tree_date_search_input_date'); |
||||
|
} |
||||
|
input_from.addClass('web_tree_date_search_input'); |
||||
|
input_to.addClass('web_tree_date_search_input'); |
||||
|
// In 2 line to fit with account move line tree view
|
||||
|
if (toolbar_height < 40) { |
||||
|
var $elem1 = input_from.parent() |
||||
|
.parent().parent().parent().parent(); |
||||
|
var $elem = $elem1.find("h4"); |
||||
|
$elem.css("display", "inline"); |
||||
|
} |
||||
|
input_from.attr("placeholder", _t("From")); |
||||
|
input_to.attr("placeholder", _t("To")); |
||||
|
|
||||
|
// on_change functions
|
||||
|
input_from.change(function() { |
||||
|
var elem = this.parentElement. |
||||
|
parentElement.parentElement.className; |
||||
|
var res = elem.split("oe_date_filter_from_"); |
||||
|
self.current_date_from[res[1]] = |
||||
|
this.value === '' ? null : this.value; |
||||
|
if (self.current_date_from[res[1]]){ |
||||
|
self.current_date_from[res[1]] = |
||||
|
instance.web.parse_value( |
||||
|
self.current_date_from[res[1]], |
||||
|
{"widget": date_type} |
||||
|
); |
||||
|
} |
||||
|
self.do_search( |
||||
|
self.last_domain, |
||||
|
self.last_context, |
||||
|
self.last_group_by |
||||
|
); |
||||
|
}); |
||||
|
input_to.change(function() { |
||||
|
var elem = this.parentElement. |
||||
|
parentElement.parentElement.className; |
||||
|
var res = elem.split("oe_date_filter_to_"); |
||||
|
self.current_date_to[res[1]] = |
||||
|
this.value === '' ? null : this.value; |
||||
|
if (self.current_date_to[res[1]]){ |
||||
|
self.current_date_to[res[1]] = |
||||
|
instance.web.parse_value( |
||||
|
self.current_date_to[res[1]], |
||||
|
{"widget": date_type} |
||||
|
); |
||||
|
} |
||||
|
self.do_search( |
||||
|
self.last_domain, |
||||
|
self.last_context, |
||||
|
self.last_group_by |
||||
|
); |
||||
|
}); |
||||
|
this.on('edit:after', this, function() { |
||||
|
input_from.attr('disabled', 'disabled'); |
||||
|
input_to.attr('disabled', 'disabled'); |
||||
|
}); |
||||
|
this.on('save:after cancel:after', this, function() { |
||||
|
input_from.removeAttr('disabled'); |
||||
|
input_to.removeAttr('disabled'); |
||||
|
}); |
||||
|
} |
||||
|
} |
||||
|
else { |
||||
|
// Only hide current if it's empty
|
||||
|
// Work from tree view to tree view with or without date_filters
|
||||
|
// Work from tree view to wizard with or without date_filters
|
||||
|
var ui_toolbar_loc = $('.ui-toolbar:last'); |
||||
|
if (ui_toolbar_loc.children().length == 0) |
||||
|
ui_toolbar_loc.hide(); |
||||
|
} |
||||
|
this.tree_date_search_loaded = true; |
||||
|
return ret; |
||||
|
}, |
||||
|
do_search: function(domain, context, group_by) { |
||||
|
this.last_domain = domain; |
||||
|
this.last_context = context; |
||||
|
this.last_group_by = group_by; |
||||
|
domain = this.get_dates_filter_domain(domain); |
||||
|
return this._super(domain, context, group_by); |
||||
|
}, |
||||
|
get_dates_filter_domain: function(last_domain) { |
||||
|
var domain = []; |
||||
|
for (from in this.current_date_from){ |
||||
|
if (this.current_date_from[from]) |
||||
|
domain.push([from, '>=', this.current_date_from[from]]); |
||||
|
} |
||||
|
for (to in this.current_date_to){ |
||||
|
if (this.current_date_to[to]) |
||||
|
domain.push([to, '<=', this.current_date_to[to]]); |
||||
|
} |
||||
|
return new instance.web.CompoundDomain(last_domain, domain); |
||||
|
}, |
||||
|
}); |
||||
|
|
||||
|
}; |
@ -1,19 +0,0 @@ |
|||||
<?xml version="1.0" encoding="UTF-8"?> |
|
||||
<templates id="template" xml:space="preserve"> |
|
||||
<t t-name="TreeDateSearch"> |
|
||||
<div class="ui-toolbar" style="margin-bottom:0px;"> |
|
||||
</div> |
|
||||
</t> |
|
||||
|
|
||||
<t t-name="TreeDateSearchField"> |
|
||||
<div class='oe_form_dropdown_section' style="min-width: 208px; margin-left:4px;"> |
|
||||
<h4><t t-esc="field_name"/> :</h4> |
|
||||
<div class='oe_form' style='margin-right:3px; display: inline;' > |
|
||||
<span/> |
|
||||
</div> |
|
||||
<div class='oe_form' style='margin-left:3px; display: inline; float: right;' > |
|
||||
<span/> |
|
||||
</div> |
|
||||
</div> |
|
||||
</t> |
|
||||
</templates> |
|
@ -0,0 +1,19 @@ |
|||||
|
<?xml version="1.0" encoding="UTF-8"?> |
||||
|
<templates id="template" xml:space="preserve"> |
||||
|
<t t-name="web_tree_date_search_toolbar"> |
||||
|
<div class="ui-toolbar web_tree_date_search_toolbar" style="margin-bottom:0px;"> |
||||
|
</div> |
||||
|
</t> |
||||
|
|
||||
|
<t t-name="web_tree_date_search_field"> |
||||
|
<div class="oe_form_dropdown_section web_tree_date_search_field"> |
||||
|
<h4><t t-esc="field_name"/> :</h4> |
||||
|
<div class="oe_form"> |
||||
|
<span/> |
||||
|
</div> |
||||
|
<div class="oe_form oe_right"> |
||||
|
<span/> |
||||
|
</div> |
||||
|
</div> |
||||
|
</t> |
||||
|
</templates> |
Write
Preview
Loading…
Cancel
Save
Reference in new issue