style coding issues

smash/web/static/js/redcap.js

@@ -2,8 +2,8 @@ function ignore_missing_subject(id, url) {
     $.ajax({
         url: url,
         success: function () {
-            $("#ignore_" + id).hide()
-            $("#unignore_" + id).show()
+            $("#ignore_" + id).hide();
+            $("#unignore_" + id).show();
             $("#row_" + id).find('td').addClass("ignore-row");
         }
     });
@@ -14,8 +14,8 @@ function unignore_missing_subject(id, url) {
     $.ajax({
         url: url,
         success: function () {
-            $("#unignore_" + id).hide()
-            $("#ignore_" + id).show()
+            $("#unignore_" + id).hide();
+            $("#ignore_" + id).show();
             $("#row_" + id).find('td').removeClass("ignore-row");
         }
     });

smash/web/statistics.py

@@ -74,7 +74,7 @@ class StatisticsManager(object):
          - number of appointments,
          - number of visits ended,
          - number of visits started
-         - number of appointements per type and per status
+         - number of appointments per type and per status
         :param month: the month number [1;12]
         :type month: int
         :param year: the year (4 digits)
@@ -200,8 +200,8 @@ class StatisticsManager(object):
             subject_type_filter = Q(subject__type=subject_type)
             filters_month_year_visits_started.add(subject_type_filter, Q.AND)
             filters_month_year_visits_ended.add(subject_type_filter, Q.AND)
-            subject_type_filter_appointements = Q(visit__subject__type=subject_type)
-            filters_month_year_appointments.add(subject_type_filter_appointements, Q.AND)
+            subject_type_filter_appointments = Q(visit__subject__type=subject_type)
+            filters_month_year_appointments.add(subject_type_filter_appointments, Q.AND)
         return filters_month_year_appointments, filters_month_year_visits_ended, filters_month_year_visits_started
 
     @staticmethod

smash/web/templates/subjects/add.html

@@ -94,7 +94,7 @@
                 var first_name = $("input[name='first_name']").val();
                 var last_name = $("input[name='last_name']").val();
                 if (last_name !== "") {
-                    var url = "{% url 'web.api.subjects' 'GENERIC' %}"
+                    var url = "{% url 'web.api.subjects' 'GENERIC' %}";
                     url += "?columns[0][data]=first_name&columns[0][search][value]=" + first_name;
                     url += "&columns[1][data]=last_name&columns[1][search][value]=" + last_name;
                     $.get(url, function (data) {
@@ -106,7 +106,7 @@
                         });
                         if (subjects.length > 0) {
                             $("#duplicate_warning").css("display", "block");
-                            var content = "There are possible duplicate(s) with the same name:<br/>"
+                            var content = "There are possible duplicate(s) with the same name:<br/>";
                             $.each(subjects, function (index, subject) {
                                 content += subject.first_name + " " + subject.last_name + ", born: " + subjects.date_born + ", screening number: " + subject.screening_number + "<br/>"
                             });

smash/web/urls.py

@@ -70,7 +70,7 @@ urlpatterns = [
 
     url(r'^subjects$', views.subject.subjects, name='web.views.subjects'),
     url(r'^subjects/no_visit$', views.subject.subject_no_visits, name='web.views.subject_no_visits'),
-    url(r'^subjects/equire_contact$', views.subject.subject_require_contact, name='web.views.subject_require_contact'),
+    url(r'^subjects/require_contact$', views.subject.subject_require_contact, name='web.views.subject_require_contact'),
     url(r'^subjects/add$', views.subject.subject_add, name='web.views.subject_add'),
     url(r'^subjects/subject_visit_details/(?P<id>\d+)$', views.subject.subject_visit_details,
         name='web.views.subject_visit_details'),
@@ -120,7 +120,7 @@ urlpatterns = [
     ####################
 
     url(r'^equipment_and_rooms$', views.equipment.equipment_and_rooms, name='web.views.equipment_and_rooms'),
-    url(r'^equipment_and_rooms/eqdef$', views.equipment.equipment_def, name='web.views.equipment_def'),
+    url(r'^equipment_and_rooms/equipment_def$', views.equipment.equipment_def, name='web.views.equipment_def'),
     url(r'^equipment_and_rooms/kit_requests$', views.kit.kit_requests, name='web.views.kit_requests'),
     url(r'^equipment_and_rooms/kit_requests/(?P<start_date>[\w-]+)/$', views.kit.kit_requests_send_mail,
         name='web.views.kit_requests_send_mail'),

smash/web/views/subject.py

@@ -96,5 +96,5 @@ def subject_visit_details(request, id):
         if not visit.is_finished:
             allow_add_visit = False
 
-    return wrap_response(request, 'subjects/visitdetails.html',
+    return wrap_response(request, 'subjects/visit_details.html',
                          {'display': visits_data, "id": id, "allow_add_visit": allow_add_visit})