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

Merge branch 'master' of code-repo.d4science.org:MaDgIK/monitor-dashboard

This commit is contained in:
argirok 2022-10-17 12:44:57 +03:00
parent 7347a06eea 44427dba5f
commit 1e2a7cff85
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,7 +76,7 @@
<li class="uk-nav-divider"></li> <li class="uk-nav-divider"></li>
<ng-template ngFor [ngForOf]="stakeholderUtils.visibility" let-v> <ng-template ngFor [ngForOf]="stakeholderUtils.visibility" let-v>
<li [class.uk-active]="stakeholder.visibility === v.value"> <li [class.uk-active]="stakeholder.visibility === v.value">
<a (click)="changeStakeholderStatus(stakeholder, v.value);"> <a (click)="changeStakeholderStatus(stakeholder, v.value);hide(element)">
<div class="uk-flex uk-flex-middle"> <div class="uk-flex uk-flex-middle">
<icon [flex]="true" [name]="v.icon" ratio="0.6"></icon> <icon [flex]="true" [name]="v.icon" ratio="0.6"></icon>
<span class="uk-margin-small-left uk-width-expand">{{v.label}}</span> <span class="uk-margin-small-left uk-width-expand">{{v.label}}</span>

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

@ -251,8 +251,8 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy {
let path = [ let path = [
stakeholder._id stakeholder._id
]; ];
this.subscriptions.push(this.stakeholderService.changeVisibility(this.properties.monitorServiceAPIURL, path, visibility).subscribe(visibility => { this.subscriptions.push(this.stakeholderService.changeVisibility(this.properties.monitorServiceAPIURL, path, visibility).subscribe(returnedElement => {
stakeholder.visibility = visibility; stakeholder.visibility = returnedElement.visibility;
UIkit.notification(stakeholder.name+ '\'s status has been <b>successfully changed</b> to ' + stakeholder.visibility.toLowerCase(), { UIkit.notification(stakeholder.name+ '\'s status has been <b>successfully changed</b> to ' + stakeholder.visibility.toLowerCase(), {
status: 'success', status: 'success',
timeout: 6000, timeout: 6000,

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit 032b91ae7a78ccad72a3a02a9463f6df5d00d223 Subproject commit ea935df5b762501f16b8c214dc311b2155b549f4

2
src/app/topic/indicators.component.html
View File

@ -50,7 +50,7 @@
</ng-container> </ng-container>
<ng-template ngFor [ngForOf]="stakeholderUtils.visibility" let-v> <ng-template ngFor [ngForOf]="stakeholderUtils.visibility" let-v>
<li> <li>
<a (click)="changeIndicatorStatus(number._id, indicator, v.value);"> <a (click)="changeIndicatorStatus(number._id, indicator, v.value);hide(element)">
<div class="uk-flex uk-flex-middle"> <div class="uk-flex uk-flex-middle">
<icon [flex]="true" [name]="v.icon" ratio="0.6"></icon> <icon [flex]="true" [name]="v.icon" ratio="0.6"></icon>
<span class="uk-margin-small-left uk-width-expand">{{v.label}}</span> <span class="uk-margin-small-left uk-width-expand">{{v.label}}</span>

4
src/app/topic/indicators.component.ts
View File

@ -1029,8 +1029,8 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
sectionId, sectionId,
indicator._id indicator._id
]; ];
this.subscriptions.push(this.stakeholderService.changeVisibility(this.properties.monitorServiceAPIURL, path, visibility).subscribe(visibility => { this.subscriptions.push(this.stakeholderService.changeVisibility(this.properties.monitorServiceAPIURL, path, visibility).subscribe(returnedElement => {
indicator.visibility = visibility; indicator.visibility = returnedElement.visibility;
UIkit.notification('Indicator has been <b>successfully changed</b> to ' + indicator.visibility.toLowerCase(), { UIkit.notification('Indicator has been <b>successfully changed</b> to ' + indicator.visibility.toLowerCase(), {
status: 'success', status: 'success',
timeout: 6000, timeout: 6000,

2
src/assets/common-assets

@ -1 +1 @@
Subproject commit 14655ae3aa7a50162ef218428a0ccdee35c1aa7b Subproject commit 2de3f625b772a264acb0579126b2bfce42778d0c

2
src/assets/openaire-theme

@ -1 +1 @@
Subproject commit bc0edde68dccfc17c1abc5d5aa3721f720aee852 Subproject commit f902074e00e01165f489e2fef12aad6551c03ccd

12
src/environments/environment.ts
View File

@ -55,16 +55,16 @@ export let properties: EnvProperties = {
piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
piwikSiteId: "80", piwikSiteId: "80",
registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/', registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/',
loginUrl: "http://mpagasas.di.uoa.gr:8080/login-service/openid_connect_login", loginUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_connect_login",
userInfoUrl: "http://mpagasas.di.uoa.gr:8080/login-service/userInfo", userInfoUrl: "http://mpagasas.di.uoa.gr:19080/login-service/userInfo",
logoutUrl: "http://mpagasas.di.uoa.gr:8080/login-service/openid_logout", logoutUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_logout",
cookieDomain: ".di.uoa.gr", cookieDomain: ".di.uoa.gr",
feedbackmail: "openaire.test@gmail.com", feedbackmail: "openaire.test@gmail.com",
cacheUrl: "http://scoobydoo.di.uoa.gr:3000/get?url=", cacheUrl: "http://scoobydoo.di.uoa.gr:3000/get?url=",
// monitorServiceAPIURL: "https://services.openaire.eu/uoa-monitor-service", // monitorServiceAPIURL: "https://services.openaire.eu/uoa-monitor-service",
monitorServiceAPIURL: "http://duffy.di.uoa.gr:8080/uoa-monitor-service", monitorServiceAPIURL: "http://duffy.di.uoa.gr:19380/uoa-monitor-service",
adminToolsAPIURL: "http://duffy.di.uoa.gr:8080/uoa-monitor-service/", adminToolsAPIURL: "http://duffy.di.uoa.gr:19380/uoa-monitor-service/",
notificationsAPIURL: "http://duffy.di.uoa.gr:8080/uoa-monitor-service/notification/", notificationsAPIURL: "http://duffy.di.uoa.gr:19380/uoa-monitor-service/notification/",
adminToolsCommunity: "monitor", adminToolsCommunity: "monitor",
useHelpTexts: true, useHelpTexts: true,
datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/", datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/",