sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v15.6.6'

Browse Source
This commit is contained in:
Sander Roosendaal
2021-03-09 08:34:38 +01:00
parent 6d2da21530 2b816b88ab
commit caf3e726bf
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/templates/plannedsessioncreate.html
View File

@@ -23,7 +23,7 @@
{% csrf_token %} {% csrf_token %}
<p><input class="button" type="submit" value="Save" name="_save"></p> <p><input class="button" type="submit" value="Save" name="_save"></p>
<p><input class="button" type="submit" value="Save and Keep Editing" name="_continue"></p> <p><input class="button" type="submit" value="Save and Keep Editing" name="_continue"></p>
<p><input class="button" type="submit" value="Save and Create New Session" name="_addanother"></p> <p><input class="button" type="submit" value="Save and Create Another Session" name="_addanother"></p>
</form> </form>
<div class="padded" id="id_guidance"> <div class="padded" id="id_guidance">
</li> </li>

2
rowers/templates/plannedsessionteamcreate.html
View File

@@ -27,7 +27,7 @@
</table> </table>
<p><input class="button" type="submit" value="Save" name="_save"></p> <p><input class="button" type="submit" value="Save" name="_save"></p>
<p><input class="button" type="submit" value="Save and Keep Editing" name="_continue"></p> <p><input class="button" type="submit" value="Save and Keep Editing" name="_continue"></p>
<p><input class="button" type="submit" value="Save and Create New Session" name="_addanother"></p> <p><input class="button" type="submit" value="Save and Create Another Session" name="_addanother"></p>
<div id="id_guidance" class="padded"> <div id="id_guidance" class="padded">
</div> </div>

2
rowers/templates/plannedsessiontemplatecreate.html
View File

@@ -28,7 +28,7 @@
</div> </div>
<p><input class="button" type="submit" value="Save" name="_save"></p> <p><input class="button" type="submit" value="Save" name="_save"></p>
<p><input class="button" type="submit" value="Save and Keep Editing" name="_continue"></p> <p><input class="button" type="submit" value="Save and Keep Editing" name="_continue"></p>
<p><input class="button" type="submit" value="Save and Create New Session" name="_addanother"></p> <p><input class="button" type="submit" value="Save and Create Another Library Session" name="_addanother"></p>
</form> </form>
</li> </li>

9
rowers/utils.py
View File

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