diff --git a/rowers/c2stuff.py b/rowers/c2stuff.py index 24ce55e6..3001cd8c 100644 --- a/rowers/c2stuff.py +++ b/rowers/c2stuff.py @@ -700,6 +700,10 @@ def createc2workoutdata(w): if workouttype in otwtypes: workouttype = 'water' + if w.timezone == 'tzutc()': + w.timezone = 'UTC' + w.save() + wendtime = w.startdatetime.astimezone(pytz.timezone(w.timezone))+datetime.timedelta(seconds=makeseconds(durationstr)) diff --git a/rowers/models.py b/rowers/models.py index 55abd552..89cac53a 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -3236,6 +3236,9 @@ class Workout(models.Model): if not can_add_workout(user.user): raise forms.ValidationError("Free Coach User cannot have any workouts") + if self.timezone == 'tzutc()': + self.timezone = 'UTC' + super(Workout, self).save(*args, **kwargs) def __str__(self): diff --git a/rowers/nkimportutils.py b/rowers/nkimportutils.py index 7f007562..2fe44cba 100644 --- a/rowers/nkimportutils.py +++ b/rowers/nkimportutils.py @@ -266,3 +266,26 @@ def strokeDataToDf(strokeData): return df + +def readlogs_summaries(logfile): # pragma: no cover + with open(logfile,'r') as f: + while f: + s = f.readline() + if s == "": + break + if "Importing" in s: + words = s.split(" ") + nkid = words[-1] + print(nkid) + line1 = f.readline() + line2 = f.readline() + + data1 = line1[line1.find('{'):] + data2 = line2[line2.find('['):] + + strokeData = json.loads(data2) + summaryData = json.loads(data1) + + df = strokeDataToDf(strokeData) + + print(get_nk_allstats(summaryData,df))