MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

no message

This commit is contained in:
annabakouli 2017-12-18 18:26:38 +02:00
parent c1f2c615af
commit 176f5b3004
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-backend/src/main/java/eu/eudat/managers/DataManagementPlanManager.java
View File

@ -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); 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>(); DataTableData<eu.eudat.models.dmp.DataManagementPlan> dataTable = new DataTableData<eu.eudat.models.dmp.DataManagementPlan>();
dataTable.setData(datamanagementPlans); dataTable.setData(datamanagementPlans);
dataTable.setTotalCount(dmpsRepository.count()); dataTable.setTotalCount(datamanagementPlans.size());
return dataTable; return dataTable;
} }

2
dmp-backend/src/main/java/eu/eudat/managers/DatasetManager.java
View File

@ -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); 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>(); DataTableData<eu.eudat.models.dataset.Dataset> dataTable = new DataTableData<eu.eudat.models.dataset.Dataset>();
dataTable.setData(datasets); dataTable.setData(datasets);
dataTable.setTotalCount(datatasetRepository.count()); dataTable.setTotalCount(datasets.size());
return dataTable; return dataTable;
} }

2
dmp-backend/src/main/java/eu/eudat/managers/ProjectManager.java
View File

@ -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); 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>(); DataTableData<eu.eudat.models.project.Project> dataTable = new DataTableData<eu.eudat.models.project.Project>();
dataTable.setData(projects); dataTable.setData(projects);
dataTable.setTotalCount(projectRepository.count()); dataTable.setTotalCount(projects.size());
return dataTable; return dataTable;
} }

6
dmp-backend/src/main/java/eu/eudat/models/helpers/DataTableData.java
View File

@ -3,13 +3,13 @@ package eu.eudat.models.helpers;
import java.util.List; import java.util.List;
public class DataTableData<T> { public class DataTableData<T> {
private Long totalCount; private Integer totalCount;
private List<T> data; private List<T> data;
public Long getTotalCount() { public Integer getTotalCount() {
return totalCount; return totalCount;
} }
public void setTotalCount(Long totalCount) { public void setTotalCount(Integer totalCount) {
this.totalCount = totalCount; this.totalCount = totalCount;
} }
public List<T> getData() { public List<T> getData() {