From 6d8b87e5f422898ad6de31894239cda96c076ec7 Mon Sep 17 00:00:00 2001 From: Andreas Svanberg Date: Tue, 4 Mar 2025 14:16:38 +0100 Subject: [PATCH 1/3] Remove unused imports --- .../se/su/dsv/scipro/datatables/project/ProjectDataPanel.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectDataPanel.java b/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectDataPanel.java index 04b5d7b3f8..75f90381f4 100644 --- a/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectDataPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectDataPanel.java @@ -1,6 +1,5 @@ package se.su.dsv.scipro.datatables.project; -import com.google.common.eventbus.EventBus; import jakarta.inject.Inject; import java.util.*; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -33,7 +32,6 @@ import se.su.dsv.scipro.components.datatables.MultipleUsersColumn; import se.su.dsv.scipro.components.datatables.UserColumn; import se.su.dsv.scipro.dataproviders.FilteredDataProvider; import se.su.dsv.scipro.datatables.AjaxCheckboxWrapper; -import se.su.dsv.scipro.notifications.NotificationController; import se.su.dsv.scipro.profile.UserLinkPanel; import se.su.dsv.scipro.project.Project; import se.su.dsv.scipro.project.ProjectService; @@ -45,7 +43,6 @@ import se.su.dsv.scipro.system.ProjectType; import se.su.dsv.scipro.system.ProjectTypeService; import se.su.dsv.scipro.system.ResearchArea; import se.su.dsv.scipro.system.User; -import se.su.dsv.scipro.system.UserService; import se.su.dsv.scipro.util.PageParameterKeys; public class ProjectDataPanel extends Panel { -- 2.39.5 From 76fec9438900fba950b7d8adcdde25fc8c48ae11 Mon Sep 17 00:00:00 2001 From: Andreas Svanberg Date: Tue, 4 Mar 2025 14:18:28 +0100 Subject: [PATCH 2/3] Show reviewers name instead of User#toString in Excel export --- .../su/dsv/scipro/datatables/project/ProjectDataPanel.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectDataPanel.java b/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectDataPanel.java index 75f90381f4..e58b5cce94 100644 --- a/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectDataPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectDataPanel.java @@ -167,6 +167,11 @@ public class ProjectDataPanel extends Panel { ) { cellItem.add(new ReviewerColumnCell(componentId, rowModel)); } + + @Override + public IModel getDataModel(IModel rowModel) { + return rowModel.map(Project::getReviewer).map(User::getFullName); + } }; } -- 2.39.5 From 5066f6d7966b8c88558ef6dc4bdb20e21ebce427 Mon Sep 17 00:00:00 2001 From: Andreas Svanberg Date: Tue, 4 Mar 2025 14:30:43 +0100 Subject: [PATCH 3/3] Output blank cells instead of cells containing "null" --- view/src/main/java/se/su/dsv/scipro/io/ExcelExporter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/view/src/main/java/se/su/dsv/scipro/io/ExcelExporter.java b/view/src/main/java/se/su/dsv/scipro/io/ExcelExporter.java index 14946fc9a4..7e4edfd722 100644 --- a/view/src/main/java/se/su/dsv/scipro/io/ExcelExporter.java +++ b/view/src/main/java/se/su/dsv/scipro/io/ExcelExporter.java @@ -72,7 +72,9 @@ public class ExcelExporter extends AbstractDataExporter { for (int i = 0; i < columns.size(); i++) { Object cellValue = columns.get(i).getDataModel(data).getObject(); Cell cell = row.createCell(i); - cell.setCellValue(String.valueOf(cellValue)); + if (cellValue != null) { + cell.setCellValue(cellValue.toString()); + } } } } -- 2.39.5