show message in the profile that role in not active

pkp · Feb 11, 2025 · 911d1b9 · 911d1b9
1 parent 2ee7e50
commit 911d1b9
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 1 deletion.
diff --git a/classes/userGroup/relationships/UserUserGroup.php b/classes/userGroup/relationships/UserUserGroup.php
@@ -99,4 +99,12 @@ public function scopeSortBy(Builder $query, string $column, ?string $direction =
     {
         return $query->orderBy('user_user_groups.' . $column, $direction);
     }
+
+    public function scopeWithActiveInFuture(Builder $query): Builder
+    {
+        $currentDateTime = Core::getCurrentDate();
+        return $query->whereNotNull('user_user_groups.date_start')
+            ->where('user_user_groups.date_start', '>', $currentDateTime)
+            ->orderBy('user_user_groups.date_start', 'asc');
+    }
 }
diff --git a/locale/en/user.po b/locale/en/user.po
@@ -801,3 +801,9 @@ msgstr "This ORCID has not been verified. Please remove this unverified ORCID an
 
 msgid "user.removeRole.message"
 msgstr "Are you sure want remove this role permanently?"
+
+msgid "user.futureRole.notification.message"
+msgstr "Your role is scheduled to begin on "
+
+msgid "user.futureRole.notification.description"
+msgstr "Until then, you can review and update your profile. If you believe this is an error, please contact journal administrator."
diff --git a/pages/user/ProfileHandler.php b/pages/user/ProfileHandler.php
@@ -22,6 +22,7 @@
 use PKP\core\PKPRequest;
 use PKP\security\authorization\PKPSiteAccessPolicy;
 use PKP\security\authorization\UserRequiredPolicy;
+use PKP\userGroup\relationships\UserUserGroup;
 
 class ProfileHandler extends UserHandler
 {
@@ -58,8 +59,9 @@ public function authorize($request, &$args, $roleAssignments)
     public function profile($args, $request)
     {
         $context = $request->getContext();
+        $user = $request->getUser();
+        $date_start = null;
         if (!$context) {
-            $user = $request->getUser();
             $contextDao = Application::getContextDAO();
             $workingContexts = $contextDao->getAvailable($user ? $user->getId() : null);
             [$firstContext, $secondContext] = [$workingContexts->next(), $workingContexts->next()];
@@ -74,11 +76,20 @@ public function profile($args, $request)
             $request->redirect(null, null, null, null, null, $anchor);
         }
 
+        if(count($user->getRoles($context->getId())) === 0){
+           $userFutureRoleStartDate = UserUserGroup::withUserId($user->getId())
+               ->withActiveInFuture()
+               ->pluck('date_start')
+               ->first();
+            $date_start = new \DateTime($userFutureRoleStartDate);
+        }
+
         $this->setupTemplate($request);
 
         $templateMgr = TemplateManager::getManager($request);
         $templateMgr->assign([
             'pageTitle' => __('user.profile'),
+            'userFutureRoleStartDate'=> $date_start?->format('Y-m-d'),
         ]);
         $templateMgr->display('user/profile.tpl');
     }

diff --git a/templates/user/profile.tpl b/templates/user/profile.tpl
@@ -10,6 +10,12 @@
 {extends file="layouts/backend.tpl"}
 
 {block name="page"}
+	{if $userFutureRoleStartDate}
+		<Notification>
+			<h2 class="text-3xl-bold text-heading"> {translate key="user.futureRole.notification.message"} {$userFutureRoleStartDate}</h2>
+			<p> {translate key="user.futureRole.notification.description"}</p>
+		</Notification>
+	{/if}
 	<h1 class="app__pageHeading">
 		{translate key="user.profile"}
 	</h1>