[Trunk|Library]: Add help texts top and bottom on advanced search.
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56649 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
k.triantafyllou
parent
11cf47ac5a
commit
46ca524ce5
|
|
@ -36,7 +36,7 @@ export class AdvancedSearchDatasetsComponent {
|
|||
private errorCodes: ErrorCodes;
|
||||
private errorMessages: ErrorMessagesComponent;
|
||||
properties:EnvProperties;
|
||||
@Input() piwikSiteId = null;
|
||||
@Input() piwikSiteId = null;
|
||||
@Input() customFilter:SearchCustomFilter= null;
|
||||
|
||||
public results =[];
|
||||
|
|
|
|||
|
|
@ -29,15 +29,11 @@
|
|||
<div id="tm-main" class=" tm-middle">
|
||||
<div uk-grid uk-grid>
|
||||
<div class="tm-main uk-width-1-1@s uk-width-1-1@m uk-width-1-1@l uk-row-first ">
|
||||
<div class="uk-container ">
|
||||
|
||||
<div class="uk-container">
|
||||
<div>
|
||||
|
||||
<div class="uk-width-1-1">
|
||||
<helper position="top"></helper>
|
||||
</div>
|
||||
<helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0" [texts]="pageContents['top']"></helper>
|
||||
<div class="uk-width-1-1 uk-grid helper-grid uk-padding-large uk-padding-remove-top" >
|
||||
<helper class="uk-margin-top helper-left-right uk-visible@m" position="left"></helper>
|
||||
<div class="uk-width-expand@m uk-with-1-1@s">
|
||||
<div *ngIf="openaireLink"> <a class="uk-margin-top uk-button uk-button-text" [href]=openaireLink target="_blank" >Results in OpenAIRE</a></div>
|
||||
<div class="uk-align-center uk-margin-remove-bottom">
|
||||
|
|
@ -76,24 +72,16 @@
|
|||
[href]="properties.lastIndexInformationLink" target="_blank">
|
||||
Last index information
|
||||
</a>
|
||||
|
||||
<helper class="uk-hidden@m" position="left" styleName="uk-width-1-1@s"></helper>
|
||||
<helper class="uk-hidden@m" position="right" styleName="uk-width-1-1@s"></helper>
|
||||
</div>
|
||||
<div class="uk-visible@m uk-margin-top helper-left-right">
|
||||
<helper position="right" before="true"></helper>
|
||||
<div class="uk-visible@m uk-margin-top uk-width-1-5">
|
||||
<search-download [type]="csvPath" [csvParams]="csvParams" [totalResults]="searchUtils.totalResults" ></search-download>
|
||||
<helper position="right" before="false"></helper>
|
||||
</div>
|
||||
<!-- <helper *ngIf="searchUtils.totalResults > csvLimit" class="uk-margin-top helper-left-right uk-visible@m" position="right"></helper> -->
|
||||
</div>
|
||||
|
||||
<div class="uk-width-1-1">
|
||||
<helper position="bottom"></helper>
|
||||
</div>
|
||||
<helper *ngIf="pageContents && pageContents['bottom'] && pageContents['bottom'].length > 0" [texts]="pageContents['bottom']"></helper>
|
||||
</div>
|
||||
</div>
|
||||
<!--modal-loading [message]= "'Loading results...'"></modal-loading-->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,27 +1,23 @@
|
|||
import {Component, Input, ViewChild} from '@angular/core';
|
||||
import {Output, EventEmitter} from '@angular/core';
|
||||
import {Location} from '@angular/common';
|
||||
import {ActivatedRoute, Router} from '@angular/router';
|
||||
import {Title, Meta} from '@angular/platform-browser';
|
||||
import {Component, EventEmitter, Input, Output, ViewChild} from '@angular/core';
|
||||
import {Location} from '@angular/common';
|
||||
import {ActivatedRoute, Router} from '@angular/router';
|
||||
import {Meta, Title} from '@angular/platform-browser';
|
||||
|
||||
import {Observable} from 'rxjs';
|
||||
|
||||
import {Filter, Value, AdvancedField} from '../searchUtils/searchHelperClasses.class';
|
||||
import {SearchResult} from '../../utils/entities/searchResult';
|
||||
import {SearchFields, FieldDetails} from '../../utils/properties/searchFields';
|
||||
import {AdvancedField} from '../searchUtils/searchHelperClasses.class';
|
||||
import {SearchCustomFilter, SearchUtilsClass} from './searchUtils.class';
|
||||
import {ModalLoading} from '../../utils/modal/loading.component';
|
||||
import {StringUtils, Dates} from '../../utils/string-utils.class';
|
||||
import {ErrorCodes} from '../../utils/properties/errorCodes';
|
||||
import {RouterHelper} from '../../utils/routerHelper.class';
|
||||
import {ModalLoading} from '../../utils/modal/loading.component';
|
||||
import {Dates, StringUtils} from '../../utils/string-utils.class';
|
||||
import {ErrorCodes} from '../../utils/properties/errorCodes';
|
||||
import {RouterHelper} from '../../utils/routerHelper.class';
|
||||
|
||||
import {PiwikService} from '../../utils/piwik/piwik.service';
|
||||
import {EnvProperties} from '../../utils/properties/env-properties';
|
||||
import { SEOService } from '../../sharedComponents/SEO/SEO.service';
|
||||
import {PiwikService} from '../../utils/piwik/piwik.service';
|
||||
import {EnvProperties} from '../../utils/properties/env-properties';
|
||||
import {SEOService} from '../../sharedComponents/SEO/SEO.service';
|
||||
import {HelperService} from "../../utils/helper/helper.service";
|
||||
|
||||
@Component({
|
||||
selector: 'advanced-search-page',
|
||||
templateUrl: 'advancedSearchPage.component.html'
|
||||
selector: 'advanced-search-page',
|
||||
templateUrl: 'advancedSearchPage.component.html'
|
||||
})
|
||||
export class AdvancedSearchPageComponent {
|
||||
@Input() piwikSiteId = null;
|
||||
|
|
@ -29,66 +25,72 @@ export class AdvancedSearchPageComponent {
|
|||
@Input() results = [];
|
||||
@Input() type;
|
||||
@Input() entityType;
|
||||
@Input() searchUtils:SearchUtilsClass = new SearchUtilsClass();
|
||||
@Input() fieldIds: string[];
|
||||
@Input() searchUtils: SearchUtilsClass = new SearchUtilsClass();
|
||||
@Input() fieldIds: string[];
|
||||
@Input() fieldIdsMap;//:{ [key:string]:{ name:string, operator:string, type:string, indexField:string, equalityOperator:string }} ;
|
||||
@Input() selectedFields:AdvancedField[];
|
||||
@Input() selectedFields: AdvancedField[];
|
||||
@Input() simpleSearchUrl: string;
|
||||
@ViewChild (ModalLoading) loading : ModalLoading ;
|
||||
@ViewChild(ModalLoading) loading: ModalLoading;
|
||||
@Input() csvParams: string;
|
||||
@Input() csvPath: string;
|
||||
@Input() simpleSearchLink: string = "";
|
||||
@Input() disableForms:boolean = false;
|
||||
@Input() disableForms: boolean = false;
|
||||
@Input() loadPaging: boolean = true;
|
||||
@Input() oldTotalResults: number = 0;
|
||||
@Input() openaireLink: string;
|
||||
@Input() customFilter:SearchCustomFilter= null;
|
||||
@Input() customFilter: SearchCustomFilter = null;
|
||||
@Input() sort: boolean = false;
|
||||
@Input() searchFormClass: string = "searchForm";
|
||||
piwiksub: any;
|
||||
public parameterNames:string[] =[];
|
||||
public parameterValues:string[] =[];
|
||||
public parameterNames: string[] = [];
|
||||
public parameterValues: string[] = [];
|
||||
|
||||
public baseURLWithParameters:string = '';
|
||||
public baseURLWithParameters: string = '';
|
||||
|
||||
public csvLimit: number = 0;
|
||||
public pagingLimit: number = 0;
|
||||
public resultsPerPage: number = 0;
|
||||
isPiwikEnabled = false;
|
||||
properties:EnvProperties;
|
||||
public routerHelper:RouterHelper = new RouterHelper();
|
||||
public errorCodes:ErrorCodes = new ErrorCodes();
|
||||
properties: EnvProperties;
|
||||
public pageContents = null;
|
||||
public divContents = null;
|
||||
public routerHelper: RouterHelper = new RouterHelper();
|
||||
public errorCodes: ErrorCodes = new ErrorCodes();
|
||||
|
||||
url = null;
|
||||
@Output() queryChange = new EventEmitter();
|
||||
constructor (private route: ActivatedRoute,
|
||||
private location: Location,
|
||||
private _meta: Meta,
|
||||
private _title: Title,
|
||||
private _piwikService:PiwikService,
|
||||
private router: Router,
|
||||
private seoService: SEOService) {
|
||||
}
|
||||
@Output() queryChange = new EventEmitter();
|
||||
|
||||
constructor(private route: ActivatedRoute,
|
||||
private location: Location,
|
||||
private _meta: Meta,
|
||||
private _title: Title,
|
||||
private _piwikService: PiwikService,
|
||||
private router: Router,
|
||||
private seoService: SEOService,
|
||||
private helper: HelperService) {
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
this.route.data
|
||||
.subscribe((data: { envSpecific: EnvProperties }) => {
|
||||
this.properties = data.envSpecific;
|
||||
//this.getDivContents();
|
||||
this.getPageContents();
|
||||
this.pagingLimit = data.envSpecific.pagingLimit;
|
||||
this.resultsPerPage =data.envSpecific.resultsPerPage;
|
||||
this.resultsPerPage = data.envSpecific.resultsPerPage;
|
||||
this.csvLimit = data.envSpecific.csvLimit;
|
||||
this.isPiwikEnabled = data.envSpecific.enablePiwikTrack;
|
||||
if(typeof window !== 'undefined') {
|
||||
this.updateUrl(data.envSpecific.baseLink+location.pathname);
|
||||
this.url = data.envSpecific.baseLink+location.pathname
|
||||
if (typeof window !== 'undefined') {
|
||||
this.updateUrl(data.envSpecific.baseLink + location.pathname);
|
||||
this.url = data.envSpecific.baseLink + location.pathname
|
||||
}
|
||||
if(typeof document !== 'undefined' && this.isPiwikEnabled){
|
||||
if (typeof document !== 'undefined' && this.isPiwikEnabled) {
|
||||
this.piwiksub = this._piwikService.trackView(this.properties, this.pageTitle, this.piwikSiteId).subscribe();
|
||||
}
|
||||
});
|
||||
|
||||
var title = "Advanced search "+this.pageTitle;
|
||||
var description = "Openaire, search, repositories, open access, type, content provider, funder, project, "+ this.pageTitle;
|
||||
var title = "Advanced search " + this.pageTitle;
|
||||
var description = "Openaire, search, repositories, open access, type, content provider, funder, project, " + this.pageTitle;
|
||||
|
||||
this.updateTitle(title);
|
||||
this.updateDescription(description);
|
||||
|
|
@ -96,228 +98,252 @@ export class AdvancedSearchPageComponent {
|
|||
this.searchUtils.baseUrl = "/" + this.searchUtils.baseUrl;
|
||||
|
||||
this.updateBaseUrlWithParameters();
|
||||
this.seoService.createLinkForCanonicalURL(this.properties.baseLink+this.router.url,false);
|
||||
this.seoService.createLinkForCanonicalURL(this.properties.baseLink + this.router.url, false);
|
||||
|
||||
|
||||
}
|
||||
|
||||
private getPageContents() {
|
||||
this.helper.getPageHelpContents(this.router.url, this.properties, (this.customFilter)?this.customFilter.valueId:null).subscribe(contents => {
|
||||
|
||||
this.pageContents = contents;
|
||||
})
|
||||
}
|
||||
|
||||
private getDivContents() {
|
||||
this.helper.getDivHelpContents(this.router.url, this.properties, (this.customFilter)?this.customFilter.valueId:null).subscribe(contents => {
|
||||
this.divContents = contents;
|
||||
})
|
||||
}
|
||||
|
||||
ngOnDestroy() {
|
||||
if(this.piwiksub){
|
||||
if (this.piwiksub) {
|
||||
this.piwiksub.unsubscribe();
|
||||
}
|
||||
}
|
||||
updateDescription(description:string) {
|
||||
this._meta.updateTag({content:description},"name='description'");
|
||||
this._meta.updateTag({content:description},"property='og:description'");
|
||||
|
||||
updateDescription(description: string) {
|
||||
this._meta.updateTag({content: description}, "name='description'");
|
||||
this._meta.updateTag({content: description}, "property='og:description'");
|
||||
}
|
||||
updateTitle(title:string) {
|
||||
var _prefix ="OpenAIRE | ";
|
||||
var _title = _prefix + ((title.length> 50 ) ?title.substring(0,50):title);
|
||||
|
||||
updateTitle(title: string) {
|
||||
var _prefix = "OpenAIRE | ";
|
||||
var _title = _prefix + ((title.length > 50) ? title.substring(0, 50) : title);
|
||||
this._title.setTitle(_title);
|
||||
this._meta.updateTag({content:_title},"property='og:title'");
|
||||
this._meta.updateTag({content: _title}, "property='og:title'");
|
||||
}
|
||||
updateUrl(url:string) {
|
||||
this._meta.updateTag({content:url},"property='og:url'");
|
||||
|
||||
updateUrl(url: string) {
|
||||
this._meta.updateTag({content: url}, "property='og:url'");
|
||||
}
|
||||
|
||||
public getSelectedFiltersFromUrl(params) {
|
||||
for(var i=0; i< this.fieldIds.length ; i++){
|
||||
for (var i = 0; i < this.fieldIds.length; i++) {
|
||||
|
||||
var fieldId = this.fieldIds[i];
|
||||
var fieldparam = (this.fieldIdsMap[fieldId])?this.fieldIdsMap[fieldId].param:"";
|
||||
if(!this.fieldIdsMap[fieldId]){
|
||||
var fieldId = this.fieldIds[i];
|
||||
var fieldparam = (this.fieldIdsMap[fieldId]) ? this.fieldIdsMap[fieldId].param : "";
|
||||
if (!this.fieldIdsMap[fieldId]) {
|
||||
|
||||
console.error("Field: "+fieldId +" not found in fieldIds map");
|
||||
}
|
||||
console.error("Field: " + fieldId + " not found in fieldIds map");
|
||||
}
|
||||
|
||||
var operatorId = this.getOperatorParameter(fieldparam);
|
||||
if(params[fieldparam] != undefined && params[operatorId] != undefined) {
|
||||
var values:string [] = StringUtils.URIDecode(params[fieldparam]).split(/,(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)/,-1);
|
||||
var operators:string [] = (StringUtils.URIDecode(params[operatorId])).split(/,(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)/,-1);
|
||||
if(values.length == operators.length){
|
||||
for(var j=0; j< values.length ; j++){
|
||||
if(this.fieldIdsMap[fieldId].type == "date"){
|
||||
var value:string =StringUtils.unquote(values[j]);
|
||||
var validDates:boolean = true;
|
||||
var dateField:AdvancedField = new AdvancedField(fieldId,fieldparam,this.fieldIdsMap[fieldId].name,this.fieldIdsMap[fieldId].type,value,operators[j]) ;
|
||||
if(value.indexOf("range") != -1){
|
||||
dateField.dateValue.type="range";
|
||||
if(value.length < 26 ){
|
||||
validDates =false;
|
||||
}else{
|
||||
if(!Dates.isValidDate(value.substring(5,15)) || !Dates.isValidDate(value.substring(16,26))){
|
||||
validDates =false;
|
||||
}else {
|
||||
dateField.dateValue.from = Dates.getDateFromString(value.substring(5,15));
|
||||
dateField.dateValue.to = Dates.getDateFromString(value.substring(16,26));
|
||||
}
|
||||
}
|
||||
// "rangeYYYY-MM-DD:YYYY-MM-DD"
|
||||
}else{
|
||||
dateField.dateValue.setDatesByType(value);
|
||||
}
|
||||
if(validDates){
|
||||
this.selectedFields.push(dateField);
|
||||
}
|
||||
var operatorId = this.getOperatorParameter(fieldparam);
|
||||
if (params[fieldparam] != undefined && params[operatorId] != undefined) {
|
||||
var values: string [] = StringUtils.URIDecode(params[fieldparam]).split(/,(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)/, -1);
|
||||
var operators: string [] = (StringUtils.URIDecode(params[operatorId])).split(/,(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)/, -1);
|
||||
if (values.length == operators.length) {
|
||||
for (var j = 0; j < values.length; j++) {
|
||||
if (this.fieldIdsMap[fieldId].type == "date") {
|
||||
var value: string = StringUtils.unquote(values[j]);
|
||||
var validDates: boolean = true;
|
||||
var dateField: AdvancedField = new AdvancedField(fieldId, fieldparam, this.fieldIdsMap[fieldId].name, this.fieldIdsMap[fieldId].type, value, operators[j]);
|
||||
if (value.indexOf("range") != -1) {
|
||||
dateField.dateValue.type = "range";
|
||||
if (value.length < 26) {
|
||||
validDates = false;
|
||||
} else {
|
||||
if (!Dates.isValidDate(value.substring(5, 15)) || !Dates.isValidDate(value.substring(16, 26))) {
|
||||
validDates = false;
|
||||
} else {
|
||||
dateField.dateValue.from = Dates.getDateFromString(value.substring(5, 15));
|
||||
dateField.dateValue.to = Dates.getDateFromString(value.substring(16, 26));
|
||||
}
|
||||
}
|
||||
// "rangeYYYY-MM-DD:YYYY-MM-DD"
|
||||
} else {
|
||||
dateField.dateValue.setDatesByType(value);
|
||||
}
|
||||
if (validDates) {
|
||||
this.selectedFields.push(dateField);
|
||||
}
|
||||
|
||||
}
|
||||
else{
|
||||
this.selectedFields.push(new AdvancedField(fieldId,fieldparam,this.fieldIdsMap[fieldId].name,this.fieldIdsMap[fieldId].type,StringUtils.unquote(values[j]),operators[j]) );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if(this.selectedFields.length == 0){
|
||||
this.selectedFields.push(new AdvancedField(this.fieldIds[0],fieldparam,this.fieldIdsMap[this.fieldIds[0]].name,this.fieldIdsMap[this.fieldIds[0]].type,"","and"));
|
||||
}
|
||||
}
|
||||
private createUrlParameters(includePage:boolean){
|
||||
var params="";
|
||||
this.parameterNames.splice(0,this.parameterNames.length);
|
||||
this.parameterValues.splice(0,this.parameterValues.length);
|
||||
var fields: { [key:string]:{ values:string[], operators:string[] }}={};
|
||||
for(var i = 0; i< this.selectedFields.length; i++){
|
||||
if(this.fieldIdsMap[this.selectedFields[i].id] != undefined && (this.selectedFields[i].value.length > 0 || this.selectedFields[i].type == "date" )){
|
||||
if(!fields[this.selectedFields[i].id]){
|
||||
fields[this.selectedFields[i].id] = {values:[], operators:[]};
|
||||
fields[this.selectedFields[i].id].values =[];
|
||||
fields[this.selectedFields[i].id].operators =[];
|
||||
}
|
||||
if(this.selectedFields[i].type == "date"){
|
||||
if(this.selectedFields[i].dateValue.type == "range"){
|
||||
fields[this.selectedFields[i].id].values.push(StringUtils.quote(StringUtils.URIEncode("range"+Dates.getDateToString(this.selectedFields[i].dateValue.from)+":"+Dates.getDateToString(this.selectedFields[i].dateValue.to))));
|
||||
}else{
|
||||
fields[this.selectedFields[i].id].values.push(StringUtils.quote(StringUtils.URIEncode(this.selectedFields[i].dateValue.type)));
|
||||
} else {
|
||||
this.selectedFields.push(new AdvancedField(fieldId, fieldparam, this.fieldIdsMap[fieldId].name, this.fieldIdsMap[fieldId].type, StringUtils.unquote(values[j]), operators[j]));
|
||||
}
|
||||
}
|
||||
}else{
|
||||
}
|
||||
}
|
||||
}
|
||||
if (this.selectedFields.length == 0) {
|
||||
this.selectedFields.push(new AdvancedField(this.fieldIds[0], fieldparam, this.fieldIdsMap[this.fieldIds[0]].name, this.fieldIdsMap[this.fieldIds[0]].type, "", "and"));
|
||||
}
|
||||
}
|
||||
|
||||
private createUrlParameters(includePage: boolean) {
|
||||
var params = "";
|
||||
this.parameterNames.splice(0, this.parameterNames.length);
|
||||
this.parameterValues.splice(0, this.parameterValues.length);
|
||||
var fields: { [key: string]: { values: string[], operators: string[] } } = {};
|
||||
for (var i = 0; i < this.selectedFields.length; i++) {
|
||||
if (this.fieldIdsMap[this.selectedFields[i].id] != undefined && (this.selectedFields[i].value.length > 0 || this.selectedFields[i].type == "date")) {
|
||||
if (!fields[this.selectedFields[i].id]) {
|
||||
fields[this.selectedFields[i].id] = {values: [], operators: []};
|
||||
fields[this.selectedFields[i].id].values = [];
|
||||
fields[this.selectedFields[i].id].operators = [];
|
||||
}
|
||||
if (this.selectedFields[i].type == "date") {
|
||||
if (this.selectedFields[i].dateValue.type == "range") {
|
||||
fields[this.selectedFields[i].id].values.push(StringUtils.quote(StringUtils.URIEncode("range" + Dates.getDateToString(this.selectedFields[i].dateValue.from) + ":" + Dates.getDateToString(this.selectedFields[i].dateValue.to))));
|
||||
} else {
|
||||
fields[this.selectedFields[i].id].values.push(StringUtils.quote(StringUtils.URIEncode(this.selectedFields[i].dateValue.type)));
|
||||
}
|
||||
} else {
|
||||
fields[this.selectedFields[i].id].values.push(StringUtils.quote(StringUtils.URIEncode(this.selectedFields[i].value)));
|
||||
}
|
||||
fields[this.selectedFields[i].id].operators.push(this.selectedFields[i].operatorId);
|
||||
|
||||
}
|
||||
}
|
||||
for(var i = 0; i< this.fieldIds.length; i++){
|
||||
if(fields[this.fieldIds[i]]){
|
||||
for (var i = 0; i < this.fieldIds.length; i++) {
|
||||
if (fields[this.fieldIds[i]]) {
|
||||
|
||||
params+="&"+this.fieldIdsMap[this.fieldIds[i]].param+"="+fields[this.fieldIds[i]].values.join()+
|
||||
"&"+ this.fieldIdsMap[this.fieldIds[i]].operator+"="+fields[this.fieldIds[i]].operators.join()
|
||||
params += "&" + this.fieldIdsMap[this.fieldIds[i]].param + "=" + fields[this.fieldIds[i]].values.join() +
|
||||
"&" + this.fieldIdsMap[this.fieldIds[i]].operator + "=" + fields[this.fieldIds[i]].operators.join()
|
||||
this.parameterNames.push(this.fieldIdsMap[this.fieldIds[i]].param);
|
||||
this.parameterValues.push(fields[this.fieldIds[i]].values.join());
|
||||
this.parameterNames.push( this.fieldIdsMap[this.fieldIds[i]].operator);
|
||||
this.parameterNames.push(this.fieldIdsMap[this.fieldIds[i]].operator);
|
||||
this.parameterValues.push(fields[this.fieldIds[i]].operators.join());
|
||||
}
|
||||
}
|
||||
if(includePage && this.searchUtils.page != 1){
|
||||
params += "&page="+this.searchUtils.page;
|
||||
if (includePage && this.searchUtils.page != 1) {
|
||||
params += "&page=" + this.searchUtils.page;
|
||||
}
|
||||
|
||||
if(this.searchUtils.size != 10) {
|
||||
params+=((params.length == 0)?'':'&') + 'size=' + this.searchUtils.size;
|
||||
if (this.searchUtils.size != 10) {
|
||||
params += ((params.length == 0) ? '' : '&') + 'size=' + this.searchUtils.size;
|
||||
this.parameterNames.push("size");
|
||||
this.parameterValues.push(""+this.searchUtils.size);
|
||||
this.parameterValues.push("" + this.searchUtils.size);
|
||||
}
|
||||
|
||||
if(this.sort && this.searchUtils.sortBy) {
|
||||
params+=((params.length == 0)?'':'&') + 'sortBy=' + this.searchUtils.sortBy;
|
||||
if (this.sort && this.searchUtils.sortBy) {
|
||||
params += ((params.length == 0) ? '' : '&') + 'sortBy=' + this.searchUtils.sortBy;
|
||||
this.parameterNames.push("sortBy");
|
||||
this.parameterValues.push(this.searchUtils.sortBy);
|
||||
}
|
||||
|
||||
return '?'+params;
|
||||
return '?' + params;
|
||||
}
|
||||
public createQueryParameters(){
|
||||
var params="";
|
||||
|
||||
public createQueryParameters() {
|
||||
var params = "";
|
||||
var countParams = 0;
|
||||
for(var i = 0; i< this.selectedFields.length; i++){
|
||||
if(this.fieldIdsMap[this.selectedFields[i].id] != undefined && (this.selectedFields[i].value != "" ||this.selectedFields[i].type == "date")){
|
||||
for (var i = 0; i < this.selectedFields.length; i++) {
|
||||
if (this.fieldIdsMap[this.selectedFields[i].id] != undefined && (this.selectedFields[i].value != "" || this.selectedFields[i].type == "date")) {
|
||||
//console.log("createQueryParameters::"+this.selectedFields[i].type);
|
||||
if(this.selectedFields[i].type == "date"){
|
||||
if(this.selectedFields[i].dateValue.type != "any"){
|
||||
params += (countParams == 0 ? "" : this.selectedFields[i].operatorId) + " " + this.selectedFields[i].id + this.fieldIdsMap[this.selectedFields[i].id].equalityOperator+ '"' + StringUtils.URIEncode(Dates.getDateToString(this.selectedFields[i].dateValue.from)) + " "
|
||||
+ StringUtils.URIEncode(Dates.getDateToString(this.selectedFields[i].dateValue.to)) + '"' + " ";
|
||||
if (this.selectedFields[i].type == "date") {
|
||||
if (this.selectedFields[i].dateValue.type != "any") {
|
||||
params += (countParams == 0 ? "" : this.selectedFields[i].operatorId) + " " + this.selectedFields[i].id + this.fieldIdsMap[this.selectedFields[i].id].equalityOperator + '"' + StringUtils.URIEncode(Dates.getDateToString(this.selectedFields[i].dateValue.from)) + " "
|
||||
+ StringUtils.URIEncode(Dates.getDateToString(this.selectedFields[i].dateValue.to)) + '"' + " ";
|
||||
}
|
||||
}else{
|
||||
if(this.selectedFields[i].id == "q"){
|
||||
} else {
|
||||
if (this.selectedFields[i].id == "q") {
|
||||
var op = "";
|
||||
// if()
|
||||
params += (countParams == 0 ? "" : this.selectedFields[i].operatorId) + " " + '"' + StringUtils.URIEncode(this.selectedFields[i].value) + '"' + " ";
|
||||
}else if(countParams == 0 && this.selectedFields[i].operatorId == "not"){
|
||||
params += " "+ this.selectedFields[i].id + " <> "+'"' + StringUtils.URIEncode(this.selectedFields[i].value) +'"' + " ";
|
||||
}else{
|
||||
params += (countParams == 0 ? "" : this.selectedFields[i].operatorId + " " ) + this.selectedFields[i].id + this.fieldIdsMap[this.selectedFields[i].id].equalityOperator+'"' + encodeURIComponent(this.selectedFields[i].value) +'"' + " ";
|
||||
} else if (countParams == 0 && this.selectedFields[i].operatorId == "not") {
|
||||
params += " " + this.selectedFields[i].id + " <> " + '"' + StringUtils.URIEncode(this.selectedFields[i].value) + '"' + " ";
|
||||
} else {
|
||||
params += (countParams == 0 ? "" : this.selectedFields[i].operatorId + " ") + this.selectedFields[i].id + this.fieldIdsMap[this.selectedFields[i].id].equalityOperator + '"' + encodeURIComponent(this.selectedFields[i].value) + '"' + " ";
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
countParams++;
|
||||
}
|
||||
}
|
||||
|
||||
if(this.customFilter){
|
||||
params+= (countParams == 0 ? "" : " and " ) + this.customFilter.queryFieldName + " exact " + StringUtils.quote((this.customFilter.valueId ));
|
||||
if (this.customFilter) {
|
||||
params += (countParams == 0 ? "" : " and ") + this.customFilter.queryFieldName + " exact " + StringUtils.quote((this.customFilter.valueId));
|
||||
}
|
||||
return params;
|
||||
return params;
|
||||
|
||||
}
|
||||
clearFilters(){
|
||||
|
||||
clearFilters() {
|
||||
}
|
||||
|
||||
goTo(page:number = 1){
|
||||
this.searchUtils.page = page;
|
||||
goTo(page: number = 1) {
|
||||
this.searchUtils.page = page;
|
||||
var urlParameters = this.createUrlParameters(true);
|
||||
var queryParameters = this.createQueryParameters();
|
||||
//this.location.go(location.pathname,urlParameters);
|
||||
this.router.navigate( [this.searchUtils.baseUrl], { queryParams: this.routerHelper.createQueryParams(this.parameterNames, this.parameterValues) } );
|
||||
this.router.navigate([this.searchUtils.baseUrl], {queryParams: this.routerHelper.createQueryParams(this.parameterNames, this.parameterValues)});
|
||||
|
||||
this.queryChange.emit({
|
||||
value: queryParameters
|
||||
value: queryParameters
|
||||
});
|
||||
/* Code For Piwik*/
|
||||
if (typeof localStorage !== 'undefined') {
|
||||
//console.log("In PreviousRouteRecorder : "+this.router.url );
|
||||
localStorage.setItem('previousRoute', this.router.url);
|
||||
}
|
||||
if(this.isPiwikEnabled && (typeof document !== 'undefined')){
|
||||
this.piwiksub = this._piwikService.trackView(this.properties, this.pageTitle, this.piwikSiteId).subscribe();
|
||||
}
|
||||
/* End Piwik Code */
|
||||
if (typeof localStorage !== 'undefined') {
|
||||
//console.log("In PreviousRouteRecorder : "+this.router.url );
|
||||
localStorage.setItem('previousRoute', this.router.url);
|
||||
}
|
||||
if (this.isPiwikEnabled && (typeof document !== 'undefined')) {
|
||||
this.piwiksub = this._piwikService.trackView(this.properties, this.pageTitle, this.piwikSiteId).subscribe();
|
||||
}
|
||||
/* End Piwik Code */
|
||||
}
|
||||
|
||||
queryChanged($event) {
|
||||
|
||||
this.goTo(1);
|
||||
this.goTo(1);
|
||||
}
|
||||
|
||||
pageChanged($event) {
|
||||
this.searchUtils.page = +$event.value;
|
||||
this.goTo(this.searchUtils.page);
|
||||
}
|
||||
|
||||
sizeChanged($event) {
|
||||
this.searchUtils.size = $event.value;
|
||||
this.goTo(1);
|
||||
this.searchUtils.size = $event.value;
|
||||
this.goTo(1);
|
||||
}
|
||||
|
||||
sortByChanged($event) {
|
||||
this.searchUtils.sortBy = $event.value;
|
||||
this.goTo(1);
|
||||
this.searchUtils.sortBy = $event.value;
|
||||
this.goTo(1);
|
||||
}
|
||||
|
||||
/*
|
||||
* Update the url with proper parameters. This is used as base url in Paging Component
|
||||
*/
|
||||
public updateBaseUrlWithParameters(){
|
||||
public updateBaseUrlWithParameters() {
|
||||
this.baseURLWithParameters = this.searchUtils.baseUrl + this.createUrlParameters(false);
|
||||
}
|
||||
getOperatorParameter(parameter:string):string{
|
||||
for (let id of this.fieldIds) {
|
||||
if(this.fieldIdsMap[id]["param"] == parameter){
|
||||
return this.fieldIdsMap[id]["operator"];
|
||||
}
|
||||
}
|
||||
}
|
||||
// for loading
|
||||
public openLoading(){
|
||||
this.loading.open();
|
||||
}
|
||||
public closeLoading(){
|
||||
this.loading.close();
|
||||
}
|
||||
}
|
||||
|
||||
getOperatorParameter(parameter: string): string {
|
||||
for (let id of this.fieldIds) {
|
||||
if (this.fieldIdsMap[id]["param"] == parameter) {
|
||||
return this.fieldIdsMap[id]["operator"];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// for loading
|
||||
public openLoading() {
|
||||
this.loading.open();
|
||||
}
|
||||
|
||||
public closeLoading() {
|
||||
this.loading.close();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -120,14 +120,14 @@ export class SearchPageComponent {
|
|||
this.seoService.createLinkForCanonicalURL(this.properties.baseLink+this.router.url,false);
|
||||
}
|
||||
|
||||
public getPageContents() {
|
||||
private getPageContents() {
|
||||
this.helper.getPageHelpContents(this.router.url, this.properties, (this.customFilter)?this.customFilter.valueId:null).subscribe(contents => {
|
||||
|
||||
this.pageContents = contents;
|
||||
})
|
||||
}
|
||||
|
||||
public getDivContents() {
|
||||
private getDivContents() {
|
||||
this.helper.getDivHelpContents(this.router.url, this.properties, (this.customFilter)?this.customFilter.valueId:null).subscribe(contents => {
|
||||
this.divContents = contents;
|
||||
})
|
||||
|
|
|
|||
Loading…
Reference in New Issue