Project

General

Profile

« Previous | Next » 

Revision 58739

[Library|Trunk]

Search Pages:

Change scroll behaviour after query is submitted. Scroll under form if filters or page changes, scroll to top when keyword changes
Hide filters and range filters when there are no results
Autocomplete for Result type vocabulary: combine publications and dataset vocabularies:

Filters:
Results:
Remove Collected From Filter "collectedfrom","collectedfrom"
Project appears when funder is selected
Repositories: add Collected From Filter "collectedfromname"

View differences:

newSearchPage.component.ts
19 19
import {RangeFilter} from "../../utils/rangeFilter/rangeFilterHelperClasses.class";
20 20
import {ZenodoInformationClass} from "../../deposit/utils/zenodoInformation.class";
21 21
import {Breadcrumb} from "../../utils/breadcrumbs/breadcrumbs.component";
22
import {HelperFunctions} from "../../utils/HelperFunctions.class";
22 23

  
23 24
declare var UIkit: any;
24 25

  
......
126 127
          this.piwiksub = this._piwikService.trackView(this.properties, this.pageTitle, this.piwikSiteId).subscribe();
127 128
        }
128 129
      });
129

  
130
    this.route.queryParams.subscribe(params => {
131
      if (params['page'] && params['page']!=1) {
132
        HelperFunctions.scrollToId("searchForm");
133
      }
134
    });
130 135
    var description = "Openaire, search, repositories, open access, type, content provider, funder, project, " + this.pageTitle;
131 136

  
132 137
    this.updateTitle(this.pageTitle);
......
205 210
    // this.clearKeywords();
206 211
  }
207 212

  
208
  goTo(page: number = 1) {
213
  goTo(page: number = 1, scroll:boolean = true) {
209 214
    if(this.offcanvasElement) {
210 215
      UIkit.offcanvas(this.offcanvasElement.nativeElement).hide();
211 216
    }
......
213 218
    this.searchUtils.page = page;
214 219
    this.buildPageURLParameters(this.filters, this.rangeFilters, true);
215 220
    this.router.navigate([this.searchUtils.baseUrl], {queryParams: this.routerHelper.createQueryParams(this.parameterNames, this.parameterValues)});
221
    if(scroll) {
222
      HelperFunctions.scrollToId("searchForm");
223
    }
216 224
    /* Code For Piwik*/
217 225
    if (typeof localStorage !== 'undefined') {
218 226
      //console.log("In PreviousRouteRecorder : "+this.router.url );
......
226 234

  
227 235
  queryChanged() {
228 236

  
229
    this.goTo(1);
237
    this.goTo(1, false);
230 238
  }
231 239

  
232 240

  
......
254 262
*/
255 263
  public getSelectedFilters(): string[] {
256 264
    var selected: string[] = [];
257
    for (var i = 0; i < this.filters.length; i++) {
258
      var filter: Filter = this.filters[i];
265
    var filters= (this.filters.length > 0)?this.filters:this.URLCreatedFilters;
266
    for (var i = 0; i < filters.length; i++) {
267
      var filter: Filter = filters[i];
259 268
      if (filter.countSelectedValues > 0) {
260 269
        selected.push(filter.filterId);
261 270
      }
......
1332 1341
    } else if (totalResults != 0) {
1333 1342
      this.showUnknownFilters = false;
1334 1343
      this.filters = filters;
1344
    }else if((this.URLCreatedFilters.length == 0 && totalResults == 0)){
1345
      this.showUnknownFilters = true;
1346
      this.filters = filters;
1335 1347
    }
1336 1348
    this.buildPageURLParameters(this.URLCreatedFilters, this.URLCreatedRangeFilters, true);
1337 1349
    //this.checkSelectedRangeFilters(this.rangeFilters);

Also available in: Unified diff