@@ -125,6 +133,12 @@
+
+
+ Recent other research products
+
+
+
diff --git a/src/app/community/community.component.ts b/src/app/community/community.component.ts
index 3e6043f..bde3c4e 100644
--- a/src/app/community/community.component.ts
+++ b/src/app/community/community.component.ts
@@ -34,6 +34,7 @@ export class CommunityComponent {
public publicationTotal = null;
public researchDataTotal = null;
public softwareTotal = null;
+ public orpTotal = null;
public projectTotal = null;
public contentProviderTotal = null;
public organizationTotal = null;
@@ -44,6 +45,7 @@ export class CommunityComponent {
public publicationResults = null;
public researchDataResults = null;
public softwareResults = null;
+ public orpResults = null;
@Input() communityId = null;
public community = null;
@@ -89,8 +91,8 @@ export class CommunityComponent {
if (this.communityId != null && this.communityId != '') {
this._communityService.getCommunity(this.properties, this.properties.communityAPI+this.communityId).subscribe (
community => {
- this.community = community;
- this.params = {communityId: community.communityId};
+ this.community = community;
+ this.params = {communityId: community.communityId};
this._meta.updateTag({content:community.description},"name='description'");
this._meta.updateTag({content:community.description},"property='og:description'");
this._meta.updateTag({content:community.title},"property='og:title'");
@@ -143,6 +145,17 @@ export class CommunityComponent {
}
});
+ this._searchEntriesService.getTotal(this.properties.searchAPIURLLAst+'other/count?format=json&fq=communityid='+this.communityId).subscribe(
+ orpTotal => {
+ this.orpTotal = orpTotal;
+ if (this.orpTotal > 0) {
+ this._searchEntriesService.getResults(this.properties.searchAPIURLLAst+'other?fq=communityid%20exact%20%22'+this.communityId+'%22&sortBy=resultdateofacceptance,descending&format=json&size=5').subscribe(
+ orpResults => {
+ this.orpResults = orpResults;
+ });
+ }
+ });
+
this._searchEntriesService.countTotal(this.properties.communityAPI+this.communityId+'/projects').subscribe(
projectTotal => {
this.projectTotal = projectTotal;
diff --git a/src/app/landingPages/orp/libOrp.module.ts b/src/app/landingPages/orp/libOrp.module.ts
new file mode 100644
index 0000000..37071c4
--- /dev/null
+++ b/src/app/landingPages/orp/libOrp.module.ts
@@ -0,0 +1,29 @@
+//import {MaterialModule} from '@angular/material';
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {FormsModule} from '@angular/forms';
+import {RouterModule} from '@angular/router';
+
+import {SharedModule} from '../../shared/shared.module';
+import {OrpModule} from '../../openaireLibrary/landingPages/orp/orp.module';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+import {OpenaireOrpComponent} from './orp.component';
+import {OrpRoutingModule} from './orp-routing.module';
+
+@NgModule({
+ imports: [
+ OrpModule, OrpRoutingModule
+ ],
+ declarations: [
+ OpenaireOrpComponent
+ ],
+ providers: [
+ FreeGuard, PreviousRouteRecorder, IsRouteEnabled
+ ],
+ exports: [
+ OpenaireOrpComponent
+ ]
+})
+export class LibOrpModule { }
diff --git a/src/app/landingPages/orp/orp-routing.module.ts b/src/app/landingPages/orp/orp-routing.module.ts
new file mode 100644
index 0000000..1f6ffac
--- /dev/null
+++ b/src/app/landingPages/orp/orp-routing.module.ts
@@ -0,0 +1,20 @@
+import {NgModule} from '@angular/core';
+import {RouterModule} from '@angular/router';
+
+import {OpenaireOrpComponent } from './orp.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+@NgModule({
+ imports: [
+ RouterModule.forChild([{
+ path: '', component: OpenaireOrpComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+ redirect: '/error'
+ },
+ canDeactivate: [PreviousRouteRecorder]
+ }])
+ ]
+})
+
+export class OrpRoutingModule { }
diff --git a/src/app/landingPages/orp/orp.component.ts b/src/app/landingPages/orp/orp.component.ts
new file mode 100644
index 0000000..94f25de
--- /dev/null
+++ b/src/app/landingPages/orp/orp.component.ts
@@ -0,0 +1,20 @@
+import {Component, ViewChild, ElementRef} from '@angular/core';
+import {PiwikHelper} from '../../utils/piwikHelper';
+import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
+
+@Component({
+ selector: 'openaire-orp',
+ template: `
`,
+})
+
+export class OpenaireOrpComponent {
+ piwikSiteId = null;
+ constructor ( ) {
+ var communityId = ConnectHelper.getCommunityFromDomain(document.location.hostname);
+ this.piwikSiteId = PiwikHelper.siteIDs[communityId];
+ }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/src/app/searchEntries/results/results.component.ts b/src/app/searchEntries/results/results.component.ts
index d3aed0c..6713dbc 100644
--- a/src/app/searchEntries/results/results.component.ts
+++ b/src/app/searchEntries/results/results.component.ts
@@ -23,9 +23,13 @@ import { CommunityInfo } from '../../openaireLibrary/connect/community/community
{{item.title}}
+