diff --git a/claims/claimsByToken/claimsByToken.component.ts b/claims/claimsByToken/claimsByToken.component.ts index c104bc2f..3959441c 100644 --- a/claims/claimsByToken/claimsByToken.component.ts +++ b/claims/claimsByToken/claimsByToken.component.ts @@ -1,3 +1,4 @@ +/* import {Component, ViewChild, ViewChildren, QueryList, ViewEncapsulation} from '@angular/core'; import {ActivatedRoute, Params, Router} from '@angular/router'; import {Title, Meta} from '@angular/platform-browser'; @@ -116,10 +117,10 @@ export class ClaimsByTokenComponent { } ], "order": [[ 2, 'desc' ]] //"pagingType": 'full_numbers', - /*"language": { + /!*"language": { "search": "", "searchPlaceholder": "Search projects..." - }*/ + }*!/ }; this.dtOptions[1] = { @@ -164,18 +165,18 @@ export class ClaimsByTokenComponent { }); } - /* + /!* Trigger a table draw in order to get the initial filtering - */ + *!/ triggerInitialLoad(){ this.triggered = true; //console.info("triggerInitialLoad"); setTimeout(function(){ - /*var table1 = $('#table1').DataTable(); + /!*var table1 = $('#table1').DataTable(); table1.page( 0 ).draw( false ); var table2 = $('#table2').DataTable(); - table2.page( 0 ).draw( false );*/ + table2.page( 0 ).draw( false );*!/ }, 500); setTimeout(() => { this.dtTrigger[0].next(); @@ -321,7 +322,7 @@ export class ClaimsByTokenComponent { this.pending_status = this.errorMessages.getErrorCode(err.status); this.curated_status = this.pending_status; - /*if(err.status == '404') { + /!*if(err.status == '404') { this.pending_status = this.errorCodes.NOT_FOUND; this.curated_status = this.errorCodes.NOT_FOUND; } else if(err.status == '500') { @@ -330,7 +331,7 @@ export class ClaimsByTokenComponent { } else { this.pending_status = this.errorCodes.NOT_AVAILABLE; this.curated_status = this.errorCodes.NOT_AVAILABLE; - }*/ + }*!/ this.showTables = true; if(!this.triggered) { @@ -408,11 +409,11 @@ export class ClaimsByTokenComponent { isSelected(id:string, set:Set) { return set.has(id); } - /* + /!* isSelectedWrong(id:string) { return this.selectedWrong.has(id); } - */ + *!/ isRight_CuratedMode(claim: any) { if(this.isSelected(claim.id, this.selectedRight_CuratedMode)) { return true; @@ -570,3 +571,4 @@ export class ClaimsByTokenComponent { console.error("Claims Project Manager Page: "+message, error); } } +*/ diff --git a/claims/claimsByToken/claimsByToken.module.ts b/claims/claimsByToken/claimsByToken.module.ts index 79fa183b..482270f8 100644 --- a/claims/claimsByToken/claimsByToken.module.ts +++ b/claims/claimsByToken/claimsByToken.module.ts @@ -1,3 +1,4 @@ +/* import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; @@ -41,3 +42,4 @@ import {ErrorMessagesModule} from '../../utils/errorMessages.module'; ] }) export class ClaimsByTokenModule { } +*/ diff --git a/dashboard/helpTexts/page-help-contents.component.html b/dashboard/helpTexts/page-help-contents.component.html index dfb3e606..360144cd 100644 --- a/dashboard/helpTexts/page-help-contents.component.html +++ b/dashboard/helpTexts/page-help-contents.component.html @@ -13,7 +13,7 @@ - Go back to pages list + Back to pages list diff --git a/searchPages/searchUtils/newSearchPage.component.html b/searchPages/searchUtils/newSearchPage.component.html index 5c8c2454..bbb0f296 100644 --- a/searchPages/searchUtils/newSearchPage.component.html +++ b/searchPages/searchUtils/newSearchPage.component.html @@ -319,9 +319,7 @@ [isDisabled]="disableForms || disableRefineForms"> - -
- +
-
- - - - - -
-
+
@@ -409,12 +392,12 @@
- Last update - + Last update of records in OpenAIRE: {{indexUpdateDate | date: 'MMM dd, yyyy'}} @@ -423,12 +406,6 @@
- - - - - - diff --git a/searchPages/searchUtils/newSearchPage.component.ts b/searchPages/searchUtils/newSearchPage.component.ts index dfc5dfb4..9d68d844 100644 --- a/searchPages/searchUtils/newSearchPage.component.ts +++ b/searchPages/searchUtils/newSearchPage.component.ts @@ -74,7 +74,7 @@ export class NewSearchPageComponent { @Input() tableViewLink: string; @Input() usedBy: string = "search"; @Input() public zenodoInformation: ZenodoInformationClass = new ZenodoInformationClass(); - @Input() showLastIndex: boolean = true; + @Input() showIndexInfo: boolean = true; @Input() showResultCount: boolean = true; @Input() showMoreFilterValuesInline: boolean = true; @Input() filterValuesNum: number = 6; @@ -88,7 +88,7 @@ export class NewSearchPageComponent { @Input() quickFilter: { filter: Filter, selected: boolean, filterId: string, value: string }; @Input() includeOnlyResultsAndFilter:boolean = false; @Input() showBreadcrumb:boolean = false; - @Input() lastIndex: boolean = true; + @Input() showDownload: boolean = true; public dashboard: boolean = properties.isDashboard; subscriptions = []; diff --git a/searchPages/searchUtils/searchFilter.component.ts b/searchPages/searchUtils/searchFilter.component.ts index e1ea926c..ac271bb4 100644 --- a/searchPages/searchUtils/searchFilter.component.ts +++ b/searchPages/searchUtils/searchFilter.component.ts @@ -9,7 +9,6 @@ import { } from '@angular/core'; import { Filter, Value} from './searchHelperClasses.class'; import {ActivatedRoute, Router} from "@angular/router"; -import {properties} from "../../../../environments/environment"; import 'rxjs/add/operator/filter'; @Component({ selector: 'search-filter', diff --git a/searchPages/searchUtils/searchPageTableView.component.html b/searchPages/searchUtils/searchPageTableView.component.html deleted file mode 100644 index e18b1ac6..00000000 --- a/searchPages/searchUtils/searchPageTableView.component.html +++ /dev/null @@ -1,304 +0,0 @@ - -
-
-
-
Filters
- - Clear All - -
-
- - - - - - - - - - - - - -
-
- -
- -
-
- - -
- -
-
-
- {{searchUtils.totalResults|number}} - {{type}}, page - {{searchUtils.page | number}} - of - {{(totalPages()|number)}} -
-
- -
-
-
-
- - -
-
- -
-
- -
- - -
-
- - -
-
-
- -
-
-
- - -
- -
- -
- - - -
-
-
-
- - -
-
- -
-
- - -
-
-
- -
- -
-
- - - - - - - - - - - - - - - Filters ({{(countFilters())}}) - - -
-
- - -
-
-
-
- -
-
- -
- -
-
- The following results are related to {{customFilter.valueName}}. - Are you interested to view more results? Visit - OpenAIRE - Explore. -
-
-
-
- -
-
- - - - List view - - -
-
- -
- - - -
- -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
{{column}}
- - - - - [no title available] - - - - {{result.type}} - - - - {{country}}{{(i < ( result['countries'].slice(0,5).length-1))?", ":""}}{{(i == result['countries'].slice(0,5).length-1 && result['countries'].length > 5)?"...":""}} - - - - - {{org.name}}{{org.name}}{{(i < ( result['organizations'].slice(0,5).length-1))?", ":""}}{{(i == result['organizations'].slice(0,5).length-1 && result['organizations'].length > 5)?"...":""}} - - - - - {{result.compatibility}} - - - - - {{result.name}} - ({{result.acronym}}) - [no title available] - - - {{result.grantId}} - - - - {{result.funder}} - - - - - {{result.name}} - [no name available] - - - {{result.officialname}} - - -
-
- -
- -
- -
-
-
- -
-
-
diff --git a/searchPages/searchUtils/searchPageTableView.component.ts b/searchPages/searchUtils/searchPageTableView.component.ts deleted file mode 100644 index 324e59be..00000000 --- a/searchPages/searchUtils/searchPageTableView.component.ts +++ /dev/null @@ -1,588 +0,0 @@ -import {Component, Input} from '@angular/core'; -import {ViewChild} from '@angular/core'; -import {ViewEncapsulation} from '@angular/core'; -import {OnInit, AfterViewInit} from '@angular/core'; -import {Location} from '@angular/common'; -import {ActivatedRoute, Router} from '@angular/router'; -import {Title, Meta} from '@angular/platform-browser'; -import {Subject, Subscriber} from 'rxjs'; -import {DataTableDirective } from 'angular-datatables'; -import {EnvProperties} from '../../utils/properties/env-properties'; -import {Filter, Value} from './searchHelperClasses.class'; -import {SearchFields} from '../../utils/properties/searchFields'; -import {SearchCustomFilter, SearchUtilsClass} from './searchUtils.class'; -import {StringUtils} from '../../utils/string-utils.class'; -import {ModalLoading} from '../../utils/modal/loading.component'; -import {SearchFilterModalComponent} from './searchFilterModal.component'; -import {ErrorCodes} from '../../utils/properties/errorCodes'; -import {PiwikService} from '../../utils/piwik/piwik.service'; -import { SEOService } from '../../sharedComponents/SEO/SEO.service'; -import {HelperService} from "../../utils/helper/helper.service"; -import {Breadcrumb} from "../../utils/breadcrumbs/breadcrumbs.component"; -import {properties} from "../../../../environments/environment"; - -@Component({ - selector: 'search-page-table', - templateUrl:'searchPageTableView.component.html', - styles: [` - #dpTable_info, #dpTable_paginate, #dpTable_length, #dpTable_filter{ - display: none; - } - - `], - encapsulation: ViewEncapsulation.None // this used in order styles to work - - }) -export class SearchPageTableViewComponent implements OnInit, AfterViewInit { - @Input() piwikSiteId = null; - @Input() hasPrefix: boolean = true; - @Input() pageTitle = ""; - @Input() results; - @Input() filters = []; - @Input() columnNames = []; - @Input() type:string = ""; - @Input() entityType: string = ""; - @Input() searchUtils:SearchUtilsClass;// = new SearchUtilsClass(); - //@Output() downloadClick = new EventEmitter(); - @Input() showResultCount:boolean = true; - @Input() showRefine:boolean = true; - @Input() refineFields = []; - //@Input() csvParams: string; - //@Input() csvPath: string; - @Input() openaireLink: string; - @Input() searchViewLink: string; - @Input() disableForms: boolean = false; - @Input() enableSearchView: boolean = true; - @Input() searchFormClass: string = "searchForm"; - @Input() formPlaceholderText = "Type Keywords..."; - @Input() mapUrl: string = ""; - @Input() mapTooltipType: string ="content providers"; - @ViewChild (ModalLoading) loading : ModalLoading ; - private searchFieldsHelper:SearchFields = new SearchFields(); - private queryParameters: Map = new Map(); - public parameterNames:string[] =[]; - public parameterValues:string[] =[]; - - public isPiwikEnabled; - - - @ViewChild (SearchFilterModalComponent) searchFilterModal : SearchFilterModalComponent ; - public currentFilter: Filter; - public errorCodes:ErrorCodes = new ErrorCodes(); - subscriptions = []; - dtOptions: DataTables.Settings = {}; - showTable = false; filteringAdded = false; - @ViewChild(DataTableDirective) datatableElement: DataTableDirective; - dtTrigger: Subject = new Subject(); //necessary - properties:EnvProperties; - url = null; - public pageContents = null; - @Input() customFilter: SearchCustomFilter = null; - @Input() enableEntitySelection: boolean = false; - @Input() includeOnlyResultsAndFilter:boolean = false; - @Input() showBreadcrumb:boolean = false; - breadcrumbs:Breadcrumb[] = []; - - constructor (private route: ActivatedRoute, - private router: Router, - private location: Location, - private _meta: Meta, - private _title: Title, - private _piwikService:PiwikService, - private seoService: SEOService, - private helper: HelperService) { } - - ngOnInit() { - - this.properties = properties; - this.getPageContents(); - this.isPiwikEnabled =this.properties.enablePiwikTrack; - if(typeof window !== 'undefined') { - this.updateUrl(this.properties.domain+this.properties.baseLink+location.pathname); - this.url =this.properties.domain+this.properties.baseLink+location.pathname; - } - if(typeof document !== 'undefined' && this.isPiwikEnabled){ - this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, this.piwikSiteId).subscribe()); - } - - this.dtOptions = { - "paging": true, - "searching": false, - "lengthChange": false, - "pageLength": this.searchUtils.size - }; - this.updateTitle(this.pageTitle); - var description = "Openaire, search, repositories, open access, type, content provider, funder, project, " + this.type + "," +this.pageTitle; - this.updateDescription(description); - this.seoService.createLinkForCanonicalURL(this.properties.domain+ this.properties.baseLink +this.router.url,false); - this.breadcrumbs.push({name: 'home', route: '/'}, {name: this.pageTitle, route: null}); - - - } - ngOnDestroy() { - this.subscriptions.forEach(subscription => { - if (subscription instanceof Subscriber) { - subscription.unsubscribe(); - } - }); - - try{ - $.fn['dataTable'].ext.search.pop(); - }catch(e){ - console.error("An error occured in ngOnDestroy of SearchPageTableViewComponent ", e) - } - } - ngAfterViewInit(): void { - try{ - $.fn['dataTable'].ext.search.push((settings, data, dataIndex) => { -//console.info(dataIndex+": "+data); -//console.info(this.results); - //if (this.filterData(this.results[dataIndex], this.searchUtils.keyword, this.filters)) { - if(this.filterAll(this.results[dataIndex], this.searchUtils.keyword.toLowerCase(),this.filters)) { - // console.info("filter true (keyword:"+this.searchUtils.keyword+")"); - - return true; - } - // console.info("filter false (keyword:"+this.searchUtils.keyword+")"); - - return false; - }); - }catch(e){ - console.error("An error occured in ngAfterViewInit of SearchPageTableViewComponent ", e) - } - - } - - - totalPages(): number { - let totalPages:any = this.searchUtils.totalResults/(this.searchUtils.size); - if(!(Number.isInteger(totalPages))) { - totalPages = (parseInt(totalPages, 10) + 1); - } - return totalPages; - } - - toggleModal($event) { - this.currentFilter = $event.value; - this.searchFilterModal.open(); - - } - - updateDescription(description:string) { - this._meta.updateTag({content:description},"name='description'"); - this._meta.updateTag({content:description},"property='og:description'"); - } - updateTitle(title:string) { - var _prefix: string = ""; - if(this.hasPrefix) { - _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'"); - } - updateUrl(url:string) { - this._meta.updateTag({content:url},"property='og:url'"); - } - -public getParametersFromUrl(params) { - for(var i=0; i< this.refineFields.length ; i++) { - var filterId = this.refineFields[i]; - if(params[filterId] != undefined) { - if(this.queryParameters == undefined){ - this.queryParameters = new Map(); - } - this.queryParameters[filterId]=decodeURIComponent(params[filterId]); - } - } -} - /* - * Mark as check the new filters that are selected, when you get them from search - */ - public checkSelectedFilters(filters:Filter[]){ - - this.filters = filters; - for(var i=0; i< filters.length ; i++){ - var filter:Filter = filters[i]; - filter.countSelectedValues = 0; - - if(this.queryParameters[filter.filterId] != undefined) { - let values = (decodeURIComponent(this.queryParameters[filter.filterId])).split(/,(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)/,-1); - for(let filterValue of filter.values) { - if(values.indexOf(StringUtils.quote(filterValue.id)) > -1) { - filterValue.selected = true; - filter.countSelectedValues++; - }else{ - filterValue.selected = false; - } - } - }else{ - for(let filterValue of filter.values) { - filterValue.selected = false; - } - } - } - - return filters; - } - - /* - * - */ - private createUrlParameters(filters:Filter[], includePage:boolean){ - var allLimits="";//location.search.slice(1); - this.parameterNames.splice(0,this.parameterNames.length); - this.parameterValues.splice(0,this.parameterValues.length); - - for (let filter of filters){ - var filterLimits=""; - if(filter.countSelectedValues > 0){ - for (let value of filter.values){ - if(value.selected == true){ - filterLimits+=((filterLimits.length == 0)?'':',') +'"'+ StringUtils.URIEncode(value.id)+'"'; - } - } - this.queryParameters[filter.filterId]=filterLimits; - if(filterLimits.length > 0){ - this.parameterNames.push(filter.filterId); - this.parameterValues.push(filterLimits); - } - allLimits+=(allLimits.length==0?"?":"&")+((filterLimits.length == 0 )?'':filter.filterId + '='+ filterLimits) ; - } - } - if(this.searchUtils.keyword.length > 0 ){ - allLimits+=(allLimits.length==0?"?":"&")+'fv0=' + this.searchUtils.keyword; - this.parameterNames.push("fv0"); - this.parameterValues.push(this.searchUtils.keyword); - } - - return allLimits; - } - - public isFiltered(){ - var filtered=false; - for (let filter of this.filters){ - if(filter.countSelectedValues > 0){ - filtered = true; - break; - } - } - if(this.searchUtils.keyword.length > 0 ){ - filtered = true; - } - return filtered; - } - private clearKeywords(){ - if(this.searchUtils.keyword.length > 0 ){ - this.searchUtils.keyword =''; - } - this.goTo(1); - } - private clearFilters(){ - for (var i =0 ; i < this.filters.length; i++) { - for (var j=0; j < this.filters[i].values.length; j++) { - if(this.filters[i].values[j].selected) { - this.filters[i].values[j].selected = false; - } - } - this.filters[i].countSelectedValues = 0; - } - } - - private removeFilter(value:Value,filter:Filter){ - filter.countSelectedValues--; - if(value.selected == true){ - value.selected = false; - } - this.goTo(1); - } - goTo(page:number = 1){ - - this.searchUtils.page=page; - var table = $('#dpTable').DataTable(); - - table.page( page - 1 ).draw( false ); - - // Object { page: 0, pages: 3, start: 0, end: 10, length: 10, recordsTotal: 28, recordsDisplay: 21, serverSide: false } - var info = table.page.info(); - this.searchUtils.totalResults = info.recordsDisplay; - - var urlParameters = this.createUrlParameters(this.filters,true); - this.location.go(location.pathname,urlParameters); - } - - filterChanged($event){ - this.goTo(1); - } - keywordChanged($event) { - this.searchUtils.keyword = $event.value; - this.goTo(1); - } - - sizeChanged($event) { - this.searchUtils.size = $event; - var table = $('#dpTable').DataTable(); - table.page.len( this.searchUtils.size ).draw(); - this.goTo(1); - } -/* - downloadClicked($event) { - if($event.value == true) { - var queryParameters = this.createSearchQueryParameters(this.filters); - - this.downloadClick.emit({ - value: queryParameters - }); - } - } -*/ - - - getSelectedValues(filter):any{ - var selected = []; - if(filter.countSelectedValues >0){ - for (var i=0; i < filter.values.length; i++){ - if(filter.values[i].selected){ - selected.push(filter.values[i]); - } - } - } - return selected; - - } - /* - Trigger a table draw in order to get the initial filtering - */ - triggerInitialLoad(){ - setTimeout(function(){ - var table = $('#dpTable').DataTable(); - table.page( 0 ).draw( false ); - - }, 500); - } - -/* -Transform initial - not filtered results to get the filtered number -*/ - transform(results, searchUtils:SearchUtilsClass = null ): any { - if(searchUtils!=null) { - this.searchUtils = searchUtils; - } - if(results.length > 0) { - var errorCodes:ErrorCodes = new ErrorCodes(); - this.searchUtils.status = errorCodes.LOADING; - - var result = results.filter(row=>this.filterAll(row, this.searchUtils.keyword.toLowerCase(),this.filters)); - - let oldTotal = this.searchUtils.totalResults; - //console.info(result); - this.searchUtils.totalResults = result.length; - - var errorCodes:ErrorCodes = new ErrorCodes(); - this.searchUtils.status = errorCodes.DONE; - if(this.searchUtils.totalResults == 0 ){ - //this.searchUtils.status = errorCodes.NONE; - } - - // if(oldTotal != this.searchUtils.totalResults) { - // args[3].detectChanges(); - // } - return result; - } - return []; - } - - filterAll(row: any, query: string, filters:Filter[]) { - let returnValue: boolean = false; - - if(query) { - if(row.title && row.title.name.toLowerCase().indexOf(query) > -1) { - returnValue = true; - } - - if(row.type && row.type.toLowerCase().indexOf(query) > -1) { - returnValue = true; - } - - if(row.countries && row.countries.length > 0) { - for(let country of row.countries) { - if(country.toLowerCase().indexOf(query) > -1) { - returnValue = true; - break; - } - } - } - - if(row.compatibility && row.compatibility.toLowerCase().indexOf(query) > -1) { - returnValue = true; - } - - if(row.organizations && row.organizations.length > 0) { - for(let organization of row.organizations) { - if(organization.name.toLowerCase().indexOf(query) > -1) { - returnValue = true; - break; - } - } - } - - if(row.name && row.name.toLowerCase().indexOf(query) > -1) { - returnValue = true; - } - - if(row.acronym && row.acronym.toLowerCase().indexOf(query) > -1) { - returnValue = true; - } - - if(row.grantId && row.grantId.toLowerCase().indexOf(query) > -1) { - returnValue = true; - } - - if(row.funder && row.funder.toLowerCase().indexOf(query) > -1) { - returnValue = true; - } - - if(!returnValue) { - return false; - } - } - - for (let filter of filters){ - if(filter.countSelectedValues > 0){ - for (let value of filter.values){ - if(value.selected == true){ - - // make it generic in future commit - let field:string = ""; - /* - let index: number = -1; - for(let i=0; i -1){ - return true; - }else{ - return false; - } - } - filterData(row: any, query: string, filters:Filter[]) { - - - let returnValue: boolean = false; - - if(query) { - for(var i=0; i 0){ - for (let value of filter.values){ - if(value.selected == true){ - let field = 1; - /*if(filter.title == "Type") { - field = 1; - } else if(filter.title == "Compatibility Level") { - field = 4; - } else if(filter.title == "Funder") { - field = 3 - }*/ - for(let i=0; i 0){ - filters+=filter.countSelectedValues; - } - } - return filters; - } - private getPageContents() { - this.subscriptions.push(this.helper.getPageHelpContents(this.properties, (this.customFilter) ? this.customFilter.valueId : null, this.router.url).subscribe(contents => { - - this.pageContents = contents; - })); - } -} diff --git a/searchPages/searchUtils/searchPageTableView.module.ts b/searchPages/searchUtils/searchPageTableView.module.ts deleted file mode 100644 index ee12e619..00000000 --- a/searchPages/searchUtils/searchPageTableView.module.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { RouterModule } from '@angular/router'; - -import{SearchPageTableViewComponent} from './searchPageTableView.component'; -import{SearchFormModule} from './searchForm.module'; -import{SearchResultsModule} from './searchResults.module'; -import {SearchFilterModule} from './searchFilter.module'; -import{LoadingModalModule} from '../../utils/modal/loadingModal.module'; -import {ReportsServiceModule} from '../../services/reportsService.module'; -import{SearchPagingModule} from './searchPaging.module'; -import {SearchDownloadModule} from './searchDownload.module'; -import {ModalModule} from '../../utils/modal/modal.module'; -import {PagingModule} from '../../utils/paging.module'; -import {SearchResultsPerPageModule} from './searchResultsPerPage.module'; -import {DataTablesModule} from 'angular-datatables'; - -import {PiwikServiceModule} from '../../utils/piwik/piwikService.module'; -import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard'; - -import {HelperModule} from '../../utils/helper/helper.module'; -import {ErrorMessagesModule} from '../../utils/errorMessages.module'; -import {Schema2jsonldModule} from '../../sharedComponents/schema2jsonld/schema2jsonld.module'; -import { SEOServiceModule } from '../../sharedComponents/SEO/SEOService.module'; -import {AdvancedSearchFormModule} from "./advancedSearchForm.module"; -import {EntitiesSelectionModule} from "./entitiesSelection.module"; -import {BreadcrumbsModule} from "../../utils/breadcrumbs/breadcrumbs.module"; - - -@NgModule({ - imports: [ - CommonModule, FormsModule, RouterModule, SearchFormModule, SearchResultsModule, LoadingModalModule, - ReportsServiceModule, SearchPagingModule, SearchDownloadModule, ModalModule, PagingModule, - DataTablesModule, SearchFilterModule, PiwikServiceModule, HelperModule, ErrorMessagesModule, - Schema2jsonldModule, SEOServiceModule, SearchResultsPerPageModule, AdvancedSearchFormModule, EntitiesSelectionModule, BreadcrumbsModule - ], - declarations: [ - SearchPageTableViewComponent -], - - providers:[ - PreviousRouteRecorder - ], - exports: [ - SearchPageTableViewComponent - ] -}) -export class SearchPageTableViewModule { } diff --git a/utils/result-preview/result-preview.component.html b/utils/result-preview/result-preview.component.html index ef5bb817..2fac6c25 100644 --- a/utils/result-preview/result-preview.component.html +++ b/utils/result-preview/result-preview.component.html @@ -23,7 +23,7 @@
diff --git a/utils/result-preview/result-preview.component.ts b/utils/result-preview/result-preview.component.ts index d0d22e02..a342193e 100644 --- a/utils/result-preview/result-preview.component.ts +++ b/utils/result-preview/result-preview.component.ts @@ -42,7 +42,12 @@ export class ResultPreviewComponent implements OnInit, OnChanges { this.urlParam = "orpId"; this.url = properties.searchLinkToOrp.split('?')[0]; } else if (this.result.resultType == "project") { - this.urlParam = "projectId"; + if(this.result.id) { + this.urlParam = "projectId"; + }else if(this.result.code && this.result.funderShortname){ + this.result.id = this.result.code; + this.urlParam = "grantId"; + } this.url = properties.searchLinkToProject.split('?')[0]; } else if (this.result.resultType == "organization") { this.urlParam = "organizationId"; @@ -140,4 +145,12 @@ export class ResultPreviewComponent implements OnInit, OnChanges { this.modal.cancel(); } } + createParam(){ + if(this.urlParam == "grantId" ){ + return this.routerHelper.createQueryParams([this.urlParam,"funder"],[this.result.id,this.result.funderShortname]) + + } + return this.routerHelper.createQueryParam(this.urlParam,this.result.id) + + } }