JS checks in edit subject page fixed

smash/web/templates/subjects/edit.html

@@ -26,9 +26,7 @@
     {% block content %}
         <div class="row">
             <p class="col-lg-3 pull-left">
-                <a href="javascript:history.back(1)" class="btn btn-block btn-default"
-                ">Go
-                back (discard changes)</a>
+                <a href="javascript:history.back(1)" class="btn btn-block btn-default">Go back (discard changes)</a>
             </p>
             <p class="col-md-2 pull-right">
                 <a href="{% url 'web.views.subject_visit_details' study_subject.id %}" type="button"
@@ -44,11 +42,11 @@
                     </div>
 
                     <form method="post" action="" class="form-horizontal">
+                        {% csrf_token %}
                         <div class="box-body">
                             <div class="col-md-12">
-                                {% csrf_token %}
 
-                                {% for field in study_subject_form %}
+                                {% for field in subject_form %}
                                     <div class="col-md-6 form-group  {% if field.errors %}has-error{% endif %}">
                                         <label for="{# TODO #}" class="col-sm-4 control-label">
                                             {{ field.label }}
@@ -64,7 +62,14 @@
                                     </div>
                                 {% endfor %}
 
-                                {% for field in subject_form %}
+                            </div>
+                        </div><!-- /.box-body -->
+                        <div class="box-header with-border">
+                            <h3>Subject's study details</h3>
+                        </div>
+                        <div class="box-body">
+                            <div class="col-md-12">
+                                {% for field in study_subject_form %}
                                     <div class="col-md-6 form-group  {% if field.errors %}has-error{% endif %}">
                                         <label for="{# TODO #}" class="col-sm-4 control-label">
                                             {{ field.label }}
@@ -168,18 +173,28 @@
                 "info": true,
                 "autoWidth": false
             });
-            var dead_was_checked = $("#id_dead").is(":checked");
-            var resigned_was_checked = $("#id_resigned").is(":checked");
-            $("#id_resign_reason").prop('disabled', !resigned_was_checked);
-            $("#id_resigned").on("click", function(){
-                var checked = $("#id_resigned").is(":checked");
-                $("#id_resign_reason").prop('disabled', !checked);
+            var deadCheckbox = $("#id_subject-dead");
+            var resignedCheckbox = $("#id_study_subject-resigned");
+            var resignReasonInput = $("#id_study_subject-resign_reason");
+            var screeningNumberInput = $("input[name='screening_number']");
+
+            if (deadCheckbox.length === 0 || resignedCheckbox.length === 0 || resignReasonInput.length === 0 || screeningNumberInput === null) {
+                alert("Internal error. Contact administrators");
+            }
+
+            var dead_was_checked = deadCheckbox.is(":checked");
+            var resigned_was_checked = resignedCheckbox.is(":checked");
+
+            resignReasonInput.prop('disabled', !resigned_was_checked);
+            resignedCheckbox.on("click", function () {
+                var checked = resignedCheckbox.is(":checked");
+                resignReasonInput.prop('disabled', !checked);
             });
             $("form").submit(function () {
                 if (confirmed) {
                     return true;
                 }
-                if ((!dead_was_checked && $("#id_dead").is(":checked")) || (!resigned_was_checked && $("#id_resigned").is(":checked"))) {
+                if ((!dead_was_checked && deadCheckbox.is(":checked")) || (!resigned_was_checked && resignedCheckbox.is(":checked"))) {
                     confirmed = false;
                     $("#confirm-dead-resigned-mark-dialog").modal("show");
                     return false;
@@ -193,15 +208,16 @@
             $("#confirm-screening-change").click(function () {
                 $('#enable-screening-number-dialog').modal('hide');
 
-                $("input[name='screening_number']").attr("readonly", false);
-                $("input[name='screening_number']")[0].focus();
+                screeningNumberInput.attr("readonly", false);
+                screeningNumberInput[0].focus();
             });
 
-            $("input[name='screening_number']").attr("readonly", true);
-            $("input[name='screening_number']").after("<div><a class='btn btn-block btn-danger' onclick='show_screening_number_enable_dialog()'>modify<a/></div>");
+            screeningNumberInput.attr("readonly", true);
+            screeningNumberInput.after("<div><a class='btn btn-block btn-danger' onclick='show_screening_number_enable_dialog()'>modify<a/></div>");
 
 
         });
+
         function show_screening_number_enable_dialog() {
             $('#enable-screening-number-dialog').modal('show');
         }