Fix registration code form button from disabling on invalid entry and…

microsetta_interface/implementation.py

@@ -874,7 +874,8 @@ def get_ajax_check_ffq_code(ffq_code):
     except:  # noqa
         return_val = False
 
-    return return_val
+    # Convert to JSON for returning to JavaScript call
+    return json.dumps(return_val)
 
 
 def _associate_sample_to_survey(account_id, source_id, sample_id, survey_id):

microsetta_interface/templates/nutrition.jinja2

@@ -44,43 +44,39 @@
             preventImplicitSubmission(form_name);
             preclude_whitespace('#ffq_code');
 
-            $("form[name='" + form_name + "']").on('submit', function() {
-                document.getElementById("ffq_code_button").disabled = true;
-            });
+            function handleSubmit() {
+                // TODO go to page since form validated
+                console.log('submitted form')
+            };
 
-            // Initialize form validation on the registration form.
-            // It has the name attribute "registration"
+            // Validate the registration form for a valid
+            // registration code using the jQuery validation plugin.
+            // If the form is not valid, the messages are displayed
             $("form[name='" + form_name + "']").validate({
                 // Specify validation rules
                 rules: {
-                    // The key name on the left side is the name attribute
-                    // of an input field. Validation rules are defined
-                    // on the right side
+                    // The key is the form input field name attribute and the validation rules
+                    // are defined in the value object
+                    // The route check_ffq_code_valid returns
+                    // either true or false
                     ffq_code: {
                         required: true,
                         remote: {
                             url: "/check_ffq_code_valid",
                         }
-                    },
-                    submitHandler: function (form) {
-                        form.submit();
                     }
                 },
+                submitHandler: function (form, event) {
+                    // prevent multiple submissions
+                    document.getElementById("ffq_code_button").disabled = false;
+                    handleSubmit(form);
+                },
                 messages: {
                     ffq_code: "{{ _('Your registration code is not in our system or has already been used. Please try again.') }}",
                 },
             });
-        });
 
-        /*
-        function updateButtonState(ffq_code_value) {
-            if(ffq_code_value != "") {
-                document.getElementById("ffq_code_button").disabled = false;
-            } else {
-                document.getElementById("ffq_code_button").disabled = true;
-            }
-        }
-        */
+        });
 
         function openCodePanel() {
             document.getElementById('add_code_container').style.display = '';