Merge branch 'master' of http://service.routetopa.eu:7480/WebCompDev/COMPONENTS

Andrea Petta
2 parents ca51b6dc e6930b3e
Showing 3 changed files with 30 additions and 18 deletions
controllets/dataset-selection-controllet/dataset-selection-controllet.html
datalets/datasetexplorer-datalet/js/buildtreemap.js
datalets/datasetexplorer-datalet/treemap_tooltip.html
@@ -284,7 +284,7 @@
                 var h = $("#material_container").height() - 48;
                 var w = $("#material_container").width();
                 //                                                                                                          /oxwall_x.y.z
-                this.$.div_datasetexplorer.innerHTML = "<datasetexplorer-datalet width=\""+w+"\" height=\""+h+"\" data-url=\"/openwall/api/datasetTree\" fields='[\"result,provider_name\",\"result,organization_name\",\"result,package_name\",\"result,resource_name\",\"result,url\",\"result,w\"]'></datasetexplorer-datalet>";
+                this.$.div_datasetexplorer.innerHTML = "<datasetexplorer-datalet width=\""+w+"\" height=\""+h+"\" data-url=\"/openwall/api/datasetTree\" fields='[\"result,datasets,provider_name\",\"result,datasets,organization_name\",\"result,datasets,package_name\",\"result,datasets,resource_name\",\"result,datasets,url\",\"result,datasets,w\"]'></datasetexplorer-datalet>";
             },
  
             _selectDataUrl_treeMap : function(e) {
@@ -366,4 +366,4 @@
  
     </script>
  
-</dom-module>
 \ No newline at end of file
+</dom-module>
@@ -131,30 +131,28 @@ function build(root, meta, place_holder, select_listener, width, height) {
             .call(rect)
             .attr("onmousemove", function(d) {
                 //var data = ["lvl", "name", "color", "description", "logoUrl", "datasets", "datasetUrl"];
-                var data = ["", d.name, d.color, "", "", "0", ""];
-                //d.name.split(':')[1]???
+                var data = ["", d.name, d.color, "", "", d.value, ""];
+                data[2] = ["#000000"];
+                var id = d.name.split(':')[1];
                 if (d.depth == 1) {
                     // FIRST LVL
                     data[0] = "first";
-                    data[3] = "description";//???
-                    data[4] = "http://essi-lab.eu/twiki/pub/GIcat/CKANProfilerGuide/logo-ckan.png";//id???
-                    data[5] = "2222";//meta???
+                    data[1] = meta[id]['title'];
+                    //data[3] = OW.getLanguageText('openwall', 'provider_'+id);//???
+                    data[3] = (typeof OW == 'undefined') ? "" : OW.getLanguageText('openwall', 'provider_'+id);
+                    data[4] = ((typeof ODE == 'undefined') ? parent.ODE.THEME_IMAGES_URL : ODE.THEME_IMAGES_URL) + "/logos/"+id+".png";//meta[id]['logo_url'];
+                    //data[5] = d.value;
                 } else if (d._children && !d._children[0]._children) {
                     // LAST LVL
                     data[0] = "last";
-                    data[6] = "datasert url";//???
+                    //data[6] = "datasert url";
                 } else {
                     // MIDDLE LVL
                     data[0] = "middle";
-                    data[5] = "1111";//meta???
                 }
-                //console.log(data);
-                //console.log(data.toString());
                 return "showTooltip(event, '" + data + "')";
             })
             .attr("onmouseout", function() {return "hideTooltip()";})
-            //.append("title")
-            //.text(function(d) { return d.name;  /*formatNumber(d.value);*/ });
  
         g.append("text")
             .attr("dy", ".75em")
@@ -36,15 +36,29 @@
             .tooltip {
                 font-family: 'Roboto', 'Helvetica Neue', Helvetica, Arial, sans-serif;
                 padding: 16px;
-                min-width: 200px;
-                max-width: 400px;
                 position: absolute;
  
+                /*min-width: 200px;*/
+                /*max-width: 400px;*/
+
                 /*position: relative*/
                 /*top: 20px;*/
                 /*left: 20px;*/
             }
  
+            .tooltip#first_info {
+                width: 400px;
+            }
+
+            .tooltip#middle_info {
+                min-width: 200px;
+            }
+
+            .tooltip#last_info {
+                min-width: 200px;
+                max-width: 800px;
+            }
+
             .tooltip_top {
                 display: flex;
                 margin: 0px;
@@ -65,7 +79,7 @@
                 margin: 0px;
                 padding: 0px;
                 height: 64px;
-                width: 64px;
+                /*width: 64px;*/
             }
  
             p {
@@ -83,9 +97,9 @@
             <iron-icon icon="communication:call-made" class="this" style$="color: {{color}};"></iron-icon>
             <div class="tooltip_top">
                 <div class="tooltip_logo"><img class="tooltip_img" src$={{logoUrl}}></div>
-                <div class="tooltip_name" style$="color: {{color}};">{{name}}</div>
+                <!--<div class="tooltip_name" style$="color: {{color}};">{{name}}</div>-->
             </div>
-            <p><i>{{description}}</i></p>
+            <p><b style$="color: {{color}};">{{name}}</b>: <i>{{description}}</i></p>
             <p>There are <b>{{datasets}}</b> datasets.</p>
         </paper-dialog>