diff --git a/src/app/app.component.html b/src/app/app.component.html
index b6745f2..5e7a84f 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -11,7 +11,7 @@
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index d329db3..4633aa0 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -262,7 +262,7 @@ export class AppComponent implements OnInit, OnDestroy {
}
if(this.isPublicOrIsMember(this.stakeholder.visibility)) {
- this.specialSideBarMenuItem = new MenuItem("search", "Search research outcomes", "", this.properties.searchLinkToResults, false, [], null, this.createSearchParameters());
+ this.specialSideBarMenuItem = new MenuItem("search", "Search research outcomes", "", this.properties.searchLinkToResults, false, [], null, {});
this.specialSideBarMenuItem.icon = '';
}else{
this.specialSideBarMenuItem =null;
@@ -371,17 +371,16 @@ export class AppComponent implements OnInit, OnDestroy {
return true;
}
- createSearchParameters() {
+/* createSearchParameters() {
if (!this.stakeholder) {
return {};
}
if (this.stakeholder.type == "funder") {
return {"relfunder": encodeURIComponent("\"" + this.stakeholder.index_id + "||" + this.stakeholder.index_name + "||" + this.stakeholder.index_shortName + "\"")};
} else if (this.stakeholder.type == "ri") {
- // https://beta.explore.openaire.eu/search/find/research-outcomes?f0=q&fv0=&resultbestaccessright=%22Open%20Access%22&community=%22mes%7C%7CEuropean%20Marine%20Science%22&qf=true
return {"community": encodeURIComponent("\"" + this.stakeholder.index_id + "||" + this.stakeholder.index_name + "\"")};
} else if (this.stakeholder.type == "organization") {
return {"cf": true};
}
- }
+ }*/
}
diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html
index 3b59555..4b1680a 100644
--- a/src/app/monitor/monitor.component.html
+++ b/src/app/monitor/monitor.component.html
@@ -150,8 +150,8 @@
{
this.addNumberIndicatorPath(this.statisticsService.getNumberUrl(indicatorPath.source, this.indicatorUtils.getFullUrl(this.stakeholder, indicatorPath)), indicatorPath.parameters, indicatorPath.source, this.getJsonPathAsFormArray(indicatorPath));
});
} else {
- this.indicator = new Indicator('', '', '', 'number', 'small', "PUBLIC", []);
+ this.indicator = new Indicator('', '', '', 'number', 'small', 'small', "PUBLIC", []);
this.numberIndicatorFb = this.fb.group({
_id: this.fb.control(this.indicator._id),
name: this.fb.control(this.indicator.name, Validators.required),
@@ -676,6 +677,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
indicatorPaths: this.fb.array([], Validators.required),
type: this.fb.control(this.indicator.type),
width: this.fb.control(this.indicator.width),
+ height: this.fb.control(this.indicator.height),
defaultId: this.fb.control(this.indicator.defaultId)
});
this.addNumberIndicatorPath();
@@ -718,6 +720,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
visibility: this.fb.control(this.indicator.visibility),
indicatorPaths: this.fb.array([]),
width: this.fb.control(this.indicator.width),
+ height: this.fb.control(this.indicator.height),
defaultId: this.fb.control(this.indicator.defaultId)
});
this.indicator.indicatorPaths.forEach(indicatorPath => {
@@ -726,7 +729,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
indicatorPath.safeResourceUrl = this.getSecureUrlByStakeHolder(indicatorPath);
});
} else {
- this.indicator = new Indicator('', '', '', 'chart', 'medium', "PUBLIC", []);
+ this.indicator = new Indicator('', '', '', 'chart', 'medium', 'medium', "PUBLIC", []);
this.chartIndicatorFb = this.fb.group({
_id: this.fb.control(this.indicator._id),
name: this.fb.control(this.indicator.name),
@@ -735,6 +738,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
visibility: this.fb.control(this.indicator.visibility),
indicatorPaths: this.fb.array([]),
width: this.fb.control(this.indicator.width, Validators.required),
+ height: this.fb.control(this.indicator.height, Validators.required),
defaultId: this.fb.control(this.indicator.defaultId)
});
this.addChartIndicatorPath();
diff --git a/src/app/utils/indicator-utils.ts b/src/app/utils/indicator-utils.ts
index b76b271..b6ae2ed 100644
--- a/src/app/utils/indicator-utils.ts
+++ b/src/app/utils/indicator-utils.ts
@@ -512,12 +512,12 @@ export class IndicatorUtils {
}
}
}
- console.debug(values);
+ // console.debug(values);
return values.length > 1;
}
generateIndicatorByForm(form: any, indicatorPaths: IndicatorPath[], type:IndicatorType, addParameters:boolean = true ): Indicator {
let indicator: Indicator = new Indicator(form.name, form.description, form.additionalDescription, type,
- form.width, form.visibility, indicatorPaths, form.defaultId);
+ form.width, form.height, form.visibility, indicatorPaths, form.defaultId);
indicator._id = form._id;
form.indicatorPaths.forEach((indicatorPath, index) => {
indicator.indicatorPaths[index].type = indicatorPath.type;