Only include future workouts

jpickup · Sep 4, 2017 · 14a03d4 · 14a03d4
1 parent d11af6b
commit 14a03d4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/src/com/johnpickup/garmin/schedule/TrainingSchedule.java b/src/com/johnpickup/garmin/schedule/TrainingSchedule.java
@@ -42,17 +42,21 @@ public void clear() {
     @Override
     public List<Mesg> generate() {
         List<Mesg> messages = createMessageHeader();
+        Date now = new Date();
 
         for (ScheduledWorkout scheduledWorkout : workouts) {
-            ScheduleMesg scheduleMesg = new ScheduleMesg();
-            scheduleMesg.setManufacturer(Manufacturer.GARMIN);
-            scheduleMesg.setProduct(65534);
-            scheduleMesg.setType(Schedule.WORKOUT);
-            scheduleMesg.setTimeCreated(new DateTime(scheduledWorkout.getWorkout().getTimestamp()));
-            scheduleMesg.setScheduledTime(scheduledWorkout.getGarminTime());
-            scheduleMesg.setSerialNumber(SERIAL_NO);
-            scheduleMesg.setCompleted(Bool.FALSE);
-            messages.add(scheduleMesg);
+            // only include future workouts (as watch has a limit of 30 in a schedule)
+            if (scheduledWorkout.getDate().after(now)) {
+                ScheduleMesg scheduleMesg = new ScheduleMesg();
+                scheduleMesg.setManufacturer(Manufacturer.GARMIN);
+                scheduleMesg.setProduct(65534);
+                scheduleMesg.setType(Schedule.WORKOUT);
+                scheduleMesg.setTimeCreated(new DateTime(scheduledWorkout.getWorkout().getTimestamp()));
+                scheduleMesg.setScheduledTime(scheduledWorkout.getGarminTime());
+                scheduleMesg.setSerialNumber(SERIAL_NO);
+                scheduleMesg.setCompleted(Bool.FALSE);
+                messages.add(scheduleMesg);
+            }
         }
 
         return messages;

diff --git a/src/com/johnpickup/gui/ScheduleConverterForm.java b/src/com/johnpickup/gui/ScheduleConverterForm.java
@@ -105,7 +105,7 @@ public void actionPerformed(ActionEvent e) {
     }
 
     public static void main(String[] args) {
-        JFrame frame = new JFrame("ScheduleConverterForm");
+        JFrame frame = new JFrame("Garmin Workout Schedule Converter");
         ScheduleConverterForm form = new ScheduleConverterForm();
         form.init();
         frame.setContentPane(form.contentPane);