MaDgIK
/
explore-services
13
0
Fork 0
Code Issues Pull Requests Projects Releases 22 Wiki Activity

Missing Files for previous commit: Deposit Pages for 'Publications' and 'R3data' Repositories seperated | subjects categorized by taxonomy added in dataset landing page 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@44407 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
konstantina.galouni 2016-11-08 16:20:24 +00:00
parent 6620306760
commit 0b6839b702
8 changed files with 78 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
portal-2/src/app/deposit/depositDatasets.component.ts Normal file
View File

@ -0,0 +1,12 @@
import {Component} from '@angular/core';
@Component({
selector: 'deposit-datasets',
template: `
<deposit [compatibility]="'Registry of Research Data Repository'" [requestFor]="'Datasets'"></deposit>
`
})
export class DepositDatasetsComponent {
}

12
portal-2/src/app/deposit/depositDatasetsResult.component.ts Normal file
View File

@ -0,0 +1,12 @@
import {Component} from '@angular/core';
@Component({
selector: 'deposit-datasets-result',
template: `
<deposit-result [compatibility]="'Registry of Research Data Repository'" [requestFor]="'Datasets'"></deposit-result>
`
})
export class DepositDatasetsResultComponent {
}

12
portal-2/src/app/deposit/depositPublications.component.ts Normal file
View File

@ -0,0 +1,12 @@
import {Component} from '@angular/core';
@Component({
selector: 'deposit-publications',
template: `
<deposit [compatibility]="'OpenDOAR'" [requestFor]="'Publications'"></deposit>
`
})
export class DepositPublicationsComponent {
}

12
portal-2/src/app/deposit/depositPublicationsResult.component.ts Normal file
View File

@ -0,0 +1,12 @@
import {Component} from '@angular/core';
@Component({
selector: 'deposit-publications-result',
template: `
<deposit-result [compatibility]="'OpenDOAR'" [requestFor]="'Publications'"></deposit-result>
`
})
export class DepositPublicationsResultComponent {
}

5
portal-2/src/app/landingPages/dataset/dataset.component.html
View File

@ -24,7 +24,10 @@
<dd *ngIf="datasetInfo.embargoEndDate != undefined && datasetInfo.embargoEndDate != ''">{{datasetInfo.embargoEndDate}}</dd>
<showIdentifiers [identifiers]="datasetInfo.identifiers"></showIdentifiers>
<showSubjects [subjects]="datasetInfo.subjects" [classifiedSubjects]="datasetInfo.classifiedSubjects"></showSubjects>
<showSubjects [subjects]="datasetInfo.subjects"
[otherSubjects]="datasetInfo.otherSubjects"
[classifiedSubjects]="datasetInfo.classifiedSubjects">
</showSubjects>
</dl>
<blockquote *ngIf="datasetInfo.description != ''">

34
portal-2/src/app/services/dataset.service.ts
View File

@ -349,26 +349,40 @@ export class DatasetService {
}
if(data[5] != null) {
this.datasetInfo.classifiedSubjects = new Map<string, string[]>();
this.datasetInfo.subjects = new Array<string>();
let mydata;
let length = data[5].length!=undefined ? data[5].length : 1;
let length = data[7].length!=undefined ? data[5].length : 1;
for(let i=0; i<length; i++) {
mydata = length > 1 ? data[5][i] : data[5];
if(mydata.classid != "") {
if(mydata.inferred == true) {
if(!this.datasetInfo.classifiedSubjects.has(mydata.classid)) {
this.datasetInfo.classifiedSubjects.set(mydata.classid, new Array<string>());
if(this.datasetInfo.classifiedSubjects == undefined) {
this.datasetInfo.classifiedSubjects = new Map<string, string[]>();
}
let counter = this.datasetInfo.classifiedSubjects.get(mydata.classid).length;
this.datasetInfo.classifiedSubjects.get(mydata.classid)[counter] = mydata.content;
if(!this.datasetInfo.classifiedSubjects.has(mydata.classname)) {
this.datasetInfo.classifiedSubjects.set(mydata.classname, new Array<string>());
}
this.datasetInfo.classifiedSubjects.get(mydata.classname).push(mydata.content);
} else {
let counter = this.datasetInfo.subjects.length;
this.datasetInfo.subjects[counter] = mydata.content;
if(mydata.classid == "keyword") {
if(this.datasetInfo.subjects == undefined) {
this.datasetInfo.subjects = new Array<string>();
}
this.datasetInfo.subjects.push(mydata.content);
} else {
if(this.datasetInfo.otherSubjects == undefined) {
this.datasetInfo.otherSubjects = new Map<string, string[]>();
}
if(!this.datasetInfo.otherSubjects.has(mydata.classname)) {
this.datasetInfo.otherSubjects.set(mydata.classname, new Array<string>());
}
this.datasetInfo.otherSubjects.get(mydata.classname).push(mydata.content);
}
}
}
}

3
portal-2/src/app/services/publication.service.ts
View File

@ -424,8 +424,7 @@ export class PublicationService {
this.publicationInfo.subjects = new Array<string>();
}
let counter = this.publicationInfo.subjects.length;
this.publicationInfo.subjects[counter] = mydata.content;
this.publicationInfo.subjects.push(mydata.content);
} else {
if(this.publicationInfo.otherSubjects == undefined) {
this.publicationInfo.otherSubjects = new Map<string, string[]>();

5
portal-2/src/app/utils/entities/datasetInfo.ts
View File

@ -9,6 +9,7 @@ export class DatasetInfo {
identifiers: Map<string, string[]>;
publisher: string;
subjects: string[];
otherSubjects: Map<string, string[]>;
classifiedSubjects: Map<string, string[]>;
description: string;
bestlicense: string;
@ -16,10 +17,6 @@ export class DatasetInfo {
fundedByProjects: { "url": string, "acronym": string, "title": string,
"funderShortname": string, "funderName": string,
"funding": string, "inline": boolean}[];
//relatedPublications: { "name": string, "url": string, "date": string, "trust": string}[];
//relatedResearchData: { "name": string, "url": string, "date": string, "trust": string}[];
//similarPublications: { "name": string, "url": string, "date": string, "trust": string}[];
//similarDatasets: { "name": string, "url": string, "date": string, "trust": string}[];
relatedResearchResults: { "name": string, "url": string, "date": string, "trust": string, "class": string}[];
similarResearchResults: {"name": string, "url": string, "date": string, "trust": string, "class": string}[];
contexts: { "labelContext": string, "labelCategory": string, "labelConcept": string, "inline": boolean}[];