MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

dmp&dataset overview: orcid path for researcher fixed

This commit is contained in:
gpapavgeri 2020-07-10 18:28:10 +03:00
parent 872e80d4b7
commit 09f207eb6e
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html
View File

@ -76,7 +76,7 @@
<div class="row header">{{'DMP-OVERVIEW.RESEARCHERS' | translate}}</div> <div class="row header">{{'DMP-OVERVIEW.RESEARCHERS' | translate}}</div>
<div class="row"> <div class="row">
<div *ngFor="let researcher of researchers; let last = last"> <div *ngFor="let researcher of researchers; let last = last">
<a href="{{ getOrcidPath() + researcher.id }}" target="blank" class="researcher"> <a href="{{ getOrcidPathForResearcher(researcher.reference) }}" target="blank" class="researcher">
<div class="id-btn">&nbsp;</div> <div class="id-btn">&nbsp;</div>
<div *ngIf="!last">{{ researcher.name }}, </div> <div *ngIf="!last">{{ researcher.name }}, </div>
<div *ngIf="last">{{ researcher.name }}</div> <div *ngIf="last">{{ researcher.name }}</div>

6
dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts
View File

@ -303,6 +303,12 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
return this.configurationService.orcidPath; return this.configurationService.orcidPath;
} }
getOrcidPathForResearcher(reference: string): string {
const path = this.getOrcidPath();
const userId = reference.split(':')[1];
return path + userId;
}
downloadPDF(id: string) { downloadPDF(id: string) {
this.datasetService.downloadPDF(id) this.datasetService.downloadPDF(id)
.pipe(takeUntil(this._destroyed)) .pipe(takeUntil(this._destroyed))

2
dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
View File

@ -63,7 +63,7 @@
<div class="row header">{{'DMP-OVERVIEW.RESEARCHERS' | translate}}</div> <div class="row header">{{'DMP-OVERVIEW.RESEARCHERS' | translate}}</div>
<div class="row"> <div class="row">
<div *ngFor="let researcher of dmp.researchers; let last = last"> <div *ngFor="let researcher of dmp.researchers; let last = last">
<a href="{{ getOrcidPath() + researcher.id}}" target="blank" class="researcher"> <a href="{{ getOrcidPathForResearcher(researcher.reference) }}" target="blank" class="researcher">
<div class="id-btn">&nbsp;</div> <div class="id-btn">&nbsp;</div>
<div *ngIf="!last">{{ researcher.name }}, </div> <div *ngIf="!last">{{ researcher.name }}, </div>
<div *ngIf="last">{{ researcher.name }}</div> <div *ngIf="last">{{ researcher.name }}</div>

12
dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
View File

@ -584,9 +584,9 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
reloadPage(): void { reloadPage(): void {
this.router.navigateByUrl('/plans', { skipLocationChange: true }).then(() => { this.router.navigateByUrl('/plans', { skipLocationChange: true }).then(() => {
this.router.navigate([`/plans/overview/${this.dmp.id}`]); this.router.navigate([`/plans/overview/${this.dmp.id}`]);
}); });
} }
updateUsers() { updateUsers() {
return this.dmpService.updateUsers(this.dmp.id, this.dmp.users).pipe(takeUntil(this._destroyed)) return this.dmpService.updateUsers(this.dmp.id, this.dmp.users).pipe(takeUntil(this._destroyed))
@ -594,7 +594,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
complete => { complete => {
this.onCallbackSuccess(); this.onCallbackSuccess();
this.reloadPage(); this.reloadPage();
}, },
error => this.onDeleteCallbackError(error) error => this.onDeleteCallbackError(error)
); );
} }
@ -632,6 +632,12 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
return this.configurationService.orcidPath; return this.configurationService.orcidPath;
} }
getOrcidPathForResearcher(reference: string): string {
const path = this.getOrcidPath();
const userId = reference.split(':')[1];
return path + userId;
}
checkLockStatus(id: string) { checkLockStatus(id: string) {
this.lockService.checkLockStatus(id).pipe(takeUntil(this._destroyed)) this.lockService.checkLockStatus(id).pipe(takeUntil(this._destroyed))
.subscribe(lockStatus => this.lockStatus = lockStatus); .subscribe(lockStatus => this.lockStatus = lockStatus);