worning x gg

Renato De Donato
1 parent 2f01c2f6
Showing 4 changed files with 36 additions and 28 deletions
controllets/data-sevc-controllet/data-sevc-controllet.html
controllets/data-table-controllet/data-table-controllet.html
controllets/providers-utility-controllet/providers-utility-controllet.html
controllets/select-data-controllet/select-data-controllet.html
@@ -49,7 +49,8 @@
                 'page-slider-controllet_selected' : '_updateSlider',
                 'dataset-selection-controllet_data-url' : '_allowSecondStep',
                 'select-fields-controllet_selected-fields' : '_allowThirdStep',
-                'filters-controllet_filters': '_allowThirdStep'
+                'filters-controllet_filters': '_allowThirdStep',
+                'data-ready': '_dataReady'
             },
             properties : {
@@ -114,33 +115,25 @@
             },
             _allowSecondStep : function(e){
-                if(e.detail.url == "") {
-                    this.$.slider.chevronRight(false);
+                this.$.slider.chevronRight(false);
+//
+                var f = Object.create(providerFactory);
+                var provider = f.getProvider(e.detail.url);
+                var dataUrl = provider.addLimit(e.detail.url);
+
+                this.$.select_data.dataUrl = dataUrl;
+                this.$.select_data.init();
+                this.$.select_visualization.dataUrl = dataUrl;
+                this.$.select_visualization.init();
+            },
+
+            _dataReady : function(e){
+                if(e.detail.ready) {
+                    this.$.slider.chevronRight(true);
                     this.$.select_dataset.$.selected_url.invalid = false;
-                    return;
                 }
-
-                var that = this;
-
-                $.ajax({
-                    url: e.detail.url,
-                    dataType: "json",
-                    success: function(){
-                        that.$.select_dataset.$.selected_url.invalid = false;
-                        var f = Object.create(providerFactory);
-                        var provider = f.getProvider(e.detail.url);
-                        var dataUrl = provider.addLimit(e.detail.url);
-                        that.$.select_data.dataUrl = dataUrl;
-                        that.$.select_data.init();
-                        that.$.select_visualization.dataUrl = dataUrl;
-                        that.$.select_visualization.init();
-                        that.$.slider.chevronRight(true);
-                    },
-                    error: function(){
-                        that.$.slider.chevronRight(false);
-                        that.$.select_dataset.$.selected_url.invalid = true;
-                    }
-                });
+                else
+                    this.$.select_dataset.$.selected_url.invalid = true;
             },
             _allowThirdStep : function(){
@@ -69,6 +69,7 @@
                 padding: 12px;
                 text-align: center;
                 font-weight: 700;
+                cursor: help;
             }
             #data_table_container table {
@@ -181,6 +182,16 @@
             <div id="header"><span id="selected_data"></span></div>
+            <paper-tooltip id="tooltip_wornings" for="header" offset="56">
+                <template is="dom-repeat" items="{{fields}}">
+                    <template is="dom-if" if={{item.errorsDescription.length}}>
+                        <p>
+                            <span class="warning">{{_warning()}}:</span> {{item.errorsDescription}}
+                        </p>
+                    </template>
+                </template>
+            </paper-tooltip>
+
             <table>
                 <tbody id="tbody">
                     <tr>
@@ -304,6 +315,8 @@
                 this.shownData = this.data.slice(this.prev-1, this.next);
                 this._resize();
+
+                this.$.tooltip_wornings.show();
             },
             reset : function(){
@@ -29,7 +29,6 @@
     };
     utility_getSelectedIndices = function(fields, selectedFileds) {
-        console.log("we");
         var selectedIndices = [];
         for (var i = 0; i < selectedFileds.length; i++)
             if($.inArray(selectedFileds[i], fields) > -1)
@@ -202,7 +202,10 @@
                             that.$.select_fields.setFields(that.fields);
                             that.$.filters.setFields(that.fields);
-                            that.fire('data-ready');
+                            that.fire('data-ready', {ready : true});
+                        },
+                        error: function(){
+                            that.fire('data-ready', {ready : false});
                         }
                     });
                 }