|
|
|
@ -291,7 +291,7 @@ public class DataManagementPlanManager {
|
|
|
|
|
if (includeDatasets) {
|
|
|
|
|
dataManagementPlan.fromDataModel(dataManagementPlanEntity);
|
|
|
|
|
dataManagementPlan.getDatasets().forEach(datasetWizardModel -> datasetWizardModel.setDescription(null));
|
|
|
|
|
dataManagementPlan.setDatasets(dataManagementPlan.getDatasets().stream().sorted(Comparator.comparing(DatasetWizardModel::getModified).reversed()).collect(Collectors.toList()));
|
|
|
|
|
dataManagementPlan.setDatasets(dataManagementPlan.getDatasets().stream().sorted(Comparator.comparing(DatasetWizardModel::getCreated).reversed()).collect(Collectors.toList()));
|
|
|
|
|
//List<Dataset> datasetEnities = new ArrayList<>(dataManagementPlanEntity.getDataset());
|
|
|
|
|
/*for (int i = 0; i < datasetEnities.size(); i++) {
|
|
|
|
|
for (int j = i; j < dataManagementPlan.getDatasets().size(); j++) {
|
|
|
|
@ -343,7 +343,7 @@ public class DataManagementPlanManager {
|
|
|
|
|
}
|
|
|
|
|
DataManagementPlanOverviewModel datamanagementPlan = new DataManagementPlanOverviewModel();
|
|
|
|
|
datamanagementPlan.fromDataModelDatasets(dataManagementPlanEntity);
|
|
|
|
|
datamanagementPlan.setDatasets(datamanagementPlan.getDatasets().stream().sorted(Comparator.comparing(DatasetOverviewModel::getModified).reversed()).collect(Collectors.toList()));
|
|
|
|
|
datamanagementPlan.setDatasets(datamanagementPlan.getDatasets().stream().sorted(Comparator.comparing(DatasetOverviewModel::getCreated).reversed()).collect(Collectors.toList()));
|
|
|
|
|
if (isPublic) {
|
|
|
|
|
datamanagementPlan.setDatasets(datamanagementPlan.getDatasets().stream().filter(dataset -> dataset.getStatus() == Dataset.Status.FINALISED.getValue()).collect(Collectors.toList()));
|
|
|
|
|
}
|
|
|
|
|