Merge branch 'develop' into feature/icu_sessions

rowers/models.py

@@ -21,7 +21,7 @@ from django.forms import ModelForm
 from django.dispatch import receiver
 from django.forms.widgets import SplitDateTimeWidget, SelectDateWidget
 from django.forms.formsets import BaseFormSet
-
+from django.db.models.signals import post_save
 from django.contrib.admin.widgets import AdminDateWidget, AdminTimeWidget, AdminSplitDateTime
 
 import os
@@ -1255,6 +1255,8 @@ class Rower(models.Model):
     getemailnotifications = models.BooleanField(default=False,
                                                 verbose_name='Receive email notifications')
 
+    imports_are_private = models.BooleanField(default=False, verbose_name='Make imports private by default')
+    
     # Friends/Team
     friends = models.ManyToManyField("self", blank=True)
     mycoachgroup = models.ForeignKey(
@@ -3814,6 +3816,15 @@ class Workout(models.Model):
 
         super(Workout, self).save(*args, **kwargs)
 
+    @classmethod
+    def post_create(cls, sender, instance, created, *args, **kwargs):
+        if created:
+            user = instance.user
+            if user.imports_are_private:
+                instance.privacy = 'hidden'
+                instance.save()
+
+                    
     def __str__(self):
 
         try:
@@ -3872,6 +3883,8 @@ class Workout(models.Model):
 
         return stri
 
+post_save.connect(Workout.post_create, sender=Workout)
+
 class WorkoutRPEForm(ModelForm):
     class Meta:
         model = Workout
@@ -4615,7 +4628,15 @@ class RowerExportForm(ModelForm):
             'rp3_auto_import',
             'intervals_auto_import',
             'intervals_auto_export',
-            'intervals_resample_to_1s'
+            'intervals_resample_to_1s',
+            'imports_are_private'
+        ]
+
+class RowerPrivateImportForm(ModelForm):
+    class Meta:
+        model = Rower
+        fields = [
+            'imports_are_private'
         ]
         
 class RowerExportFormStrava(ModelForm):