From 50434b10bc39e6682fa027f10ffce51b6a712b33 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 19 May 2011 17:53:02 +0200
Subject: [PATCH] [IMP] Added datetime and date picker to custom filters.

bzr revid: nicolas.vanhoren@openerp.com-20110519155302-qfthbnkic2qfzmf1
---
 addons/base/static/src/js/search.js | 45 +++++++++++++++++++++--------
 addons/base/static/src/xml/base.xml |  7 +++--
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index b463d21962c..185b55e7a5f 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -696,11 +696,6 @@ openerp.base.search.ManyToManyField = openerp.base.search.IntegerField.extend({
     // TODO: .related_columns (Array), .context, .domain
 });
 
-openerp.base.search.custom_filters = new openerp.base.Registry({
-    'char': 'openerp.base.search.ExtendedSearchProposition.Char',
-    'datetime': 'openerp.base.search.ExtendedSearchProposition.DateTime'
-});
-
 openerp.base.search.ExtendedSearch = openerp.base.BaseWidget.extend({
     template: 'SearchView.extended_search',
     identifier_prefix: 'extended-search',
@@ -873,7 +868,7 @@ openerp.base.search.ExtendedSearchProposition.Char = openerp.base.BaseWidget.ext
     }
 });
 openerp.base.search.ExtendedSearchProposition.DateTime = openerp.base.BaseWidget.extend({
-    template: 'SearchView.extended_search.proposition.char',
+    template: 'SearchView.extended_search.proposition.datetime',
     identifier_prefix: 'extended-search-proposition-datetime',
     operators: [
         {value: "=", text: "is equal to"},
@@ -884,19 +879,45 @@ openerp.base.search.ExtendedSearchProposition.DateTime = openerp.base.BaseWidget
         {value: "<=", text: "less or equal than"}
     ],
     get_value: function() {
-        var val = this.$element.val();
-        debugger;
-        return val;
+        return this.$element.val();
     },
-    render: function(add) {
-        this._super(add);
-        this.$element.find('input').datetimepicker({
+    start: function() {
+        this._super();
+        this.$element.datetimepicker({
+            dateFormat: 'yy-mm-dd',
+            timeFormat: 'hh:mm:ss'
+        });
+    }
+});
+openerp.base.search.ExtendedSearchProposition.Date = openerp.base.BaseWidget.extend({
+    template: 'SearchView.extended_search.proposition.date',
+    identifier_prefix: 'extended-search-proposition-date',
+    operators: [
+        {value: "=", text: "is equal to"},
+        {value: "!=", text: "is not equal to"},
+        {value: ">", text: "greater than"},
+        {value: "<", text: "less than"},
+        {value: ">=", text: "greater or equal than"},
+        {value: "<=", text: "less or equal than"}
+    ],
+    get_value: function() {
+        return this.$element.val();
+    },
+    start: function() {
+        this._super();
+        this.$element.datepicker({
             dateFormat: 'yy-mm-dd',
             timeFormat: 'hh:mm:ss'
         });
     }
 });
 
+openerp.base.search.custom_filters = new openerp.base.Registry({
+    'char': 'openerp.base.search.ExtendedSearchProposition.Char',
+    'datetime': 'openerp.base.search.ExtendedSearchProposition.DateTime',
+    'date': 'openerp.base.search.ExtendedSearchProposition.Date'
+});
+
 };
 
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 57c09839fd8..3cbf5c88501 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -576,9 +576,10 @@
     <input t-att-id="element_id"/>
 </t>
 <t t-name="SearchView.extended_search.proposition.datetime">
-    <input type="text"
-        t-att-id="element_id"
-    />
+    <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 t-name="ViewManager.sidebar">
     <div t-att-id="element_id" class="sidebar-main-div closed-sidebar">