nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1342: getTasksWorkbasketReport now filters for states

This commit is contained in:
Tristan Eisermann 2020-07-17 11:56:07 +02:00 committed by Tristan2357
parent 72d46b9324
commit e441506812
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rest/taskana-rest-spring/src/main/java/pro/taskana/monitor/rest/MonitorController.java
View File

@ -50,7 +50,7 @@ public class MonitorController {
@RequestParam(required = false) List<String> domains, @RequestParam(required = false) List<String> domains,
@RequestParam(required = false) List<TaskState> states) @RequestParam(required = false) List<TaskState> states)
throws NotAuthorizedException, InvalidArgumentException { throws NotAuthorizedException, InvalidArgumentException {
LOGGER.debug("Entry to getTasksStatusReport()"); LOGGER.debug("Entry to getTasksStatusReport(), states to include {}", states);
ResponseEntity<ReportRepresentationModel> response = ResponseEntity<ReportRepresentationModel> response =
ResponseEntity.ok( ResponseEntity.ok(
reportRepresentationModelAssembler.toModel( reportRepresentationModelAssembler.toModel(
@ -73,13 +73,14 @@ public class MonitorController {
public ResponseEntity<ReportRepresentationModel> getTasksWorkbasketReport( public ResponseEntity<ReportRepresentationModel> getTasksWorkbasketReport(
@RequestParam(value = "states") List<TaskState> states) @RequestParam(value = "states") List<TaskState> states)
throws NotAuthorizedException, InvalidArgumentException { throws NotAuthorizedException, InvalidArgumentException {
LOGGER.debug("Entry to getTasksWorkbasketReport()"); LOGGER.debug("Entry to getTasksWorkbasketReport(), states to include {}", states);
ReportRepresentationModel report = ReportRepresentationModel report =
reportRepresentationModelAssembler.toModel( reportRepresentationModelAssembler.toModel(
monitorService monitorService
.createWorkbasketReportBuilder() .createWorkbasketReportBuilder()
.withColumnHeaders(getRangeTimeInterval()) .withColumnHeaders(getRangeTimeInterval())
.stateIn(states)
.buildReport(), .buildReport(),
states); states);
@ -96,7 +97,11 @@ public class MonitorController {
@RequestParam(value = "daysInPast") int daysInPast, @RequestParam(value = "daysInPast") int daysInPast,
@RequestParam(value = "states") List<TaskState> states) @RequestParam(value = "states") List<TaskState> states)
throws NotAuthorizedException, InvalidArgumentException { throws NotAuthorizedException, InvalidArgumentException {
LOGGER.debug("Entry to getTasksWorkbasketPlannedDateReport()"); LOGGER.debug(
"Entry to getTasksWorkbasketPlannedDateReport(), "
+ "upto {} days in the past, states to include {}",
daysInPast,
states);
ReportRepresentationModel report = ReportRepresentationModel report =
reportRepresentationModelAssembler.toModel( reportRepresentationModelAssembler.toModel(