Merge branch 'develop' into feature/restapi

rowers/models.py

@@ -9,8 +9,31 @@ from django.forms.widgets import SplitDateTimeWidget
 from datetimewidget.widgets import DateTimeWidget
 import os
 
-# Create your models here.
+from django.conf import settings
+from sqlalchemy import create_engine
+import sqlalchemy as sa
+from sqlite3 import OperationalError
 
+user = settings.DATABASES['default']['USER']
+password = settings.DATABASES['default']['PASSWORD']
+database_name = settings.DATABASES['default']['NAME']
+host = settings.DATABASES['default']['HOST']
+port = settings.DATABASES['default']['PORT']
+
+database_url = 'mysql://{user}:{password}@{host}:{port}/{database_name}'.format(
+    user=user,
+    password=password,
+    database_name=database_name,
+    host=host,
+    port=port,
+    )
+
+if settings.DEBUG:	    
+    database_url = 'sqlite:///db.sqlite3'
+
+engine = create_engine(database_url, echo=False)
+
+# Create your models here.
 class Team(models.Model):
     name = models.CharField(max_length=150)
     notes = models.CharField(blank=True,max_length=200)
@@ -120,6 +143,17 @@ def auto_delete_file_on_delete(sender, instance, **kwargs):
 	if os.path.isfile(instance.csvfilename):
 	    os.remove(instance.csvfilename)
 
+@receiver(models.signals.post_delete,sender=Workout)
+def auto_delete_strokedata_on_delete(sender, instance, **kwargs):
+    if instance.id:
+        query = sa.text('DELETE FROM strokedata WHERE workoutid={id};'.format(
+            id=instance.id,
+            ))
+        with engine.connect() as conn, conn.begin():
+            try:
+                result = conn.execute(query)
+            except:
+                print "Database Locked"
 
 class StrokeData(models.Model):
     class Meta:
@@ -130,6 +164,7 @@ class StrokeData(models.Model):
     timesecs = models.FloatField(null=True)
     hr = models.IntegerField(null=True)
     pace = models.TimeField(null=True)
+    workoutstate = models.IntegerField(null=True,default=1)
     pseconds = models.FloatField(null=True)
     spm = models.FloatField(null=True)
     cumdist = models.FloatField(null=True)