From d3ca655d54d3b01cf1231282c46972d22a2ad102 Mon Sep 17 00:00:00 2001
From: ivan deng <guohuadeng@hotmail.com>
Date: Wed, 15 Nov 2017 01:32:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=AF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=9A=84search=20range?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app_search_range/__openerp__.py               |  2 +
 app_search_range/data/ir_config_parameter.xml | 13 +++
 app_search_range/static/src/js/tree.js        | 80 ++++++++++---------
 .../static/src/xml/pivot_view.xml             |  4 +-
 4 files changed, 61 insertions(+), 38 deletions(-)
 create mode 100644 app_search_range/data/ir_config_parameter.xml

diff --git a/app_search_range/__openerp__.py b/app_search_range/__openerp__.py
index 48b5e8a7..a95af0fc 100644
--- a/app_search_range/__openerp__.py
+++ b/app_search_range/__openerp__.py
@@ -16,6 +16,8 @@ Search by date or number range in List view and Pivot view
     'depends': ['web'],
     'data': [
         'views/template_view.xml',
+        # data
+        'data/ir_config_parameter.xml',
     ],
     'qweb': [
         'static/src/xml/*.xml',
diff --git a/app_search_range/data/ir_config_parameter.xml b/app_search_range/data/ir_config_parameter.xml
new file mode 100644
index 00000000..4369230f
--- /dev/null
+++ b/app_search_range/data/ir_config_parameter.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="0">
+        <record id="app_show_search_date" model="ir.config_parameter">
+            <field name="key">app_show_search_date</field>
+            <field name="value">True</field>
+        </record>
+        <record id="app_show_search_number" model="ir.config_parameter">
+            <field name="key">app_show_search_number</field>
+            <field name="value">True</field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/app_search_range/static/src/js/tree.js b/app_search_range/static/src/js/tree.js
index 1cae26ad..90136649 100644
--- a/app_search_range/static/src/js/tree.js
+++ b/app_search_range/static/src/js/tree.js
@@ -68,32 +68,35 @@ ListView.include({
 
         self.$buttons.find('.app-search').remove();
 
-        // Tim kiem theo khoang thoi gian
-
         var app_fields = [];
         _.each(self.columns, function(value, key, list){
             if (value.store && value.type === "datetime" || value.type === "date") {
                 app_fields.push([value.name, value.string]);
             }
         });
-        if (app_fields.length > 0) {
-            self.$search_button = $(QWeb.render('odooApp.buttons', {'app_fields': app_fields}))
-            self.$search_button.find('.app_start_date').datetimepicker(datepickers_options);
-            self.$search_button.find('.app_end_date').datetimepicker(datepickers_options);
-            // self.$search_button.find('.app_search_date_rate').click(function() {
-            //     self.tgl_search();
-            // });
-            self.$search_button.find('.app_start_date').on('change', function() {
-                self.tgl_search();
-            });
-            self.$search_button.find('.app_end_date').on('change', function() {
-                self.tgl_search();
-            });
-            self.$search_button.find('.app_select_field').on('change', function() {
-                self.tgl_search();
-            });
-            self.$search_button.appendTo(self.$buttons);
-        }        
+        // 增加参数控制app_show_search_date
+        new Model('ir.config_parameter').call('search_read', [[['key', '=', 'app_show_search_date']], ['value']]).then(function (show) {
+            if (show.length >= 1 && (show[0]['value'] == "True")) {
+                if (app_fields.length > 0) {
+                    self.$search_button = $(QWeb.render('odooApp.buttons', {'app_fields': app_fields}))
+                    self.$search_button.find('.app_start_date').datetimepicker(datepickers_options);
+                    self.$search_button.find('.app_end_date').datetimepicker(datepickers_options);
+                    // self.$search_button.find('.app_search_date_rate').click(function() {
+                    //     self.tgl_search();
+                    // });
+                    self.$search_button.find('.app_start_date').on('change', function () {
+                        self.tgl_search();
+                    });
+                    self.$search_button.find('.app_end_date').on('change', function () {
+                        self.tgl_search();
+                    });
+                    self.$search_button.find('.app_select_field').on('change', function () {
+                        self.tgl_search();
+                    });
+                    self.$search_button.appendTo(self.$buttons);
+                }
+            }
+        });
 
 
         app_fields = [];
@@ -109,22 +112,27 @@ ListView.include({
             }
         }
 
-        if (app_fields.length > 0) {
-            self.$search_range = $(QWeb.render('odooApp.SearchRange', {'app_fields': app_fields}))
-            // self.$search_range.find('.app_search_date_range').click(function() {
-            //     self.tgl_search();
-            // });
-            self.$search_range.find('.app_select_range_field').on('change', function() {
-                self.tgl_search();
-            });
-            self.$search_range.find('.app_start_range').on('change', function() {
-                self.tgl_search();
-            });
-            self.$search_range.find('.app_end_range').on('change', function() {
-                self.tgl_search();
-            });
-            self.$search_range.appendTo(self.$buttons);
-        }    
+        // 增加参数控制app_show_search_number
+        new Model('ir.config_parameter').call('search_read', [[['key', '=', 'app_show_search_number']], ['value']]).then(function (show) {
+            if (show.length >= 1 && (show[0]['value'] == "True")) {
+                if (app_fields.length > 0) {
+                    self.$search_range = $(QWeb.render('odooApp.SearchRange', {'app_fields': app_fields}))
+                    // self.$search_range.find('.app_search_date_range').click(function() {
+                    //     self.tgl_search();
+                    // });
+                    self.$search_range.find('.app_select_range_field').on('change', function () {
+                        self.tgl_search();
+                    });
+                    self.$search_range.find('.app_start_range').on('change', function () {
+                        self.tgl_search();
+                    });
+                    self.$search_range.find('.app_end_range').on('change', function () {
+                        self.tgl_search();
+                    });
+                    self.$search_range.appendTo(self.$buttons);
+                }
+            }
+        });
 
         // Dropdown list cho phep chon nhieu
         _.each(this.ts_context, function(item){
diff --git a/app_search_range/static/src/xml/pivot_view.xml b/app_search_range/static/src/xml/pivot_view.xml
index 624225ff..abf677dd 100644
--- a/app_search_range/static/src/xml/pivot_view.xml
+++ b/app_search_range/static/src/xml/pivot_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates id="template" xml:space="preserve">
-
+<!--日期类型搜索-->
     <t t-name="odooApp.buttons">
         <div class="app-search btn-group btn-group-sm" >
             <!-- <div style="margin-left: 10px; margin-top: 2px;"> -->
@@ -27,7 +27,7 @@
         </div>
         <!-- <br></br> -->
     </t>
-
+<!--数值范围搜索-->
     <t t-name="odooApp.SearchRange">
         <div class="app-search btn-group btn-group-sm" >
             <!-- <div style="margin-left: 10px; margin-top: 2px;"> -->