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

11/75: removed a useless comment
by chorem.org scm 07 Jul '16

07 Jul '16

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 62133e8f2ca86866586c7e6c260b6d5ccd2dc54e Author: servantie <servantie.c(a)gmail.com> Date: Fri May 20 17:47:10 2016 +0200 removed a useless comment --- src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java index 078f67f..606b5e8 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java +++ b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java @@ -456,7 +456,6 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener } } } - //if all has gone well, update SyncTime (todo:save information) if (hasUpdated) { core.getData().editTaskLastSync(task, LocalDateTime.now()); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

10/75: added an error message if the update isn't done, asking to check for url
by chorem.org scm 07 Jul '16

07 Jul '16

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 3cbcd20b9aca4e243d190e0bf46c287ed6d885ac Author: servantie <servantie.c(a)gmail.com> Date: Fri May 20 11:41:53 2016 +0200 added an error message if the update isn't done, asking to check for url --- .../chorem/jtimer/ui/report/TimerTaskUpdaterView.java | 19 +++++++++++++++++++ .../report/resources/TimerTaskUpdaterView.properties | 6 ++++++ .../resources/TimerTaskUpdaterView_fr.properties | 6 ++++++ 3 files changed, 31 insertions(+) diff --git a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java index 4b72b27..078f67f 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java +++ b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java @@ -22,6 +22,7 @@ */ package org.chorem.jtimer.ui.report; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.jtimer.JTimer; @@ -174,6 +175,16 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener panelOption.add(checkIncludesAnnotations, new GridBagConstraints(1, 1, 1, 1, 0, 0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); + JLabel lastUpdateLabel = new JLabel(getResourceMap().getString("lastUpdateLabel")); + //if there has been an update before, display its date + LocalDateTime lastSyncTime = task.getLastSync(); + if (lastSyncTime != null) { + JLabel lastUpdate = new JLabel(lastSyncTime.toLocalDate().toString()); + panelOption.add(lastUpdateLabel, new GridBagConstraints(1, 2, 1, 1, 0, 0, + GridBagConstraints.WEST, GridBagConstraints.VERTICAL, new Insets(2, 1, 1, 1), 0, 0)); + panelOption.add(lastUpdate, new GridBagConstraints(2, 2, 1, 1, 0, 0, + GridBagConstraints.WEST, GridBagConstraints.VERTICAL, new Insets(1, 2, 1, 1), 0, 0)); + } configComponent.add(panelGeneral); @@ -449,6 +460,14 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener if (hasUpdated) { core.getData().editTaskLastSync(task, LocalDateTime.now()); } + else { + log.error("Update error, wrong URL?"); + String message = getResourceMap().getString("action.updateError"); + String title = getResourceMap().getString("action.updateErrorTitle"); + JOptionPane.showMessageDialog(this.getMainComponent(), message, title, + JOptionPane.ERROR_MESSAGE); + + } } @Override diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties index 8268439..9546d72 100644 --- a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties +++ b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties @@ -25,6 +25,9 @@ updateOptions=Options updateFrom=From : updateTo=To : +lastUpdateLabel=Last Sync at: + + pickCurrentMonth.Action.text = Select current month pickCurrentMonth.Action.shortDescription = Select current month @@ -51,3 +54,6 @@ sendUpdate.Action.shortDescription = Send update closeView.Action.text = &Close closeView.Action.icon = dialog-close.png closeView.Action.shortDescription = Close + +action.updateError = Update failed, check URL ? +action.updateErrorTitle = Update error diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties index 3f3eacc..d5c7b71 100644 --- a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties +++ b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties @@ -26,6 +26,9 @@ updateOptions=Options updateFrom=De : updateTo=\u00C0 : +lastUpdateLabel=Derni\u00E8re mise \u00E0 jour : + + pickCurrentMonth.Action.text = Selectionner le mois courant pickCurrentMonth.Action.shortDescription = Selectionner le mois courant @@ -51,3 +54,6 @@ sendUpdate.Action.shortDescription = Envoyer la mise \u00C0 jour closeView.Action.text = &Fermer closeView.Action.icon = dialog-close.png closeView.Action.shortDescription = Fermer + +action.updateError = Erreur de mise \u00E0 jour, v\u00E9rifier l'URL ? +action.updateErrorTitle = Erreur de mise \u00E0 jour \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

09/75: saving synchronisation time when update successful
by chorem.org scm 07 Jul '16

07 Jul '16

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 8793f5b2a95f894b72cc606e79aaacaeb12e6c82 Author: servantie <servantie.c(a)gmail.com> Date: Fri May 20 09:48:12 2016 +0200 saving synchronisation time when update successful --- .../java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java index 0c264a5..4b72b27 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java +++ b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java @@ -38,14 +38,12 @@ import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import java.awt.*; import java.io.IOException; -import java.io.InputStream; import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.net.*; import java.text.DateFormat; import java.time.LocalDate; import java.time.LocalDateTime; -import java.time.ZoneId; import java.util.*; import java.util.List; @@ -90,11 +88,8 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener public TimerTaskUpdaterView(Application application, TimerCore core, TimerTask task) { super(application); - // modify frame name - // otherwise, get parent frame dimension getFrame().setName("updateFrame"); - //getFrame().setTitle("Update"); getFrame().setTitle(getResourceMap().getString("updateTitle")); this.core = core; @@ -452,7 +447,7 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener } //if all has gone well, update SyncTime (todo:save information) if (hasUpdated) { - task.setLastSync(LocalDateTime.now()); + core.getData().editTaskLastSync(task, LocalDateTime.now()); } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

08/75: be able to pick previous month and current month for update with a button
by chorem.org scm 07 Jul '16

07 Jul '16

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 34fb3544605bc89d2c8dbc6b3403f64cc5920733 Author: servantie <servantie.c(a)gmail.com> Date: Thu May 19 16:06:24 2016 +0200 be able to pick previous month and current month for update with a button --- .../chorem/jtimer/entities/TimerTaskHelper.java | 9 +++- .../jtimer/ui/report/TimerTaskUpdaterView.java | 48 ++++++++++++++++++++++ .../resources/TimerTaskUpdaterView.properties | 6 +++ .../resources/TimerTaskUpdaterView_fr.properties | 6 +++ 4 files changed, 68 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java index 846077b..19643d3 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java @@ -356,7 +356,14 @@ public class TimerTaskHelper { * @return result the string in JSON */ public static String taskToJSONFormat(TimerTask task, Date startDate, Date endDate, boolean withAnnotations) { - String resultingJSON = "{\"URL\":\"" + task.getSynchronisingURL()+ "\",\"periods\":" + getTimesAndCommentsJSON(task, startDate, endDate, withAnnotations) +"}"; + + LocalDate startPeriodDate = startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + LocalDate endPeriodDate = endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + + + String resultingJSON = "{\"URL\":\"" + task.getSynchronisingURL()+ "\",\"startDate\":\"" + + startPeriodDate.toString() + "\",\"endDate\":\"" + endPeriodDate.toString() + "\",\"periods\":" + + getTimesAndCommentsJSON(task, startDate, endDate, withAnnotations) +"}"; return resultingJSON; } diff --git a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java index f5be8bf..0c264a5 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java +++ b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java @@ -43,7 +43,9 @@ import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.net.*; import java.text.DateFormat; +import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.ZoneId; import java.util.*; import java.util.List; @@ -155,6 +157,18 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener JPanel typePanel = new JPanel(new GridLayout(0, 2)); panelGeneral.add(typePanel, new GridBagConstraints(0, 2, 3, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0)); + //button to have the whole month selected in the datepicker + JButton currentMonthButton = new JButton(); + currentMonthButton.setBorder(BorderFactory.createEmptyBorder()); + currentMonthButton.setAction(getContext().getActionMap(this).get("pickCurrentMonth")); + panelGeneral.add(currentMonthButton, new GridBagConstraints(1, 2, 1, 1, 0, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); + JButton previousMonthButton = new JButton(); + previousMonthButton.setBorder(BorderFactory.createEmptyBorder()); + previousMonthButton.setAction(getContext().getActionMap(this).get("pickPreviousMonth")); + panelGeneral.add(previousMonthButton, new GridBagConstraints(1, 3, 1, 1, 0, 0, + GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); + // miscellaneous JXTaskPane panelOption = new JXTaskPane(getResourceMap().getString("updateOptions")); @@ -223,6 +237,40 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener } /** + * Have current month selected in date pickers + */ + @org.jdesktop.application.Action + public void pickCurrentMonth() { + Calendar calendar = Calendar.getInstance(); + datePickerTo.setDate(calendar.getTime()); + //set it to the first day of the month + calendar.set(calendar.DAY_OF_MONTH, 1); + datePickerFrom.setDate(calendar.getTime()); + + } + + /** + * Have previous month selected in date pickers + */ + @org.jdesktop.application.Action + public void pickPreviousMonth() { + //get number of days in the previous month + //there has to be a better way to do this.. + LocalDate currentDate = LocalDate.now(); + currentDate.minusMonths(1); + int numberOfDays = currentDate.minusMonths(1).lengthOfMonth(); + + Calendar calendar = Calendar.getInstance(); + //previous month, first day + calendar.add(calendar.MONTH, -1); + calendar.set(calendar.DAY_OF_MONTH, 1); + datePickerFrom.setDate(calendar.getTime()); + Calendar calendarEnd = (Calendar) calendar.clone(); + calendarEnd.set(calendar.DAY_OF_MONTH, numberOfDays); + datePickerTo.setDate(calendarEnd.getTime()); + + } + /** * Fill picker date with predefined week selection (from current) * and apply a delay (-1 = previous week). * diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties index e2d2022..8268439 100644 --- a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties +++ b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties @@ -25,6 +25,12 @@ updateOptions=Options updateFrom=From : updateTo=To : +pickCurrentMonth.Action.text = Select current month +pickCurrentMonth.Action.shortDescription = Select current month + +pickPreviousMonth.Action.text = Select previous month +pickPreviousMonth.Action.shortDescription = Select previous month + currentWeek.Action.icon = date_current.png currentWeek.Action.shortDescription = Current week diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties index 8cda7ee..3f3eacc 100644 --- a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties +++ b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties @@ -26,6 +26,12 @@ updateOptions=Options updateFrom=De : updateTo=\u00C0 : +pickCurrentMonth.Action.text = Selectionner le mois courant +pickCurrentMonth.Action.shortDescription = Selectionner le mois courant + +pickPreviousMonth.Action.text = Selectionner le mois pr\u00E9c\u00E9dent +pickPreviousMonth.Action.shortDescription = Selectionner le mois pr\u00E9c\u00E9dent + currentWeek.Action.icon = date_current.png currentWeek.Action.shortDescription = Semaine courante -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

07/75: displayed the checkbox to include annotations with the update, includes it in the update if checked.
by chorem.org scm 07 Jul '16

07 Jul '16

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 5249bb573725847edd58afb1fe57984be0e090db Author: servantie <servantie.c(a)gmail.com> Date: Thu May 19 10:57:29 2016 +0200 displayed the checkbox to include annotations with the update, includes it in the update if checked. --- .../chorem/jtimer/entities/TimerTaskHelper.java | 12 +++---- .../jtimer/ui/report/TimerTaskUpdaterView.java | 39 ++++++++++++++-------- .../resources/TimerTaskUpdaterView.properties | 3 +- .../resources/TimerTaskUpdaterView_fr.properties | 3 +- 4 files changed, 34 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java index dd8d6c9..846077b 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java @@ -338,10 +338,10 @@ public class TimerTaskHelper { * @param task the task to make a JSON from * @return result the string in JSON */ - public static String taskToJSONFormat(TimerTask task) { + public static String taskToJSONFormat(TimerTask task, boolean withAnnotations) { Date startDate = task.getCreationDate(); Date endDate = new Date(); - String resultingJSON = taskToJSONFormat(task, startDate, endDate); + String resultingJSON = taskToJSONFormat(task, startDate, endDate, withAnnotations); return resultingJSON; } @@ -355,8 +355,8 @@ public class TimerTaskHelper { * @param endDate the end date * @return result the string in JSON */ - public static String taskToJSONFormat(TimerTask task, Date startDate, Date endDate) { - String resultingJSON = "{\"URL\":\"" + task.getSynchronisingURL()+ "\",\"periods\":" + getTimesAndCommentsJSON(task, startDate, endDate) +"}"; + public static String taskToJSONFormat(TimerTask task, Date startDate, Date endDate, boolean withAnnotations) { + String resultingJSON = "{\"URL\":\"" + task.getSynchronisingURL()+ "\",\"periods\":" + getTimesAndCommentsJSON(task, startDate, endDate, withAnnotations) +"}"; return resultingJSON; } @@ -369,7 +369,7 @@ public class TimerTaskHelper { * @param endDate : end of period * @return a string in json format */ - public static String getTimesAndCommentsJSON(TimerTask task, Date startDate, Date endDate) { + public static String getTimesAndCommentsJSON(TimerTask task, Date startDate, Date endDate, boolean withAnnotations) { String result = ""; SortedMap<Date, Long> dates = task.getAllDaysAndTimes().subMap(startDate, endDate); if (dates.size() != 0) { @@ -384,7 +384,7 @@ public class TimerTaskHelper { result = result + "{\"id\":\""+ dateString + "\",\"startDate\":\"" + dateString + "T00:00:00" + "\",\"duration\":" + Long.toString(entry.getValue()) + ",\"info\":\""; //adding comments (if there are any) - if (getAnnotation(task, entry.getKey()).size() != 0) { + if (getAnnotation(task, entry.getKey()).size() != 0 && withAnnotations ) { for (String s : getAnnotation(task, entry.getKey())) { result = result + s + ","; } diff --git a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java index 045fcfd..f5be8bf 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java +++ b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java @@ -43,6 +43,7 @@ import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.net.*; import java.text.DateFormat; +import java.time.LocalDateTime; import java.util.*; import java.util.List; @@ -157,10 +158,14 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener // miscellaneous JXTaskPane panelOption = new JXTaskPane(getResourceMap().getString("updateOptions")); + panelOption.setLayout(new GridBagLayout()); checkIncludesAnnotations = new JCheckBox(); - checkIncludesAnnotations.setAction(getContext().getActionMap(this).get("updateAnnotations")); - panelOption.add(checkIncludesAnnotations); + checkIncludesAnnotations.setAction(getContext().getActionMap(this).get("isIncludingAnnotations")); + panelOption.add(checkIncludesAnnotations, new GridBagConstraints(1, 1, 1, 1, 0, 0, + GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(1, 1, 1, 1), 0, 0)); + + configComponent.add(panelGeneral); configComponent.add(panelOption); @@ -311,7 +316,7 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener updateJson = ""; // make String of information updateJson = taskToJSONFormat(task, datePickerFrom.getDate(), - datePickerTo.getDate()); + datePickerTo.getDate(), isIncludingAnnotations()); if (updateJson != null && !updateJson.isEmpty()) { updateArea.setText(prettifyJSON(updateJson)); @@ -320,6 +325,16 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener } } + /** + * Show annotation checkbox checked. + */ + @Action + public boolean isIncludingAnnotations() { + boolean ischeckedIncludeAnnotations = checkIncludesAnnotations.isSelected(); + return ischeckedIncludeAnnotations; + } + + /** * Can update ? @@ -376,25 +391,21 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener } catch (IOException e) { e.printStackTrace(); } - - try { - InputStream response = connection.getInputStream(); //get the header fields Map<String, List<String>> map = connection.getHeaderFields(); + boolean hasUpdated = false; + //check for positive answer from server for (Map.Entry<String, List<String>> entry : map.entrySet()) { for (String s : entry.getValue()) { if (s.equals("HTTP/1.1 200 OK")) { - log.info("Synchronised!"); - //todo : make it update the lastSync Data - + hasUpdated = true; } } } - - - } catch (IOException e) { - e.printStackTrace(); - } + //if all has gone well, update SyncTime (todo:save information) + if (hasUpdated) { + task.setLastSync(LocalDateTime.now()); + } } @Override diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties index e3a30c1..e2d2022 100644 --- a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties +++ b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties @@ -24,7 +24,6 @@ updateGeneral=General updateOptions=Options updateFrom=From : updateTo=To : -updateAnnotations = Include annotations currentWeek.Action.icon = date_current.png currentWeek.Action.shortDescription = Current week @@ -32,6 +31,8 @@ currentWeek.Action.shortDescription = Current week previousWeek.Action.icon = date_previous.png previousWeek.Action.shortDescription = Previous week +updateAnnotations.Action.text = Include annotations +updateAnnotations.Action.shortDescription = Include annotations generateUpdate.Action.text = &Generate generateUpdate.Action.icon = applications-system.png diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties index 169d5bd..8cda7ee 100644 --- a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties +++ b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties @@ -25,8 +25,6 @@ updateGeneral=G\u00E9n\u00E9ral updateOptions=Options updateFrom=De : updateTo=\u00C0 : -updateAnnotations = Inclure les annotations - currentWeek.Action.icon = date_current.png currentWeek.Action.shortDescription = Semaine courante @@ -34,6 +32,7 @@ currentWeek.Action.shortDescription = Semaine courante previousWeek.Action.icon = date_previous.png previousWeek.Action.shortDescription = Semaine pr\u00E9c\u00E9dente +isIncludingAnnotations.Action.text = Inclure les annotations generateUpdate.Action.text = &G\u00E9n\u00E9rer generateUpdate.Action.icon = applications-system.png -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

06/75: set up ids for times in the json output to be dates (one task at one date has only one value for duration in jtimer), minor properties change
by chorem.org scm 07 Jul '16

07 Jul '16

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 fc44c09c7adab4e5597c382998feb595a5ba090d Author: servantie <servantie.c(a)gmail.com> Date: Wed May 18 17:33:52 2016 +0200 set up ids for times in the json output to be dates (one task at one date has only one value for duration in jtimer), minor properties change --- .../java/org/chorem/jtimer/entities/TimerTaskHelper.java | 8 +++----- .../ui/report/resources/TimerTaskUpdaterView.properties | 6 +----- .../report/resources/TimerTaskUpdaterView_fr.properties | 15 +-------------- 3 files changed, 5 insertions(+), 24 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java index fed5607..dd8d6c9 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java @@ -372,8 +372,6 @@ public class TimerTaskHelper { public static String getTimesAndCommentsJSON(TimerTask task, Date startDate, Date endDate) { String result = ""; SortedMap<Date, Long> dates = task.getAllDaysAndTimes().subMap(startDate, endDate); - //todo:deal with ids (currently a useless sequence) - int sequence = 0; if (dates.size() != 0) { result = result + "["; for (SortedMap.Entry<Date, Long> entry : dates.entrySet()) { @@ -381,8 +379,9 @@ public class TimerTaskHelper { //converting Date to LocalDate (to ease the .toString()) //deal with timezones ? LocalDate date = entry.getKey().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); - - result = result + "{\"id\":\""+ sequence + "\",\"startDate\":\"" + date.toString() + "T00:00:00" + + String dateString = date.toString(); + //as jtimer has time entries only for a day, the id of the times will be the date in yyyy-mm-dd format + result = result + "{\"id\":\""+ dateString + "\",\"startDate\":\"" + dateString + "T00:00:00" + "\",\"duration\":" + Long.toString(entry.getValue()) + ",\"info\":\""; //adding comments (if there are any) if (getAnnotation(task, entry.getKey()).size() != 0) { @@ -393,7 +392,6 @@ public class TimerTaskHelper { result = result.substring(0, result.length()-1); } result = result + "\"},"; - ++sequence; } //deleting trailing ',' because of the loop result = result.substring(0, result.length()-1); diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties index 3837279..e3a30c1 100644 --- a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties +++ b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties @@ -24,10 +24,7 @@ updateGeneral=General updateOptions=Options updateFrom=From : updateTo=To : -updateDaily=Daily -updateMonthly=Monthly -updateWeekly=Weekly -updateYearly=Yearly +updateAnnotations = Include annotations currentWeek.Action.icon = date_current.png currentWeek.Action.shortDescription = Current week @@ -35,7 +32,6 @@ currentWeek.Action.shortDescription = Current week previousWeek.Action.icon = date_previous.png previousWeek.Action.shortDescription = Previous week -updateAnnotations.text = Include annotations generateUpdate.Action.text = &Generate generateUpdate.Action.icon = applications-system.png diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties index 44943f0..169d5bd 100644 --- a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties +++ b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties @@ -25,17 +25,8 @@ updateGeneral=G\u00E9n\u00E9ral updateOptions=Options updateFrom=De : updateTo=\u00C0 : -updateDaily=Par jour -updateMonthly=Par mois -updateWeekly=Par semaine -updateYearly=Par ann\u00E9e -updateByProject=Par projet +updateAnnotations = Inclure les annotations -updateIncludeTime=Afficher les temps -updateAnnotationsTime=avec l'heure -updateIntermediateTotalTime=Ajout des temps totaux interm\u00E9diaires -updateProjects=Projets -updateProjectsList=Liste des projets currentWeek.Action.icon = date_current.png currentWeek.Action.shortDescription = Semaine courante @@ -43,10 +34,6 @@ currentWeek.Action.shortDescription = Semaine courante previousWeek.Action.icon = date_previous.png previousWeek.Action.shortDescription = Semaine pr\u00E9c\u00E9dente -updateAnnotations.Action.text = Inclure les annotations -updateAnnotations.Action.shortDescription = Inclure les annotations - -* generateUpdate.Action.text = &G\u00E9n\u00E9rer generateUpdate.Action.icon = applications-system.png -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

05/75: showing an info log when receiving a 200 OK after an update. small typo correction in properties file
by chorem.org scm 07 Jul '16

07 Jul '16

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 b65ba97a8017dedafae07939811e0a66160c3978 Author: servantie <servantie.c(a)gmail.com> Date: Wed May 18 16:04:40 2016 +0200 showing an info log when receiving a 200 OK after an update. small typo correction in properties file --- .../org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java | 14 +++++++++++++- .../ui/report/resources/TimerTaskUpdaterView.properties | 4 ++-- .../ui/report/resources/TimerTaskUpdaterView_fr.properties | 9 ++++----- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java index 1181dc2..045fcfd 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java +++ b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java @@ -44,6 +44,7 @@ import java.io.UnsupportedEncodingException; import java.net.*; import java.text.DateFormat; import java.util.*; +import java.util.List; import static org.chorem.jtimer.entities.TimerTaskHelper.taskToJSONFormat; @@ -377,8 +378,19 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener } try { - //todo: deal with responses ! InputStream response = connection.getInputStream(); + //get the header fields + Map<String, List<String>> map = connection.getHeaderFields(); + for (Map.Entry<String, List<String>> entry : map.entrySet()) { + for (String s : entry.getValue()) { + if (s.equals("HTTP/1.1 200 OK")) { + log.info("Synchronised!"); + //todo : make it update the lastSync Data + + } + } + } + } catch (IOException e) { e.printStackTrace(); diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties index 6359a52..3837279 100644 --- a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties +++ b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties @@ -30,12 +30,12 @@ updateWeekly=Weekly updateYearly=Yearly currentWeek.Action.icon = date_current.png -currentWeek.Action.shortDescription = Current week- +currentWeek.Action.shortDescription = Current week previousWeek.Action.icon = date_previous.png previousWeek.Action.shortDescription = Previous week -updateAnnotations.Action.text = Include annotations +updateAnnotations.text = Include annotations generateUpdate.Action.text = &Generate generateUpdate.Action.icon = applications-system.png diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties index 85d01e6..44943f0 100644 --- a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties +++ b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties @@ -38,16 +38,15 @@ updateProjects=Projets updateProjectsList=Liste des projets currentWeek.Action.icon = date_current.png -currentWeek.Action.shortDescription = Semaine courante- +currentWeek.Action.shortDescription = Semaine courante previousWeek.Action.icon = date_previous.png -previousWeek.Action.shortDescription = Semaine precedente +previousWeek.Action.shortDescription = Semaine pr\u00E9c\u00E9dente updateAnnotations.Action.text = Inclure les annotations +updateAnnotations.Action.shortDescription = Inclure les annotations - -showHiddenProjects.Action.text = Show hidden projects -showHiddenProjects.Action.shortDescription = Show hidden projects +* generateUpdate.Action.text = &G\u00E9n\u00E9rer generateUpdate.Action.icon = applications-system.png -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

04/75: small typo corrected with " at the wrong places or missing in the json output
by chorem.org scm 07 Jul '16

07 Jul '16

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 59ff4b7949e4adf25804bca9e475210e1099372c Author: servantie <servantie.c(a)gmail.com> Date: Wed May 18 10:07:43 2016 +0200 small typo corrected with " at the wrong places or missing in the json output --- src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java index ba7bad1..fed5607 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java @@ -356,8 +356,6 @@ public class TimerTaskHelper { * @return result the string in JSON */ public static String taskToJSONFormat(TimerTask task, Date startDate, Date endDate) { - //todo : change id with something else ? - String taskID = Integer.toString(task.getNumber()); String resultingJSON = "{\"URL\":\"" + task.getSynchronisingURL()+ "\",\"periods\":" + getTimesAndCommentsJSON(task, startDate, endDate) +"}"; return resultingJSON; } @@ -381,16 +379,18 @@ public class TimerTaskHelper { for (SortedMap.Entry<Date, Long> entry : dates.entrySet()) { //adding id, startDate and duration //converting Date to LocalDate (to ease the .toString()) - //todo:deal with timezones ? + //deal with timezones ? LocalDate date = entry.getKey().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); - result = result + "{\"id\":"+ sequence + "\",\"startDate\":\"" + date.toString() + "T00:00:00" + - "\",\"duration\":\"" + Long.toString(entry.getValue()) + ",\"info\":\""; + result = result + "{\"id\":\""+ sequence + "\",\"startDate\":\"" + date.toString() + "T00:00:00" + + "\",\"duration\":" + Long.toString(entry.getValue()) + ",\"info\":\""; //adding comments (if there are any) if (getAnnotation(task, entry.getKey()).size() != 0) { for (String s : getAnnotation(task, entry.getKey())) { result = result + s + ","; } + //remove trailing comma + result = result.substring(0, result.length()-1); } result = result + "\"},"; ++sequence; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch feature/sync updated (4cdc4fb -> 31ba1e9)
by chorem.org scm 04 Jul '16

04 Jul '16

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 4cdc4fb corrected the title change not activating validation button in task editor new 31ba1e9 New display of SyncInfo edition, with URL test button The 1 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 31ba1e94b8b38f0e48d6b991af500df2a261671e Author: servantie <servantie.c(a)gmail.com> Date: Thu Jun 30 15:49:29 2016 +0200 New display of SyncInfo edition, with URL test button Summary of changes: src/main/java/org/chorem/jtimer/JTimer.java | 4 +- .../org/chorem/jtimer/data/DataEventListener.java | 5 +- .../java/org/chorem/jtimer/data/TimerCore.java | 2 - .../org/chorem/jtimer/data/TimerDataManager.java | 21 +- .../java/org/chorem/jtimer/entities/SyncInfo.java | 35 +- .../java/org/chorem/jtimer/entities/TimerTask.java | 39 +- .../chorem/jtimer/entities/TimerTaskHelper.java | 86 ++- .../chorem/jtimer/io/GTimerIncrementalSaver.java | 76 ++- .../chorem/jtimer/io/TimerTaskSynchronizer.java | 16 +- src/main/java/org/chorem/jtimer/ui/StatusBar.java | 3 +- .../jtimer/ui/report/TimerTaskSyncInfoEditor.java | 385 ++++++++++++ .../jtimer/ui/report/TimerTaskUpdaterView.java | 671 --------------------- .../chorem/jtimer/ui/systray/SystrayManager.java | 3 +- .../jtimer/ui/treetable/ProjectsAndTasksModel.java | 3 +- .../ProjectsAndTasksRunningCellRenderer.java | 3 +- .../org/chorem/jtimer/resources/JTimer.properties | 4 +- .../chorem/jtimer/resources/JTimer_fr.properties | 4 +- .../resources/TimerTaskSyncInfoEditor.properties | 46 ++ .../TimerTaskSyncInfoEditor_fr.properties | 46 ++ .../resources/TimerTaskUpdaterView.properties | 74 --- .../resources/TimerTaskUpdaterView_fr.properties | 73 --- .../org/chorem/jtimer/entities/TimerTaskTest.java | 12 +- src/test/resources/testdata/41.task.sync | 2 +- 23 files changed, 674 insertions(+), 939 deletions(-) create mode 100644 src/main/java/org/chorem/jtimer/ui/report/TimerTaskSyncInfoEditor.java delete mode 100644 src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java create mode 100644 src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskSyncInfoEditor.properties create mode 100644 src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskSyncInfoEditor_fr.properties delete mode 100644 src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView.properties delete mode 100644 src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskUpdaterView_fr.properties -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1