work/timetrack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

corrected null value editing

Browse Source
This commit is contained in:
Jörg Henke
2022-07-04 21:11:25 +02:00
parent b35e2539a3
commit 5651ee5464
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/de/jottyfan/timetrack/spring/done/DoneController.java
View File

@@ -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";
}

8
src/main/java/de/jottyfan/timetrack/spring/done/IDoneService.java
View File

@@ -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);

16
src/main/java/de/jottyfan/timetrack/spring/done/impl/DoneService.java
View File

@@ -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<>();