From 56e0810154d6b23f02db68af4535fc310632c307 Mon Sep 17 00:00:00 2001
From: "myrto.koukouli" <myrto.koukouli@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Mon, 12 Mar 2018 11:26:23 +0000
Subject: [PATCH] refreshed monitor

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@51146 d315682c-612b-4755-9ff5-7f18f6832af3
---
 src/app/statistics/statistics.component.html | 25 ++++++++++----------
 src/app/statistics/statistics.component.ts   |  7 +++---
 src/app/statistics/statisticsEntities.ts     | 16 +++++++++++++
 src/assets/env-properties.json               |  2 +-
 4 files changed, 34 insertions(+), 16 deletions(-)
 create mode 100644 src/app/statistics/statisticsEntities.ts

diff --git a/src/app/statistics/statistics.component.html b/src/app/statistics/statistics.component.html
index 8857c6e..3a31376 100644
--- a/src/app/statistics/statistics.component.html
+++ b/src/app/statistics/statistics.component.html
@@ -6,13 +6,14 @@
     <div *ngIf="statistics" class="uk-margin uk-margin-top uk-text-lead">
 
       <div>
-          {{statistics.publications}} publications from
+          {{statistics.publications.total}} publications from
         <!--span *ngIf="statistics.virtual_organizations && statistics.virtual_organizations > 0"> {{statistics.virtual_organizations}} VOs and</span-->
           {{statistics.total_projects}}  projects.
       </div>
       <div>
-        {{statistics.open_access}} are OA <span *ngIf="statistics.restricted && statistics.restricted > 0">, {{statistics.restricted}} are restricted </span>
-         <span *ngIf="statistics.embargo && statistics.embargo > 0">and  {{statistics.embargo}} are still in embargo  </span>
+        {{statistics.publications.open_access}} are OA
+          <span *ngIf="statistics.publications.restricted && statistics.publications.restricted > 0">, {{statistics.publications.restricted}} are restricted </span>
+         <span *ngIf="statistics.publications.embargo && statistics.publications.embargo > 0">and  {{statistics.publications.embargo}} are still in embargo  </span>
      </div>
     </div>
     <div *ngIf="charts && charts.timelines && statistics">
@@ -25,33 +26,33 @@
 
       <ul id="timelinestabs" class="uk-switcher uk-margin">
           <li>
-            <div *ngIf="charts.timelines.publications.load && statistics.publications > 0">
+            <div *ngIf="charts.timelines.publications.load && statistics.publications.total > 0">
               <i-frame  [url]=charts.timelines.publications.url width="1000" height="450"></i-frame>
             </div>
-            <div *ngIf="statistics.publications == 0" class="uk-alert uk-alert-primary">
+            <div *ngIf="statistics.publications.total == 0" class="uk-alert uk-alert-primary">
               No publications available
             </div>
           </li>
           <li>
-            <div *ngIf="charts.timelines.datasets.load && statistics.datasets > 0">
+            <div *ngIf="charts.timelines.datasets.load && statistics.datasets.total > 0">
               <i-frame  [url]=charts.timelines.datasets.url width="1000" height="450"></i-frame>
             </div>
-            <div *ngIf="statistics.datasets == 0" class="uk-alert uk-alert-primary">
+            <div *ngIf="statistics.datasets.total == 0" class="uk-alert uk-alert-primary">
               No research data available
             </div>
           </li>
           <li>
-            <div *ngIf="charts.timelines.software.load && statistics.software > 0">
+            <div *ngIf="charts.timelines.software.load && statistics.software.total > 0">
               <i-frame  [url]=charts.timelines.software.url width="1000" height="450"></i-frame>
             </div>
-            <div *ngIf="statistics.software == 0" class="uk-alert uk-alert-primary">
+            <div *ngIf="statistics.software.total == 0" class="uk-alert uk-alert-primary">
               No software available
             </div>
           </li>
       </ul>
   </div>
 
-  <div *ngIf="charts && charts.projectPublications && statistics && statistics.publications > 0">
+  <div *ngIf="charts && charts.projectPublications && statistics && statistics.publications.total > 0">
     <div class="uk-text-large" >Publications per projects</div>
     <ul class="uk-tab uk-margin-top" data-uk-tab="{connect:'#publicationtabs'}">
         <li (click)="charts.projectPublications.columns.load = true"><a href="#">Columns</a></li>
@@ -77,7 +78,7 @@
         </li>
     </ul>
 </div>
-<div *ngIf="charts && charts.projectDatasets  && statistics && statistics.datasets > 0">
+<div *ngIf="charts && charts.projectDatasets  && statistics && statistics.datasets.total > 0">
   <div class="uk-text-large" >Research data per projects</div>
   <ul class="uk-tab uk-margin-top" data-uk-tab="{connect:'#datasettabs'}">
       <li (click)="charts.projectDatasets.columns.load = true"><a href="#">Columns</a></li>
@@ -103,7 +104,7 @@
       </li>
   </ul>
 </div>
-<div *ngIf="charts && charts.projectSoftware  && statistics && statistics.software > 0">
+<div *ngIf="charts && charts.projectSoftware  && statistics && statistics.software.total > 0">
   <div class="uk-text-large" >Software per projects</div>
   <ul class="uk-tab uk-margin-top" data-uk-tab="{connect:'#softwaretabs'}">
       <li (click)="charts.projectSoftware.columns.load = true"><a href="#">Columns</a></li>
diff --git a/src/app/statistics/statistics.component.ts b/src/app/statistics/statistics.component.ts
index 34e6558..8cafd40 100644
--- a/src/app/statistics/statistics.component.ts
+++ b/src/app/statistics/statistics.component.ts
@@ -14,6 +14,7 @@ import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
 import {Meta} from '../openaireLibrary/sharedComponents/metaService';
 import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
 import{ StatisticsService} from '../utils/services/statistics.service';
+import {StatisticsSummary} from "./statisticsEntities";
 
 @Component({
     selector: 'statistics',
@@ -23,12 +24,12 @@ export class StatisticsComponent {
   public piwiksub: any;
   public subfunders: any;
 
-  public pageTitle = "OpenAIRE"
+  public pageTitle = "OpenAIRE";
 
   properties:EnvProperties;
   public communityId = null;
   public communityInfo = null;
-  public statistics = null;
+  public statistics: StatisticsSummary;
   charts = null;
   constructor (
     private route: ActivatedRoute,
@@ -64,7 +65,7 @@ export class StatisticsComponent {
           this.route.queryParams.subscribe(
             communityId => {
                   this.communityId = communityId['communityId'];
-                  this._statisticsService.getCommunityStatistics(this.properties.statisticsAPIURL+"/communities/",this.communityId).subscribe (
+                  this._statisticsService.getCommunityStatistics(this.properties.statisticsAPIURL+"communities/",this.communityId).subscribe (
                     res => {
                           this.statistics = res;
                           console.log(this.statistics);
diff --git a/src/app/statistics/statisticsEntities.ts b/src/app/statistics/statisticsEntities.ts
new file mode 100644
index 0000000..c1e5aa2
--- /dev/null
+++ b/src/app/statistics/statisticsEntities.ts
@@ -0,0 +1,16 @@
+
+export class StatisticsNumbers {
+    total: number;
+    open_access: number;
+    embargo: number;
+    restricted: number;
+    closed_access: number;
+}
+
+export class StatisticsSummary {
+    publications : StatisticsNumbers;
+    datasets:StatisticsNumbers;
+    software: StatisticsNumbers;
+    total_projects: number;
+    virtual_organizations: number;
+}
\ No newline at end of file
diff --git a/src/assets/env-properties.json b/src/assets/env-properties.json
index 0ad842e..168833c 100644
--- a/src/assets/env-properties.json
+++ b/src/assets/env-properties.json
@@ -4,7 +4,7 @@
   "useCache" : true,
   "metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/",
   "framesAPIURL" : "https://beta.openaire.eu/stats3/",
-  "statisticsAPIURL" : "http://vatopedi.di.uoa.gr:8080/stats/",
+  "statisticsAPIURL" : "http://vatopedi.di.uoa.gr:8080/stats-api/",
   "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/",
   "claimsAPIURL" : "http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/",