From 0b7cbd3379a95013b5815e0f0130e04b735090bb Mon Sep 17 00:00:00 2001
From: Renato De Donato <renato@isislab01.isis.lab>
Date: Mon, 14 Dec 2015 17:31:15 +0100
Subject: [PATCH] title-desciption

---
 controllets/data-sevc-controllet/data-sevc-controllet.html                 |   2 +-
 controllets/datalet-selection-controllet/datalet-selection-controllet.html |  52 +++++++++++++++++++++++++++++++++++-----------------
 controllets/dataset-selection-controllet/dataset-selection-controllet.html |   2 +-
 datalets/base-datalet/base-datalet.html                                    |  55 ++++++++++++++++++++++++++++++-------------------------
 datalets/base-datalet/static/js/BaseDataletBehavior.js                     |   9 +++++++--
 datalets/base-datalet/static/js/BaseDataletBehaviors.js                    | 153 ---------------------------------------------------------------------------------------------------------------------------------------------------------
 datalets/datasetexplorer-datalet/datasetexplorer-datalet.html              |   7 ++++---
 datalets/dynamic-datatable-datalet/dynamic-datatable-datalet.html          |   2 ++
 datalets/highcharts-datalet/highcharts-datalet.html                        |   2 ++
 9 files changed, 82 insertions(+), 202 deletions(-)
 delete mode 100755 datalets/base-datalet/static/js/BaseDataletBehaviors.js

diff --git a/controllets/data-sevc-controllet/data-sevc-controllet.html b/controllets/data-sevc-controllet/data-sevc-controllet.html
index 202e580..cf2c312 100755
--- a/controllets/data-sevc-controllet/data-sevc-controllet.html
+++ b/controllets/data-sevc-controllet/data-sevc-controllet.html
@@ -135,7 +135,7 @@
 //                        slider.setTitle("SELECT DATA", "Select the fields from tree-view. The multi-table will show the values related to the selected fields.");
                         if(this.modify){
                             slider.chevronLeft("invisible");
-                            slider.setAvatar("2");
+//                            slider.setAvatar("2");
                         }
                         else{
                             slider.chevronLeft(true);
diff --git a/controllets/datalet-selection-controllet/datalet-selection-controllet.html b/controllets/datalet-selection-controllet/datalet-selection-controllet.html
index 28a9fda..1f6d0f4 100755
--- a/controllets/datalet-selection-controllet/datalet-selection-controllet.html
+++ b/controllets/datalet-selection-controllet/datalet-selection-controllet.html
@@ -209,7 +209,7 @@
                         <paper-dropdown-menu id={{ddl_index}} label={{item.name}}>
                             <paper-menu class="dropdown-content">
                                 <template is="dom-repeat" items={{fields}}>
-                                    <paper-item id={{index}} on-tap="_addInput">{{item}}</paper-item>
+                                    <paper-item id={{index}} on-tap="_addInput">{{_fieldName(item)}}</paper-item>
                                     <!--{{_fieldName(item)}}-->
                                 </template>
                             </paper-menu>
@@ -374,8 +374,10 @@
 
                 //this.modify = true;//da eliminare in futuro
                 if(this.preselectedDatalet){
+                    if(this.modify)
+                        this._preselectDatalet();
+
                     this.modify = true;
-                    this._preselectDatalet();
                     this.preselectedDatalet = undefined;
                 }
             },
@@ -425,22 +427,29 @@
             },
 
             _preselectDatalet : function() {
+                this.type = "undefined";
+                this.$.selectedDatalet_request.url = this.deepUrl + this.preselectedDatalet + "-datalet";
+                this.$.selectedDatalet_request.generateRequest();
+
                 this.selectedDatalet = this.preselectedDatalet;
                 this.selectedFields = this._copy(this.fields);
 
-                var inputs = document.getElementsByTagName("paper-dropdown-menu");
-                for(var i=0; i < inputs.length; i++)
-                    $(inputs[i]).find("paper-menu")[0].select(i);
+                this.async(function() {
+                    this.selectedFields = this._copy(this.fields);
 
-               //set info labels options
-                var labels = this.$.datalet_selection_labels.querySelectorAll("paper-textarea");
-                for (var i = 0; i < labels.length; i++)
-                    labels[i].value = this.dataletPreset[labels[i].label];
+                    var inputs = document.getElementsByTagName("paper-dropdown-menu");
+                    for (var i = 0; i < inputs.length; i++)
+                        $(inputs[i]).find("paper-menu")[0].select(i);
 
-                var labels = this.$.datalet_selection_labels.querySelectorAll("paper-input");
-                for (var i = 0; i < labels.length; i++)
-                    labels[i].value = this.dataletPreset[labels[i].label];
+                    //set info labels options
+                    var labels = this.$.datalet_selection_labels.querySelectorAll("paper-textarea");
+                    for (var i = 0; i < labels.length; i++)
+                        labels[i].value = this.dataletPreset[labels[i].label];
 
+                    var labels = this.$.datalet_selection_labels.querySelectorAll("paper-input");
+                    for (var i = 0; i < labels.length; i++)
+                        labels[i].value = this.dataletPreset[labels[i].label];
+                }, 300);
 
                 this.loadPreview = true;
                 this._loadDatalet(this.selectedFields);
@@ -461,6 +470,7 @@
                         var selection = inputs.selection;
                         inputs = [];
                         for (var i in this.fields)
+//                        for (var i = 0; i < Math.max(this.fields.length, 8); i++)//error
                             inputs.push({name: name + " " + i, description: description, selection: selection});
                     }
 
@@ -482,8 +492,12 @@
             _addInput : function(e){
                 var selectedFields = this._copy(this.selectedFields);
 
-                var index = $(e.target).parents("paper-dropdown-menu")[0].id;
-                selectedFields[index] = e.target.innerHTML.trim();
+//                var index = $(e.target).parents("paper-dropdown-menu")[0].id;
+//                selectedFields[index] = e.target.innerHTML.trim();
+
+                var ddl_index = $(e.target).parents("paper-dropdown-menu")[0].id;
+                var index = e.target.id;
+                selectedFields[ddl_index] = this.fields[index];
 
                 this.selectedFields = this._copy(selectedFields);
 
@@ -546,8 +560,12 @@
                 ComponentService.deep_url = this.deepUrl;
                 ComponentService.getComponent(dataletParams);
 
-//                this.async(function(){this.$.add_button.removeAttribute("disabled");}, 1000);
-                this.$.add_button.removeAttribute("disabled");
+                //300???
+                if(this.$.datalet_selection_datalet_placeholder.children[1])
+                    this.async(function(){this.$.datalet_selection_datalet_placeholder.children[1].behavior.setParameters(this.params)}, 300);
+                this.async(function(){this.$.add_button.removeAttribute("disabled");}, 300);
+
+//                this.$.add_button.removeAttribute("disabled");
             },
 
             _addDatalet : function(){
@@ -557,7 +575,7 @@
                     if(this.selectedFields[i])
                         selectedFields.push(this.selectedFields[i]);
 
-                console.log(this.params);
+//                console.log(this.params);
 
                 var data = {
                     dataUrl : this.dataUrl,
diff --git a/controllets/dataset-selection-controllet/dataset-selection-controllet.html b/controllets/dataset-selection-controllet/dataset-selection-controllet.html
index 47387cf..80e7b2a 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=\"/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=\"/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>";
             },
 
             _selectDataUrl_treeMap : function(e) {
diff --git a/datalets/base-datalet/base-datalet.html b/datalets/base-datalet/base-datalet.html
index cfc277b..030d8e6 100755
--- a/datalets/base-datalet/base-datalet.html
+++ b/datalets/base-datalet/base-datalet.html
@@ -83,22 +83,26 @@ Example :
                 font-size: small;
             }
             #rtpalogo {
-                height:32px;
+                height: 32px;
                 width: 32px;
             }
             #base_datalet_spin {
-                height:64px;
+                height: 64px;
                 width: 100%;
+                margin-top: 64px;
             }
-            /*#base_datalet_info{*/
-                /*padding-top: 8px;*/
-                /*/!*background-color: green;*!/*/
-                /*width: 100%;*/
-                /*/!*font-size: small;*!/*/
-            /*}*/
+
             #base_datalet_source_link{
                 padding-top: 12px;
             }
+
+            #span_title{
+                font-size: small;
+            }
+
+            #span_description{
+                color: #727272;
+            }
         </style>
 
         <div id="base_datalet_imgWaitDatalet">
@@ -108,7 +112,7 @@ Example :
         <div id="base_datalet_container">
 
             <div id="base_datalet_title_description">
-                <span id="span_title" style="font-size: small"><b>{{title}}</b><span id="span_description" style="color: #727272"> - {{description}}</span></span>
+                <span id="span_title"><b>{{title}}</b> <span id="span_description">{{description}}</span></span>
             </div>
 
             <div id="base_datalet_source_link">
@@ -141,11 +145,6 @@ Example :
                 description : {
                     type : String,
                     value : ""
-                },
-
-                hideFooter : {
-                    type : Boolean,
-                    value : false
                 }
 
             },
@@ -164,17 +163,25 @@ Example :
                 }
             },
 
-            _setFooter: function() {
-                if (this.title == "" && this.description == "")
-                    this.$.base_datalet_title_description.innerHTML = "";
-                else if (this.description == "")
-                    this.$.span_description.innerHTML = "";
+            hideFooter: function() {
+                this.$.base_datalet_container.innerHTML = "";
+                this.$.base_datalet_container.style.border = 0;
 
-                if (this.hideFooter) {
-                    this.$.base_datalet_source_link.innerHTML = "";
-                    this.$.base_datalet_rtp.innerHTML = "";
-                }
+//                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";
             },
 
             /**
@@ -189,8 +196,6 @@ Example :
              * @method ready
              */
             ready: function(){
-                this._setFooter();
-
                 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 ab7fc74..199c9e1 100755
--- a/datalets/base-datalet/static/js/BaseDataletBehavior.js
+++ b/datalets/base-datalet/static/js/BaseDataletBehavior.js
@@ -2,7 +2,7 @@
 @license
     The MIT License (MIT)
 
-    Copyright (c) 2015 Dipartimento di Informatica - Università di Salerno - Italy
+    Copyright (c) 2015 Dipartimento di Informatica - Universit� di Salerno - Italy
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -74,6 +74,11 @@ var BaseDataletBehavior ={
     factoryImpl: function(data_url, fields) {
         this.data_url = data_url;
         this.fields   = fields;
-    }
+    },
+
+    setParameters: function(params)
+    {
+        $(this._component).find("base-datalet")[0].setFooter(params['title'], params['description']);
+    },
 
 };
\ No newline at end of file
diff --git a/datalets/base-datalet/static/js/BaseDataletBehaviors.js b/datalets/base-datalet/static/js/BaseDataletBehaviors.js
deleted file mode 100755
index ba4bfb6..0000000
--- a/datalets/base-datalet/static/js/BaseDataletBehaviors.js
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
-@license
-    The MIT License (MIT)
-
-    Copyright (c) 2015 Dipartimento di Informatica - Università di Salerno - Italy
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-*/
-
-var BaseDataletBehavior ={
-
-    properties: {
-
-        /**
-         * It represent the dataset api url
-         *
-         * @attribute dataUrl
-         * @type string
-         * @default 'null'
-         */
-        dataUrl: {
-            type: String,
-            value: ""
-        },
-
-        /**
-         * It represents one or multiple fields selected by user
-         *
-         * @attribute fields
-         * @type Array
-         * @default empty
-         */
-        fields: {
-            type: String,
-            value: ""
-        },
-
-        /**
-         * The selected and transformed data you can use in presentation phase
-         *
-         * @attribute data
-         * @type Array
-         * @default empty
-         */
-        data: {
-            type: Array,
-            value: []
-        }
-
-    },
-
-    factoryImpl: function(data_url, fields) {
-        this.data_url = data_url;
-        this.fields   = fields;
-    }
-
-};
-
-var WorkcycleBehavior = {
-    /**
-     * A reference to Polymer object
-     *
-     */
-    _component: null,
-
-    /**
-     * Request data from source(e.g. CKAN by api) using some kind of technology(e.g. Ajax)
-     *
-     * @method requestData
-     */
-    requestData: function(){
-    },
-
-    /**
-     * Select the fields from data(typically json) previously retrieved by ajax request. The selection could be done by jsonPath but
-     * it depends on the representation data format(CKAN apies return a json representation of the dataset).
-     *
-     * @method selectData
-     */
-    selectData: function(){
-    },
-
-    /**
-     * Filter data previously selected. An example of filterting could be an expression such "fields > 30" or "fields = 'AAA'"
-     * If you are using jsonPath to select the datas you can apply an expression directly in the jsonPath query string.
-     *
-     * @method filterData
-     */
-    filterData: function(){
-    },
-
-    /**
-     * Transform the selected data in order to build the structure that the presentation phase needs.
-     *
-     * @method transformData
-     */
-    transformData: function(){
-    },
-
-    /**
-     * Build the object/s for presentation layer.
-     *
-     * @method presentData
-     */
-    presentData: function(){
-
-    },
-
-    /**
-     * This method represents the entire datalet workcycle.
-     *
-     * @method runWorkcycle
-     */
-    runWorkcycle: function() {
-        this.selectData();
-        this.filterData();
-        this.transformData();
-        this.presentData();
-    },
-
-    /**
-     * This method save the reference to the polymer object related to the datalet.
-     *
-     * @method init
-     */
-    init: function(component){
-        this._component = component;
-
-        if(this.properties.data.length == 0){
-            this.requestData();
-        }else{
-            this.transformData();
-            this.presentData();
-        }
-    }
-
-};
\ No newline at end of file
diff --git a/datalets/datasetexplorer-datalet/datasetexplorer-datalet.html b/datalets/datasetexplorer-datalet/datasetexplorer-datalet.html
index fc1374d..0c79232 100755
--- a/datalets/datasetexplorer-datalet/datasetexplorer-datalet.html
+++ b/datalets/datasetexplorer-datalet/datasetexplorer-datalet.html
@@ -64,7 +64,7 @@ Example:
             :host ::content #treemap_placeholder {
                 width: 100%;
                 height: 70%;
-                min-height: 500px;
+                /*min-height: 500px;*/
                 background: #ffffff;
                 position: relative;
             }
@@ -125,8 +125,7 @@ Example:
                 children : []
             },
 
-            transformData: function(e)
-            {
+            transformData: function(e){
                 var treemapData = [];
                 DatasetexplorerBehavior.map.name = this._component.title;
 
@@ -225,6 +224,8 @@ Example:
             },
 
             ready: function(){
+                $(this).find("base-datalet")[0].hideFooter();
+
                 this.behavior =  $.extend(true, {}, BaseDataletBehavior, WorkcycleBehavior, AjaxJsonJsonPathBehavior, DatasetexplorerBehavior);
                 this.async(function(){this.behavior.init(this)},0);
             }
diff --git a/datalets/dynamic-datatable-datalet/dynamic-datatable-datalet.html b/datalets/dynamic-datatable-datalet/dynamic-datatable-datalet.html
index 4ae4dab..f8c6ff2 100755
--- a/datalets/dynamic-datatable-datalet/dynamic-datatable-datalet.html
+++ b/datalets/dynamic-datatable-datalet/dynamic-datatable-datalet.html
@@ -121,6 +121,8 @@ Example:
             },
 
             ready: function(){
+                $(this).find("base-datalet")[0].hideFooter();
+
                 this.behavior =  $.extend(true, {}, BaseDataletBehavior, WorkcycleBehavior, AjaxJsonJsonPathBehavior, DynamicDatatableBehavior);
                 this.async(function(){this.behavior.init(this)}, 0);
             },
diff --git a/datalets/highcharts-datalet/highcharts-datalet.html b/datalets/highcharts-datalet/highcharts-datalet.html
index 4a13e2e..4044531 100755
--- a/datalets/highcharts-datalet/highcharts-datalet.html
+++ b/datalets/highcharts-datalet/highcharts-datalet.html
@@ -137,6 +137,8 @@ Example :
 
             setParameters: function(params)
             {
+                $(this._component).find("base-datalet")[0].setFooter(params['title'], params['description']);
+
                 var chart = $(this._component.$.charts.$.container).highcharts();
 
                 chart.setTitle({text: params['title']});
--
libgit2 0.21.4