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

r2954 - in trunk: . src/main/java/org/chorem/jtimer/ui/report/tree src/main/java/org/chorem/jtimer/ui/treetable src/site
by tchemit＠users.chorem.org 11 Feb '14

11 Feb '14

Author: tchemit Date: 2014-02-12 00:20:29 +0100 (Wed, 12 Feb 2014) New Revision: 2954 Url: http://chorem.org/projects/jtimer/repository/revisions/2954 Log: fixes #984: updates nuiton-config to 3.0-alpha-2 fixes #985: updates commons-collections to 4.0 fixes #957: Updates mavenpom to 4.7 Modified: trunk/pom.xml trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-11 23:19:49 UTC (rev 2953) +++ trunk/pom.xml 2014-02-11 23:20:29 UTC (rev 2954) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>4.2</version> + <version>4.7</version> </parent> <groupId>org.chorem</groupId> @@ -63,11 +63,11 @@ </contributors> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</connection> + <connection>scm:svn:https://chorem.org/svn/jtimer/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/jtimer/trunk + scm:svn:https://chorem.org/svn/jtimer/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/jtimer/trunk</url> + <url>https://chorem.org/repositories/browse/jtimer/trunk</url> </scm> <distributionManagement> @@ -106,9 +106,6 @@  <jnlpFileName>jTimer.jnlp</jnlpFileName> -  - <webstartPluginVersion>1.0-beta-4</webstartPluginVersion> - </properties> <build> @@ -182,15 +179,16 @@ <libPath>lib</libPath> <makeArchive>false</makeArchive> - <verbose>false</verbose> +  <updateManifestEntries> <Application-Name>jTimer ${project.version}</Application-Name> - <Permissions>all-permissions</Permissions> + <Permissions>all-permissions</Permissions> <Codebase>*</Codebase> +  +  </updateManifestEntries> -  -  - <jnlp> + <outputJarVersions>false</outputJarVersions> + <jnlp> <mainClass>${maven.jar.main.class}</mainClass> <allPermissions>true</allPermissions> <offlineAllowed>true</offlineAllowed> @@ -253,7 +251,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.0-alpha-1</version> + <version>3.0-alpha-2</version> <scope>compile</scope> <exclusions> <exclusion> @@ -340,8 +338,8 @@  <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -445,6 +443,7 @@ </property> </activation> <build> + <defaultGoal>package</defaultGoal> <plugins>  <plugin> @@ -477,7 +476,7 @@ <id>generate-jnlp</id> <phase>package</phase> <goals> - <goal>jnlp-inline</goal> + <goal>jnlp-single</goal> </goals> </execution> </executions> Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java 2014-02-11 23:19:49 UTC (rev 2953) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java 2014-02-11 23:20:29 UTC (rev 2954) @@ -32,8 +32,8 @@ import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.Predicate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.jtimer.data.TimerCore; Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java 2014-02-11 23:19:49 UTC (rev 2953) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java 2014-02-11 23:20:29 UTC (rev 2954) @@ -36,8 +36,8 @@ import javax.swing.table.TableColumn; import javax.swing.tree.TreePath; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.Predicate; import org.apache.commons.lang3.time.DurationFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2014-02-11 23:19:49 UTC (rev 2953) +++ trunk/src/site/site_en.xml 2014-02-11 23:20:29 UTC (rev 2954) @@ -68,11 +68,11 @@ <head> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/mavenpom-site.js"> + src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/> + href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/> </head> <menu name="Users" inherit="top"> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2014-02-11 23:19:49 UTC (rev 2953) +++ trunk/src/site/site_fr.xml 2014-02-11 23:20:29 UTC (rev 2954) @@ -68,11 +68,11 @@ <head> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/mavenpom-site.js"> + src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/> + href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/> </head> <menu name="Utilisateurs" inherit="top">

1 0

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
by tchemit＠users.chorem.org 11 Feb '14

11 Feb '14

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

1 0

r2952 - in branches/ng-jtimer: . jtimer-server jtimer-server/src/main/go jtimer-server/src/main/webapp/css jtimer-server/src/main/webapp/js
by echatellier＠users.chorem.org 06 Feb '14

06 Feb '14

Author: echatellier Date: 2014-02-06 21:44:47 +0100 (Thu, 06 Feb 2014) New Revision: 2952 Url: http://chorem.org/projects/jtimer/repository/revisions/2952 Log: Update libs Modified: branches/ng-jtimer/ branches/ng-jtimer/jtimer-server/ branches/ng-jtimer/jtimer-server/pom.xml branches/ng-jtimer/jtimer-server/src/main/go/readme.txt branches/ng-jtimer/jtimer-server/src/main/webapp/css/ branches/ng-jtimer/jtimer-server/src/main/webapp/js/ branches/ng-jtimer/pom.xml Property changes on: branches/ng-jtimer ___________________________________________________________________ Added: svn:ignore + .settings target .project Property changes on: branches/ng-jtimer/jtimer-server ___________________________________________________________________ Modified: svn:ignore - .settings .classpath .project + .settings .classpath .project target Modified: branches/ng-jtimer/jtimer-server/pom.xml =================================================================== --- branches/ng-jtimer/jtimer-server/pom.xml 2013-11-10 09:33:13 UTC (rev 2951) +++ branches/ng-jtimer/jtimer-server/pom.xml 2014-02-06 20:44:47 UTC (rev 2952) @@ -30,17 +30,17 @@ <dependency> <groupId>org.restlet.jee</groupId> <artifactId>org.restlet</artifactId> - <version>2.2-M5</version> + <version>2.2-M6</version> </dependency> <dependency> <groupId>org.restlet.jee</groupId> <artifactId>org.restlet.ext.servlet</artifactId> - <version>2.2-M5</version> + <version>2.2-M6</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-runner</artifactId> - <version>9.0.5.v20130815</version> + <version>9.1.1.v20140108</version> <scope>provided</scope> </dependency> </dependencies> @@ -50,7 +50,7 @@ <plugin> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>9.0.5.v20130815</version> + <version>9.1.1.v20140108</version> </plugin> <plugin> <groupId>ro.isdc.wro4j</groupId> Modified: branches/ng-jtimer/jtimer-server/src/main/go/readme.txt =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/readme.txt 2013-11-10 09:33:13 UTC (rev 2951) +++ branches/ng-jtimer/jtimer-server/src/main/go/readme.txt 2014-02-06 20:44:47 UTC (rev 2952) @@ -1,6 +1,8 @@ Compilation do client go ======================== +export GOPATH=$HOME/gocode + Packages necessaires -------------------- go get github.com/BurntSushi/xgb/screensaver Property changes on: branches/ng-jtimer/jtimer-server/src/main/webapp/css ___________________________________________________________________ Added: svn:ignore + jtimer.css Property changes on: branches/ng-jtimer/jtimer-server/src/main/webapp/js ___________________________________________________________________ Added: svn:ignore + jtimer.js Modified: branches/ng-jtimer/pom.xml =================================================================== --- branches/ng-jtimer/pom.xml 2013-11-10 09:33:13 UTC (rev 2951) +++ branches/ng-jtimer/pom.xml 2014-02-06 20:44:47 UTC (rev 2952) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.13</version> + <version>4.7</version> </parent> <groupId>org.chorem</groupId> @@ -43,22 +43,22 @@ <plugin> <groupId>ro.isdc.wro4j</groupId> <artifactId>wro4j-maven-plugin</artifactId> - <version>1.7.0</version> + <version>1.7.3</version> <dependencies> <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-wro</artifactId> - <version>1.0.1</version> + <version>1.0.2</version> </dependency> <dependency> <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-angular</artifactId> - <version>1.2.0-rc2-1</version> + <artifactId>nuiton-js-angularjs</artifactId> + <version>1.2.11-1</version> </dependency> <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-jquery</artifactId> - <version>2.0.3-1</version> + <version>2.1.0-1</version> </dependency> <dependency> <groupId>org.nuiton.js</groupId> @@ -78,7 +78,7 @@ <dependency> <groupId>ro.isdc.wro4j</groupId> <artifactId>wro4j-extensions</artifactId> - <version>1.7.0</version> + <version>1.7.3</version> </dependency> </dependencies> </plugin> @@ -91,7 +91,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.173</version> + <version>1.3.175</version> </dependency> </dependencies> </dependencyManagement>

1 0

r2951 - trunk
by tchemit＠users.chorem.org 10 Nov '13

10 Nov '13

Author: tchemit Date: 2013-11-10 10:33:13 +0100 (Sun, 10 Nov 2013) New Revision: 2951 Url: http://chorem.org/projects/jtimer/repository/revisions/2951 Log: fixes #958: Updates jna to 4.0.0 fixes #959: Updates freemarker to 2.3.20 fixes #960: Updates testng to 6.8.7 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-11-10 08:47:29 UTC (rev 2950) +++ trunk/pom.xml 2013-11-10 09:33:13 UTC (rev 2951) @@ -92,6 +92,7 @@ <locales>fr,en</locales> <xmrpcVersion>3.1.3</xmrpcVersion> + <jnaVersion>4.0.0</jnaVersion>  <redmine.releaseFiles> @@ -298,13 +299,13 @@ <dependency> <groupId>net.java.dev.jna</groupId> <artifactId>jna</artifactId> - <version>3.5.2</version> + <version>${jnaVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>net.java.dev.jna</groupId> - <artifactId>platform</artifactId> - <version>3.5.2</version> + <artifactId>jna-platform</artifactId> + <version>${jnaVersion}</version> <scope>compile</scope> </dependency> <dependency> @@ -315,7 +316,7 @@ <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <version>2.3.19</version> + <version>2.3.20</version> </dependency> <dependency> <groupId>org.apache.xmlrpc</groupId> @@ -365,7 +366,7 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>6.8.5</version> + <version>6.8.7</version> <scope>test</scope> <exclusions> <exclusion>

1 0

r2950 - trunk
by tchemit＠users.chorem.org 10 Nov '13

10 Nov '13

Author: tchemit Date: 2013-11-10 09:47:29 +0100 (Sun, 10 Nov 2013) New Revision: 2950 Url: http://chorem.org/projects/jtimer/repository/revisions/2950 Log: fixes #957: Updates to mavenpom 4.2 fixes #956: Make webstart starts more friendly Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-27 06:08:08 UTC (rev 2949) +++ trunk/pom.xml 2013-11-10 08:47:29 UTC (rev 2950) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>4.1</version> + <version>4.2</version> </parent> <groupId>org.chorem</groupId> @@ -92,11 +92,11 @@ <locales>fr,en</locales> <xmrpcVersion>3.1.3</xmrpcVersion> - +  <redmine.releaseFiles> target/${project.artifactId}-${project.version}-bin.zip, - target/${project.artifactId}-${project.version}-src.zip, + target/${project.artifactId}-${project.version}-src.zip </redmine.releaseFiles>  @@ -105,6 +105,9 @@  <jnlpFileName>jTimer.jnlp</jnlpFileName> +  + <webstartPluginVersion>1.0-beta-4</webstartPluginVersion> + </properties> <build> @@ -145,7 +148,7 @@ </executions> </plugin> </plugins> - + <pluginManagement> <plugins> <plugin> @@ -157,11 +160,6 @@ <mainClass>${maven.jar.main.class}</mainClass> <classpathPrefix>lib/</classpathPrefix> </manifest> -  - <manifestEntries> - <Trusted-Only>true</Trusted-Only> -  - </manifestEntries> </archive> </configuration> </plugin> @@ -184,8 +182,14 @@ <libPath>lib</libPath> <makeArchive>false</makeArchive> <verbose>false</verbose> - <canUnsign>false</canUnsign> - <jnlp> + <updateManifestEntries> + <Application-Name>jTimer ${project.version}</Application-Name> + <Permissions>all-permissions</Permissions> + <Codebase>*</Codebase> + </updateManifestEntries> +  +  + <jnlp> <mainClass>${maven.jar.main.class}</mainClass> <allPermissions>true</allPermissions> <offlineAllowed>true</offlineAllowed> @@ -203,10 +207,11 @@ </keystoreConfig> </sign> <gzip>true</gzip> - <unsign>false</unsign> - <canUnsign>false</canUnsign> -  - <pack200>true</pack200> + <unsign>true</unsign> + <canUnsign>true</canUnsign> + <pack200> + <enabled>true</enabled> + </pack200> </configuration> </plugin> </plugins>

1 0

r2949 - trunk
by tchemit＠users.chorem.org 27 Sep '13

27 Sep '13

Author: tchemit Date: 2013-09-27 08:08:08 +0200 (Fri, 27 Sep 2013) New Revision: 2949 Url: http://chorem.org/projects/jtimer/repository/revisions/2949 Log: fix jnlp config Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-27 05:49:55 UTC (rev 2948) +++ trunk/pom.xml 2013-09-27 06:08:08 UTC (rev 2949) @@ -160,7 +160,7 @@  <manifestEntries> <Trusted-Only>true</Trusted-Only> - <Trusted-Library>true</Trusted-Library> +  </manifestEntries> </archive> </configuration>

1 0

[ANN] - jTimer 1.4.3 released
by chorem.org Release Notification 27 Sep '13

27 Sep '13

The jTimer team is pleased to announce the jtimer-1.4.3 release! jTimer - Time tracking tool. Documentation of the project can be found here: http://maven-site.chorem.org/jtimer Changes ------- Changes in this version include: New features: o Improve the task editor Issue: 950. Thanks to Tony Chemit. Resolved by tchemit. o Keyboard navigation Issue: 528. Resolved by tchemit. o Add more shortcuts Issue: 945. Thanks to Tony Chemit. Resolved by tchemit. o Add shortcuts to navigate (expand/collapse) in the task's tree Issue: 948. Thanks to Tony Chemit. Resolved by tchemit. o Add jnlp deployement mode Issue: 953. Thanks to Tony Chemit. Resolved by tchemit. o Permettre l'utilisation du clavier dans l'arbre de navigation des projets Issue: 107. Thanks to Tony Chemit. Resolved by echatellier. Changes: o Updates mavenpom to 4.1 Issue: 946. Thanks to Tony Chemit. Resolved by tchemit. o Migrates to nuiton-config Issue: 947. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: http://chorem.org/projects/jtimer/files * jtimer-1.4.3-bin.zip - http://chorem.org/attachments/download/146 * jtimer-1.4.3-src.zip - http://chorem.org/attachments/download/147 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -jTimer team

1 0

r2948 - trunk
by maven-release＠users.chorem.org 27 Sep '13

27 Sep '13

Author: maven-release Date: 2013-09-27 07:49:55 +0200 (Fri, 27 Sep 2013) New Revision: 2948 Url: http://chorem.org/projects/jtimer/repository/revisions/2948 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-27 05:49:53 UTC (rev 2947) +++ trunk/pom.xml 2013-09-27 05:49:55 UTC (rev 2948) @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.4.3</version> + <version>1.4.4-SNAPSHOT</version> <name>jTimer</name> <description> @@ -63,11 +63,11 @@ </contributors> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.4.3</connection> + <connection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.4.3 + scm:svn:http://svn.chorem.org/svn/jtimer/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/jtimer/tags/jtimer-1.4.3</url> + <url>http://www.chorem.org/repositories/browse/jtimer/trunk</url> </scm> <distributionManagement>

1 0

r2947 - in tags: . jtimer-1.4.3
by maven-release＠users.chorem.org 27 Sep '13

27 Sep '13

Author: maven-release Date: 2013-09-27 07:49:53 +0200 (Fri, 27 Sep 2013) New Revision: 2947 Url: http://chorem.org/projects/jtimer/repository/revisions/2947 Log: [maven-release-plugin] copy for tag jtimer-1.4.3 Added: tags/jtimer-1.4.3/ Property changes on: tags/jtimer-1.4.3 ___________________________________________________________________ Added: svn:ignore + target .settings .project .classpath *.properties *testng*.xml .idea *.ipr *.iws *.iml *.log Added: svn:mergeinfo + /branches/1.4.0-ttalgo:2840-2847

1 0

r2946 - trunk
by maven-release＠users.chorem.org 27 Sep '13

27 Sep '13

Author: maven-release Date: 2013-09-27 07:49:51 +0200 (Fri, 27 Sep 2013) New Revision: 2946 Url: http://chorem.org/projects/jtimer/repository/revisions/2946 Log: [maven-release-plugin] prepare release jtimer-1.4.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-27 05:48:51 UTC (rev 2945) +++ trunk/pom.xml 2013-09-27 05:49:51 UTC (rev 2946) @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.4.3-SNAPSHOT</version> + <version>1.4.3</version> <name>jTimer</name> <description> @@ -63,11 +63,11 @@ </contributors> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.4.3</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/jtimer/trunk + scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.4.3 </developerConnection> - <url>http://www.chorem.org/repositories/browse/jtimer/trunk</url> + <url>http://www.chorem.org/repositories/browse/jtimer/tags/jtimer-1.4.3</url> </scm> <distributionManagement>

1 0