Merge branch 'develop' into feature/trainingplanserver

rowers/utils.py

@@ -772,7 +772,8 @@ def step_to_string(step):
 
     durationtype = step['durationType']
     if step['durationValue'] == 0:
-        return '',type, -1, -1
+        if durationtype not in ['RepeatUntilStepsCmplt','RepeatUntilHrLessThan','RepeatUntilHrGreaterThan']:
+            return '',type, -1, -1,1
 
     if durationtype == 'Time':
         unit = 'min'
@@ -976,8 +977,10 @@ def step_to_string(step):
 
     name = step['wkt_step_name']
 
-    intensity = step['intensity']
-
+    try:
+        intensity = step['intensity']
+    except KeyError:
+        intensity = 0
 
     s = '{name} {intensity} {duration} {unit} {target} {repeat}'.format(
         nr = nr,