Show claims by project token to project manager | metrics updated - openaire referrer added - pageviws added | selectModal created (currently not used anywhere)

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@46983 d315682c-612b-4755-9ff5-7f18f6832af3

portal-2/src/app/app-routing.module.ts

@@ -115,6 +115,12 @@ export function getClaimsAdminModule() {
   return System.import('./claims/claimsAdmin/claimsAdmin.module' + (process.env.AOT ? '.ngfactory' : ''))
     .then(mod => mod[(process.env.AOT ? 'ClaimsAdminModuleNgFactory' : 'ClaimsAdminModule')]);
 }
+
+export function getClaimsByTokenModule() {
+  return System.import('./claims/claimsByToken/claimsByToken.module' + (process.env.AOT ? '.ngfactory' : ''))
+    .then(mod => mod[(process.env.AOT ? 'ClaimsByTokenModuleNgFactory' : 'ClaimsByTokenModule')]);
+}
+
 export function getLinkingModule() {
   return System.import('./claims/linking/linkingGeneric.module' + (process.env.AOT ? '.ngfactory' : ''))
     .then(mod => mod[(process.env.AOT ? 'LinkingGenericModuleNgFactory' : 'LinkingGenericModule')]);
@@ -162,6 +168,7 @@ export function getUserModule() {
       { path: 'claims', loadChildren: getClaimsAdminModule },
       { path: 'participate/claim', loadChildren: getLinkingModule },
       { path: 'participate/direct-claim', loadChildren: getDirectLinkingModule },
+      { path: 'claims-project-manager', loadChildren: getClaimsByTokenModule },
       { path: 'user-info', loadChildren: getUserModule },
 
     ])

portal-2/src/app/claims/claimsByToken/claimsByToken-routing.module.ts

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { LoginGuard} from'../../login/loginGuard.guard';
+import { ClaimsByTokenComponent } from './claimsByToken.component';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      { path: '', component: ClaimsByTokenComponent, canActivate: [LoginGuard]}
+
+    ])
+  ]
+})
+export class ClaimsByTokenRoutingModule { }

portal-2/src/app/claims/claimsByToken/claimsByToken.component.ts

@@ -0,0 +1,271 @@
+import {Component, ViewChild, Input} from '@angular/core';
+import {Location} from '@angular/common';
+import {Observable}       from 'rxjs/Observable';
+import {ActivatedRoute, Router, Params} from '@angular/router';
+import {ClaimsByTokenService} from './claimsByToken.service';
+
+import {ModalSelect} from '../../utils/modal/selectModal.component';
+import {ModalLoading} from '../../utils/modal/loading.component';
+
+import {Session} from '../../login/utils/helper.class';
+
+@Component({
+    selector: 'claims-project-manager',
+    template: `
+
+      <!--div class="page-header">
+          <h1> Claims Manager </h1>
+      </div-->
+
+      <!--div *ngIf="accessStatus=='empty'" class="uk-margin-top uk-width-medium-2-3 uk-container-center">
+        <div class="uk-block uk-block-primary uk-block-large uk-contrast uk-text-center">
+          <p class="uk-text-large">Please enter your email and then press 'See Claims' button.</p>
+          <form class="uk-form">
+            <fieldset data-uk-margin>
+                <input type="text" placeholder="example@email.com" name="email" [(ngModel)]="email">
+                <button (click)="validateJWTandToken()" class="uk-button">See Claims</button>
+            </fieldset>
+          </form>
+        </div>
+      </div-->
+
+      <div *ngIf="accessStatus=='invalid'" class="uk-margin-top uk-width-medium-2-3 uk-container-center">
+        <div class="uk-block uk-block-primary uk-block-large uk-contrast uk-text-center">
+          <!--p class="uk-text-large">Oops! There is no entry for you! Please retry with another email or for another project.</p-->
+          <!--button (click)="accessStatus='empty'" class="uk-button">Retry</button-->
+          <p class="uk-text-large">Oops! Your email does not give you the authority to view claims for the selected project. Please contact the administrators.</p>
+        </div>
+      </div>
+
+      <div *ngIf="accessStatus=='valid'">
+        <h1> Pending Claims </h1>
+
+        <div *ngIf=" pending_claims && pending_claims.length == 0" >
+          <div class = "uk-alert uk-alert-info " >No pending claims found.</div>
+        </div>
+
+        <div class="">
+        <table *ngIf="pending_claims && pending_claims.length > 0" class="uk-table uk-table-striped">
+          <thead>
+             <tr>
+                <th>Research Result</th>
+                <th>Link to</th>
+                <th>Claimed by</th>
+                <th>Claimed Date</th>
+                <th>True</th>
+                <th>False</th>
+             </tr>
+          </thead>
+          <tbody>
+              <tr *ngFor="let claim of pending_claims ">
+                <td><claim-entity [entity]="claim.target" [type]="claim.targetType" > </claim-entity></td>
+                <td><claim-entity [entity]="claim.source" [type]="claim.sourceType" > </claim-entity></td>
+                <td>{{claim.userMail}}</td>
+                <td>{{claim.date}}</td>
+                <td><input [id]="claim.id" type="checkbox" (click)="selectApprove(claim.id,$event)"  [ngModel]="isSelectedRight(claim.id)"/></td>
+                <td><input [id]="claim.id" type="checkbox" (click)="selectDisapprove(claim.id,$event)"  [ngModel]="isSelectedWrong(claim.id)"/></td>
+              </tr>
+          </tbody>
+        </table>
+
+
+        <h1> Already Curated Claims </h1>
+
+        <div *ngIf=" curated_claims && curated_claims.length == 0" >
+          <div class = "uk-alert uk-alert-info " >No curated claims found.</div>
+        </div>
+
+        <div class="">
+        <table *ngIf="curated_claims && curated_claims.length > 0" class="uk-table uk-table-striped">
+          <thead>
+             <tr>
+                <th>Research Result</th>
+                <th>Link to</th>
+                <th>Claimed by</th>
+                <th>Claimed Date</th>
+                <th>Curated by</th>
+                <th>Curation Date</th>
+                <th>True</th>
+                <th>False</th>
+                <th></th>
+             </tr>
+          </thead>
+          <tbody>
+              <tr *ngFor="let claim of curated_claims let i=index">
+                <td><claim-entity [entity]="claim.target" [type]="claim.targetType" > </claim-entity></td>
+                <td><claim-entity [entity]="claim.source" [type]="claim.sourceType" > </claim-entity></td>
+                <td>{{claim.userMail}}</td>
+                <td>{{claim.date}}</td>
+                <td>{{claim.curatedBy}}</td>
+                <td>{{claim.curationDate}}</td>
+                <td><input [id]="claim.id" type="checkbox" [disabled]="!editable.has(i)" (click)="selectApprove(claim.id,$event)"  [ngModel]="isRight(claim)"/></td>
+                <td><input [id]="claim.id" type="checkbox" [disabled]="!editable.has(i)" (click)="selectDisapprove(claim.id,$event)"  [ngModel]="isWrong(claim)"/></td>
+                <td><button class="uk-button" (click)="editable.add(i)">Edit</button></td>
+              </tr>
+          </tbody>
+        </table>
+
+
+        <div class="uk-text-small uk-text-right">*Note that claims you did not approved or disapproved are considered as right (but not curated)</div>
+        <button class="uk-button uk-button-success uk-float-right" type="button" (click)="saveChanges()">Save Changes</button>
+
+        <!--modal-select (alertOutput)="curatorSelected($event)"></modal-select-->
+        <modal-loading [message]= "'Loading...'"></modal-loading>
+      </div>
+    `,
+
+})
+export class ClaimsByTokenComponent {
+  public token: string = "";
+  public sub: any;
+  private claims:any = [];
+  public pending_claims: any = [];
+  public curated_claims: any = [];
+  public selectedRight: Set<string>;
+  public selectedWrong: Set<string>;
+  public editable: Set<string>;
+  public contact_person: string[] = ["Konstantina", "Argiro", "Katerina"];
+
+  // when 'empty' show form to fill email, when 'valid' show proper claims, when 'invalid' show no matched entry-wanna retry
+  public accessStatus: string;// = "empty";
+
+  @ViewChild (ModalSelect) selectModal : ModalSelect;
+  @ViewChild (ModalLoading) loading : ModalLoading ;
+
+  constructor ( private route: ActivatedRoute, private _router:Router, private claimsByTokenService: ClaimsByTokenService ) {
+
+  }
+  ngOnInit() {
+    this.sub =  this.route.queryParams.subscribe(params => {
+        this.token = params['token'];
+        this.selectedRight = new Set<string>();
+        this.selectedWrong = new Set<string>();
+        this.editable = new Set<string>();
+        //this.openSelect();
+        //this.setMessageSelect("Please select your identity:");
+        //this.setOptionsSelect(this.contact_person);
+        this.validateJWTandToken();
+      }
+    );
+  }
+
+  validateJWTandToken() {
+    var user_token=Session.getUserJwt();
+    if(this.token) {
+      this.claimsByTokenService.getClaims(this.token, user_token).subscribe(
+          data => {
+            this.closeLoading();
+            this.accessStatus = "valid";
+              //console.info(data);
+              this.claims = data.data;
+              for(let claim of this.claims) {
+                if(claim.curatedBy) {
+                  this.curated_claims.push(claim);
+                } else {
+                  this.pending_claims.push(claim);
+                }
+              }
+          },
+          err => {
+              this.accessStatus = "invalid";
+              console.log(err);
+          }
+        );
+      } else {
+        this.accessStatus = "invalid";
+      }
+  }
+
+  selectApprove(id:string, event) {
+    var value = event.currentTarget.checked;
+    if(value){
+      this.selectedRight.add(id);
+      this.selectedWrong.delete(id);
+      console.info(this.selectedRight);
+    }else{
+      this.selectedRight.delete(id);
+      console.info(this.selectedRight);
+    }
+  }
+
+  selectDisapprove(id:string,event) {
+    var value = event.currentTarget.checked;
+    if(value){
+      this.selectedWrong.add(id);
+      this.selectedRight.delete(id);
+    }else{
+      this.selectedWrong.delete(id);
+    }
+  }
+
+  isSelectedRight(id:string) {
+    return this.selectedRight.has(id);
+  }
+
+  isSelectedWrong(id:string) {
+    return this.selectedWrong.has(id);
+  }
+
+  isRight(claim: any) {
+    //claim.approved = true;
+    if(this.isSelectedRight(claim.id)) {
+      return true;
+    } else if(claim.approved == true && !this.isSelectedWrong(claim.id)) {
+      return true;
+    }
+
+    return false;
+  }
+
+  isWrong(claim: any) {
+    if(this.isSelectedWrong(claim.id)) {
+      return true;
+    } else if(claim.approved == false && !this.isSelectedRight(claim.id)) {
+      return true;
+    }
+
+    return false;
+  }
+
+  saveChanges() {
+    console.info("Changes Saved!");
+    /*
+    this.claimsByTokenService.updateClaimsCuration(this.token, this.selectedRight, this.selectedWrong).subscribe(
+        data => {
+            console.info(data);
+        },
+        err => {
+            console.log(err);
+        }
+      );
+    */
+  }
+
+  public closeLoading(){
+    if(this.loading){
+      this.loading.close();
+    }
+  }
+
+  curatorSelected(selected: string) {
+    console.info("selected curator: "+selected);
+  }
+
+  public openSelect(){
+    if(this.selectModal){
+      this.selectModal.open();
+    }
+  }
+
+  public setMessageSelect(message: string){
+    if(this.selectModal){
+      this.selectModal.message = message;
+    }
+  }
+
+  public setOptionsSelect(options: string[]){
+    if(this.selectModal){
+      this.selectModal.options = options;
+    }
+  }
+}

portal-2/src/app/claims/claimsByToken/claimsByToken.module.ts

@@ -0,0 +1,34 @@
+import { NgModule } from '@angular/core';
+
+import { SharedModule } from '../../shared/shared.module';
+import { ClaimsByTokenComponent } from './claimsByToken.component';
+import { ClaimsByTokenService } from './claimsByToken.service';
+import { ClaimsByTokenRoutingModule } from './claimsByToken-routing.module';
+import {ClaimEntityFormatterModule} from '../claim-utils/entityFormatter/claimEntityFormatter.module';
+// import{ClaimServiceModule} from '../claim-utils/service/claimsService.module';
+//import {DisplayClaimsModule} from '../claim-utils/displayClaims/displayClaims.module';
+import {SelectModalModule} from '../../utils/modal/selectModal.module';
+import {LoadingModalModule} from '../../utils/modal/loadingModal.module';
+
+import {LoginGuard} from'../../login/loginGuard.guard';
+
+@NgModule({
+  imports: [
+    SharedModule,
+    ClaimsByTokenRoutingModule,
+    ClaimEntityFormatterModule,
+    SelectModalModule,
+    LoadingModalModule
+    // ClaimServiceModule,
+    //DisplayClaimsModule
+
+  ],
+  providers:[
+    ClaimsByTokenService,
+    LoginGuard
+  ],
+  declarations: [
+    ClaimsByTokenComponent
+  ]
+})
+export class ClaimsByTokenModule { }

portal-2/src/app/claims/claimsByToken/claimsByToken.service.ts

@@ -0,0 +1,73 @@
+import {Injectable} from '@angular/core';
+import {Http, Response} from '@angular/http';
+import {Jsonp, URLSearchParams,ResponseOptions, RequestOptions, Headers} from '@angular/http';
+import {Observable}     from 'rxjs/Observable';
+import {OpenaireProperties} from '../../utils/properties/openaireProperties';
+import 'rxjs/add/operator/do';
+import { CacheService  } from '../../shared/cache.service';
+@Injectable()
+export class ClaimsByTokenService {
+
+    constructor(private http: Http, public _cache: CacheService) {}
+
+    getClaims(token: string, user_token: string):any {
+        console.info("getClaims in service");
+
+        let url = OpenaireProperties.getClaimsAPIURL()+"projects/corda__h2020::94c962e736df90a5075a7f660ba3d7f6/claims"
+                    +"?&token="+user_token;
+console.info(url);
+        let key = url;
+        if (this._cache.has(key)) {
+          return Observable.of(this._cache.get(key));
+        }
+        return this.http.get(url)
+                    //.map(res => <any> res.text())
+                    .map(request => <any> request.json())
+                    .do(res => {
+                      this._cache.set(key, res);
+                    });
+    }
+
+
+/*
+    getClaims(email: string, token: string, user_token: string):any {
+      let url = OpenaireProperties.getClaimsAPIURL();   // What else?
+      let body = JSON.stringify( {"email": email, "token": token} );
+      console.warn('Json body:  : '+body);
+      let headers = new Headers({ 'Content-Type': 'application/json' });
+      let options = new RequestOptions({ headers: headers });
+      return this.http.post(url, body, options)
+                            .map(res => res.json())
+                            .do(request => console.info("Insert Response:"+request.status) )
+                            .catch(this.handleError);
+    }
+*/
+
+  updateClaimsCuration(token: string, selectedRight: Set<string>, selectedWrong: Set<string>) {
+    let url = OpenaireProperties.getClaimsAPIURL();   // What else?
+    let claimsCurationInfo: any = [];
+    for(let selected in selectedRight) {
+      let claimCurationInfo: any = {"claim_id": selected, "approved": true, "token": token};
+      claimsCurationInfo.add(claimCurationInfo);
+    }
+    for(let selected in selectedWrong) {
+      let claimCurationInfo: any = {"claim_id": selected, "approved": false, "token": token};
+      claimsCurationInfo.add(claimCurationInfo);
+    }
+    let body = JSON.stringify( claimsCurationInfo );
+    console.warn('Json body:  : '+body);
+    let headers = new Headers({ 'Content-Type': 'application/json' });
+    let options = new RequestOptions({ headers: headers });
+    return this.http.post(url, body, options)
+                          .map(res => res.json())
+                          .do(request => console.info("Insert Response:"+request.status) )
+                          .catch(this.handleError);
+  }
+
+  private handleError (error: Response) {
+    // in a real world app, we may send the error to some remote logging infrastructure
+    // instead of just logging it to the console
+    console.log(error);
+    return Observable.throw(error  || 'Server error');
+  }
+}

portal-2/src/app/landingPages/dataProvider/dataProvider.component.html

@@ -131,8 +131,8 @@
                           </div>
                         </div>
 
-                        <metrics *ngIf="  tab.content=='metricsTab' && metricsClicked"
+                        <metrics *ngIf="  tab.content=='metricsTab'"
-                            [id]="id" [type]="'datasources'" [name]="dataProviderInfo.title['name']" (metricsResults)="metricsResults($event)">
+                            [id]="datasourceId" [type]="'datasources'" [name]="dataProviderInfo.title['name']" (metricsResults)="metricsResults($event)">
                         </metrics>
                         <i-frame *ngIf="  tab.content=='metricsTab' && metricsClicked && totalViews > 0"
                             [url]=viewsFrameUrl width="100%" height="250">
@@ -157,6 +157,12 @@
                       </dd>
                   </dl>
                 </li>
+
+                <li>
+                    <dl class="uk-description-list-line">
+                        <dt>Page Views: {{pageViews}}</dt>
+                    </dl>
+                </li>
             </ul>
         </div>
     </div>

portal-2/src/app/landingPages/dataProvider/dataProvider.component.ts

@@ -50,6 +50,7 @@ public reloadRelatedDatasources: boolean = true;
   private downloadsFrameUrl: string;
   private totalViews: number;
   private totalDownloads: number;
+  private pageViews: number;
 
   public statsClicked: boolean = false;
   private  docsTimelineUrl: string;
@@ -151,8 +152,15 @@ public reloadRelatedDatasources: boolean = true;
                this.count(1, 0);
 
                this.metricsClicked = false;
-               this.viewsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"dtsrcOpenAIRETimeline", "dtsrcName":"'+this.datasourceId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"OpenAIRE","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]},{"query":"dtsrcRepoTimeline", "dtsrcName":"'+this.datasourceId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":" ","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Repository","yaxisheaders":[""],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]}]&info_types=["column","column"]&stacking=normal&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true';
+
+               this.viewsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"dtsrcRepoViews","dtsrcName":"'+this.datasourceId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"chart","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false';
+               /*this.viewsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"dtsrcOpenAIRETimeline", "dtsrcName":"'+this.datasourceId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"OpenAIRE","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]},{"query":"dtsrcRepoTimeline", "dtsrcName":"'+this.datasourceId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":" ","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Repository","yaxisheaders":[""],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]}]&info_types=["column","column"]&stacking=normal&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true';
+               */
+
+               this.downloadsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"dtsrcRepoDownloads","dtsrcName":"'+this.datasourceId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"chart","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false';
+               /*
                this.downloadsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"dtsrcDownloadsTimeline","dtsrcName":"'+this.datasourceId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"chart","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true';
+               */
 
                this.docsTimelineUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcYear","dtsrcName":"'+this.datasourceId+'","table": "result", "fields": [{"fld": "number", "agg": "count", "type": "line", "yaxis":1, "c":true}], "xaxis":{"name": "year", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [{"f":0, "text": "Yearly"}], "filters": [{"name":"year","max":"2016","min":"1997"},{"name": "result_datasources-datasource-name", "values":[""], "to": "-1"}],"having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": "Year"}&w=600&h=250';
                this.docsTypesUrl = 'https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubs","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
@@ -284,5 +292,6 @@ public reloadRelatedDatasources: boolean = true;
     public metricsResults($event) {
       this.totalViews = $event.totalViews;
       this.totalDownloads = $event.totalDownloads;
+      this.pageViews = $event.pageViews;
     }
 }

portal-2/src/app/landingPages/dataset/dataset.component.html

@@ -101,7 +101,7 @@
                     </div>
                 </li>
                 <li class="uk-animation-fade">
-                    <metrics *ngIf="metricsClicked"
+                    <metrics
                         [id]="datasetId" [type]="'results'" (metricsResults)="metricsResults($event)">
                     </metrics>
                     <i-frame *ngIf="metricsClicked && totalViews > 0"
@@ -267,6 +267,12 @@
                         </dd>
                     </dl>
                 </li>
+                
+                <li>
+                    <dl class="uk-description-list-line">
+                        <dt>Page Views: {{pageViews}}</dt>
+                    </dl>
+                </li>
             </ul>
         </div>
     </div>

portal-2/src/app/landingPages/dataset/dataset.component.ts

@@ -32,6 +32,7 @@ export class DatasetComponent {
     private downloadsFrameUrl: string;
     private totalViews: number;
     private totalDownloads: number;
+    private pageViews: number;
 
     public relatedResearchResultsNum: number = 0;
 
@@ -60,10 +61,14 @@ export class DatasetComponent {
             }
 
             this.metricsClicked = false;
-            //this.viewsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"resOpenAIRETimeline", "resTitle":"'+this.datasetId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"OpenAIRE","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]},{"query":"resRepoTimeline", "resTitle":"'+this.datasetId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":" ","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Repository","yaxisheaders":[""],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]}]&info_types=["column","column"]&stacking=normal&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true';
-            this.viewsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"resViewsTimeline", "resTitle":"'+this.datasetId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":" ","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Repository","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]}]&info_types=["column"]&stacking=normal&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false';
-            this.downloadsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"resRepoDownloadTimeline", "resTitle":"'+this.datasetId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":" ","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Repository","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]}]&info_types=["column"]&stacking=normal&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true';
 
+            this.viewsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"resRepoViews", "resTitle":"'+this.datasetId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":" ","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Repository","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]}]&info_types=["column"]&stacking=normal&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false';
+            /*this.viewsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"resViewsTimeline", "resTitle":"'+this.datasetId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":" ","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Repository","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]}]&info_types=["column"]&stacking=normal&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false';
+            */
+
+            this.downloadsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"resRepoDownloads", "resTitle":"'+this.datasetId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":" ","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Repository","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]}]&info_types=["column"]&stacking=normal&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false';
+            /*this.downloadsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"resRepoDownloadTimeline", "resTitle":"'+this.datasetId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":" ","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Repository","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]}]&info_types=["column"]&stacking=normal&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true';
+            */
             if (typeof document !== 'undefined') {
                this.element.nativeElement.scrollIntoView();
             }
@@ -111,6 +116,7 @@ export class DatasetComponent {
     public metricsResults($event) {
       this.totalViews = $event.totalViews;
       this.totalDownloads = $event.totalDownloads;
+      this.pageViews = $event.pageViews;
     }
     updateDescription(description:string){
       this._meta.updateMeta("description", description);

portal-2/src/app/landingPages/metrics.component.ts

@@ -47,9 +47,15 @@ import {ErrorCodes} from '../utils/properties/openaireProperties';
             <tr>
                 <td class="uk-text-center">
                     {{metrics.totalViews}}
+                    <span *ngIf="metrics.totalViews > 0 && metrics.totalOpenaireViews > 0">
+                      ( {{metrics.totalOpenaireViews}} from OpenAIRE )
+                    </span>
                 </td>
                 <td class="uk-text-center">
                     {{metrics.totalDownloads}}
+                    <span *ngIf="metrics.totalDownloads > 0 && metrics.totalOpenaireDownloads > 0">
+                      ( {{metrics.totalOpenaireDownloads}} from OpenAIRE )
+                    </span>
                 </td>
             </tr>
         </tbody>
@@ -73,9 +79,15 @@ import {ErrorCodes} from '../utils/properties/openaireProperties';
                 </td>
                 <td class="uk-text-center">
                     {{metrics.infos.get(key).numOfViews}}
+                    <span *ngIf="metrics.infos.get(key).numOfViews > 0 && metrics.infos.get(key).openaireViews > 0">
+                      ( {{metrics.infos.get(key).openaireViews}} from OpenAIRE )
+                    </span>
                 </td>
                 <td class="uk-text-center">
                     {{metrics.infos.get(key).numOfDownloads}}
+                    <span *ngIf="metrics.infos.get(key).numOfDownloads > 0 && metrics.infos.get(key).openaireDownloads > 0">
+                      ( {{metrics.infos.get(key).openaireDownloads}} from OpenAIRE )
+                    </span>
                 </td>
             </tr>
         </tbody>
@@ -115,8 +127,8 @@ export class MetricsComponent {
              this.status = this.errorCodes.DONE;
              this.metricsResults.emit({
                  totalViews: this.metrics.totalViews,
-                 totalDownloads: this.metrics.totalDownloads
+                 totalDownloads: this.metrics.totalDownloads,
-
+                 pageViews: this.metrics.pageViews
              });
          },
          err => {

portal-2/src/app/landingPages/project/project.component.html

@@ -160,7 +160,7 @@
                   </div>
                 </li>
                 <li class="uk-animation-fade">
-                    <metrics *ngIf="metricsClicked"
+                    <metrics
                         [id]="projectId" [type]="'projects'" [name]="projectName" (metricsResults)="metricsResults($event)">
                     </metrics>
                     <!--i-frame *ngIf="metricsClicked" [url]=viewsFrameUrl width="800" height="350"></i-frame-->
@@ -243,6 +243,12 @@
                         Deposit Publications
                     </a>
                 </li>
+
+                <li>
+                    <dl class="uk-description-list-line">
+                        <dt>Page Views: {{pageViews}}</dt>
+                    </dl>
+                </li>
             </ul>
         </div>
     </div>

portal-2/src/app/landingPages/project/project.component.ts

@@ -31,6 +31,7 @@ export class ProjectComponent{
   public downloadsFrameUrl: string;
   private totalViews: number;
   private totalDownloads: number;
+  private pageViews: number;
   public statsClicked: boolean;
   public chartScientificResultsUrl: string;
   public chartAccessModeUrl: string;
@@ -178,8 +179,15 @@ export class ProjectComponent{
           this.updateDescription("project, funding, open access, publications, datasets, "+this.projectName+ ","+this.projectInfo.funder);
           this.project= { funderId: "", funderName: this.projectInfo.funder, projectId: this.projectId, projectName: this.projectInfo.title, projectAcronym: this.projectInfo.acronym, startDate: this.projectInfo.startDate, endDate: this.projectInfo.endDate };
 
-          this.viewsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"projViewsTimeline","projTitle":"'+this.projectId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true';
+          this.viewsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"projRepoViews","projTitle":"'+this.projectId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false';
+          /*this.viewsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"projViewsTimeline","projTitle":"'+this.projectId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true';
+          */
+
+          this.downloadsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"projRepoDownloads","projTitle":"'+this.projectId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false';
+          /*
           this.downloadsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"projDownloadsTimeline","projTitle":"'+this.projectId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true';
+          */
+
           //stats tab charts
           this.chartScientificResultsUrl='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"projScient","projTitle":"'+this.projectId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "spline", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Publications"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [" "], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
           this.chartAccessModeUrl='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"projOA","projTitle":"'+this.projectId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Publications"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [" "], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
@@ -245,6 +253,7 @@ export class ProjectComponent{
     public metricsResults($event) {
       this.totalViews = $event.totalViews;
       this.totalDownloads = $event.totalDownloads;
+      this.pageViews = $event.pageViews;
     }
     updateDescription(description:string){
       this._meta.updateMeta("description", description);

portal-2/src/app/landingPages/publication/publication.component.html

@@ -313,7 +313,7 @@
                     </table>
                 </li>
                 <li class="uk-animation-fade">
-                    <metrics *ngIf="metricsClicked"
+                    <metrics
                         [id]="articleId" [type]="'results'" (metricsResults)="metricsResults($event)">
                     </metrics>
                     <!--i-frame *ngIf="metricsClicked" [url]=viewsFrameUrl width="100%" height="250"></i-frame-->
@@ -342,7 +342,6 @@
                     </altmetrics>
                 </li>
 
-
                 <li *ngIf="publicationInfo.downloadFrom != undefined && publicationInfo.downloadFrom.size > 0">
                     <dl class="uk-description-list-line">
                         <dt class="title">Download from</dt>
@@ -542,6 +541,12 @@
                         </dd>
                     </dl>
                 </li>
+
+                <li>
+                    <dl class="uk-description-list-line">
+                        <dt>Page Views: {{pageViews}}</dt>
+                    </dl>
+                </li>
             </ul>
         </div>
     </div>

portal-2/src/app/landingPages/publication/publication.component.ts

@@ -30,6 +30,7 @@ export class PublicationComponent {
   private downloadsFrameUrl: string;
   private totalViews: number;
   private totalDownloads: number;
+  private pageViews: number;
 
   public showAllReferences: boolean = false;
   public showAllRelResData: boolean = false;
@@ -71,10 +72,14 @@ export class PublicationComponent {
               this.warningMessage="No valid publication id";
           }
           this.metricsClicked = false;
-          //this.viewsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"resOpenAIRETimeline", "resTitle":"'+this.articleId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"OpenAIRE","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]},{"query":"resRepoTimeline", "resTitle":"'+this.articleId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":" ","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Repository","yaxisheaders":[""],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]}]&info_types=["column","column"]&stacking=normal&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true';
-          this.viewsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"resViewsTimeline", "resTitle":"'+this.articleId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":" ","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Repository","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]}]&info_types=["column"]&stacking=normal&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false';
-          this.downloadsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"resRepoDownloadTimeline", "resTitle":"'+this.articleId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":" ","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Repository","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]}]&info_types=["column"]&stacking=normal&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true';
 
+          this.viewsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"resRepoViews", "resTitle":"'+this.articleId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":" ","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Repository","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]}]&info_types=["column"]&stacking=normal&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false';
+          /*this.viewsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"resViewsTimeline", "resTitle":"'+this.articleId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":" ","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Repository","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]}]&info_types=["column"]&stacking=normal&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false';
+          */
+
+          this.downloadsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"resRepoDownloads", "resTitle":"'+this.articleId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":" ","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Repository","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]}]&info_types=["column"]&stacking=normal&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false';
+          /*this.downloadsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"resRepoDownloadTimeline", "resTitle":"'+this.articleId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":" ","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Repository","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]}]&info_types=["column"]&stacking=normal&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true';
+          */
           if (typeof document !== 'undefined') {
              this.element.nativeElement.scrollIntoView();
           }
@@ -143,6 +148,7 @@ export class PublicationComponent {
     public metricsResults($event) {
       this.totalViews = $event.totalViews;
       this.totalDownloads = $event.totalDownloads;
+      this.pageViews = $event.pageViews;
     }
 
     public buildTooltip(item: { "id": string, "acronym": string, "title": string,

portal-2/src/app/searchPages/searchUtils/searchResult.component.ts

@@ -17,7 +17,8 @@ import {RouterHelper} from '../../utils/routerHelper.class';
                 <!--a href="{{result['title'].url}}"-->
                 <!--a [queryParams]="{articleId: 'od_______908::3a5b2885656a91307156325644e73b92'}" routerLinkActive="router-link-active" routerLink="search/publication"-->
 
-                <a href="/search/{{type}}?{{urlParam}}={{result.id}}">
+                <a [queryParams]="routerHelper.createQueryParam(urlParam,result.id)" routerLinkActive="router-link-active" routerLink="/search/{{type}}">
+                <!--a href="/search/{{type}}?{{urlParam}}={{result.id}}"-->
                     <p *ngIf="result['title'].name != undefined && result['title'].name != ''"
                         [innerHTML]="result['title'].name">
                     </p>

portal-2/src/app/services/metrics.service.ts

@@ -12,35 +12,41 @@ export class MetricsService {
     constructor(private http: Http, public _cache: CacheService) {}
 
     getMetrics (id: string, entity: string):any {
-        console.info("getPublicationViews in service");
+        console.info("getMetrics in service");
         //let url = OpenaireProperties. getSearchAPIURLLast() + 'publications/' +id+"?format=json";
         let url = OpenaireProperties.getMetricsAPIURL()+entity+"/"+id+"/clicks";
         let key = url;
         if (this._cache.has(key)) {
           return Observable.of(this._cache.get(key));
         }
+
         return this.http.get(url)
                     .map(res => <any> res.json())
-                    .map(res => this.parseMetrics(res["downloads"], res["views"], res["total_downloads"], res["total_views"]))
+                    .map(res => this.parseMetrics(res["downloads"], res["views"], res["total_downloads"], res["total_views"],
+                                                  res["total_openaire_views"], res["total_openaire_downloads"], res["pageviews"]))
                     .do(res => {
                       this._cache.set(key, res);
                     });
     }
 
 
-    parseMetrics(downloads: string, views: string, totalDownloads: any, totalViews: any): any {
+    parseMetrics(downloads: any, views: any, totalDownloads: string, totalViews: string,
-
+                totalOpenaireViews: string, totalOpenaireDownloads: string, pageViews: string): any {
         this.metrics = new Metrics();
 
         this.metrics.totalDownloads = totalDownloads;
         this.metrics.totalViews = totalViews;
+        this.metrics.totalOpenaireViews = totalOpenaireViews;
+        this.metrics.totalOpenaireDownloads = totalOpenaireDownloads;
+        this.metrics.pageViews = pageViews;
 
-        this.metrics.infos = new Map<string, {"name": string, "url": string, "numOfDownloads": string, "numOfViews": string}>();
+        this.metrics.infos = new Map<string, {"name": string, "url": string, "numOfDownloads": string, "numOfViews": string, "openaireDownloads": string, "openaireViews": string}>();
 
         for(let i=0; i<downloads.length; i++) {
             let id: string = downloads[i]['datasource_id'];
             if(this.metrics.infos.has(id)) {
                 this.metrics.infos.get(id).numOfDownloads = downloads[i]['value'];
+                this.metrics.infos.get(id).openaireDownloads = downloads[i]['openaire'];
             } else {
                 let info;//: {"url": string, "numOfDownloads": string, "numOfViews": string};
                 info = {};
@@ -48,7 +54,9 @@ export class MetricsService {
                 info.name = downloads[i]['datasource_name'];
                 info.url = OpenaireProperties.getsearchLinkToDataProvider()+id;
                 info.numOfDownloads = downloads[i]['value'];
+                info.openaireDownloads = downloads[i]['openaire'];
                 info.numOfViews = "0";
+                info.openaireViews = "0";
 
                 this.metrics.infos.set(id, info);
             }
@@ -58,6 +66,7 @@ export class MetricsService {
             let id: string = views[i]['datasource_id'];
             if(this.metrics.infos.has(id)) {
                 this.metrics.infos.get(id).numOfViews = views[i]['value'];
+                this.metrics.infos.get(id).openaireViews = views[i]['openaire'];
             } else {
                 let info;//: {"url": string, "numOfDownloads": string, "numOfViews": string};
                 info = {};
@@ -65,7 +74,9 @@ export class MetricsService {
                 info.name = views[i]['datasource_name'];
                 info.url = OpenaireProperties.getsearchLinkToDataProvider()+id;
                 info.numOfDownloads = "0";
+                info.openaireDownloads = "0";
                 info.numOfViews = views[i]['value'];
+                info.openaireViews = views[i]['openaire'];
 
                 this.metrics.infos.set(id, info);
             }

portal-2/src/app/utils/entities/metrics.ts

@@ -1,5 +1,8 @@
 export class Metrics {
     totalDownloads: string;
     totalViews: string;
-    infos: Map<string, {"name": string, "url": string, "numOfDownloads": string, "numOfViews": string}>;
+    totalOpenaireViews: string;
+    totalOpenaireDownloads: string;
+    pageViews: string;
+    infos: Map<string, {"name": string, "url": string, "numOfDownloads": string, "numOfViews": string, "openaireDownloads": string, "openaireViews": string}>;
 }

portal-2/src/app/utils/modal/selectModal.component.ts

@@ -0,0 +1,79 @@
+import {Component, ViewEncapsulation, ComponentRef, ElementRef, Input, EventEmitter, Output} from '@angular/core';
+
+@Component({
+  selector: 'modal-select',
+  template: `
+  <div [class]="(!isOpen)?'uk-modal ':'uk-modal uk-open uk-animation-fade'"   [open]="!isOpen"   data-uk-modal="{center:true}" tabindex="-1" role="dialog" >
+    <div class="uk-modal-dialog" role="">
+      <div class="modal-content">
+
+        <div class="modal-body">
+          <div >
+          <h3 class="text-center" >{{message}}</h3>
+          <!--div class="uk-button uk-form-select uk-active" data-uk-form-select="">
+            <span class=""></span>
+            <i class="uk-icon-caret-down"></i>
+            <select (change)="selected=$event.target.value">
+                <option *ngFor="let option of options" value="option">aa</option>
+            </select>
+          </div-->
+
+          <div class="uk-form-select" data-uk-form-select>
+            <span></span>
+            <select (change)="selected=$event.target.value">
+                <option *ngFor="let option of options let i=index" value="{{option}}">{{option}}</option>
+            </select>
+          </div>
+
+          <div class="uk-modal-footer uk-text-right">
+            <button class="uk-button" (click)="close()">Proceed</button>
+          </div>
+        </div>
+
+      </div>
+    </div>
+  </div>
+  <!--div   class="uk-modal uk-open" aria-hidden="false" style="display: block; overflow-y: scroll;">
+                            <div class="uk-modal-dialog" tabindex="">
+                                <div class="uk-modal-spinner"></div>
+                            </div>
+                        </div-->
+  `,
+  encapsulation: ViewEncapsulation.None,
+})
+/**
+  * API to an open alert window.
+  */
+export class ModalSelect{
+
+@Input() public message:string ="Loading";
+@Input() public options:string[] = [];
+
+public selected: string;
+
+  /**
+    * if the value is true alert will be visible or else it will be hidden.
+    */
+  public isOpen:boolean=false;
+  /**
+    * Emitted when a ok button was clicked
+    * or when Ok method is called.
+    */
+  @Output() public alertOutput:EventEmitter<any> = new EventEmitter();
+  constructor( public _elementRef: ElementRef){}
+  /**
+       * Opens a alert window creating backdrop.
+       */
+  open(){
+    this.isOpen= true;
+  }
+
+  close(){
+    this.isOpen = false;
+    if(!this.selected) {
+      this.selected = this.options[0];
+    }
+    this.alertOutput.emit(this.selected);
+  }
+
+}

portal-2/src/app/utils/modal/selectModal.module.ts

@@ -0,0 +1,19 @@
+import { NgModule }            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+
+ import {ModalSelect} from './selectModal.component';
+import {ModalModule} from './modal.module';
+
+//helpers
+
+@NgModule({
+  imports: [ CommonModule, FormsModule,ModalModule  ],
+  declarations: [
+    ModalSelect
+  ],
+  exports: [
+   ModalSelect
+  ]
+})
+export class SelectModalModule { }

portal-2/src/app/utils/properties/openaireProperties.ts

@@ -28,7 +28,7 @@ export class OpenaireProperties {
 //http://rudie.di.uoa.gr:6081/dnet-functionality-services-2.0.0-SNAPSHOT
     // Services - APIs
 
-    private static metricsAPIURL = "http://vatopedi.di.uoa.gr:8080/stats/";
+    private static metricsAPIURL = "http://vatopedi.di.uoa.gr:8080/usagestats/";
     private static framesAPIURL = "http://vatopedi.di.uoa.gr/stats2/";
 
     private static loginAPIURL = "http://mpagasas.di.uoa.gr:8080/uoa-user-management-1.0.0-SNAPSHOT/api/users/authenticates";

portal-2/src/server.routes.ts

@@ -16,7 +16,7 @@ export const routes: string[] = [
   'search/advanced/people','search/advanced/publications','search/advanced/projects','search/advanced/datasets','search/advanced/dataproviders','search/advanced/organizations',
   'participate/deposit-publications','participate/deposit-datasets','participate/deposit-publications-result','participate/deposit-datasets-result',
   'search/data-providers','search/entity-registries', 'project-report',
-  'claims','myclaims','participate/claim', 'participate/direct-claim',
+  'claims','myclaims','participate/claim', 'participate/direct-claim', 'claims-project-manager',
   'test', 'user-info',
   '**','error'