From 5651ee5464b7125ffb1524c559d5a57e4684da34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Henke?= <joerg.henke@uni-greifswald.de>
Date: Mon, 4 Jul 2022 21:11:25 +0200
Subject: [PATCH] corrected null value editing

---
 .../timetrack/spring/done/DoneController.java    | 16 ++++++++--------
 .../timetrack/spring/done/IDoneService.java      |  8 ++++----
 .../timetrack/spring/done/impl/DoneService.java  | 16 ++++++++--------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/main/java/de/jottyfan/timetrack/spring/done/DoneController.java b/src/main/java/de/jottyfan/timetrack/spring/done/DoneController.java
index 215d870..4a9032b 100644
--- a/src/main/java/de/jottyfan/timetrack/spring/done/DoneController.java
+++ b/src/main/java/de/jottyfan/timetrack/spring/done/DoneController.java
@@ -45,10 +45,10 @@ public class DoneController {
 		model.addAttribute("doneList", list);
 		model.addAttribute("doneModel", doneModel);
 		model.addAttribute("sum", new SummaryBean(list, doneModel.getDay(), maxWorkTime));
-		model.addAttribute("projectList", doneService.getProjects());
-		model.addAttribute("moduleList", doneService.getModules());
-		model.addAttribute("jobList", doneService.getJobs());
-		model.addAttribute("billingList", doneService.getBillings());
+		model.addAttribute("projectList", doneService.getProjects(false));
+		model.addAttribute("moduleList", doneService.getModules(false));
+		model.addAttribute("jobList", doneService.getJobs(false));
+		model.addAttribute("billingList", doneService.getBillings(false));
 		return "done/list";
 	}
 
@@ -66,10 +66,10 @@ public class DoneController {
 			bean = new DoneBean(); // the add case
 		}
 		model.addAttribute("doneBean", bean);
-		model.addAttribute("projectList", doneService.getProjects());
-		model.addAttribute("moduleList", doneService.getModules());
-		model.addAttribute("jobList", doneService.getJobs());
-		model.addAttribute("billingList", doneService.getBillings());
+		model.addAttribute("projectList", doneService.getProjects(true));
+		model.addAttribute("moduleList", doneService.getModules(true));
+		model.addAttribute("jobList", doneService.getJobs(true));
+		model.addAttribute("billingList", doneService.getBillings(true));
 		return "done/item";
 	}
 	
diff --git a/src/main/java/de/jottyfan/timetrack/spring/done/IDoneService.java b/src/main/java/de/jottyfan/timetrack/spring/done/IDoneService.java
index 3797d39..5c8c809 100644
--- a/src/main/java/de/jottyfan/timetrack/spring/done/IDoneService.java
+++ b/src/main/java/de/jottyfan/timetrack/spring/done/IDoneService.java
@@ -22,13 +22,13 @@ public interface IDoneService {
 
 	public String getCurrentUser(HttpServletRequest request);
 
-	public List<TProjectRecord> getProjects();
+	public List<TProjectRecord> getProjects(boolean includeNull);
 
-	public List<TModuleRecord> getModules();
+	public List<TModuleRecord> getModules(boolean includeNull);
 
-	public List<TJobRecord> getJobs();
+	public List<TJobRecord> getJobs(boolean includeNull);
 
-	public List<TBillingRecord> getBillings();
+	public List<TBillingRecord> getBillings(boolean includeNull);
 
 	public Integer doUpsert(DoneBean bean, String username);
 
diff --git a/src/main/java/de/jottyfan/timetrack/spring/done/impl/DoneService.java b/src/main/java/de/jottyfan/timetrack/spring/done/impl/DoneService.java
index 7259263..f0cd3cc 100644
--- a/src/main/java/de/jottyfan/timetrack/spring/done/impl/DoneService.java
+++ b/src/main/java/de/jottyfan/timetrack/spring/done/impl/DoneService.java
@@ -68,9 +68,9 @@ public class DoneService implements IDoneService {
 	}
 
 	@Override
-	public List<TProjectRecord> getProjects() {
+	public List<TProjectRecord> getProjects(boolean includeNull) {
 		try {
-			return new DoneGateway(dsl).getAllProjects(true);
+			return new DoneGateway(dsl).getAllProjects(includeNull);
 		} catch (Exception e) {
 			LOGGER.error(e);
 			return new ArrayList<>();
@@ -78,9 +78,9 @@ public class DoneService implements IDoneService {
 	}
 
 	@Override
-	public List<TModuleRecord> getModules() {
+	public List<TModuleRecord> getModules(boolean includeNull) {
 		try {
-			return new DoneGateway(dsl).getAllModules(true);
+			return new DoneGateway(dsl).getAllModules(includeNull);
 		} catch (Exception e) {
 			LOGGER.error(e);
 			return new ArrayList<>();
@@ -88,9 +88,9 @@ public class DoneService implements IDoneService {
 	}
 
 	@Override
-	public List<TJobRecord> getJobs() {
+	public List<TJobRecord> getJobs(boolean includeNull) {
 		try {
-			return new DoneGateway(dsl).getAllJobs(true);
+			return new DoneGateway(dsl).getAllJobs(includeNull);
 		} catch (Exception e) {
 			LOGGER.error(e);
 			return new ArrayList<>();
@@ -98,9 +98,9 @@ public class DoneService implements IDoneService {
 	}
 
 	@Override
-	public List<TBillingRecord> getBillings() {
+	public List<TBillingRecord> getBillings(boolean includeNull) {
 		try {
-			return new DoneGateway(dsl).getAllBillings(true);
+			return new DoneGateway(dsl).getAllBillings(includeNull);
 		} catch (Exception e) {
 			LOGGER.error(e);
 			return new ArrayList<>();