odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[imp] used datetime widget in advanced search 

bzr revid: nicolas.vanhoren@openerp.com-20110921120347-rx8xhwa4igswtsx7
This commit is contained in:
niv-openerp 2011-09-21 14:03:47 +02:00
parent 7d65aca167
commit e281efe866
3 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/web/static/src/css/base.css
View File

@ -896,6 +896,10 @@ label.error {
}
.openerp .oe_datepicker {
position: relative;
display: inline-block;
}
.openerp .oe_datepicker input[type="text"] {
min-width: 160px;
}
.openerp .oe_input_icon_disabled {
position: absolute;

23
addons/web/static/src/js/search.js
View File

@ -803,9 +803,6 @@ openerp.web.search.DateField = openerp.web.search.Field.extend(/** @lends opener
this.attrs.default_focus === '1' ? 'autofocus' : undefined);
this.datewidget.set_value(this.defaults[this.attrs.name] || false);
},
stop: function () {
this.$element.datepicker('destroy');
},
get_value: function () {
return this.datewidget.get_value() || null;
}
@ -1122,7 +1119,7 @@ openerp.web.search.ExtendedSearchProposition.Char = openerp.web.OldWidget.extend
}
});
openerp.web.search.ExtendedSearchProposition.DateTime = openerp.web.OldWidget.extend({
template: 'SearchView.extended_search.proposition.datetime',
template: 'SearchView.extended_search.proposition.empty',
identifier_prefix: 'extended-search-proposition-datetime',
operators: [
{value: "=", text: "is equal to"},
@ -1133,18 +1130,16 @@ openerp.web.search.ExtendedSearchProposition.DateTime = openerp.web.OldWidget.ex
{value: "<=", text: "less or equal than"}
],
get_value: function() {
return this.$element.val();
return this.datewidget.get_value();
},
start: function() {
this._super();
this.$element.datetimepicker({
dateFormat: 'yy-mm-dd',
timeFormat: 'hh:mm:ss'
});
this.datewidget = new openerp.web.DateTimeWidget(this);
this.datewidget.prependTo(this.$element);
}
});
openerp.web.search.ExtendedSearchProposition.Date = openerp.web.OldWidget.extend({
template: 'SearchView.extended_search.proposition.date',
template: 'SearchView.extended_search.proposition.empty',
identifier_prefix: 'extended-search-proposition-date',
operators: [
{value: "=", text: "is equal to"},
@ -1155,14 +1150,12 @@ openerp.web.search.ExtendedSearchProposition.Date = openerp.web.OldWidget.extend
{value: "<=", text: "less or equal than"}
],
get_value: function() {
return this.$element.val();
return this.datewidget.get_value();
},
start: function() {
this._super();
this.$element.datepicker({
dateFormat: 'yy-mm-dd',
timeFormat: 'hh:mm:ss'
});
this.datewidget = new openerp.web.DateWidget(this);
this.datewidget.prependTo(this.$element);
}
});
openerp.web.search.ExtendedSearchProposition.Integer = openerp.web.OldWidget.extend({

7
addons/web/static/src/xml/base.xml
View File

@ -1156,11 +1156,8 @@
<t t-name="SearchView.extended_search.proposition.char">
<input t-att-id="element_id" class="field_char"/>
</t>
<t t-name="SearchView.extended_search.proposition.datetime">
<input t-att-id="element_id" class="field_datetime"/>
</t>
<t t-name="SearchView.extended_search.proposition.date">
<input t-att-id="element_id" class="field_date"/>
<t t-name="SearchView.extended_search.proposition.empty">
<span t-att-id="element_id"></span>
</t>
<t t-name="SearchView.extended_search.proposition.integer">
<input type="number" t-att-id="element_id" class="field_integer" step="1"/>