WebCompDev / COMPONENTS

Commit 2e94028d2d97b3e909eeb323719e59736e00d373

Authored by Renato De Donato
1 parent 90562b46

...

Inline Side-by-side
Showing 6 changed files with 97 additions and 73 deletions
controllets/datasets-list-controllet/datasets-list-controllet.html
  View file @2e94028
... ... @@ -313,6 +313,12 @@
313 313 this.shownNext = Math.min(this.next, this.length);
314 314 this.shownDatasets = this.datasets.slice(this.prev-1, this.next);
315 315  
  316 + this.$.info_header.innerHTML = ln["datasetsInfo_" + ln["localization"]];
  317 + this.$.info_body.innerHTML = "";
  318 + this.$.spinner.active = false;
  319 + this.selectedItemId = -1;
  320 + this.fire("datasets-list-controllet_dataset", { dataset: {url:""} });
  321 +
316 322 this._filter();
317 323 },
318 324  
... ...
controllets/expert-query-controllet/expert-query-controllet.html
  View file @2e94028
... ... @@ -359,7 +359,8 @@
359 359 .replace('WHERE', '<br><br><span style="color:#2196F3; font-weight: 700;">WHERE</span>')
360 360 .replace('GROUP BY', '<br><br><span style="color:#2196F3; font-weight: 700;">GROUP BY</span>')
361 361 .replace(/\[/g, '')
362   - .replace(/\]/g, '');
  362 + .replace(/\]/g, '')
  363 + .replace(/`/g, '');
363 364 else
364 365 this.$.query_container.innerHTML = "";
365 366 }
... ...
controllets/select-dataset-controllet/select-dataset-controllet.html
  View file @2e94028
... ... @@ -46,9 +46,10 @@
46 46 }
47 47  
48 48 #select_dataset_container .header_block {
49   - width: calc((100% - 48px) / 2);
50   - max-width: 400px;
51   - margin-left: 12px;
  49 + /*width: calc((100% - 48px) / 2);*/
  50 + /*max-width: 400px;*/
  51 + width: calc(50% - 24px);
  52 + padding:0 12px;
52 53  
53 54 line-height: 40px;
54 55  
... ... @@ -77,7 +78,7 @@
77 78 border-right: 2px solid #FFFFFF;
78 79 }
79 80  
80   - paper-tab:nth-child(2) {
  81 + paper-tab:nth-last-child(2) {
81 82 border-right: 0;
82 83 }
83 84  
... ... @@ -125,7 +126,8 @@
125 126 }
126 127  
127 128 paper-dropdown-menu {
128   - width: 200px;
  129 + /*width: 200px;*/
  130 + width: 50%;
129 131 --paper-input-container-focus-color: #2196F3;
130 132 }
131 133  
... ... @@ -169,6 +171,7 @@
169 171 <paper-tabs selected={{tabIndex}} no-bar>
170 172 <paper-tab noink on-tap="_setProvidersDatasets"><span id="providers_datasets"></span></paper-tab>
171 173 <paper-tab noink on-tap="_setLocalDatasets"><span id="spod_users_datasets"></span></paper-tab>
  174 + <paper-tab noink on-tap="_setExtendedDatasets"><span id="extended_datasets"></span></paper-tab>
172 175 </paper-tabs>
173 176  
174 177 <div id="options">
... ... @@ -215,24 +218,24 @@
215 218 <!--</paper-tooltip>-->
216 219 <!--</div>-->
217 220  
218   - <div id="search_option" class="header_block">
219   - {{_getLocalization('search')}}:&nbsp;
220   - <paper-dropdown-menu id="ddl_search" label="" no-label-float>
221   - <paper-menu id="menu_search" class="dropdown-content">
222   - <paper-item><span id="standard"></span></paper-item>
223   - <paper-item disabled><span id="extended"></span></paper-item>
224   - </paper-menu>
225   - </paper-dropdown-menu>
226   - <paper-icon-button id="info_search" icon="info-outline" noink></paper-icon-button>
227   - <paper-tooltip id="tooltip_search" for="info_search" offset="8">
228   - <p>
229   - <span class="option">{{_getLocalization('standard')}}</span><br>
230   - <span class="description">{{_getLocalization('standardDescription')}}</span><br>
231   - <span class="option">{{_getLocalization('extended')}}</span><br>
232   - <span class="description">{{_getLocalization('extendedDescription')}}</span><br>
233   - </p>
234   - </paper-tooltip>
235   - </div>
  221 + <!--<div id="search_option" class="header_block">-->
  222 + <!--{{_getLocalization('search')}}:&nbsp;-->
  223 + <!--<paper-dropdown-menu id="ddl_search" label="" no-label-float>-->
  224 + <!--<paper-menu id="menu_search" class="dropdown-content">-->
  225 + <!--<paper-item><span id="standard"></span></paper-item>-->
  226 + <!--<paper-item disabled><span id="extended"></span></paper-item>-->
  227 + <!--</paper-menu>-->
  228 + <!--</paper-dropdown-menu>-->
  229 + <!--<paper-icon-button id="info_search" icon="info-outline" noink></paper-icon-button>-->
  230 + <!--<paper-tooltip id="tooltip_search" for="info_search" offset="8">-->
  231 + <!--<p>-->
  232 + <!--<span class="option">{{_getLocalization('standard')}}</span><br>-->
  233 + <!--<span class="description">{{_getLocalization('standardDescription')}}</span><br>-->
  234 + <!--<span class="option">{{_getLocalization('extended')}}</span><br>-->
  235 + <!--<span class="description">{{_getLocalization('extendedDescription')}}</span><br>-->
  236 + <!--</p>-->
  237 + <!--</paper-tooltip>-->
  238 + <!--</div>-->
236 239  
237 240 <div id="version_option" class="header_block">
238 241 {{_getLocalization('version')}}:&nbsp;
... ... @@ -253,7 +256,7 @@
253 256 </paper-tooltip>
254 257 </div>
255 258  
256   - <paper-icon-button icon="settings" on-click="_optionsMenu"></paper-icon-button>
  259 + <!--<paper-icon-button icon="settings" on-click="_optionsMenu"></paper-icon-button>-->
257 260  
258 261 </div>
259 262  
... ... @@ -306,7 +309,7 @@
306 309 $(this.$.list_container).perfectScrollbar();
307 310 $(this.$.info).perfectScrollbar();
308 311  
309   - this.options = false;
  312 + this.options = true;
310 313 },
311 314  
312 315 attached : function() {
... ... @@ -354,30 +357,23 @@
354 357  
355 358 this.$.providers_datasets.innerHTML = ln["providersDatasets_" + ln["localization"]];
356 359 this.$.spod_users_datasets.innerHTML = ln["spodUsersDatasets_" + ln["localization"]];
  360 + this.$.extended_datasets.innerHTML = ln["extendedDatasets_" + ln["localization"]];
357 361 this.$.options_header.innerHTML = ln["datasets_" + ln["localization"]];
358 362  
359 363 this.$.all.innerHTML = ln["all_" + ln["localization"]];
360 364 // this.$.list.innerHTML = ln["list_" + ln["localization"]];
361 365 // this.$.tree.innerHTML = ln["tree_" + ln["localization"]];
362   - this.$.standard.innerHTML = ln["standard_" + ln["localization"]];
363   - this.$.extended.innerHTML = ln["extended_" + ln["localization"]];
  366 +// this.$.standard.innerHTML = ln["standard_" + ln["localization"]];
  367 +// this.$.extended.innerHTML = ln["extended_" + ln["localization"]];
364 368 this.$.show_last.innerHTML = ln["showLast_" + ln["localization"]];
365 369 this.$.show_all.innerHTML = ln["showAll_" + ln["localization"]];
366 370  
367 371 this.$.menu_provider.select(0);
368 372 // this.$.menu_view.select(0);
369   - this.$.menu_search.select(0);
  373 +// this.$.menu_search.select(0);
370 374 this.$.menu_version.select(0);
371 375 },
372 376  
373   - _setLocalDatasets : function() {
374   - if(this.$.ddl_version.selectedItem.id == 0)
375   - this._showLast();
376   - else
377   - this._showAll();
378   - this._showOptions()
379   - },
380   -
381 377 _setProvidersDatasets : function() {
382 378 this.async(function () {
383 379 var ddl_provider = $(this.$.ddl_provider).find("paper-menu")[0].selectedItem;
... ... @@ -392,10 +388,23 @@
392 388 else
393 389 this.$.datasets_list.setDatasets(this.providersDatasets);
394 390  
395   - this._showOptions()
  391 + this._showOptions();
396 392 }, 0);
397 393 },
398 394  
  395 + _setLocalDatasets : function() {
  396 + if(this.$.ddl_version.selectedItem.id == 0)
  397 + this._showLast();
  398 + else
  399 + this._showAll();
  400 + this._showOptions();
  401 + },
  402 +
  403 + _setExtendedDatasets : function() {
  404 + this.$.datasets_list.setDatasets([]);//tutto molto bello, clap, clap, clapù
  405 + this._showOptions()
  406 + },
  407 +
399 408 _getIdByProviderName : function(name) {
400 409 for(var id in this.providers) {
401 410 if (this.providers[id].title == name)
... ... @@ -414,23 +423,30 @@
414 423 this.$.options_header.style.display = "block";
415 424 this.$.provider_option.style.display = "none";
416 425 // this.$.view_option.style.display = "none";
417   - this.$.search_option.style.display = "none";
  426 +// this.$.search_option.style.display = "none";
418 427 this.$.version_option.style.display = "none";
419 428 }
420 429 else if(this.tabIndex == 0) {
421 430 this.$.options_header.style.display = "none";
422 431 this.$.provider_option.style.display = "block";
423 432 // this.$.view_option.style.display = "block";
424   - this.$.search_option.style.display = "block";
  433 +// this.$.search_option.style.display = "block";
425 434 this.$.version_option.style.display = "none";
426 435 }
427 436 else if(this.tabIndex == 1) {
428 437 this.$.options_header.style.display = "none";
429 438 this.$.provider_option.style.display = "none";
430 439 // this.$.view_option.style.display = "none";
431   - this.$.search_option.style.display = "none";
  440 +// this.$.search_option.style.display = "none";
432 441 this.$.version_option.style.display = "block";
433 442 }
  443 + else if(this.tabIndex == 2) {
  444 + this.$.options_header.style.display = "none";
  445 + this.$.provider_option.style.display = "none";
  446 +// this.$.view_option.style.display = "none";
  447 +// this.$.search_option.style.display = "none";
  448 + this.$.version_option.style.display = "none";
  449 + }
434 450 }, 0);
435 451 },
436 452  
... ...
locales/controllet_ln.js
  View file @2e94028
... ... @@ -20,8 +20,9 @@ ln[&quot;forward_en&quot;] = &quot;FORWARD&quot;;
20 20 ln["selectedUrl_en"] = "Selected url";
21 21 ln["wrongUrl_en"] = "Invalid url or data provider not supported yet.";
22 22  
23   -ln["providersDatasets_en"] = "PROVIDERS DATASETS";
24   -ln["spodUsersDatasets_en"] = "COCREATED DATASETS";
  23 +ln["providersDatasets_en"] = "FROM PROVIDERS";
  24 +ln["spodUsersDatasets_en"] = "FROM COCREATED";
  25 +ln["extendedDatasets_en"] = "FROM EXTENDED SEARCH";
25 26 ln["datasets_en"] = "DATASETS LIST";
26 27  
27 28 ln["provider_en"] = "Provider";
... ... @@ -36,11 +37,11 @@ ln[&quot;providerNameDescription_en&quot;] = &quot;Shows only the datasets of the selected prov
36 37 //ln["tree_en"] = "Tree";
37 38 //ln["treeDescription_en"] = "Shows the datasets with a tree map.";
38 39  
39   -ln["search_en"] = "Search";
40   -ln["standard_en"] = "Standard";
41   -ln["standardDescription_en"] = "The search function works only on datasets names.";
42   -ln["extended_en"] = "Extended [NOT AVAILABLE]";
43   -ln["extendedDescription_en"] = "The search function works the entire contents of the datasets.";
  40 +//ln["search_en"] = "Search";
  41 +//ln["standard_en"] = "Standard";
  42 +//ln["standardDescription_en"] = "The search function works only on datasets names.";
  43 +//ln["extended_en"] = "Extended [NOT AVAILABLE]";
  44 +//ln["extendedDescription_en"] = "The search function works the entire contents of the datasets.";
44 45  
45 46 ln["version_en"] = "Version";
46 47 ln["showLast_en"] = "Show last";
... ...
locales/dataset_table_ln.js
  View file @2e94028
... ... @@ -50,25 +50,25 @@ ln[&quot;download_docs_it&quot;] = &quot;Download documento&quot;;
50 50 /******** fr ********/
51 51  
52 52 //data-table
53   -ln["selectedData_fr"] = "DATASET";
54   -ln["rows_fr"] = "rows";
  53 +ln["selectedData_fr"] = "JEU DE DONNÉES";
  54 +ln["rows_fr"] = "rangées";
55 55 ln["type_fr"] = "TYPE";
56   -ln["warning_fr"] = "WARNING";
57   -ln["showing_fr"] = "Showing";
58   -ln["to_fr"] = "to";
59   -ln["of_fr"] = "of";
60   -ln["search_fr"] = "Search";
  56 +ln["warning_fr"] = "AVERTISSEMENT";
  57 +ln["showing_fr"] = "Aperçu";
  58 +ln["to_fr"] = "à";
  59 +ln["of_fr"] = "de";
  60 +ln["search_fr"] = "Rechercher";
61 61 ln["VER_fr"] = "VER";
62   -ln["USER_fr"] = "USER";
63   -ln["NAME_fr"] = "NAME";
64   -ln["DATA_fr"] = "DATA";
  62 +ln["USER_fr"] = "UTILISATEUR";
  63 +ln["NAME_fr"] = "NOM";
  64 +ln["DATA_fr"] = "DONNÉES";
65 65 ln["DESCRIPTION_fr"] = "DESCRIPTION";
66   -ln["TOOLS_fr"] = "TOOLS";
67   -ln["last_version_fr"] = "Last version";
68   -ln["open_fr"] = "Open";
69   -ln["download_csv_fr"] = "Download as CSV";
70   -ln["copy_link_fr"] = "Copy link";
71   -ln["download_docs_fr"] = "Download docs";
  66 +ln["TOOLS_fr"] = "OUTILS";
  67 +ln["last_version_fr"] = "Dernière version";
  68 +ln["open_fr"] = "Ouvrir";
  69 +ln["download_csv_fr"] = "Télécharger en CSV";
  70 +ln["copy_link_fr"] = "Copier le lien";
  71 +ln["download_docs_fr"] = "Télécharger les documents";
72 72  
73 73 /******** nl ********/
74 74  
... ...
locales/room_controllet_ln.js
  View file @2e94028
... ... @@ -26,15 +26,15 @@ room_ln[&quot;and_it&quot;] = &quot;e&quot;;
26 26  
27 27 /* FR */
28 28  
29   -room_ln["thisRoom_fr"] = "This room";
30   -room_ln["createdBy_fr"] = "created by";
31   -room_ln["has_fr"] = "has";
32   -room_ln["many_fr"] = "many";
33   -room_ln["few_fr"] = "few";
34   -room_ln["views_fr"] = "views";
35   -room_ln["comments_fr"] = "comments";
36   -room_ln["datasets_fr"] = "datasets";
37   -room_ln["and_fr"] = "and";
  29 +room_ln["thisRoom_fr"] = "Cet espace commun";
  30 +room_ln["createdBy_fr"] = "créé par";
  31 +room_ln["has_fr"] = "contient";
  32 +room_ln["many_fr"] = "plusieurs";
  33 +room_ln["few_fr"] = "peu";
  34 +room_ln["views_fr"] = "visualisations";
  35 +room_ln["comments_fr"] = "commentaires";
  36 +room_ln["datasets_fr"] = "jeux de données";
  37 +room_ln["and_fr"] = "et";
38 38  
39 39 /* NL */
40 40  
... ...