From d134efcb55d2350884f4386bc6a27842fdcec9f9 Mon Sep 17 00:00:00 2001
From: annampak <annampak@hotmail.com>
Date: Fri, 15 Dec 2017 13:52:11 +0200
Subject: [PATCH] dashborad total counts from server

---
 dmp-frontend/src/app/app.module.ts            |  5 +--
 .../src/app/homepage/homepage.component.html  | 12 +++----
 .../src/app/homepage/homepage.component.ts    | 25 +++++++++------
 .../dashboard/DashboardStatisticsModel.ts     | 15 +++++++++
 .../services/dashboard/dashboard.service.ts   | 31 +++++++++++++++++++
 .../figurecard/figurecard.component.css       |  0
 .../figurecard/figurecard.component.html      |  0
 .../figurecard/figurecard.component.ts        |  0
 8 files changed, 70 insertions(+), 18 deletions(-)
 create mode 100644 dmp-frontend/src/app/models/dashboard/DashboardStatisticsModel.ts
 create mode 100644 dmp-frontend/src/app/services/dashboard/dashboard.service.ts
 rename dmp-frontend/src/app/{ => shared/components}/figurecard/figurecard.component.css (100%)
 rename dmp-frontend/src/app/{ => shared/components}/figurecard/figurecard.component.html (100%)
 rename dmp-frontend/src/app/{ => shared/components}/figurecard/figurecard.component.ts (100%)

diff --git a/dmp-frontend/src/app/app.module.ts b/dmp-frontend/src/app/app.module.ts
index f4daaffcb..5b219e249 100644
--- a/dmp-frontend/src/app/app.module.ts
+++ b/dmp-frontend/src/app/app.module.ts
@@ -104,12 +104,13 @@ import { SharedModule } from './shared/shared.module';
 import { MaterialModule } from './shared/material/material.module';
 import { AuthService } from './services/auth/auth.service';
 import { ProjectListingComponent } from './projects/project-listing.component';
+import { DashboardService } from './services/dashboard/dashboard.service';
 import { BaseHttpService } from './utilities/cite-http-service-module/base-http.service';
 import { DataManagementPlanListingComponent } from './dmps/dmp-listing.component';
 import { ProjectEditorComponent } from './projects/editor/project-editor.component';
 import { DataManagementPlanEditorComponent } from './dmps/editor/dmp-editor.component';
 
-import { FigurecardComponent } from './figurecard/figurecard.component';
+import { FigurecardComponent } from './shared/components/figurecard/figurecard.component';
 
 
 
@@ -195,7 +196,7 @@ import { FigurecardComponent } from './figurecard/figurecard.component';
   },
     ServerService, VisibilityRulesService, PaginationService, GlobalVariables, AuthGuard, TokenService,
     LocalStorageService, RestBase, EestoreService, NativeLoginService, PDFService,
-    AuthService,
+    AuthService,DashboardService,
     BaseHttpService
   ],
   bootstrap: [AppComponent]
diff --git a/dmp-frontend/src/app/homepage/homepage.component.html b/dmp-frontend/src/app/homepage/homepage.component.html
index 0e28568e7..a056b7540 100644
--- a/dmp-frontend/src/app/homepage/homepage.component.html
+++ b/dmp-frontend/src/app/homepage/homepage.component.html
@@ -21,7 +21,7 @@
                             <div class="icon">
                                 <i class="material-icons">list</i>
                             </div>
-                            <h3 class="card-title">52</h3>
+                            <h3 class="card-title">{{dashboardStatisticsData.totalProjectCount}}</h3>
                             <p class="card-description text-center">
                                 This is good if your company size is between 2 and 10 Persons.
                             </p>
@@ -34,7 +34,7 @@
                             <div class="icon">
                                 <i class="material-icons">mode_edit</i>
                             </div>
-                            <h3 class="card-title">33</h3>
+                            <h3 class="card-title">{{dashboardStatisticsData.totalDataManagementPlanCount}}</h3>
                             <p class="card-description text-center">
                                 This is good if your company size is between 2 and 10 Persons.
                             </p>
@@ -47,7 +47,7 @@
                             <div class="icon">
                                 <i class="material-icons">subject</i>
                             </div>
-                            <h3 class="card-title">3</h3>
+                            <h3 class="card-title">{{dashboardStatisticsData.totalDataSetCount}}</h3>
                             <p class="card-description text-center">
                                 This is good if your company size is between 2 and 10 Persons.
                             </p>
@@ -64,7 +64,7 @@
         <div class="row" style="margin-top: 30px">
           <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12 col-md-offset-1">
             <app-figurecard
-              title="184"
+              title={{dashboardStatisticsData.totalProjectCount}}
               headerIcon="list"
               category="Projects"
               footContent="open projects"
@@ -75,7 +75,7 @@
           </div>
           <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
             <app-figurecard
-              title="75.521"
+              title={{dashboardStatisticsData.totalDataManagementPlanCount}}
               headerIcon="mode_edit"
               category="DMPs"
               footContent="open DMPs"
@@ -86,7 +86,7 @@
           </div>
           <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
             <app-figurecard
-              title="+245"
+              title={{dashboardStatisticsData.totalDataSetCount}}
               headerIcon="subject"
               category="Datasets"
               footContent="open datasets"
diff --git a/dmp-frontend/src/app/homepage/homepage.component.ts b/dmp-frontend/src/app/homepage/homepage.component.ts
index b2957b6b1..9964f9695 100644
--- a/dmp-frontend/src/app/homepage/homepage.component.ts
+++ b/dmp-frontend/src/app/homepage/homepage.component.ts
@@ -1,7 +1,9 @@
 import { Component, OnInit } from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
 import { ServerService } from '../../app/services/server.service';
-import { RestBase } from '../../app/services/rest-base';
+import { DashboardService } from '../../app/services/dashboard/dashboard.service';
+import { DashboardStatisticsModel } from '../models/dashboard/DashboardStatisticsModel';
+import { JsonSerializer } from '../utilities/JsonSerializer';
 
 @Component({
   selector: 'homepage',
@@ -12,9 +14,12 @@ import { RestBase } from '../../app/services/rest-base';
 export class HomepageComponent implements OnInit{
 
   private userInfo: any;
-
-  constructor(private serverService: ServerService, private route: ActivatedRoute, private router: Router, private restbase: RestBase){
-
+  private dashboardStatisticsData:DashboardStatisticsModel = new DashboardStatisticsModel();
+  
+  constructor(private serverService: ServerService, private route: ActivatedRoute, private router: Router, private dashBoardService: DashboardService){
+    this.dashboardStatisticsData.totalDataManagementPlanCount = 0;
+    this.dashboardStatisticsData.totalDataSetCount = 0;
+    this.dashboardStatisticsData.totalProjectCount = 0;
   }
 
 
@@ -24,14 +29,14 @@ export class HomepageComponent implements OnInit{
         this.userInfo = userInfo;
       },
       error => {
-
       }
-    );    
+    );   
+    
+    this.dashBoardService.getStatistics().subscribe(data =>{
+      debugger;
+      this.dashboardStatisticsData = new JsonSerializer<DashboardStatisticsModel>().fromJSONObject(data,DashboardStatisticsModel);
+    })
 
   }
 
-  getStatistics(){
-    return this.restbase.get("datasetprofile/getAll");
-  }
-
 }
\ No newline at end of file
diff --git a/dmp-frontend/src/app/models/dashboard/DashboardStatisticsModel.ts b/dmp-frontend/src/app/models/dashboard/DashboardStatisticsModel.ts
new file mode 100644
index 000000000..2af2dd294
--- /dev/null
+++ b/dmp-frontend/src/app/models/dashboard/DashboardStatisticsModel.ts
@@ -0,0 +1,15 @@
+import { Serializable } from "../Serializable";
+
+export class DashboardStatisticsModel implements Serializable<DashboardStatisticsModel>{
+    public totalDataManagementPlanCount: number;
+    public totalProjectCount: number;
+    public totalDataSetCount: number;
+
+    fromJSONObject(item: any): DashboardStatisticsModel {
+		this.totalDataManagementPlanCount = item.totalDataManagementPlanCount;
+		this.totalProjectCount = item.totalProjectCount;
+        this.totalDataSetCount = item.totalDataSetCount;
+		return this;
+	}
+
+}
\ No newline at end of file
diff --git a/dmp-frontend/src/app/services/dashboard/dashboard.service.ts b/dmp-frontend/src/app/services/dashboard/dashboard.service.ts
new file mode 100644
index 000000000..7556a37a8
--- /dev/null
+++ b/dmp-frontend/src/app/services/dashboard/dashboard.service.ts
@@ -0,0 +1,31 @@
+import 'rxjs/add/operator/map';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { HostConfiguration } from './../../app.constants';
+import { BaseHttpService } from '../../utilities/cite-http-service-module/base-http.service';
+import { Observable } from 'rxjs/Observable';
+import { DashboardStatisticsModel } from '../../models/dashboard/DashboardStatisticsModel';
+
+
+
+
+@Injectable()
+export class DashboardService {
+
+    private actionUrl: string;
+    private headers: HttpHeaders;
+
+    constructor(private http: BaseHttpService) {
+
+        this.actionUrl = HostConfiguration.Server + 'dashboard/';
+
+        this.headers = new HttpHeaders();
+        this.headers = this.headers.set('Content-Type', 'application/json');
+        this.headers = this.headers.set('Accept', 'application/json');
+    }
+
+    getStatistics(): Observable<DashboardStatisticsModel> {
+        return this.http.get<DashboardStatisticsModel>(this.actionUrl + 'getStatistics', { headers: this.headers });
+    }
+
+}
diff --git a/dmp-frontend/src/app/figurecard/figurecard.component.css b/dmp-frontend/src/app/shared/components/figurecard/figurecard.component.css
similarity index 100%
rename from dmp-frontend/src/app/figurecard/figurecard.component.css
rename to dmp-frontend/src/app/shared/components/figurecard/figurecard.component.css
diff --git a/dmp-frontend/src/app/figurecard/figurecard.component.html b/dmp-frontend/src/app/shared/components/figurecard/figurecard.component.html
similarity index 100%
rename from dmp-frontend/src/app/figurecard/figurecard.component.html
rename to dmp-frontend/src/app/shared/components/figurecard/figurecard.component.html
diff --git a/dmp-frontend/src/app/figurecard/figurecard.component.ts b/dmp-frontend/src/app/shared/components/figurecard/figurecard.component.ts
similarity index 100%
rename from dmp-frontend/src/app/figurecard/figurecard.component.ts
rename to dmp-frontend/src/app/shared/components/figurecard/figurecard.component.ts