This is an automated email from the git hooks/post-receive script. New commit to branch feature/sync in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit d4632884a733845e6cfb5d576a26f54bf4f8afe3 Author: servantie <servantie.c@gmail.com> Date: Wed Jul 20 14:48:11 2016 +0200 included subtask times in time sent. --- src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java | 4 +++- src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java | 5 +++-- .../java/org/chorem/jtimer/ui/report/TimerTaskSyncInfoEditor.java | 6 +----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java index 2e01103..1aba7fc 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java @@ -410,7 +410,9 @@ public class TimerTaskHelper { JsonObject periodElement = new JsonObject(); periodElement.addProperty("id", dateString); periodElement.addProperty("startDate", dateString + timestamp); - periodElement.addProperty("duration", entry.getValue()/1000); + //TimerTaskHelper.getTotalTime(task, entry.getKey()) (pour avoir la durée des sous tâches inclues) + //entry.getValue() pour n'avoir que celle de la tache + periodElement.addProperty("duration", TimerTaskHelper.getTotalTime(task, entry.getKey())/1000); if (withAnnotations && !(getAnnotation(task, entry.getKey()).isEmpty())) { StringBuilder annotationBuilder = new StringBuilder(); for (String s : getAnnotation(task, entry.getKey())) { diff --git a/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java b/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java index 4b4abf9..3d602a9 100644 --- a/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java +++ b/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java @@ -1138,6 +1138,9 @@ public class GTimerIncrementalSaver extends AbstractSaver implements Saver, out.close(); deleteBackupFile(backupfile); + if (log.isDebugEnabled()) { + log.debug("Saving sync on task : " + task.getName()); + } } catch (IOException e) { if (log.isErrorEnabled()) { @@ -1384,7 +1387,6 @@ public class GTimerIncrementalSaver extends AbstractSaver implements Saver, // en cours d'execution if (!runningTasks.contains(task)) { saveTask(task); - saveSynchronizationInfo(task); } } @@ -1446,7 +1448,6 @@ public class GTimerIncrementalSaver extends AbstractSaver implements Saver, // remove task from running task and force save runningTasks.remove(task); saveTask(task); - saveSynchronizationInfo(task); } @Override diff --git a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskSyncInfoEditor.java b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskSyncInfoEditor.java index 96cb74c..0b37c35 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskSyncInfoEditor.java +++ b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskSyncInfoEditor.java @@ -29,12 +29,10 @@ import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.text.DateFormat; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.List; -import java.util.Locale; import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JOptionPane; @@ -120,7 +118,6 @@ public class TimerTaskSyncInfoEditor extends FrameView implements ActionListener JPanel urlPanel = new JPanel(); urlPanel.setLayout(new BorderLayout(5,5)); - urlJTable = new JTable(new SyncInfoTableModel()); //try to have coherent width of columns TableColumnModel tableColModel = urlJTable.getColumnModel(); @@ -131,8 +128,6 @@ public class TimerTaskSyncInfoEditor extends FrameView implements ActionListener //render the date properly tableColModel.getColumn(3).setCellRenderer(new DateRenderer()); - - //add the headers and the table urlPanel.add(urlJTable.getTableHeader(), BorderLayout.NORTH); urlPanel.add(urlJTable, BorderLayout.CENTER); @@ -417,6 +412,7 @@ public class TimerTaskSyncInfoEditor extends FrameView implements ActionListener infoBox(getResourceMap().getString("testSyncSuccessMessage"), getResourceMap().getString("testSyncSuccessTitle")); Calendar cal = Calendar.getInstance(); infoToUse.setLastSync(cal.getTime()); + core.getData().syncInfoChanged(task, infoToUse); } else { errorBox(getResourceMap().getString("testSyncFailureMessage"), getResourceMap().getString("testSyncFailureTitle")); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.