- Jtimer-commits - mailman.cloud.codelutin.com

r2824 - trunk/src/main/java/org/chorem/jtimer/ui/widget
by echatellier＠users.chorem.org 15 Mar '12

15 Mar '12

Author: echatellier Date: 2012-03-15 10:56:38 +0100 (Thu, 15 Mar 2012) New Revision: 2824 Url: http://chorem.org/repositories/revision/jtimer/2824 Log: #487 : Force jtimer to start in non iconified frame mode Added: trunk/src/main/java/org/chorem/jtimer/ui/widget/WindowProperty2.java Added: trunk/src/main/java/org/chorem/jtimer/ui/widget/WindowProperty2.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/widget/WindowProperty2.java (rev 0) +++ trunk/src/main/java/org/chorem/jtimer/ui/widget/WindowProperty2.java 2012-03-15 09:56:38 UTC (rev 2824) @@ -0,0 +1,53 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.chorem.jtimer.ui.widget; + +import java.awt.Component; +import java.awt.Frame; + +import org.jdesktop.application.session.WindowProperty; + +/** + * Code from http://kenai.com/jira/browse/BSAF-74. + * + * Force jtimer to always start in not iconified mode. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class WindowProperty2 extends WindowProperty { + + @Override + public void setSessionState(final Component comp, final Object state) { + super.setSessionState(comp, state); + if (comp instanceof Frame && !((Frame) comp).isLocationByPlatform()) { + ((Frame) comp).setExtendedState(((Frame) comp).getExtendedState() & ~Frame.ICONIFIED); + } + } +} Property changes on: trunk/src/main/java/org/chorem/jtimer/ui/widget/WindowProperty2.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r2823 - trunk/src/main/java/org/chorem/jtimer/ui/treetable
by echatellier＠users.chorem.org 15 Mar '12

15 Mar '12

Author: echatellier Date: 2012-03-15 10:10:31 +0100 (Thu, 15 Mar 2012) New Revision: 2823 Url: http://chorem.org/repositories/revision/jtimer/2823 Log: Fix node removal before cache modification. Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java 2012-03-14 13:12:33 UTC (rev 2822) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java 2012-03-15 09:10:31 UTC (rev 2823) @@ -331,10 +331,10 @@ break; } case OPERATION_DELETE: { - subTasksCache.remove(pathLastComponent); // invalidate cache - subTasksCache.remove(taskUO); // no in cache anymore - taskNameCache.remove(taskUO); // no in cache anymore + // before cache invalidate (use index of himself) modelSupport.fireChildRemoved(path, childIndex, taskUO); + subTasksCache.get(pathLastComponent).remove(taskUO); // not in cache anymore + taskNameCache.remove(taskUO); // not in cache anymore break; } case OPERATION_MODIFY: {

1 0

r2822 - trunk/src/main/java/org/chorem/jtimer/ui/tasks
by echatellier＠users.chorem.org 14 Mar '12

14 Mar '12

Author: echatellier Date: 2012-03-14 14:12:33 +0100 (Wed, 14 Mar 2012) New Revision: 2822 Url: http://chorem.org/repositories/revision/jtimer/2822 Log: #484 : Exception sometime :( Caused by: java.lang.StackOverflowError Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java 2012-03-12 08:58:08 UTC (rev 2821) +++ trunk/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java 2012-03-14 13:12:33 UTC (rev 2822) @@ -123,7 +123,6 @@ // don't make reference on other parent // windows, cause idle to unlock some task // if parent window is hidden by systray - super(); // init resources map this.application = application; @@ -131,7 +130,12 @@ ResourceManager mgr = ctxt.getResourceManager(); resourceMap = mgr.getResourceMap(IdleDialog.class); - setName("idleFrame"); + // remove dialog name to this dialog, due to bug + // http://chorem.org/issues/484 and + // http://kenai.com/jira/browse/BSAF-107 + // cause infinite loop under openjdk + setName(null); // force nameExplicitlySet to true + setTitle(resourceMap.getString("idleTitle")); setResizable(false); setModal(true);

1 0

r2821 - trunk/src/main/assembly
by echatellier＠users.chorem.org 12 Mar '12

12 Mar '12

Author: echatellier Date: 2012-03-12 09:58:08 +0100 (Mon, 12 Mar 2012) New Revision: 2821 Url: http://chorem.org/repositories/revision/jtimer/2821 Log: Don't include project artifact twice (change from assembly plugin 2.2+) Modified: trunk/src/main/assembly/bin.xml Modified: trunk/src/main/assembly/bin.xml =================================================================== --- trunk/src/main/assembly/bin.xml 2012-03-09 17:47:06 UTC (rev 2820) +++ trunk/src/main/assembly/bin.xml 2012-03-12 08:58:08 UTC (rev 2821) @@ -34,6 +34,7 @@ <dependencySet> <outputDirectory>lib</outputDirectory> <scope>runtime</scope> + <useProjectArtifact>false</useProjectArtifact> </dependencySet> </dependencySets> <files>

1 0

r2820 - trunk/src/test/java/org/chorem/jtimer/entities
by echatellier＠users.chorem.org 09 Mar '12

09 Mar '12

Author: echatellier Date: 2012-03-09 18:47:06 +0100 (Fri, 09 Mar 2012) New Revision: 2820 Url: http://chorem.org/repositories/revision/jtimer/2820 Log: Remove failing tests (now equality only works with uuid) Modified: trunk/src/test/java/org/chorem/jtimer/entities/TimerProjectTest.java trunk/src/test/java/org/chorem/jtimer/entities/TimerTaskTest.java Modified: trunk/src/test/java/org/chorem/jtimer/entities/TimerProjectTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/entities/TimerProjectTest.java 2012-03-09 17:46:41 UTC (rev 2819) +++ trunk/src/test/java/org/chorem/jtimer/entities/TimerProjectTest.java 2012-03-09 17:47:06 UTC (rev 2820) @@ -80,22 +80,4 @@ Assert.assertEquals("name1", project2.getName()); Assert.assertEquals(project, project2); } - - /** - * Test project clone(). - * - * Test que une fois le clone modifier, - * les objets ne sont plus egaux. - */ - @Test - public void testClone2() { - - TimerProject project = new TimerProject(); - project.setName("name1"); - - TimerProject project2 = project.clone(); - project.setName("name2"); - - Assert.assertFalse(project.equals(project2)); - } } Modified: trunk/src/test/java/org/chorem/jtimer/entities/TimerTaskTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/entities/TimerTaskTest.java 2012-03-09 17:46:41 UTC (rev 2819) +++ trunk/src/test/java/org/chorem/jtimer/entities/TimerTaskTest.java 2012-03-09 17:47:06 UTC (rev 2820) @@ -60,45 +60,6 @@ * Test task clone(); */ @Test - public void testClone() { - - TimerTask task = new TimerTask(); - task.setName("test"); - - TimerTask clonedTask = task.clone(); - Assert.assertEquals("test", clonedTask.getName()); - - clonedTask.setName("name2"); - Assert.assertFalse(clonedTask.equals(task)); - } - - /** - * Test task clone(); - */ - @Test - public void testClone3() { - - Calendar now = Calendar.getInstance(); - - TimerTask task = new TimerTask(); - task.setName("test"); - task.setCreationDate(new Date()); - task.setClosed(true); - task.setTime(now.getTime(), 10l); - task.addAnnotation(now.getTime(), "blah"); - - TimerTask clonedTask = task.clone(); - Assert.assertEquals(clonedTask, task); - - now.add(Calendar.DAY_OF_YEAR, 1); - clonedTask.addAnnotation(now.getTime(), "blah2"); - Assert.assertFalse(clonedTask.equals(task)); - } - - /** - * Test task clone(); - */ - @Test public void testCloneDailyMap() { TimerTask task = new TimerTask();

1 0

r2819 - trunk/src/main/resources/ftl
by echatellier＠users.chorem.org 09 Mar '12

09 Mar '12

Author: echatellier Date: 2012-03-09 18:46:41 +0100 (Fri, 09 Mar 2012) New Revision: 2819 Url: http://chorem.org/repositories/revision/jtimer/2819 Log: Fix report format (too much blank line a top of report) Modified: trunk/src/main/resources/ftl/reportByProject.ftl trunk/src/main/resources/ftl/reportByProject_fr.ftl Modified: trunk/src/main/resources/ftl/reportByProject.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByProject.ftl 2012-03-09 17:20:13 UTC (rev 2818) +++ trunk/src/main/resources/ftl/reportByProject.ftl 2012-03-09 17:46:41 UTC (rev 2819) @@ -25,7 +25,6 @@ Report by project ================= -<#assign periods=utils.getDailyDates(begin?date,end?date)/> <#macro displaySubtaskReport task identation=0> <#local ident=identation + 1/> <#list utils.getSubTaskOrdered(task) as subtask> @@ -54,6 +53,7 @@ </#list> </#macro> +<#assign periods=utils.getDailyDates(begin?date,end?date)/> <#list projects as project> <#assign periodTotalTime=0/> <#list periods as period> Modified: trunk/src/main/resources/ftl/reportByProject_fr.ftl =================================================================== --- trunk/src/main/resources/ftl/reportByProject_fr.ftl 2012-03-09 17:20:13 UTC (rev 2818) +++ trunk/src/main/resources/ftl/reportByProject_fr.ftl 2012-03-09 17:46:41 UTC (rev 2819) @@ -25,7 +25,6 @@ Rapport par projet ================== -<#assign periods=utils.getDailyDates(begin?date,end?date)/> <#macro displaySubtaskReport task identation=0> <#local ident=identation + 1/> <#list utils.getSubTaskOrdered(task) as subtask> @@ -54,6 +53,7 @@ </#list> </#macro> +<#assign periods=utils.getDailyDates(begin?date,end?date)/> <#list projects as project> <#assign periodTotalTime=0/> <#list periods as period>

1 0

r2818 - trunk/src/main/java/org/chorem/jtimer/entities
by echatellier＠users.chorem.org 09 Mar '12

09 Mar '12

Author: echatellier Date: 2012-03-09 18:20:13 +0100 (Fri, 09 Mar 2012) New Revision: 2818 Url: http://chorem.org/repositories/revision/jtimer/2818 Log: Remove unused deprecated method Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java 2012-03-09 17:18:53 UTC (rev 2817) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java 2012-03-09 17:20:13 UTC (rev 2818) @@ -73,18 +73,6 @@ }; /** - * Get task's subtasks ordered alphabetically. - * - * @param task task - * @return the subTasks ordered - * @deprecated since 1.4.0 use {@link #sortTask(task.getSubTasks())} - */ - public static List<TimerTask> getSubTasksOrderedByName(TimerTask task) { - List<TimerTask> taksToSort = task.getSubTasks(); - return sortTask(taksToSort); - } - - /** * Get tasks ordered alphabetically. * * @param tasks tasks

1 0

r2817 - in trunk: . src/main/java/org/chorem/jtimer/ui/report src/main/resources/org/chorem/jtimer/ui/report/resources
by echatellier＠users.chorem.org 09 Mar '12

09 Mar '12

Author: echatellier Date: 2012-03-09 18:18:53 +0100 (Fri, 09 Mar 2012) New Revision: 2817 Url: http://chorem.org/repositories/revision/jtimer/2817 Log: Add current week and previous week buttons Added: trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/date_current.png trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/date_previous.png Modified: trunk/README.txt trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java 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 Modified: trunk/README.txt =================================================================== --- trunk/README.txt 2012-03-09 15:31:15 UTC (rev 2816) +++ trunk/README.txt 2012-03-09 17:18:53 UTC (rev 2817) @@ -24,3 +24,12 @@ jtimer (linux) jtimer.exe (windows) + + +Credits +------- + +Images "src/main/resources/org/chorem/jtimer/ui/report/resources/date_current.png" +and "src/main/resources/org/chorem/jtimer/ui/report/resources/date_previous.png" +are licensed under Creative Commons Attribution (by) and available at: +http://www.famfamfam.com/ Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java 2012-03-09 15:31:15 UTC (rev 2816) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java 2012-03-09 17:18:53 UTC (rev 2817) @@ -123,9 +123,6 @@ /** Report output */ protected JTextArea reportArea; - /** Send by mail button */ - protected JButton sendMailButton; - /** Can send mail property. */ protected boolean canSendMail; @@ -167,29 +164,6 @@ JPanel mainComponent = new JPanel(new GridBagLayout()); - // init dates - Calendar calendarBegin = Calendar.getInstance(); - int firstDayOfWeek = JTimer.config.getReportFirstDayOfWeek(); - if (firstDayOfWeek < 0 || firstDayOfWeek > 6) { - firstDayOfWeek = calendarBegin.getFirstDayOfWeek(); - } - calendarBegin.set(Calendar.DAY_OF_WEEK, firstDayOfWeek); - calendarBegin.set(Calendar.HOUR, 0); - calendarBegin.set(Calendar.MINUTE, 0); - calendarBegin.set(Calendar.SECOND, 0); - calendarBegin.set(Calendar.MILLISECOND, 0); - - // calendar must be in current week by default - if (calendarBegin.getTime().after(new Date())) { - calendarBegin.add(Calendar.WEEK_OF_YEAR, -1); - } - - // get end of week - // take calendarBegin and add a week time - Calendar calendarEnd = (Calendar) calendarBegin.clone(); - calendarEnd.add(Calendar.WEEK_OF_YEAR, 1); - calendarEnd.add(Calendar.DAY_OF_YEAR, -1); // take the day before - // panel for options JPanel panelOption = new JPanel(new GridBagLayout()); panelOption.setBorder(BorderFactory.createTitledBorder(getResourceMap() @@ -202,9 +176,8 @@ new Insets(1, 1, 1, 1), 0, 0)); datePickerFrom = new JXDatePicker(); datePickerFrom.getMonthView().setDayForeground(Calendar.SUNDAY, Color.RED); - datePickerFrom.setDate(calendarBegin.getTime()); datePickerFrom.setFormats(DateFormat.getDateInstance(DateFormat.FULL)); - panelOption.add(datePickerFrom, new GridBagConstraints(1, 0, 3, 1, 1, + panelOption.add(datePickerFrom, new GridBagConstraints(1, 0, 2, 1, 1, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); @@ -215,13 +188,29 @@ new Insets(1, 1, 1, 1), 0, 0)); datePickerTo = new JXDatePicker(); datePickerTo.getMonthView().setDayForeground(Calendar.SUNDAY, Color.RED); - datePickerTo.setDate(calendarEnd.getTime()); datePickerTo.setFormats(DateFormat.getDateInstance(DateFormat.FULL)); - panelOption.add(datePickerTo, new GridBagConstraints(1, 1, 3, 1, 0, 0, + panelOption.add(datePickerTo, new GridBagConstraints(1, 1, 2, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); - // Option for period regroupment + // 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)); + 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)); + + // Option for period grouping radioByDay = new JRadioButton( getResourceMap().getString("reportDaily"), true); radioByMonth = new JRadioButton(getResourceMap().getString( @@ -246,13 +235,13 @@ 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, 1, 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, 1, 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, 1, + panelOption.add(radioByProject, new GridBagConstraints(0, 4, 4, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); @@ -260,7 +249,7 @@ checkIncludesAnnotations = new JCheckBox(getResourceMap().getString( "reportAnnotations")); panelOption.add(checkIncludesAnnotations, new GridBagConstraints(0, 5, - 4, 1, 1, 0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, + 4, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); // panel form projects @@ -313,7 +302,7 @@ 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); - sendMailButton = new JButton(); + JButton sendMailButton = new JButton(); sendMailButton.setAction(getContext().getActionMap(this) .get("sendMail")); mainComponent.add(sendMailButton, new GridBagConstraints(1, 2, 1, 1, 1, @@ -334,6 +323,60 @@ } /** + * Select current week in date pickers. + */ + @Action + public void currentWeek() { + fillPickerDates(0); + } + + /** + * Display previous week in date pickers. + */ + @Action + public void previousWeek() { + fillPickerDates(-1); + } + + /** + * Fill picker date with predefined week selection (from current) + * and apply a delay (-1 = previous week). + * + * @param delay delay to add to current week + */ + protected void fillPickerDates(int delay) { + // init dates + Calendar calendarBegin = Calendar.getInstance(); + int firstDayOfWeek = JTimer.config.getReportFirstDayOfWeek(); + if (firstDayOfWeek < 0 || firstDayOfWeek > 6) { + firstDayOfWeek = calendarBegin.getFirstDayOfWeek(); + } + calendarBegin.set(Calendar.DAY_OF_WEEK, firstDayOfWeek); + calendarBegin.set(Calendar.HOUR, 0); + calendarBegin.set(Calendar.MINUTE, 0); + calendarBegin.set(Calendar.SECOND, 0); + calendarBegin.set(Calendar.MILLISECOND, 0); + + // calendar must be in current week by default + if (calendarBegin.getTime().after(new Date())) { + calendarBegin.add(Calendar.WEEK_OF_YEAR, -1); + } + + // get end of week + // take calendarBegin and add a week time + Calendar calendarEnd = (Calendar) calendarBegin.clone(); + calendarEnd.add(Calendar.WEEK_OF_YEAR, 1); + calendarEnd.add(Calendar.DAY_OF_YEAR, -1); // take the day before + + // apply delai + calendarBegin.add(Calendar.WEEK_OF_YEAR, delay); + calendarEnd.add(Calendar.WEEK_OF_YEAR, delay); + + datePickerFrom.setDate(calendarBegin.getTime()); + datePickerTo.setDate(calendarEnd.getTime()); + } + + /** * Close action. */ @Action 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 2012-03-09 15:31:15 UTC (rev 2816) +++ trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties 2012-03-09 17:18:53 UTC (rev 2817) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2011 CodeLutin, Chatellier Eric +# Copyright (C) 2007 - 2012 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 @@ -37,6 +37,12 @@ reportContent=Report reportProjectsList=Projects list +currentWeek.Action.icon = date_current.png +currentWeek.Action.shortDescription = Current week + +previousWeek.Action.icon = date_previous.png +previousWeek.Action.shortDescription = Previous week + showHiddenProjects.Action.text = Show hidden projects showHiddenProjects.Action.shortDescription = Show hidden projects 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 2012-03-09 15:31:15 UTC (rev 2816) +++ trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties 2012-03-09 17:18:53 UTC (rev 2817) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2007 - 2011 CodeLutin, Chatellier Eric +# Copyright (C) 2007 - 2012 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 @@ -37,6 +37,10 @@ reportContent=Rapport reportProjectsList=Liste des projets +currentWeek.Action.shortDescription = Semaine courante + +previousWeek.Action.shortDescription = Semaine pr\u00E9c\u00E9dente + showHiddenProjects.Action.text = Afficher les cach\u00E9s showHiddenProjects.Action.shortDescription = Afficher les cach\u00E9s Added: trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/date_current.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/date_current.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/date_previous.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/date_previous.png ___________________________________________________________________ Added: svn:mime-type + image/png

1 0

r2816 - in trunk/src/main/java/org/chorem/jtimer: . ui/report
by echatellier＠users.chorem.org 09 Mar '12

09 Mar '12

Author: echatellier Date: 2012-03-09 16:31:15 +0100 (Fri, 09 Mar 2012) New Revision: 2816 Url: http://chorem.org/repositories/revision/jtimer/2816 Log: #281 : Ability to save report options Modified: trunk/src/main/java/org/chorem/jtimer/JTimerConfig.java trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java Modified: trunk/src/main/java/org/chorem/jtimer/JTimerConfig.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/JTimerConfig.java 2012-03-09 15:03:30 UTC (rev 2815) +++ trunk/src/main/java/org/chorem/jtimer/JTimerConfig.java 2012-03-09 15:31:15 UTC (rev 2816) @@ -85,7 +85,7 @@ public Class getIOSaverClass() { return appConfig.getOptionAsClass(JTimerOption.IO_SAVER_CLASS.key); } - + public String getIOSaverDirectory() { return appConfig.getOption(JTimerOption.IO_SAVER_DIRECTORY.key); } @@ -108,6 +108,16 @@ return appConfig.getOptionAsLong(JTimerOption.UI_IDLE_TIME.key); } + /** + * Return first day of week. + * Default to {@code -1} (no preference). + * + * @return first day of week in report + */ + public int getReportFirstDayOfWeek() { + return appConfig.getOptionAsInt(JTimerOption.UI_REPORT_FIRSTDAYOFWEEK.key); + } + public enum JTimerOption { CONFIG_FILENAME(ApplicationConfig.CONFIG_FILE_NAME, "jtimer.properties"), SERVICE_CLASS("jtimer.service.class", null), @@ -116,7 +126,8 @@ IO_SAVER_CLASS("jtimer.io.saver.class", "org.chorem.jtimer.io.GTimerIncrementalSaver"), IO_SAVER_DIRECTORY("jtimer.io.saver.directory", "${user.home}/.gtimer"), IO_SAVER_AUTOSAVEDELAY("jtimer.io.saver.autosavedelay", "300"), - UI_IDLE_TIME("jtimer.ui.idletime", "300"); + UI_IDLE_TIME("jtimer.ui.idletime", "300"), + UI_REPORT_FIRSTDAYOFWEEK("jtimer.ui.report.firstdayofweek", "-1"); protected String key; Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java 2012-03-09 15:03:30 UTC (rev 2815) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java 2012-03-09 15:31:15 UTC (rev 2816) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2011 CodeLutin, Chatellier Eric + * Copyright (C) 2008 - 2012 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 @@ -40,6 +40,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Collection; +import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -60,6 +61,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.jtimer.JTimer; import org.chorem.jtimer.data.TimerCore; import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; @@ -159,7 +161,7 @@ * Get main view component. * * TODO use less complicated UI (no gbl) - * @return + * @return main component */ protected JComponent getMainComponent() { @@ -167,13 +169,21 @@ // init dates Calendar calendarBegin = Calendar.getInstance(); - calendarBegin.set(Calendar.DAY_OF_WEEK, calendarBegin - .getFirstDayOfWeek()); + int firstDayOfWeek = JTimer.config.getReportFirstDayOfWeek(); + if (firstDayOfWeek < 0 || firstDayOfWeek > 6) { + firstDayOfWeek = calendarBegin.getFirstDayOfWeek(); + } + calendarBegin.set(Calendar.DAY_OF_WEEK, firstDayOfWeek); calendarBegin.set(Calendar.HOUR, 0); calendarBegin.set(Calendar.MINUTE, 0); calendarBegin.set(Calendar.SECOND, 0); calendarBegin.set(Calendar.MILLISECOND, 0); + // calendar must be in current week by default + if (calendarBegin.getTime().after(new Date())) { + calendarBegin.add(Calendar.WEEK_OF_YEAR, -1); + } + // get end of week // take calendarBegin and add a week time Calendar calendarEnd = (Calendar) calendarBegin.clone();

1 0

r2815 - in trunk/src/main: java/org/chorem/jtimer/ui/report resources/ftl
by echatellier＠users.chorem.org 09 Mar '12

09 Mar '12

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)/>

1 0