branch develop updated (fac1edb -> f8ebc46)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jtimer. See http://git.chorem.org/jtimer.git from fac1edb Fix layout new a8d5288 refs #1329: Use task pane to improve ui new f8ebc46 fixes #1329: Add option to not display time in report The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit f8ebc46d7de68268305b831241332b312564f67a Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Feb 29 14:06:52 2016 +0100 fixes #1329: Add option to not display time in report commit a8d5288f1d4b48ea2f7c755f5fd351704d8e8752 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Feb 29 13:00:15 2016 +0100 refs #1329: Use task pane to improve ui Summary of changes: .../chorem/jtimer/ui/report/ReportGenerator.java | 24 ++- .../org/chorem/jtimer/ui/report/ReportView.java | 199 +++++++++------------ src/main/resources/ftl/reportByDay.ftl | 4 +- src/main/resources/ftl/reportByDay_fr.ftl | 4 +- src/main/resources/ftl/reportByMonth.ftl | 4 +- src/main/resources/ftl/reportByMonth_fr.ftl | 4 +- src/main/resources/ftl/reportByProject.ftl | 4 +- src/main/resources/ftl/reportByProject_fr.ftl | 4 +- src/main/resources/ftl/reportByWeek.ftl | 4 +- src/main/resources/ftl/reportByWeek_fr.ftl | 4 +- src/main/resources/ftl/reportByYear.ftl | 4 +- src/main/resources/ftl/reportByYear_fr.ftl | 4 +- .../ui/report/resources/ReportView.properties | 7 +- .../ui/report/resources/ReportView_fr.properties | 2 + .../jtimer/ui/report/ReportGeneratorTest.java | 14 +- 15 files changed, 126 insertions(+), 160 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jtimer. See http://git.chorem.org/jtimer.git commit a8d5288f1d4b48ea2f7c755f5fd351704d8e8752 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Feb 29 13:00:15 2016 +0100 refs #1329: Use task pane to improve ui --- .../org/chorem/jtimer/ui/report/ReportView.java | 193 ++++++++------------- .../ui/report/resources/ReportView.properties | 3 +- .../ui/report/resources/ReportView_fr.properties | 1 + 3 files changed, 78 insertions(+), 119 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/ui/report/ReportView.java b/src/main/java/org/chorem/jtimer/ui/report/ReportView.java index f60d7e7..6af7051 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/ReportView.java +++ b/src/main/java/org/chorem/jtimer/ui/report/ReportView.java @@ -22,7 +22,6 @@ package org.chorem.jtimer.ui.report; -import java.awt.BorderLayout; import java.awt.Color; import java.awt.Desktop; import java.awt.Font; @@ -42,7 +41,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.swing.BorderFactory; import javax.swing.ButtonGroup; import javax.swing.JButton; import javax.swing.JCheckBox; @@ -71,6 +69,8 @@ import org.jdesktop.application.Action; import org.jdesktop.application.Application; import org.jdesktop.application.FrameView; import org.jdesktop.swingx.JXDatePicker; +import org.jdesktop.swingx.JXTaskPane; +import org.jdesktop.swingx.JXTaskPaneContainer; /** * Reports UI. @@ -141,6 +141,7 @@ public class ReportView extends FrameView implements DocumentListener { // modify frame name // otherwise, get parent frame dimention getFrame().setName("reportFrame"); + getFrame().setTitle(getResourceMap().getString("reportTitle")); this.core = core; this.uncheckedTaskSet = new HashSet<>(); @@ -164,65 +165,52 @@ public class ReportView extends FrameView implements DocumentListener { */ protected JComponent getMainComponent() { - JPanel configComponent = new JPanel(new GridBagLayout()); + JPanel configComponent = new JXTaskPaneContainer(); // panel for options - JPanel panelOption = new JPanel(new GridBagLayout()); - panelOption.setBorder(BorderFactory.createTitledBorder(getResourceMap() - .getString("reportOptions"))); + JXTaskPane panelGeneral = new JXTaskPane(getResourceMap().getString("reportGeneral")); + panelGeneral.setLayout(new GridBagLayout()); + panelGeneral.setSpecial(true); // first date picker JLabel labelFrom = new JLabel(getResourceMap().getString("reportFrom")); - panelOption.add(labelFrom, new GridBagConstraints(0, 0, 1, 1, 0, 0, - GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); + panelGeneral.add(labelFrom, new GridBagConstraints(0, 0, 1, 1, 0, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); datePickerFrom = new JXDatePicker(); datePickerFrom.getMonthView().setDayForeground(Calendar.SUNDAY, Color.RED); datePickerFrom.setFormats(DateFormat.getDateInstance(DateFormat.FULL)); - panelOption.add(datePickerFrom, new GridBagConstraints(1, 0, 2, 1, 1, - 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); + panelGeneral.add(datePickerFrom, new GridBagConstraints(1, 0, 2, 1, 1, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); // second date picker JLabel labelTo = new JLabel(getResourceMap().getString("reportTo")); - panelOption.add(labelTo, new GridBagConstraints(0, 1, 1, 1, 0, 0, - GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); + panelGeneral.add(labelTo, new GridBagConstraints(0, 1, 1, 1, 0, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); datePickerTo = new JXDatePicker(); datePickerTo.getMonthView().setDayForeground(Calendar.SUNDAY, Color.RED); datePickerTo.setFormats(DateFormat.getDateInstance(DateFormat.FULL)); - panelOption.add(datePickerTo, new GridBagConstraints(1, 1, 2, 1, 0, 0, - GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); + panelGeneral.add(datePickerTo, new GridBagConstraints(1, 1, 2, 1, 0, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); // set current week by default currentWeek(); // action button to show current or previous week JButton currentWeekButton = new JButton(); - currentWeekButton.setAction(getContext().getActionMap(this).get( - "currentWeek")); - panelOption.add(currentWeekButton, new GridBagConstraints(3, 0, 1, 1, 0, - 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); + currentWeekButton.setAction(getContext().getActionMap(this).get("currentWeek")); + panelGeneral.add(currentWeekButton, new GridBagConstraints(3, 0, 1, 1, 0, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); JButton previousWeekButton = new JButton(); - previousWeekButton.setAction(getContext().getActionMap(this).get( - "previousWeek")); - panelOption.add(previousWeekButton, new GridBagConstraints(3, 1, 1, 1, 0, - 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); + previousWeekButton.setAction(getContext().getActionMap(this).get("previousWeek")); + panelGeneral.add(previousWeekButton, new GridBagConstraints(3, 1, 1, 1, 0, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); // Option for period grouping - radioByDay = new JRadioButton( - getResourceMap().getString("reportDaily"), true); - radioByMonth = new JRadioButton(getResourceMap().getString( - "reportMonthly")); - radioByWeek = new JRadioButton(getResourceMap().getString( - "reportWeekly")); - radioByYear = new JRadioButton(getResourceMap().getString( - "reportYearly")); - radioByProject = new JRadioButton(getResourceMap().getString( - "reportByProject")); + radioByDay = new JRadioButton(getResourceMap().getString("reportDaily"), true); + radioByMonth = new JRadioButton(getResourceMap().getString("reportMonthly")); + radioByWeek = new JRadioButton(getResourceMap().getString("reportWeekly")); + radioByYear = new JRadioButton(getResourceMap().getString("reportYearly")); + radioByProject = new JRadioButton(getResourceMap().getString("reportByProject")); ButtonGroup group = new ButtonGroup(); group.add(radioByDay); @@ -231,106 +219,86 @@ public class ReportView extends FrameView implements DocumentListener { group.add(radioByYear); group.add(radioByProject); - panelOption.add(radioByDay, new GridBagConstraints(0, 2, 2, 1, 1, 0, - GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - panelOption.add(radioByMonth, new GridBagConstraints(2, 2, 2, 1, 1, 0, - GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - panelOption.add(radioByWeek, new GridBagConstraints(0, 3, 2, 1, 0, 0, - GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - panelOption.add(radioByYear, new GridBagConstraints(2, 3, 2, 1, 0, 0, - GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - panelOption.add(radioByProject, new GridBagConstraints(0, 4, 4, 1, 0, - 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); + panelGeneral.add(radioByDay, new GridBagConstraints(0, 2, 2, 1, 2, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); + panelGeneral.add(radioByMonth, new GridBagConstraints(2, 2, 2, 1, 2, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); + panelGeneral.add(radioByWeek, new GridBagConstraints(0, 3, 2, 1, 0, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); + panelGeneral.add(radioByYear, new GridBagConstraints(2, 3, 2, 1, 0, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); + panelGeneral.add(radioByProject, new GridBagConstraints(0, 4, 4, 1, 0, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); // miscellaneous + JXTaskPane panelOption = new JXTaskPane(getResourceMap().getString("reportOptions")); + panelOption.setLayout(new GridBagLayout()); + checkIncludesAnnotations = new JCheckBox(); - checkIncludesAnnotations.setAction(getContext().getActionMap(this).get( - "reportAnnotations")); - panelOption.add(checkIncludesAnnotations, new GridBagConstraints(0, 5, - 2, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); - checkIncludesAnnotationsTime = new JCheckBox(getResourceMap().getString( - "reportAnnotationsTime")); + checkIncludesAnnotations.setAction(getContext().getActionMap(this).get("reportAnnotations")); + panelOption.add(checkIncludesAnnotations, new GridBagConstraints(0, 5, 2, 1, 0, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); + checkIncludesAnnotationsTime = new JCheckBox(getResourceMap().getString("reportAnnotationsTime")); checkIncludesAnnotationsTime.setEnabled(false); - 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, 4, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); + 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, 4, 1, 1, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); // panel form projects - JPanel panelProjects = new JPanel(new BorderLayout()); - panelProjects.setBorder(BorderFactory - .createTitledBorder(getResourceMap() - .getString("reportProjects"))); + JPanel panelProjects = new JXTaskPane(getResourceMap().getString("reportProjects")); + panelProjects.setLayout(new GridBagLayout()); // show hidden box - showHiddenProjectBox = new JCheckBox(getContext().getActionMap(this) - .get("showHiddenProjects")); - panelProjects.add(showHiddenProjectBox, BorderLayout.NORTH); + showHiddenProjectBox = new JCheckBox(getContext().getActionMap(this).get("showHiddenProjects")); + panelProjects.add(showHiddenProjectBox, new GridBagConstraints(0, 0, 1, 1, 0, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); projectsTree = new JTree(); projectsTree.setRootVisible(true); projectsTree.setEditable(true); projectsTree.setModel(new CheckBoxTreeModel(core, getResourceMap().getString("reportProjectsList") + " :")); - projectsTree.setCellEditor(new CheckBoxTreeCellEditor(core, projectsTree, - uncheckedTaskSet)); - projectsTree.setCellRenderer(new CheckBoxTreeCellRenderer(core, projectsTree, - uncheckedTaskSet)); + projectsTree.setCellEditor(new CheckBoxTreeCellEditor(core, projectsTree, uncheckedTaskSet)); + projectsTree.setCellRenderer(new CheckBoxTreeCellRenderer(core, projectsTree, uncheckedTaskSet)); JScrollPane jspTable = new JScrollPane(projectsTree); - panelProjects.add(jspTable, BorderLayout.CENTER); - - configComponent.add(panelOption, new GridBagConstraints(0, 0, 1, 1, 0, 0, - GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(1, 1, 1, 1), 0, 0)); + panelProjects.add(jspTable, new GridBagConstraints(0, 1, 1, 1, 1, 1, + GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(1, 0, 0, 0), 0, 0)); - configComponent.add(panelProjects, new GridBagConstraints(0, 1, 1, 1, 1, - 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH, - new Insets(1, 1, 1, 1), 0, 0)); + configComponent.add(panelGeneral); + configComponent.add(panelOption); + configComponent.add(panelProjects); // panel for report text JPanel panelReports = new JPanel(new GridBagLayout()); - panelReports.setBorder(BorderFactory.createTitledBorder(getResourceMap() - .getString("reportContent"))); reportArea = new JTextArea(); reportArea.setFont(new Font("Courier", Font.PLAIN, 12)); reportArea.getDocument().addDocumentListener(this); JScrollPane jspReport = new JScrollPane(reportArea); panelReports.add(jspReport, new GridBagConstraints(0, 0, 3, 1, 1, 1, - GridBagConstraints.CENTER, GridBagConstraints.BOTH, - new Insets(1, 1, 1, 1), 0, 0)); + GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0)); // buttons JButton generateButton = new JButton(); - generateButton.setAction(getContext().getActionMap(this).get( - "generateReport")); - panelReports.add(generateButton, new GridBagConstraints(0, 1, 1, 1, 1, - 0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, - new Insets(1, 1, 1, 1), 0, 0)); + generateButton.setAction(getContext().getActionMap(this).get("generateReport")); + panelReports.add(generateButton, new GridBagConstraints(0, 1, 1, 1, 1, 0, + GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0)); JButton sendMailButton = new JButton(); - sendMailButton.setAction(getContext().getActionMap(this) - .get("sendMail")); - panelReports.add(sendMailButton, new GridBagConstraints(1, 1, 1, 1, 1, - 0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, - new Insets(1, 1, 1, 1), 0, 0)); + sendMailButton.setAction(getContext().getActionMap(this).get("sendMail")); + panelReports.add(sendMailButton, new GridBagConstraints(1, 1, 1, 1, 1, 0, + GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0)); JButton closeButton = new JButton(); closeButton.setAction(getContext().getActionMap(this).get("closeView")); panelReports.add(closeButton, new GridBagConstraints(2, 1, 1, 1, 1, 0, - GridBagConstraints.CENTER, GridBagConstraints.BOTH, - new Insets(1, 1, 1, 1), 0, 0)); - + GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0)); + + // color fix on linux ? + configComponent.setBackground(panelReports.getBackground()); + JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, configComponent, panelReports); splitPane.setOneTouchExpandable(true); return splitPane; @@ -434,11 +402,9 @@ public class ReportView extends FrameView implements DocumentListener { .getData().getProjectsList(), uncheckedTaskSet); // make report - String report = reportGenerator.getReportText(reportType, - selectedProjects, datePickerFrom.getDate(), datePickerTo - .getDate(), checkIncludesAnnotations.isSelected(), - checkIncludesAnnotationsTime.isSelected(), - checkIncludeIntermediateTotalTime.isSelected()); + String report = reportGenerator.getReportText(reportType, selectedProjects, datePickerFrom.getDate(), + datePickerTo.getDate(), checkIncludesAnnotations.isSelected(), + checkIncludesAnnotationsTime.isSelected(), checkIncludeIntermediateTotalTime.isSelected()); if (report != null && !report.isEmpty()) { reportArea.setText(report); @@ -583,25 +549,16 @@ public class ReportView extends FrameView implements DocumentListener { firePropertyChange("sendMailEnabled", oldValue, canSendMail); } - /* - * @see javax.swing.event.DocumentListener#changedUpdate(javax.swing.event.DocumentEvent) - */ @Override public void changedUpdate(DocumentEvent e) { documentChanged(); } - /* - * @see javax.swing.event.DocumentListener#insertUpdate(javax.swing.event.DocumentEvent) - */ @Override public void insertUpdate(DocumentEvent e) { documentChanged(); } - /* - * @see javax.swing.event.DocumentListener#removeUpdate(javax.swing.event.DocumentEvent) - */ @Override public void removeUpdate(DocumentEvent e) { documentChanged(); diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties b/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties index f007249..e2656a8 100644 --- a/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties +++ b/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties @@ -2,7 +2,7 @@ # #%L # jTimer # %% -# Copyright (C) 2007 - 2012 CodeLutin, Chatellier Eric +# Copyright (C) 2007 - 2016 CodeLutin, Chatellier Eric # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -21,6 +21,7 @@ ### # Report i18n reportTitle=${Application.title} - Report +reportGeneral=General reportOptions=Options reportFrom=From : reportTo=To : diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties b/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties index 0287873..20885e5 100644 --- a/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties +++ b/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties @@ -21,6 +21,7 @@ ### # Report i18n reportTitle=${Application.title} - Rapport +reportGeneral=G\u00E9neral reportOptions=Options reportFrom=De : reportTo=\u00C0 : -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jtimer. See http://git.chorem.org/jtimer.git commit f8ebc46d7de68268305b831241332b312564f67a Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Feb 29 14:06:52 2016 +0100 fixes #1329: Add option to not display time in report --- .../chorem/jtimer/ui/report/ReportGenerator.java | 24 ++++++++++------------ .../org/chorem/jtimer/ui/report/ReportView.java | 14 +++++++++---- src/main/resources/ftl/reportByDay.ftl | 4 ++-- src/main/resources/ftl/reportByDay_fr.ftl | 4 ++-- src/main/resources/ftl/reportByMonth.ftl | 4 ++-- src/main/resources/ftl/reportByMonth_fr.ftl | 4 ++-- src/main/resources/ftl/reportByProject.ftl | 4 ++-- src/main/resources/ftl/reportByProject_fr.ftl | 4 ++-- src/main/resources/ftl/reportByWeek.ftl | 4 ++-- src/main/resources/ftl/reportByWeek_fr.ftl | 4 ++-- src/main/resources/ftl/reportByYear.ftl | 4 ++-- src/main/resources/ftl/reportByYear_fr.ftl | 4 ++-- .../ui/report/resources/ReportView.properties | 4 +++- .../ui/report/resources/ReportView_fr.properties | 1 + .../jtimer/ui/report/ReportGeneratorTest.java | 14 ++++++------- 15 files changed, 52 insertions(+), 45 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java b/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java index 70b26b9..f725605 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java +++ b/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java @@ -92,6 +92,7 @@ public class ReportGenerator { * @param projects projects sub set * @param begin begin date * @param end end date + * @param includeTime include time * @param includeAnnotate include annotations * @param includeAnnotateTime include annotations time * @param includeIntermediateTotalTime include intermediate total time @@ -99,7 +100,7 @@ public class ReportGenerator { * @return report text */ public String getReportText(Type reportType, List<TimerProject> projects, - Date begin, Date end, boolean includeAnnotate, boolean includeAnnotateTime, + Date begin, Date end, boolean includeTime, boolean includeAnnotate, boolean includeAnnotateTime, boolean includeIntermediateTotalTime) { Template template = null; @@ -108,28 +109,23 @@ public class ReportGenerator { try { switch (reportType) { case BY_DAY_REPORT: - template = freemarkerConfiguration - .getTemplate("reportByDay.ftl"); + template = freemarkerConfiguration.getTemplate("reportByDay.ftl"); break; case BY_WEEK_REPORT: - template = freemarkerConfiguration - .getTemplate("reportByWeek.ftl"); + template = freemarkerConfiguration.getTemplate("reportByWeek.ftl"); break; case BY_MONTH_REPORT: - template = freemarkerConfiguration - .getTemplate("reportByMonth.ftl"); + template = freemarkerConfiguration.getTemplate("reportByMonth.ftl"); break; case BY_YEAR_REPORT: - template = freemarkerConfiguration - .getTemplate("reportByYear.ftl"); + template = freemarkerConfiguration.getTemplate("reportByYear.ftl"); break; case BY_PROJECT_REPORT: - template = freemarkerConfiguration - .getTemplate("reportByProject.ftl"); + template = freemarkerConfiguration.getTemplate("reportByProject.ftl"); break; } - content = getReportContent(template, projects, begin, end, + content = getReportContent(template, projects, begin, end, includeTime, includeAnnotate, includeAnnotateTime, includeIntermediateTotalTime); } catch (IOException e) { if (log.isErrorEnabled()) { @@ -151,6 +147,7 @@ public class ReportGenerator { * @param begin begin date * @param end end date * @param template freemarker template to use + * @param includeTime include time * @param includeAnnotate include annotations * @param includeAnnotateTime include annotations time * @param includeIntermediateTotalTime include middle man total time @@ -164,7 +161,7 @@ public class ReportGenerator { */ protected String getReportContent(Template template, List<TimerProject> projects, Date begin, Date end, - boolean includeAnnotate, boolean includeAnnotateTime, + boolean includeTime, boolean includeAnnotate, boolean includeAnnotateTime, boolean includeIntermediateTotalTime) throws TemplateException, IOException { // Create the root hash @@ -173,6 +170,7 @@ public class ReportGenerator { root.put("projects", projects); root.put("begin", begin); root.put("end", end); + root.put("includeTime", includeTime); root.put("annotations", includeAnnotate); root.put("annotationsTime", includeAnnotateTime); root.put("intermediateTotalTime", includeIntermediateTotalTime); diff --git a/src/main/java/org/chorem/jtimer/ui/report/ReportView.java b/src/main/java/org/chorem/jtimer/ui/report/ReportView.java index 6af7051..bc025e3 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/ReportView.java +++ b/src/main/java/org/chorem/jtimer/ui/report/ReportView.java @@ -103,6 +103,8 @@ public class ReportView extends FrameView implements DocumentListener { /** Report sorting : project */ protected JRadioButton radioByProject; + /** Include task time on report. */ + protected JCheckBox checkIncludesTaskTimes; /** Include annotations on reports */ protected JCheckBox checkIncludesAnnotations; /** Include annotations time on reports */ @@ -234,16 +236,20 @@ public class ReportView extends FrameView implements DocumentListener { JXTaskPane panelOption = new JXTaskPane(getResourceMap().getString("reportOptions")); panelOption.setLayout(new GridBagLayout()); + checkIncludesTaskTimes = new JCheckBox(getResourceMap().getString("reportIncludeTime")); + checkIncludesTaskTimes.setSelected(true); + panelOption.add(checkIncludesTaskTimes, new GridBagConstraints(0, 0, 2, 1, 1, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); checkIncludesAnnotations = new JCheckBox(); checkIncludesAnnotations.setAction(getContext().getActionMap(this).get("reportAnnotations")); - panelOption.add(checkIncludesAnnotations, new GridBagConstraints(0, 5, 2, 1, 0, 0, + panelOption.add(checkIncludesAnnotations, new GridBagConstraints(0, 1, 1, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); checkIncludesAnnotationsTime = new JCheckBox(getResourceMap().getString("reportAnnotationsTime")); checkIncludesAnnotationsTime.setEnabled(false); - panelOption.add(checkIncludesAnnotationsTime, new GridBagConstraints(2, 5, 2, 1, 0, 0, + panelOption.add(checkIncludesAnnotationsTime, new GridBagConstraints(1, 1, 1, 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, 4, 1, 1, 0, + panelOption.add(checkIncludeIntermediateTotalTime, new GridBagConstraints(0, 2, 2, 1, 1, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); // panel form projects @@ -403,7 +409,7 @@ public class ReportView extends FrameView implements DocumentListener { // make report String report = reportGenerator.getReportText(reportType, selectedProjects, datePickerFrom.getDate(), - datePickerTo.getDate(), checkIncludesAnnotations.isSelected(), + datePickerTo.getDate(), checkIncludesTaskTimes.isSelected(), checkIncludesAnnotations.isSelected(), checkIncludesAnnotationsTime.isSelected(), checkIncludeIntermediateTotalTime.isSelected()); if (report != null && !report.isEmpty()) { diff --git a/src/main/resources/ftl/reportByDay.ftl b/src/main/resources/ftl/reportByDay.ftl index 8cc5882..d9392a1 100644 --- a/src/main/resources/ftl/reportByDay.ftl +++ b/src/main/resources/ftl/reportByDay.ftl @@ -2,7 +2,7 @@ #%L jTimer %% - Copyright (C) 2007 - 2012 CodeLutin, Chatellier Eric + Copyright (C) 2007 - 2016 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -28,7 +28,7 @@ Report by day <#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><#if intermediateTotalTime && taskTotalTime > 0 && !subtask.getSubTasks().isEmpty()> (total: ${utils.formatDuration(taskTotalTime)})</#if> +<#list 1..ident as i> </#list>- ${subtask.name}<#if includeTime && 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> diff --git a/src/main/resources/ftl/reportByDay_fr.ftl b/src/main/resources/ftl/reportByDay_fr.ftl index 91244d0..b8b164e 100644 --- a/src/main/resources/ftl/reportByDay_fr.ftl +++ b/src/main/resources/ftl/reportByDay_fr.ftl @@ -2,7 +2,7 @@ #%L jTimer %% - Copyright (C) 2007 - 2012 CodeLutin, Chatellier Eric + Copyright (C) 2007 - 2016 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -28,7 +28,7 @@ Rapport par jour <#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><#if intermediateTotalTime && taskTotalTime > 0 && !subtask.getSubTasks().isEmpty()> (total : ${utils.formatDuration(taskTotalTime)})</#if> +<#list 1..ident as i> </#list>- ${subtask.name}<#if includeTime && 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> diff --git a/src/main/resources/ftl/reportByMonth.ftl b/src/main/resources/ftl/reportByMonth.ftl index 4108a73..814424d 100644 --- a/src/main/resources/ftl/reportByMonth.ftl +++ b/src/main/resources/ftl/reportByMonth.ftl @@ -2,7 +2,7 @@ #%L jTimer %% - Copyright (C) 2007 - 2012 CodeLutin, Chatellier Eric + Copyright (C) 2007 - 2016 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -28,7 +28,7 @@ Report by month <#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><#if intermediateTotalTime && taskTotalTime > 0 && !subtask.getSubTasks().isEmpty()> (total: ${utils.formatDuration(taskTotalTime)})</#if> +<#list 1..ident as i> </#list>- ${subtask.name}<#if includeTime && 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> diff --git a/src/main/resources/ftl/reportByMonth_fr.ftl b/src/main/resources/ftl/reportByMonth_fr.ftl index 4996f02..6c3078e 100644 --- a/src/main/resources/ftl/reportByMonth_fr.ftl +++ b/src/main/resources/ftl/reportByMonth_fr.ftl @@ -2,7 +2,7 @@ #%L jTimer %% - Copyright (C) 2007 - 2012 CodeLutin, Chatellier Eric + Copyright (C) 2007 - 2016 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -28,7 +28,7 @@ Rapport par mois <#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><#if intermediateTotalTime && taskTotalTime > 0 && !subtask.getSubTasks().isEmpty()> (total : ${utils.formatDuration(taskTotalTime)})</#if> +<#list 1..ident as i> </#list>- ${subtask.name}<#if includeTime && 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> diff --git a/src/main/resources/ftl/reportByProject.ftl b/src/main/resources/ftl/reportByProject.ftl index c3addaa..e843c16 100644 --- a/src/main/resources/ftl/reportByProject.ftl +++ b/src/main/resources/ftl/reportByProject.ftl @@ -2,7 +2,7 @@ #%L jTimer %% - Copyright (C) 2007 - 2012 CodeLutin, Chatellier Eric + Copyright (C) 2007 - 2016 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -36,7 +36,7 @@ Report by project <#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><#if intermediateTotalTime && taskTotalTime > 0 && !subtask.getSubTasks().isEmpty()> (total: ${utils.formatDuration(taskTotalTime)})</#if> +<#list 1..ident as i> </#list>- ${subtask.name}<#if includeTime && 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)/> diff --git a/src/main/resources/ftl/reportByProject_fr.ftl b/src/main/resources/ftl/reportByProject_fr.ftl index 486dfd6..9445cd9 100644 --- a/src/main/resources/ftl/reportByProject_fr.ftl +++ b/src/main/resources/ftl/reportByProject_fr.ftl @@ -2,7 +2,7 @@ #%L jTimer %% - Copyright (C) 2007 - 2012 CodeLutin, Chatellier Eric + Copyright (C) 2007 - 2016 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -36,7 +36,7 @@ Rapport par projet <#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><#if intermediateTotalTime && taskTotalTime > 0 && !subtask.getSubTasks().isEmpty()> (total: ${utils.formatDuration(taskTotalTime)})</#if> +<#list 1..ident as i> </#list>- ${subtask.name}<#if includeTime && 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)/> diff --git a/src/main/resources/ftl/reportByWeek.ftl b/src/main/resources/ftl/reportByWeek.ftl index 83e4060..4bad988 100644 --- a/src/main/resources/ftl/reportByWeek.ftl +++ b/src/main/resources/ftl/reportByWeek.ftl @@ -2,7 +2,7 @@ #%L jTimer %% - Copyright (C) 2007 - 2012 CodeLutin, Chatellier Eric + Copyright (C) 2007 - 2016 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -28,7 +28,7 @@ Report by week <#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><#if intermediateTotalTime && taskTotalTime > 0 && !subtask.getSubTasks().isEmpty()> (total: ${utils.formatDuration(taskTotalTime)})</#if> +<#list 1..ident as i> </#list>- ${subtask.name}<#if includeTime && 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> diff --git a/src/main/resources/ftl/reportByWeek_fr.ftl b/src/main/resources/ftl/reportByWeek_fr.ftl index 67726a6..136647c 100644 --- a/src/main/resources/ftl/reportByWeek_fr.ftl +++ b/src/main/resources/ftl/reportByWeek_fr.ftl @@ -2,7 +2,7 @@ #%L jTimer %% - Copyright (C) 2007 - 2012 CodeLutin, Chatellier Eric + Copyright (C) 2007 - 2016 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -28,7 +28,7 @@ Rapport par semaine <#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><#if intermediateTotalTime && taskTotalTime > 0 && !subtask.getSubTasks().isEmpty()> (total : ${utils.formatDuration(taskTotalTime)})</#if> +<#list 1..ident as i> </#list>- ${subtask.name}<#if includeTime && 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> diff --git a/src/main/resources/ftl/reportByYear.ftl b/src/main/resources/ftl/reportByYear.ftl index 19de1d6..51526ec 100644 --- a/src/main/resources/ftl/reportByYear.ftl +++ b/src/main/resources/ftl/reportByYear.ftl @@ -2,7 +2,7 @@ #%L jTimer %% - Copyright (C) 2007 - 2012 CodeLutin, Chatellier Eric + Copyright (C) 2007 - 2016 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -29,7 +29,7 @@ Report by year <#if taskTotalTime > 0> <#local taskTime=utils.getYearlyTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#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> +<#list 1..ident as i> </#list>- ${subtask.name}<#if includeTime && 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> diff --git a/src/main/resources/ftl/reportByYear_fr.ftl b/src/main/resources/ftl/reportByYear_fr.ftl index 336baa3..1f62a29 100644 --- a/src/main/resources/ftl/reportByYear_fr.ftl +++ b/src/main/resources/ftl/reportByYear_fr.ftl @@ -2,7 +2,7 @@ #%L jTimer %% - Copyright (C) 2007 - 2012 CodeLutin, Chatellier Eric + Copyright (C) 2007 - 2016 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -29,7 +29,7 @@ Rapport par année <#if taskTotalTime > 0> <#local taskTime=utils.getYearlyTaskTime(subtask, periodTime?date, begin?date, end?date)/> <#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> +<#list 1..ident as i> </#list>- ${subtask.name}<#if includeTime && 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> diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties b/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties index e2656a8..476a47f 100644 --- a/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties +++ b/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties @@ -30,8 +30,10 @@ reportMonthly=Monthly reportWeekly=Weekly reportYearly=Yearly reportByProject=By project + +reportIncludeTime=Include task times reportAnnotationsTime=with time -reportIntermediateTotalTime=Add intermediate total times +reportIntermediateTotalTime=Include intermediate total times reportProjects=Projects reportContent=Report reportProjectsList=Projects list diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties b/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties index 20885e5..f164b1d 100644 --- a/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties +++ b/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties @@ -31,6 +31,7 @@ reportWeekly=Par semaine reportYearly=Par ann\u00E9e reportByProject=Par projet +reportIncludeTime=Afficher les temps reportAnnotationsTime=avec l'heure reportIntermediateTotalTime=Ajout des temps totaux interm\u00E9diaires reportProjects=Projets diff --git a/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java b/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java index a704156..415646e 100644 --- a/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java +++ b/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java @@ -69,7 +69,7 @@ public class ReportGeneratorTest extends AbstractJTimerTest { projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_DAY_REPORT, - projects, d1, d2, false, false, false); + projects, d1, d2, false, false, false, false); if (log.isDebugEnabled()) { log.debug("Daily report = " + content); @@ -120,7 +120,7 @@ public class ReportGeneratorTest extends AbstractJTimerTest { projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_DAY_REPORT, - projects, d1, d2, true, true, false); + projects, d1, d2, false, true, true, false); if (log.isDebugEnabled()) { log.debug("Daily report = " + content); @@ -158,7 +158,7 @@ public class ReportGeneratorTest extends AbstractJTimerTest { projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_WEEK_REPORT, - projects, d1, d2, true, false, false); + projects, d1, d2, true, true, false, false); if (log.isDebugEnabled()) { log.debug("Weekly report = " + content); @@ -205,7 +205,7 @@ public class ReportGeneratorTest extends AbstractJTimerTest { projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_MONTH_REPORT, - projects, d1, d2, true, true, false); + projects, d1, d2, true, true, true, false); if (log.isDebugEnabled()) { log.debug("Monthly report = " + content); @@ -242,7 +242,7 @@ public class ReportGeneratorTest extends AbstractJTimerTest { projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_MONTH_REPORT, - projects, d1, d2, false, false, false); + projects, d1, d2, true, false, false, false); if (log.isDebugEnabled()) { log.debug("Monthly report = " + content); @@ -288,7 +288,7 @@ public class ReportGeneratorTest extends AbstractJTimerTest { projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_YEAR_REPORT, - projects, d1, d2, false, false, false); + projects, d1, d2, false, false, false, false); if (log.isDebugEnabled()) { log.debug("Yearly report = " + content); @@ -335,7 +335,7 @@ public class ReportGeneratorTest extends AbstractJTimerTest { projects.addAll(testSaver.load()); ReportGenerator generator = new ReportGenerator(); String content = generator.getReportText(ReportGenerator.Type.BY_PROJECT_REPORT, - projects, d1, d2, true, false, false); + projects, d1, d2, true, true, false, false); if (log.isDebugEnabled()) { log.debug("Project report = " + content); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm