From a5bc43de48acc33958d0b23d97eeac07178e1087 Mon Sep 17 00:00:00 2001 From: Florent Yvon Date: Thu, 30 Nov 2023 16:31:25 +0000 Subject: [PATCH 1/4] Changed PMID field widget to show the full value --- curation_tracker/admin.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/curation_tracker/admin.py b/curation_tracker/admin.py index 7e0e7836..4e1b2e7e 100644 --- a/curation_tracker/admin.py +++ b/curation_tracker/admin.py @@ -146,6 +146,9 @@ class Meta: 'eligibility': 'Eligibility automatically assigned (default: Yes)' } exclude = () + widgets = { + 'PMID': forms.TextInput(attrs={'size': 6}) + } def clean(self): """ Used as a form validator (on some of the fields) """ From 5776eea285658d76dfea80dadefa88c583661b20 Mon Sep 17 00:00:00 2001 From: Florent Yvon Date: Tue, 5 Dec 2023 15:52:55 +0000 Subject: [PATCH 2/4] Added filter for creation date --- curation_tracker/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/curation_tracker/admin.py b/curation_tracker/admin.py index 4e1b2e7e..f1490fc0 100644 --- a/curation_tracker/admin.py +++ b/curation_tracker/admin.py @@ -271,7 +271,7 @@ class CurationPublicationAnnotationAdmin(MultiDBModelAdmin): "curation_status","display_first_level_curation_status","display_first_level_curator", "display_second_level_curation_status","display_second_level_curator", "priority") - list_filter = ("curation_status","first_level_curator","second_level_curator","priority",("publication_date",PublicationDateFilter),) + list_filter = ("curation_status","first_level_curator","second_level_curator","priority",("publication_date",PublicationDateFilter),"created_on") search_fields = ["id","study_name","pgp_id","doi","PMID","first_level_curation_status","second_level_curation_status","curation_status","reported_trait"] ordering = ('-id',) list_per_page = 25 # No of records per page From b9d7bba1a3c7c2084b9a70b1d24637a4deeafb41 Mon Sep 17 00:00:00 2001 From: Florent Yvon Date: Tue, 5 Dec 2023 16:01:19 +0000 Subject: [PATCH 3/4] Added action for batch "Imported" tagging --- curation_tracker/admin.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/curation_tracker/admin.py b/curation_tracker/admin.py index f1490fc0..b43aff13 100644 --- a/curation_tracker/admin.py +++ b/curation_tracker/admin.py @@ -763,12 +763,16 @@ def confirm_litsuggest_formset(self,request): display_created_on.admin_order_field = 'created_on' # Batch actions - actions = ["mark_as_released"] + actions = ["mark_as_imported","mark_as_released"] @admin.action(permissions=["change"],description="Mark selected studies as Released") def mark_as_released(self, request, queryset): queryset.update(curation_status='Released') + @admin.action(permissions=["change"],description="Mark selected studies as Imported") + def mark_as_imported(self, request, queryset): + queryset.update(curation_status='Imported - Awaiting Release') + ### Email Templates ### class EmailTemplateForm(forms.ModelForm): From 24adf1fe92a90134328249cab304f0702caafe6f Mon Sep 17 00:00:00 2001 From: Florent Yvon Date: Tue, 12 Dec 2023 16:03:46 +0000 Subject: [PATCH 4/4] Fixed anchor link ref --- curation_tracker/templates/curation_tracker/release_ready.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/curation_tracker/templates/curation_tracker/release_ready.html b/curation_tracker/templates/curation_tracker/release_ready.html index 7f578125..5c09d028 100644 --- a/curation_tracker/templates/curation_tracker/release_ready.html +++ b/curation_tracker/templates/curation_tracker/release_ready.html @@ -21,7 +21,7 @@

Curation Release Ready

Content