branch feature/sync updated (2d14fce -> 01169e7)
This is an automated email from the git hooks/post-receive script. New change to branch feature/sync in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git from 2d14fce date format in jtable display + width of cells new d463288 included subtask times in time sent. new 01169e7 in case of task merging with SyncInfo, added a warning message 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 01169e795192c5032402c195d7e451616a8f33f8 Author: servantie <servantie.c@gmail.com> Date: Wed Jul 20 15:16:55 2016 +0200 in case of task merging with SyncInfo, added a warning message Synchronization information of tasks merged will be lost, the task being merged into will retain its SyncInfo commit d4632884a733845e6cfb5d576a26f54bf4f8afe3 Author: servantie <servantie.c@gmail.com> Date: Wed Jul 20 14:48:11 2016 +0200 included subtask times in time sent. Summary of changes: src/main/java/org/chorem/jtimer/JTimer.java | 17 ++++++++++++++--- .../org/chorem/jtimer/entities/TimerTaskHelper.java | 4 +++- .../org/chorem/jtimer/io/GTimerIncrementalSaver.java | 5 +++-- .../jtimer/ui/report/TimerTaskSyncInfoEditor.java | 6 +----- .../org/chorem/jtimer/resources/JTimer.properties | 1 + .../org/chorem/jtimer/resources/JTimer_fr.properties | 2 ++ 6 files changed, 24 insertions(+), 11 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 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>.
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 01169e795192c5032402c195d7e451616a8f33f8 Author: servantie <servantie.c@gmail.com> Date: Wed Jul 20 15:16:55 2016 +0200 in case of task merging with SyncInfo, added a warning message Synchronization information of tasks merged will be lost, the task being merged into will retain its SyncInfo --- src/main/java/org/chorem/jtimer/JTimer.java | 17 ++++++++++++++--- .../org/chorem/jtimer/resources/JTimer.properties | 1 + .../org/chorem/jtimer/resources/JTimer_fr.properties | 2 ++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/JTimer.java b/src/main/java/org/chorem/jtimer/JTimer.java index eeae51d..5ca6508 100644 --- a/src/main/java/org/chorem/jtimer/JTimer.java +++ b/src/main/java/org/chorem/jtimer/JTimer.java @@ -1053,9 +1053,20 @@ public class JTimer extends SingleFrameApplication implements TimerTask destinationTask = tasks.get(0); List<TimerTask> otherTasks = tasks.subList(1, tasks.size()); - int confirm = JOptionPane.showConfirmDialog(getMainFrame(), - resourceMap.getString("input.mergeTaskMessage", tasks.size(), - destinationTask.getName()), resourceMap + //check for syncInfos, if there are some in the tasks being merged, warn with a message + String mergeMessage = resourceMap.getString("input.mergeTaskMessage", tasks.size(), + destinationTask.getName()); + boolean syncInfoInMergedTasks = false; + for (TimerTask task : otherTasks) { + if (!task.getSynchronizingInfoList().isEmpty()) { + syncInfoInMergedTasks = true; + } + } + if (syncInfoInMergedTasks) { + mergeMessage = resourceMap.getString("input.mergeTaskWithSyncInfoMessage", tasks.size(), destinationTask.getName()); + } + int confirm = JOptionPane.showConfirmDialog(getMainFrame(), mergeMessage + , resourceMap .getString("input.mergeTaskTitle"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (confirm == JOptionPane.YES_OPTION) { diff --git a/src/main/resources/org/chorem/jtimer/resources/JTimer.properties b/src/main/resources/org/chorem/jtimer/resources/JTimer.properties index 4120155..e841b89 100644 --- a/src/main/resources/org/chorem/jtimer/resources/JTimer.properties +++ b/src/main/resources/org/chorem/jtimer/resources/JTimer.properties @@ -171,6 +171,7 @@ input.deleteTaskTitle=Confirm input.deleteTaskMessage=Do you want to delete task "%s" ? input.deleteTasksMessage=Do you want to delete the %d selected tasks ? input.mergeTaskMessage=Do you want to merge selected %d tasks\ninto "%s" ? +input.mergeTaskWithSyncInfoMessage = Do you want to merge selected %d tasks\ninto "%s" ? \nSynchronization Information will be lost ! input.mergeTaskTitle=Merge input.addAnnotationTitle=Add annotation input.addAnnotationMessage=Annotation for task "%s" : diff --git a/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties b/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties index b070bbf..0f3aa4b 100644 --- a/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties +++ b/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties @@ -135,6 +135,8 @@ input.deleteTaskTitle=Confirmation input.deleteTaskMessage=Voulez-vous supprimer la t\u00E2che "%s" ? input.deleteTasksMessage=Voulez-vous supprimer les %d t\u00E2ches s\u00E9lectionn\u00E9es ? input.mergeTaskMessage=Voulez-vous fusionner les %d t\u00E2ches s\u00E9lectionn\u00E9es\ndans la t\u00E2ches "%s" ? +input.mergeTaskWithSyncInfoMessage = Voulez-vous fusionner les %d t\u00E2ches s\u00E9lectionn\u00E9es\ndans la t\u00E2che "%s" ?\n Les informations de synchronisation seront perdues ! + input.mergeTaskTitle=Fusionner input.addAnnotationTitle=Ajouter une annotation input.addAnnotationMessage=Annotation pour la t\u00E2che "%s" : -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm