From eff104b1e2840ad40131e7ab811448a34a896f9f Mon Sep 17 00:00:00 2001 From: FivePixels Date: Sat, 23 Apr 2022 17:48:40 -0500 Subject: Begin logic on record.js for enter to tab handling, remove skip exercise button from record page. Add info about workout in card on select page, update edit to use units if they exist on an existing workout --- app/static/js/record.js | 31 ++++++++++++++++++++++--------- app/templates/workout/record.html | 1 - app/templates/workout/select.html | 21 ++++++++++++--------- 3 files changed, 34 insertions(+), 19 deletions(-) diff --git a/app/static/js/record.js b/app/static/js/record.js index aba6785..67ad2a6 100644 --- a/app/static/js/record.js +++ b/app/static/js/record.js @@ -1,13 +1,26 @@ - // Register 'Enter' listeners on all inputs -Array.from(document.getElementsByClassName('input')) - .filter(e => e.type == 'number') - .forEach(e => e.addEventListener('keyup', function(event) { - if (event.key == 'Enter') { - // TODO implement - console.log("ENTER") - } - })) +allInputs = Array.from(document.getElementsByClassName('input')) + .filter(e => e.type == 'number'); +allInputs.forEach(e => e.addEventListener('keypress', handleEnterKey)); + +function handleEnterKey(event) { + + // add ids to each input programatically + + if (event.key = 'Enter') { + event.preventDefault(); + + //Isolate the node that we're after + const currentNode = event.target; + + //Find the current tab index. + currentIndex = [...allInputs].findIndex(el => currentNode.isEqualNode(el)) + + //focus the following element + const targetIndex = (currentIndex + 1) % allInputs.length; + allInputs[targetIndex].focus();} + +} function setReset(row, values=true) { let lbsInput = row.children[1].children[0]; diff --git a/app/templates/workout/record.html b/app/templates/workout/record.html index 94fe611..d1662e3 100644 --- a/app/templates/workout/record.html +++ b/app/templates/workout/record.html @@ -37,7 +37,6 @@ Add Set - Skip
diff --git a/app/templates/workout/select.html b/app/templates/workout/select.html index c01a4f8..7109c70 100644 --- a/app/templates/workout/select.html +++ b/app/templates/workout/select.html @@ -4,18 +4,21 @@
{% for workout in current_user.workouts %} -
-
-
-

{{ workout.name }}

-
-
-
- Start -
+
+
+
+

{{ workout.name }}

+
+
+
+ {% for exercise in workout.exercises %} +

{{ exercise.sets }} x {{ exercise.units }} x {{ exercise.name }}

+ {% endfor %} + Start
+
{% endfor %}
-- cgit v1.2.3