diff --git a/landingPages/organization/organization.component.ts b/landingPages/organization/organization.component.ts
index 3d8f495d..bd1bd95e 100644
--- a/landingPages/organization/organization.component.ts
+++ b/landingPages/organization/organization.component.ts
@@ -9,7 +9,6 @@ import {SearchResearchResultsService} from '../../services/searchResearchResults
import {SearchDataprovidersService} from '../../services/searchDataproviders.service';
import {SearchProjectsService} from '../../services/searchProjects.service';
import {ErrorCodes} from '../../utils/properties/errorCodes';
-import {ProjectsInModalComponent} from '../landing-utils/projects-in-modal.component';
import {RouterHelper} from '../../utils/routerHelper.class';
import {ModalLoading} from '../../utils/modal/loading.component';
@@ -20,6 +19,8 @@ import {SEOService} from '../../sharedComponents/SEO/SEO.service';
import {HelperFunctions} from "../../utils/HelperFunctions.class";
import {HelperService} from "../../utils/helper/helper.service";
import {Location} from "@angular/common";
+import {FetchResearchResults} from "../../utils/fetchEntitiesClasses/fetchResearchResults.class";
+import {FetchDataproviders} from "../../utils/fetchEntitiesClasses/fetchDataproviders.class";
interface Total {
publications: number;
@@ -49,7 +50,6 @@ export class OrganizationComponent {
// CSV variables
public downloadURLAPI: string;
public csvProjectParamsHead: string;
- public csvPublicationParamsHead: string;
public csvParamsTail: string;
// Active tab variable for responsiveness
@@ -65,10 +65,16 @@ export class OrganizationComponent {
dataproviders: 0
};
public fetchProjects: FetchProjects;
+ public fetchPublications: FetchResearchResults;
+ public fetchDatasets: FetchResearchResults;
+ public fetchSoftware: FetchResearchResults;
+ public fetchOrps: FetchResearchResults;
+ public fetchDataproviders: FetchDataproviders
+ public searchNumber: number = 5;
+
+
@ViewChild('downloadReportModal') downloadReportModal;
@ViewChild('downloadFunderReportModal') downloadFunderReportModal;
- // Variables for projects query (query results only if projects tab is clicked)
- @ViewChild(ProjectsInModalComponent) projectsInModalComponent: ProjectsInModalComponent;
@ViewChild(ModalLoading) loading: ModalLoading;
// Alert box when CSV: Project Publications for a funder is requested
@@ -534,14 +540,6 @@ export class OrganizationComponent {
this.alertModalDeletedByInference.open();
}
- openProjectsModal() {
- this.projectsInModalComponent.pageChange({value: 1});
- this.projectsModal.cancelButton = false;
- this.projectsModal.okButton = false;
- this.projectsModal.alertTitle = "Projects of";
- this.projectsModal.open();
- }
-
public getTypeParam(type: string): string {
if(type == 'results') {
type = 'publications&type=datasets&type=software&type=other';
diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html
index 8bed084b..0268a15b 100644
--- a/landingPages/result/resultLanding.component.html
+++ b/landingPages/result/resultLanding.component.html
@@ -126,7 +126,7 @@