Move Right
diff --git a/monitor-admin/topic/indicators.component.ts b/monitor-admin/topic/indicators.component.ts
index cb29946d..715fba78 100644
--- a/monitor-admin/topic/indicators.component.ts
+++ b/monitor-admin/topic/indicators.component.ts
@@ -102,7 +102,8 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
@ViewChild('editChartNotify', {static: true}) editChartNotify: NotifyFormComponent;
@ViewChild('deleteNotify', {static: true}) deleteNotify: NotifyFormComponent;
/* Transition Groups */
- @ViewChild('transitionGroup') transitionGroup: TransitionGroupComponent;
+ @ViewChild('numbersTransition') numbersTransition: TransitionGroupComponent;
+ @ViewChild('chartsTransition') chartsTransition: TransitionGroupComponent;
public isFullscreen: boolean = false;
@@ -590,7 +591,7 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
public removeNumberIndicatorPath(index: number) {
this.numberIndicatorPaths.removeAt(index);
this.indicator.indicatorPaths.splice(index, 1);
- this.transitionGroup.init();
+ this.numbersTransition.init();
if (this.indicator.activePath === index) {
this.activeNumberIndicatorPath(Math.max(0, index - 1));
} else if (this.indicator.activePath > index) {
@@ -602,7 +603,7 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
public removeChartIndicatorPath(index: number) {
this.chartIndicatorPaths.removeAt(index);
this.indicator.indicatorPaths.splice(index, 1);
- this.transitionGroup.init();
+ this.chartsTransition.init();
if (this.indicator.activePath === index) {
this.activeChartIndicatorPath(Math.max(0, index - 1));
} else if (this.indicator.activePath > index) {
@@ -612,9 +613,14 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
}
public moveIndicatorPath(form: FormGroup,
- indicatorPaths: FormArray, index: number,
+ type: 'number' | 'chart', index: number,
newIndex: number = index - 1) {
- this.transitionGroup.init();
+ let indicatorPaths = type == 'number'?this.numberIndicatorPaths:this.chartIndicatorPaths;
+ if(type == 'number') {
+ this.numbersTransition.init();
+ } else {
+ this.chartsTransition.init();
+ }
let a = indicatorPaths.at(index);
let b = indicatorPaths.at(newIndex);
indicatorPaths.setControl(index, b);
@@ -632,7 +638,7 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
let paths = this.numberIndicatorPaths;
if (index == paths.length) {
this.addNumberIndicatorPath();
- this.transitionGroup.init();
+ this.numbersTransition.init();
}
this.indicator.activePath = index;
}
@@ -641,7 +647,7 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
let paths = this.chartIndicatorPaths;
if (index == paths.length) {
this.addChartIndicatorPath();
- this.transitionGroup.init();
+ this.chartsTransition.init();
}
this.indicator.activePath = index;
}
diff --git a/monitor-admin/topic/topic.component.html b/monitor-admin/topic/topic.component.html
index c5d7ecb9..c264fee7 100644
--- a/monitor-admin/topic/topic.component.html
+++ b/monitor-admin/topic/topic.component.html
@@ -30,12 +30,12 @@
(click)="$event.stopPropagation();$event.preventDefault()">
-
-
+
-
@@ -112,7 +112,7 @@
-
@@ -243,7 +243,7 @@
-
diff --git a/services/searchProjects.service.ts b/services/searchProjects.service.ts
index 6d30b06c..e9e704b9 100644
--- a/services/searchProjects.service.ts
+++ b/services/searchProjects.service.ts
@@ -230,7 +230,8 @@ export class SearchProjectsService {
for(let z=0; z
-
-
+
+
Funder:
- {{result.funderShortname}}
+ {{result.funderName ? result.funderName : result.funderShortname}}
-
+
{{openaireEntities.PROJECT}} Code:
{{result.code}}
diff --git a/utils/result-preview/result-preview.ts b/utils/result-preview/result-preview.ts
index 542e34f2..c8a38e1d 100644
--- a/utils/result-preview/result-preview.ts
+++ b/utils/result-preview/result-preview.ts
@@ -123,6 +123,7 @@ export class ResultPreview {
acronym: string;
code: string;
// callIdentifier: string; // currently not parsed
+ funderName: string;
funderShortname: string;
budget: string;
contribution: string;
@@ -188,6 +189,7 @@ export class ResultPreview {
resultPreview.acronym = result.acronym;
resultPreview.code = result.code;
// resultPreview.callIdentifier = result.callIdentifier; // currently not parsed
+ resultPreview.funderName = result.funderName;
resultPreview.funderShortname = result.funderShortname;
resultPreview.budget = result.budget;
resultPreview.contribution = result.contribution;