|
@ -3,26 +3,25 @@ |
|
|
odoo.define('date_range.search_filters', function (require) { |
|
|
odoo.define('date_range.search_filters', function (require) { |
|
|
"use strict"; |
|
|
"use strict"; |
|
|
|
|
|
|
|
|
var core = require('web.core'); |
|
|
|
|
|
|
|
|
var core = require('web.core'); |
|
|
var data = require('web.data'); |
|
|
var data = require('web.data'); |
|
|
var filters = require('web.search_filters'); |
|
|
var filters = require('web.search_filters'); |
|
|
var Model = require('web.Model'); |
|
|
|
|
|
|
|
|
var rpc = require('web.rpc'); |
|
|
var framework = require('web.framework'); |
|
|
var framework = require('web.framework'); |
|
|
|
|
|
|
|
|
var _t = core._t; |
|
|
var _t = core._t; |
|
|
var _lt = core._lt; |
|
|
|
|
|
filters.ExtendedSearchProposition.include({ |
|
|
filters.ExtendedSearchProposition.include({ |
|
|
select_field: function(field) { |
|
|
select_field: function(field) { |
|
|
this._super.apply(this, arguments); |
|
|
this._super.apply(this, arguments); |
|
|
this.is_date_range_selected = false; |
|
|
this.is_date_range_selected = false; |
|
|
this.is_date = field.type == 'date' || field.type == 'datetime'; |
|
|
|
|
|
|
|
|
this.is_date = field.type === 'date' || field.type === 'datetime'; |
|
|
this.$value = this.$el.find('.searchview_extended_prop_value, .o_searchview_extended_prop_value'); |
|
|
this.$value = this.$el.find('.searchview_extended_prop_value, .o_searchview_extended_prop_value'); |
|
|
if (this.is_date){ |
|
|
if (this.is_date){ |
|
|
var ds = new data.DataSetSearch(this, 'date.range.type', this.context, [[1, '=', 1]]); |
|
|
var ds = new data.DataSetSearch(this, 'date.range.type', this.context, [[1, '=', 1]]); |
|
|
ds.read_slice(['name'], {}).done(this.proxy('add_date_range_types_operator')); |
|
|
ds.read_slice(['name'], {}).done(this.proxy('add_date_range_types_operator')); |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
add_date_range_types_operator: function(date_range_types){ |
|
|
add_date_range_types_operator: function(date_range_types){ |
|
|
var self = this; |
|
|
var self = this; |
|
|
_.each(date_range_types, function(drt) { |
|
|
_.each(date_range_types, function(drt) { |
|
@ -31,10 +30,10 @@ filters.ExtendedSearchProposition.include({ |
|
|
.appendTo(self.$el.find('.searchview_extended_prop_op, .o_searchview_extended_prop_op')); |
|
|
.appendTo(self.$el.find('.searchview_extended_prop_op, .o_searchview_extended_prop_op')); |
|
|
}); |
|
|
}); |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
operator_changed: function (e) { |
|
|
operator_changed: function (e) { |
|
|
var val = $(e.target).val(); |
|
|
var val = $(e.target).val(); |
|
|
this.is_date_range_selected = val.startsWith('drt_'); |
|
|
|
|
|
|
|
|
this.is_date_range_selected = val.startsWith('drt_'); |
|
|
if (this.is_date_range_selected){ |
|
|
if (this.is_date_range_selected){ |
|
|
var type_id = val.replace('drt_', ''); |
|
|
var type_id = val.replace('drt_', ''); |
|
|
this.date_range_type_operator_selected(type_id); |
|
|
this.date_range_type_operator_selected(type_id); |
|
@ -47,18 +46,18 @@ filters.ExtendedSearchProposition.include({ |
|
|
this.$value.empty().show(); |
|
|
this.$value.empty().show(); |
|
|
var ds = new data.DataSetSearch(this, 'date.range', this.context, [['type_id', '=', parseInt(type_id)]]); |
|
|
var ds = new data.DataSetSearch(this, 'date.range', this.context, [['type_id', '=', parseInt(type_id)]]); |
|
|
ds.read_slice(['name','date_start', 'date_end'], {}).done(this.proxy('on_range_type_selected')); |
|
|
ds.read_slice(['name','date_start', 'date_end'], {}).done(this.proxy('on_range_type_selected')); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
on_range_type_selected: function(date_range_values){ |
|
|
on_range_type_selected: function(date_range_values){ |
|
|
this.value = new filters.ExtendedSearchProposition.DateRange(this, this.value.field, date_range_values); |
|
|
this.value = new filters.ExtendedSearchProposition.DateRange(this, this.value.field, date_range_values); |
|
|
this.value.appendTo(this.$value); |
|
|
this.value.appendTo(this.$value); |
|
|
if (!this.$el.hasClass('o_filter_condition')){ |
|
|
if (!this.$el.hasClass('o_filter_condition')){ |
|
|
this.$value.find('.date-range-select').addClass('form-control'); |
|
|
|
|
|
|
|
|
this.$value.find('.date-range-select').addClass('form-control'); |
|
|
} |
|
|
} |
|
|
this.value.on_range_selected(); |
|
|
this.value.on_range_selected(); |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
get_filter: function () { |
|
|
get_filter: function () { |
|
|
var res = this._super.apply(this, arguments); |
|
|
var res = this._super.apply(this, arguments); |
|
|
if (this.is_date_range_selected){ |
|
|
if (this.is_date_range_selected){ |
|
@ -68,15 +67,22 @@ filters.ExtendedSearchProposition.include({ |
|
|
} |
|
|
} |
|
|
return res; |
|
|
return res; |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
filters.ExtendedSearchProposition.DateRange = filters.ExtendedSearchProposition.Field.extend({ |
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
Since Odoo 11, The Field class used as base class for all specialized filter |
|
|
|
|
|
widgets is no more exposed by 'web.search_filters'. To create our own class we |
|
|
|
|
|
extend the more simple class available into the search_filters_registry as base |
|
|
|
|
|
class |
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
|
|
|
|
filters.ExtendedSearchProposition.DateRange = core.search_filters_registry.get('id').extend({ |
|
|
template: 'SearchView.extended_search.dateRange.selection', |
|
|
template: 'SearchView.extended_search.dateRange.selection', |
|
|
events: { |
|
|
events: { |
|
|
'change': 'on_range_selected', |
|
|
'change': 'on_range_selected', |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
init: function (parent, field, date_range_values) { |
|
|
init: function (parent, field, date_range_values) { |
|
|
this._super(parent, field); |
|
|
this._super(parent, field); |
|
|
this.date_range_values = date_range_values; |
|
|
this.date_range_values = date_range_values; |
|
@ -87,31 +93,33 @@ filters.ExtendedSearchProposition.DateRange = filters.ExtendedSearchProposition. |
|
|
var option = select.options[select.selectedIndex]; |
|
|
var option = select.options[select.selectedIndex]; |
|
|
return option.label || option.text; |
|
|
return option.label || option.text; |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
get_value: function() { |
|
|
get_value: function() { |
|
|
return parseInt(this.$el.val()); |
|
|
return parseInt(this.$el.val()); |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
on_range_selected: function(e){ |
|
|
on_range_selected: function(e){ |
|
|
var self = this; |
|
|
var self = this; |
|
|
self.domain = ''; |
|
|
self.domain = ''; |
|
|
framework.blockUI(); |
|
|
framework.blockUI(); |
|
|
new Model("date.range") |
|
|
|
|
|
.call("get_domain", [ |
|
|
|
|
|
[this.get_value()], |
|
|
|
|
|
this.field.name, |
|
|
|
|
|
{} |
|
|
|
|
|
]) |
|
|
|
|
|
.then(function (domain) { |
|
|
|
|
|
framework.unblockUI(); |
|
|
|
|
|
self.domain = domain; |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
return rpc.query({ |
|
|
|
|
|
args: [this.get_value()], |
|
|
|
|
|
kwargs: { |
|
|
|
|
|
field_name: this.field.name |
|
|
|
|
|
}, |
|
|
|
|
|
model: 'date.range', |
|
|
|
|
|
method: 'get_domain', |
|
|
|
|
|
}) |
|
|
|
|
|
.then(function (domain) { |
|
|
|
|
|
framework.unblockUI(); |
|
|
|
|
|
self.domain = domain; |
|
|
|
|
|
}); |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
get_domain: function (field, operator) { |
|
|
get_domain: function (field, operator) { |
|
|
return this.domain; |
|
|
return this.domain; |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
}); |