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

Luigi Serra
2 parents 0e9ad951 4b79b3c8
Showing 3 changed files with 50 additions and 10 deletions
controllets/datalet-selection-controllet/datalet-selection-controllet.html
datalets/barchart-datalet/barchart-datalet.html
datalets/base-datalet/base-datalet.html
@@ -224,18 +224,18 @@
                 <div class="input_header"><span data-l10n-id="baseInfo"></span></div>
  
                 <div class="inputs">
-                    <paper-input maxlength="32" label="title" class="base_input" on-blur="_loadDataletBlur"></paper-input>
+                    <paper-input maxlength="32" label="title" class="base_input"></paper-input>
                 </div>
  
                 <div class="inputs">
-                    <paper-textarea maxlength="100" label="description" class="base_input" on-blur="_loadDataletBlur"></paper-textarea>
+                    <paper-textarea maxlength="100" label="description" class="base_input"></paper-textarea>
                 </div>
  
                 <div class="input_header"><span data-l10n-id="layouts"></span></div>
  
                 <template is="dom-repeat" items="{{labels}}" index-as="index">
                     <div class="inputs">
-                        <paper-input label={{item.name}} on-blur="_loadDataletBlur"></paper-input>
+                        <paper-input label={{item.name}}></paper-input>
                         <div class="info_button">
                             <paper-icon-button id="info_button" on-click="_showInfo" icon="info-outline" title="{{item.name}} info"></paper-icon-button>
                         </div>
@@ -348,10 +348,17 @@
             },
  
             listeners: {
-                'items-vslider-controllet_selected-datalet': '_selectDatalet'
+                'items-vslider-controllet_selected-datalet': '_selectDatalet',
 //                'tree-view-controllet_selected-fields': '_updateSelectedFields'
+                'change': '_loadDataletBlur'
             },
  
+//            aaaaaaaaaa : function() {
+//                console.log("AAAAAAAAAAAAAAAAAAAAAAAA");
+//            },
+
+//            change in highchart e chart a gruppi
+
             ready : function() {//console.log(this.dataletPreset);
                 this._resize();
                 $(this.$.datalet_selection_inputs).perfectScrollbar();
@@ -503,7 +510,7 @@
  
             },
  
-            _loadDataletBlur : function(){//da eliminare
+            _loadDataletBlur : function(e){//da eliminare
  
                 var labels = this.$.datalet_selection_labels.querySelectorAll("paper-textarea");
                 for (var i = 0; i < labels.length; i++)
@@ -513,7 +520,9 @@
                 for (var i = 0; i < labels.length; i++)
                     this.params[labels[i].label] = labels[i].value;
  
-                var dataletParams ={
+//                console.log(e.target);
+
+                /*var dataletParams ={
                     component   : this.selectedDatalet+"-datalet",
                     params      : this.params,
                     fields      : this.selectedFields,
@@ -521,9 +530,11 @@
                 };
  
                 ComponentService.deep_url = this.deepUrl;
-                ComponentService.getComponent(dataletParams);
+                ComponentService.getComponent(dataletParams);*/
  
 //                this.async(function(){this.$.add_button.removeAttribute("disabled");}, 1111);
+                if(this.$.datalet_selection_datalet_placeholder.children[1])
+                    this.$.datalet_selection_datalet_placeholder.children[1].behavior.setParameters(this.params);
             },
  
             _loadDatalet : function(selectedFields){
@@ -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
@@ -57,6 +57,22 @@ Example:
         var BarchartBehavior = {
  
  
+            setParameters: function(params)
+            {
+                //"description\":\"d\",\"title\":\"coseeee\",\"x-axis-label\":\"x\",\"y-axis-label\":\"y\",\"suffix\":\"e\"}'
+                this._component.chart.setTitle({text: params.title});
+                this._component.chart.xAxis[0].setTitle({text: params['x-axis-label']});
+                this._component.chart.yAxis[0].setTitle({text: params['y-axis-label']});
+
+
+                /*this._component.chart.tooltip.options.formatter = function() {
+                    $.each(this.points,function(){
+                        console.log(this.points);
+                    });
+                    return 'a';
+                }*/
+            },
+
             /**
              * Bluid Highchart object
              *
@@ -114,6 +130,8 @@ Example:
                     },
                     series: this.properties.series.value
                 });
+
+                this._component.chart = $(this._component.$.charts.$.container).highcharts();
             }
         };
  
@@ -176,6 +194,17 @@ Example:
                 behavior : {
                     type : Object,
                     value : {}
+                },
+                /**
+                 * It's the component chart
+                 *
+                 * @attribute chart
+                 * @type Object
+                 * @default {}
+                 */
+                chart : {
+                    type : Object,
+                    value : {}
                 }
             },
  
@@ -120,12 +120,12 @@ Example :
  
                 title : {
                     type : String,
-                    value : undefined
+                    value : ""
                 },
  
                 description : {
                     type : String,
-                    value : undefined
+                    value : ""
                 }
  
             },