Merge branch 'develop' of bitbucket.org:sanderroosendaal/rowsandall into develop

rowers/dataprep.py

@@ -1345,6 +1345,9 @@ def new_workout_from_file(r, f2,
                       r.user.email)
         
         return (0, message, f2)
+    if fileformat == 'att':
+        # email attachment which can safely be ignored
+        return (0, '', f2)
 
     # handle non-Painsled by converting it to painsled compatible CSV
     if (fileformat != 'csv'):

rowers/mailprocessing.py

@@ -137,6 +137,8 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
 
     
     # handle non-Painsled
+    if fileformat == 'att':
+        return 0
     if fileformat != 'csv':
         filename_mediadir, summary, oarlength, inboard,fileformat = dataprep.handle_nonpainsled(
             'media/' + datafilename, fileformat, summary)

rowers/tasks.py

@@ -1026,7 +1026,7 @@ def handle_sendemail_breakthrough(workoutid, useremail,
     d = {
         'first_name':userfirstname,
         'siteurl':siteurl,
-        'workoutid':workoutid,
+        'workoutid':encoder.encode_hex(workoutid),
         'btvalues':tablevalues,
         }
 
@@ -1071,7 +1071,7 @@ def handle_sendemail_hard(workoutid, useremail,
     d = {
         'first_name':userfirstname,
         'siteurl':siteurl,
-        'workoutid':workoutid,
+        'workoutid':encoder.encode_hex(workoutid),
         'btvalues':tablevalues,
         }
 

rowers/templates/flexchart3otw.html

@@ -35,7 +35,7 @@
     
 <ul class="main-content">
   <li class="grid_4">
-    <div id="theplot" class="flexplot" style="min-width:300px;">
+    <div id="theplot" class="flexplot">
       {{ the_div|safe }}
     </div>
   </li>

rowers/tests/testdata/emails/ATT00001.txt

@@ -0,0 +1,3 @@
+
+
+