MaDgIK
/
monitor-dashboard
13
0
Fork 0
Code Issues Pull Requests Projects Releases 21 Wiki Activity

add stakeholder entities as enum and update openaireLibrary repo

This commit is contained in:
Alex Martzios 2022-06-09 10:38:45 +03:00
parent bd8032fdb5
commit ae3ff6f9f2
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/manageStakeholders/manageStakeholders.component.html
View File

@ -48,7 +48,7 @@
<ng-container *ngTemplateOutlet="stakeholderBox; context: {stakeholder:stakeholder}"></ng-container> <ng-container *ngTemplateOutlet="stakeholderBox; context: {stakeholder:stakeholder}"></ng-container>
</ng-template> </ng-template>
<div *ngIf="!loading && isCurator()"> <div *ngIf="!loading && isCurator()">
<ng-container *ngTemplateOutlet="newBox; context: {text:'Create a new profile by selecting the type (Funder, Organization, Research Initiative or Project) and ' + <ng-container *ngTemplateOutlet="newBox; context: {text:'Create a new profile by selecting the type ('+stakeholderEntities.FUNDER+', '+stakeholderEntities.ORGANIZATION+', '+stakeholderEntities.RI+' or '+stakeholderEntities.PROJECT+') and ' +
'select indicators based on a default or a blank profile.', isDefault:false}"></ng-container> 'select indicators based on a default or a blank profile.', isDefault:false}"></ng-container>
</div> </div>
</div> </div>

3
src/app/manageStakeholders/manageStakeholders.component.ts
View File

@ -1,7 +1,7 @@
import {Component, OnDestroy, OnInit, ViewChild} from "@angular/core"; import {Component, OnDestroy, OnInit, ViewChild} from "@angular/core";
import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service"; import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service";
import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties"; import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties";
import {Stakeholder, Visibility} from "../openaireLibrary/monitor/entities/stakeholder"; import {Stakeholder, StakeholderEntities, Visibility} from "../openaireLibrary/monitor/entities/stakeholder";
import {Subscriber, zip} from "rxjs"; import {Subscriber, zip} from "rxjs";
import {StakeholderUtils} from "../utils/indicator-utils"; import {StakeholderUtils} from "../utils/indicator-utils";
import {FormBuilder, FormGroup} from "@angular/forms"; import {FormBuilder, FormGroup} from "@angular/forms";
@ -35,6 +35,7 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy {
public user = null; public user = null;
public stickyPageHeader: boolean = false; public stickyPageHeader: boolean = false;
public tab: Tab = 'all'; public tab: Tab = 'all';
public stakeholderEntities = StakeholderEntities;
/** /**
* Filtered Stakeholders * Filtered Stakeholders
*/ */

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit 86b78e12fdda81d8a90ed9393d34682d59aa0608 Subproject commit 73dae143f398ed46ef515086a1fc459046eccb60

11
src/app/utils/indicator-utils.ts
View File

@ -5,7 +5,8 @@ import {
SourceType, SourceType,
Stakeholder, Stakeholder,
SubCategory, SubCategory,
Topic, Visibility Topic, Visibility,
StakeholderEntities
} from "../openaireLibrary/monitor/entities/stakeholder"; } from "../openaireLibrary/monitor/entities/stakeholder";
import {AbstractControl, ValidatorFn, Validators} from "@angular/forms"; import {AbstractControl, ValidatorFn, Validators} from "@angular/forms";
import {Option} from "../openaireLibrary/sharedComponents/input/input.component"; import {Option} from "../openaireLibrary/sharedComponents/input/input.component";
@ -21,10 +22,10 @@ export class StakeholderUtils {
]; ];
types: Option[] = [ types: Option[] = [
{value: 'funder', label: 'Funder'}, {value: 'funder', label: StakeholderEntities.FUNDER},
{value: 'ri', label: 'Research Initiative'}, {value: 'ri', label: StakeholderEntities.RI},
{value: 'project', label: 'Project'}, {value: 'project', label: StakeholderEntities.PROJECT},
{value: 'organization', label: 'Organization'} {value: 'organization', label: StakeholderEntities.ORGANIZATION}
]; ];
visibility: Option[] = [ visibility: Option[] = [