diff --git a/server.ts b/server.ts
index 5794d7e..6c61534 100644
--- a/server.ts
+++ b/server.ts
@@ -13,7 +13,7 @@ enableProdMode();
// Express server
const app = express();
-const PORT = process.env.PORT || 5000;
+const PORT = 5000;
const DIST_FOLDER = join(process.cwd(), 'dist');
// Our index.html we'll use as our template
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 4042922..0ab3d02 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -38,6 +38,85 @@ const routes: Routes = [
loadChildren: './topic/topic.module#TopicModule',
resolve: {envSpecific: EnvironmentSpecificResolver}
},
+
+ /* Library paths*/
+ {
+ path: 'portals',
+ loadChildren: './openaireLibrary/dashboard/portal/communities.module#CommunitiesModule',
+ resolve: { envSpecific: EnvironmentSpecificResolver }
+ },
+ {
+ path: 'entities',
+ loadChildren: './openaireLibrary/dashboard/entity/entities.module#EntitiesModule',
+ resolve: { envSpecific: EnvironmentSpecificResolver }
+ },
+ {
+ path: 'classes',
+ loadChildren: './openaireLibrary/dashboard/divId/divIds.module#DivIdsModule',
+ resolve: { envSpecific: EnvironmentSpecificResolver }
+ },
+ {
+ path: 'classContents',
+ loadChildren: './openaireLibrary/dashboard/divhelpcontent/div-help-contents.module#DivHelpContentsModule',
+ resolve: { envSpecific: EnvironmentSpecificResolver }
+ },
+ {
+ path: 'classContents/new',
+ loadChildren: './openaireLibrary/dashboard/divhelpcontent/new-div-help-content.module#NewDivHelpContentModule',
+ resolve: { envSpecific: EnvironmentSpecificResolver }
+ },
+ {
+ path: 'classContents/edit',
+ loadChildren: './openaireLibrary/dashboard/divhelpcontent/edit-div-help-content.module#EditDivHelpContentModule',
+ resolve: { envSpecific: EnvironmentSpecificResolver }
+ },
+ {
+ path: 'helptexts',
+ loadChildren: './openaireLibrary/dashboard/helpTexts/page-help-contents.module#PageHelpContentsModule',
+ resolve: { envSpecific: EnvironmentSpecificResolver }
+ },
+ {
+ path: 'helptexts/new',
+ loadChildren: './openaireLibrary/dashboard/helpTexts/new-page-help-content.module#NewPageHelpContentModule',
+ resolve: { envSpecific: EnvironmentSpecificResolver }
+ },
+ {
+ path: 'helptexts/edit',
+ loadChildren: './openaireLibrary/dashboard/helpTexts/edit-page-help-content.module#EditPageHelpContentModule',
+ resolve: { envSpecific: EnvironmentSpecificResolver }
+ },
+ {
+ path: 'pages',
+ loadChildren: './openaireLibrary/dashboard/page/pages.module#PagesModule',
+ resolve: { envSpecific: EnvironmentSpecificResolver }
+ },
+ /*{
+ path: 'pages',
+ loadChildren: './openaireLibrary/dashboard/page/pages.module#PagesModule',
+ resolve: { envSpecific: EnvironmentSpecificResolver }
+ },
+ {
+ path: 'pageContents',
+ loadChildren: './openaireLibrary/dashboard/helpcontent/page-help-contents.module#PageHelpContentsModule',
+ resolve: { envSpecific: EnvironmentSpecificResolver }
+ },
+ {
+ path: 'pageContents/new',
+ loadChildren: './pages/helpcontent/new-page-help-content.module#NewPageHelpContentModule',
+ resolve: { envSpecific: EnvironmentSpecificResolver }
+ },
+ {
+ path: 'pageContents/edit',
+ loadChildren: './pages/helpcontent/edit-page-help-content.module#EditPageHelpContentModule',
+ resolve: { envSpecific: EnvironmentSpecificResolver }
+ },
+
+
+ {
+ path: 'htmlPageContent/edit',
+ loadChildren: './pages/htmlpagecontent/edit-html-page-content.module#EditHtmlPageContentModule',
+ resolve: { envSpecific: EnvironmentSpecificResolver }
+ },*/
{
path: '',
loadChildren: './monitor/monitor.module#MonitorModule',
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 0c41548..c0aa5f7 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -22,5 +22,7 @@
+
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index dbe67b0..57f1222 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -8,100 +8,110 @@ import {StakeholderService} from "./services/stakeholder.service";
import {Subscriber} from "rxjs";
import {LayoutService} from "./library/sharedComponents/sidebar/layout.service";
import {MenuItem} from "./openaireLibrary/sharedComponents/menu";
+import {Item} from "./utils/entities/sidebar";
@Component({
- selector: 'app-root',
- templateUrl: './app.component.html'
+ selector: 'app-root',
+ templateUrl: './app.component.html'
})
export class AppComponent implements OnInit, OnDestroy {
- properties: EnvProperties;
- user: User;
- hasSidebar: boolean = false;
- hasHeader: boolean = false;
- userMenuItems: MenuItem[] = [new MenuItem("", "My profile", "", "", false, [], [], {})];
- private subscriptions: any[] = [];
+ properties: EnvProperties;
+ user: User;
+ hasSidebar: boolean = false;
+ hasHeader: boolean = false;
+ userMenuItems: MenuItem[] = [new MenuItem("", "My profile", "", "", false, [], [], {})];
+ private subscriptions: any[] = [];
+ adminMenuItems: Item[] = [];
- constructor(private route: ActivatedRoute,
- private propertiesService: EnvironmentSpecificService,
- private router: Router,
- private userManagementService: UserManagementService,
- private layoutService: LayoutService,
- private stakeholderService: StakeholderService,
- private cdr: ChangeDetectorRef) {
- }
+ constructor(private route: ActivatedRoute,
+ private propertiesService: EnvironmentSpecificService,
+ private router: Router,
+ private userManagementService: UserManagementService,
+ private layoutService: LayoutService,
+ private stakeholderService: StakeholderService,
+ private cdr: ChangeDetectorRef) {
+ }
- ngOnInit() {
- this.subscriptions.push(this.layoutService.hasSidebar.subscribe(hasSidebar => {
- this.hasSidebar = hasSidebar;
- this.cdr.detectChanges();
- }));
- this.subscriptions.push(this.layoutService.hasHeader.subscribe(hasHeader => {
- this.hasHeader = hasHeader;
- this.cdr.detectChanges();
- }));
- this.propertiesService.loadEnvironment()
- .then(properties => {
- this.properties = properties;
- this.subscriptions.push(this.router.events.subscribe(() => {
- let r = this.route;
- while (r.firstChild) {
- r = r.firstChild;
- }
- this.subscriptions.push(r.params.subscribe(params => {
- if (params['stakeholder']) {
- if (!this.stakeholderService.stakeholder ||
- this.stakeholderService.stakeholder.alias !== params['stakeholder']) {
- this.stakeholderService.getStakeholder(this.properties.monitorServiceAPIURL, params['stakeholder']).subscribe(stakeholder => {
- this.stakeholderService.setStakeholder(stakeholder);
- this.layoutService.setOpen(true);
- });
- }
- } else {
- this.stakeholderService.setStakeholder(null);
- }
- }));
- }));
- this.subscriptions.push(this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe(user => {
- this.user = user;
- this.buildMenu();
- }, error => {
- console.log("App couldn't fetch properties");
- console.log(error);
- }));
- });
- }
-
- public ngOnDestroy() {
- this.subscriptions.forEach(value => {
- if (value instanceof Subscriber) {
- value.unsubscribe();
+ ngOnInit() {
+ this.subscriptions.push(this.layoutService.hasSidebar.subscribe(hasSidebar => {
+ this.hasSidebar = hasSidebar;
+ this.cdr.detectChanges();
+ }));
+ this.subscriptions.push(this.layoutService.hasHeader.subscribe(hasHeader => {
+ this.hasHeader = hasHeader;
+ this.cdr.detectChanges();
+ }));
+ this.propertiesService.loadEnvironment()
+ .then(properties => {
+ this.properties = properties;
+ this.subscriptions.push(this.router.events.subscribe(() => {
+ let r = this.route;
+ while (r.firstChild) {
+ r = r.firstChild;
+ }
+ this.subscriptions.push(r.params.subscribe(params => {
+ if (params['stakeholder']) {
+ if (!this.stakeholderService.stakeholder ||
+ this.stakeholderService.stakeholder.alias !== params['stakeholder']) {
+ this.stakeholderService.getStakeholder(this.properties.monitorServiceAPIURL, params['stakeholder']).subscribe(stakeholder => {
+ this.stakeholderService.setStakeholder(stakeholder);
+ this.layoutService.setOpen(true);
+ });
+ }
+ } else {
+ this.stakeholderService.setStakeholder(null);
}
- });
+ }));
+ }));
+ this.subscriptions.push(this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe(user => {
+ this.user = user;
+ this.buildMenu();
+ }, error => {
+ console.log("App couldn't fetch properties");
+ console.log(error);
+ }));
+ });
+ }
+
+ public ngOnDestroy() {
+ this.subscriptions.forEach(value => {
+ if (value instanceof Subscriber) {
+ value.unsubscribe();
+ }
+ });
+ }
+
+ public get open() {
+ return this.layoutService.open;
+ }
+
+ public toggleOpen(event = null) {
+ if (!event) {
+ this.layoutService.setOpen(!this.open);
+ } else if (event && event['value'] === true) {
+ this.layoutService.setOpen(false);
}
+ }
+
+
+ buildMenu() {
+ this.userMenuItems = [];
+ if (Session.isPortalAdministrator(this.user)) {
+ this.userMenuItems.push(new MenuItem("", "Manage helptexts",
+ ((this.properties.environment == "beta") ? "https://beta.admin.connect.openaire.eu" : "https://admin.explore.openaire.eu") + "/dashboard?communityId=openaire", "", true, [], [], {}))
- public get open() {
- return this.layoutService.open;
}
-
- public toggleOpen(event = null) {
- if (!event) {
- this.layoutService.setOpen(!this.open);
- } else if (event && event['value'] === true) {
- this.layoutService.setOpen(false);
- }
+ if (this.user) {
+ this.userMenuItems.push(new MenuItem("", "User information", "", "/user-info", false, [], [], {}));
}
-
-
- buildMenu() {
- this.userMenuItems = [];
- if (Session.isPortalAdministrator(this.user)) {
- this.userMenuItems.push(new MenuItem("", "Manage helptexts",
- ((this.properties.environment == "beta") ? "https://beta.admin.connect.openaire.eu" : "https://admin.explore.openaire.eu") + "/dashboard?communityId=openaire", "", true, [], [], {}))
-
- }
- if (this.user) {
- this.userMenuItems.push(new MenuItem("", "User information", "", "/user-info", false, [], [], {}));
- }
+ if (this.adminMenuItems.length == 0) {
+ //nstructor(id: string, name: string, route: string, items: Item[], icon, open: boolean) {
+ this.adminMenuItems.push(new Item("stakeholders", "Manage Stakeholders", "/admin", [], null, false));
+ this.adminMenuItems.push(new Item("pages", "Pages", "/pages", [], null, false));
+ this.adminMenuItems.push(new Item("monitor", "Monitor", "/portals", [], null, false));
+ this.adminMenuItems.push(new Item("entities", "Entities", "/entities", [], null, false));
+ this.adminMenuItems.push(new Item("helptexts", "Help texts", "/helptexts?communityId=openaire", [], null, false));
}
+ }
}
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 17b1624..5919377 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -15,12 +15,9 @@ import {ErrorModule} from './openaireLibrary/error/error.module';
import {NavigationBarModule} from './openaireLibrary/sharedComponents/navigationBar.module';
import {EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/environmentSpecificResolver';
-
-import {CommunitiesService} from './openaireLibrary/connect/communities/communities.service';
-import {LayoutService} from "./openaireLibrary/services/layout.service";
import {SubscribeModule} from './utils/subscribe/subscribe.module';
-import {StakeholderService} from "./services/stakeholder.service";
import {UserMiniModule} from "./openaireLibrary/login/userMiniModule.module";
+import {SideBarModule} from "./library/sharedComponents/sidebar/sideBar.module";
@NgModule({
@@ -37,12 +34,14 @@ import {UserMiniModule} from "./openaireLibrary/login/userMiniModule.module";
SubscribeModule.forRoot(),
BrowserModule.withServerTransition({appId: 'my-app'}),
AppRoutingModule,
- UserMiniModule
+ UserMiniModule, SideBarModule
+
],
- declarations: [ AppComponent, OpenaireErrorPageComponent],
- exports: [ AppComponent ],
- providers:[EnvironmentSpecificResolver],
+ declarations: [AppComponent, OpenaireErrorPageComponent],
+ exports: [AppComponent],
+ providers: [EnvironmentSpecificResolver],
bootstrap: [AppComponent]
})
//
-export class AppModule {}
+export class AppModule {
+}
diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts
index dacc8c9..3b13521 100644
--- a/src/app/home/home-routing.module.ts
+++ b/src/app/home/home-routing.module.ts
@@ -12,7 +12,7 @@ import {HomeComponent} from "./home.component";
component: HomeComponent,
canActivate: [FreeGuard],
canDeactivate: [PreviousRouteRecorder],
- data: {hasSidebar: false}
+ data: {hasSidebar: true}
}
])
]
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
index 2dfa493..1a8fdf0 100644
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@@ -8,6 +8,7 @@ import {Option, StakeholderUtils} from "../utils/indicator-utils";
import {FormBuilder, FormGroup, Validators} from "@angular/forms";
import {AlertModal} from "../openaireLibrary/utils/modal/alert";
import {StakeholderCreator} from "../utils/entities/stakeholderCreator";
+import {LayoutService} from "../library/sharedComponents/sidebar/layout.service";
@Component({
selector: 'home',
@@ -50,7 +51,7 @@ export class HomeComponent implements OnInit, OnDestroy {
constructor(private stakeholderService: StakeholderService,
private propertiesService: EnvironmentSpecificService,
- private fb: FormBuilder) {
+ private fb: FormBuilder, private layoutService: LayoutService) {
}
ngOnInit(): void {
@@ -70,6 +71,8 @@ export class HomeComponent implements OnInit, OnDestroy {
this.loading = false;
});
});
+ this.layoutService.setHasHeader(true);
+ this.layoutService.setOpen(true);
}
ngOnDestroy(): void {
diff --git a/src/app/library/sharedComponents/input/input.component.ts b/src/app/library/sharedComponents/input/input.component.ts
index e5a4651..30f7934 100644
--- a/src/app/library/sharedComponents/input/input.component.ts
+++ b/src/app/library/sharedComponents/input/input.component.ts
@@ -6,7 +6,7 @@ import {HelperFunctions} from "../../../openaireLibrary/utils/HelperFunctions.cl
@Component({
selector: '[dashboard-input]',
template: `
-
+
+ {{label}}
`
})
export class InputComponent implements OnInit, OnDestroy {
diff --git a/src/app/library/sharedComponents/input/input.module.ts b/src/app/library/sharedComponents/input/input.module.ts
index bdd8cd9..10590c2 100644
--- a/src/app/library/sharedComponents/input/input.module.ts
+++ b/src/app/library/sharedComponents/input/input.module.ts
@@ -5,7 +5,7 @@ import {SharedModule} from "../../../shared/shared.module";
import {MatFormFieldModule} from "@angular/material/form-field";
import {MatInputModule} from "@angular/material/input";
import {MatSelectModule} from "@angular/material/select";
-
+import {MatCheckboxModule} from '@angular/material/checkbox';
@NgModule({
imports: [
CommonModule,
@@ -13,6 +13,7 @@ import {MatSelectModule} from "@angular/material/select";
MatFormFieldModule,
MatInputModule,
MatSelectModule,
+ MatCheckboxModule
],
exports: [
InputComponent
diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html
index 9a70387..e896ae5 100644
--- a/src/app/monitor/monitor.component.html
+++ b/src/app/monitor/monitor.component.html
@@ -60,7 +60,7 @@
-
+
- {
+ let subscription: Subscription;
+ this.route.params.subscribe(params => {
+ if(subscription) {
+ subscription.unsubscribe();
+ }
+ this.properties = data.envSpecific;
+ var url = data.envSpecific.baseLink + this._router.url;
+ if (!this.stakeholder || this.stakeholder.alias !== params['stakeholder']) {
+ this.status = this.errorCodes.LOADING;
+ this.numberResults = new Map();
+ this.chartsActiveType = new Map();
+ // subscription = this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
+ let stakeholder: Stakeholder = null;
+ if (params['stakeholder'] == "fwf") {
+ stakeholder = new Stakeholder(null, "funder", "fwf_________::FWF", "Austrian Science Fund (FWF)", "FWF",
+ false, "fwf", true, true, null);
+ stakeholder = this.stakeholderUtils.createFunderFromDefaultProfile(stakeholder, StakeholderCreator.createFunderDefaultProfile().topics);
+ stakeholder.logoUrl = "./assets/fwf.png";
+ } else if (params['stakeholder'] == "arc") {
+ stakeholder = new Stakeholder(null, "funder", "arc_________::ARC",
+ "Australian Research Council (ARC)", "ARC",
+ false, "arc", true, true, null);
+ stakeholder = this.stakeholderUtils.createFunderFromDefaultProfile(stakeholder, StakeholderCreator.createFunderDefaultProfile().topics);
+ stakeholder.logoUrl = "./assets/arc1.gif";
+ } else {
+ stakeholder = new Stakeholder(null, "funder", "ec__________::EC",
+ "European Commission", "EC",
+ false, "ec", true, true, null);
+ stakeholder = this.stakeholderUtils.createFunderFromDefaultProfile(stakeholder, StakeholderCreator.createFunderDefaultProfile().topics);
+ stakeholder.logoUrl = "./assets/ec.png";
+ }
+ if (stakeholder) {
+ this.stakeholder = stakeholder;
+ this.seoService.createLinkForCanonicalURL(url, false);
+ this._meta.updateTag({content: url}, "property='og:url'");
+ var description = "Monitor Dashboard | " + this.stakeholder.index_name;
+ var title = "Monitor Dashboard | " + this.stakeholder.index_shortName;
+ this._meta.updateTag({content: description}, "name='description'");
+ this._meta.updateTag({content: description}, "property='og:description'");
+ this._meta.updateTag({content: title}, "property='og:title'");
+ this._title.setTitle(title);
+ if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
+ this.piwiksub = this._piwikService.trackView(this.properties, title, this.properties.piwikSiteId).subscribe();
+ }
+ //this.getDivContents();
+ this.getPageContents();
+ this.status = this.errorCodes.DONE;
+ this.setView(params);
+ this.layoutService.setOpen(true);
+ }
+ // }, error => {
+ // this.navigateToError();
+ // });
+ this.subscriptions.push(subscription);
+ } else {
+ this.setView(params);
+ }
+ this.subscriptions.push(this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe(user => {
+ this.user = user;
+ this.buildMenu();
+ }, error => {
+ console.log("App couldn't fetch properties");
+ console.log(error);
+ }));
+ });
+ });
+
});
}
diff --git a/src/app/utils/entities/stakeholderCreator.ts b/src/app/utils/entities/stakeholderCreator.ts
index be2e81f..e80081f 100644
--- a/src/app/utils/entities/stakeholderCreator.ts
+++ b/src/app/utils/entities/stakeholderCreator.ts
@@ -110,7 +110,7 @@ export class StakeholderCreator {
}
let res_access_mode = new Indicator("",null, "chart","small",true, true,[new IndicatorPath("pie", "stats-tool", "chart?json=",
'{"library":"HighCharts","chartDescription":{"queries":[{"name":"'+typePlural+'","type":"'+ChartHelper.prefix+'type'+ChartHelper.suffix+'","query":{"select":[{"field":"'+dbType+'","aggregate":"count"},{"field":"'+dbType+'.access mode","aggregate":null}],"filters":[{"groupFilters":[{"field":"'+dbType+'.project.funder","type":"=","values":["'+ChartHelper.prefix+'funder_name'+ChartHelper.suffix+'"]}],"op":"AND"}'+fundingFilter[index]+'],"entity":"' + dbType + '","profile":"OpenAIRE All-inclusive","limit":"0"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"'+ChartHelper.prefix+'title'+ChartHelper.suffix+'"},"subtitle":{},"yAxis":{"title":{"text":"'+typePlural+'"}},"xAxis":{"title":{"text":"Year"}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}', null)]);
- res_access_mode.indicatorPaths[0].parameters = IndicatorPath.createParameters(stakeholder.index_name,chartTitle[index] + typeSingl+" acccess mode","pie");
+ res_access_mode.indicatorPaths[0].parameters = IndicatorPath.createParameters(stakeholder.index_name,chartTitle[index] + typeSingl+" access mode","pie");
res_access_mode.indicatorPaths[0].filters = IndicatorPath.createResultFilters(dbType);
pubDefSub.charts.push(res_access_mode);
@@ -185,20 +185,21 @@ export class StakeholderCreator {
static createOpenAccessTopic(stakeholder:Stakeholder):Category {
let category = new Category("Open Access", "", "open-access", true, true);
category.subCategories.push(this.createOASub(stakeholder,"Publications","Publication","publication","publications"));
- // category.subCategories.push(this.createOASub(stakeholder,"Research data","Research data","dataset","datasets"));
- // category.subCategories.push(this.createOASub(stakeholder,"Software","Software","software","software"));
- // category.subCategories.push(this.createOASub(stakeholder,"Other research products","Other research product","other","other"));
+ category.subCategories.push(this.createOASub(stakeholder,"Research data","Research data","dataset","datasets"));
+ category.subCategories.push(this.createOASub(stakeholder,"Software","Software","software","software"));
+ category.subCategories.push(this.createOASub(stakeholder,"Other research products","Other research product","other","other"));
return category;
}
static createOASub(stakeholder:Stakeholder,typePlural, typeSingl, dbType, dbTypePlural ):SubCategory {
let sub:SubCategory = new SubCategory(typePlural, null, dbTypePlural, true, true);
sub.charts = sub.charts.concat( this.createOAPerType(stakeholder,typePlural, typeSingl, dbType, dbTypePlural, 0 ));
sub.charts = sub.charts.concat( this.createOAPerType(stakeholder,typePlural, typeSingl, dbType, dbTypePlural, 1 ));
- // sub.charts = sub.charts.concat( this.createOAPerType(stakeholder,typePlural, typeSingl, dbType, dbTypePlural, 2 ));
+ sub.charts = sub.charts.concat( this.createOAPerType(stakeholder,typePlural, typeSingl, dbType, dbTypePlural, 2 ));
return sub;
}
static createOAPerType(stakeholder:Stakeholder,typePlural, typeSingl, dbType, dbTypePlural, index:number):Indicator[] {
-
+//default pallette: "colors":["#2f7ed8","#0d233a","#8bbc21","#910000","#1aadce","#492970","#f28f43","#77a1e5","#c42525","#a6c96a"]
+ let greenAndGoldPalette = ', "colors":["#239D60","#F8B500"]';
let fundingFilter = ['', '{"groupFilters":[{"field":"' + dbType + '.project.funding level 0","type":"=","values":["FP7"]}],"op":"AND"}',
'{"groupFilters":[{"field":"' + dbType + '.project.funding level 0","type":"=","values":["H2020"]}],"op":"AND"}'];
let fieldValue = ["", "FP7", "H2020"];
@@ -208,7 +209,7 @@ export class StakeholderCreator {
let open_non_url = "http://88.197.53.71:8080/stats-api/chart?json="+encodeURIComponent('{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"pie","color":"#e62020ee","query":{"name":"monitor.' + ChartHelper.prefix + 'id' + ChartHelper.suffix +(index==2?".h2020":(index==1?".fp7":""))+ '.' + dbTypePlural+'.oavsnonoa"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"'+chartTitle[index]+' Open Access vs Non Open Access"},"subtitle":{},"yAxis":{"title":{}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}');
encodeURIComponent('{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"pie","query":{"name":"monitor.' + ChartHelper.prefix + 'id' + ChartHelper.suffix +(index==2?".h2020":(index==1?".fp7":""))+ '.' + dbTypePlural+'.greenvsgold"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{},"subtitle":{},"yAxis":{"title":{}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}');
- let open_non_ind:Indicator = new Indicator(chartTitle[index], "", "chart", "small", true, true, [utils.generateIndicatorByChartUrl("stats-tool", open_non_url, "pie")])
+ let open_non_ind:Indicator = new Indicator(chartTitle[index]+" Overview", "", "chart", "small", true, true, [utils.generateIndicatorByChartUrl("stats-tool", open_non_url, "pie")])
open_non_ind.indicatorPaths[0].parameters["id"] = stakeholder.index_shortName.toLowerCase();
if(index!=0){
open_non_ind.recommendedFor.push("ec__________::EC");
@@ -223,8 +224,7 @@ export class StakeholderCreator {
gold_vs_green_ind.recommendedFor.push("ec__________::EC");
}
indicators.push(gold_vs_green_ind);
-
- let gold_vs_green_time_url = "http://88.197.53.71:8080/stats-api/chart?json=" + encodeURIComponent('{"library":"HighCharts","chartDescription":{"queries":[{"name":"Gold OA","type":"column","color":"#F8B500","query":{"name":"monitor.' + ChartHelper.prefix + 'id' + ChartHelper.suffix + (index == 2 ? ".h2020" : (index == 1 ? ".fp7" : "")) + '.' + dbTypePlural + '.gold.year"}},{"name":"Green OA","type":"column","color":"#239D60","query":{"name":"monitor.' + ChartHelper.prefix + 'id' + ChartHelper.suffix + (index == 2 ? ".h2020" : (index == 1 ? ".fp7" : "")) + '.' + dbTypePlural + '.green.year"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Green vs Gold Open Access"},"subtitle":{"text":"by year"},"yAxis":{"title":{}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}');
+ let gold_vs_green_time_url = "http://88.197.53.71:8080/stats-api/chart?json=" + encodeURIComponent('{"library":"HighCharts","chartDescription":{"queries":[{"name":"Green OA","type":"column","query":{"name":"monitor.' + ChartHelper.prefix + 'id' + ChartHelper.suffix + (index == 2 ? ".h2020" : (index == 1 ? ".fp7" : "")) + '.' + dbTypePlural + '.green.year"}},{"name":"Gold OA","type":"column","query":{"name":"monitor.' + ChartHelper.prefix + 'id' + ChartHelper.suffix + (index == 2 ? ".h2020" : (index == 1 ? ".fp7" : "")) + '.' + dbTypePlural + '.gold.year"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"' + chartTitle[index] + ' Green vs Gold Open Access"},"subtitle":{"text":"by year"},"yAxis":{"title":{}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}'+greenAndGoldPalette+'}}');
let gold_vs_green_time_ind: Indicator = (new Indicator("", "", "chart", "small", true, true, [utils.generateIndicatorByChartUrl("stats-tool", gold_vs_green_time_url, "column")]));
gold_vs_green_time_ind.indicatorPaths[0].parameters["id"] = stakeholder.index_shortName.toLowerCase();
if (index != 0) {
@@ -233,7 +233,7 @@ export class StakeholderCreator {
indicators.push(gold_vs_green_time_ind);
}
- let top_project_url = "http://88.197.53.71:8080/stats-api/chart?json="+ encodeURIComponent('{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"monitor.'+ ChartHelper.prefix + 'id' + ChartHelper.suffix +(index==2?".h2020":(index==1?".fp7":""))+ '.' + dbTypePlural+'.top10projects"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Top 15 projects"},"subtitle":{"text":"by publications"},"yAxis":{"title":{}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}');
+ let top_project_url = "http://88.197.53.71:8080/stats-api/chart?json="+ encodeURIComponent('{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"monitor.'+ ChartHelper.prefix + 'id' + ChartHelper.suffix +(index==2?".h2020":(index==1?".fp7":""))+ '.' + dbTypePlural+'.top10projects"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"' + chartTitle[index] + 'Top 10 projects"},"subtitle":{"text":"by '+typePlural+'"},"yAxis":{"title":{}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}');
let top_project_ind:Indicator = (new Indicator("", "", "chart", "medium", true, true, [utils.generateIndicatorByChartUrl("stats-tool", top_project_url, "column")]));
top_project_ind.indicatorPaths[0].parameters["id"] = stakeholder.index_shortName.toLowerCase();
if(index!=0){
@@ -241,44 +241,47 @@ export class StakeholderCreator {
}
indicators.push(top_project_ind);
if(index == 0) {
- let top_datasources_url = "http://88.197.53.71:8080/stats-api/chart?json=" + encodeURIComponent('{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","color":"#42a5f5","query":{"name":"monitor.' + ChartHelper.prefix + 'id' + ChartHelper.suffix + '.' + dbTypePlural + '.top10datasources"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Top 10 Datasources"},"subtitle":{},"yAxis":{"title":{}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}');
+ let top_datasources_url = "http://88.197.53.71:8080/stats-api/chart?json=" + encodeURIComponent('{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"monitor.' + ChartHelper.prefix + 'id' + ChartHelper.suffix + '.' + dbTypePlural + '.top10datasources"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"' + chartTitle[index] + 'Top 10 Datasources"},"subtitle":{},"yAxis":{"title":{}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}');
let top_datasources_ind: Indicator = (new Indicator("", "", "chart", "medium", true, true, [utils.generateIndicatorByChartUrl("stats-tool", top_datasources_url, "column")]));
top_datasources_ind.indicatorPaths[0].parameters["id"] = stakeholder.index_shortName.toLowerCase();
indicators.push(top_datasources_ind);
}
if(index != 0) {
let open_non_fl2 = "http://88.197.53.71:8080/stats-api/chart?json=" + encodeURIComponent(
- '{"library":"HighCharts","chartDescription":{"queries":[{"name":"Open Access","type":"bar","query":{"select":[{"field":"' + dbType + '","aggregate":"count"},{"field":"' + dbType + '.project.funding level 2","aggregate":null}],"filters":['+fundingFilter[index]+',{"groupFilters":[{"field":"' + dbType + '.access mode","type":"=","values":["Open Access"]}],"op":"AND"}],"entity":"' + dbType + '","profile":"OpenAIRE All-inclusive","limit":"30"}},{"name":"Non Open Access","type":"bar","query":{"select":[{"field":"' + dbType + '","aggregate":"count"},{"field":"' + dbType + '.project.funding level 2","aggregate":null}],"filters":[{"groupFilters":[{"field":"' + dbType + '.access mode","type":"!=","values":["Open Access"]}],"op":"AND"}'+(fundingFilter[index].length >0?', ':'')+fundingFilter[index]+'],"entity":"' + dbType + '","profile":"OpenAIRE All-inclusive","limit":"30"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access vs Non Open Access"},"subtitle":{"text":"'+chartTitle[index]+'"},"yAxis":{"title":{}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}');
- let open_non_fl2_ind: Indicator = (new Indicator("By Scientific area", "", "chart", "medium", true, true, [utils.generateIndicatorByChartUrl("stats-tool", open_non_fl2, "column")]));
+ '{"library":"HighCharts","chartDescription":{"queries":[{"name":"Open Access","type":"bar","query":{"select":[{"field":"' + dbType + '","aggregate":"count"},{"field":"' + dbType + '.project.funding level 2","aggregate":null}],"filters":['+fundingFilter[index]+',{"groupFilters":[{"field":"' + dbType + '.access mode","type":"=","values":["Open Access"]}],"op":"AND"}],"entity":"' + dbType + '","profile":"OpenAIRE All-inclusive","limit":"30"}},{"name":"Non Open Access","type":"bar","query":{"select":[{"field":"' + dbType + '","aggregate":"count"},{"field":"' + dbType + '.project.funding level 2","aggregate":null}],"filters":[{"groupFilters":[{"field":"' + dbType + '.access mode","type":"!=","values":["Open Access"]}],"op":"AND"}'+(fundingFilter[index].length >0?', ':'')+fundingFilter[index]+'],"entity":"' + dbType + '","profile":"OpenAIRE All-inclusive","limit":"30"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"' + chartTitle[index] + 'Open Access vs Non Open Access"},"subtitle":{"text":"By Scientific area"},"yAxis":{"title":{}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}');
+ let open_non_fl2_ind: Indicator = (new Indicator("", "", "chart", "medium", true, true, [utils.generateIndicatorByChartUrl("stats-tool", open_non_fl2, "column")]));
// open_non_fl2_ind.indicatorPaths[0].parameters["id"] = stakeholder.index_shortName.toLowerCase();
indicators.push(open_non_fl2_ind);
if (index != 0) {
open_non_fl2_ind.recommendedFor.push("ec__________::EC");
}
- let gold_green__fl2 = "http://88.197.53.71:8080/stats-api/chart?json=" + encodeURIComponent(
- '{"library":"HighCharts","chartDescription":{"queries":[{"name":"Green OA","type":"bar","query":{"select":[{"field":"' + dbType + '","aggregate":"count"},{"field":"' + dbType + '.project.funding level 2","aggregate":null}],"filters":[{"groupFilters":[{"field":"' + dbType + '.project.funding level 0","type":"=","values":["' + fieldValue[index] + '"]}],"op":"AND"},{"groupFilters":[{"field":"' + dbType + '.access mode","type":"=","values":["Open Access"]}],"op":"AND"},{"groupFilters":[{"field":"' + dbType + '.datasource.type","type":"contains","values":["repo"]}],"op":"AND"}],"entity":"' + dbType + '","profile":"OpenAIRE All-inclusive","limit":"30"}},{"name":"Gold OA","type":"bar","query":{"select":[{"field":"' + dbType + '","aggregate":"count"},{"field":"' + dbType + '.project.funding level 2","aggregate":null}],"filters":[{"groupFilters":[{"field":"' + dbType + '.access mode","type":"=","values":["Open Access"]}],"op":"AND"},{"groupFilters":[{"field":"' + dbType + '.project.funding level 0","type":"=","values":["' + fieldValue[index] + '"]}],"op":"AND"},{"groupFilters":[{"field":"' + dbType + '.datasource.id","type":"starts_with","values":["doaj"]}],"op":"AND"}],"entity":"' + dbType + '","profile":"OpenAIRE All-inclusive","limit":"30"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Green vs Gold Open Access"},"subtitle":{"text":"' + chartTitle[index] + '"},"yAxis":{"title":{}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}');
- let gold_green_ind_fl2: Indicator = (new Indicator("", "", "chart", "medium", true, true, [utils.generateIndicatorByChartUrl("stats-tool", gold_green__fl2, "column")]));
- // open_non_fl2_ind.indicatorPaths[0].parameters["id"] = stakeholder.index_shortName.toLowerCase();
- indicators.push(gold_green_ind_fl2);
- if (index != 0) {
- gold_green_ind_fl2.recommendedFor.push("ec__________::EC");
+ if(dbType == "publication") {
+ let gold_green__fl2 = "http://88.197.53.71:8080/stats-api/chart?json=" + encodeURIComponent(
+ '{"library":"HighCharts","chartDescription":{"queries":[{"name":"Green OA","type":"bar","query":{"select":[{"field":"' + dbType + '","aggregate":"count"},{"field":"' + dbType + '.project.funding level 2","aggregate":null}],"filters":[{"groupFilters":[{"field":"' + dbType + '.project.funding level 0","type":"=","values":["' + fieldValue[index] + '"]}],"op":"AND"},{"groupFilters":[{"field":"' + dbType + '.access mode","type":"=","values":["Open Access"]}],"op":"AND"},{"groupFilters":[{"field":"' + dbType + '.datasource.type","type":"contains","values":["repo"]}],"op":"AND"}],"entity":"' + dbType + '","profile":"OpenAIRE All-inclusive","limit":"30"}},{"name":"Gold OA","type":"bar","query":{"select":[{"field":"' + dbType + '","aggregate":"count"},{"field":"' + dbType + '.project.funding level 2","aggregate":null}],"filters":[{"groupFilters":[{"field":"' + dbType + '.access mode","type":"=","values":["Open Access"]}],"op":"AND"},{"groupFilters":[{"field":"' + dbType + '.project.funding level 0","type":"=","values":["' + fieldValue[index] + '"]}],"op":"AND"},{"groupFilters":[{"field":"' + dbType + '.datasource.id","type":"starts_with","values":["doaj"]}],"op":"AND"}],"entity":"' + dbType + '","profile":"OpenAIRE All-inclusive","limit":"30"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"' + chartTitle[index] + 'Green vs Gold Open Access"},"subtitle":{"text":"By Scientific area"},"yAxis":{"title":{}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}'+greenAndGoldPalette+'}}');
+ let gold_green_ind_fl2: Indicator = (new Indicator("", "", "chart", "medium", true, true, [utils.generateIndicatorByChartUrl("stats-tool", gold_green__fl2, "column")]));
+ // open_non_fl2_ind.indicatorPaths[0].parameters["id"] = stakeholder.index_shortName.toLowerCase();
+ indicators.push(gold_green_ind_fl2);
+ if (index != 0) {
+ gold_green_ind_fl2.recommendedFor.push("ec__________::EC");
+ }
}
-
let open_non_fl1 = "http://88.197.53.71:8080/stats-api/chart?json=" + encodeURIComponent(
- '{"library":"HighCharts","chartDescription":{"queries":[{"name":"Open Access","type":"bar","query":{"select":[{"field":"' + dbType + '","aggregate":"count"},{"field":"' + dbType + '.project.funding level 1","aggregate":null}],"filters":['+fundingFilter[index]+',{"groupFilters":[{"field":"' + dbType + '.access mode","type":"=","values":["Open Access"]}],"op":"AND"}],"entity":"' + dbType + '","profile":"OpenAIRE All-inclusive","limit":"30"}},{"name":"Non Open Access","type":"bar","query":{"select":[{"field":"' + dbType + '","aggregate":"count"},{"field":"' + dbType + '.project.funding level 1","aggregate":null}],"filters":[{"groupFilters":[{"field":"' + dbType + '.access mode","type":"!=","values":["Open Access"]}],"op":"AND"}'+(fundingFilter[index].length >0?', ':'')+fundingFilter[index]+'],"entity":"' + dbType + '","profile":"OpenAIRE All-inclusive","limit":"30"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Open Access vs Non Open Access"},"subtitle":{"text":"'+chartTitle[index]+'"},"yAxis":{"title":{}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}');
- let open_non_fl1_ind: Indicator = (new Indicator("By Programme", "", "chart", "medium", true, true, [utils.generateIndicatorByChartUrl("stats-tool", open_non_fl1, "column")]));
+ '{"library":"HighCharts","chartDescription":{"queries":[{"name":"Open Access","type":"bar","query":{"select":[{"field":"' + dbType + '","aggregate":"count"},{"field":"' + dbType + '.project.funding level 1","aggregate":null}],"filters":['+fundingFilter[index]+',{"groupFilters":[{"field":"' + dbType + '.access mode","type":"=","values":["Open Access"]}],"op":"AND"}],"entity":"' + dbType + '","profile":"OpenAIRE All-inclusive","limit":"30"}},{"name":"Non Open Access","type":"bar","query":{"select":[{"field":"' + dbType + '","aggregate":"count"},{"field":"' + dbType + '.project.funding level 1","aggregate":null}],"filters":[{"groupFilters":[{"field":"' + dbType + '.access mode","type":"!=","values":["Open Access"]}],"op":"AND"}'+(fundingFilter[index].length >0?', ':'')+fundingFilter[index]+'],"entity":"' + dbType + '","profile":"OpenAIRE All-inclusive","limit":"30"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"' + chartTitle[index] + 'Open Access vs Non Open Access"},"subtitle":{"text":"By Programme"},"yAxis":{"title":{}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}');
+ let open_non_fl1_ind: Indicator = (new Indicator("", "", "chart", "medium", true, true, [utils.generateIndicatorByChartUrl("stats-tool", open_non_fl1, "column")]));
// open_non_fl2_ind.indicatorPaths[0].parameters["id"] = stakeholder.index_shortName.toLowerCase();
indicators.push(open_non_fl1_ind);
if (index != 0) {
open_non_fl1_ind.recommendedFor.push("ec__________::EC");
}
- let gold_green__fl1 = "http://88.197.53.71:8080/stats-api/chart?json=" + encodeURIComponent(
- '{"library":"HighCharts","chartDescription":{"queries":[{"name":"Green OA","type":"bar","query":{"select":[{"field":"' + dbType + '","aggregate":"count"},{"field":"' + dbType + '.project.funding level 1","aggregate":null}],"filters":[{"groupFilters":[{"field":"' + dbType + '.project.funding level 0","type":"=","values":["' + fieldValue[index] + '"]}],"op":"AND"},{"groupFilters":[{"field":"' + dbType + '.access mode","type":"=","values":["Open Access"]}],"op":"AND"},{"groupFilters":[{"field":"' + dbType + '.datasource.type","type":"contains","values":["repo"]}],"op":"AND"}],"entity":"' + dbType + '","profile":"OpenAIRE All-inclusive","limit":"30"}},{"name":"Gold OA","type":"bar","query":{"select":[{"field":"' + dbType + '","aggregate":"count"},{"field":"' + dbType + '.project.funding level 1","aggregate":null}],"filters":[{"groupFilters":[{"field":"' + dbType + '.access mode","type":"=","values":["Open Access"]}],"op":"AND"},{"groupFilters":[{"field":"' + dbType + '.project.funding level 0","type":"=","values":["' + fieldValue[index] + '"]}],"op":"AND"},{"groupFilters":[{"field":"' + dbType + '.datasource.id","type":"starts_with","values":["doaj"]}],"op":"AND"}],"entity":"' + dbType + '","profile":"OpenAIRE All-inclusive","limit":"30"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Green vs Gold Open Access"},"subtitle":{"text":"' + chartTitle[index] + '"},"yAxis":{"title":{}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}}}');
- let gold_green_ind_fl1: Indicator = (new Indicator("", "", "chart", "medium", true, true, [utils.generateIndicatorByChartUrl("stats-tool", gold_green__fl1, "column")]));
- // open_non_fl2_ind.indicatorPaths[0].parameters["id"] = stakeholder.index_shortName.toLowerCase();
- indicators.push(gold_green_ind_fl1);
- if (index != 0) {
- gold_green_ind_fl1.recommendedFor.push("ec__________::EC");
+ if(dbType == "publication") {
+ let gold_green__fl1 = "http://88.197.53.71:8080/stats-api/chart?json=" + encodeURIComponent(
+ '{"library":"HighCharts","chartDescription":{"queries":[{"name":"Green OA","type":"bar","query":{"select":[{"field":"' + dbType + '","aggregate":"count"},{"field":"' + dbType + '.project.funding level 1","aggregate":null}],"filters":[{"groupFilters":[{"field":"' + dbType + '.project.funding level 0","type":"=","values":["' + fieldValue[index] + '"]}],"op":"AND"},{"groupFilters":[{"field":"' + dbType + '.access mode","type":"=","values":["Open Access"]}],"op":"AND"},{"groupFilters":[{"field":"' + dbType + '.datasource.type","type":"contains","values":["repo"]}],"op":"AND"}],"entity":"' + dbType + '","profile":"OpenAIRE All-inclusive","limit":"30"}},{"name":"Gold OA","type":"bar","query":{"select":[{"field":"' + dbType + '","aggregate":"count"},{"field":"' + dbType + '.project.funding level 1","aggregate":null}],"filters":[{"groupFilters":[{"field":"' + dbType + '.access mode","type":"=","values":["Open Access"]}],"op":"AND"},{"groupFilters":[{"field":"' + dbType + '.project.funding level 0","type":"=","values":["' + fieldValue[index] + '"]}],"op":"AND"},{"groupFilters":[{"field":"' + dbType + '.datasource.id","type":"starts_with","values":["doaj"]}],"op":"AND"}],"entity":"' + dbType + '","profile":"OpenAIRE All-inclusive","limit":"30"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"' + chartTitle[index] + 'Green vs Gold Open Access"},"subtitle":{"text":"By Programme"},"yAxis":{"title":{}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":true,"align":"center","verticalAlign":"bottom","layout":"horizontal"},"credits":{"href":null,"enabled":true,"text":"Created by OpenAIRE via HighCharts"}'+greenAndGoldPalette+'}}');
+ let gold_green_ind_fl1: Indicator = (new Indicator("", "", "chart", "medium", true, true, [utils.generateIndicatorByChartUrl("stats-tool", gold_green__fl1, "column")]));
+ // open_non_fl2_ind.indicatorPaths[0].parameters["id"] = stakeholder.index_shortName.toLowerCase();
+ indicators.push(gold_green_ind_fl1);
+ if (index != 0) {
+ gold_green_ind_fl1.recommendedFor.push("ec__________::EC");
+ }
}
}
@@ -286,16 +289,16 @@ export class StakeholderCreator {
return indicators;
}
static createOSTopic(stakeholder:Stakeholder):Topic{
- let topic = new Topic("Open Science","Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do...","open-science",true,true);
+ let topic = new Topic("Open Science","","open-science",true,true);
topic.categories.push(this.createOpenAccessTopic(stakeholder));
- let linked:Category = new Category("Fair / Linked","","linked",true,true);
+ let linked:Category = new Category("Fair / Linked","Indicators based on FAIR data maturity model will soon be included","linked",true,true);
topic.categories.push(linked);
linked.subCategories.push(this.createOSOverviewPerType(stakeholder,"Publications","Publication","publication","publications"));
linked.subCategories.push(this.createOSOverviewPerType(stakeholder,"Research data","Research data","dataset","datasets"));
linked.subCategories.push(this.createOSOverviewPerType(stakeholder,"Software","Software","software","software"));
linked.subCategories.push(this.createOSOverviewPerType(stakeholder,"Other research products","Other research product","other","other"));
- let openInfra:Category = new Category("Open Infrastructures","","open-infrastructures",true,true);
+ let openInfra:Category = new Category("Open Infrastructures","Indicators based on the use of services for generating, producing and publishing research","open-infrastructures",true,true);
openInfra.subCategories.push(new SubCategory("Overview","","overview",true,true,true));
topic.categories.push(openInfra);
return topic;
diff --git a/src/index.html b/src/index.html
index 799ccce..95e6aff 100644
--- a/src/index.html
+++ b/src/index.html
@@ -27,8 +27,8 @@
-
-
+
+
@@ -43,6 +43,8 @@
+
+