From 176f5b30042a4c5b7f5e62fc4966649369e0d9c4 Mon Sep 17 00:00:00 2001
From: annabakouli <annabakouli@gmail.com>
Date: Mon, 18 Dec 2017 18:26:38 +0200
Subject: [PATCH] no message

---
 .../java/eu/eudat/managers/DataManagementPlanManager.java   | 2 +-
 .../src/main/java/eu/eudat/managers/DatasetManager.java     | 2 +-
 .../src/main/java/eu/eudat/managers/ProjectManager.java     | 2 +-
 .../main/java/eu/eudat/models/helpers/DataTableData.java    | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dmp-backend/src/main/java/eu/eudat/managers/DataManagementPlanManager.java b/dmp-backend/src/main/java/eu/eudat/managers/DataManagementPlanManager.java
index a5c2f152d..072ea2342 100644
--- a/dmp-backend/src/main/java/eu/eudat/managers/DataManagementPlanManager.java
+++ b/dmp-backend/src/main/java/eu/eudat/managers/DataManagementPlanManager.java
@@ -18,7 +18,7 @@ public class DataManagementPlanManager {
 		List<eu.eudat.models.dmp.DataManagementPlan> datamanagementPlans = new DomainModelConverter<eu.eudat.entities.DMP, eu.eudat.models.dmp.DataManagementPlan>().fromDataModel( pagedItems.toList(), eu.eudat.models.dmp.DataManagementPlan.class);
 		DataTableData<eu.eudat.models.dmp.DataManagementPlan> dataTable = new DataTableData<eu.eudat.models.dmp.DataManagementPlan>();
 		dataTable.setData(datamanagementPlans);
-		dataTable.setTotalCount(dmpsRepository.count());
+		dataTable.setTotalCount(datamanagementPlans.size());
 		return dataTable;		
 	}
 	
diff --git a/dmp-backend/src/main/java/eu/eudat/managers/DatasetManager.java b/dmp-backend/src/main/java/eu/eudat/managers/DatasetManager.java
index ba3fece4d..300901abd 100644
--- a/dmp-backend/src/main/java/eu/eudat/managers/DatasetManager.java
+++ b/dmp-backend/src/main/java/eu/eudat/managers/DatasetManager.java
@@ -24,7 +24,7 @@ public class DatasetManager {
         List<Dataset> datasets = new DomainModelConverter<eu.eudat.entities.Dataset, Dataset>().fromDataModel( pagedItems.toList(), eu.eudat.models.dataset.Dataset.class);
         DataTableData<eu.eudat.models.dataset.Dataset> dataTable = new DataTableData<eu.eudat.models.dataset.Dataset>();
         dataTable.setData(datasets);
-        dataTable.setTotalCount(datatasetRepository.count());
+        dataTable.setTotalCount(datasets.size());
         return dataTable;
     }
 
diff --git a/dmp-backend/src/main/java/eu/eudat/managers/ProjectManager.java b/dmp-backend/src/main/java/eu/eudat/managers/ProjectManager.java
index efb9cb952..1affd2bf8 100644
--- a/dmp-backend/src/main/java/eu/eudat/managers/ProjectManager.java
+++ b/dmp-backend/src/main/java/eu/eudat/managers/ProjectManager.java
@@ -18,7 +18,7 @@ public class ProjectManager {
 		List<eu.eudat.models.project.Project> projects = new DomainModelConverter<eu.eudat.entities.Project, Project>().fromDataModel(pagedItems.toList(), eu.eudat.models.project.Project.class);
 		DataTableData<eu.eudat.models.project.Project> dataTable = new DataTableData<eu.eudat.models.project.Project>();
 		dataTable.setData(projects);
-		dataTable.setTotalCount(projectRepository.count());
+		dataTable.setTotalCount(projects.size());
 		return dataTable;		
 	}
 	
diff --git a/dmp-backend/src/main/java/eu/eudat/models/helpers/DataTableData.java b/dmp-backend/src/main/java/eu/eudat/models/helpers/DataTableData.java
index 60d12e1d4..b6a6a11cc 100644
--- a/dmp-backend/src/main/java/eu/eudat/models/helpers/DataTableData.java
+++ b/dmp-backend/src/main/java/eu/eudat/models/helpers/DataTableData.java
@@ -3,13 +3,13 @@ package eu.eudat.models.helpers;
 import java.util.List;
 
 public class DataTableData<T> {
-	private Long totalCount;
+	private Integer totalCount;
 	private List<T> data;
 	
-	public Long getTotalCount() {
+	public Integer getTotalCount() {
 		return totalCount;
 	}
-	public void setTotalCount(Long totalCount) {
+	public void setTotalCount(Integer totalCount) {
 		this.totalCount = totalCount;
 	}
 	public List<T> getData() {