diff --git a/controllets/datalet-selection-controllet/datalet-selection-controllet.html b/controllets/datalet-selection-controllet/datalet-selection-controllet.html
index 1057212..d253448 100755
--- a/controllets/datalet-selection-controllet/datalet-selection-controllet.html
+++ b/controllets/datalet-selection-controllet/datalet-selection-controllet.html
@@ -560,18 +560,17 @@
ComponentService.deep_url = this.deepUrl;
ComponentService.getComponent(dataletParams);
- console.log(this.params);
+// console.log(this.params);
- //300???
- this.async(function(){
- if(this.$.datalet_selection_datalet_placeholder.children[1])
- this.$.datalet_selection_datalet_placeholder.children[1].behavior.setParameters(this.params);
- this.$.add_button.removeAttribute("disabled");
- }, 300);
+// this.async(function(){
+// if(this.$.datalet_selection_datalet_placeholder.children[1])
+// this.$.datalet_selection_datalet_placeholder.children[1].behavior.setParameters(this.params);
+// this.$.add_button.removeAttribute("disabled");
+// }, 300);
// this.async(function(){this.$.add_button.removeAttribute("disabled");}, 300);
-// this.$.add_button.removeAttribute("disabled");
+ this.$.add_button.removeAttribute("disabled");
},
_addDatalet : function(){
diff --git a/controllets/dataset-selection-controllet/dataset-selection-controllet.html b/controllets/dataset-selection-controllet/dataset-selection-controllet.html
index 80e7b2a..47387cf 100755
--- a/controllets/dataset-selection-controllet/dataset-selection-controllet.html
+++ b/controllets/dataset-selection-controllet/dataset-selection-controllet.html
@@ -281,7 +281,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=\"/oxwall_x.y.z/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,provider_name\",\"result,organization_name\",\"result,package_name\",\"result,resource_name\",\"result,url\",\"result,w\"]'></datasetexplorer-datalet>";
},
_selectDataUrl_treeMap : function(e) {
diff --git a/datalets/areachart-datalet/areachart-datalet.html b/datalets/areachart-datalet/areachart-datalet.html
index eef7fcf..1b3717a 100755
--- a/datalets/areachart-datalet/areachart-datalet.html
+++ b/datalets/areachart-datalet/areachart-datalet.html
@@ -50,7 +50,7 @@ Example:
<dom-module id="areachart-datalet">
<template>
- <highcharts-datalet id="charts" data-url="{{dataUrl}}" fields="{{fields}}"></highcharts-datalet>
+ <highcharts-datalet id="charts" data-url="{{dataUrl}}" fields="{{fields}}" title="{{title}}" description="{{description}}"></highcharts-datalet>
</template>
<script>
diff --git a/datalets/barchart-datalet/barchart-datalet.html b/datalets/barchart-datalet/barchart-datalet.html
index 46cc321..3beb917 100755
--- a/datalets/barchart-datalet/barchart-datalet.html
+++ b/datalets/barchart-datalet/barchart-datalet.html
@@ -50,7 +50,7 @@ Example:
<dom-module name="barchart-datalet">
<template>
- <highcharts-datalet id="charts" data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}"></highcharts-datalet>
+ <highcharts-datalet id="charts" data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}" title="{{title}}" description="{{description}}"></highcharts-datalet>
</template>
<script>
@@ -117,7 +117,6 @@ Example:
}
};
-
BarchartDatalet = Polymer({
is: 'barchart-datalet',
@@ -176,7 +175,6 @@ Example:
* @method ready
*/
ready: function(){
-
this.behavior = $.extend(true, {}, HighchartsComponentBehavior, BarchartBehavior);
this.async(function(){this.behavior.init(this)},0);
}
diff --git a/datalets/base-ajax-json-jsonpath-datalet/base-ajax-json-jsonpath-datalet.html b/datalets/base-ajax-json-jsonpath-datalet/base-ajax-json-jsonpath-datalet.html
index 1e88c13..6a9da05 100755
--- a/datalets/base-ajax-json-jsonpath-datalet/base-ajax-json-jsonpath-datalet.html
+++ b/datalets/base-ajax-json-jsonpath-datalet/base-ajax-json-jsonpath-datalet.html
@@ -52,7 +52,7 @@ Example :
<dom-module id="base-ajax-json-jsonpath-datalet">
<template>
- <base-datalet data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}"></base-datalet>
+ <base-datalet data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}" title="{{title}}" description="{{description}}"></base-datalet>
</template>
<script src="static/js/vendor/jsonpath-0.8.5.js"></script>
diff --git a/datalets/base-datalet/base-datalet.html b/datalets/base-datalet/base-datalet.html
index 030d8e6..4cc3695 100755
--- a/datalets/base-datalet/base-datalet.html
+++ b/datalets/base-datalet/base-datalet.html
@@ -64,20 +64,15 @@ Example :
text-decoration: underline;
}
#base_datalet_container {
- /*display: flex;*/
font-family: 'Roboto', 'Helvetica Neue', Helvetica, Arial, sans-serif;
- /*color: #212121;*/
padding-top: 2px;
- /*padding: 16px;*/
border-top: 2px solid #B6B6B6;
}
#base_datalet_rtp {
- /*background-color: red;*/
display: flex;
padding-top: 4px;
}
#rtp {
- /*width: 152px;*/
padding-top: 8px;
padding-right: 8px;
font-size: small;
@@ -135,20 +130,6 @@ Example :
BaseDatalet = Polymer({
is: 'base-datalet',
- properties: {
-
- title : {
- type : String,
- value : ""
- },
-
- description : {
- type : String,
- value : ""
- }
-
- },
-
objectDatalet: {
/**
* It contains the json data from async xhr call returned from core-ajax core component
@@ -166,22 +147,6 @@ Example :
hideFooter: function() {
this.$.base_datalet_container.innerHTML = "";
this.$.base_datalet_container.style.border = 0;
-
-// this.$.base_datalet_source_link.innerHTML = "";
-// this.$.base_datalet_rtp.innerHTML = "";
- },
-
- setFooter: function(title, description) {
- this.title = title;
- if(title != "" && description != "")
- this.description = "- " + description;
- else
- this.description = description;
-
- if (this.title == "" && this.description == "")
- this.$.base_datalet_title_description.style.display = "none";
- else
- this.$.base_datalet_title_description.style.display = "block";
},
/**
@@ -195,7 +160,14 @@ Example :
* from the entire URL and set the text content of the datalet footer.
* @method ready
*/
+
+ attached: function(){
+ if(this.title != "" && this.description != "")
+ this.description = "- " + this.description;
+ },
+
ready: function(){
+
if(this.dataUrl != undefined) {
//cKan organized with or not catalog
diff --git a/datalets/base-datalet/static/js/BaseDataletBehavior.js b/datalets/base-datalet/static/js/BaseDataletBehavior.js
index 199c9e1..d05a198 100755
--- a/datalets/base-datalet/static/js/BaseDataletBehavior.js
+++ b/datalets/base-datalet/static/js/BaseDataletBehavior.js
@@ -78,7 +78,8 @@ var BaseDataletBehavior ={
setParameters: function(params)
{
- $(this._component).find("base-datalet")[0].setFooter(params['title'], params['description']);
- },
+ this.title = params['title'];
+ this.description = params['description'];
+ }
};
\ No newline at end of file
diff --git a/datalets/bubble3d-datalet/bubble3d-datalet.html b/datalets/bubble3d-datalet/bubble3d-datalet.html
index 7553fb5..6e8e38b 100755
--- a/datalets/bubble3d-datalet/bubble3d-datalet.html
+++ b/datalets/bubble3d-datalet/bubble3d-datalet.html
@@ -59,7 +59,7 @@ Examples:
<dom-module name="bubble3d-datalet">
<template>
- <highcharts-datalet id="charts" data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}"></highcharts-datalet>
+ <highcharts-datalet id="charts" data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}" title="{{title}}" description="{{description}}"></highcharts-datalet>
</template>
<script>
diff --git a/datalets/column3Dchart-datalet/column3Dchart-datalet.html b/datalets/column3Dchart-datalet/column3Dchart-datalet.html
index 64906a3..318011a 100755
--- a/datalets/column3Dchart-datalet/column3Dchart-datalet.html
+++ b/datalets/column3Dchart-datalet/column3Dchart-datalet.html
@@ -59,7 +59,7 @@ Example:
<tr><td>Alpha Angle</td><td><input id="R0" type="range" min="0" max="45" value="15"/> <span id="R0-value" class="value"></span></td></tr>
<tr><td>Beta Angle</td><td><input id="R1" type="range" min="0" max="45" value="15"/> <span id="R1-value" class="value"></span></td></tr>
</table>
- <highcharts-datalet id="charts" data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}"></highcharts-datalet>
+ <highcharts-datalet id="charts" data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}" title="{{title}}" description="{{description}}"></highcharts-datalet>
</template>
<script>
diff --git a/datalets/columnchart-datalet/columnchart-datalet.html b/datalets/columnchart-datalet/columnchart-datalet.html
index 4075938..c2e5b6b 100755
--- a/datalets/columnchart-datalet/columnchart-datalet.html
+++ b/datalets/columnchart-datalet/columnchart-datalet.html
@@ -50,7 +50,7 @@ Example:
<dom-module id="columnchart-datalet">
<template>
- <highcharts-datalet id="charts" data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}"></highcharts-datalet>
+ <highcharts-datalet id="charts" data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}" title="{{title}}" description="{{description}}"></highcharts-datalet>
</template>
<script>
diff --git a/datalets/datatable-datalet/datatable-datalet.html b/datalets/datatable-datalet/datatable-datalet.html
index b0d386a..a26e363 100755
--- a/datalets/datatable-datalet/datatable-datalet.html
+++ b/datalets/datatable-datalet/datatable-datalet.html
@@ -54,7 +54,7 @@ Example:
<table id="datatable" class="stripe row-border" cellspacing="0" style="height: auto; width: auto;">
</table>
- <base-ajax-json-jsonpath-datalet data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}"></base-ajax-json-jsonpath-datalet>
+ <base-ajax-json-jsonpath-datalet data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}" title="{{title}}" description="{{description}}"></base-ajax-json-jsonpath-datalet>
</template>
<script type="text/javascript" src="js/DataTables/datatables.js"></script>
diff --git a/datalets/donutpie3dchart-datalet/donutpie3dchart-datalet.html b/datalets/donutpie3dchart-datalet/donutpie3dchart-datalet.html
index d58203d..6f0d1a8 100755
--- a/datalets/donutpie3dchart-datalet/donutpie3dchart-datalet.html
+++ b/datalets/donutpie3dchart-datalet/donutpie3dchart-datalet.html
@@ -49,7 +49,7 @@ Example:
-->
<dom-module id="donutpie3dchart-datalet">
<template>
- <highcharts-datalet id="charts" data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}"></highcharts-datalet>
+ <highcharts-datalet id="charts" data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}" title="{{title}}" description="{{description}}"></highcharts-datalet>
</template>
<script>
diff --git a/datalets/highcharts-datalet/highcharts-datalet.html b/datalets/highcharts-datalet/highcharts-datalet.html
index 4044531..cabfe6b 100755
--- a/datalets/highcharts-datalet/highcharts-datalet.html
+++ b/datalets/highcharts-datalet/highcharts-datalet.html
@@ -57,7 +57,7 @@ Example :
<template>
<div id="container" style="width:auto; height:auto;"></div>
- <base-ajax-json-jsonpath-datalet data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}"></base-ajax-json-jsonpath-datalet>
+ <base-ajax-json-jsonpath-datalet data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}" title="{{title}}" description="{{description}}"></base-ajax-json-jsonpath-datalet>
</template>
<script src="static/js/highcharts.js"></script>
@@ -82,6 +82,7 @@ Example :
type: String,
value: "line"//spline,time
}
+
},
/**
* Normalizes a number in agreement with javascript's conventions. Delete all NaN characters. Exception: number representing lat & long remain unchanged.
@@ -137,7 +138,8 @@ Example :
setParameters: function(params)
{
- $(this._component).find("base-datalet")[0].setFooter(params['title'], params['description']);
+ this._component.title = params['title'];
+ this._component.description = params['description'];
var chart = $(this._component.$.charts.$.container).highcharts();
@@ -149,7 +151,8 @@ Example :
return this.x + '<br/><br/><span style="fill:#7cb5ec" x="8" dy="15">●</span> ' + this.series.name + ': <b>' + this.y + ' ' + params['suffix'] + '</b>';
}
- },
+ }
+
};
var HighchartsComponentBehavior = $.extend(true, {}, BaseDataletBehavior, WorkcycleBehavior, AjaxJsonJsonPathBehavior, HighchartsBehavior);
diff --git a/datalets/leafletjs-datalet/leafletjs-datalet.html b/datalets/leafletjs-datalet/leafletjs-datalet.html
index 3510663..106b6bb 100755
--- a/datalets/leafletjs-datalet/leafletjs-datalet.html
+++ b/datalets/leafletjs-datalet/leafletjs-datalet.html
@@ -56,7 +56,7 @@ Example:
</style>
<div id="leafletjs"></div>
- <base-ajax-json-jsonpath-datalet data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}"></base-ajax-json-jsonpath-datalet>
+ <base-ajax-json-jsonpath-datalet data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}" title="{{title}}" description="{{description}}"></base-ajax-json-jsonpath-datalet>
</template>
diff --git a/datalets/linechart-datalet/linechart-datalet.html b/datalets/linechart-datalet/linechart-datalet.html
index c5fe4d5..5e9ed9e 100755
--- a/datalets/linechart-datalet/linechart-datalet.html
+++ b/datalets/linechart-datalet/linechart-datalet.html
@@ -50,7 +50,7 @@ Example:
<dom-module id="linechart-datalet">
<template>
- <highcharts-datalet id="charts" data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}"></highcharts-datalet>
+ <highcharts-datalet id="charts" data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}" title="{{title}}" description="{{description}}"></highcharts-datalet>
</template>
<script>
diff --git a/datalets/piechart-datalet/piechart-datalet.html b/datalets/piechart-datalet/piechart-datalet.html
index 956f19c..4a87eaf 100755
--- a/datalets/piechart-datalet/piechart-datalet.html
+++ b/datalets/piechart-datalet/piechart-datalet.html
@@ -49,7 +49,7 @@ Example:
-->
<dom-module id="piechart-datalet">
<template>
- <highcharts-datalet id="charts" data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}"></highcharts-datalet>
+ <highcharts-datalet id="charts" data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}" title="{{title}}" description="{{description}}"></highcharts-datalet>
</template>
<script>
diff --git a/datalets/treemap-datalet/treemap-datalet.html b/datalets/treemap-datalet/treemap-datalet.html
index b19927c..7032935 100755
--- a/datalets/treemap-datalet/treemap-datalet.html
+++ b/datalets/treemap-datalet/treemap-datalet.html
@@ -105,7 +105,7 @@ Example:
}
</style>
<div id="treemap_placeholder"></div>
- <base-ajax-json-jsonpath-datalet data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}"></base-ajax-json-jsonpath-datalet>
+ <base-ajax-json-jsonpath-datalet data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}" title="{{title}}" description="{{description}}"></base-ajax-json-jsonpath-datalet>
</template>
<script src="../shared_js/d3.js"></script>