use None instead of study_subject_columns to force the columns to be visible....

use None instead of study_subject_columns to force the columns to be visible. use yes_no_null_inconclusive_filter instead of yes_no_null_filter. add virus_test_date for width hack in smash.js,. Change column names so that they start in 0 and they refer to RT-PCR

smash/web/api_views/subject.py

@@ -6,7 +6,7 @@ from django.http import JsonResponse
 from django.urls import reverse
 
 from web.api_views.serialization_utils import bool_to_yes_no, flying_team_to_str, location_to_str, add_column, \
-    serialize_date, serialize_datetime, get_filters_for_data_table_request, bool_to_yes_no_null
+    serialize_date, serialize_datetime, get_filters_for_data_table_request, virus_test_to_str
 from web.models import StudySubject, Visit, Appointment, Subject, SubjectColumns, StudyColumns, Study, ContactAttempt
 from web.models.constants import SUBJECT_TYPE_CHOICES, GLOBAL_STUDY_ID
 from web.models.study_subject_list import SUBJECT_LIST_GENERIC, SUBJECT_LIST_NO_VISIT, SUBJECT_LIST_REQUIRE_CONTACT, \
@@ -78,16 +78,16 @@ def get_subject_columns(request, subject_list_type):
     add_column(result, "Excluded", "excluded", study_subject_columns, "yes_no_filter", study.columns)
     add_column(result, "Info sent", "information_sent", study_subject_columns, "yes_no_filter", study.columns)
 
-    add_column(result, "Visit 1 virus", "virus_test_1", study_subject_columns, "yes_no_null_filter", study.columns)
-    add_column(result, "Visit 1 virus date", "virus_test_1_updated", study_subject_columns, None, study.columns)
-    add_column(result, "Visit 2 virus", "virus_test_2", study_subject_columns, "yes_no_null_filter", study.columns)
-    add_column(result, "Visit 2 virus date", "virus_test_2_updated", study_subject_columns, None, study.columns)
-    add_column(result, "Visit 3 virus", "virus_test_3", study_subject_columns, "yes_no_null_filter", study.columns)
-    add_column(result, "Visit 3 virus date", "virus_test_3_updated", study_subject_columns, None, study.columns)
-    add_column(result, "Visit 4 virus", "virus_test_4", study_subject_columns, "yes_no_null_filter", study.columns)
-    add_column(result, "Visit 4 virus date", "virus_test_4_updated", study_subject_columns, None, study.columns)
-    add_column(result, "Visit 5 virus", "virus_test_5", study_subject_columns, "yes_no_null_filter", study.columns)
-    add_column(result, "Visit 5 virus date", "virus_test_5_updated", study_subject_columns, None, study.columns)
+    add_column(result, "Visit 0 RT-PCR", "virus_test_1", None, "yes_no_null_inconclusive_filter", study.columns)
+    add_column(result, "Visit 0 RT-PCR date", "virus_test_1_updated", None, "virus_test_date", study.columns)
+    add_column(result, "Visit 1 RT-PCR", "virus_test_2", None, "yes_no_null_inconclusive_filter", study.columns)
+    add_column(result, "Visit 1 RT-PCR date", "virus_test_2_updated", None, "virus_test_date", study.columns)
+    add_column(result, "Visit 2 RT-PCR", "virus_test_3", None, "yes_no_null_inconclusive_filter", study.columns)
+    add_column(result, "Visit 2 RT-PCR date", "virus_test_3_updated", None, "virus_test_date", study.columns)
+    add_column(result, "Visit 3 RT-PCR", "virus_test_4", None, "yes_no_null_inconclusive_filter", study.columns)
+    add_column(result, "Visit 3 RT-PCR date", "virus_test_4_updated", None, "virus_test_date", study.columns)
+    add_column(result, "Visit 4 RT-PCR", "virus_test_5", None, "yes_no_null_inconclusive_filter", study.columns)
+    add_column(result, "Visit 4 RT-PCR date", "virus_test_5_updated", None, "virus_test_date", study.columns)
 
     add_column(result, "Type", "type", study_subject_columns, "type_filter", study.columns)
     add_column(result, "Edit", "edit", None, None, sortable=False)