MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

plugins-functionality #43

Merged
argiro.kokogiannaki merged 86 commits from plugins-functionality into develop 2024-06-13 09:14:22 +02:00
Conversation 0 Commits 86 Files Changed 128 +21 -23
2 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1882ea10fa - Show all commits

1
dashboard/plugins/components/stats/monitor.component.ts
View File

@ -22,6 +22,7 @@ export class MonitorComponent extends MonitorIndicatorStakeholderBaseComponent {
stakeholder = null; stakeholder = null;
@Input() pluginObject: PluginStats; @Input() pluginObject: PluginStats;
profiles; profiles;
public chartsActiveType: Map<string, IndicatorPath> = new Map<string, IndicatorPath>();
constructor(protected _route: ActivatedRoute, constructor(protected _route: ActivatedRoute,
protected _router: Router, protected _router: Router,
protected _meta: Meta, protected _meta: Meta,

43
role-verification/role-verification.component.ts
View File

@ -152,11 +152,8 @@ export class RoleVerificationComponent extends BaseComponent implements OnInit,
relativeTo: this.relativeTo relativeTo: this.relativeTo
}); });
} }
} else if(this.isMember) {
this.openMemberModal();
} }
} else { } else {
this.isMember = false;
this.cdr.detectChanges(); this.cdr.detectChanges();
} }
}); });
@ -211,17 +208,17 @@ export class RoleVerificationComponent extends BaseComponent implements OnInit,
this.userManagementService.login(properties.domain + '/admin/' + this.verification.entity); this.userManagementService.login(properties.domain + '/admin/' + this.verification.entity);
} else { } else {
this.subscriptions.push(this.emailService.notifyManagers(this.id, 'manager', this.subscriptions.push(this.emailService.notifyManagers(this.id, 'manager',
Composer.composeEmailToInformOldManagersForTheNewOnes(this.name, this.id)).subscribe(() => { Composer.composeEmailToInformOldManagersForTheNewOnes(this.name, this.id)).subscribe(() => {
this.subscriptions.push(this.emailService.notifyNewManager(Composer.composeEmailForNewManager(this.id, this.name)).subscribe( this.subscriptions.push(this.emailService.notifyNewManager(Composer.composeEmailForNewManager(this.id, this.name)).subscribe(
() => { () => {
this.loading = false; this.loading = false;
window.location.href = properties.adminPortalURL + '/' + this.verification.entity; window.location.href = properties.adminPortalURL + '/' + this.verification.entity;
}, },
error1 => { error1 => {
console.error(error1); console.error(error1);
this.loading = false; this.loading = false;
window.location.href = properties.adminPortalURL + '/' + this.verification.entity; window.location.href = properties.adminPortalURL + '/' + this.verification.entity;
} }
)); ));
}, error => { }, error => {
console.error(error); console.error(error);
@ -237,16 +234,16 @@ export class RoleVerificationComponent extends BaseComponent implements OnInit,
public verifyMember() { public verifyMember() {
this.loading = true; this.loading = true;
this.subscriptions.push(this.userRegistryService.verify(this.verification.id, this.code.value, "member").subscribe(() => { this.subscriptions.push(this.userRegistryService.verify(this.verification.id, this.code.value, "member").subscribe(() => {
// this.clearCacheService.clearCache('Members updated'); // this.clearCacheService.clearCache('Members updated');
this.memberModal.cancel(); this.memberModal.cancel();
this.loading = false; this.loading = false;
this.error = null; this.error = null;
window.location.href = window.location.href.split('?')[0]; window.location.href = window.location.href.split('?')[0];
}, error => { }, error => {
this.loading = false; this.loading = false;
this.error = 'The verification code is invalid'; this.error = 'The verification code is invalid';
})); }));
} }
public reset() { public reset() {