r2953 - in trunk/src: main/java/org/chorem/jtimer/ui/report main/resources/ftl main/resources/org/chorem/jtimer/ui/report/resources test/java/org/chorem/jtimer/ui/report
Author: tchemit Date: 2014-02-12 00:19:49 +0100 (Wed, 12 Feb 2014) New Revision: 2953 Url: http://chorem.org/projects/jtimer/repository/revisions/2953 Log: fixes #983: Add report option to include intermediate total time Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.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 trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties trunk/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java 2014-02-11 23:19:49 UTC (rev 2953) @@ -97,11 +97,13 @@ * @param end end date * @param includeAnnotate include annotations * @param includeAnnotateTime include annotations time - * + * @param includeIntermediateTotalTime include intermediate total time + * * @return report text */ public String getReportText(Type reportType, List<TimerProject> projects, - Date begin, Date end, boolean includeAnnotate, boolean includeAnnotateTime) { + Date begin, Date end, boolean includeAnnotate, boolean includeAnnotateTime, + boolean includeIntermediateTotalTime) { Template template = null; String content = null; @@ -131,7 +133,7 @@ } content = getReportContent(template, projects, begin, end, - includeAnnotate, includeAnnotateTime); + includeAnnotate, includeAnnotateTime, includeIntermediateTotalTime); } catch (IOException e) { if (log.isErrorEnabled()) { log.error("Can't get freemarker template", e); @@ -154,7 +156,8 @@ * @param template freemarker template to use * @param includeAnnotate include annotations * @param includeAnnotateTime include annotations time - * + * @param includeIntermediateTotalTime include middle man total time + * * @return string content * * @throws IOException if i/o exception occurs @@ -164,7 +167,8 @@ */ protected String getReportContent(Template template, List<TimerProject> projects, Date begin, Date end, - boolean includeAnnotate, boolean includeAnnotateTime) throws TemplateException, IOException { + boolean includeAnnotate, boolean includeAnnotateTime, + boolean includeIntermediateTotalTime) throws TemplateException, IOException { // Create the root hash Map<String, Object> root = new HashMap<String, Object>(); @@ -174,6 +178,7 @@ root.put("end", end); root.put("annotations", includeAnnotate); root.put("annotationsTime", includeAnnotateTime); + root.put("intermediateTotalTime", includeIntermediateTotalTime); root.put("utils", new ReportUtils()); Writer out = new StringWriter(); Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java 2014-02-11 23:19:49 UTC (rev 2953) @@ -110,6 +110,8 @@ protected JCheckBox checkIncludesAnnotations; /** Include annotations time on reports */ protected JCheckBox checkIncludesAnnotationsTime; + /** Include middle man total time on reports */ + protected JCheckBox checkIncludeIntermediateTotalTime; /** Date pickers, from... to */ protected JXDatePicker datePickerFrom, datePickerTo; @@ -261,6 +263,11 @@ panelOption.add(checkIncludesAnnotationsTime, new GridBagConstraints(2, 5, 2, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); + checkIncludeIntermediateTotalTime = new JCheckBox(getResourceMap().getString( + "reportIntermediateTotalTime")); + panelOption.add(checkIncludeIntermediateTotalTime, + new GridBagConstraints(0, 6, 2, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, + new Insets(1, 1, 1, 1), 0, 0)); // panel form projects JPanel panelProjects = new JPanel(new BorderLayout()); @@ -431,9 +438,10 @@ // make report String report = reportGenerator.getReportText(reportType, - selectedProjects, datePickerFrom.getDate(), datePickerTo - .getDate(), checkIncludesAnnotations.isSelected(), - checkIncludesAnnotationsTime.isSelected()); + selectedProjects, datePickerFrom.getDate(), datePickerTo + .getDate(), checkIncludesAnnotations.isSelected(), + checkIncludesAnnotationsTime.isSelected(), + checkIncludeIntermediateTotalTime.isSelected()); if (report != null && !report.isEmpty()) { reportArea.setText(report); Modified: trunk/src/main/resources/ftl/reportByDay.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByDay.ftl 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/resources/ftl/reportByDay.ftl 2014-02-11 23:19:49 UTC (rev 2953) @@ -31,7 +31,7 @@ <#local taskTotalTime=utils.getDailyTotalTaskTime(subtask, periodTime?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getDailyTaskTime(subtask, periodTime?date)/> -<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> +<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if><#if intermediateTotalTime && taskTotalTime > 0 && !subtask.getSubTasks().isEmpty()> (total: ${utils.formatDuration(taskTotalTime)})</#if> <#if annotations> <#local taskAnnTimes=utils.getDailyTaskAnnotation(subtask, periodTime?date)/> <#list taskAnnTimes.keySet() as taskAnnTime> @@ -59,7 +59,7 @@ <#list projects as project> <#assign periodProjectTotalTime=utils.getDailyTotalTaskTime(project, period?date)/> <#if periodProjectTotalTime > 0> -- ${project.name} +- ${project.name}<#if intermediateTotalTime> (total: ${utils.formatDuration(periodProjectTotalTime)})</#if> <@displaySubtaskReport task=project periodTime=period/> </#if> </#list> Modified: trunk/src/main/resources/ftl/reportByDay_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByDay_fr.ftl 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/resources/ftl/reportByDay_fr.ftl 2014-02-11 23:19:49 UTC (rev 2953) @@ -31,7 +31,7 @@ <#local taskTotalTime=utils.getDailyTotalTaskTime(subtask, periodTime?date)/> <#if taskTotalTime > 0> <#local taskTime=utils.getDailyTaskTime(subtask, periodTime?date)/> -<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> +<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if><#if intermediateTotalTime && taskTotalTime > 0 && !subtask.getSubTasks().isEmpty()> (total : ${utils.formatDuration(taskTotalTime)})</#if> <#if annotations> <#local taskAnnTimes=utils.getDailyTaskAnnotation(subtask, periodTime?date)/> <#list taskAnnTimes.keySet() as taskAnnTime> @@ -59,7 +59,7 @@ <#list projects as project> <#assign periodProjectTotalTime=utils.getDailyTotalTaskTime(project, period?date)/> <#if periodProjectTotalTime > 0> -- ${project.name} +- ${project.name}<#if intermediateTotalTime> (total : ${utils.formatDuration(periodProjectTotalTime)})</#if> <@displaySubtaskReport task=project periodTime=period/> </#if> </#list> Modified: trunk/src/main/resources/ftl/reportByMonth.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByMonth.ftl 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/resources/ftl/reportByMonth.ftl 2014-02-11 23:19:49 UTC (rev 2953) @@ -31,7 +31,7 @@ <#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)/> -<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> +<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if><#if intermediateTotalTime && taskTotalTime > 0 && !subtask.getSubTasks().isEmpty()> (total: ${utils.formatDuration(taskTotalTime)})</#if> <#if annotations> <#local taskAnnTimes=utils.getMonthlyTaskAnnotation(subtask, periodTime?date, begin?date, end?date)/> <#list taskAnnTimes.keySet() as taskAnnTime> @@ -59,7 +59,7 @@ <#list projects as project> <#assign periodProjectTotalTime=utils.getMonthlyTotalTaskTime(project, period?date, begin?date, end?date)/> <#if periodProjectTotalTime > 0> -- ${project.name} +- ${project.name}<#if intermediateTotalTime> (total: ${utils.formatDuration(periodProjectTotalTime)})</#if> <@displaySubtaskReport task=project periodTime=period/> </#if> </#list> Modified: trunk/src/main/resources/ftl/reportByMonth_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByMonth_fr.ftl 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/resources/ftl/reportByMonth_fr.ftl 2014-02-11 23:19:49 UTC (rev 2953) @@ -31,7 +31,7 @@ <#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)/> -<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> +<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if><#if intermediateTotalTime && taskTotalTime > 0 && !subtask.getSubTasks().isEmpty()> (total : ${utils.formatDuration(taskTotalTime)})</#if> <#if annotations> <#local taskAnnTimes=utils.getMonthlyTaskAnnotation(subtask, periodTime?date, begin?date, end?date)/> <#list taskAnnTimes.keySet() as taskAnnTime> @@ -59,7 +59,7 @@ <#list projects as project> <#assign periodProjectTotalTime=utils.getMonthlyTotalTaskTime(project, period?date, begin?date, end?date)/> <#if periodProjectTotalTime > 0> -- ${project.name} +- ${project.name}<#if intermediateTotalTime> (total : ${utils.formatDuration(periodProjectTotalTime)})</#if> <@displaySubtaskReport task=project periodTime=period/> </#if> </#list> Modified: trunk/src/main/resources/ftl/reportByProject.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByProject.ftl 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/resources/ftl/reportByProject.ftl 2014-02-11 23:19:49 UTC (rev 2953) @@ -39,7 +39,7 @@ <#local subtaskPeriodTime=utils.getDailyTaskTime(subtask, period?date)/> <#local taskTime=taskTime+subtaskPeriodTime/> </#list> -<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> +<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if><#if intermediateTotalTime && taskTotalTime > 0 && !subtask.getSubTasks().isEmpty()> (total: ${utils.formatDuration(taskTotalTime)})</#if> <#if annotations> <#list periods as period> <#local taskAnnTimes=utils.getDailyTaskAnnotation(subtask, period?date)/> Modified: trunk/src/main/resources/ftl/reportByProject_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByProject_fr.ftl 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/resources/ftl/reportByProject_fr.ftl 2014-02-11 23:19:49 UTC (rev 2953) @@ -39,7 +39,7 @@ <#local subtaskPeriodTime=utils.getDailyTaskTime(subtask, period?date)/> <#local taskTime=taskTime+subtaskPeriodTime/> </#list> -<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> +<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if><#if intermediateTotalTime && taskTotalTime > 0 && !subtask.getSubTasks().isEmpty()> (total: ${utils.formatDuration(taskTotalTime)})</#if> <#if annotations> <#list periods as period> <#local taskAnnTimes=utils.getDailyTaskAnnotation(subtask, period?date)/> Modified: trunk/src/main/resources/ftl/reportByWeek.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByWeek.ftl 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/resources/ftl/reportByWeek.ftl 2014-02-11 23:19:49 UTC (rev 2953) @@ -31,7 +31,7 @@ <#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)/> -<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> +<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if><#if intermediateTotalTime && taskTotalTime > 0 && !subtask.getSubTasks().isEmpty()> (total: ${utils.formatDuration(taskTotalTime)})</#if> <#if annotations> <#local taskAnnTimes=utils.getWeeklyTaskAnnotation(subtask, periodTime?date, begin?date, end?date)/> <#list taskAnnTimes.keySet() as taskAnnTime> @@ -59,7 +59,7 @@ <#list projects as project> <#assign periodProjectTotalTime=utils.getWeeklyTotalTaskTime(project, period?date, begin?date, end?date)/> <#if periodProjectTotalTime > 0> -- ${project.name} +- ${project.name}<#if intermediateTotalTime> (total: ${utils.formatDuration(periodProjectTotalTime)})</#if> <@displaySubtaskReport task=project periodTime=period/> </#if> </#list> Modified: trunk/src/main/resources/ftl/reportByWeek_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByWeek_fr.ftl 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/resources/ftl/reportByWeek_fr.ftl 2014-02-11 23:19:49 UTC (rev 2953) @@ -31,7 +31,7 @@ <#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)/> -<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> +<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if><#if intermediateTotalTime && taskTotalTime > 0 && !subtask.getSubTasks().isEmpty()> (total : ${utils.formatDuration(taskTotalTime)})</#if> <#if annotations> <#local taskAnnTimes=utils.getWeeklyTaskAnnotation(subtask, periodTime?date, begin?date, end?date)/> <#list taskAnnTimes.keySet() as taskAnnTime> @@ -59,7 +59,7 @@ <#list projects as project> <#assign periodProjectTotalTime=utils.getWeeklyTotalTaskTime(project, period?date, begin?date, end?date)/> <#if periodProjectTotalTime > 0> -- ${project.name} +- ${project.name}<#if intermediateTotalTime> (total : ${utils.formatDuration(periodProjectTotalTime)})</#if> <@displaySubtaskReport task=project periodTime=period/> </#if> </#list> Modified: trunk/src/main/resources/ftl/reportByYear.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByYear.ftl 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/resources/ftl/reportByYear.ftl 2014-02-11 23:19:49 UTC (rev 2953) @@ -31,7 +31,8 @@ <#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)/> -<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> + <#local totalTaskTime=utils.getYearlyTotalTaskTime(subtask, periodTime?date, begin?date, end?date)/> +<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if><#if intermediateTotalTime && totalTaskTime > 0 && !subtask.getSubTasks().isEmpty()> (total: ${utils.formatDuration(totalTaskTime)})</#if> <#if annotations> <#local taskAnnTimes=utils.getYearlyTaskAnnotation(subtask, periodTime?date, begin?date, end?date)/> <#list taskAnnTimes.keySet() as taskAnnTime> @@ -59,7 +60,7 @@ <#list projects as project> <#assign periodProjectTotalTime=utils.getYearlyTotalTaskTime(project, period?date, begin?date, end?date)/> <#if periodProjectTotalTime > 0> -- ${project.name} +- ${project.name}<#if intermediateTotalTime> (total: ${utils.formatDuration(periodProjectTotalTime)})</#if> <@displaySubtaskReport task=project periodTime=period/> </#if> </#list> Modified: trunk/src/main/resources/ftl/reportByYear_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByYear_fr.ftl 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/resources/ftl/reportByYear_fr.ftl 2014-02-11 23:19:49 UTC (rev 2953) @@ -31,7 +31,8 @@ <#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)/> -<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if> + <#local totalTaskTime=utils.getYearlyTotalTaskTime(subtask, periodTime?date, begin?date, end?date)/> +<#list 1..ident as i> </#list>- ${subtask.name}<#if taskTime > 0> : ${utils.formatDuration(taskTime)}</#if><#if intermediateTotalTime && totalTaskTime > 0 && !subtask.getSubTasks().isEmpty()> (total : ${utils.formatDuration(totalTaskTime)})</#if> <#if annotations> <#local taskAnnTimes=utils.getYearlyTaskAnnotation(subtask, periodTime?date, begin?date, end?date)/> <#list taskAnnTimes.keySet() as taskAnnTime> @@ -59,7 +60,7 @@ <#list projects as project> <#assign periodProjectTotalTime=utils.getYearlyTotalTaskTime(project, period?date, begin?date, end?date)/> <#if periodProjectTotalTime > 0> -- ${project.name} +- ${project.name}<#if intermediateTotalTime> (total : ${utils.formatDuration(periodProjectTotalTime)})</#if> <@displaySubtaskReport task=project periodTime=period/> </#if> </#list> Modified: trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties 2014-02-11 23:19:49 UTC (rev 2953) @@ -33,6 +33,7 @@ reportYearly=Yearly reportByProject=By project reportAnnotationsTime=with time +reportIntermediateTotalTime=Add intermediate total times reportProjects=Projects reportContent=Report reportProjectsList=Projects list Modified: trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties 2014-02-11 23:19:49 UTC (rev 2953) @@ -34,6 +34,7 @@ reportByProject=Par projet reportAnnotationsTime=avec l'heure +reportIntermediateTotalTime=Ajout des temps totaux intermédiaires reportProjects=Projets reportContent=Rapport reportProjectsList=Liste des projets Modified: trunk/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java 2014-02-06 20:44:47 UTC (rev 2952) +++ trunk/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java 2014-02-11 23:19:49 UTC (rev 2953) @@ -72,7 +72,7 @@ projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_DAY_REPORT, - projects, d1, d2, false, false); + projects, d1, d2, false, false, false); if (log.isDebugEnabled()) { log.debug("Daily report = " + content); @@ -123,7 +123,7 @@ projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_DAY_REPORT, - projects, d1, d2, true, true); + projects, d1, d2, true, true, false); if (log.isDebugEnabled()) { log.debug("Daily report = " + content); @@ -161,7 +161,7 @@ projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_WEEK_REPORT, - projects, d1, d2, true, false); + projects, d1, d2, true, false, false); if (log.isDebugEnabled()) { log.debug("Weekly report = " + content); @@ -208,7 +208,7 @@ projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_MONTH_REPORT, - projects, d1, d2, true, true); + projects, d1, d2, true, true, false); if (log.isDebugEnabled()) { log.debug("Monthly report = " + content); @@ -245,7 +245,7 @@ projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_MONTH_REPORT, - projects, d1, d2, false, false); + projects, d1, d2, false, false, false); if (log.isDebugEnabled()) { log.debug("Monthly report = " + content); @@ -291,7 +291,7 @@ projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_YEAR_REPORT, - projects, d1, d2, false, false); + projects, d1, d2, false, false, false); if (log.isDebugEnabled()) { log.debug("Yearly report = " + content); @@ -338,7 +338,7 @@ projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_PROJECT_REPORT, - projects, d1, d2, true, false); + projects, d1, d2, true, false, false); if (log.isDebugEnabled()) { log.debug("Project report = " + content);
participants (1)
-
tchemit＠users.chorem.org