Bugs fix

Luigi Serra
1 parent 8bada91f
Showing 3 changed files with 13 additions and 15 deletions
controllets/data-sevc-controllet/data-sevc-controllet.html
controllets/draggable-element-controllet/draggable-element-controllet.html
datalets/treemap-datalet/treemap-datalet.html
@@ -325,7 +325,7 @@
                     <div class="fancy area_container">
                         <paper-tabs selected="{{DatasourceTabSelected}}">
-                            <paper-tab>Select data suorce</paper-tab>
+                            <paper-tab>Select data source</paper-tab>
                             <paper-tab>Most popular</paper-tab>
                             <paper-tab>Search</paper-tab>
                         </paper-tabs>
@@ -116,7 +116,7 @@
         </template>
         <template is="dom-if" if="{{!isTarget}}">
-            <div class="drag-content-source" draggable="true" on-track="_handleTrack" on-drag="_handleStartDrag">
+            <div class="drag-content-source" draggable="true" on-track="_handleTrack" on-drag="_handleOnDrag" on-dragstart="_handleStartDrag">
                 <div id="{{identifier}}" class='draggable-card unselectable'>{{label}}</div>
             </div>
         </template>
@@ -171,6 +171,11 @@
             },
             _handleStartDrag : function(e){
+                /*var target = EventUtil.getCurrentTarget(e);
+                target.style.cursor = 'move';*/
+            },
+
+            _handleOnDrag : function(e){
                 this.targets = document.querySelectorAll('draggable-element-controllet[is-target=true]');
                 for (var i = 0; i < this.targets.length; i++) {
                     this.targets[i].children[0].children[1].className = "onTrackOnTarget dd-content-target unselectable style-scope draggable-element-controllet";
@@ -12,6 +12,7 @@
             #treemap_placeholder {
                 width: 100%;
                 height: 70%;
+                min-height: 500px;
                 background: #ddd;
             }
@@ -56,7 +57,7 @@
             }
         </style>
         <div id="treemap_placeholder"></div>
-        <base-datalet data-url="{{dataUrl}}" query="{{query}}" fields-order="{{fieldsOrder}}"></base-datalet>
+        <base-datalet data-url="{{dataUrl}}" query="{{query}}"></base-datalet>
     </template>
     <script src="../shared_js/d3.js"></script>
@@ -88,16 +89,8 @@
                 this.map.children = [];
-                //var curr_fields_order = this._component.fieldsOrder.split(',');
-                //var curr_fields_order = new Array();
-                var curr_fields_order = "0,1,2".split(',');
-                for(var i = 0; i < queries.length; i++) curr_fields_order.push(i);
-
-                var value_index = curr_fields_order[curr_fields_order.length -1];
-                curr_fields_order.pop();
-
                 for(var i = 0; i < this.properties.data.value.length; i++){
-                    this.checkAggragationField(this.properties.data.value[i], curr_fields_order , value_index);
+                    this.checkAggragationField(this.properties.data.value[i], queries.length - 1 , queries.length - 1);
                 }
                 //var json = JSON.stringify(this.map);
             },
@@ -111,12 +104,12 @@
                 children.push(nchild);
                 return nchild;
             },
-            checkAggragationField: function(object, cat_index, value_index){
+            checkAggragationField: function(object, levels, value_index){
                 var curchild = this.map;
                 var keys = Object.keys(object);
-                for(var level= 0; level < cat_index.length; level++){
+                for(var level= 0; level < levels; level++){
-                    var child = this.findChild(curchild, object[keys[cat_index[level]]]);
+                    var child = this.findChild(curchild, object[keys[level]]);
                     curchild = child;
                 }