-
-
50
-
Research Outcomes
+
+
+
+
\ No newline at end of file
diff --git a/explore/src/app/sdg/sdg.component.ts b/explore/src/app/sdg/sdg.component.ts
index 6b74068b..51863c12 100644
--- a/explore/src/app/sdg/sdg.component.ts
+++ b/explore/src/app/sdg/sdg.component.ts
@@ -1,28 +1,55 @@
import {HttpClient} from "@angular/common/http";
-import {Component, OnInit} from "@angular/core";
+import {Component, OnDestroy, OnInit} from "@angular/core";
+import {Subscription} from "rxjs";
import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
+import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties";
+import {properties} from "src/environments/environment";
+import {RefineFieldResultsService} from "../openaireLibrary/services/refineFieldResults.service";
@Component({
selector: 'sdg',
templateUrl: 'sdg.component.html',
styleUrls: ['sdg.component.css']
})
-export class SdgComponent implements OnInit {
+export class SdgComponent implements OnInit, OnDestroy {
- public sdgs: any = [];
+ private sdgs: any = [];
+ private sdgsResearchOutcomes: any = [];
+ public displayedSdgs: any = [];
+ public loading: boolean;
+ properties: EnvProperties = properties;
public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'SDG'}];
+ subscriptions: Subscription[] = [];
+
constructor(
- private httpClient: HttpClient
+ private httpClient: HttpClient, private refineFieldResultsService: RefineFieldResultsService
) {}
ngOnInit() {
+ this.loading = true;
this.httpClient.get('/assets/vocabulary/sdg.json').subscribe(data => {
- // console.log(data['sdg']);
this.sdgs = data['sdg'];
- console.log(this.sdgs);
- })
+ });
+ this.refineFieldResultsService.getRefineFieldsResultsByEntityName(['sdg'], 'result', this.properties, null).subscribe(data => {
+ this.sdgsResearchOutcomes = data[1][0].values;
+ let merged =[];
+ for(let i=0; i
innerItem.id === this.sdgs[i].id))
+ });
+ }
+ this.displayedSdgs = merged;
+ this.loading = false;
+ });
}
+
+ public ngOnDestroy() {
+ for (let sub of this.subscriptions) {
+ sub.unsubscribe();
+ }
+ }
}
\ No newline at end of file
diff --git a/explore/src/app/sdg/sdg.module.ts b/explore/src/app/sdg/sdg.module.ts
index 330c5d85..560340a3 100644
--- a/explore/src/app/sdg/sdg.module.ts
+++ b/explore/src/app/sdg/sdg.module.ts
@@ -4,6 +4,8 @@ import {FormsModule} from "@angular/forms";
import {RouterModule} from "@angular/router";
import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
import {BreadcrumbsModule} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.module";
+import {RefineFieldResultsServiceModule} from "../openaireLibrary/services/refineFieldResultsService.module";
+import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
import {SdgRoutingModule} from './sdg-routing.module';
import {SdgComponent} from './sdg.component';
@@ -11,7 +13,8 @@ import {SdgComponent} from './sdg.component';
@NgModule({
imports: [
CommonModule, FormsModule, RouterModule,
- SdgRoutingModule, BreadcrumbsModule
+ SdgRoutingModule, BreadcrumbsModule, RefineFieldResultsServiceModule,
+ LoadingModule
],
declarations: [
SdgComponent
diff --git a/explore/src/assets/common-assets b/explore/src/assets/common-assets
index 776ba071..bbad5016 160000
--- a/explore/src/assets/common-assets
+++ b/explore/src/assets/common-assets
@@ -1 +1 @@
-Subproject commit 776ba07197e4cf73e98890bd4213a32183ea19d2
+Subproject commit bbad5016c9a712348c5056c3b2709e4baaf27d69
diff --git a/explore/src/assets/openaire-theme b/explore/src/assets/openaire-theme
index 3b700ea4..ca92c36b 160000
--- a/explore/src/assets/openaire-theme
+++ b/explore/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit 3b700ea4c14ba05d1f8c2cf3ef3253623eda55f3
+Subproject commit ca92c36bad13d0be11514abf7786f1e476ae7f5e