pkp#9914 sort services by start date and display user name and affili…

…ation only once on editorial history page, use different text to link to the editorial history form the editorial masthead page
bozana · Jul 10, 2024 · b30a167 · b30a167
1 parent ce0f337
commit b30a167
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 18 deletions.
diff --git a/classes/userGroup/relationships/UserUserGroup.php b/classes/userGroup/relationships/UserUserGroup.php
@@ -125,4 +125,9 @@ public function scopeWithMasthead(Builder $query): Builder
     {
         return $query->where('user_user_groups.masthead', 1);
     }
+
+    public function scopeSortBy(Builder $query, string $column, ?string $direction = 'asc')
+    {
+        return $query->orderBy('user_user_groups.' . $column, $direction);
+    }
 }
diff --git a/locale/en/common.po b/locale/en/common.po
@@ -45,6 +45,9 @@ msgstr "Principal Contact"
 msgid "about.contact.supportContact"
 msgstr "Support Contact"
 
+msgid "about.editorialMasthead.linkToEditorialHistory"
+msgstr "View <a href=\"{$url}\">Editorial History</a>"
+
 msgid "about.other"
 msgstr "Other"
 
@@ -160,6 +163,12 @@ msgstr "The editors express their appreciation of the reviewers for {$year} list
 msgid "common.editorialHistory"
 msgstr "Editorial History"
 
+msgid "common.editorialHistory.page"
+msgstr "Editorial History Page"
+
+msgid "common.editorialHistory.page.description"
+msgstr "This section lists past contributors."
+
 msgid "common.name"
 msgstr "Name"
 

diff --git a/pages/about/AboutContextHandler.php b/pages/about/AboutContextHandler.php
@@ -167,6 +167,7 @@ public function editorialHistory($args, $request)
                     ->withUserGroupId($mastheadUserGroup->getId())
                     ->withEnded()
                     ->withMasthead()
+                    ->sortBy('date_start', 'desc')
                     ->get();
                 $services = [];
                 foreach ($userUserGroups as $userUserGroup) {

diff --git a/templates/frontend/pages/editorialHistory.tpl b/templates/frontend/pages/editorialHistory.tpl
@@ -13,34 +13,39 @@
 <div class="page page_masthead">
 	{include file="frontend/components/breadcrumbs.tpl" currentTitleKey="common.editorialHistory"}
 
-	<h1>{translate key="common.editorialHistory"}</h1>
+	<h1>{translate key="common.editorialHistory.page"}</h1>
+	<p>{translate key="common.editorialHistory.page.description"}</p>
 	{foreach from=$mastheadRoles item="mastheadRole"}
 		{if array_key_exists($mastheadRole->getId(), $mastheadUsers)}
 			<h2>{$mastheadRole->getLocalizedName()|escape}</h2>
 			<ul>
-			{foreach from=$mastheadUsers[$mastheadRole->getId()] item="mastheadUser"}
-				{foreach from=$mastheadUser['services'] item="service"}
+				{foreach from=$mastheadUsers[$mastheadRole->getId()] item="mastheadUser"}
 					<li>
 						<ul id="commaList">
 							<li>{$mastheadUser['user']->getFullName()|escape}</li>
 							{if !empty($mastheadUser['user']->getLocalizedData('affiliation'))}
 								<li>{$mastheadUser['user']->getLocalizedData('affiliation')|escape}</li>
 							{/if}
-							<li>{translate key="common.fromUntil" from=$service['dateStart'] until=$service['dateEnd']}</li>
+							{if $mastheadUser['user']->getData('orcid')}
+								<span class="orcid">
+									{if $mastheadUser['user']->getData('orcidAccessToken')}
+										{$orcidIcon}
+									{/if}
+									<a href="{$mastheadUser['user']->getData('orcid')|escape}" target="_blank">
+										{$mastheadUser['user']->getData('orcid')|escape}
+									</a>
+								</span>
+							{/if}
+							<li>
+								{foreach from=$mastheadUser['services'] item="service"}
+									<ul>
+										<li>{translate key="common.fromUntil" from=$service['dateStart'] until=$service['dateEnd']}</li>
+									</ul>
+								{/foreach}
+							</li>
 						</ul>
-						{if $mastheadUser['user']->getData('orcid')}
-							<span class="orcid">
-								{if $mastheadUser['user']->getData('orcidAccessToken')}
-									{$orcidIcon}
-								{/if}
-								<a href="{$mastheadUser['user']->getData('orcid')|escape}" target="_blank">
-								{$mastheadUser['user']->getData('orcid')|escape}
-							</a>
-							</span>
-						{/if}
 					</li>
 				{/foreach}
-			{/foreach}
 			</ul>
 		{/if}
 	{/foreach}

diff --git a/templates/frontend/pages/editorialMasthead.tpl b/templates/frontend/pages/editorialMasthead.tpl
@@ -44,9 +44,8 @@
 	{/foreach}
 
 	<p>
-		<a href="{url page="about" op="editorialHistory" router=\PKP\core\PKPApplication::ROUTE_PAGE}">
-			{translate key="common.editorialHistory"}
-		</a>
+		{capture assign=editorialHistoryUrl}{url page="about" op="editorialHistory" router=\PKP\core\PKPApplication::ROUTE_PAGE}{/capture}
+		{translate key="about.editorialMasthead.linkToEditorialHistory" url=$editorialHistoryUrl}
 	</p>
 
 	{if !empty($reviewers)}