From a22fa9b46191784e5ac7a2984f9b4148ec71d849 Mon Sep 17 00:00:00 2001 From: William Welling Date: Mon, 7 Jun 2021 14:56:41 -0500 Subject: [PATCH 01/15] add un sustainable goals facets --- src/main/resources/defaults/directoryViews.yml | 16 ++++++++++++++++ src/main/resources/defaults/discoveryViews.yml | 10 +++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/main/resources/defaults/directoryViews.yml b/src/main/resources/defaults/directoryViews.yml index b09ec8543..c7acdf574 100644 --- a/src/main/resources/defaults/directoryViews.yml +++ b/src/main/resources/defaults/directoryViews.yml @@ -37,6 +37,14 @@ pageSize: 10 collapsed: true hidden: false + - name: UN Sustainable Development Goals + field: tags + type: STRING + sort: COUNT + direction: DESC + pageSize: 10 + collapsed: true + hidden: false filters: - field: class value: Person @@ -191,6 +199,14 @@ pageSize: 10 collapsed: true hidden: false + - name: UN Sustainable Development Goals + field: tags + type: STRING + sort: COUNT + direction: DESC + pageSize: 10 + collapsed: true + hidden: false filters: - field: class value: Document diff --git a/src/main/resources/defaults/discoveryViews.yml b/src/main/resources/defaults/discoveryViews.yml index 5cabe0950..35908ad76 100644 --- a/src/main/resources/defaults/discoveryViews.yml +++ b/src/main/resources/defaults/discoveryViews.yml @@ -42,6 +42,14 @@ pageSize: 10 collapsed: true hidden: false + - name: UN Sustainable Development Goals + field: tags + type: STRING + sort: COUNT + direction: DESC + pageSize: 10 + collapsed: true + hidden: false - name: Published In field: selectedPublicationVenue type: STRING @@ -260,7 +268,7 @@ pageSize: 10 collapsed: true hidden: false - - name: Research Tag + - name: UN Sustainable Development Goals field: tags type: STRING sort: COUNT From 5a0d8959c00244c718b3ac08d3331b8cccbb0fac Mon Sep 17 00:00:00 2001 From: William Welling Date: Tue, 8 Jun 2021 08:29:11 -0500 Subject: [PATCH 02/15] switch research tags to un goals --- .../displayViews/persons/asideTemplate.html | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/resources/defaults/displayViews/persons/asideTemplate.html b/src/main/resources/defaults/displayViews/persons/asideTemplate.html index d76ecfe16..741dd581c 100644 --- a/src/main/resources/defaults/displayViews/persons/asideTemplate.html +++ b/src/main/resources/defaults/displayViews/persons/asideTemplate.html @@ -16,11 +16,13 @@
- Research Tags: + UN Sustainable Development Goals:
-
+
{{#tags publications}} - {{this}} + + + {{/tags}}
@@ -123,12 +125,13 @@
- - Research Tags: + UN Sustainable Development Goals:
-
+
{{#tags publications}} - {{this}} + + + {{/tags}}
From 4e15a79e177c8f871df1d38df6ee1738e14e9367 Mon Sep 17 00:00:00 2001 From: William Welling Date: Tue, 8 Jun 2021 08:42:56 -0500 Subject: [PATCH 03/15] update tags on document display view --- src/main/resources/defaults/displayViews.yml | 2 +- .../defaults/displayViews/documents/other/tags.html | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/resources/defaults/displayViews.yml b/src/main/resources/defaults/displayViews.yml index 9f7676a6b..9bff144df 100644 --- a/src/main/resources/defaults/displayViews.yml +++ b/src/main/resources/defaults/displayViews.yml @@ -1338,7 +1338,7 @@ template: "defaults/displayViews/documents/other/dateTimeValue.html" field: dateTimeValue order: 9 - - name: tags + - name: UN Sustainable Development Goals template: "defaults/displayViews/documents/other/tags.html" field: tags order: 10 diff --git a/src/main/resources/defaults/displayViews/documents/other/tags.html b/src/main/resources/defaults/displayViews/documents/other/tags.html index 4fc05f6da..9bc80962a 100644 --- a/src/main/resources/defaults/displayViews/documents/other/tags.html +++ b/src/main/resources/defaults/displayViews/documents/other/tags.html @@ -1,9 +1,7 @@ -{{#if tags}} -
    +
    {{#each tags}} -
  • - {{this}} -
    • + + + {{/each}} -
-{{/if}} +
From 58333090007991537c4d60e8f370a1c3c17a3422 Mon Sep 17 00:00:00 2001 From: William Welling Date: Tue, 8 Jun 2021 09:19:25 -0500 Subject: [PATCH 04/15] style un goal badges in templates --- .../directoryViews/research/default.html | 69 +++++++++++++++++- .../discoveryViews/publications/default.html | 69 +++++++++++++++++- .../selectedPublications/book.html | 71 ++++++++++++++++++- .../selectedPublications/chapter.html | 71 ++++++++++++++++++- .../selectedPublications/default.html | 71 ++++++++++++++++++- .../internetPublication.html | 69 +++++++++++++++++- 6 files changed, 409 insertions(+), 11 deletions(-) diff --git a/src/main/resources/defaults/directoryViews/research/default.html b/src/main/resources/defaults/directoryViews/research/default.html index 8db495114..fe076fb3d 100644 --- a/src/main/resources/defaults/directoryViews/research/default.html +++ b/src/main/resources/defaults/directoryViews/research/default.html @@ -60,7 +60,11 @@ {{#if tags}} {{#each tags}} - {{this}} + + + {{toUNGoal this}} + + {{/each}} {{/if}} @@ -74,4 +78,65 @@ .badge-custom { height: 18px; } - \ No newline at end of file + + .badge-goal { + border: 1px solid lightgray; + border-radius: 0px; + border-left-width: 5px; + border-left-style: solid; + padding-left: 5px; + height: 18px; + } + + .badge-sdg-1 { + border-left-color: #E5243B; + } + .badge-sdg-2 { + border-left-color: #DDA63A; + } + .badge-sdg-3 { + border-left-color: #4C9F38; + } + .badge-sdg-4 { + border-left-color: #C5192D; + } + .badge-sdg-5 { + border-left-color: #FF3A21; + } + .badge-sdg-6 { + border-left-color: #26BDE2; + } + .badge-sdg-7 { + border-left-color: #FCC30B; + } + .badge-sdg-8 { + border-left-color: #A21942; + } + .badge-sdg-9 { + border-left-color: #FD6925; + } + .badge-sdg-10 { + border-left-color: #DD1367; + } + .badge-sdg-11 { + border-left-color: #FD9D24; + } + .badge-sdg-12 { + border-left-color: #BF8B2E; + } + .badge-sdg-13 { + border-left-color: #3F7E44; + } + .badge-sdg-14 { + border-left-color: #0A97D9; + } + .badge-sdg-15 { + border-left-color: #56C02B; + } + .badge-sdg-16 { + border-left-color: #00689D; + } + .badge-sdg-17 { + border-left-color: #19486A; + } + diff --git a/src/main/resources/defaults/discoveryViews/publications/default.html b/src/main/resources/defaults/discoveryViews/publications/default.html index 31e490df3..30547b01d 100644 --- a/src/main/resources/defaults/discoveryViews/publications/default.html +++ b/src/main/resources/defaults/discoveryViews/publications/default.html @@ -66,7 +66,11 @@ {{#if tags}} {{#each tags}} - {{this}} + + + {{toUNGoal this}} + + {{/each}} {{/if}} @@ -85,4 +89,65 @@ .badge-custom { height: 18px; } - \ No newline at end of file + + .badge-goal { + border: 1px solid lightgray; + border-radius: 0px; + border-left-width: 5px; + border-left-style: solid; + padding-left: 5px; + height: 18px; + } + + .badge-sdg-1 { + border-left-color: #E5243B; + } + .badge-sdg-2 { + border-left-color: #DDA63A; + } + .badge-sdg-3 { + border-left-color: #4C9F38; + } + .badge-sdg-4 { + border-left-color: #C5192D; + } + .badge-sdg-5 { + border-left-color: #FF3A21; + } + .badge-sdg-6 { + border-left-color: #26BDE2; + } + .badge-sdg-7 { + border-left-color: #FCC30B; + } + .badge-sdg-8 { + border-left-color: #A21942; + } + .badge-sdg-9 { + border-left-color: #FD6925; + } + .badge-sdg-10 { + border-left-color: #DD1367; + } + .badge-sdg-11 { + border-left-color: #FD9D24; + } + .badge-sdg-12 { + border-left-color: #BF8B2E; + } + .badge-sdg-13 { + border-left-color: #3F7E44; + } + .badge-sdg-14 { + border-left-color: #0A97D9; + } + .badge-sdg-15 { + border-left-color: #56C02B; + } + .badge-sdg-16 { + border-left-color: #00689D; + } + .badge-sdg-17 { + border-left-color: #19486A; + } + diff --git a/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/book.html b/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/book.html index c8fd38f9d..4d46f0096 100644 --- a/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/book.html +++ b/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/book.html @@ -54,7 +54,13 @@ {{#if tags}} {{#each tags}} - {{this}} + + + + {{toUNGoal this}} + + + {{/each}} {{/if}}
@@ -70,4 +76,65 @@ .__dimensions_Badge_Image svg { display: none; } - \ No newline at end of file + + .badge-goal { + border: 1px solid lightgray; + border-radius: 0px; + border-left-width: 5px; + border-left-style: solid; + padding-left: 5px; + height: 18px; + } + + .badge-sdg-1 { + border-left-color: #E5243B; + } + .badge-sdg-2 { + border-left-color: #DDA63A; + } + .badge-sdg-3 { + border-left-color: #4C9F38; + } + .badge-sdg-4 { + border-left-color: #C5192D; + } + .badge-sdg-5 { + border-left-color: #FF3A21; + } + .badge-sdg-6 { + border-left-color: #26BDE2; + } + .badge-sdg-7 { + border-left-color: #FCC30B; + } + .badge-sdg-8 { + border-left-color: #A21942; + } + .badge-sdg-9 { + border-left-color: #FD6925; + } + .badge-sdg-10 { + border-left-color: #DD1367; + } + .badge-sdg-11 { + border-left-color: #FD9D24; + } + .badge-sdg-12 { + border-left-color: #BF8B2E; + } + .badge-sdg-13 { + border-left-color: #3F7E44; + } + .badge-sdg-14 { + border-left-color: #0A97D9; + } + .badge-sdg-15 { + border-left-color: #56C02B; + } + .badge-sdg-16 { + border-left-color: #00689D; + } + .badge-sdg-17 { + border-left-color: #19486A; + } + diff --git a/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/chapter.html b/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/chapter.html index 9ccefaf74..f13b8522c 100644 --- a/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/chapter.html +++ b/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/chapter.html @@ -75,7 +75,13 @@ {{#if tags}} {{#each tags}} - {{this}} + + + + {{toUNGoal this}} + + + {{/each}} {{/if}}
@@ -91,4 +97,65 @@ .__dimensions_Badge_Image svg { display: none; } - \ No newline at end of file + + .badge-goal { + border: 1px solid lightgray; + border-radius: 0px; + border-left-width: 5px; + border-left-style: solid; + padding-left: 5px; + height: 18px; + } + + .badge-sdg-1 { + border-left-color: #E5243B; + } + .badge-sdg-2 { + border-left-color: #DDA63A; + } + .badge-sdg-3 { + border-left-color: #4C9F38; + } + .badge-sdg-4 { + border-left-color: #C5192D; + } + .badge-sdg-5 { + border-left-color: #FF3A21; + } + .badge-sdg-6 { + border-left-color: #26BDE2; + } + .badge-sdg-7 { + border-left-color: #FCC30B; + } + .badge-sdg-8 { + border-left-color: #A21942; + } + .badge-sdg-9 { + border-left-color: #FD6925; + } + .badge-sdg-10 { + border-left-color: #DD1367; + } + .badge-sdg-11 { + border-left-color: #FD9D24; + } + .badge-sdg-12 { + border-left-color: #BF8B2E; + } + .badge-sdg-13 { + border-left-color: #3F7E44; + } + .badge-sdg-14 { + border-left-color: #0A97D9; + } + .badge-sdg-15 { + border-left-color: #56C02B; + } + .badge-sdg-16 { + border-left-color: #00689D; + } + .badge-sdg-17 { + border-left-color: #19486A; + } + diff --git a/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/default.html b/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/default.html index 77d7eebed..9b136f6c2 100644 --- a/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/default.html +++ b/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/default.html @@ -76,7 +76,13 @@ {{#if tags}} {{#each tags}} - {{this}} + + + + {{toUNGoal this}} + + + {{/each}} {{/if}} @@ -92,4 +98,65 @@ .__dimensions_Badge_Image svg { display: none; } - \ No newline at end of file + + .badge-goal { + border: 1px solid lightgray; + border-radius: 0px; + border-left-width: 5px; + border-left-style: solid; + padding-left: 5px; + height: 18px; + } + + .badge-sdg-1 { + border-left-color: #E5243B; + } + .badge-sdg-2 { + border-left-color: #DDA63A; + } + .badge-sdg-3 { + border-left-color: #4C9F38; + } + .badge-sdg-4 { + border-left-color: #C5192D; + } + .badge-sdg-5 { + border-left-color: #FF3A21; + } + .badge-sdg-6 { + border-left-color: #26BDE2; + } + .badge-sdg-7 { + border-left-color: #FCC30B; + } + .badge-sdg-8 { + border-left-color: #A21942; + } + .badge-sdg-9 { + border-left-color: #FD6925; + } + .badge-sdg-10 { + border-left-color: #DD1367; + } + .badge-sdg-11 { + border-left-color: #FD9D24; + } + .badge-sdg-12 { + border-left-color: #BF8B2E; + } + .badge-sdg-13 { + border-left-color: #3F7E44; + } + .badge-sdg-14 { + border-left-color: #0A97D9; + } + .badge-sdg-15 { + border-left-color: #56C02B; + } + .badge-sdg-16 { + border-left-color: #00689D; + } + .badge-sdg-17 { + border-left-color: #19486A; + } + diff --git a/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/internetPublication.html b/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/internetPublication.html index d8705c270..aed804804 100644 --- a/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/internetPublication.html +++ b/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/internetPublication.html @@ -80,7 +80,13 @@ {{#if tags}} {{#each tags}} - {{this}} + + + + {{toUNGoal this}} + + + {{/each}} {{/if}} @@ -96,4 +102,65 @@ .__dimensions_Badge_Image svg { display: none; } + + .badge-goal { + border: 1px solid lightgray; + border-radius: 0px; + border-left-width: 5px; + border-left-style: solid; + padding-left: 5px; + height: 18px; + } + + .badge-sdg-1 { + border-left-color: #E5243B; + } + .badge-sdg-2 { + border-left-color: #DDA63A; + } + .badge-sdg-3 { + border-left-color: #4C9F38; + } + .badge-sdg-4 { + border-left-color: #C5192D; + } + .badge-sdg-5 { + border-left-color: #FF3A21; + } + .badge-sdg-6 { + border-left-color: #26BDE2; + } + .badge-sdg-7 { + border-left-color: #FCC30B; + } + .badge-sdg-8 { + border-left-color: #A21942; + } + .badge-sdg-9 { + border-left-color: #FD6925; + } + .badge-sdg-10 { + border-left-color: #DD1367; + } + .badge-sdg-11 { + border-left-color: #FD9D24; + } + .badge-sdg-12 { + border-left-color: #BF8B2E; + } + .badge-sdg-13 { + border-left-color: #3F7E44; + } + .badge-sdg-14 { + border-left-color: #0A97D9; + } + .badge-sdg-15 { + border-left-color: #56C02B; + } + .badge-sdg-16 { + border-left-color: #00689D; + } + .badge-sdg-17 { + border-left-color: #19486A; + } From 261e5f4d0887a47c812e77f7651e41664d221d67 Mon Sep 17 00:00:00 2001 From: William Welling Date: Tue, 8 Jun 2021 11:02:11 -0500 Subject: [PATCH 05/15] fix styling of un goal badges in templates --- .../directoryViews/research/default.html | 3 ++- .../discoveryViews/publications/default.html | 3 ++- .../selectedPublications/book.html | 23 ++++++++++--------- .../selectedPublications/chapter.html | 23 ++++++++++--------- .../selectedPublications/default.html | 23 ++++++++++--------- .../internetPublication.html | 23 ++++++++++--------- 6 files changed, 52 insertions(+), 46 deletions(-) diff --git a/src/main/resources/defaults/directoryViews/research/default.html b/src/main/resources/defaults/directoryViews/research/default.html index fe076fb3d..6c6f6a3bb 100644 --- a/src/main/resources/defaults/directoryViews/research/default.html +++ b/src/main/resources/defaults/directoryViews/research/default.html @@ -60,7 +60,7 @@ {{#if tags}} {{#each tags}} - + {{toUNGoal this}} @@ -80,6 +80,7 @@ } .badge-goal { + vertical-align: middle; border: 1px solid lightgray; border-radius: 0px; border-left-width: 5px; diff --git a/src/main/resources/defaults/discoveryViews/publications/default.html b/src/main/resources/defaults/discoveryViews/publications/default.html index 30547b01d..9c54d6bb9 100644 --- a/src/main/resources/defaults/discoveryViews/publications/default.html +++ b/src/main/resources/defaults/discoveryViews/publications/default.html @@ -66,7 +66,7 @@ {{#if tags}} {{#each tags}} - + {{toUNGoal this}} @@ -91,6 +91,7 @@ } .badge-goal { + vertical-align: middle; border: 1px solid lightgray; border-radius: 0px; border-left-width: 5px; diff --git a/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/book.html b/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/book.html index 4d46f0096..c839cf4b2 100644 --- a/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/book.html +++ b/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/book.html @@ -16,32 +16,32 @@
{{#if doi}} - doi badge + doi badge {{/if}} {{#if pmcid}} - pubmed badge + pubmed badge {{/if}} {{#if uri}} - open access badge + open access badge {{/if}} {{#if url}} - online source badge + online source badge {{/if}} {{#if key}} - + {{else}} {{#if doi}} - + {{else}} {{#if uri}} - + {{else}} {{#if isbn13}} - + {{else}} {{#if isbn10}} - + {{/if}} {{/if}} {{/if}} @@ -49,13 +49,13 @@ {{/if}} {{#if doi}} - + {{/if}} {{#if tags}} {{#each tags}} - + {{toUNGoal this}} @@ -78,6 +78,7 @@ } .badge-goal { + vertical-align: middle; border: 1px solid lightgray; border-radius: 0px; border-left-width: 5px; diff --git a/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/chapter.html b/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/chapter.html index f13b8522c..ff7e1b211 100644 --- a/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/chapter.html +++ b/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/chapter.html @@ -37,32 +37,32 @@
{{#if doi}} - doi badge + doi badge {{/if}} {{#if pmcid}} - pubmed badge + pubmed badge {{/if}} {{#if uri}} - open access badge + open access badge {{/if}} {{#if url}} - online source badge + online source badge {{/if}} {{#if key}} - + {{else}} {{#if doi}} - + {{else}} {{#if uri}} - + {{else}} {{#if isbn13}} - + {{else}} {{#if isbn10}} - + {{/if}} {{/if}} {{/if}} @@ -70,13 +70,13 @@ {{/if}} {{#if doi}} - + {{/if}} {{#if tags}} {{#each tags}} - + {{toUNGoal this}} @@ -99,6 +99,7 @@ } .badge-goal { + vertical-align: middle; border: 1px solid lightgray; border-radius: 0px; border-left-width: 5px; diff --git a/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/default.html b/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/default.html index 9b136f6c2..c773a1671 100644 --- a/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/default.html +++ b/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/default.html @@ -38,32 +38,32 @@
{{#if doi}} - doi badge + doi badge {{/if}} {{#if pmcid}} - pubmed badge + pubmed badge {{/if}} {{#if uri}} - open access badge + open access badge {{/if}} {{#if url}} - online source badge + online source badge {{/if}} {{#if key}} - + {{else}} {{#if doi}} - + {{else}} {{#if uri}} - + {{else}} {{#if isbn13}} - + {{else}} {{#if isbn10}} - + {{/if}} {{/if}} {{/if}} @@ -71,13 +71,13 @@ {{/if}} {{#if doi}} - + {{/if}} {{#if tags}} {{#each tags}} - + {{toUNGoal this}} @@ -100,6 +100,7 @@ } .badge-goal { + vertical-align: middle; border: 1px solid lightgray; border-radius: 0px; border-left-width: 5px; diff --git a/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/internetPublication.html b/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/internetPublication.html index aed804804..3f849e331 100644 --- a/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/internetPublication.html +++ b/src/main/resources/defaults/displayViews/persons/publications/selectedPublications/internetPublication.html @@ -42,32 +42,32 @@
{{#if doi}} - doi badge + doi badge {{/if}} {{#if pmcid}} - pubmed badge + pubmed badge {{/if}} {{#if uri}} - open access badge + open access badge {{/if}} {{#if url}} - online source badge + online source badge {{/if}} {{#if key}} - + {{else}} {{#if doi}} - + {{else}} {{#if uri}} - + {{else}} {{#if isbn13}} - + {{else}} {{#if isbn10}} - + {{/if}} {{/if}} {{/if}} @@ -75,13 +75,13 @@ {{/if}} {{#if doi}} - + {{/if}} {{#if tags}} {{#each tags}} - + {{toUNGoal this}} @@ -104,6 +104,7 @@ } .badge-goal { + vertical-align: middle; border: 1px solid lightgray; border-radius: 0px; border-left-width: 5px; From 51af6c81d2cdf204f77683f82e595f589b923f39 Mon Sep 17 00:00:00 2001 From: William Welling Date: Tue, 8 Jun 2021 12:41:25 -0500 Subject: [PATCH 06/15] refactor pubmed central id to pubmed id --- src/main/resources/defaults/displayViews.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/defaults/displayViews.yml b/src/main/resources/defaults/displayViews.yml index 9bff144df..e01127889 100644 --- a/src/main/resources/defaults/displayViews.yml +++ b/src/main/resources/defaults/displayViews.yml @@ -1202,7 +1202,7 @@ template: "defaults/displayViews/documents/identity/nihManuscriptSubmissionSystemId.html" field: nihmsid order: 2 - - name: PubMed Central ID + - name: PubMed ID template: "defaults/displayViews/documents/identity/pubMedCentralId.html" field: pmcid order: 3 From 1d2f01a2670de80231fdeedf6ee14e2d38bbfacb Mon Sep 17 00:00:00 2001 From: William Welling Date: Tue, 8 Jun 2021 15:55:16 -0500 Subject: [PATCH 07/15] add book title template --- src/main/resources/defaults/displayViews.yml | 50 ++++++++++--------- .../documents/overview/bookTitle.html | 1 + 2 files changed, 28 insertions(+), 23 deletions(-) create mode 100644 src/main/resources/defaults/displayViews/documents/overview/bookTitle.html diff --git a/src/main/resources/defaults/displayViews.yml b/src/main/resources/defaults/displayViews.yml index 9bff144df..f15658ba8 100644 --- a/src/main/resources/defaults/displayViews.yml +++ b/src/main/resources/defaults/displayViews.yml @@ -1092,106 +1092,110 @@ template: "defaults/displayViews/documents/overview/abstract.html" field: abstract order: 1 + - name: book title + template: "defaults/displayViews/documents/overview/bookTitle.html" + field: bookTitle + order: 2 - name: authors template: "defaults/displayViews/documents/overview/authors.html" field: authors - order: 2 + order: 3 - name: author list (cited authors) template: "defaults/displayViews/documents/overview/authorList.html" field: authorList - order: 3 + order: 4 - name: editors template: "defaults/displayViews/documents/overview/editors.html" field: editors - order: 4 + order: 5 - name: editor list (cited editors) template: "defaults/displayViews/documents/overview/editorList.html" field: editorList - order: 5 + order: 6 - name: etd chair template: "defaults/displayViews/documents/overview/etdChair.html" field: etdChairedBy - order: 6 + order: 7 lazyReferences: - etdChairedBy - name: capstone (non-thesis) advisor template: "defaults/displayViews/documents/overview/advisor.html" field: advisedBy - order: 7 + order: 8 lazyReferences: - advisedBy - name: translator template: "defaults/displayViews/documents/overview/translator.html" field: translators - order: 8 + order: 9 - name: status template: "defaults/displayViews/documents/overview/status.html" field: status - order: 9 + order: 10 - name: publication date template: "defaults/displayViews/documents/overview/publicationDate.html" field: publicationDate - order: 10 + order: 11 - name: publisher template: "defaults/displayViews/documents/overview/publisher.html" field: publisher - order: 11 + order: 12 - name: has subject area template: "defaults/displayViews/documents/overview/hasSubjectArea.html" field: subjectAreas - order: 12 + order: 13 - name: has restriction template: "defaults/displayViews/documents/overview/hasRestriction.html" field: restrictions - order: 13 + order: 14 - name: has document part template: "defaults/displayViews/documents/overview/hasDocumentPart.html" field: documentParts - order: 14 + order: 15 - name: features template: "defaults/displayViews/documents/overview/features.html" field: features - order: 15 + order: 16 - name: published in template: "defaults/displayViews/documents/overview/publishedIn.html" field: publicationVenue - order: 16 + order: 17 lazyReferences: - publicationVenue - name: geographic focus template: "defaults/displayViews/documents/overview/geographicFocus.html" field: geographicFocus - order: 17 + order: 18 - name: documentation for project or resource template: "defaults/displayViews/documents/overview/documentationForProjectOrResource.html" field: documentationForProjectOrResource - order: 18 + order: 19 - name: output of process or event template: "defaults/displayViews/documents/overview/outputOfProcessOrEvent.html" field: outputOfProcessOrEvent - order: 19 + order: 20 - name: open educational resource for template: "defaults/displayViews/documents/overview/presentedAtEvent.html" field: presentedAt - order: 20 + order: 21 lazyReferences: - presentedAt - name: keywords template: "defaults/displayViews/documents/overview/keywords.html" field: keywords - order: 21 + order: 22 - name: altmetric score template: "defaults/displayViews/documents/overview/altmetricScore.html" field: altmetricScore - order: 22 + order: 23 - name: citation count template: "defaults/displayViews/documents/overview/citationCount.html" field: citationCount - order: 23 + order: 24 - name: news outlet template: "defaults/displayViews/documents/overview/newsOutlet.html" field: newsOutlet - order: 24 + order: 25 - name: Identity sections: - name: EAN International-Uniform Code Council (EAN-UCC) 13 diff --git a/src/main/resources/defaults/displayViews/documents/overview/bookTitle.html b/src/main/resources/defaults/displayViews/documents/overview/bookTitle.html new file mode 100644 index 000000000..59d5efa43 --- /dev/null +++ b/src/main/resources/defaults/displayViews/documents/overview/bookTitle.html @@ -0,0 +1 @@ +

{{{bookTitle}}}

From f12010070fb7d2f9dbeb2efcb7a9d11074286ab6 Mon Sep 17 00:00:00 2001 From: William Welling Date: Tue, 8 Jun 2021 16:18:15 -0500 Subject: [PATCH 08/15] add selected publication tag to person --- .../scholars/middleware/discovery/model/Person.java | 12 ++++++++++++ .../sparql/person/selectedPublicationDate.sparql | 2 +- .../sparql/person/selectedPublicationTag.sparql | 13 +++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/templates/sparql/person/selectedPublicationTag.sparql diff --git a/src/main/java/edu/tamu/scholars/middleware/discovery/model/Person.java b/src/main/java/edu/tamu/scholars/middleware/discovery/model/Person.java index dd744234d..106d3d9bd 100644 --- a/src/main/java/edu/tamu/scholars/middleware/discovery/model/Person.java +++ b/src/main/java/edu/tamu/scholars/middleware/discovery/model/Person.java @@ -266,6 +266,10 @@ public class Person extends Common { @PropertySource(template = "person/selectedPublicationVenue", predicate = "http://www.w3.org/2000/01/rdf-schema#label", unique = true) private List selectedPublicationVenue; + @Indexed(type = "nested_whole_strings") + @PropertySource(template = "person/selectedPublicationTag", predicate = "http://purl.obolibrary.org/obo/ARG_0000015") + private List selectedPublicationTag; + @Indexed(type = "nested_whole_strings", searchable = false) @NestedObject(properties = { @Reference(value = "collectionOrSeriesEditorForType", key = "type"), @Reference(value = "collectionOrSeriesEditorForRole", key = "role"), @Reference(value = "collectionOrSeriesEditorForStartDate", key = "startDate"), @Reference(value = "collectionOrSeriesEditorForEndDate", key = "endDate") }) @PropertySource(template = "person/collectionOrSeriesEditorFor", predicate = "http://www.w3.org/2000/01/rdf-schema#label") @@ -1145,6 +1149,14 @@ public void setSelectedPublicationVenue(List selectedPublicationVenue) { this.selectedPublicationVenue = selectedPublicationVenue; } + public List getSelectedPublicationTag() { + return selectedPublicationTag; + } + + public void setSelectedPublicationTag(List selectedPublicationTag) { + this.selectedPublicationTag = selectedPublicationTag; + } + public List getCollectionOrSeriesEditorFor() { return collectionOrSeriesEditorFor; } diff --git a/src/main/resources/templates/sparql/person/selectedPublicationDate.sparql b/src/main/resources/templates/sparql/person/selectedPublicationDate.sparql index 6b5bd626e..f8d80f150 100644 --- a/src/main/resources/templates/sparql/person/selectedPublicationDate.sparql +++ b/src/main/resources/templates/sparql/person/selectedPublicationDate.sparql @@ -11,4 +11,4 @@ CONSTRUCT { ?publication ?dateTimeValue ?date . ?date vivo:dateTime ?dateTime . BIND( CONCAT( STR(?dateTime), REPLACE(STR(?publication), "(^.*/)", "::") ) AS ?dateTimeWithId ) . -} \ No newline at end of file +} diff --git a/src/main/resources/templates/sparql/person/selectedPublicationTag.sparql b/src/main/resources/templates/sparql/person/selectedPublicationTag.sparql new file mode 100644 index 000000000..305f0d23a --- /dev/null +++ b/src/main/resources/templates/sparql/person/selectedPublicationTag.sparql @@ -0,0 +1,13 @@ +PREFIX vivo: +PREFIX obo: + +CONSTRUCT { + ?publication obo:ARG_0000015 ?tagWithId . +} WHERE { + <{{uri}}> vivo:relatedBy ?authorship . + ?authorship a vivo:Authorship . + ?authorship vivo:relates ?publication . + ?publication a obo:IAO_0000030 . + ?publication obo:ARG_0000015 ?tag . + BIND( CONCAT( STR(?tag), REPLACE(STR(?publication), "(^.*/)", "::") ) AS ?tagWithId ) . +} From 966000bb5c1c7b89558673e4ee63c6cf6a1beb9d Mon Sep 17 00:00:00 2001 From: William Welling Date: Tue, 8 Jun 2021 16:21:08 -0500 Subject: [PATCH 09/15] update person views facet un goals field --- src/main/resources/defaults/directoryViews.yml | 2 +- src/main/resources/defaults/discoveryViews.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/defaults/directoryViews.yml b/src/main/resources/defaults/directoryViews.yml index c7acdf574..51b46c8b7 100644 --- a/src/main/resources/defaults/directoryViews.yml +++ b/src/main/resources/defaults/directoryViews.yml @@ -38,7 +38,7 @@ collapsed: true hidden: false - name: UN Sustainable Development Goals - field: tags + field: selectedPublicationTag type: STRING sort: COUNT direction: DESC diff --git a/src/main/resources/defaults/discoveryViews.yml b/src/main/resources/defaults/discoveryViews.yml index 35908ad76..256ef9df9 100644 --- a/src/main/resources/defaults/discoveryViews.yml +++ b/src/main/resources/defaults/discoveryViews.yml @@ -43,7 +43,7 @@ collapsed: true hidden: false - name: UN Sustainable Development Goals - field: tags + field: selectedPublicationTag type: STRING sort: COUNT direction: DESC From d979667286aaf9bea13877809b21648820dfe8c8 Mon Sep 17 00:00:00 2001 From: William Welling Date: Tue, 8 Jun 2021 16:36:15 -0500 Subject: [PATCH 10/15] additionally filter for author college --- .../templates/sparql/document/authorOrganization.sparql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/templates/sparql/document/authorOrganization.sparql b/src/main/resources/templates/sparql/document/authorOrganization.sparql index ddfaa12d6..304b99292 100644 --- a/src/main/resources/templates/sparql/document/authorOrganization.sparql +++ b/src/main/resources/templates/sparql/document/authorOrganization.sparql @@ -17,5 +17,5 @@ CONSTRUCT { ?organization rdfs:label ?label . ?organization vitro:mostSpecificType ?mostSpecificType . BIND( CONCAT( STR(?label), REPLACE(STR(?author), "(^.*/)", "::"), REPLACE(STR(?organization), "(^.*/)", "::") ) AS ?labelWithId ) . - FILTER(lang(?label) = '' && (?mostSpecificType = vivo:AcademicDepartment || ?mostSpecificType = vivo:Institute || ?mostSpecificType = vivo:Library || ?mostSpecificType = vivo:Center || ?mostSpecificType = vivo:Laboratory)) -} \ No newline at end of file + FILTER(lang(?label) = '' && (?mostSpecificType = vivo:AcademicDepartment || ?mostSpecificType = vivo:College || ?mostSpecificType = vivo:Institute || ?mostSpecificType = vivo:Library || ?mostSpecificType = vivo:Center || ?mostSpecificType = vivo:Laboratory)) +} From 412284954357db7c2a4d0d9a14310f2aaac862ed Mon Sep 17 00:00:00 2001 From: William Welling Date: Tue, 8 Jun 2021 20:58:12 -0500 Subject: [PATCH 11/15] add update person graphql model --- .../tamu/scholars/middleware/graphql/model/Person.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/edu/tamu/scholars/middleware/graphql/model/Person.java b/src/main/java/edu/tamu/scholars/middleware/graphql/model/Person.java index 1c899ef6a..f554c1a94 100644 --- a/src/main/java/edu/tamu/scholars/middleware/graphql/model/Person.java +++ b/src/main/java/edu/tamu/scholars/middleware/graphql/model/Person.java @@ -153,6 +153,8 @@ public class Person extends AbstractNestedDocument { private List keywords; + private List selectedPublicationTag; + private String researchOverview; private List principalInvestigatorOn; @@ -611,6 +613,14 @@ public void setKeywords(List keywords) { this.keywords = keywords; } + public List getSelectedPublicationTag() { + return selectedPublicationTag; + } + + public void setSelectedPublicationTag(List selectedPublicationTag) { + this.selectedPublicationTag = selectedPublicationTag; + } + public String getResearchOverview() { return researchOverview; } From 8347c2a5d0d64f763a452d578cac4a6f52046042 Mon Sep 17 00:00:00 2001 From: William Welling Date: Wed, 9 Jun 2021 10:06:13 -0500 Subject: [PATCH 12/15] add tags as nested object property --- .../scholars/middleware/discovery/model/Person.java | 2 +- .../tamu/scholars/middleware/graphql/model/Person.java | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/main/java/edu/tamu/scholars/middleware/discovery/model/Person.java b/src/main/java/edu/tamu/scholars/middleware/discovery/model/Person.java index 106d3d9bd..3d04fad53 100644 --- a/src/main/java/edu/tamu/scholars/middleware/discovery/model/Person.java +++ b/src/main/java/edu/tamu/scholars/middleware/discovery/model/Person.java @@ -246,7 +246,7 @@ public class Person extends Common { private List adviseeOfEndDate; @Indexed(type = "nested_whole_strings", copyTo = "_text_") - @NestedObject(properties = { @Reference(value = "selectedPublicationType", key = "type"), @Reference(value = "selectedPublicationDate", key = "publicationDate"), @Reference(value = "selectedPublicationPublisher", key = "publisher"), @Reference(value = "selectedPublicationVenue", key = "venue") }) + @NestedObject(properties = { @Reference(value = "selectedPublicationType", key = "type"), @Reference(value = "selectedPublicationDate", key = "publicationDate"), @Reference(value = "selectedPublicationPublisher", key = "publisher"), @Reference(value = "selectedPublicationVenue", key = "venue"), @Reference(value = "selectedPublicationTag", key = "tags") }) @PropertySource(template = "person/publication", predicate = "http://www.w3.org/2000/01/rdf-schema#label") private List publications; diff --git a/src/main/java/edu/tamu/scholars/middleware/graphql/model/Person.java b/src/main/java/edu/tamu/scholars/middleware/graphql/model/Person.java index f554c1a94..1c899ef6a 100644 --- a/src/main/java/edu/tamu/scholars/middleware/graphql/model/Person.java +++ b/src/main/java/edu/tamu/scholars/middleware/graphql/model/Person.java @@ -153,8 +153,6 @@ public class Person extends AbstractNestedDocument { private List keywords; - private List selectedPublicationTag; - private String researchOverview; private List principalInvestigatorOn; @@ -613,14 +611,6 @@ public void setKeywords(List keywords) { this.keywords = keywords; } - public List getSelectedPublicationTag() { - return selectedPublicationTag; - } - - public void setSelectedPublicationTag(List selectedPublicationTag) { - this.selectedPublicationTag = selectedPublicationTag; - } - public String getResearchOverview() { return researchOverview; } From 063c86baf6472e6217ba4891aab44c0c342efe66 Mon Sep 17 00:00:00 2001 From: William Welling Date: Wed, 9 Jun 2021 12:43:50 -0500 Subject: [PATCH 13/15] upgrade dependencies --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index d4cde3b05..72f87d23c 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.4.RELEASE + 2.3.11.RELEASE @@ -67,7 +67,7 @@ org.springframework.data spring-data-solr - 4.2.4.TAMU.RELEASE + 4.3.9.TAMU org.springframework.boot @@ -159,7 +159,7 @@ com.jayway.jsonpath json-path - 2.4.0 + 2.6.0 @@ -189,7 +189,7 @@ com.github.jsonld-java jsonld-java - 0.13.0 + 0.13.3 com.fasterxml.jackson.core From fdd9e94f4fa2e77c346b418499473e8ba9682e91 Mon Sep 17 00:00:00 2001 From: William Welling Date: Fri, 11 Jun 2021 09:52:22 -0500 Subject: [PATCH 14/15] increment minor version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 72f87d23c..175413198 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ edu.tamu.scholars middleware - 1.0.2 + 1.1.0 middleware From befdea5b0c1afeb1da7890e8938e96e0995278fb Mon Sep 17 00:00:00 2001 From: William Welling Date: Wed, 23 Jun 2021 09:54:03 -0500 Subject: [PATCH 15/15] post-demo updates --- .../displayViews/persons/asideTemplate.html | 28 +++++++++---------- .../sparql/document/authorOrganization.sparql | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/resources/defaults/displayViews/persons/asideTemplate.html b/src/main/resources/defaults/displayViews/persons/asideTemplate.html index 741dd581c..da1cc5ccf 100644 --- a/src/main/resources/defaults/displayViews/persons/asideTemplate.html +++ b/src/main/resources/defaults/displayViews/persons/asideTemplate.html @@ -107,20 +107,6 @@
{{/if}} - {{#if researchAreas}} -
-
-
- Research Areas: -
-
- {{#each researchAreas}} - {{label}}{{#if @last }}{{else}}, {{/if}} - {{/each}} -
-
- {{/if}} - {{#hasTags publications}}
@@ -137,6 +123,20 @@
{{/hasTags}} + {{#if researchAreas}} +
+
+
+ Research Areas: +
+
+ {{#each researchAreas}} + {{label}}{{#if @last }}{{else}}, {{/if}} + {{/each}} +
+
+ {{/if}} +