From 62f3d373cfd3c841fc0eee9ae4e6ab46a94f35b6 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal
=t$#dpk;28qBZ?SYsXvVOT52MKkZ}EyLIPPcPqpB?)TP)72gBA!Kwj
z-X^3s^U%GzUT%hY2i KJu$@lsE^ul@4!UXIhoNES|8m0q)Xl(5sYqUN293q%hUFyBx|*O0SQ2d
zoG?li+8E95SrErIO-|(Y|KPD@c{
+ No sessions found
+ rRZLUmk9Q6FuY%81ozX;C*ifYMGu70SpU6JVmenc~2uZq+JB|J$74aaViR<1fko|
zb67Lx3=wVFriXAZ_9LEY!x9mLc7!3=^l!wGRfFU3vpxRi3tfCK#u#`xx+!dVlZaL{
zh-nhn3naw2+U^j%Qiu)=-7^1&@pjL&1iuqC>Lc^l6c
z*yB{U$BY5vB|B9|M#8<RFdc(!Es3(CJ935cdCE!24KgJ)fduAO~o7A5a`*^9gQBD
z--H`|`J<&Y8WeUIp{LKXjookluE|7u<~{4;F~#SvA@@5jOv(67?{9trF3c&OQYUrl
z8tE(_AigEVGX8mTkX_E*L@LPHe8_9i#BR~cs}JMl=vnSd61$MA%C#kmc+}ZkQAqeD
z!vS16HRo5yB!^`O?dF~y2*pLICX55d2Q@at(Jj;=w2s!z+KN73_Ztk{gEz>v1La-B
z?DgzX37kFe5wVKhM+ppW+5n+}KMBMYTP7*Cyp_}l@t9Y+z@=utGZ#(Nk=lYM8>llW
z)h-?)Wj}NBw=NL2GPNZHvT37DO=hRkO4h38ymc^gDx=0*Zl#{&EH6HJC|1v*i2r4)
zuNAk>yCJ{Z8Eyy-ar;+LLuk|DR*jgfr9bwwjdD=+P~ZJr{HO9GLu Available on Rojabo
+{% if sessions %}
+
+
+{% else %}
+ Import
Session
SPM
+ Points
Planned Date
+ New
@@ -34,7 +36,9 @@
{{ session|lookuplong:'name' }}
{{ session|lookuplong:'spm' }}
+ {{ session|lookuplong:'points' }}
{{ session|lookuplong:'date' }}
+ {{ session|lookuplong:'new' }}
{% endfor %}
diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py
index 0ca52ee3..35191735 100644
--- a/rowers/views/importviews.py
+++ b/rowers/views/importviews.py
@@ -1064,14 +1064,59 @@ def workout_rojaboimport_view(request, message="", userid=0):
sessions = []
r = getrower(request.user)
+
+ if request.method == "POST":
+ try:
+ tdict = dict(request.POST.lists())
+ ids = tdict['sessionid']
+ rojaboids = [int(id) for id in ids]
+ alldata = {}
+ for item in res.json():
+ alldata[item['training_session']['id']] = item['training_session']
+ for rojaboid in rojaboids:
+ try:
+ item = alldata[rojaboid]
+ name = item['workout']
+ spm = item['stroke']
+ points = item['points']
+ manager = userid
+ comment = 'ROJABO {name}, SPM: {spm}. Points: {points}'.format(
+ name = name,
+ points = points,
+ spm = spm,
+ )
+
+ preferreddate = datetime.datetime.strptime(item['training_date'],"%Y-%m-%d")
+ startdate = preferreddate
+ enddate = preferreddate
+ ps = PlannedSession(
+ name = item['workout'],
+ comment = comment,
+ startdate = startdate,
+ enddate = enddate,
+ preferreddate = preferreddate,
+ sessionsport = 'rower',
+ manager = request.user,
+ rojabo_id = rojaboid,
+ )
+ ps.save()
+ ps.rower.add(r)
+ ps.tags.add('ROJABO')
+ ps.save()
+ messages.info(request,'Saved planned session {id}'.format(id=ps.id))
+ except KeyError:
+ pass
+ except KeyError:
+ pass
+
rojabo_ids = [int(item['training_session']['id']) for item in res.json()]
knownrojaboids = uniqify([
ps.rojabo_id for ps in PlannedSession.objects.filter(manager=request.user)
])
+
for item in res.json():
- print(item['training_session'])
i = item['training_session']['id']
if i in knownrojaboids:
nnn = ''
@@ -1080,12 +1125,14 @@ def workout_rojaboimport_view(request, message="", userid=0):
n = item['training_session']['workout']
spm = item['training_session']['stroke']
d = item['training_session']['training_date']
+ p = item['training_session']['points']
sessions.append({
'id':i,
'name':n,
'spm':spm,
'new':nnn,
'date': d,
+ 'points': p,
})
breadcrumbs = [
diff --git a/rowers/views/statements.py b/rowers/views/statements.py
index c6a8f707..b03447e6 100644
--- a/rowers/views/statements.py
+++ b/rowers/views/statements.py
@@ -239,6 +239,7 @@ from rowers.rows import handle_uploaded_file, handle_uploaded_image
from rowers.plannedsessions import *
from rowers.tasks import handle_makeplot, handle_otwsetpower, handle_sendemailtcx, handle_sendemailcsv
from rowers.tasks import (
+ fetch_rojabo_session,
handle_sendemail_unrecognized, handle_sendemailnewcomment,
handle_request_post,
handle_sendemailsummary,