Commit 7a8b744601852c9e58fbd5e1c99ac8f9a47fd5c5
1 parent
98d9d8a5
filters data-sevc
Showing
1 changed file
with
16 additions
and
16 deletions
controllets/data-sevc-controllet/data-sevc-controllet.html
1 | -<!--<script src="../shared_js/jquery-1.11.2.min.js"></script>--> | ||
2 | -<!--<script src="../../bower_components/webcomponentsjs/webcomponents-lite.min.js"></script>--> | ||
3 | <script src="../shared_js/perfect-scrollbar/js/min/perfect-scrollbar.jquery.min.js"></script> | 1 | <script src="../shared_js/perfect-scrollbar/js/min/perfect-scrollbar.jquery.min.js"></script> |
4 | <link rel="stylesheet" href="../shared_js/perfect-scrollbar/css/perfect-scrollbar.min.css"> | 2 | <link rel="stylesheet" href="../shared_js/perfect-scrollbar/css/perfect-scrollbar.min.css"> |
5 | 3 | ||
6 | -<!--<script defer src="../../bower_components/l20n/dist/compat/web/l20n.min.js"></script>--> | ||
7 | <script src="../../locales/controllet_ln.js"></script> | 4 | <script src="../../locales/controllet_ln.js"></script> |
8 | 5 | ||
9 | - | ||
10 | <link rel="import" href="../../bower_components/polymer/polymer.html"> | 6 | <link rel="import" href="../../bower_components/polymer/polymer.html"> |
11 | 7 | ||
12 | <link rel="import" href="../page-slider-controllet/page-slider-controllet.html"> | 8 | <link rel="import" href="../page-slider-controllet/page-slider-controllet.html"> |
13 | <link rel="import" href="../dataset-selection-controllet/dataset-selection-controllet.html"> | 9 | <link rel="import" href="../dataset-selection-controllet/dataset-selection-controllet.html"> |
14 | -<link rel="import" href="../tree-view-multi-table-controllet/tree-view-multi-table-controllet.html" /> | 10 | +<link rel="import" href="../select-data-controllet/select-data-controllet.html" /> |
15 | <link rel="import" href="../datalet-selection-controllet/datalet-selection-controllet.html"> | 11 | <link rel="import" href="../datalet-selection-controllet/datalet-selection-controllet.html"> |
16 | 12 | ||
17 | <dom-module id="data-sevc-controllet"> | 13 | <dom-module id="data-sevc-controllet"> |
@@ -23,20 +19,20 @@ | @@ -23,20 +19,20 @@ | ||
23 | <neon-animatable> | 19 | <neon-animatable> |
24 | 20 | ||
25 | <template is="dom-if" if={{!modify}}> | 21 | <template is="dom-if" if={{!modify}}> |
26 | - <dataset-selection-controllet id="dataset_selection" datasets={{datasets}} suggested-datasets={{suggestedDatasets}}></dataset-selection-controllet> | 22 | + <dataset-selection-controllet id="select_dataset" datasets={{datasets}} suggested-datasets={{suggestedDatasets}}></dataset-selection-controllet> |
27 | </template> | 23 | </template> |
28 | 24 | ||
29 | </neon-animatable> | 25 | </neon-animatable> |
30 | 26 | ||
31 | <neon-animatable> | 27 | <neon-animatable> |
32 | 28 | ||
33 | - <tree-view-multi-table-controllet id="tree_view_multi_table" data-url={{dataUrl}} preselected-fields={{selectedFields}}></tree-view-multi-table-controllet> | 29 | + <select-data-controllet id="select_data" data-url={{dataUrl}} preselected-fields={{selectedFields}} datalet-preset="{{dataletPreset}}"></select-data-controllet> |
34 | 30 | ||
35 | </neon-animatable> | 31 | </neon-animatable> |
36 | 32 | ||
37 | <neon-animatable> | 33 | <neon-animatable> |
38 | 34 | ||
39 | - <datalet-selection-controllet id="datalet_selection" deep-url={{deepUrl}} datalets-list-url={{dataletsListUrl}} data-url={{dataUrl}} preselected-datalet={{selectedDatalet}} datalet-preset={{dataletPreset}}></datalet-selection-controllet> | 35 | + <datalet-selection-controllet id="select_visualization" deep-url={{deepUrl}} datalets-list-url={{dataletsListUrl}} data-url={{dataUrl}} preselected-datalet={{selectedDatalet}} datalet-preset={{dataletPreset}}></datalet-selection-controllet> |
40 | 36 | ||
41 | </neon-animatable> | 37 | </neon-animatable> |
42 | 38 | ||
@@ -119,7 +115,6 @@ | @@ -119,7 +115,6 @@ | ||
119 | if(this.selectedDatalet){ | 115 | if(this.selectedDatalet){ |
120 | this.modify = true; | 116 | this.modify = true; |
121 | this.$.slider.selected = 1; | 117 | this.$.slider.selected = 1; |
122 | -// console.log(this.selectedDatalet); | ||
123 | this.dataUrl = this.dataletPreset["data-url"]; | 118 | this.dataUrl = this.dataletPreset["data-url"]; |
124 | } | 119 | } |
125 | ln["localization"] = this.localization; | 120 | ln["localization"] = this.localization; |
@@ -143,15 +138,18 @@ | @@ -143,15 +138,18 @@ | ||
143 | slider.chevronLeft(true); | 138 | slider.chevronLeft(true); |
144 | } | 139 | } |
145 | slider.chevronRight(false); | 140 | slider.chevronRight(false); |
146 | - this.$.tree_view_multi_table.ready(); | ||
147 | - this._allowThirdStep({detail: {fields: tree_view_multi_table.getFlatFields()}}); | 141 | + this.$.select_data.ready(); |
142 | +// this.async(function () {this.dataletPreset["filters"] = undefined;}, 1000); | ||
143 | + this._allowThirdStep({detail: {fields: select_data.getFlatFields()}}); | ||
144 | + this._allowThirdStep({detail: {fields: select_data.getFlatFields()}}); | ||
148 | break; | 145 | break; |
149 | case 2: | 146 | case 2: |
150 | slider.setTitle(ln["slide3Title_" + this.localization], ln["slide3Subtitle_" + this.localization]); | 147 | slider.setTitle(ln["slide3Title_" + this.localization], ln["slide3Subtitle_" + this.localization]); |
151 | slider.chevronLeft(true); | 148 | slider.chevronLeft(true); |
152 | slider.chevronRight("invisible"); | 149 | slider.chevronRight("invisible"); |
153 | - this.$.datalet_selection.setFields(tree_view_multi_table.getFlatFields()); | ||
154 | - this.$.datalet_selection.ready(); | 150 | + this.$.select_visualization.setFields(select_data.getFlatFields()); |
151 | + this.$.select_visualization.setFilters(select_data.getFilters()); | ||
152 | + this.$.select_visualization.ready(); | ||
155 | } | 153 | } |
156 | }, | 154 | }, |
157 | 155 | ||
@@ -165,16 +163,16 @@ | @@ -165,16 +163,16 @@ | ||
165 | // this.dataUrl = e.detail.url | 163 | // this.dataUrl = e.detail.url |
166 | // this.jsonData = JSON.stringify(data); | 164 | // this.jsonData = JSON.stringify(data); |
167 | slider.chevronRight(true); | 165 | slider.chevronRight(true); |
168 | - dataset_selection.$.selected_url.invalid = false; | 166 | + select_dataset.$.selected_url.invalid = false; |
169 | }, | 167 | }, |
170 | error: function(){ | 168 | error: function(){ |
171 | // this.jsonData = undefined; | 169 | // this.jsonData = undefined; |
172 | slider.chevronRight(false); | 170 | slider.chevronRight(false); |
173 | - dataset_selection.$.selected_url.invalid = true; | 171 | + select_dataset.$.selected_url.invalid = true; |
174 | } | 172 | } |
175 | }); | 173 | }); |
176 | 174 | ||
177 | - this.$.datalet_selection.reset(); | 175 | + this.$.select_visualization.reset(); |
178 | }, | 176 | }, |
179 | 177 | ||
180 | _allowThirdStep : function(e){ | 178 | _allowThirdStep : function(e){ |
@@ -182,6 +180,8 @@ | @@ -182,6 +180,8 @@ | ||
182 | slider.chevronRight(true); | 180 | slider.chevronRight(true); |
183 | else | 181 | else |
184 | slider.chevronRight(false); | 182 | slider.chevronRight(false); |
183 | + | ||
184 | + //this.$.select_visualization.reset(); | ||
185 | } | 185 | } |
186 | 186 | ||
187 | }); | 187 | }); |