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

playing with the selected date

Browse Source
This commit is contained in:
Jörg Henke
2022-07-04 22:08:14 +02:00
parent 5651ee5464
commit 18dd8edc30
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/de/jottyfan/timetrack/config/InitialConfiguration.java
View File

@ -11,6 +11,8 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy;
import de.jottyfan.timetrack.spring.done.DoneModel;
/**
*
* @author henkej
@ -21,6 +23,11 @@ public class InitialConfiguration {
@Autowired
private DataSource dataSource;
@Bean
public DoneModel getDoneModel() {
return new DoneModel();
}
@Bean
public DataSourceConnectionProvider connectionProvider() {
return new DataSourceConnectionProvider(new TransactionAwareDataSourceProxy(dataSource));

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

@ -1,6 +1,7 @@
package de.jottyfan.timetrack.spring.done;
import java.time.Duration;
import java.time.LocalDate;
import java.util.List;
import javax.annotation.security.RolesAllowed;
@ -31,6 +32,9 @@ public class DoneController {
@Autowired
private IDoneService doneService;
@Autowired
private DoneModel doneModel;
@Autowired
public DoneController(HttpServletRequest request) {
this.request = request;
@ -41,10 +45,12 @@ public class DoneController {
public String getList(@ModelAttribute DoneModel doneModel, Model model) {
String username = doneService.getCurrentUser(request);
Duration maxWorkTime = Duration.ofHours(8); // TODO: to the configuration file
List<DoneBean> list = doneService.getList(doneModel.getDay(), username);
LocalDate day = doneModel.getDay();
this.doneModel.setDay(day);
List<DoneBean> list = doneService.getList(day, username);
model.addAttribute("doneList", list);
model.addAttribute("doneModel", doneModel);
model.addAttribute("sum", new SummaryBean(list, doneModel.getDay(), maxWorkTime));
model.addAttribute("doneModel", this.doneModel);
model.addAttribute("sum", new SummaryBean(list, day, maxWorkTime));
model.addAttribute("projectList", doneService.getProjects(false));
model.addAttribute("moduleList", doneService.getModules(false));
model.addAttribute("jobList", doneService.getJobs(false));
@ -78,9 +84,8 @@ public class DoneController {
public String doUpsert(Model model, @ModelAttribute DoneBean bean) {
String username = doneService.getCurrentUser(request);
Integer amount = doneService.doUpsert(bean, username);
DoneModel doneModel = new DoneModel();
doneModel.setDay(bean.getLocalDate());
return amount.equals(1) ? getList(doneModel, model) : toItem(bean.getPk(), model);
this.doneModel.setDay(bean.getLocalDate());
return amount.equals(1) ? getList(this.doneModel, model) : toItem(bean.getPk(), model);
}
@RolesAllowed("timetrack_user")
@ -88,8 +93,7 @@ public class DoneController {
public String doDelete(@PathVariable Integer id, Model model) {
DoneBean bean = doneService.getBean(id);
Integer amount = doneService.doDelete(id);
DoneModel doneModel = new DoneModel();
doneModel.setDay(bean.getLocalDate());
return amount.equals(1) ? getList(doneModel, model) : toItem(id, model);
this.doneModel.setDay(bean.getLocalDate());
return amount.equals(1) ? getList(this.doneModel, model) : toItem(id, model);
}
}