diff --git a/rowers/models.py b/rowers/models.py index 6c5a679a..8225aa16 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -2574,6 +2574,7 @@ class PlannedSession(models.Model): ) manager = models.ForeignKey(User, on_delete=models.PROTECT) + rojabo_id = models.BigIntegerField(default=0,blank=True) course = models.ForeignKey(GeoCourse, blank=True, null=True, verbose_name='OTW Course', on_delete=models.SET_NULL) diff --git a/rowers/rojabo_stuff.py b/rowers/rojabo_stuff.py index 39a29419..af3029b6 100644 --- a/rowers/rojabo_stuff.py +++ b/rowers/rojabo_stuff.py @@ -167,8 +167,9 @@ def do_refresh_token(refreshtoken): aweekago = timezone.now()-timedelta(days=7) today = timezone.now() +a_week_from_now = timezone.now()+timedelta(days=7) -def get_rojabo_workout_list(user,startdate=aweekago,enddate=today): +def get_rojabo_workout_list(user,startdate=aweekago,enddate=a_week_from_now): r = Rower.objects.get(user=user) if (r.rojabo_token == '') or (r.rojabo_token is None): # pragma: no cover s = "Token doesn't exist. Need to authorize" diff --git a/rowers/urls.py b/rowers/urls.py index c1040181..bc000870 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -598,6 +598,8 @@ urlpatterns = [ views.workout_rp3import_view, name='workout_rp3import_view'), re_path(r'^workout/stravaimport/$', views.workout_stravaimport_view, name='workout_stravaimport_view'), + re_path(r'^rojaboimport/$', views.workout_rojaboimport_view, + name='workout_rojaboimport_view'), re_path(r'^workout/stravaimport/user/(?P\d+)/$', views.workout_stravaimport_view, name='workout_stravaimport_view'), re_path(r'^workout/c2import/all/$', views.workout_getc2workout_all, diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index 18ad305c..3deeb613 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -1029,6 +1029,46 @@ def workout_rp3import_view(request, userid=0): 'teams': get_my_teams(request.user) }) +# The page where you select which Strava workout to import +@login_required() +@permission_required('rower.is_coach', fn=get_user_by_userid, raise_exception=True) +@permission_required('rower.is_not_freecoach', fn=get_user_by_userid, raise_exception=True) +def workout_rojaboimport_view(request, message="", userid=0): + r = getrequestrower(request, userid=userid) + if r.user != request.user: + messages.error( + request, 'You can only access your own workouts on the NK Logbook, not those of your athletes') + url = reverse('workout_stravaimport_view', + kwargs={'userid': request.user.id}) + return HttpResponseRedirect(url) + + try: + _ = rojabo_open(request.user) + except NoTokenError: # pragma: no cover + return HttpResponseRedirect("/rowers/me/rojaboauthorize/") + + res = rojabo_stuff.get_rojabo_workout_list(request.user) + + if (res.status_code != 200): # pragma: no cover + if (res.status_code == 401): + r = getrower(request.user) + if (r.stravatoken == '') or (r.stravatoken is None): + s = "Token doesn't exist. Need to authorize" + return HttpResponseRedirect("/rowers/me/rojaboauthorize/") + message = "Something went wrong in workout_rojaboimport_view" + messages.error(request, message) + url = reverse('workouts_view') + return HttpResponseRedirect(url) + + sessions = [] + r = getrower(request.user) + 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) + ]) + + return HttpResponse(res.json()) # The page where you select which Strava workout to import @login_required() diff --git a/rowers/views/statements.py b/rowers/views/statements.py index 0bbed467..c6a8f707 100644 --- a/rowers/views/statements.py +++ b/rowers/views/statements.py @@ -198,8 +198,10 @@ from rowers.sporttracksstuff import sporttracks_open from rowers.tpstuff import tp_open from iso8601 import ParseError import rowers.stravastuff as stravastuff +import rowers.rojabo_stuff as rojabo_stuff import rowers.garmin_stuff as garmin_stuff from rowers.stravastuff import strava_open +from rowers.rojabo_stuff import rojabo_open import rowers.polarstuff as polarstuff import rowers.sporttracksstuff as sporttracksstuff