More progress on forms

1 files changed, 10 insertions, 8 deletions

diff --git a/app/forms/workout.py b/app/forms/workout.py
index a84eb6a..b406024 100644
--- a/app/forms/workout.py
+++ b/app/forms/workout.py
@@ -1,14 +1,20 @@
 from flask_wtf import FlaskForm, Form
-from wtforms import FieldList, FormField, IntegerField, StringField
+from wtforms import FieldList, FormField, IntegerField, SelectField, StringField
 from wtforms.validators import DataRequired, Email
 
-# Subclasses
+# /workout/create
 class ExerciseCreateForm(Form):
-    name = StringField("name",  [DataRequired()])
+    # TODO no exercise_*, breaks workout_edit endpoint
+    exercise_name = StringField("name",  [DataRequired()])
     sets = IntegerField("sets", [DataRequired()])
     units = IntegerField("units", [DataRequired()])
-    type = StringField("type", [DataRequired()]) # TODO: make sure its time or reps
+    exercise_type = SelectField("type", [DataRequired()], choices=[('reps', 'Reps'), ('time', 'Time')])
 
+class WorkoutCreateForm(FlaskForm):
+    name = StringField("name", [DataRequired()])
+    exercises = FieldList(FormField(ExerciseCreateForm), min_entries=1)
+
+#  /workout/record
 class SetForm(Form):
     lbs = IntegerField("lbs", [DataRequired()])
     reps = IntegerField("reps", [DataRequired()])
@@ -17,9 +23,5 @@ class ExerciseRecordForm(Form):
     sets = FieldList(FormField(SetForm))
 
 # Actual forms
-class WorkoutCreateForm(FlaskForm):
-    name = StringField("name", [DataRequired()])
-    exercises = FieldList(FormField(ExerciseCreateForm), min_entries=1)
-
 class WorkoutRecordForm(FlaskForm):
     exercises = FieldList(FormField(ExerciseRecordForm))