From 99a44271a5a0287084f85e29d9c3463824b984c6 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Sun, 12 Feb 2017 21:08:38 +0100
Subject: [PATCH] adding team to workout upon creation

---
 rowers/dataprep.py | 9 +++++++++
 rowers/models.py   | 9 +++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 43af9582..0bf6098e 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -25,6 +25,8 @@ from rowingdata import (
     summarydata,get_file_type,
     )
 
+from rowers.models import Team
+
 import os
 import pandas as pd
 import numpy as np
@@ -320,7 +322,14 @@ def save_workout_database(f2,r,dosmooth=True,workouttype='rower',
 		maxhr=maxhr,averagehr=averagehr,
 		startdatetime=workoutstartdatetime)
 
+
     w.save()
+
+    ts = Team.objects.filter(rower=r)
+
+    for t in ts:
+        w.team.add(t)
+
     # put stroke data in database
     res = dataprep(row.df,id=w.id,bands=True,
                    barchart=True,otwpower=True,empower=True)
diff --git a/rowers/models.py b/rowers/models.py
index c67f050c..068e875c 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -377,9 +377,14 @@ class Workout(models.Model):
 	date = self.date
 	name = self.name
 
-	str = date.strftime('%Y-%m-%d')+'_'+name
+        try:
+            stri = date.strftime('%Y-%m-%d')+'_'+name
+        except AttributeError:
+            stri = str(date)+'_'+name
+            
 
-	return str
+            
+	return stri
 
 # delete files belonging to workout instance
 # related GraphImage objects should be deleted automatically