diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 30e7a31..0c859f6 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -231,7 +231,7 @@ export class AppComponent implements OnInit, OnDestroy { // 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 { "relorganizationid":encodeURIComponent("\"" + this.stakeholder.index_id + "\"" )}; + return { "cf":true}; } } } diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html index aba87e0..3ea8154 100644 --- a/src/app/monitor/monitor.component.html +++ b/src/app/monitor/monitor.component.html @@ -154,7 +154,7 @@ [class.switcher_active]="filterToggle">
- diff --git a/src/app/monitor/monitor.component.ts b/src/app/monitor/monitor.component.ts index 1384568..7bd0cb0 100644 --- a/src/app/monitor/monitor.component.ts +++ b/src/app/monitor/monitor.component.ts @@ -52,7 +52,6 @@ export class MonitorComponent implements OnInit, OnDestroy { periodFilter:RangeFilter = { title: "Period", filterId: "year", originalFilterIdFrom: null, originalFilterIdTo: null, selectedFromValue: null, selectedToValue: null, selectedFromAndToValues: ""}; privateStakeholder = false; public keyword: FormControl; - public someRange: number[] = [3, 7]; constructor( private route: ActivatedRoute, private _router: Router, @@ -100,7 +99,7 @@ export class MonitorComponent implements OnInit, OnDestroy { this.periodFilter.selectedFromValue = (params['year'] && params['year'].indexOf("range")==0)?params['year'].split("range")[1].split(":")[0]:""; this.periodFilter.selectedToValue = (params['year'] && params['year'].indexOf("range")==0)?params['year'].split("range")[1].split(":")[1]:""; this.validateYearRange(false); - if (this.stakeholder) { + if (this.stakeholder && !this.privateStakeholder) { this.setIndicators(); } }); diff --git a/src/app/search/searchPages/advanced/searchResearchResults.component.ts b/src/app/search/searchPages/advanced/searchResearchResults.component.ts index c728e9b..5547bc9 100644 --- a/src/app/search/searchPages/advanced/searchResearchResults.component.ts +++ b/src/app/search/searchPages/advanced/searchResearchResults.component.ts @@ -30,14 +30,14 @@ export class MonitorAdvancedSearchResearchResultsComponent { if (stakeholder) { if (stakeholder.type === "funder") { let value = stakeholder.index_id; - this.customFilter = new SearchCustomFilter("Funder", "relfunderid", value, ""); + this.customFilter = new SearchCustomFilter("Funder", "relfunderid", value, stakeholder.name); this.customFilter.isHiddenFilter = false; } else if (stakeholder.type === "organization") { let value = stakeholder.index_id; - this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, ""); + this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, stakeholder.name); this.customFilter.isHiddenFilter = false; } else if (stakeholder.type === "ri") { - this.customFilter = new SearchCustomFilter("Community", "communityId", stakeholder.index_id, ""); + this.customFilter = new SearchCustomFilter("Community", "communityId", stakeholder.index_id, stakeholder.name); this.customFilter.isHiddenFilter = false; } this.initialized = true; diff --git a/src/app/search/searchPages/simple/searchResearchResults.component.ts b/src/app/search/searchPages/simple/searchResearchResults.component.ts index 4a5eee3..68b799d 100644 --- a/src/app/search/searchPages/simple/searchResearchResults.component.ts +++ b/src/app/search/searchPages/simple/searchResearchResults.component.ts @@ -30,14 +30,14 @@ export class MonitorSearchResearchResultsComponent { if (stakeholder) { if (stakeholder.type === "funder") { let value = stakeholder.index_id; - this.customFilter = new SearchCustomFilter("Funder", "relfunderid", value, ""); + this.customFilter = new SearchCustomFilter("Funder", "relfunderid", value, stakeholder.name); this.customFilter.isHiddenFilter = false; } else if (stakeholder.type === "organization") { let value = stakeholder.index_id; - this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, ""); - this.customFilter.isHiddenFilter = true; + this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, stakeholder.name); + this.customFilter.isHiddenFilter = false; } else if (stakeholder.type === "ri") { - this.customFilter = new SearchCustomFilter("Community", "communityId", stakeholder.index_id, ""); + this.customFilter = new SearchCustomFilter("Community", "communityId", stakeholder.index_id, stakeholder.name); this.customFilter.isHiddenFilter = false; } this.initialized = true; diff --git a/src/assets/theme-assets/dashboard-custom.css b/src/assets/theme-assets/dashboard-custom.css index c8bc899..383ca05 100644 --- a/src/assets/theme-assets/dashboard-custom.css +++ b/src/assets/theme-assets/dashboard-custom.css @@ -548,8 +548,8 @@ body.dashboard { .dashboard .md-card { background: #FFFFFF no-repeat padding-box; - box-shadow: 1px 10px 12px #00000026; - border: 1px solid #E0E0E0; + /* box-shadow: 1px 10px 12px #00000026; + border: 1px solid #E0E0E0;*/ border-radius: 5px; opacity: 1; } @@ -576,3 +576,8 @@ body.dashboard { .selectedFilterLabel .material-icons{ color: var(--portal-main-contrast) !important; } + +#style_switcher_toggle{ + left: -36px !important; + width: 36px !important; +}