[IMP] Implement treeview(completed)

bzr revid: bth@tinyerp.com-20110613055102-2syu8awycm0etxc1

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 9eb16f8..d05dffa 100644 (file)
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -762,14 +762,4 @@ class TreeView(View):
     @openerpweb.jsonrequest
     def load(self, req, model, view_id, toolbar=False):
         fields_view = self.fields_view_get(req, model, view_id, 'tree', toolbar=toolbar)
-        return {'field_parent': fields_view}
-
-    def fields_view_get(self, request, model, view_id, view_type="tree",
-                        transform=True, toolbar=False, submenu=False):
-        """ Sets @editable on the view's arch if it isn't already set and
-        ``set_editable`` is present in the request context
-        """
-        view = super(TreeView, self).fields_view_get(
-            request, model, view_id, view_type, transform, toolbar, submenu)
-
-        return view
\ No newline at end of file
+        return {'field_parent': fields_view}
\ No newline at end of file

diff --git a/addons/base/static/src/js/tree.js b/addons/base/static/src/js/tree.js
index 853b470..5cd3d8d 100644 (file)
--- a/addons/base/static/src/js/tree.js
+++ b/addons/base/static/src/js/tree.js
@@ -22,139 +22,99 @@ openerp.base.TreeView = openerp.base.View.extend({
             toolbar: this.view_manager ? !!this.view_manager.sidebar : false
         }, this.on_loaded);
     },
+
     on_loaded: function (data) {
         var self = this;
         this.dataset.read_slice([], 0, false, function (response) {
             self.$element.html(QWeb.render('TreeView', {'field_data':response}));
-
             id=self.dataset.ids[0];
-            self.dataset.domain=[['parent_id','=',parseInt(id,10)]];
-            self.dataset.read_slice([], 0, false, function (response) {
-                $('#parent_id').change(self.getch(($('#parent_id').attr('value')),0));
-                self.$element.append(QWeb.render('TreeView_Secondry', {'child_data':response}));
-
-                $('#child_id').find('div').click(function(){
-                    if($('#'+this.id).parent().attr('id')=="child_id"){
-                           if(jQuery('#child_id').find('#'+(this.id)).find('#subchild').length==0){
-                              //console.log('in load');
-                               self.getch(this.id,1);
-                           }
-                       }
-                });
+            self.$element.find('#parent_id').bind('change', function(){
+                self.getdata($('#parent_id').val(), 0);
             });
+            self.getdata(id);
         });
     },
-    getch: function(id,flag) {
-        //console.log(flag);
-        var self=this;
-        if(flag==0){
-            $('#parent_id').change(function(){
-                self.on_change($('#parent_id').attr('value'),0);
-            });
-         }
-         else if(flag==1){
-            self.on_change(id,1);
-         }else{
-            self.on_change(id,2);
-         }
-    },
-    on_change:function(parentid,flag){
 
+    // get child data of selected value
+    getdata: function (id, flag) {
         var self=this;
-
-        if(parentid>0){
-            this.dataset.domain=[['parent_id','=',parseInt(parentid,10)]];
-            this.dataset.read_slice([],0,false, function (response) {
-                if(flag==0){
-                    $('#child_id').remove();
-                    self.$element.append(QWeb.render('TreeView_Secondry', {'child_data':response}));
-                }else if(flag==1){
-                    jQuery('#'+parentid).append(QWeb.render('TreeView_Children', {'childdata':response}))
-                    $("#subchild").show();
-                    jQuery('#'+parentid).find("#parentimg").attr("src", "/base/static/src/img/collapse.gif");
-                    $('#'+parentid).find('#subchild').find('#subchild').remove();
-                    $('#'+parentid).find('#subchild').slice(1,3).remove();
-                }else if(flag==2){
-                    $("#subchild #"+parentid).find('#subchild').remove();
-                    $("#subchild #"+parentid).find('#childsubchild').remove();
-                    jQuery('#subchild #'+parentid).find("#childimg").attr("src", "/base/static/src/img/collapse.gif");
-                    $("#subchild #"+parentid).append(QWeb.render('TreeView_SubChildren', {'subchilddata':response}))
-                    $("#subchild #"+parentid).find('#childsubchild').show();
+        self.dataset.domain = [['parent_id', '=', parseInt(id,10)]];
+        self.dataset.read_slice([], 0, false, function (response) {
+            if (($('tr #'+id).length) == 1){
+                $('tr #'+id).find('td #parentimg').attr('src','/base/static/src/img/collapse.gif');
+                $('tr #'+id).after(QWeb.render('TreeView_Secondry', {'child_data':response}));
+            }else{
+                if (flag == 0){
+                    self.$element.find('tr').remove();
                 }
-                /*for(var i=0;i<$('#child_id > div').length;i++){
-                    console.log($('#child_id:nth-child('+i+') '));
-                }*/
-                //console.log($('#child_id > div').slice().attr('id'));
-                // subclass
-                //$('#child_id').find('.childclass').click(function(){
-                if(flag==0){
-                    //console.log('in flag 0');
-                       $('#child_id').find('div').click(function(){
+                self.$element.append(QWeb.render('TreeView_Secondry', {'child_data':response}));
+            }
 
-                          if($('#'+this.id).parent().attr('id')=="child_id"){
-                                  var pathimg=jQuery('#child_id').find('#'+(this.id)).find("#parentimg").attr("src");
-                                     if(pathimg=='/base/static/src/img/collapse.gif'){
-                                          $(('#'+this.id)+'> div').hide();
-                                          jQuery('#child_id').find('#'+(this.id)).find('#parentimg').attr('src','/base/static/src/img/expand.gif');
-                                     }
-                                     else if(pathimg=='/base/static/src/img/expand.gif'){
-                                          if(jQuery('#child_id').find('#'+(this.id)).find('#subchild').length==0){
-                                              self.getch(this.id,1);
-                                          }else{
-                                               $(('#'+this.id)+'> div').show();
-                                               jQuery('#child_id').find('#'+(this.id)).find('#parentimg').attr('src','/base/static/src/img/collapse.gif');
-                                          }
-                                     }
-                              }
-                       });
+            $('tr').click(function(){
+                divflag=0;
+                if ($('#'+(this.id)).length == 1){
+                    for (i in response){
+                        if (this.id == response[i].id){
+                            if (response[i].child_id.length > 0){
+                                jQuery(response[i].child_id).each(function(e,chid){
+                                    if (jQuery('tr #'+chid).length > 0){
+                                        if (jQuery('tr #'+chid).is(':hidden')){
+                                            divflag = -1;
+                                        }else{
+                                            divflag++;
+                                        }
+                                    }
+                                });
+                                if (divflag == 0){
+                                    if ($('#'+(this.id)).find('td #parentimg').attr('src') == '/base/static/src/img/expand.gif'){
+                                        self.getdata(this.id);
+                                    }
+                                }else if (divflag > 0){
+                                    self.showcontent(this.id, 1, response[i].child_id);
+                                }else if (divflag == -1){
+                                    self.showcontent(this.id, 0, response[i].child_id);
+                                }
+                            }
+                        }
+                    }
                 }
-                               $('#child_id div #subchild').find('div').click(function(){
-                    var childimg=jQuery('#subchild').find('#'+(this.id)).find("#childimg").attr("src");
-                     if(childimg=='/base/static/src/img/collapse.gif'){
-                        $('#'+this.id).find('#childsubchild').hide();
-                        jQuery('#subchild').find('#'+(this.id)).find('#childimg').attr('src','/base/static/src/img/expand.gif');
-                     }else if(childimg=='/base/static/src/img/expand.gif'){
-                       /* console.log('in else of subchild div');
-                        if($('#'+(this.id)).find('#childsubchild').css('display')=='none'){
-                            console.log('in else-else of subchild div');
-                            $(('#'+this.id)+'> div').show();
-                            jQuery('#subchild').find('#'+(this.id)).find('#childimg').attr('src','/base/static/src/img/collapse.gif');
-                        }else{
-                            self.getch(this.id,2);
-                        }*/
-                        if(jQuery('#subchild').find('#'+(this.id)).find('#childsubchild').length==0){
-                            //console.log('in else-if of subchild div');
-                              self.getch(this.id,2);
-                           }else{
-                               //console.log('in else-else of subchild div');
-                            $(('#'+this.id)+'> div').show();
-                            jQuery('#subchild').find('#'+(this.id)).find('#childimg').attr('src','/base/static/src/img/collapse.gif');
-                           }
-                     }
-
-                    /*if(jQuery('#subchild').find('#'+(this.id)).find('#childsubchild').length==0){
-                                  self.getch(this.id,2);
-                    }else if((jQuery('#subchild').find('#'+(this.id)).find('#childimg').attr('src'))=='/base/static/src/img/collapse.gif'){
-                        jQuery('#subchild').find('#'+(this.id)).find('#childimg').attr('src','/base/static/src/img/expand.gif');
-                                       //jQuery('#subchild').find('#'+(this.id)).find('#childsubchild').hide();
-                                   jQuery('#subchild').find('#'+(this.id)).find('#childsubchild').css('display','none');
-                               }else{
-                                    jQuery('#subchild').find('#'+(this.id)).find('#childsubchild').css('display','block');
-                                    //jQuery('#subchild').find('#'+(this.id)).find('#childsubchild').show();
-                               }*/ /*else{
-                                          jQuery('#subchild').find('#'+(this.id)).find('#childimg').attr('src','/base/static/src/img/expand.gif');
-                                          jQuery('#subchild').find('#'+(this.id)).find('#childsubchild').hide();
-                                       }*/
-                });
+            });
+        });
+    },
 
+    // show & hide the contents
+    showcontent: function (id, flag, childid) {
+        var self=this;
+        if (flag == 1){
+            $('tr #'+id).find('td #parentimg').attr('src', '/base/static/src/img/expand.gif');
+        }
+        else{
+            $('tr #'+id).find('td #parentimg').attr('src', '/base/static/src/img/collapse.gif');
+        }
 
-            });
+        for (i in childid){
+            if (flag == 1){
+                self.dataset.domain = [['parent_id', '=', parseInt(childid[i],10)]];
+                self.dataset.read_slice([], 0, false, function (response) {
+                    for (j in response){
+                        if (jQuery('tr #'+response[j].id).length > 0){
+                            jQuery('tr #'+response[j].id).hide();
+                        }
+                    }
+                });
+                jQuery ('tr #'+childid[i]).hide();
+            }
+            else{
+                jQuery ('tr #'+childid[i]).show();
+            }
         }
     },
+
     reload_view: function (grouped) {
         var self = this;
         this.dataset.offset = 0;
         this.dataset.limit = false;
+
         return this.rpc('/base/treeview/load', {
             model: this.model,
             view_id: this.view_id,

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index e109dae..75ded7f 100644 (file)
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -228,62 +228,28 @@
     </tr>
     </table>
 </t>
-<table t-name="TreeView">
-    <tr>
-       <select name="parent" id="parent_id" style="width: 30%">
-                <t t-foreach="field_data" t-as="field" >
-                    <option t-att-value="field.id">
-                        <t t-esc="field.name"/>
-                    </option>
-                </t>
-        </select>
-   </tr>
-</table>
-<t t-name="TreeView_Secondry">
-    <div id="child_id">
-        <t t-foreach="child_data" t-as="field" >
-            <div t-att-id="field.id" class="childclass">
-                <t t-if="(field.child_id).length>=1">
-                   <img id="parentimg" src="/base/static/src/img/expand.gif" width="16" height="16" border="0"/>
-                </t>
+<t t-name="TreeView">
+    <select name="parent" id="parent_id" style="width: 30%">
+        <t t-foreach="field_data" t-as="field" >
+            <option t-att-value="field.id">
                 <t t-esc="field.name"/>
-            </div>
+            </option>
         </t>
-    </div>
-        <!-- <ul id="child_id">
-            <t t-foreach="child_data" t-as="field" >
-                <li t-att-id="field.id" >
-                    <t t-esc="field.name"/>
-
-
-                </li>
-            </t>
-        </ul> -->
-
-</t>
-<t t-name="TreeView_Children">
-    <div id="subchild" style="display:none">
-        <t t-foreach="childdata" t-as="child" >
-            <div t-att-id="child.id" class="subclass">
-                <t t-if="(child.child_id).length>=1">
-                    <img id="childimg" src="/base/static/src/img/expand.gif" width="16" height="16" border="0"/>
-                </t>
-                <t t-esc="child.name"/>
-            </div>
-        </t>
-    </div>
+    </select>
 </t>
-<t t-name="TreeView_SubChildren">
-    <div id="childsubchild" style="display:none">
-        <t t-foreach="subchilddata" t-as="subchild" class="subchildclass">
-            <div t-att-id="subchild.id" >
-                <t t-if="(subchild.child_id).length>=1">
-                    <img id="subchildimg" src="/base/static/src/img/expand.gif" width="16" height="16" border="0"/>
+<t t-name="TreeView_Secondry">
+    <t t-foreach="child_data" t-as="field" >
+        <tr t-att-id="field.id" class="childclass" >
+            <td>
+                <t t-if="(field.child_id).length>=1">
+                    <img id="parentimg" src="/base/static/src/img/expand.gif" width="16" height="16" border="0"/>
                 </t>
-                <t t-esc="subchild.name"/>
-            </div>
-        </t>
-    </div>
+            </td>
+            <td>
+                <t t-esc="field.name"/>
+            </td>
+        </tr>
+    </t>
 </t>
 <table t-name="ListView">
     <t t-set="columns_count" t-value="visible_columns.length + (options.selectable ? 1 : 0) + (options.deletable ? 1 : 0)"/>
@@ -920,4 +886,4 @@
     <button type="button" class="oe_many2xselectpopup-form-save">Save</button>
     <button type="button" class="oe_many2xselectpopup-form-close">Close</button>
 </t>
-</templates>
+</templates>
\ No newline at end of file