From c0a3e7b994da1816d81e1e1bb17d36c01c018bab Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 28 Mar 2017 14:02:31 +0200 Subject: [PATCH 1/2] link to google analytics js --- rowers/templates/ga.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rowers/templates/ga.html b/rowers/templates/ga.html index dd37c1c6..15741226 100644 --- a/rowers/templates/ga.html +++ b/rowers/templates/ga.html @@ -2,7 +2,7 @@ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) - })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); + })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); ga('create', '{{ GOOGLE_ANALYTICS_PROPERTY_ID }}', '{{ GOOGLE_ANALYTICS_DOMAIN }}'); ga('send', 'pageview'); From 61df4685ce87305dd3839a4b0c87bdcad75f1fa6 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 28 Mar 2017 14:52:20 +0200 Subject: [PATCH 2/2] improved mail processing (zip) --- rowers/mailprocessing.py | 4 +++- rowers/management/commands/processemail.py | 16 +++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/rowers/mailprocessing.py b/rowers/mailprocessing.py index f3435a1c..0d04e517 100644 --- a/rowers/mailprocessing.py +++ b/rowers/mailprocessing.py @@ -189,7 +189,7 @@ def make_new_workout_from_email(rr,f2,name,cntr=0): summary = '' # handle non-Painsled if fileformat != 'csv': - f3,summary = dataprep.handle_nonpainsled('media/'+f2,fileformat,summary) + f3,summary,oarlength,inboard = dataprep.handle_nonpainsled('media/'+f2,fileformat,summary) else: f3 = 'media/'+f2 @@ -227,6 +227,8 @@ def make_new_workout_from_email(rr,f2,name,cntr=0): id,message = dataprep.save_workout_database(f2,rr, workouttype=workouttype, dosummary=dosummary, + inboard=inboard, + oarlength=oarlength, title=name, notes='imported through email') diff --git a/rowers/management/commands/processemail.py b/rowers/management/commands/processemail.py index e0000317..918602ec 100644 --- a/rowers/management/commands/processemail.py +++ b/rowers/management/commands/processemail.py @@ -63,15 +63,13 @@ class Command(BaseCommand): z = zipfile.ZipFile(a.document) for f in z.namelist(): f2 = z.extract(f,path='media/') - try: - wid = [ - make_new_workout_from_email(rr,f2[6:],name) - ] - res += wid - link = 'http://rowsandall.com/rowers/workout/'+str(wid)+'/edit' - dd = send_confirm(u,name,link) - except: - pass + wid = [ + make_new_workout_from_email(rr,f2[6:],name) + ] + res += wid + link = 'http://rowsandall.com/rowers/workout/'+str(wid[0])+'/edit' + dd = send_confirm(rr.user,name,link) + else: # move attachment and make workout try: