Merge branch 'release/0.1.4'

ambition-trial · Aug 6, 2018 · c1692d3 · c1692d3
2 parents 17a5fa4 + 64ab5f4
commit c1692d3
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.1.3
+0.1.4
diff --git a/ambition_prn/admin/death_report_admin.py b/ambition_prn/admin/death_report_admin.py
@@ -42,8 +42,9 @@ class DeathReportAdmin(ModelAdminMixin, admin.ModelAdmin):
 
     list_filter = ('report_datetime', 'death_datetime', 'cause_of_death')
 
-    search_fields = ['action_identifier',
-                     'tracking_identifier', 'subject_identifier']
+    search_fields = ['subject_identifier',
+                     'action_identifier',
+                     'tracking_identifier']
 
     def get_readonly_fields(self, request, obj=None):
         fields = super().get_readonly_fields(request, obj)

diff --git a/ambition_prn/admin/death_report_tmg_admin.py b/ambition_prn/admin/death_report_tmg_admin.py
@@ -43,8 +43,9 @@ class DeathReportTmgAdmin(ModelAdminMixin, admin.ModelAdmin):
     list_filter = ('report_datetime', 'report_status',
                    'cause_of_death_agreed', 'cause_of_death')
 
-    search_fields = ['action_identifier',
-                     'tracking_identifier', 'subject_identifier',
+    search_fields = ['subject_identifier',
+                     'action_identifier',
+                     'tracking_identifier',
                      'death_report__action_identifier',
                      'death_report__tracking_identifier']
 

diff --git a/ambition_prn/admin/protocol_deviation_violation_admin.py b/ambition_prn/admin/protocol_deviation_violation_admin.py
@@ -70,8 +70,10 @@ class ProtocolDeviationViolationAdmin(ModelAdminMixin, admin.ModelAdmin):
     list_filter = ('action_required', 'report_status',
                    'report_type')
 
-    search_fields = ('tracking_identifier', 'short_description',
-                     'subject_identifier', 'action_identifier')
+    search_fields = ['subject_identifier',
+                     'action_identifier',
+                     'short_description',
+                     'tracking_identifier']
 
     def get_readonly_fields(self, request, obj=None):
         fields = super().get_readonly_fields(request, obj)

diff --git a/ambition_prn/admin/study_termination_conclusion_admin.py b/ambition_prn/admin/study_termination_conclusion_admin.py
@@ -66,8 +66,9 @@ class StudyTerminationConclusionAdmin(ModelAdminMixin, admin.ModelAdmin):
 
     list_filter = ('offschedule_datetime', 'last_study_fu_date')
 
-    search_fields = ('tracking_identifier',
-                     'subject_identifier', 'action_identifier')
+    search_fields = ('subject_identifier',
+                     'action_identifier',
+                     'tracking_identifier')
 
     def get_readonly_fields(self, request, obj=None):
         fields = super().get_readonly_fields(request, obj)

diff --git a/ambition_prn/admin/study_termination_conclusion_w10_admin.py b/ambition_prn/admin/study_termination_conclusion_w10_admin.py
@@ -36,8 +36,9 @@ class StudyTerminationConclusionW10Admin(ModelAdminMixin, admin.ModelAdmin):
 
     list_filter = ('offschedule_datetime', 'last_study_fu_date')
 
-    search_fields = ('tracking_identifier',
-                     'subject_identifier', 'action_identifier')
+    search_fields = ('subject_identifier',
+                     'action_identifier',
+                     'tracking_identifier')
 
     def get_readonly_fields(self, request, obj=None):
         fields = super().get_readonly_fields(request, obj)