Author: echatellier Date: 2012-03-09 16:03:30 +0100 (Fri, 09 Mar 2012) New Revision: 2815 Url: http://chorem.org/repositories/revision/jtimer/2815 Log: #283 : Sort task on reports Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java trunk/src/main/resources/ftl/reportByDay.ftl trunk/src/main/resources/ftl/reportByDay_fr.ftl trunk/src/main/resources/ftl/reportByMonth.ftl trunk/src/main/resources/ftl/reportByMonth_fr.ftl trunk/src/main/resources/ftl/reportByProject.ftl trunk/src/main/resources/ftl/reportByProject_fr.ftl trunk/src/main/resources/ftl/reportByWeek.ftl trunk/src/main/resources/ftl/reportByWeek_fr.ftl trunk/src/main/resources/ftl/reportByYear.ftl trunk/src/main/resources/ftl/reportByYear_fr.ftl Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java 2012-03-09 14:52:09 UTC (rev 2814) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java 2012-03-09 15:03:30 UTC (rev 2815) @@ -545,4 +545,17 @@ return result; } + + /** + * Return task subtasks ordered by name. + * + * @param task task to get subtasks + * @return subtask ordered by name + * @since 1.4.0 + */ + public List<TimerTask> getSubTaskOrdered(TimerTask task) { + List<TimerTask> subTask = new ArrayList<TimerTask>(task.getSubTasks()); + TimerTaskHelper.sortTask(subTask); + return subTask; + } } Modified: trunk/src/main/resources/ftl/reportByDay.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByDay.ftl 2012-03-09 14:52:09 UTC (rev 2814) +++ trunk/src/main/resources/ftl/reportByDay.ftl 2012-03-09 15:03:30 UTC (rev 2815) @@ -27,7 +27,7 @@ <#macro displaySubtaskReport task periodTime identation=0> <#local ident=identation + 1/> - <#list task.subTasks as subtask> + <#list utils.getSubTaskOrdered(task) as subtask> <#local taskTotalTime=utils.getDailyTotalTaskTime(subtask, periodTime?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getDailyTaskTime(subtask, periodTime?date)/> Modified: trunk/src/main/resources/ftl/reportByDay_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByDay_fr.ftl 2012-03-09 14:52:09 UTC (rev 2814) +++ trunk/src/main/resources/ftl/reportByDay_fr.ftl 2012-03-09 15:03:30 UTC (rev 2815) @@ -27,7 +27,7 @@ <#macro displaySubtaskReport task periodTime identation=0> <#local ident=identation + 1/> - <#list task.subTasks as subtask> + <#list utils.getSubTaskOrdered(task) as subtask> <#local taskTotalTime=utils.getDailyTotalTaskTime(subtask, periodTime?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getDailyTaskTime(subtask, periodTime?date)/> Modified: trunk/src/main/resources/ftl/reportByMonth.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByMonth.ftl 2012-03-09 14:52:09 UTC (rev 2814) +++ trunk/src/main/resources/ftl/reportByMonth.ftl 2012-03-09 15:03:30 UTC (rev 2815) @@ -27,7 +27,7 @@ <#macro displaySubtaskReport task periodTime identation=0> <#local ident=identation + 1/> - <#list task.subTasks as subtask> + <#list utils.getSubTaskOrdered(task) as subtask> <#local taskTotalTime=utils.getMonthlyTotalTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getMonthlyTaskTime(subtask, periodTime?date, begin?date, end?date)/> Modified: trunk/src/main/resources/ftl/reportByMonth_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByMonth_fr.ftl 2012-03-09 14:52:09 UTC (rev 2814) +++ trunk/src/main/resources/ftl/reportByMonth_fr.ftl 2012-03-09 15:03:30 UTC (rev 2815) @@ -27,7 +27,7 @@ <#macro displaySubtaskReport task periodTime identation=0> <#local ident=identation + 1/> - <#list task.subTasks as subtask> + <#list utils.getSubTaskOrdered(task) as subtask> <#local taskTotalTime=utils.getMonthlyTotalTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getMonthlyTaskTime(subtask, periodTime?date, begin?date, end?date)/> Modified: trunk/src/main/resources/ftl/reportByProject.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByProject.ftl 2012-03-09 14:52:09 UTC (rev 2814) +++ trunk/src/main/resources/ftl/reportByProject.ftl 2012-03-09 15:03:30 UTC (rev 2815) @@ -28,7 +28,7 @@ <#assign periods=utils.getDailyDates(begin?date,end?date)/> <#macro displaySubtaskReport task identation=0> <#local ident=identation + 1/> - <#list task.subTasks as subtask> + <#list utils.getSubTaskOrdered(task) as subtask> <#local taskTotalTime=0/> <#list periods as period> <#local subtaskPeriodTotalTime=utils.getDailyTotalTaskTime(subtask, period?date)/> Modified: trunk/src/main/resources/ftl/reportByProject_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByProject_fr.ftl 2012-03-09 14:52:09 UTC (rev 2814) +++ trunk/src/main/resources/ftl/reportByProject_fr.ftl 2012-03-09 15:03:30 UTC (rev 2815) @@ -28,7 +28,7 @@ <#assign periods=utils.getDailyDates(begin?date,end?date)/> <#macro displaySubtaskReport task identation=0> <#local ident=identation + 1/> - <#list task.subTasks as subtask> + <#list utils.getSubTaskOrdered(task) as subtask> <#local taskTotalTime=0/> <#list periods as period> <#local subtaskPeriodTotalTime=utils.getDailyTotalTaskTime(subtask, period?date)/> Modified: trunk/src/main/resources/ftl/reportByWeek.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByWeek.ftl 2012-03-09 14:52:09 UTC (rev 2814) +++ trunk/src/main/resources/ftl/reportByWeek.ftl 2012-03-09 15:03:30 UTC (rev 2815) @@ -27,7 +27,7 @@ <#macro displaySubtaskReport task periodTime identation=0> <#local ident=identation + 1/> - <#list task.subTasks as subtask> + <#list utils.getSubTaskOrdered(task) as subtask> <#local taskTotalTime=utils.getWeeklyTotalTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getWeeklyTaskTime(subtask, periodTime?date, begin?date, end?date)/> Modified: trunk/src/main/resources/ftl/reportByWeek_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByWeek_fr.ftl 2012-03-09 14:52:09 UTC (rev 2814) +++ trunk/src/main/resources/ftl/reportByWeek_fr.ftl 2012-03-09 15:03:30 UTC (rev 2815) @@ -27,7 +27,7 @@ <#macro displaySubtaskReport task periodTime identation=0> <#local ident=identation + 1/> - <#list task.subTasks as subtask> + <#list utils.getSubTaskOrdered(task) as subtask> <#local taskTotalTime=utils.getWeeklyTotalTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getWeeklyTaskTime(subtask, periodTime?date, begin?date, end?date)/> Modified: trunk/src/main/resources/ftl/reportByYear.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByYear.ftl 2012-03-09 14:52:09 UTC (rev 2814) +++ trunk/src/main/resources/ftl/reportByYear.ftl 2012-03-09 15:03:30 UTC (rev 2815) @@ -27,7 +27,7 @@ <#macro displaySubtaskReport task periodTime identation=0> <#local ident=identation + 1/> - <#list task.subTasks as subtask> + <#list utils.getSubTaskOrdered(task) as subtask> <#local taskTotalTime=utils.getYearlyTotalTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getYearlyTaskTime(subtask, periodTime?date, begin?date, end?date)/> Modified: trunk/src/main/resources/ftl/reportByYear_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByYear_fr.ftl 2012-03-09 14:52:09 UTC (rev 2814) +++ trunk/src/main/resources/ftl/reportByYear_fr.ftl 2012-03-09 15:03:30 UTC (rev 2815) @@ -27,7 +27,7 @@ <#macro displaySubtaskReport task periodTime identation=0> <#local ident=identation + 1/> - <#list task.subTasks as subtask> + <#list utils.getSubTaskOrdered(task) as subtask> <#local taskTotalTime=utils.getYearlyTotalTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getYearlyTaskTime(subtask, periodTime?date, begin?date, end?date)/>