duplicates concept

rowers/dataprep.py

@@ -999,13 +999,30 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
     maxhr = np.nan_to_num(maxhr)
     averagehr = np.nan_to_num(averagehr)
 
+    duplicate = True
+
+    t = datetime.datetime.strptime(duration,"%H:%M:%S.%f")
+    delta = datetime.timedelta(hours=t.hour, minutes=t.minute, seconds=t.second)
+
+    workoutenddatetime = workoutstartdatetime+delta
+
     # check for duplicate start times and duration
-    ws = Workout.objects.filter(startdatetime=workoutstartdatetime,
-                                distance=totaldist,
-                                user=r)
-    if (len(ws) != 0):
-        message = "Warning: This workout probably already exists in the database"
-        privacy = 'hidden'
+    ws = Workout.objects.filter(user=r,date=workoutdate).exclude(
+        startdatetime__gt=workoutenddatetime
+    )
+
+    ws2 = []
+    
+    for ww in ws:
+        t = ww.duration
+        delta = datetime.timedelta(hours=t.hour, minutes=t.minute, seconds=t.second)
+        enddatetime = ww.startdatetime+delta
+        if enddatetime > workoutstartdatetime:
+            ws2.append(ww)
+                                
+    if (len(ws2) != 0):
+        message = "Warning: This workout overlaps with an existing one and was marked as a duplicate"
+        duplicate = True
 
 
     w = Workout(user=r, name=title, date=workoutdate,
@@ -1014,6 +1031,7 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
                 duration=duration, distance=totaldist,
                 weightcategory=r.weightcategory,
                 starttime=workoutstarttime,
+                duplicate=duplicate,
                 workoutsource=workoutsource,
                 rankingpiece=rankingpiece,
                 forceunit=forceunit,