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

feature/810 Add querying by planned date in monitor screen

This commit is contained in:
Martin Rojas Miguel Angel 2019-03-13 17:00:55 +01:00 committed by Mustapha Zorgati
parent 5d54e99b6f
commit 7720baaa2b
49 changed files with 1086 additions and 822 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/taskana-core/src/main/java/pro/taskana/impl/CategoryReportBuilderImpl.java
View File

@ -12,7 +12,6 @@ import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.impl.report.header.TimeIntervalColumnHeader;
import pro.taskana.impl.report.item.MonitorQueryItem;
import pro.taskana.impl.report.preprocessor.DaysToWorkingDaysPreProcessor;
import pro.taskana.impl.report.structure.Report;
import pro.taskana.mappings.TaskMonitorMapper;
import pro.taskana.report.CategoryReport;
@ -58,10 +57,4 @@ public class CategoryReportBuilderImpl
LOGGER.debug("exit from buildReport().");
}
}
@Override
public Report<MonitorQueryItem, TimeIntervalColumnHeader> buildPlannedDateBasedReport()
throws NotAuthorizedException, InvalidArgumentException {
throw new java.lang.UnsupportedOperationException("Not supported yet.");
}
}

11
lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationReportBuilderImpl.java
View File

@ -1,7 +1,10 @@
package pro.taskana.impl;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole;
import pro.taskana.exceptions.InvalidArgumentException;
@ -13,9 +16,6 @@ import pro.taskana.impl.report.preprocessor.DaysToWorkingDaysPreProcessor;
import pro.taskana.mappings.TaskMonitorMapper;
import pro.taskana.report.ClassificationReport;
import pro.taskana.report.ClassificationReport.DetailedClassificationReport;
import pro.taskana.report.Report;
import java.util.List;
/**
* The implementation of ClassificationReportBuilder.
@ -79,9 +79,4 @@ public class ClassificationReportBuilderImpl
LOGGER.debug("exit from buildDetailedReport().");
}
}
@Override
public Report<MonitorQueryItem, TimeIntervalColumnHeader> buildPlannedDateBasedReport() throws NotAuthorizedException, InvalidArgumentException {
throw new java.lang.UnsupportedOperationException("Not supported yet.");
}
}

8
lib/taskana-core/src/main/java/pro/taskana/impl/CustomFieldValueReportBuilderImpl.java
View File

@ -13,7 +13,6 @@ import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.impl.report.header.TimeIntervalColumnHeader;
import pro.taskana.impl.report.item.MonitorQueryItem;
import pro.taskana.impl.report.preprocessor.DaysToWorkingDaysPreProcessor;
import pro.taskana.impl.report.structure.Report;
import pro.taskana.mappings.TaskMonitorMapper;
import pro.taskana.report.CustomFieldValueReport;
@ -66,11 +65,4 @@ public class CustomFieldValueReportBuilderImpl
LOGGER.debug("exit from buildReport().");
}
}
@Override
public Report<MonitorQueryItem, TimeIntervalColumnHeader> buildPlannedDateBasedReport()
throws NotAuthorizedException, InvalidArgumentException {
throw new java.lang.UnsupportedOperationException("Not supported yet.");
}
}

10
lib/taskana-core/src/main/java/pro/taskana/impl/TaskStatusReportBuilderImpl.java
View File

@ -8,11 +8,8 @@ import org.slf4j.LoggerFactory;
import pro.taskana.TaskState;
import pro.taskana.TaskanaEngine;
import pro.taskana.TaskanaRole;
import pro.taskana.exceptions.InvalidArgumentException;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.impl.report.header.TaskStatusColumnHeader;
import pro.taskana.impl.report.item.TaskQueryItem;
import pro.taskana.impl.report.structure.Report;
import pro.taskana.mappings.TaskMonitorMapper;
import pro.taskana.report.TaskStatusReport;
@ -59,11 +56,4 @@ public class TaskStatusReportBuilderImpl implements TaskStatusReport.Builder {
LOGGER.debug("exit from buildReport().");
}
}
@Override
public Report<TaskQueryItem, TaskStatusColumnHeader> buildPlannedDateBasedReport()
throws NotAuthorizedException, InvalidArgumentException {
throw new java.lang.UnsupportedOperationException("Not supported yet.");
}
}

6
lib/taskana-core/src/main/java/pro/taskana/impl/report/header/TimeIntervalColumnHeader.java
View File

@ -89,6 +89,12 @@ public class TimeIntervalColumnHeader implements ColumnHeader<AgeQueryItem> {
return "<" + this.getUpperAgeLimit();
} else if (this.getUpperAgeLimit() == Integer.MAX_VALUE) {
return ">" + this.getLowerAgeLimit();
} else if (this.getLowerAgeLimit() == -1) {
return "-1 day";
} else if (this.getLowerAgeLimit() == 1) {
return "+1 day";
} else if (this.getLowerAgeLimit() == 0) {
return "today";
} else if (this.getLowerAgeLimit() == this.getUpperAgeLimit()) {
return this.getUpperAgeLimit() + "";
} else if (this.getLowerAgeLimit() != this.getUpperAgeLimit()) {

1
lib/taskana-core/src/main/java/pro/taskana/impl/report/structure/Report.java
View File

@ -105,6 +105,5 @@ public abstract class Report<I extends QueryItem, H extends ColumnHeader<? super
public interface Builder<I extends QueryItem, H extends ColumnHeader<? super I>> {
Report<I, H> buildReport() throws NotAuthorizedException, InvalidArgumentException;
Report<I, H> buildPlannedDateBasedReport() throws NotAuthorizedException, InvalidArgumentException;
}
}

85
lib/taskana-core/src/main/java/pro/taskana/mappings/TaskMonitorMapper.java
View File

@ -10,13 +10,13 @@ import org.apache.ibatis.annotations.Select;
import pro.taskana.CustomField;
import pro.taskana.TaskState;
import pro.taskana.report.Timestamp;
import pro.taskana.impl.SelectedItem;
import pro.taskana.impl.report.CombinedClassificationFilter;
import pro.taskana.impl.report.item.TimestampQueryItem;
import pro.taskana.impl.report.item.DetailedMonitorQueryItem;
import pro.taskana.impl.report.item.MonitorQueryItem;
import pro.taskana.impl.report.item.TaskQueryItem;
import pro.taskana.impl.report.item.TimestampQueryItem;
import pro.taskana.report.Timestamp;
/**
* This class is the mybatis mapping of task monitoring.
@ -24,9 +24,10 @@ import pro.taskana.impl.report.item.TaskQueryItem;
public interface TaskMonitorMapper {
@Select("<script>"
+ "<if test=\"_databaseId == 'db2'\">SELECT T.WORKBASKET_KEY, (DAYS(T.DUE) - DAYS(CURRENT_TIMESTAMP)) as AGE_IN_DAYS, COUNT(*) as NUMBER_OF_TASKS</if> "
+ "<if test=\"_databaseId == 'h2'\">SELECT T.WORKBASKET_KEY, DATEDIFF('DAY', CURRENT_TIMESTAMP, T.DUE) as AGE_IN_DAYS, COUNT(*) as NUMBER_OF_TASKS</if> "
+ "<if test=\"_databaseId == 'postgres'\">SELECT T.WORKBASKET_KEY, DATE_PART('DAY', T.DUE - CURRENT_TIMESTAMP) as AGE_IN_DAYS, COUNT(*) as NUMBER_OF_TASKS</if> "
+ "SELECT B.WORKBASKET_KEY, B.AGE_IN_DAYS, COUNT(B.AGE_IN_DAYS) AS NUMBER_OF_TASKS FROM ("
+ "<if test=\"_databaseId == 'db2'\">SELECT T.WORKBASKET_KEY, (DAYS(T.DUE) - DAYS(CURRENT_TIMESTAMP)) as AGE_IN_DAYS </if> "
+ "<if test=\"_databaseId == 'h2'\">SELECT T.WORKBASKET_KEY, DATEDIFF('DAY', CURRENT_TIMESTAMP, T.DUE) as AGE_IN_DAYS </if> "
+ "<if test=\"_databaseId == 'postgres'\">SELECT T.WORKBASKET_KEY, DATE_PART('DAY', T.DUE - CURRENT_TIMESTAMP) as AGE_IN_DAYS </if> "
+ "FROM TASK AS T LEFT JOIN ATTACHMENT AS A ON T.ID = A.TASK_ID "
+ "<where>"
+ "<if test=\"workbasketIds != null\">"
@ -60,10 +61,8 @@ public interface TaskMonitorMapper {
+ "</if>"
+ "AND T.DUE IS NOT NULL "
+ "</where>"
+ "<if test=\"_databaseId == 'db2'\">GROUP BY T.WORKBASKET_KEY, (DAYS(T.DUE) - DAYS(CURRENT_TIMESTAMP))</if> "
+ "<if test=\"_databaseId == 'h2'\">GROUP BY T.WORKBASKET_KEY, DATEDIFF('DAY', CURRENT_TIMESTAMP, T.DUE)</if> "
+ "<if test=\"_databaseId == 'postgres'\">GROUP BY T.WORKBASKET_KEY, DATE_PART('DAY', T.DUE - CURRENT_TIMESTAMP)</if> "
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
+ ") AS B "
+ "GROUP BY B.WORKBASKET_KEY, B.AGE_IN_DAYS"
+ "</script>")
@Results({
@Result(column = "WORKBASKET_KEY", property = "key"),
@ -79,9 +78,10 @@ public interface TaskMonitorMapper {
@Param("combinedClassificationFilter") List<CombinedClassificationFilter> combinedClassificationFilter);
@Select("<script>"
+ "<if test=\"_databaseId == 'db2'\">SELECT T.WORKBASKET_KEY, (DAYS(T.PLANNED) - DAYS(CURRENT_TIMESTAMP)) as AGE_IN_DAYS, COUNT(*) as NUMBER_OF_TASKS</if> "
+ "<if test=\"_databaseId == 'h2'\">SELECT T.WORKBASKET_KEY, DATEDIFF('DAY', CURRENT_TIMESTAMP, T.PLANNED) as AGE_IN_DAYS, COUNT(*) as NUMBER_OF_TASKS</if> "
+ "<if test=\"_databaseId == 'postgres'\">SELECT T.WORKBASKET_KEY, DATE_PART('DAY', T.PLANNED - CURRENT_TIMESTAMP) as AGE_IN_DAYS, COUNT(*) as NUMBER_OF_TASKS</if> "
+ "SELECT B.WORKBASKET_KEY, B.AGE_IN_DAYS, COUNT(B.AGE_IN_DAYS) AS NUMBER_OF_TASKS FROM ("
+ "<if test=\"_databaseId == 'db2'\">SELECT T.WORKBASKET_KEY, (DAYS(T.PLANNED) - DAYS(CURRENT_TIMESTAMP)) as AGE_IN_DAYS </if> "
+ "<if test=\"_databaseId == 'h2'\">SELECT T.WORKBASKET_KEY, DATEDIFF('DAY', CURRENT_TIMESTAMP, T.PLANNED) as AGE_IN_DAYS </if> "
+ "<if test=\"_databaseId == 'postgres'\">SELECT T.WORKBASKET_KEY, DATE_PART('DAY', T.PLANNED - CURRENT_TIMESTAMP) as AGE_IN_DAYS </if> "
+ "FROM TASK AS T LEFT JOIN ATTACHMENT AS A ON T.ID = A.TASK_ID "
+ "<where>"
+ "<if test=\"workbasketIds != null\">"
@ -115,16 +115,15 @@ public interface TaskMonitorMapper {
+ "</if>"
+ "AND T.PLANNED IS NOT NULL "
+ "</where>"
+ "<if test=\"_databaseId == 'db2'\">GROUP BY T.WORKBASKET_KEY, (DAYS(T.PLANNED) - DAYS(CURRENT_TIMESTAMP))</if> "
+ "<if test=\"_databaseId == 'h2'\">GROUP BY T.WORKBASKET_KEY, DATEDIFF('DAY', CURRENT_TIMESTAMP, T.PLANNED)</if> "
+ "<if test=\"_databaseId == 'postgres'\">GROUP BY T.WORKBASKET_KEY, DATE_PART('DAY', T.PLANNED - CURRENT_TIMESTAMP)</if> "
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
+ ") AS B "
+ "GROUP BY B.WORKBASKET_KEY, B.AGE_IN_DAYS"
+ "</script>")
@Results({
@Result(column = "WORKBASKET_KEY", property = "key"),
@Result(column = "AGE_IN_DAYS", property = "ageInDays"),
@Result(column = "NUMBER_OF_TASKS", property = "numberOfTasks")})
List<MonitorQueryItem> getTaskCountOfWorkbasketsBasedOnPlannedDate(@Param("workbasketIds") List<String> workbasketIds,
List<MonitorQueryItem> getTaskCountOfWorkbasketsBasedOnPlannedDate(
@Param("workbasketIds") List<String> workbasketIds,
@Param("states") List<TaskState> states,
@Param("categories") List<String> categories,
@Param("domains") List<String> domains,
@ -134,9 +133,10 @@ public interface TaskMonitorMapper {
@Param("combinedClassificationFilter") List<CombinedClassificationFilter> combinedClassificationFilter);
@Select("<script>"
+ "<if test=\"_databaseId == 'db2'\">SELECT CLASSIFICATION_CATEGORY, (DAYS(DUE) - DAYS(CURRENT_TIMESTAMP)) as AGE_IN_DAYS, COUNT(*) as NUMBER_OF_TASKS</if> "
+ "<if test=\"_databaseId == 'h2'\">SELECT CLASSIFICATION_CATEGORY, DATEDIFF('DAY', CURRENT_TIMESTAMP, DUE) as AGE_IN_DAYS, COUNT(*) as NUMBER_OF_TASKS</if> "
+ "<if test=\"_databaseId == 'postgres'\">SELECT CLASSIFICATION_CATEGORY, DATE_PART('DAY', DUE - CURRENT_TIMESTAMP) as AGE_IN_DAYS, COUNT(*) as NUMBER_OF_TASKS</if> "
+ "SELECT B.CLASSIFICATION_CATEGORY, B.AGE_IN_DAYS, COUNT(B.AGE_IN_DAYS) AS NUMBER_OF_TASKS FROM ("
+ "<if test=\"_databaseId == 'db2'\">SELECT CLASSIFICATION_CATEGORY, (DAYS(DUE) - DAYS(CURRENT_TIMESTAMP)) as AGE_IN_DAYS </if> "
+ "<if test=\"_databaseId == 'h2'\">SELECT CLASSIFICATION_CATEGORY, DATEDIFF('DAY', CURRENT_TIMESTAMP, DUE) as AGE_IN_DAYS </if> "
+ "<if test=\"_databaseId == 'postgres'\">SELECT CLASSIFICATION_CATEGORY, DATE_PART('DAY', DUE - CURRENT_TIMESTAMP) as AGE_IN_DAYS </if> "
+ "FROM TASK "
+ "<where>"
+ "<if test=\"workbasketIds != null\">"
@ -162,10 +162,8 @@ public interface TaskMonitorMapper {
+ "</if>"
+ "AND DUE IS NOT NULL "
+ "</where>"
+ "<if test=\"_databaseId == 'db2'\">GROUP BY CLASSIFICATION_CATEGORY, (DAYS(DUE) - DAYS(CURRENT_TIMESTAMP))</if> "
+ "<if test=\"_databaseId == 'h2'\">GROUP BY CLASSIFICATION_CATEGORY, DATEDIFF('DAY', CURRENT_TIMESTAMP, DUE)</if> "
+ "<if test=\"_databaseId == 'postgres'\">GROUP BY CLASSIFICATION_CATEGORY, DATE_PART('DAY', DUE - CURRENT_TIMESTAMP)</if> "
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
+ ") AS B "
+ "GROUP BY B.CLASSIFICATION_CATEGORY, B.AGE_IN_DAYS "
+ "</script>")
@Results({
@Result(column = "CLASSIFICATION_CATEGORY", property = "key"),
@ -180,9 +178,10 @@ public interface TaskMonitorMapper {
@Param("customAttributeFilter") Map<CustomField, String> customAttributeFilter);
@Select("<script>"
+ "<if test=\"_databaseId == 'db2'\">SELECT CLASSIFICATION_KEY, (DAYS(DUE) - DAYS(CURRENT_TIMESTAMP)) as AGE_IN_DAYS, COUNT(*) as NUMBER_OF_TASKS</if> "
+ "<if test=\"_databaseId == 'h2'\">SELECT CLASSIFICATION_KEY, DATEDIFF('DAY', CURRENT_TIMESTAMP, DUE) as AGE_IN_DAYS, COUNT(*) as NUMBER_OF_TASKS</if> "
+ "<if test=\"_databaseId == 'postgres'\">SELECT CLASSIFICATION_KEY, DATE_PART('DAY', DUE - CURRENT_TIMESTAMP) as AGE_IN_DAYS, COUNT(*) as NUMBER_OF_TASKS</if> "
+ "SELECT B.CLASSIFICATION_KEY, B.AGE_IN_DAYS, COUNT(B.AGE_IN_DAYS) AS NUMBER_OF_TASKS FROM ("
+ "<if test=\"_databaseId == 'db2'\">SELECT CLASSIFICATION_KEY, (DAYS(DUE) - DAYS(CURRENT_TIMESTAMP)) as AGE_IN_DAYS </if> "
+ "<if test=\"_databaseId == 'h2'\">SELECT CLASSIFICATION_KEY, DATEDIFF('DAY', CURRENT_TIMESTAMP, DUE) as AGE_IN_DAYS </if> "
+ "<if test=\"_databaseId == 'postgres'\">SELECT CLASSIFICATION_KEY, DATE_PART('DAY', DUE - CURRENT_TIMESTAMP) as AGE_IN_DAYS </if> "
+ "FROM TASK "
+ "<where>"
+ "<if test=\"workbasketIds != null\">"
@ -208,10 +207,8 @@ public interface TaskMonitorMapper {
+ "</if>"
+ "AND DUE IS NOT NULL "
+ "</where>"
+ "<if test=\"_databaseId == 'db2'\">GROUP BY CLASSIFICATION_KEY, (DAYS(DUE) - DAYS(CURRENT_TIMESTAMP))</if> "
+ "<if test=\"_databaseId == 'h2'\">GROUP BY CLASSIFICATION_KEY, DATEDIFF('DAY', CURRENT_TIMESTAMP, DUE)</if> "
+ "<if test=\"_databaseId == 'postgres'\">GROUP BY CLASSIFICATION_KEY, DATE_PART('DAY', DUE - CURRENT_TIMESTAMP)</if> "
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
+ ") AS B "
+ "GROUP BY B.CLASSIFICATION_KEY, B.AGE_IN_DAYS "
+ "</script>")
@Results({
@Result(column = "CLASSIFICATION_KEY", property = "key"),
@ -226,9 +223,10 @@ public interface TaskMonitorMapper {
@Param("customAttributeFilter") Map<CustomField, String> customAttributeFilter);
@Select("<script>"
+ "<if test=\"_databaseId == 'db2'\">SELECT T.CLASSIFICATION_KEY as TASK_CLASSIFICATION_KEY, A.CLASSIFICATION_KEY as ATTACHMENT_CLASSIFICATION_KEY, (DAYS(DUE) - DAYS(CURRENT_TIMESTAMP)) as AGE_IN_DAYS, COUNT(*) as NUMBER_OF_TASKS</if> "
+ "<if test=\"_databaseId == 'h2'\">SELECT T.CLASSIFICATION_KEY as TASK_CLASSIFICATION_KEY, A.CLASSIFICATION_KEY as ATTACHMENT_CLASSIFICATION_KEY, DATEDIFF('DAY', CURRENT_TIMESTAMP, DUE) as AGE_IN_DAYS, COUNT(*) as NUMBER_OF_TASKS</if> "
+ "<if test=\"_databaseId == 'postgres'\">SELECT T.CLASSIFICATION_KEY as TASK_CLASSIFICATION_KEY, A.CLASSIFICATION_KEY as ATTACHMENT_CLASSIFICATION_KEY, DATE_PART('DAY', DUE - CURRENT_TIMESTAMP) as AGE_IN_DAYS, COUNT(*) as NUMBER_OF_TASKS</if> "
+ "SELECT B.TASK_CLASSIFICATION_KEY, B.ATTACHMENT_CLASSIFICATION_KEY, B.AGE_IN_DAYS, COUNT(B.AGE_IN_DAYS) AS NUMBER_OF_TASKS FROM ("
+ "<if test=\"_databaseId == 'db2'\">SELECT T.CLASSIFICATION_KEY as TASK_CLASSIFICATION_KEY, A.CLASSIFICATION_KEY as ATTACHMENT_CLASSIFICATION_KEY, (DAYS(DUE) - DAYS(CURRENT_TIMESTAMP)) as AGE_IN_DAYS </if> "
+ "<if test=\"_databaseId == 'h2'\">SELECT T.CLASSIFICATION_KEY as TASK_CLASSIFICATION_KEY, A.CLASSIFICATION_KEY as ATTACHMENT_CLASSIFICATION_KEY, DATEDIFF('DAY', CURRENT_TIMESTAMP, DUE) as AGE_IN_DAYS </if> "
+ "<if test=\"_databaseId == 'postgres'\">SELECT T.CLASSIFICATION_KEY as TASK_CLASSIFICATION_KEY, A.CLASSIFICATION_KEY as ATTACHMENT_CLASSIFICATION_KEY, DATE_PART('DAY', DUE - CURRENT_TIMESTAMP) as AGE_IN_DAYS </if> "
+ "FROM TASK AS T LEFT JOIN ATTACHMENT AS A ON T.ID = A.TASK_ID "
+ "<where>"
+ "<if test=\"workbasketIds != null\">"
@ -254,10 +252,8 @@ public interface TaskMonitorMapper {
+ "</if>"
+ "AND DUE IS NOT NULL "
+ "</where>"
+ "<if test=\"_databaseId == 'db2'\">GROUP BY T.CLASSIFICATION_KEY, A.CLASSIFICATION_KEY, (DAYS(DUE) - DAYS(CURRENT_TIMESTAMP))</if> "
+ "<if test=\"_databaseId == 'h2'\">GROUP BY T.CLASSIFICATION_KEY, A.CLASSIFICATION_KEY, DATEDIFF('DAY', CURRENT_TIMESTAMP, DUE)</if> "
+ "<if test=\"_databaseId == 'postgres'\">GROUP BY T.CLASSIFICATION_KEY, A.CLASSIFICATION_KEY, DATE_PART('DAY', DUE - CURRENT_TIMESTAMP)</if> "
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
+ ") AS B "
+ "GROUP BY B.TASK_CLASSIFICATION_KEY, B.ATTACHMENT_CLASSIFICATION_KEY, B.AGE_IN_DAYS "
+ "</script>")
@Results({
@Result(column = "TASK_CLASSIFICATION_KEY", property = "key"),
@ -274,9 +270,10 @@ public interface TaskMonitorMapper {
@Param("customAttributeFilter") Map<CustomField, String> customAttributeFilter);
@Select("<script>"
+ "<if test=\"_databaseId == 'db2'\">SELECT ${customField} as CUSTOM_FIELD, (DAYS(DUE) - DAYS(CURRENT_TIMESTAMP)) as AGE_IN_DAYS, COUNT(*) as NUMBER_OF_TASKS</if> "
+ "<if test=\"_databaseId == 'h2'\">SELECT ${customField} as CUSTOM_FIELD, DATEDIFF('DAY', CURRENT_TIMESTAMP, DUE) as AGE_IN_DAYS, COUNT(*) as NUMBER_OF_TASKS</if> "
+ "<if test=\"_databaseId == 'postgres'\">SELECT ${customField} as CUSTOM_FIELD, DATE_PART('DAY', DUE - CURRENT_TIMESTAMP) as AGE_IN_DAYS, COUNT(*) as NUMBER_OF_TASKS</if> "
+ "SELECT B.CUSTOM_FIELD, B.AGE_IN_DAYS, COUNT(B.AGE_IN_DAYS) AS NUMBER_OF_TASKS FROM ("
+ "<if test=\"_databaseId == 'db2'\">SELECT ${customField} as CUSTOM_FIELD, (DAYS(DUE) - DAYS(CURRENT_TIMESTAMP)) as AGE_IN_DAYS </if> "
+ "<if test=\"_databaseId == 'h2'\">SELECT ${customField} as CUSTOM_FIELD, DATEDIFF('DAY', CURRENT_TIMESTAMP, DUE) as AGE_IN_DAYS </if> "
+ "<if test=\"_databaseId == 'postgres'\">SELECT ${customField} as CUSTOM_FIELD, DATE_PART('DAY', DUE - CURRENT_TIMESTAMP) as AGE_IN_DAYS </if> "
+ "FROM TASK "
+ "<where>"
+ "<if test=\"workbasketIds != null\">"
@ -302,10 +299,8 @@ public interface TaskMonitorMapper {
+ "</if>"
+ "AND DUE IS NOT NULL "
+ "</where>"
+ "<if test=\"_databaseId == 'db2'\">GROUP BY ${customField}, (DAYS(DUE) - DAYS(CURRENT_TIMESTAMP))</if> "
+ "<if test=\"_databaseId == 'h2'\">GROUP BY ${customField}, DATEDIFF('DAY', CURRENT_TIMESTAMP, DUE)</if> "
+ "<if test=\"_databaseId == 'postgres'\">GROUP BY ${customField}, DATE_PART('DAY', DUE - CURRENT_TIMESTAMP)</if> "
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
+ ") AS B "
+ "GROUP BY B.CUSTOM_FIELD, B.AGE_IN_DAYS "
+ "</script>")
@Results({
@Result(column = "CUSTOM_FIELD", property = "key"),

8
lib/taskana-core/src/main/java/pro/taskana/report/TaskStatusReport.java
View File

@ -7,8 +7,8 @@ import java.util.stream.Stream;
import pro.taskana.TaskState;
import pro.taskana.exceptions.InvalidArgumentException;
import pro.taskana.exceptions.NotAuthorizedException;
import pro.taskana.impl.report.item.TaskQueryItem;
import pro.taskana.impl.report.header.TaskStatusColumnHeader;
import pro.taskana.impl.report.item.TaskQueryItem;
import pro.taskana.impl.report.structure.Report;
/**
@ -29,6 +29,9 @@ public class TaskStatusReport extends Report<TaskQueryItem, TaskStatusColumnHead
*/
public interface Builder extends Report.Builder<TaskQueryItem, TaskStatusColumnHeader> {
@Override
TaskStatusReport buildReport() throws NotAuthorizedException, InvalidArgumentException;
/**
* Adds a list of states to the builder. The created report contains only tasks with a state in this list.
*
@ -46,8 +49,5 @@ public class TaskStatusReport extends Report<TaskQueryItem, TaskStatusColumnHead
* @return the Builder
*/
Builder domainIn(List<String> domains);
@Override
TaskStatusReport buildReport() throws NotAuthorizedException, InvalidArgumentException;
}
}

1
lib/taskana-core/src/main/java/pro/taskana/report/WorkbasketReport.java
View File

@ -36,7 +36,6 @@ public class WorkbasketReport extends Report<MonitorQueryItem, TimeIntervalColum
/**
* buildPlannedDateBasedReport is querying grouping by plannedDate instead of due date.
*/
@Override
WorkbasketReport buildPlannedDateBasedReport() throws NotAuthorizedException, InvalidArgumentException;
/**

24
lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketReportBuilderImplTest.java
View File

@ -28,6 +28,7 @@ import org.mockito.junit.MockitoJUnitRunner;
import pro.taskana.CustomField;
import pro.taskana.TaskState;
import pro.taskana.TaskanaRole;
import pro.taskana.configuration.TaskanaEngineConfiguration;
import pro.taskana.exceptions.InvalidArgumentException;
import pro.taskana.exceptions.NotAuthorizedException;
@ -66,7 +67,8 @@ public class WorkbasketReportBuilderImplTest {
}
@Test
public void testGetTotalNumbersOfWorkbasketReportBasedOnDueDate() throws InvalidArgumentException, NotAuthorizedException {
public void testGetTotalNumbersOfWorkbasketReportBasedOnDueDate()
throws InvalidArgumentException, NotAuthorizedException {
List<String> workbasketIds = Collections.singletonList("WBI:000000000000000000000000000000000001");
List<TaskState> states = Arrays.asList(TaskState.CLAIMED, TaskState.READY);
List<String> categories = Collections.singletonList("EXTERN");
@ -292,7 +294,8 @@ public class WorkbasketReportBuilderImplTest {
}
@Test
public void testGetTotalNumbersOfWorkbasketReportBasedOnCreatedDate() throws InvalidArgumentException, NotAuthorizedException {
public void testGetTotalNumbersOfWorkbasketReportBasedOnCreatedDate()
throws InvalidArgumentException, NotAuthorizedException {
List<String> workbasketIds = Collections.singletonList("WBI:000000000000000000000000000000000001");
List<TaskState> states = Arrays.asList(TaskState.CLAIMED, TaskState.READY);
List<String> categories = Collections.singletonList("EXTERN");
@ -310,9 +313,9 @@ public class WorkbasketReportBuilderImplTest {
monitorQueryItem.setKey("WBI:000000000000000000000000000000000001");
monitorQueryItem.setNumberOfTasks(1);
expectedResult.add(monitorQueryItem);
doReturn(expectedResult).when(taskMonitorMapperMock).getTaskCountOfWorkbasketsBasedOnPlannedDate(workbasketIds, states,
when(taskMonitorMapperMock.getTaskCountOfWorkbasketsBasedOnPlannedDate(workbasketIds, states,
categories, domains, classificationIds, excludedClassificationIds, customAttributeFilter,
combinedClassificationFilter);
combinedClassificationFilter)).thenReturn(expectedResult);
WorkbasketReport actualResult = cut.createWorkbasketReportBuilder()
.workbasketIdIn(workbasketIds)
@ -327,12 +330,19 @@ public class WorkbasketReportBuilderImplTest {
verify(taskanaEngineImplMock, times(1))
.openConnection();
verify(taskanaEngineImplMock, times(1)).checkRoleMembership(any());
verify(taskanaEngineImplMock, times(1)).checkRoleMembership(TaskanaRole.MONITOR, TaskanaRole.ADMIN);
verify(taskanaEngineImplMock, times(2)).getConfiguration();
verify(taskanaEngineConfiguration, times(1)).isGermanPublicHolidaysEnabled();
verify(taskanaEngineConfiguration, times(1)).getCustomHolidays();
verify(taskMonitorMapperMock, times(1)).getTaskCountOfWorkbasketsBasedOnPlannedDate(any(), any(), any(), any(),
any(), any(), any(), any());
verify(taskMonitorMapperMock, times(1)).getTaskCountOfWorkbasketsBasedOnPlannedDate(
workbasketIds,
states,
categories,
domains,
classificationIds,
excludedClassificationIds,
customAttributeFilter,
combinedClassificationFilter);
verify(taskanaEngineImplMock, times(1)).returnConnection();
verifyNoMoreInteractions(taskanaEngineImplMock, taskMonitorMapperMock, taskanaEngineConfiguration);

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

@ -63,15 +63,15 @@ public class MonitorController {
@GetMapping(path = "/tasks-workbasket-report")
@Transactional(readOnly = true, rollbackFor = Exception.class)
public ResponseEntity<?> getTasksWorkbasketReport(
@RequestParam(value = "daysInPast") int daysInPast,
@RequestParam(value = "states") List<TaskState> states)
throws NotAuthorizedException, InvalidArgumentException {
LOGGER.debug("Entry to getTasksWorkbasketReport()");
ReportResource report = reportAssembler.toResource(
taskMonitorService.createWorkbasketReportBuilder()
.stateIn(states)
.withColumnHeaders(getTasksWorkbasketsTimeInterval(daysInPast)).buildReport(), daysInPast, states);
.withColumnHeaders(getRangeTimeInterval())
.buildReport(), states);
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from getTasksWorkbasketReport(), returning {}", report);
}
@ -92,7 +92,7 @@ public class MonitorController {
ReportResource report = reportAssembler.toResource(
taskMonitorService.createWorkbasketReportBuilder()
.stateIn(states)
.withColumnHeaders(getTasksWorkbasketsTimeInterval(daysInPast)).buildPlannedDateBasedReport(),
.withColumnHeaders(getDateTimeInterval(daysInPast)).buildPlannedDateBasedReport(),
daysInPast, states);
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Exit from getTasksWorkbasketPlannedDateReport(), returning {}", report);
@ -111,7 +111,7 @@ public class MonitorController {
ReportResource report = reportAssembler.toResource(
taskMonitorService.createClassificationReportBuilder()
.withColumnHeaders(getTaskClassificationTimeInterval())
.withColumnHeaders(getRangeTimeInterval())
.buildReport());
if (LOGGER.isDebugEnabled()) {
@ -136,7 +136,7 @@ public class MonitorController {
.buildReport()));
}
private List<TimeIntervalColumnHeader> getTaskClassificationTimeInterval() {
private List<TimeIntervalColumnHeader> getRangeTimeInterval() {
return Stream.concat(Stream.concat(
Stream.of(new TimeIntervalColumnHeader.Range(Integer.MIN_VALUE, -10),
new TimeIntervalColumnHeader.Range(-10, -5)
@ -150,7 +150,7 @@ public class MonitorController {
.collect(Collectors.toList());
}
private List<TimeIntervalColumnHeader> getTasksWorkbasketsTimeInterval(int daysInPast) {
private List<TimeIntervalColumnHeader> getDateTimeInterval(int daysInPast) {
List<TimeIntervalColumnHeader> columnHeaders = new ArrayList<>();
for (int i = 0; i <= daysInPast; i++) {

11
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ReportAssembler.java
View File

@ -52,11 +52,20 @@ public class ReportAssembler {
return resource;
}
public ReportResource toResource(WorkbasketReport report, List<TaskState> states)
throws NotAuthorizedException, InvalidArgumentException {
ReportResource resource = toReportResource(report);
resource.add(
linkTo(methodOn(MonitorController.class).getTasksWorkbasketReport(states))
.withSelfRel().expand());
return resource;
}
public ReportResource toResource(WorkbasketReport report, int daysInPast, List<TaskState> states)
throws NotAuthorizedException, InvalidArgumentException {
ReportResource resource = toReportResource(report);
resource.add(
linkTo(methodOn(MonitorController.class).getTasksWorkbasketReport(daysInPast, states))
linkTo(methodOn(MonitorController.class).getTasksWorkbasketPlannedDateReport(daysInPast, states))
.withSelfRel().expand());
return resource;
}

2
web/src/app/administration/administration-routing.module.ts
View File

@ -1,7 +1,7 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { WorkbasketListComponent } from 'app/administration/workbasket/master/list/workbasket-list.component';
import { WorkbasketListComponent } from 'app/administration/workbasket/master/workbasket-list.component';
import { WorkbasketDetailsComponent } from 'app/administration/workbasket/details/workbasket-details.component';
import { MasterAndDetailComponent } from 'app/shared/master-and-detail/master-and-detail.component';
import { ClassificationListComponent } from 'app/administration/classification/master/list/classification-list.component';

4
web/src/app/administration/administration.module.ts
View File

@ -10,8 +10,8 @@ import {InfiniteScrollModule} from 'ngx-infinite-scroll';
/**
* Components
*/
import {WorkbasketListComponent} from './workbasket/master/list/workbasket-list.component';
import {WorkbasketListToolbarComponent} from './workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component'
import {WorkbasketListComponent} from './workbasket/master/workbasket-list.component';
import {WorkbasketListToolbarComponent} from './workbasket/master/workbasket-list-toolbar/workbasket-list-toolbar.component'
import {WorkbasketDetailsComponent} from './workbasket/details/workbasket-details.component';
import {WorkbasketInformationComponent} from './workbasket/details/information/workbasket-information.component';
import {DistributionTargetsComponent} from './workbasket/details/distribution-targets/distribution-targets.component';

0
web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.html → web/src/app/administration/workbasket/master/workbasket-list-toolbar/workbasket-list-toolbar.component.html
View File

0
web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.scss → web/src/app/administration/workbasket/master/workbasket-list-toolbar/workbasket-list-toolbar.component.scss
View File

0
web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts → web/src/app/administration/workbasket/master/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts
View File

0
web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.ts → web/src/app/administration/workbasket/master/workbasket-list-toolbar/workbasket-list-toolbar.component.ts
View File

0
web/src/app/administration/workbasket/master/list/workbasket-list.component.html → web/src/app/administration/workbasket/master/workbasket-list.component.html
View File

0
web/src/app/administration/workbasket/master/list/workbasket-list.component.scss → web/src/app/administration/workbasket/master/workbasket-list.component.scss
View File

0
web/src/app/administration/workbasket/master/list/workbasket-list.component.spec.ts → web/src/app/administration/workbasket/master/workbasket-list.component.spec.ts
View File

0
web/src/app/administration/workbasket/master/list/workbasket-list.component.ts → web/src/app/administration/workbasket/master/workbasket-list.component.ts
View File

2
web/src/app/monitor/classification-tasks/classification-tasks.component.html
View File

@ -4,7 +4,7 @@
</div>
<div class="panel-body">
<div class="row">
<div class="col-xs-12 col-md-8 col-md-offset-2">
<div class="col-xs-12 col-md-7 col-md-offset-2">
<div style="display: block;">
<canvas baseChart [datasets]="lineChartData" [labels]="lineChartLabels" [options]="lineChartOptions"
[colors]="lineChartColors" [legend]="lineChartLegend" [chartType]="lineChartType"></canvas>

21
web/src/app/monitor/classification-tasks/classification-tasks.component.ts
View File

@ -3,6 +3,7 @@ import { RestConnectorService } from 'app/monitor/services/restConnector/rest-co
import {ReportData} from '../models/report-data';
import {ChartData} from 'app/monitor/models/chart-data';
import {ChartColorsDefinition} from '../models/chart-colors';
import {RequestInProgressService} from '../../services/requestInProgress/request-in-progress.service';
@Component({
selector: 'taskana-monitor-classification-tasks',
@ -22,14 +23,20 @@ export class ClassificationTasksComponent implements OnInit {
};
lineChartColors = ChartColorsDefinition.getColors();
constructor(private restConnectorService: RestConnectorService) {
constructor(
private restConnectorService: RestConnectorService,
private requestInProgressService: RequestInProgressService) {
}
ngOnInit() {
this.restConnectorService.getClassificationTasksReport().subscribe((data: ReportData) => {
this.reportData = data;
this.lineChartData = this.restConnectorService.getChartData(data);
this.lineChartLabels = this.restConnectorService.getChartHeaders(data);
})
async ngOnInit() {
this.requestInProgressService.setRequestInProgress(true);
this.reportData = await this.restConnectorService.getClassificationTasksReport().toPromise()
this.lineChartData = this.restConnectorService.getChartData(this.reportData);
this.lineChartLabels = this.reportData.meta.header;
this.requestInProgressService.setRequestInProgress(false);
}
getTitle(): string {
return 'Tasks grouped by classification, querying by due date';
}
}

4
web/src/app/monitor/models/monitor-query-type.ts Normal file
View File

@ -0,0 +1,4 @@
export enum MonitorQueryType {
DueDate,
PlannedDate
}

18
web/src/app/monitor/monitor.module.ts
View File

@ -12,13 +12,20 @@ import {SharedModule} from '../shared/shared.module';
import {ReportComponent} from './report/report.component';
import {MonitorComponent} from './monitor.component';
import {TasksComponent} from './tasks/tasks.component';
import {WorkbasketComponent} from './workbasket/workbasket.component';
import {ClassificationTasksComponent} from './classification-tasks/classification-tasks.component';
import {TimestampComponent} from './timestamp/timestamp.component';
import {RestConnectorService} from './services/restConnector/rest-connector.service';
import {MapToIterable} from '../shared/pipes/mapToIterable/mapToIterable';
import {MonitorWorkbasketsComponent} from './workbasket/monitor-workbaskets.component';
import {MonitorWorkbasketPlannedDateComponent} from './workbasket/workbasket-planned-date/monitor-workbasket-planned-date.component';
import {MonitorWorkbasketDueDateComponent} from './workbasket/monitor-workbasket-due-date/monitor-workbasket-due-date.component';
import {
MonitorWorkbasketQuerySwitcherComponent
} from './workbasket/monitor-workbasket-query-switcher/monitor-workbasket-query-switcher.component';
const MODULES = [
CommonModule,
@ -32,12 +39,15 @@ const MODULES = [
SharedModule
];
const DECLARATIONS = [
TasksComponent,
WorkbasketComponent,
ReportComponent,
MonitorComponent,
TimestampComponent,
MonitorWorkbasketsComponent,
MonitorWorkbasketPlannedDateComponent,
MonitorWorkbasketDueDateComponent,
MonitorWorkbasketQuerySwitcherComponent,
TasksComponent,
ClassificationTasksComponent,
TimestampComponent
];
@NgModule({

37
web/src/app/monitor/services/restConnector/rest-connector.service.ts
View File

@ -4,8 +4,6 @@ import { environment } from 'environments/environment';
import {Observable} from 'rxjs';
import {ReportData} from '../../models/report-data';
import {ChartData} from 'app/monitor/models/chart-data';
import { TaskanaDate } from 'app/shared/util/taskana.date';
import { map } from 'rxjs/internal/operators/map';
const monitorUrl = '/v1/monitor/';
@ -21,9 +19,14 @@ export class RestConnectorService {
+ 'tasks-status-report?states=READY,CLAIMED,COMPLETED');
}
getWorkbasketStatistics(): Observable<ReportData> {
getWorkbasketStatisticsQueryingByDueDate(): Observable<ReportData> {
return this.httpClient.get<ReportData>(environment.taskanaRestUrl
+ monitorUrl + 'tasks-workbasket-planned-date-report?daysInPast=5&states=READY,CLAIMED,COMPLETED');
+ monitorUrl + 'tasks-workbasket-report?states=READY,CLAIMED,COMPLETED');
}
getWorkbasketStatisticsQueryingByPlannedDate(): Observable<ReportData> {
return this.httpClient.get<ReportData>(environment.taskanaRestUrl
+ '/v1/monitor/tasks-workbasket-planned-date-report?daysInPast=7&states=READY,CLAIMED,COMPLETED');
}
getClassificationTasksReport(): Observable<ReportData> {
@ -37,29 +40,11 @@ export class RestConnectorService {
}
getChartData(source: ReportData): Array<ChartData> {
const result = new Array<ChartData>();
Object.keys(source.rows).forEach(key => {
return source.rows.map(row => {
const rowData = new ChartData();
rowData.label = key;
rowData.data = new Array<number>();
source.meta.header.forEach((headerValue: string) => {
rowData.data.push(source.rows[key].cells[headerValue]);
rowData.label = row.desc[0];
rowData.data = row.cells;
return rowData;
});
result.push(rowData)
});
return result;
}
getChartHeaders(source: ReportData): Array<string> {
const result = new Array<string>();
source.meta.header.forEach((header: string) => {
result.push(header);
})
return result;
}
}

21
web/src/app/monitor/tasks/tasks.component.ts
View File

@ -1,6 +1,7 @@
import {Component, OnInit} from '@angular/core';
import {RestConnectorService} from '../services/restConnector/rest-connector.service';
import {ReportData} from 'app/monitor/models/report-data';
import {RequestInProgressService} from '../../services/requestInProgress/request-in-progress.service';
@Component({
selector: 'taskana-monitor-tasks',
@ -15,16 +16,22 @@ export class TasksComponent implements OnInit {
pieChartType = 'pie';
reportData: ReportData
constructor(private restConnectorService: RestConnectorService) {
constructor(
private restConnectorService: RestConnectorService,
private requestInProgressService: RequestInProgressService) {
}
ngOnInit() {
this.restConnectorService.getTaskStatusReport().subscribe((data: ReportData) => {
this.reportData = data;
this.pieChartLabels = data.meta.header;
data.sumRow[0].cells.forEach(c => this.pieChartData.push(c));
async ngOnInit() {
this.requestInProgressService.setRequestInProgress(true);
this.reportData = await this.restConnectorService.getTaskStatusReport().toPromise()
this.pieChartLabels = this.reportData.meta.header;
this.reportData.sumRow[0].cells.forEach(c => {
this.pieChartData.push(c);
})
this.requestInProgressService.setRequestInProgress(false);
}
getTitle(): string {
return 'Tasks status grouped by domain';
}
}

9
web/src/app/monitor/workbasket/monitor-workbasket-due-date/monitor-workbasket-due-date.component.html Normal file
View File

@ -0,0 +1,9 @@
<div class="row" *ngIf="reportData">
<div class="col-xs-12 col-md-7 col-md-offset-2">
<div style="display: block;">
<canvas baseChart [datasets]="lineChartData" [labels]="lineChartLabels" [options]="lineChartOptions"
[colors]="lineChartColors" [legend]="lineChartLegend" [chartType]="lineChartType" ></canvas>
</div>
</div>
</div>
<taskana-report [reportData]="reportData"></taskana-report>

0
web/src/app/monitor/workbasket/workbasket.component.css → web/src/app/monitor/workbasket/monitor-workbasket-due-date/monitor-workbasket-due-date.component.scss
View File

25
web/src/app/monitor/workbasket/monitor-workbasket-due-date/monitor-workbasket-due-date.component.spec.ts Normal file
View File

@ -0,0 +1,25 @@
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import {MonitorWorkbasketDueDateComponent} from './monitor-workbasket-due-date.component';
describe('MonitorWorkbasketDueDateComponent', () => {
let component: MonitorWorkbasketDueDateComponent;
let fixture: ComponentFixture<MonitorWorkbasketDueDateComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [MonitorWorkbasketDueDateComponent]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(MonitorWorkbasketDueDateComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should be created', () => {
expect(component).toBeTruthy();
});
});

46
web/src/app/monitor/workbasket/monitor-workbasket-due-date/monitor-workbasket-due-date.component.ts Normal file
View File

@ -0,0 +1,46 @@
import {Component, EventEmitter, OnInit, Output} from '@angular/core';
import {ReportData} from '../../models/report-data';
import {ChartData} from '../../models/chart-data';
import {ChartColorsDefinition} from '../../models/chart-colors';
import {RestConnectorService} from '../../services/restConnector/rest-connector.service';
import {MetaInfoData} from '../../models/meta-info-data';
import {RequestInProgressService} from '../../../services/requestInProgress/request-in-progress.service';
@Component({
selector: 'taskana-monitor-workbasket-due-date',
templateUrl: './monitor-workbasket-due-date.component.html',
styleUrls: ['./monitor-workbasket-due-date.component.scss']
})
export class MonitorWorkbasketDueDateComponent implements OnInit {
@Output()
metaInformation = new EventEmitter<MetaInfoData>()
reportData: ReportData;
lineChartLabels: Array<any>;
lineChartLegend = true;
lineChartType = 'line';
lineChartData: Array<ChartData>;
lineChartOptions: any = {
responsive: true
};
lineChartColors = ChartColorsDefinition.getColors();
constructor(
private restConnectorService: RestConnectorService,
private requestInProgressService: RequestInProgressService) {
}
async ngOnInit() {
this.requestInProgressService.setRequestInProgress(true);
this.reportData = await this.restConnectorService.getWorkbasketStatisticsQueryingByDueDate().toPromise();
this.metaInformation.emit(this.reportData.meta);
this.lineChartLabels = this.reportData.meta.header;
this.lineChartData = this.restConnectorService.getChartData(this.reportData);
this.requestInProgressService.setRequestInProgress(false);
}
}

15
web/src/app/monitor/workbasket/monitor-workbasket-query-switcher/monitor-workbasket-query-switcher.component.html Normal file
View File

@ -0,0 +1,15 @@
<div class="btn-group" role="group" aria-label="select chart type">
<div class="btn-group" role="group">
<button type="button" class="btn btn-default"
[ngClass]="selectedChartType === monitorQueryDueDateType ? 'selected' : ''"
(click)="switch(monitorQueryDueDateType)">Due date
</button>
</div>
<div class="btn-group" role="group">
<button type="button" class="btn btn-default"
[ngClass]="selectedChartType === monitorQueryPlannedDateType ? 'selected' : ''"
(click)="switch(monitorQueryPlannedDateType)">Planned date
</button>
</div>
</div>

6
web/src/app/monitor/workbasket/monitor-workbasket-query-switcher/monitor-workbasket-query-switcher.component.scss Normal file
View File

@ -0,0 +1,6 @@
@import './src/assets/_colors';
.btn.selected {
background-color: $blue;
color: white;
}

25
web/src/app/monitor/workbasket/monitor-workbasket-query-switcher/monitor-workbasket-query-switcher.component.spec.ts Normal file
View File

@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MonitorWorkbasketQuerySwitcherComponent } from './monitor-workbasket-query-switcher.component';
describe('MonitorWorkbasketQuerySwitcherComponent', () => {
let component: MonitorWorkbasketQuerySwitcherComponent;
let fixture: ComponentFixture<MonitorWorkbasketQuerySwitcherComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ MonitorWorkbasketQuerySwitcherComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(MonitorWorkbasketQuerySwitcherComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

30
web/src/app/monitor/workbasket/monitor-workbasket-query-switcher/monitor-workbasket-query-switcher.component.ts Normal file
View File

@ -0,0 +1,30 @@
import {Component, EventEmitter, OnInit, Output} from '@angular/core';
import {MonitorQueryType} from '../../models/monitor-query-type';
@Component({
selector: 'taskana-monitor-workbasket-query-switcher',
templateUrl: './monitor-workbasket-query-switcher.component.html',
styleUrls: ['./monitor-workbasket-query-switcher.component.scss']
})
export class MonitorWorkbasketQuerySwitcherComponent implements OnInit {
@Output()
queryChanged = new EventEmitter<MonitorQueryType>();
selectedChartType: MonitorQueryType;
monitorQueryPlannedDateType = MonitorQueryType.PlannedDate;
monitorQueryDueDateType = MonitorQueryType.DueDate;
constructor() {
}
ngOnInit() {
this.selectedChartType = MonitorQueryType.DueDate;
this.queryChanged.emit(MonitorQueryType.DueDate);
}
switch(queryType: MonitorQueryType) {
this.selectedChartType = queryType;
this.queryChanged.emit(queryType);
}
}

13
web/src/app/monitor/workbasket/monitor-workbaskets.component.html Normal file
View File

@ -0,0 +1,13 @@
<div class="panel panel-default">
<div class="panel-heading">
<h4 *ngIf="metaInformation">{{getTitle()}} ({{metaInformation?.date | date : 'dd.MM.yyyy HH:mm:ss'}})</h4>
<taskana-monitor-workbasket-query-switcher
(queryChanged)="queryChanged($event)"></taskana-monitor-workbasket-query-switcher>
</div>
<div class="panel-body">
<taskana-monitor-workbasket-due-date [ngClass]="showMonitorQueryDueDate ? '' : 'hidden'"
(metaInformation)="getMetaInformation($event)"></taskana-monitor-workbasket-due-date>
<taskana-monitor-workbasket-planned-date [ngClass]="showMonitorQueryPlannedDate ? '' : 'hidden'"
(metaInformation)="getMetaInformation($event)"></taskana-monitor-workbasket-planned-date>
</div>
</div>

0
web/src/app/monitor/workbasket/workbasket.component.scss → web/src/app/monitor/workbasket/monitor-workbaskets.component.scss
View File

25
web/src/app/monitor/workbasket/monitor-workbaskets.component.spec.ts Normal file
View File

@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MonitorWorkbasketsComponent } from './monitor-workbaskets.component';
describe('MonitorWorkbasketsComponent', () => {
let component: MonitorWorkbasketsComponent;
let fixture: ComponentFixture<MonitorWorkbasketsComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ MonitorWorkbasketsComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(MonitorWorkbasketsComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

45
web/src/app/monitor/workbasket/monitor-workbaskets.component.ts Normal file
View File

@ -0,0 +1,45 @@
import {Component, OnInit} from '@angular/core';
import {MetaInfoData} from '../models/meta-info-data';
import {MonitorQueryType} from '../models/monitor-query-type';
@Component({
selector: 'taskana-monitor-workbaskets',
templateUrl: './monitor-workbaskets.component.html',
styleUrls: ['./monitor-workbaskets.component.scss']
})
export class MonitorWorkbasketsComponent implements OnInit {
metaInformation: MetaInfoData;
showMonitorQueryPlannedDate: Boolean;
showMonitorQueryDueDate: Boolean;
constructor() {
}
ngOnInit() {
}
getMetaInformation(metaInformation: MetaInfoData) {
this.metaInformation = metaInformation;
}
queryChanged(monitorQueryType: MonitorQueryType) {
this.switchGraphicShowed(monitorQueryType);
}
getTitle(): string {
return this.showMonitorQueryPlannedDate ?
'Tasks grouped by workbasket, querying by planned date' :
'Tasks grouped by workbasket, querying by due date';
}
private switchGraphicShowed(monitorQueryType: MonitorQueryType) {
if (monitorQueryType === MonitorQueryType.PlannedDate) {
this.showMonitorQueryPlannedDate = true;
this.showMonitorQueryDueDate = false
} else if (monitorQueryType === MonitorQueryType.DueDate) {
this.showMonitorQueryPlannedDate = false;
this.showMonitorQueryDueDate = true
}
}
}

9
web/src/app/monitor/workbasket/workbasket-planned-date/monitor-workbasket-planned-date.component.html Normal file
View File

@ -0,0 +1,9 @@
<div class="row" *ngIf="reportData">
<div class="col-xs-12 col-md-7 col-md-offset-2">
<div style="display: block;">
<canvas baseChart [datasets]="lineChartData" [labels]="lineChartLabels" [options]="lineChartOptions"
[colors]="lineChartColors" [legend]="lineChartLegend" [chartType]="lineChartType"></canvas>
</div>
</div>
</div>
<taskana-report [reportData]="reportData"></taskana-report>

0
web/src/app/monitor/workbasket/workbasket-planned-date/monitor-workbasket-planned-date.component.scss Normal file
View File

25
web/src/app/monitor/workbasket/workbasket-planned-date/monitor-workbasket-planned-date.component.spec.ts Normal file
View File

@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MonitorWorkbasketPlannedDateComponent } from './monitor-workbasket-planned-date.component';
describe('MonitorWorkbasketPlannedDateComponent', () => {
let component: MonitorWorkbasketPlannedDateComponent;
let fixture: ComponentFixture<MonitorWorkbasketPlannedDateComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ MonitorWorkbasketPlannedDateComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(MonitorWorkbasketPlannedDateComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

45
web/src/app/monitor/workbasket/workbasket-planned-date/monitor-workbasket-planned-date.component.ts Normal file
View File

@ -0,0 +1,45 @@
import {Component, EventEmitter, OnInit, Output} from '@angular/core';
import {ReportData} from '../../models/report-data';
import {ChartData} from '../../models/chart-data';
import {ChartColorsDefinition} from '../../models/chart-colors';
import {RestConnectorService} from '../../services/restConnector/rest-connector.service';
import {MetaInfoData} from '../../models/meta-info-data';
import {RequestInProgressService} from '../../../services/requestInProgress/request-in-progress.service';
@Component({
selector: 'taskana-monitor-workbasket-planned-date',
templateUrl: './monitor-workbasket-planned-date.component.html',
styleUrls: ['./monitor-workbasket-planned-date.component.scss']
})
export class MonitorWorkbasketPlannedDateComponent implements OnInit {
@Output()
metaInformation = new EventEmitter<MetaInfoData>()
reportData: ReportData;
lineChartLabels: Array<any>;
lineChartLegend = true;
lineChartType = 'line';
lineChartData: Array<ChartData>;
lineChartOptions: any = {
responsive: true,
scales: {xAxes: [{}], yAxes: [{}]},
};
lineChartColors = ChartColorsDefinition.getColors();
constructor(
private restConnectorService: RestConnectorService,
private requestInProgressService: RequestInProgressService) {
}
async ngOnInit() {
this.requestInProgressService.setRequestInProgress(true);
this.reportData = await this.restConnectorService.getWorkbasketStatisticsQueryingByPlannedDate().toPromise();
this.metaInformation.emit(this.reportData.meta);
this.lineChartLabels = this.reportData.meta.header;
this.lineChartData = this.restConnectorService.getChartData(this.reportData);
this.requestInProgressService.setRequestInProgress(false);
}
}

16
web/src/app/monitor/workbasket/workbasket.component.html
View File

@ -1,16 +0,0 @@
<div *ngIf="reportData" class="panel panel-default">
<div class="panel-heading">
<h4>{{reportData.meta.name}} ({{reportData.meta.date | dateTimeZone}})</h4>
</div>
<div class="panel-body">
<div class="row">
<div class="col-xs-12 col-md-8 col-md-offset-2">
<div style="display: block;">
<canvas baseChart [datasets]="lineChartData" [labels]="lineChartLabels" [options]="lineChartOptions"
[colors]="lineChartColors" [legend]="lineChartLegend" [chartType]="lineChartType"></canvas>
</div>
</div>
</div>
<taskana-report [reportData]="reportData"></taskana-report>
</div>
</div>

25
web/src/app/monitor/workbasket/workbasket.component.spec.ts
View File

@ -1,25 +0,0 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { WorkbasketComponent } from './workbasket.component';
describe('WorkbasketComponent', () => {
let component: WorkbasketComponent;
let fixture: ComponentFixture<WorkbasketComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ WorkbasketComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(WorkbasketComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should be created', () => {
expect(component).toBeTruthy();
});
});

37
web/src/app/monitor/workbasket/workbasket.component.ts
View File

@ -1,37 +0,0 @@
import { Component, OnInit } from '@angular/core';
import { RestConnectorService } from 'app/monitor/services/restConnector/rest-connector.service';
import { ChartColorsDefinition } from '../models/chart-colors';
import { ReportData } from 'app/monitor/models/report-data';
import {ChartData} from 'app/monitor/models/chart-data';
@Component({
selector: 'taskana-monitor-workbaskets',
templateUrl: './workbasket.component.html',
styleUrls: ['./workbasket.component.scss'],
providers: [RestConnectorService]
})
export class WorkbasketComponent implements OnInit {
reportData: ReportData;
lineChartLabels: Array<any>;
lineChartLegend = true;
lineChartType = 'line';
lineChartData: Array<ChartData>;
lineChartOptions: any = {
responsive: true
};
lineChartColors = ChartColorsDefinition.getColors();
constructor(private restConnectorService: RestConnectorService) { }
ngOnInit() {
this.restConnectorService.getWorkbasketStatistics().subscribe((data: ReportData) => {
this.reportData = data;
this.lineChartLabels = this.restConnectorService.getChartHeaders(data);
this.lineChartData = this.restConnectorService.getChartData(data);
})
}
}

2
web/src/app/workplace/task/task.component.ts
View File

@ -44,7 +44,7 @@ export class TaskComponent implements OnInit, OnDestroy {
async getTask(id: string) {
this.requestInProgress = true;
this.task = await this.taskService.getTask(id).toPromise()
this.task = await this.taskService.getTask(id).toPromise();
const classification = await this.classificationService.getClassification
(this.task.classificationSummaryResource.classificationId).toPromise();
this.address = this.extractUrl(classification.applicationEntryPoint) || `${this.address}/?q=${this.task.name}`;

25
web/src/assets/_site.scss
View File

@ -1,5 +1,4 @@
.placeholder img {
display: inline-block;
border-radius: 50%;
@ -62,6 +61,7 @@
*/
.white {
color: white;
& svg {
fill: white;
}
@ -69,6 +69,7 @@
.blue {
color: $blue;
& svg {
fill: $blue;
}
@ -76,6 +77,7 @@
.blue-green {
color: $blue-green;
& svg {
fill: $blue-green;
}
@ -83,6 +85,7 @@
.green {
color: $green;
& svg {
fill: $green;
}
@ -90,6 +93,7 @@
.dark-green {
color: $dark-green;
& svg {
fill: $dark-green;
}
@ -97,6 +101,7 @@
.grey {
color: $grey;
& svg {
fill: $grey;
}
@ -104,6 +109,7 @@
.brown {
color: $brown;
& svg {
fill: $brown;
}
@ -111,6 +117,7 @@
.red {
color: $invalid;
& svg {
fill: $invalid;
}
@ -118,6 +125,7 @@
.green-blue {
color: $blue-green;
& svg {
fill: $blue-green;
}
@ -125,6 +133,7 @@
.aquamarine {
color: $aquamarine;
& svg {
fill: $aquamarine;
}
@ -143,6 +152,7 @@ svg-icon {
.panel-default > .panel-heading .badge.warning {
background-color: $brown;
}
.badge.priority {
background-color: #e1e1e1;
}
@ -250,6 +260,7 @@ body{
-o-transition: opacity 300ms ease, visibility 300ms ease;
transition: opacity 300ms ease, visibility 300ms ease;
}
/* buttons and icons vertical align */
.vertical-align {
vertical-align: top;
@ -258,9 +269,11 @@ body{
.btn > svg-icon > svg {
vertical-align: middle;
}
a > svg-icon > svg {
vertical-align: text-top;
}
/*end buttons and icons vertical align */
span.flip {
@ -270,6 +283,7 @@ span.flip {
.panel-heading {
padding: 8px 15px 4px 15px;
}
.panel {
border-radius: 0px;
}
@ -305,6 +319,7 @@ taskana-monitor-workbaskets, taskana-monitor-classification-tasks, taskana-monit
border: none;
box-shadow: none;
margin-bottom: 0px;
& > .panel-body {
height: calc(100vh - 155px);
max-height: calc(100vh - 155px);
@ -318,6 +333,7 @@ taskana-task-details, taskana-classification-details, taskana-access-items-manag
border: none;
box-shadow: none;
margin-bottom: 0px;
& > .panel-body {
height: calc(100vh - 100px);
max-height: calc(100vh - 100px);
@ -335,6 +351,7 @@ taskana-task-query {
}
}
taskana-monitor-tasks, taskana-monitor-workbaskets, taskana-monitor-classification-tasks, taskana-access-items-management {
& .panel {
& > .panel-heading {
@ -353,6 +370,7 @@ li.list-group-item.active:hover {
.list-group-item.active {
background-color: $green;
}
li.list-group-item:hover {
color: #555;
text-decoration: none;
@ -363,6 +381,7 @@ li.list-group-item:hover {
border-right: 1px solid #ccc;
height: calc(100vh - 55px);
}
.horizontal-bottom-divider {
border-bottom: 1px solid #ccc;
}
@ -381,9 +400,11 @@ li.list-group-item:hover {
border: none;
background-color: transparent;
}
.align-header {
margin-top: 3px;
}
.container-no-items {
top: 20vh;
height: 40vh;
@ -400,6 +421,7 @@ li.list-group-item:hover {
.btn.rounded {
border-radius: 50%;
background-color: transparent;
&:focus, &:active:focus {
outline: none;
}
@ -408,6 +430,7 @@ li.list-group-item:hover {
.modal-backdrop.show {
background-color: $transparent-grey;
}
.padding-right.pull-right {
padding-right: 15px;
}