From 8781b13cdd6467810b995b45f69846f07732e76d Mon Sep 17 00:00:00 2001 From: "Viktoria.Nedyalkova" Date: Tue, 17 Sep 2024 13:37:23 +0300 Subject: [PATCH 01/12] Add elife assessment updates --- composer.json | 2 +- composer.lock | 18 ++++--- src/Controller/ArticlesController.php | 73 ++++++++++++++++++++++++--- 3 files changed, 79 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index 74fba3be9..47fef86dc 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "elife/api-client": "^1.0@dev", "elife/api-sdk": "dev-master", "elife/civi-contacts": "dev-master", - "elife/patterns": "dev-master", + "elife/patterns": "dev-elife-assessment-updates", "fabpot/goutte": "^3.2", "fig/link-util": "^1.0", "firebase/php-jwt": "^5.0", diff --git a/composer.lock b/composer.lock index 70c68ebf1..bffe9bd64 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "cc6b3eb8581ce24b68d16d11a9db35f5", + "content-hash": "87f201ad33cd0be62a4c555830cd8fa0", "packages": [ { "name": "beberlei/assert", @@ -1329,16 +1329,16 @@ }, { "name": "elife/patterns", - "version": "dev-master", + "version": "dev-elife-assessment-updates", "source": { "type": "git", "url": "https://github.com/elifesciences/patterns-php.git", - "reference": "44124efe244fc65e5054f870fb2fd5fe8ceee24c" + "reference": "91e1ad24ee46a094f70385c1aabbfbf981d507dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/elifesciences/patterns-php/zipball/44124efe244fc65e5054f870fb2fd5fe8ceee24c", - "reference": "44124efe244fc65e5054f870fb2fd5fe8ceee24c", + "url": "https://api.github.com/repos/elifesciences/patterns-php/zipball/91e1ad24ee46a094f70385c1aabbfbf981d507dc", + "reference": "91e1ad24ee46a094f70385c1aabbfbf981d507dc", "shasum": "" }, "require": { @@ -1375,7 +1375,10 @@ "MIT" ], "description": "eLife patterns", - "time": "2024-09-03T09:17:41+00:00" + "support": { + "source": "https://github.com/elifesciences/patterns-php/tree/elife-assessment-updates" + }, + "time": "2024-09-16T15:06:31+00:00" }, { "name": "fabpot/goutte", @@ -6337,5 +6340,6 @@ "platform-dev": [], "platform-overrides": { "php": "7.1.33" - } + }, + "plugin-api-version": "2.6.0" } diff --git a/src/Controller/ArticlesController.php b/src/Controller/ArticlesController.php index 0ef3e160a..42868ce03 100644 --- a/src/Controller/ArticlesController.php +++ b/src/Controller/ArticlesController.php @@ -32,6 +32,7 @@ use eLife\Journal\Helper\HasPages; use eLife\Journal\Helper\Humanizer; use eLife\Patterns\ViewModel; +use eLife\Patterns\ViewModel\Assessment; use eLife\Patterns\ViewModel\ArticleSection; use eLife\Patterns\ViewModel\ContentAside; use eLife\Patterns\ViewModel\ContentHeaderNew; @@ -46,6 +47,7 @@ use eLife\Patterns\ViewModel\ReadMoreItem; use eLife\Patterns\ViewModel\SpeechBubble; use eLife\Patterns\ViewModel\TabbedNavigation; +use eLife\Patterns\ViewModel\Term; use eLife\Patterns\ViewModel\ViewSelector; use GuzzleHttp\Promise\PromiseInterface; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -309,22 +311,31 @@ private function createFirstPage(Request $request, string $id, array $arguments) if ($item instanceof ArticleVoR && $item->getElifeAssessment()) { $first = true; - $relatedLinks = []; - - $relatedLinks[] = new Link('Read the peer reviews', $this->generatePath($history, $item->getVersion(), 'peer-reviews', 'content')); - $relatedLinks[] = new Link('About eLife assessments', $this->get('router')->generate('inside-elife-article', ['id'=> 'db24dd46'])); + $summary = 'During the peer-review process the editor and reviewers write an eLife Assessment that summarises the significance of the findings reported in the article (on a scale ranging from landmark to useful) and the strength of the evidence (on a scale ranging from exceptional to inadequate). About eLife assessments'; + $significanceTerms = [['term' => 'Landmark'], ['term' => 'Fundamental'], ['term' => 'Important'], ['term' => 'Valuable'], ['term' => 'Useful']]; + $strengthTerms = [['term' => 'Exceptional'], ['term' => 'Compelling'], ['term' => 'Convincing'], ['term' => 'Solid'], ['term' => 'Incomplete'], ['term' => 'Inadequate']]; + $content = $item->getElifeAssessment()->getContent(); + $resultSignificance = $this->highlightAndFormatTerms($content, $significanceTerms); + $resultStrength = $this->highlightAndFormatTerms($content, $strengthTerms); + $significance = !empty($resultSignificance['formattedDescription']) ? new Term('Significance of the findings:', implode("\n", $resultSignificance['formattedDescription']), $resultSignificance['highlightedTerm']) : null; + $strength = !empty($resultStrength['formattedDescription']) ? new Term('Strength of evidence:', implode("\n", $resultStrength['formattedDescription']), $resultStrength['highlightedTerm']) : null; $parts[] = ArticleSection::collapsible( 'elife-assessment', $item->getElifeAssessmentTitle(), 2, $this->render(...$this->convertContent($item->getElifeAssessment(), 2, $context)), - $relatedLinks, + null, ArticleSection::STYLE_HIGHLIGHTED, false, $first, $item->getElifeAssessment()->getDoi() ? new Doi($item->getElifeAssessment()->getDoi()) : null, - ArticleSection::RELATED_LINKS_SEPARATOR_CIRCLE + null, + new Assessment( + $significance, + $strength, + $summary + ) ); $first = false; @@ -1961,4 +1972,54 @@ private function generatePublicationHistoryForNewVor($history) { return $publicationHistory; } + + private function highlightAndFormatTerms($content, array $terms): array { + $formattedDescription = []; + $highlightedWords = []; + + foreach ($content as $contentItem) { + if (method_exists($contentItem, 'getText')) { + $text = $contentItem->getText(); + + preg_match_all('/(.*?)<\/b>/', $text, $matches); + + if (!empty($matches[1])) { + $highlightedWords = array_merge($highlightedWords, $matches[1]); + } + } + } + + $highlightedTerm = array_map(function ($term) use ($highlightedWords, &$formattedDescription) { + $termDescriptions = [ + 'landmark' => 'Findings with profound implications that are expected to have widespread influence', + 'fundamental' => 'Findings that substantially advance our understanding of major research questions', + 'important' => 'Findings that have theoretical or practical implications beyond a single subfield', + 'valuable' => 'Findings that have theoretical or practical implications for a subfield', + 'useful' => 'Findings that have focused importance and scope', + 'exceptional' => 'Exemplary use of existing approaches that establish new standards for a field', + 'compelling' => 'Evidence that features methods, data and analyses more rigorous than the current state-of-the-art', + 'convincing' => 'Appropriate and validated methodology in line with current state-of-the-art', + 'solid' => 'Methods, data and analyses broadly support the claims with only minor weaknesses', + 'incomplete' => 'Main claims are only partially supported', + 'inadequate' => 'Methods, data and analyses do not support the primary claims', + ]; + + $termWord = strtolower($term['term']); + + if (in_array($termWord, $highlightedWords)) { + $term['isHighlighted'] = true; + + if (isset($termDescriptions[$termWord])) { + $formattedDescription[$termWord] = sprintf("%s: %s", ucfirst($termWord), $termDescriptions[$termWord]); + } + } + + return $term; + }, $terms); + + return [ + 'highlightedTerm' => $highlightedTerm, + 'formattedDescription' => $formattedDescription + ]; + } } From d2d4d6ecf3aa65a14577f06d764253f7f5058808 Mon Sep 17 00:00:00 2001 From: "Viktoria.Nedyalkova" Date: Tue, 17 Sep 2024 14:57:16 +0300 Subject: [PATCH 02/12] Update text --- composer.lock | 8 ++++---- src/Controller/ArticlesController.php | 8 +++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index bffe9bd64..b1f528ab7 100644 --- a/composer.lock +++ b/composer.lock @@ -1333,12 +1333,12 @@ "source": { "type": "git", "url": "https://github.com/elifesciences/patterns-php.git", - "reference": "91e1ad24ee46a094f70385c1aabbfbf981d507dc" + "reference": "239949359be6ff3177f15e580eca40bb4e4d8c57" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/elifesciences/patterns-php/zipball/91e1ad24ee46a094f70385c1aabbfbf981d507dc", - "reference": "91e1ad24ee46a094f70385c1aabbfbf981d507dc", + "url": "https://api.github.com/repos/elifesciences/patterns-php/zipball/239949359be6ff3177f15e580eca40bb4e4d8c57", + "reference": "239949359be6ff3177f15e580eca40bb4e4d8c57", "shasum": "" }, "require": { @@ -1378,7 +1378,7 @@ "support": { "source": "https://github.com/elifesciences/patterns-php/tree/elife-assessment-updates" }, - "time": "2024-09-16T15:06:31+00:00" + "time": "2024-09-17T11:51:13+00:00" }, { "name": "fabpot/goutte", diff --git a/src/Controller/ArticlesController.php b/src/Controller/ArticlesController.php index 42868ce03..b3ffff436 100644 --- a/src/Controller/ArticlesController.php +++ b/src/Controller/ArticlesController.php @@ -311,14 +311,16 @@ private function createFirstPage(Request $request, string $id, array $arguments) if ($item instanceof ArticleVoR && $item->getElifeAssessment()) { $first = true; - $summary = 'During the peer-review process the editor and reviewers write an eLife Assessment that summarises the significance of the findings reported in the article (on a scale ranging from landmark to useful) and the strength of the evidence (on a scale ranging from exceptional to inadequate). About eLife assessments'; + $summary = 'During the peer-review process the editor and reviewers write an eLife Assessment that summarises the significance of the findings reported in the article (on a scale ranging from landmark to useful) and the strength of the evidence (on a scale ranging from exceptional to inadequate). Learn more about eLife assessments'; $significanceTerms = [['term' => 'Landmark'], ['term' => 'Fundamental'], ['term' => 'Important'], ['term' => 'Valuable'], ['term' => 'Useful']]; $strengthTerms = [['term' => 'Exceptional'], ['term' => 'Compelling'], ['term' => 'Convincing'], ['term' => 'Solid'], ['term' => 'Incomplete'], ['term' => 'Inadequate']]; $content = $item->getElifeAssessment()->getContent(); $resultSignificance = $this->highlightAndFormatTerms($content, $significanceTerms); $resultStrength = $this->highlightAndFormatTerms($content, $strengthTerms); - $significance = !empty($resultSignificance['formattedDescription']) ? new Term('Significance of the findings:', implode("\n", $resultSignificance['formattedDescription']), $resultSignificance['highlightedTerm']) : null; - $strength = !empty($resultStrength['formattedDescription']) ? new Term('Strength of evidence:', implode("\n", $resultStrength['formattedDescription']), $resultStrength['highlightedTerm']) : null; + $significanceAriaLable = 'eLife assessments use a common vocabulary to describe significance. The term chosen for this paper is:'; + $strengthAriaLable = 'eLife assessments use a common vocabulary to describe strength of evidence. The term or terms chosen for this paper is:'; + $significance = !empty($resultSignificance['formattedDescription']) ? new Term('Significance of the findings:', implode("\n", $resultSignificance['formattedDescription']), $resultSignificance['highlightedTerm'], $significanceAriaLable) : null; + $strength = !empty($resultStrength['formattedDescription']) ? new Term('Strength of evidence:', implode("\n", $resultStrength['formattedDescription']), $resultStrength['highlightedTerm'], $strengthAriaLable) : null; $parts[] = ArticleSection::collapsible( 'elife-assessment', From 51bddf7474e4ddcb55e75ccc916d4ff8345c07ae Mon Sep 17 00:00:00 2001 From: "Viktoria.Nedyalkova" Date: Wed, 18 Sep 2024 13:39:28 +0300 Subject: [PATCH 03/12] Update composer --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index b1f528ab7..90ecb4c50 100644 --- a/composer.lock +++ b/composer.lock @@ -1333,12 +1333,12 @@ "source": { "type": "git", "url": "https://github.com/elifesciences/patterns-php.git", - "reference": "239949359be6ff3177f15e580eca40bb4e4d8c57" + "reference": "cc38748f1b1de64103940d7c1aa7404c59950214" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/elifesciences/patterns-php/zipball/239949359be6ff3177f15e580eca40bb4e4d8c57", - "reference": "239949359be6ff3177f15e580eca40bb4e4d8c57", + "url": "https://api.github.com/repos/elifesciences/patterns-php/zipball/cc38748f1b1de64103940d7c1aa7404c59950214", + "reference": "cc38748f1b1de64103940d7c1aa7404c59950214", "shasum": "" }, "require": { @@ -1378,7 +1378,7 @@ "support": { "source": "https://github.com/elifesciences/patterns-php/tree/elife-assessment-updates" }, - "time": "2024-09-17T11:51:13+00:00" + "time": "2024-09-18T10:36:12+00:00" }, { "name": "fabpot/goutte", From eb64ac8ef4c4d054014cddc64dde9216eaa06e5d Mon Sep 17 00:00:00 2001 From: Dave Date: Fri, 4 Oct 2024 12:39:49 +0100 Subject: [PATCH 04/12] updating css from pattern library --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index e24db2773..29807b7e1 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "dfcbe23319d1e823dc81ce7e1e7ffdb0", + "content-hash": "a5d50837b80dd8f3fe9277f46e9f353c", "packages": [ { "name": "beberlei/assert", @@ -1338,12 +1338,12 @@ "source": { "type": "git", "url": "https://github.com/elifesciences/patterns-php.git", - "reference": "cc38748f1b1de64103940d7c1aa7404c59950214" + "reference": "af1c0e67efe4e0ccc973c250968f83d451d93c98" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/elifesciences/patterns-php/zipball/cc38748f1b1de64103940d7c1aa7404c59950214", - "reference": "cc38748f1b1de64103940d7c1aa7404c59950214", + "url": "https://api.github.com/repos/elifesciences/patterns-php/zipball/af1c0e67efe4e0ccc973c250968f83d451d93c98", + "reference": "af1c0e67efe4e0ccc973c250968f83d451d93c98", "shasum": "" }, "require": { @@ -1383,7 +1383,7 @@ "support": { "source": "https://github.com/elifesciences/patterns-php/tree/elife-assessment-updates" }, - "time": "2024-09-18T10:36:12+00:00" + "time": "2024-10-04T11:22:36+00:00" }, { "name": "fabpot/goutte", From f8d3ff2d3a41b033b299a349894e0fd302dc1539 Mon Sep 17 00:00:00 2001 From: Dave Date: Mon, 7 Oct 2024 08:57:50 +0100 Subject: [PATCH 05/12] Change url to http://elifesciences.org/about/elife-assessments --- src/Controller/ArticlesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controller/ArticlesController.php b/src/Controller/ArticlesController.php index e9651f38c..370f9f15b 100644 --- a/src/Controller/ArticlesController.php +++ b/src/Controller/ArticlesController.php @@ -311,7 +311,7 @@ private function createFirstPage(Request $request, string $id, array $arguments) if ($item instanceof ArticleVoR && $item->getElifeAssessment()) { $first = true; - $summary = 'During the peer-review process the editor and reviewers write an eLife Assessment that summarises the significance of the findings reported in the article (on a scale ranging from landmark to useful) and the strength of the evidence (on a scale ranging from exceptional to inadequate). Learn more about eLife assessments'; + $summary = 'During the peer-review process the editor and reviewers write an eLife Assessment that summarises the significance of the findings reported in the article (on a scale ranging from landmark to useful) and the strength of the evidence (on a scale ranging from exceptional to inadequate). Learn more about eLife assessments'; $significanceTerms = [['term' => 'Landmark'], ['term' => 'Fundamental'], ['term' => 'Important'], ['term' => 'Valuable'], ['term' => 'Useful']]; $strengthTerms = [['term' => 'Exceptional'], ['term' => 'Compelling'], ['term' => 'Convincing'], ['term' => 'Solid'], ['term' => 'Incomplete'], ['term' => 'Inadequate']]; $content = $item->getElifeAssessment()->getContent(); From 36b7e544fd8f9768603422dfd7c6089ce2634de6 Mon Sep 17 00:00:00 2001 From: Dave Date: Mon, 7 Oct 2024 09:10:16 +0100 Subject: [PATCH 06/12] Refactor http to https --- src/Controller/ArticlesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controller/ArticlesController.php b/src/Controller/ArticlesController.php index 370f9f15b..7acd7e2f2 100644 --- a/src/Controller/ArticlesController.php +++ b/src/Controller/ArticlesController.php @@ -311,7 +311,7 @@ private function createFirstPage(Request $request, string $id, array $arguments) if ($item instanceof ArticleVoR && $item->getElifeAssessment()) { $first = true; - $summary = 'During the peer-review process the editor and reviewers write an eLife Assessment that summarises the significance of the findings reported in the article (on a scale ranging from landmark to useful) and the strength of the evidence (on a scale ranging from exceptional to inadequate). Learn more about eLife assessments'; + $summary = 'During the peer-review process the editor and reviewers write an eLife Assessment that summarises the significance of the findings reported in the article (on a scale ranging from landmark to useful) and the strength of the evidence (on a scale ranging from exceptional to inadequate). Learn more about eLife assessments'; $significanceTerms = [['term' => 'Landmark'], ['term' => 'Fundamental'], ['term' => 'Important'], ['term' => 'Valuable'], ['term' => 'Useful']]; $strengthTerms = [['term' => 'Exceptional'], ['term' => 'Compelling'], ['term' => 'Convincing'], ['term' => 'Solid'], ['term' => 'Incomplete'], ['term' => 'Inadequate']]; $content = $item->getElifeAssessment()->getContent(); From 755d6122b2a96713ce12c86d9a47973c25db1bef Mon Sep 17 00:00:00 2001 From: Dave Date: Mon, 7 Oct 2024 09:10:34 +0100 Subject: [PATCH 07/12] update from pattern library --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 29807b7e1..4bed13728 100644 --- a/composer.lock +++ b/composer.lock @@ -1338,12 +1338,12 @@ "source": { "type": "git", "url": "https://github.com/elifesciences/patterns-php.git", - "reference": "af1c0e67efe4e0ccc973c250968f83d451d93c98" + "reference": "3b13c84e8a508a599244a60ffadba52b9e386a60" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/elifesciences/patterns-php/zipball/af1c0e67efe4e0ccc973c250968f83d451d93c98", - "reference": "af1c0e67efe4e0ccc973c250968f83d451d93c98", + "url": "https://api.github.com/repos/elifesciences/patterns-php/zipball/3b13c84e8a508a599244a60ffadba52b9e386a60", + "reference": "3b13c84e8a508a599244a60ffadba52b9e386a60", "shasum": "" }, "require": { @@ -1383,7 +1383,7 @@ "support": { "source": "https://github.com/elifesciences/patterns-php/tree/elife-assessment-updates" }, - "time": "2024-10-04T11:22:36+00:00" + "time": "2024-10-07T07:52:24+00:00" }, { "name": "fabpot/goutte", From c22c9908a1a85237704fb939747f69c8ecd00e2f Mon Sep 17 00:00:00 2001 From: Dave Date: Mon, 7 Oct 2024 13:35:32 +0100 Subject: [PATCH 08/12] Updating patterns --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 4bed13728..920b59a67 100644 --- a/composer.lock +++ b/composer.lock @@ -1338,12 +1338,12 @@ "source": { "type": "git", "url": "https://github.com/elifesciences/patterns-php.git", - "reference": "3b13c84e8a508a599244a60ffadba52b9e386a60" + "reference": "e4e6230ea44c9886ef369eee3bb3836863bd4997" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/elifesciences/patterns-php/zipball/3b13c84e8a508a599244a60ffadba52b9e386a60", - "reference": "3b13c84e8a508a599244a60ffadba52b9e386a60", + "url": "https://api.github.com/repos/elifesciences/patterns-php/zipball/e4e6230ea44c9886ef369eee3bb3836863bd4997", + "reference": "e4e6230ea44c9886ef369eee3bb3836863bd4997", "shasum": "" }, "require": { @@ -1383,7 +1383,7 @@ "support": { "source": "https://github.com/elifesciences/patterns-php/tree/elife-assessment-updates" }, - "time": "2024-10-07T07:52:24+00:00" + "time": "2024-10-07T11:23:42+00:00" }, { "name": "fabpot/goutte", From 9cb1b76f227729f9a22c7094487e91ce9e775265 Mon Sep 17 00:00:00 2001 From: Dave Date: Mon, 7 Oct 2024 15:46:50 +0100 Subject: [PATCH 09/12] Add paragraph tag for term descriptions --- src/Controller/ArticlesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controller/ArticlesController.php b/src/Controller/ArticlesController.php index 7acd7e2f2..7fa94f243 100644 --- a/src/Controller/ArticlesController.php +++ b/src/Controller/ArticlesController.php @@ -2021,7 +2021,7 @@ private function highlightAndFormatTerms($content, array $terms): array { $term['isHighlighted'] = true; if (isset($termDescriptions[$termWord])) { - $formattedDescription[$termWord] = sprintf("%s: %s", ucfirst($termWord), $termDescriptions[$termWord]); + $formattedDescription[$termWord] = sprintf("

%s: %s

", ucfirst($termWord), $termDescriptions[$termWord]); } } From e27f8cd2bc2dff1c5af87da66a919f1bda7d515c Mon Sep 17 00:00:00 2001 From: Dave Date: Tue, 8 Oct 2024 08:37:34 +0100 Subject: [PATCH 10/12] Amend test in summary --- src/Controller/ArticlesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controller/ArticlesController.php b/src/Controller/ArticlesController.php index 7fa94f243..34650272b 100644 --- a/src/Controller/ArticlesController.php +++ b/src/Controller/ArticlesController.php @@ -311,7 +311,7 @@ private function createFirstPage(Request $request, string $id, array $arguments) if ($item instanceof ArticleVoR && $item->getElifeAssessment()) { $first = true; - $summary = 'During the peer-review process the editor and reviewers write an eLife Assessment that summarises the significance of the findings reported in the article (on a scale ranging from landmark to useful) and the strength of the evidence (on a scale ranging from exceptional to inadequate). Learn more about eLife assessments'; + $summary = 'During the peer-review process the editor and reviewers write an eLife Assessment that summarises the significance of the findings reported in the article (on a scale ranging from landmark to useful) and the strength of the evidence (on a scale ranging from exceptional to inadequate). Learn more about eLife Assessments'; $significanceTerms = [['term' => 'Landmark'], ['term' => 'Fundamental'], ['term' => 'Important'], ['term' => 'Valuable'], ['term' => 'Useful']]; $strengthTerms = [['term' => 'Exceptional'], ['term' => 'Compelling'], ['term' => 'Convincing'], ['term' => 'Solid'], ['term' => 'Incomplete'], ['term' => 'Inadequate']]; $content = $item->getElifeAssessment()->getContent(); From 2f5db60c853f0744cd62b3e51247c5b7fa8ba23b Mon Sep 17 00:00:00 2001 From: Dave Date: Tue, 8 Oct 2024 11:56:43 +0100 Subject: [PATCH 11/12] Update from patterns --- composer.json | 2 +- composer.lock | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index b37a69232..53fc0c7e5 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "elife/api-client": "^1.0@dev", "elife/api-sdk": "dev-master", "elife/civi-contacts": "dev-master", - "elife/patterns": "dev-elife-assessment-updates", + "elife/patterns": "dev-master", "fabpot/goutte": "^3.2", "fig/link-util": "^1.0", "firebase/php-jwt": "^5.0", diff --git a/composer.lock b/composer.lock index 920b59a67..89b4d22d4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a5d50837b80dd8f3fe9277f46e9f353c", + "content-hash": "dfcbe23319d1e823dc81ce7e1e7ffdb0", "packages": [ { "name": "beberlei/assert", @@ -1334,16 +1334,16 @@ }, { "name": "elife/patterns", - "version": "dev-elife-assessment-updates", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/elifesciences/patterns-php.git", - "reference": "e4e6230ea44c9886ef369eee3bb3836863bd4997" + "reference": "54925197ca6be4bf9c0ba6664a7e5af68f513ccf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/elifesciences/patterns-php/zipball/e4e6230ea44c9886ef369eee3bb3836863bd4997", - "reference": "e4e6230ea44c9886ef369eee3bb3836863bd4997", + "url": "https://api.github.com/repos/elifesciences/patterns-php/zipball/54925197ca6be4bf9c0ba6664a7e5af68f513ccf", + "reference": "54925197ca6be4bf9c0ba6664a7e5af68f513ccf", "shasum": "" }, "require": { @@ -1366,6 +1366,7 @@ "suggest": { "twig/twig": "^2.0, to use PatternExtension" }, + "default-branch": true, "type": "library", "autoload": { "files": [ @@ -1381,9 +1382,9 @@ ], "description": "eLife patterns", "support": { - "source": "https://github.com/elifesciences/patterns-php/tree/elife-assessment-updates" + "source": "https://github.com/elifesciences/patterns-php/tree/master" }, - "time": "2024-10-07T11:23:42+00:00" + "time": "2024-09-18T10:13:40+00:00" }, { "name": "fabpot/goutte", From e515fc740f6e1e6521209a2c8c0817ac249f48b3 Mon Sep 17 00:00:00 2001 From: Dave Date: Tue, 8 Oct 2024 13:10:08 +0100 Subject: [PATCH 12/12] update from patterns --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 89b4d22d4..d7059da23 100644 --- a/composer.lock +++ b/composer.lock @@ -1338,12 +1338,12 @@ "source": { "type": "git", "url": "https://github.com/elifesciences/patterns-php.git", - "reference": "54925197ca6be4bf9c0ba6664a7e5af68f513ccf" + "reference": "9aae188e29567ef9db04ccb106e7b4e62112eb0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/elifesciences/patterns-php/zipball/54925197ca6be4bf9c0ba6664a7e5af68f513ccf", - "reference": "54925197ca6be4bf9c0ba6664a7e5af68f513ccf", + "url": "https://api.github.com/repos/elifesciences/patterns-php/zipball/9aae188e29567ef9db04ccb106e7b4e62112eb0c", + "reference": "9aae188e29567ef9db04ccb106e7b4e62112eb0c", "shasum": "" }, "require": { @@ -1384,7 +1384,7 @@ "support": { "source": "https://github.com/elifesciences/patterns-php/tree/master" }, - "time": "2024-09-18T10:13:40+00:00" + "time": "2024-10-08T11:36:14+00:00" }, { "name": "fabpot/goutte",