Project

General

Profile

« Previous | Next » 

Revision 57839

[Monitor dashborad|Trunk]

Updates on funder default profile

View differences:

modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/monitor/monitor.component.html
1 1
<!--disable_transitions -->
2 2
<div class="double-header stakeholderPage">
3
    <div class="">
4
        <div id="header_menu" class="uk-width-1-1">
5
            <nav class="uk-navbar">
3
  <div class="">
4
    <div id="header_menu" class="uk-width-1-1">
5
      <nav class="uk-navbar">
6 6

  
7
                <div class="uk-navbar-left">
8
                    <img class="badge "
9
                         src="assets/theme-assets/prototype_flag.svg"
10
                         alt="BETA">
11
                    <a *ngIf="stakeholder"
12
                       class="uk-logo uk-navbar-item ng-star-inserted uk-link uk-margin-small-top  uk-margin-medium-left"
13
                       routerlink="/"
14
                       routerlinkactive="uk-link" href="/">
15
                        <img *ngIf="stakeholder.logoUrl" [src]="stakeholder.logoUrl" class="uk-responsive-height">
16
                        <div *ngIf="!stakeholder.logoUrl">
17
                            {{stakeholder.index_name}}
18
                        </div>
19
                    </a>
20
                    <div class="uk-margin-large-left uk-width-medium ng-star-inserted">
21
                        <div class="">
22
                            <!--              <div dashboard-input label="Search for..." [formInput]="keyword"></div>-->
23
                        </div>
24
                    </div>
25
                </div>
7
        <div class="uk-navbar-left">
8
          <img class="badge "
9
               src="assets/theme-assets/prototype_flag.svg"
10
               alt="BETA">
11
          <a *ngIf="stakeholder"
12
             class="uk-logo uk-navbar-item ng-star-inserted uk-link uk-margin-small-top  uk-margin-medium-left"
13
             routerlink="/"
14
             routerlinkactive="uk-link" href="/">
15
            <img *ngIf="stakeholder.logoUrl" [src]="stakeholder.logoUrl" class="uk-responsive-height">
16
            <div *ngIf="!stakeholder.logoUrl">
17
              {{stakeholder.index_name}}
18
            </div>
19
          </a>
20
          <div class="uk-margin-large-left uk-width-medium ng-star-inserted">
21
            <div class="">
22
              <!--              <div dashboard-input label="Search for..." [formInput]="keyword"></div>-->
23
            </div>
24
          </div>
25
        </div>
26 26

  
27
                <div *ngIf="stakeholder && status === errorCodes.DONE && activeTopic"
28
                     class="uk-navbar-right uk-margin-right">
29
                    <!--<ul class="uk-navbar-nav">
30
                      <li class="uk-active">
31
                        <a class="uk-margin-remove-bottom "><span>Monitor</span></a>
32
                      </li>
33
                      <li>
34
                        <a class="uk-margin-remove-bottom ">Search</a>
35
                      </li>
36
                      <li>
37
                        <a class="uk-margin-remove-bottom ">Help</a>
38
                      </li>
27
        <div *ngIf="stakeholder && status === errorCodes.DONE && activeTopic" class="uk-navbar-right uk-margin-right">
28
          <!--<ul class="uk-navbar-nav">
29
            <li class="uk-active">
30
              <a class="uk-margin-remove-bottom "><span>Monitor</span></a>
31
            </li>
32
            <li>
33
              <a class="uk-margin-remove-bottom ">Search</a>
34
            </li>
35
            <li>
36
              <a class="uk-margin-remove-bottom ">Help</a>
37
            </li>
39 38

  
40
                    </ul>-->
41
                </div>
42
            </nav>
39
          </ul>-->
43 40
        </div>
41
      </nav>
44 42
    </div>
45
    <div class="sidebar_main_swipe  header_full" [class.sidebar_main_active]="open">
46
        <div id="header_main">
47
            <nav class="uk-light">
48
                <div class="main_logo_top">
49
                    <div *ngIf="stakeholder && stakeholder.index_name" class=" ">
50
                        <div class="uk-text-bold uk-h4 uk-margin-remove-bottom">{{stakeholder.index_name}}</div>
51
                        <div class="uk-h5 uk-margin-remove">Monitor Dashboard</div>
52
                    </div>
43
  </div>
44
  <div class="sidebar_main_swipe  header_full" [class.sidebar_main_active]="open">
45
    <div id="header_main">
46
      <nav class="uk-light">
47
        <div class="main_logo_top">
48
          <div *ngIf="stakeholder && stakeholder.index_name" class=" ">
49
            <div class="uk-text-bold uk-h4 uk-margin-remove-bottom">{{stakeholder.index_name}}</div>
50
            <div class="uk-h5 uk-margin-remove">Monitor Dashboard</div>
51
          </div>
52
        </div>
53
        <a id="sidebar_main_toggle" (click)="toggleOpen()" class="sSwitch sSwitch_left uk-margin-left">
54
          <span class="sSwitchIcon"></span>
55
        </a>
56
        <div *ngIf="stakeholder && status === errorCodes.DONE && activeTopic" class="uk-navbar-center">
57
          <ul class="uk-navbar-nav">
58
            <ng-template ngFor [ngForOf]="stakeholder.topics" let-topic let-i="index">
59
              <li *ngIf="topic.isPublic && topic.isActive"
60
                  [ngClass]="(topic.alias === activeTopic.alias)?'uk-active':''">
61
                <a (click)="navigateTo(stakeholder.alias, topic.alias)" class="uk-margin-remove-bottom uk-h4"
62
                ><span>{{topic.name}}</span></a>
63
              </li>
64
            </ng-template>
65
          </ul>
66
        </div>
67
      </nav>
68
    </div>
69
    <dashboard-sidebar *ngIf="sideBar && stakeholder" [items]="sideBar.items"
70
                       [activeItem]="activeCategory?activeCategory.alias:null"
71
                       [activeSubItem]="activeSubCategory?activeSubCategory.alias:null" [showHeader]=false
72
    ></dashboard-sidebar>
73
    <div *ngIf="activeSubCategory"
74
         id="page_content" click-outside-or-esc targetId="page_content" [escClose]="false"
75
         (clickOutside)="toggleOpen($event)">
76
      <div id="page_content_inner">
77
        <!--      <div>
78
                Filters
79
                <input class="uk-input uk-form-width-medium" placeholder="Funding Stream" type="text" name="fund_level_0"
80
                       [(ngModel)]="fundingL0">
81

  
82
              <input class="uk-input uk-form-width-medium" placeholder="Start year" type="text" name="start_year"
83
                     [(ngModel)]="startYear">
84
                <input class="uk-input uk-form-width-medium" placeholder="End year" type="text" name="end_year"
85
                       [(ngModel)]="endYear">
86
                <button class="uk-button uk-button-primary" (click)="setIndicators()">Apply</button>
87
          </div>-->
88

  
89

  
90
        <div class="" *ngIf="activeSubCategory.numbers.length == 0  && activeSubCategory.charts.length == 0;">
91
          <div class="">
92
            <div class="uk-h3">
93
              No indicators available yet. Stay tuned!
94
            </div>
95
          </div>
96
        </div>
97
        <div *ngIf="activeSubCategory" class="uk-grid uk-grid-medium uk-margin-bottom" uk-height-match="target: div.md-card">
98

  
99
          <ng-template ngFor [ngForOf]="activeSubCategory.numbers" let-number let-i="index">
100
            <div *ngIf="number.isActive && number.isPublic"
101
                 [class.uk-width-1-3@m]="number.width === 'small'"
102
                 [class.uk-width-1-2@m]="number.width === 'medium'"
103
                 [class.uk-width-1-1]="number.width === 'large'">
104
              <div class="md-card"
105
                   [attr.uk-tooltip]="number.description">
106
                <div class="md-card-content">
107
                  <span class="uk-text-muted uk-margin-bottom uk-h5">{{number.name}}</span>
108
                  <h2 *ngIf="numberResults.get(i)" class="uk-margin-remove">
109
                    <span>{{numberResults.get(i) | number}}</span>
110
                  </h2>
53 111
                </div>
54
                <a id="sidebar_main_toggle" (click)="toggleOpen()" class="sSwitch sSwitch_left uk-margin-left">
55
                    <span class="sSwitchIcon"></span>
56
                </a>
57
                <div *ngIf="stakeholder && status === errorCodes.DONE && activeTopic" class="uk-navbar-center">
58
                    <ul class="uk-navbar-nav">
59
                        <ng-template ngFor [ngForOf]="stakeholder.topics" let-topic let-i="index">
60
                            <li *ngIf="topic.isPublic && topic.isActive"
61
                                [ngClass]="(topic.alias === activeTopic.alias)?'uk-active':''">
62
                                <a (click)="navigateTo(stakeholder.alias, topic.alias)"
63
                                   class="uk-margin-remove-bottom uk-h4"
64
                                ><span>{{topic.name}}</span></a>
65
                            </li>
66
                        </ng-template>
67
                    </ul>
68
                </div>
69
            </nav>
112
              </div>
113
            </div>
114
          </ng-template>
70 115
        </div>
71
        <dashboard-sidebar *ngIf="sideBar && stakeholder" [items]="sideBar.items"
72
                           [activeItem]="activeCategory?activeCategory.alias:null"
73
                           [activeSubItem]="activeSubCategory?activeSubCategory.alias:null" [showHeader]=false
74
        ></dashboard-sidebar>
75
        <div id="page_content" click-outside-or-esc targetId="page_content" [escClose]="false"
76
             (clickOutside)="toggleOpen($event)">
77
            <div id="page_content_inner">
78
                <!--      <div>
79
                        Filters
80
                        <input class="uk-input uk-form-width-medium" placeholder="Funding Stream" type="text" name="fund_level_0"
81
                               [(ngModel)]="fundingL0">
116
        <div *ngIf="(activeSubCategory && activeSubCategory.charts.length == 0) &&  ((activeSubCategory && activeSubCategory.description &&
117
        activeSubCategory.description.length > 0) ||
118
          (activeCategory && activeCategory.description && activeCategory.description.length > 0) ||
119
          (activeTopic && activeTopic.description && activeTopic.description.length > 0))"
120
             class="">
121
          <div class="">
122
            <div class="uk-h5">
123
              {{activeSubCategory.description && activeSubCategory.description.length > 0 ? activeSubCategory.description
124
                : (activeCategory.description && activeCategory.description.length > 0 ? activeCategory.description :
125
                    (activeTopic.description && activeTopic.description.length > 0 ? activeTopic.description : ""))}}
126
            </div>
127
          </div>
128
        </div>
129
        <div  *ngIf="activeSubCategory"class="uk-grid uk-grid-medium uk-margin-bottom uk-flex uk-flex-bottom "
130
             uk-height-match="target: div > div > .chartTitle">
131
          <ng-template ngFor [ngForOf]="activeSubCategory.charts" let-chart let-i="index">
132
            <div *ngIf="chart.isActive && chart.isPublic && chartsActiveType.get(i)"
133
                 [class.uk-width-1-3@m]="chart.width === 'small'"
134
                 [class.uk-width-1-2@m]="chart.width === 'medium'"
135
                 [class.uk-width-1-1]="chart.width === 'large'">
136
              <div class="indicatorBox">
82 137

  
83
                      <input class="uk-input uk-form-width-medium" placeholder="Start year" type="text" name="start_year"
84
                             [(ngModel)]="startYear">
85
                        <input class="uk-input uk-form-width-medium" placeholder="End year" type="text" name="end_year"
86
                               [(ngModel)]="endYear">
87
                        <button class="uk-button uk-button-primary" (click)="setIndicators()">Apply</button>
88
                  </div>-->
89
                <h4 *ngIf="activeSubCategory && (activeSubCategory.numbers.length > 0
90
                || activeSubCategory.charts.length > 0); else noIndicators"
91
                    class="uk-margin uk-margin-top uk-text-bold">Indicators
138
                <h4 class="uk-margin-bottom uk-margin-top chartTitle uk-flex uk-flex-bottom ">
139
                  <div>{{chart.name + " "}}</div>
92 140
                </h4>
93
                <ng-template #noIndicators>
94

  
95
                    <div class="">
96
                        <div class="">
97
                            <div class="uk-h3">
98
                                No indicators available yet. Stay tuned!
99
                            </div>
100
                        </div>
141
                <div class="md-card" [attr.uk-tooltip]="chart.description">
142
                  <div class="md-card-content uk-text-center">
143
                    <div *ngIf="chart.indicatorPaths.length > 1" class="uk-button-group">
144
                      <button *ngFor="let indicatorPath of chart.indicatorPaths;"
145
                              class="uk-button"
146
                              (click)="setActiveChart(i, indicatorPath.type)"
147
                              [class.uk-button-secondary]="chartsActiveType.get(i).url === indicatorPath.url">
148
                        {{indicatorPath.type}}
149
                      </button>
101 150
                    </div>
102
                    <div *ngIf="(activeSubCategory && activeSubCategory.description && activeSubCategory.description.length > 0) ||
103
          (activeCategory && activeCategory.description && activeCategory.description.length > 0) ||
104
          (activeTopic && activeTopic.description && activeTopic.description.length > 0)"
105
                         class="">
106
                        <div class="">
107
                            <div class="uk-h5">
108
                                {{activeSubCategory.description && activeSubCategory.description.length > 0 ? activeSubCategory.description
109
                                : (activeCategory.description && activeCategory.description.length > 0 ? activeCategory.description :
110
                                    (activeTopic.description && activeTopic.description.length > 0 ? activeTopic.description : ""))}}
111
                            </div>
112
                        </div>
113
                    </div>
114
                </ng-template>
115
                <div *ngIf="activeSubCategory" class="uk-grid uk-grid-medium uk-margin-bottom"
116
                     uk-height-match="target: div.md-card">
117
                    <ng-template ngFor [ngForOf]="activeSubCategory.numbers" let-number let-i="index">
118
                        <div *ngIf="number.isActive && number.isPublic"
119
                             [class.uk-width-1-3@m]="number.width === 'small'"
120
                             [class.uk-width-1-2@m]="number.width === 'medium'"
121
                             [class.uk-width-1-1]="number.width === 'large'">
122
                            <div class="md-card"
123
                                 [attr.uk-tooltip]="number.description">
124
                                <div class="md-card-content">
125
                                    <span class="uk-text-muted uk-margin-bottom uk-h5">{{number.name}}</span>
126
                                    <h2 *ngIf="numberResults.get(i)" class="uk-margin-remove">
127
                                        <span>{{numberResults.get(i) | number}}</span>
128
                                    </h2>
129
                                </div>
130
                            </div>
131
                        </div>
132
                    </ng-template>
151
                    <iframe *ngIf="chartsActiveType.get(i).source !== 'image'"
152
                            [src]="chartsActiveType.get(i).safeResourceUrl"
153
                            class="uk-width-1-1 uk-height-medium"></iframe>
154
                    <!--                                        {{chartsActiveType.get(i).safeResourceUrl}}-->
155
                    <!--                    <a [href]="chartsActiveType.get(i).safeResourceUrl" target="_blank" > ChartuURL</a>-->
156
                    <img *ngIf="chartsActiveType.get(i).source === 'image'"
157
                         [src]="chartsActiveType.get(i).safeResourceUrl"
158
                         class="uk-width-1-1 uk-height-medium">
159
                  </div>
133 160
                </div>
134
                <div *ngIf="activeSubCategory" class="uk-grid uk-grid-medium uk-margin-bottom uk-flex uk-flex-bottom "
135
                     uk-height-match="target: div > div > .chartTitle">
136
                    <ng-template ngFor [ngForOf]="activeSubCategory.charts" let-chart let-i="index">
137
                        <div *ngIf="chart.isActive && chart.isPublic && chartsActiveType.get(i)"
138
                             [class.uk-width-1-3@m]="chart.width === 'small'"
139
                             [class.uk-width-1-2@m]="chart.width === 'medium'"
140
                             [class.uk-width-1-1]="chart.width === 'large'">
141
                            <div class="indicatorBox">
142

  
143
                                <h4 class="uk-margin-bottom uk-margin-top chartTitle uk-flex uk-flex-bottom ">
144
                                    <div>{{chart.name + " "}}</div>
145
                                </h4>
146
                                <div class="md-card" [attr.uk-tooltip]="chart.description">
147
                                    <div class="md-card-content uk-text-center">
148
                                        <div *ngIf="chart.indicatorPaths.length > 1" class="uk-button-group">
149
                                            <button *ngFor="let indicatorPath of chart.indicatorPaths;"
150
                                                    class="uk-button"
151
                                                    (click)="setActiveChart(i, indicatorPath.type)"
152
                                                    [class.uk-button-secondary]="chartsActiveType.get(i).url === indicatorPath.url">
153
                                                {{indicatorPath.type}}
154
                                            </button>
155
                                        </div>
156
                                        <iframe *ngIf="chartsActiveType.get(i).source !== 'image'"
157
                                                [src]="chartsActiveType.get(i).safeResourceUrl"
158
                                                class="uk-width-1-1 uk-height-medium"></iframe>
159
                                        <!--                    {{chartsActiveType.get(i).safeResourceUrl}}-->
160
                                        <img *ngIf="chartsActiveType.get(i).source === 'image'"
161
                                             [src]="chartsActiveType.get(i).safeResourceUrl"
162
                                             class="uk-width-1-1 uk-height-medium">
163
                                    </div>
164
                                </div>
165
                            </div>
166
                        </div>
167
                    </ng-template>
168
                </div>
161
              </div>
169 162
            </div>
163
          </ng-template>
170 164
        </div>
165
      </div>
171 166
    </div>
172
    <a *ngIf="stakeholder" id="style_switcher" class="" routerLinkActive="active"
173
       [routerLink]="['/admin', this.stakeholder.alias]">
174
        <div id="style_switcher_toggle"><i class="material-icons">settings</i></div>
175
    </a>
167
  </div>
168
  <a *ngIf="stakeholder" id="style_switcher" class="" routerLinkActive="active"
169
     [routerLink]="['/admin', this.stakeholder.alias]">
170
    <div id="style_switcher_toggle"><i class="material-icons">settings</i></div>
171
  </a>
176 172
</div>
177 173

  
178 174

  
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/monitor/monitor.component.ts
55 55
    public keyword: FormControl;
56 56

  
57 57
    constructor(
58
        private route: ActivatedRoute,
59
        private _router: Router,
60
        private _meta: Meta,
61
        private _title: Title,
62
        private _piwikService: PiwikService,
63
        private helper: HelperService,
64
        private stakeholderService: StakeholderService,
65
        private statisticsService: StatisticsService,
66
        private layoutService: LayoutService,
67
        private seoService: SEOService,
68
        private cdr: ChangeDetectorRef,
69
        private sanitizer: DomSanitizer, private _fb: FormBuilder) {
58
      private route: ActivatedRoute,
59
      private _router: Router,
60
      private _meta: Meta,
61
      private _title: Title,
62
      private _piwikService: PiwikService,
63
      private helper: HelperService,
64
      private stakeholderService: StakeholderService,
65
      private statisticsService: StatisticsService,
66
      private layoutService: LayoutService,
67
      private seoService: SEOService,
68
      private cdr: ChangeDetectorRef,
69
      private sanitizer: DomSanitizer, private _fb: FormBuilder) {
70 70
        this.errorCodes = new ErrorCodes();
71 71
        this.errorMessages = new ErrorMessagesComponent();
72 72
        this.status = this.errorCodes.LOADING;
......
91 91
                        this.status = this.errorCodes.LOADING;
92 92
                        this.numberResults = new Map<number, number>();
93 93
                        this.chartsActiveType = new Map<number, IndicatorPath>();
94
                        subscription = this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
95
                            /*let stakeholder: Stakeholder = null;
94
                        // subscription = this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
95
                            let stakeholder: Stakeholder = null;
96 96
                            if (params['stakeholder'] == "fwf") {
97 97
                                stakeholder = new Stakeholder(null, "funder", "fwf_________::FWF", "Austrian Science Fund (FWF)", "FWF",
98 98
                                    false, "fwf", true, true, null);
......
110 110
                                    false, "ec", true, true, null);
111 111
                                stakeholder = this.stakeholderUtils.createFunderFromDefaultProfile(stakeholder, StakeholderCreator.createFunderDefaultProfile().topics);
112 112
                                stakeholder.logoUrl = "./assets/ec.png";
113
                            }*/
113
                            }
114 114
                            if (stakeholder) {
115 115
                                this.stakeholder = stakeholder;
116 116
                                this.seoService.createLinkForCanonicalURL(url, false);
......
129 129
                                this.status = this.errorCodes.DONE;
130 130
                                this.setView(params);
131 131
                            }
132
                        }, error => {
133
                            this.navigateToError();
134
                        });
132
                        // }, error => {
133
                        //     this.navigateToError();
134
                        // });
135 135
                        this.subscriptions.push(subscription);
136 136
                    } else {
137 137
                        this.setView(params);
......
213 213
                        }
214 214
                    } else {
215 215
                        this.activeSubCategory = this.activeCategory.subCategories.find(subCategory =>
216
                            subCategory.isPublic && subCategory.isActive);
216
                          subCategory.isPublic && subCategory.isActive);
217 217
                    }
218 218
                    if (this.activeSubCategory) {
219 219
                        this.setSideBar();
......
258 258
                category.subCategories.forEach(subCategory => {
259 259
                    if (subCategory.isPublic && subCategory.isActive) {
260 260
                        subItems.push(new Item(subCategory.alias, subCategory.name, (
261
                            '/' + this.stakeholder.alias + '/' + this.activeTopic.alias + '/' + category.alias + '/' + subCategory.alias),
262
                            null, null, false));
261
                          '/' + this.stakeholder.alias + '/' + this.activeTopic.alias + '/' + category.alias + '/' + subCategory.alias),
262
                          null, null, false));
263 263
                    }
264 264
                });
265 265
                let open = this.activeCategory.alias === category.alias;
......
267 267
                    open = MonitorComponent.sidebarStatus.status[index];
268 268
                }
269 269
                items.push(new Item(category.alias, category.name, (
270
                    '/' + this.stakeholder.alias + '/' + this.activeTopic.alias + '/' + category.alias),
271
                    subItems, null, open));
270
                  '/' + this.stakeholder.alias + '/' + this.activeTopic.alias + '/' + category.alias),
271
                  subItems, null, open));
272 272
            }
273 273
        });
274 274
        if(items.length === 0) {
......
317 317

  
318 318
    public getUrlByStakeHolder(indicatorPath: IndicatorPath) {
319 319
        return this.sanitizer.bypassSecurityTrustResourceUrl(
320
            this.statisticsService.getChartUrl(indicatorPath.source, this.indicatorUtils.getFullUrl(indicatorPath, this.fundingL0, this.startYear, this.endYear)));
320
          this.statisticsService.getChartUrl(indicatorPath.source, this.indicatorUtils.getFullUrl(indicatorPath, this.fundingL0, this.startYear, this.endYear)));
321 321
    }
322 322

  
323 323
    public setActiveChart(index, type: string) {
......
332 332

  
333 333
    public navigateTo(stakeholder: string, topic: string, category: string = null, subcategory: string = null) {
334 334
        let url = stakeholder + '/' + topic + ((category) ? ('/'
335
            + category) : '') + ((subcategory) ? ('/' + subcategory) : '');
335
          + category) : '') + ((subcategory) ? ('/' + subcategory) : '');
336 336
        return this._router.navigate([url]);
337 337
    }
338 338

  
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/app/utils/entities/stakeholderCreator.ts
8 8
    funder.topics.push(StakeholderCreator.createResearchProductionTopic(funder));
9 9
    funder.topics.push(StakeholderCreator.createOSTopic(funder));
10 10
    let collaboration = new Topic("Collaboration","Indexes for collaboration","collaboration", true, true);
11
    collaboration.categories.push(this.createEmptyCategory("Academic Impact","","academic-impact"));
12
    collaboration.categories.push(this.createEmptyCategory("Economic Impact","","economic-impact"));
13
    collaboration.categories.push(this.createEmptyCategory("Societal Impact","","societal-impact"));
11
    collaboration.categories.push(this.createEmptyCategory("International collaboration","Indicators for international collaborations based on the percentage of research results or patents with at least one co-author from abroad","international-collaboration"));
12
    collaboration.categories.push(this.createEmptyCategory("EU collaboration","Indicators for EU Collaboration based on the percentage of research results or patents with at least one co-author from another EU organization","eu-collaboration"));
13
    collaboration.categories.push(this.createEmptyCategory("Industrial collaboration","Indicators for Industrial collaboration based on the percentage of research results or patents with at least one co-author from the industry","industrial-collaboration"));
14
    collaboration.categories.push(this.createEmptyCategory("Transdisciplinary / transectoral collaboration","Indicators for Transdisciplinary/transectoral collaboration based on the percentage of research results or patents with at least one co-author from another discipline or sector","transdisciplinary-collaboration"));
15

  
14 16
    funder.topics.push(collaboration);
15 17

  
16
    funder.topics.push(StakeholderCreator.createEmptyTopic("Diffusion","","diffusion"));
18
    funder.topics.push(StakeholderCreator.createEmptyTopic("Diffusion","Indicators based on citations, classifications and usage data: How diverse are the research knowledge resources upon which an article is drawn? How diverse are the venues in which a body of research appears? How diverse are the fields that cite a research result?","diffusion"));
17 19
    let impact = new Topic("Impact", "", "impact", true, true);
18
    impact.categories.push(this.createEmptyCategory("Academic Impact","","academic-impact"));
19
    impact.categories.push(this.createEmptyCategory("Economic Impact","","economic-impact"));
20
    impact.categories.push(this.createEmptyCategory("Societal Impact","","societal-impact"));
20
    impact.categories.push(this.createEmptyCategory("Academic Impact","Indicators based on citations and collaboration, related to MAG classifications.","academic-impact"));
21
    impact.categories.push(this.createEmptyCategory("Economic Impact","Indicators based on patents and collaboration between industry and academia","economic-impact"));
22
    impact.categories.push(this.createEmptyCategory("Societal Impact","Indicators that correlate research results with SDGs","societal-impact"));
21 23
    funder.topics.push(impact);
22 24

  
23 25
    return funder;
......
183 185
  static createOpenAccessTopic(stakeholder:Stakeholder):Category {
184 186
    let category = new Category("Open Access", "", "open-access", true, true);
185 187
    category.subCategories.push(this.createOASub(stakeholder,"Publications","Publication","publication","publications"));
186
    category.subCategories.push(this.createOASub(stakeholder,"Research data","Research data","dataset","datasets"));
187
    category.subCategories.push(this.createOASub(stakeholder,"Software","Software","software","software"));
188
    category.subCategories.push(this.createOASub(stakeholder,"Other research products","Other research product","other","other"));
188
    // category.subCategories.push(this.createOASub(stakeholder,"Research data","Research data","dataset","datasets"));
189
    // category.subCategories.push(this.createOASub(stakeholder,"Software","Software","software","software"));
190
    // category.subCategories.push(this.createOASub(stakeholder,"Other research products","Other research product","other","other"));
189 191
    return category;
190 192
  }
191 193
  static createOASub(stakeholder:Stakeholder,typePlural, typeSingl, dbType, dbTypePlural ):SubCategory {
192 194
    let sub:SubCategory =  new SubCategory(typePlural, null, dbTypePlural, true, true);
193
    // sub.charts = sub.charts.concat( this.createOAPerType(stakeholder,typePlural, typeSingl, dbType, dbTypePlural, 0 ));
194
    // sub.charts = sub.charts.concat( this.createOAPerType(stakeholder,typePlural, typeSingl, dbType, dbTypePlural, 1 ));
195
    sub.charts = sub.charts.concat( this.createOAPerType(stakeholder,typePlural, typeSingl, dbType, dbTypePlural, 0 ));
196
    sub.charts = sub.charts.concat( this.createOAPerType(stakeholder,typePlural, typeSingl, dbType, dbTypePlural, 1 ));
195 197
    // sub.charts = sub.charts.concat( this.createOAPerType(stakeholder,typePlural, typeSingl, dbType, dbTypePlural, 2 ));
196 198
    return sub;
197 199
  }
198 200
  static createOAPerType(stakeholder:Stakeholder,typePlural, typeSingl, dbType, dbTypePlural, index:number):Indicator[] {
199 201

  
200
    let fundingFilter = ['', ',{"groupFilters":[{"field":"' + dbType + '.project.funding level 0","type":"=","values":["FP7"]}],"op":"AND"}',
201
      ',{"groupFilters":[{"field":"' + dbType + '.project.funding level 0","type":"=","values":["H2020"]}],"op":"AND"}'];
202
    let categoryTitle = ["Overview", "FP7", "H2020"];
202
    let fundingFilter = ['', '{"groupFilters":[{"field":"' + dbType + '.project.funding level 0","type":"=","values":["FP7"]}],"op":"AND"}',
203
      '{"groupFilters":[{"field":"' + dbType + '.project.funding level 0","type":"=","values":["H2020"]}],"op":"AND"}'];
204
    let fieldValue = ["", "FP7", "H2020"];
203 205
    let chartTitle = ["", "FP7 ", "H2020 "];
204 206
    let indicators:Indicator[]=[];
205 207
    let utils = new IndicatorUtils();
206 208

  
207 209
    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"}}}');
208 210
      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"}}}');
209
    let open_non_ind:Indicator = new Indicator(categoryTitle[index], "", "column", "small", true, true, [utils.generateIndicatorByChartUrl("stats-tool", open_non_url, "pie")])
211
    let open_non_ind:Indicator = new Indicator(chartTitle[index], "", "chart", "small", true, true, [utils.generateIndicatorByChartUrl("stats-tool", open_non_url, "pie")])
210 212
    open_non_ind.indicatorPaths[0].parameters["id"] =  stakeholder.index_shortName.toLowerCase();
213
    if(index!=0){
214
      open_non_ind.recommendedFor.push("ec__________::EC");
215
    }
211 216
    indicators.push(open_non_ind);
212 217

  
213
    let gold_vs_green_url = "http://88.197.53.71:8080/stats-api/chart?json="+ 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"}}}');
214
    let gold_vs_green_ind:Indicator = (new Indicator("", "", "column", "small", true, true, [utils.generateIndicatorByChartUrl("stats-tool", gold_vs_green_url, "pie")]));
215
    gold_vs_green_ind.indicatorPaths[0].parameters["id"] =  stakeholder.index_shortName.toLowerCase();
216
    indicators.push(gold_vs_green_ind);
218
    if(dbType == "publication") {
219
      let gold_vs_green_url = "http://88.197.53.71:8080/stats-api/chart?json=" + encodeURIComponent('{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"column","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":{"text":"' + chartTitle[index] + ' Green vs Gold"},"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"}}}');
220
      let gold_vs_green_ind: Indicator = (new Indicator("", "", "chart", "small", true, true, [utils.generateIndicatorByChartUrl("stats-tool", gold_vs_green_url, "pie")]));
221
      gold_vs_green_ind.indicatorPaths[0].parameters["id"] = stakeholder.index_shortName.toLowerCase();
222
      if (index != 0) {
223
        gold_vs_green_ind.recommendedFor.push("ec__________::EC");
224
      }
225
      indicators.push(gold_vs_green_ind);
217 226

  
218
    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"}}}');
219
    let gold_vs_green_time_ind:Indicator = (new Indicator("", "", "column", "small", true, true, [utils.generateIndicatorByChartUrl("stats-tool", gold_vs_green_time_url, "column")]));
220
    gold_vs_green_time_ind.indicatorPaths[0].parameters["id"] =  stakeholder.index_shortName.toLowerCase();
221
    indicators.push(gold_vs_green_time_ind);
227
      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"}}}');
228
      let gold_vs_green_time_ind: Indicator = (new Indicator("", "", "chart", "small", true, true, [utils.generateIndicatorByChartUrl("stats-tool", gold_vs_green_time_url, "column")]));
229
      gold_vs_green_time_ind.indicatorPaths[0].parameters["id"] = stakeholder.index_shortName.toLowerCase();
230
      if (index != 0) {
231
        gold_vs_green_time_ind.recommendedFor.push("ec__________::EC");
232
      }
233
      indicators.push(gold_vs_green_time_ind);
234
    }
222 235

  
223 236
    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"}}}');
224
    let top_project_ind:Indicator = (new Indicator("", "", "column", "medium", true, true, [utils.generateIndicatorByChartUrl("stats-tool", top_project_url, "column")]));
237
    let top_project_ind:Indicator = (new Indicator("", "", "chart", "medium", true, true, [utils.generateIndicatorByChartUrl("stats-tool", top_project_url, "column")]));
225 238
    top_project_ind.indicatorPaths[0].parameters["id"] =  stakeholder.index_shortName.toLowerCase();
239
    if(index!=0){
240
      top_project_ind.recommendedFor.push("ec__________::EC");
241
    }
226 242
    indicators.push(top_project_ind);
227 243
    if(index == 0) {
228
      let top_datasources_url = "http://88.197.53.71:8080/stats-api/chart?json=" + encodeURIComponent('{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","color":"#e62020ee","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"}}}');
229
      let top_datasources_ind: Indicator = (new Indicator("By Content Providers", "", "column", "large", true, true, [utils.generateIndicatorByChartUrl("stats-tool", top_datasources_url, "column")]));
244
      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"}}}');
245
      let top_datasources_ind: Indicator = (new Indicator("", "", "chart", "medium", true, true, [utils.generateIndicatorByChartUrl("stats-tool", top_datasources_url, "column")]));
230 246
      top_datasources_ind.indicatorPaths[0].parameters["id"] = stakeholder.index_shortName.toLowerCase();
231 247
      indicators.push(top_datasources_ind);
232 248
    }
249
    if(index != 0) {
250
      let open_non_fl2 = "http://88.197.53.71:8080/stats-api/chart?json=" + encodeURIComponent(
251
        '{"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"}}}');
252
      let open_non_fl2_ind: Indicator = (new Indicator("By Scientific area", "", "chart", "medium", true, true, [utils.generateIndicatorByChartUrl("stats-tool", open_non_fl2, "column")]));
253
      // open_non_fl2_ind.indicatorPaths[0].parameters["id"] = stakeholder.index_shortName.toLowerCase();
254
      indicators.push(open_non_fl2_ind);
255
      if (index != 0) {
256
        open_non_fl2_ind.recommendedFor.push("ec__________::EC");
257
      }
258
      let gold_green__fl2 = "http://88.197.53.71:8080/stats-api/chart?json=" + encodeURIComponent(
259
        '{"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"}}}');
260
      let gold_green_ind_fl2: Indicator = (new Indicator("", "", "chart", "medium", true, true, [utils.generateIndicatorByChartUrl("stats-tool", gold_green__fl2, "column")]));
261
      // open_non_fl2_ind.indicatorPaths[0].parameters["id"] = stakeholder.index_shortName.toLowerCase();
262
      indicators.push(gold_green_ind_fl2);
263
      if (index != 0) {
264
        gold_green_ind_fl2.recommendedFor.push("ec__________::EC");
265
      }
266

  
267
      let open_non_fl1 = "http://88.197.53.71:8080/stats-api/chart?json=" + encodeURIComponent(
268
        '{"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"}}}');
269
      let open_non_fl1_ind: Indicator = (new Indicator("By Programme", "", "chart", "medium", true, true, [utils.generateIndicatorByChartUrl("stats-tool", open_non_fl1, "column")]));
270
      // open_non_fl2_ind.indicatorPaths[0].parameters["id"] = stakeholder.index_shortName.toLowerCase();
271
      indicators.push(open_non_fl1_ind);
272
      if (index != 0) {
273
        open_non_fl1_ind.recommendedFor.push("ec__________::EC");
274
      }
275
      let gold_green__fl1 = "http://88.197.53.71:8080/stats-api/chart?json=" + encodeURIComponent(
276
        '{"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"}}}');
277
      let gold_green_ind_fl1: Indicator = (new Indicator("", "", "chart", "medium", true, true, [utils.generateIndicatorByChartUrl("stats-tool", gold_green__fl1, "column")]));
278
      // open_non_fl2_ind.indicatorPaths[0].parameters["id"] = stakeholder.index_shortName.toLowerCase();
279
      indicators.push(gold_green_ind_fl1);
280
      if (index != 0) {
281
        gold_green_ind_fl1.recommendedFor.push("ec__________::EC");
282
      }
283
    }
284

  
285

  
233 286
    return indicators;
234 287
  }
235 288
  static createOSTopic(stakeholder:Stakeholder):Topic{
modules/uoa-monitor-portal/trunk/monitor_dashboard/src/assets/monitor-custom.css
84 84
}
85 85

  
86 86
.dashboard .double-header .header_full #page_content_inner {
87
    top:  calc(var(--header-height) + var(--monitor-header-menu-height));
88
    position: absolute;
87
    /*top:  calc(var(--header-height) + var(--monitor-header-menu-height));*/
88
    /*position: absolute;*/
89
    margin-top: calc(var(--header-height) + 24px);
89 90
}
90 91

  
91 92
.stakeholderPage  #sidebar_main .menu_section > ul li > a {

Also available in: Unified diff