...

Renato De Donato
1 parent 90562b46
Showing 6 changed files with 97 additions and 73 deletions
controllets/datasets-list-controllet/datasets-list-controllet.html
controllets/expert-query-controllet/expert-query-controllet.html
controllets/select-dataset-controllet/select-dataset-controllet.html
locales/controllet_ln.js
locales/dataset_table_ln.js
locales/room_controllet_ln.js
@@ -313,6 +313,12 @@
                     this.shownNext = Math.min(this.next, this.length);
                     this.shownDatasets = this.datasets.slice(this.prev-1, this.next);
+                    this.$.info_header.innerHTML = ln["datasetsInfo_" + ln["localization"]];
+                    this.$.info_body.innerHTML = "";
+                    this.$.spinner.active = false;
+                    this.selectedItemId = -1;
+                    this.fire("datasets-list-controllet_dataset", { dataset: {url:""} });
+
                     this._filter();
                 },
@@ -359,7 +359,8 @@
                             .replace('WHERE', '<br><br><span style="color:#2196F3; font-weight: 700;">WHERE</span>')
                             .replace('GROUP BY', '<br><br><span style="color:#2196F3; font-weight: 700;">GROUP BY</span>')
                             .replace(/\[/g, '')
-                            .replace(/\]/g, '');
+                            .replace(/\]/g, '')
+                            .replace(/`/g, '');
                 else
                     this.$.query_container.innerHTML = "";
             }
@@ -46,9 +46,10 @@
             }
             #select_dataset_container .header_block {
-                width: calc((100% - 48px) / 2);
-                max-width: 400px;
-                margin-left: 12px;
+                /*width: calc((100% - 48px) / 2);*/
+                /*max-width: 400px;*/
+                width: calc(50% - 24px);
+                padding:0 12px;
                 line-height: 40px;
@@ -77,7 +78,7 @@
                 border-right: 2px solid #FFFFFF;
             }
-            paper-tab:nth-child(2) {
+            paper-tab:nth-last-child(2) {
                 border-right: 0;
             }
@@ -125,7 +126,8 @@
             }
             paper-dropdown-menu {
-                width: 200px;
+                /*width: 200px;*/
+                width: 50%;
                 --paper-input-container-focus-color: #2196F3;
             }
@@ -169,6 +171,7 @@
             <paper-tabs selected={{tabIndex}} no-bar>
                 <paper-tab noink on-tap="_setProvidersDatasets"><span id="providers_datasets"></span></paper-tab>
                 <paper-tab noink on-tap="_setLocalDatasets"><span id="spod_users_datasets"></span></paper-tab>
+                <paper-tab noink on-tap="_setExtendedDatasets"><span id="extended_datasets"></span></paper-tab>
             </paper-tabs>
             <div id="options">
@@ -215,24 +218,24 @@
                     <!--</paper-tooltip>-->
                 <!--</div>-->
-                <div id="search_option" class="header_block">
-                    {{_getLocalization('search')}}:&nbsp;
-                    <paper-dropdown-menu id="ddl_search" label="" no-label-float>
-                        <paper-menu id="menu_search" class="dropdown-content">
-                            <paper-item><span id="standard"></span></paper-item>
-                            <paper-item disabled><span id="extended"></span></paper-item>
-                        </paper-menu>
-                    </paper-dropdown-menu>
-                    <paper-icon-button id="info_search" icon="info-outline" noink></paper-icon-button>
-                    <paper-tooltip id="tooltip_search" for="info_search" offset="8">
-                        <p>
-                            <span class="option">{{_getLocalization('standard')}}</span><br>
-                            <span class="description">{{_getLocalization('standardDescription')}}</span><br>
-                            <span class="option">{{_getLocalization('extended')}}</span><br>
-                            <span class="description">{{_getLocalization('extendedDescription')}}</span><br>
-                        </p>
-                    </paper-tooltip>
-                </div>
+                <!--<div id="search_option" class="header_block">-->
+                    <!--{{_getLocalization('search')}}:&nbsp;-->
+                    <!--<paper-dropdown-menu id="ddl_search" label="" no-label-float>-->
+                        <!--<paper-menu id="menu_search" class="dropdown-content">-->
+                            <!--<paper-item><span id="standard"></span></paper-item>-->
+                            <!--<paper-item disabled><span id="extended"></span></paper-item>-->
+                        <!--</paper-menu>-->
+                    <!--</paper-dropdown-menu>-->
+                    <!--<paper-icon-button id="info_search" icon="info-outline" noink></paper-icon-button>-->
+                    <!--<paper-tooltip id="tooltip_search" for="info_search" offset="8">-->
+                        <!--<p>-->
+                            <!--<span class="option">{{_getLocalization('standard')}}</span><br>-->
+                            <!--<span class="description">{{_getLocalization('standardDescription')}}</span><br>-->
+                            <!--<span class="option">{{_getLocalization('extended')}}</span><br>-->
+                            <!--<span class="description">{{_getLocalization('extendedDescription')}}</span><br>-->
+                        <!--</p>-->
+                    <!--</paper-tooltip>-->
+                <!--</div>-->
                 <div id="version_option" class="header_block">
                     {{_getLocalization('version')}}:&nbsp;
@@ -253,7 +256,7 @@
                     </paper-tooltip>
                 </div>
-                <paper-icon-button icon="settings" on-click="_optionsMenu"></paper-icon-button>
+                <!--<paper-icon-button icon="settings" on-click="_optionsMenu"></paper-icon-button>-->
             </div>
@@ -306,7 +309,7 @@
                     $(this.$.list_container).perfectScrollbar();
                     $(this.$.info).perfectScrollbar();
-                    this.options = false;
+                    this.options = true;
                 },
                 attached : function() {
@@ -354,30 +357,23 @@
                     this.$.providers_datasets.innerHTML = ln["providersDatasets_" + ln["localization"]];
                     this.$.spod_users_datasets.innerHTML = ln["spodUsersDatasets_" + ln["localization"]];
+                    this.$.extended_datasets.innerHTML = ln["extendedDatasets_" + ln["localization"]];
                     this.$.options_header.innerHTML = ln["datasets_" + ln["localization"]];
                     this.$.all.innerHTML = ln["all_" + ln["localization"]];
 //                    this.$.list.innerHTML = ln["list_" + ln["localization"]];
 //                    this.$.tree.innerHTML = ln["tree_" + ln["localization"]];
-                    this.$.standard.innerHTML = ln["standard_" + ln["localization"]];
-                    this.$.extended.innerHTML = ln["extended_" + ln["localization"]];
+//                    this.$.standard.innerHTML = ln["standard_" + ln["localization"]];
+//                    this.$.extended.innerHTML = ln["extended_" + ln["localization"]];
                     this.$.show_last.innerHTML = ln["showLast_" + ln["localization"]];
                     this.$.show_all.innerHTML = ln["showAll_" + ln["localization"]];
                     this.$.menu_provider.select(0);
 //                    this.$.menu_view.select(0);
-                    this.$.menu_search.select(0);
+//                    this.$.menu_search.select(0);
                     this.$.menu_version.select(0);
                 },
-                _setLocalDatasets : function() {
-                    if(this.$.ddl_version.selectedItem.id == 0)
-                        this._showLast();
-                    else
-                        this._showAll();
-                    this._showOptions()
-                },
-
                 _setProvidersDatasets : function() {
                     this.async(function () {
                         var ddl_provider = $(this.$.ddl_provider).find("paper-menu")[0].selectedItem;
@@ -392,10 +388,23 @@
                         else
                             this.$.datasets_list.setDatasets(this.providersDatasets);
-                        this._showOptions()
+                        this._showOptions();
                     }, 0);
                 },
+                _setLocalDatasets : function() {
+                    if(this.$.ddl_version.selectedItem.id == 0)
+                        this._showLast();
+                    else
+                        this._showAll();
+                    this._showOptions();
+                },
+
+                _setExtendedDatasets : function() {
+                    this.$.datasets_list.setDatasets([]);//tutto molto bello, clap, clap, clapù
+                    this._showOptions()
+                },
+
                 _getIdByProviderName : function(name) {
                     for(var id in this.providers) {
                         if (this.providers[id].title == name)
@@ -414,23 +423,30 @@
                             this.$.options_header.style.display = "block";
                             this.$.provider_option.style.display = "none";
 //                            this.$.view_option.style.display = "none";
-                            this.$.search_option.style.display = "none";
+//                            this.$.search_option.style.display = "none";
                             this.$.version_option.style.display = "none";
                         }
                         else if(this.tabIndex == 0) {
                             this.$.options_header.style.display = "none";
                             this.$.provider_option.style.display = "block";
 //                            this.$.view_option.style.display = "block";
-                            this.$.search_option.style.display = "block";
+//                            this.$.search_option.style.display = "block";
                             this.$.version_option.style.display = "none";
                         }
                         else if(this.tabIndex == 1) {
                             this.$.options_header.style.display = "none";
                             this.$.provider_option.style.display = "none";
 //                            this.$.view_option.style.display = "none";
-                            this.$.search_option.style.display = "none";
+//                            this.$.search_option.style.display = "none";
                             this.$.version_option.style.display = "block";
                         }
+                        else if(this.tabIndex == 2) {
+                            this.$.options_header.style.display = "none";
+                            this.$.provider_option.style.display = "none";
+//                            this.$.view_option.style.display = "none";
+//                            this.$.search_option.style.display = "none";
+                            this.$.version_option.style.display = "none";
+                        }
                     }, 0);
                 },
@@ -20,8 +20,9 @@ ln[&quot;forward_en&quot;] = &quot;FORWARD&quot;;
 ln["selectedUrl_en"] = "Selected url";
 ln["wrongUrl_en"] = "Invalid url or data provider not supported yet.";
-ln["providersDatasets_en"] = "PROVIDERS DATASETS";
-ln["spodUsersDatasets_en"] = "COCREATED DATASETS";
+ln["providersDatasets_en"] = "FROM PROVIDERS";
+ln["spodUsersDatasets_en"] = "FROM COCREATED";
+ln["extendedDatasets_en"] = "FROM EXTENDED SEARCH";
 ln["datasets_en"] = "DATASETS LIST";
 ln["provider_en"] = "Provider";
@@ -36,11 +37,11 @@ ln[&quot;providerNameDescription_en&quot;] = &quot;Shows only the datasets of the selected prov
 //ln["tree_en"] = "Tree";
 //ln["treeDescription_en"] = "Shows the datasets with a tree map.";
-ln["search_en"] = "Search";
-ln["standard_en"] = "Standard";
-ln["standardDescription_en"] = "The search function works only on datasets names.";
-ln["extended_en"] = "Extended [NOT AVAILABLE]";
-ln["extendedDescription_en"] = "The search function works the entire contents of the datasets.";
+//ln["search_en"] = "Search";
+//ln["standard_en"] = "Standard";
+//ln["standardDescription_en"] = "The search function works only on datasets names.";
+//ln["extended_en"] = "Extended [NOT AVAILABLE]";
+//ln["extendedDescription_en"] = "The search function works the entire contents of the datasets.";
 ln["version_en"] = "Version";
 ln["showLast_en"] = "Show last";
@@ -50,25 +50,25 @@ ln[&quot;download_docs_it&quot;] = &quot;Download documento&quot;;
 /******** fr ********/
 //data-table
-ln["selectedData_fr"] = "DATASET";
-ln["rows_fr"] = "rows";
+ln["selectedData_fr"] = "JEU DE DONNÉES";
+ln["rows_fr"] = "rangées";
 ln["type_fr"] = "TYPE";
-ln["warning_fr"] = "WARNING";
-ln["showing_fr"] = "Showing";
-ln["to_fr"] = "to";
-ln["of_fr"] = "of";
-ln["search_fr"] = "Search";
+ln["warning_fr"] = "AVERTISSEMENT";
+ln["showing_fr"] = "Aperçu";
+ln["to_fr"] = "à";
+ln["of_fr"] = "de";
+ln["search_fr"] = "Rechercher";
 ln["VER_fr"] = "VER";
-ln["USER_fr"] = "USER";
-ln["NAME_fr"] = "NAME";
-ln["DATA_fr"] = "DATA";
+ln["USER_fr"] = "UTILISATEUR";
+ln["NAME_fr"] = "NOM";
+ln["DATA_fr"] = "DONNÉES";
 ln["DESCRIPTION_fr"] = "DESCRIPTION";
-ln["TOOLS_fr"] = "TOOLS";
-ln["last_version_fr"] = "Last version";
-ln["open_fr"] = "Open";
-ln["download_csv_fr"] = "Download as CSV";
-ln["copy_link_fr"] = "Copy link";
-ln["download_docs_fr"] = "Download docs";
+ln["TOOLS_fr"] = "OUTILS";
+ln["last_version_fr"] = "Dernière version";
+ln["open_fr"] = "Ouvrir";
+ln["download_csv_fr"] = "Télécharger en CSV";
+ln["copy_link_fr"] = "Copier le lien";
+ln["download_docs_fr"] = "Télécharger les documents";
 /******** nl ********/
@@ -26,15 +26,15 @@ room_ln[&quot;and_it&quot;] = &quot;e&quot;;
 /* FR */
-room_ln["thisRoom_fr"] = "This room";
-room_ln["createdBy_fr"] = "created by";
-room_ln["has_fr"] = "has";
-room_ln["many_fr"] = "many";
-room_ln["few_fr"] = "few";
-room_ln["views_fr"] = "views";
-room_ln["comments_fr"] = "comments";
-room_ln["datasets_fr"] = "datasets";
-room_ln["and_fr"] = "and";
+room_ln["thisRoom_fr"] = "Cet espace commun";
+room_ln["createdBy_fr"] = "créé par";
+room_ln["has_fr"] = "contient";
+room_ln["many_fr"] = "plusieurs";
+room_ln["few_fr"] = "peu";
+room_ln["views_fr"] = "visualisations";
+room_ln["comments_fr"] = "commentaires";
+room_ln["datasets_fr"] = "jeux de données";
+room_ln["and_fr"] = "et";
 /* NL */