Merge branch 'master' of github.com:chamilo/chamilo-lms

ywarnier · ywarnier · commit 70bdda1192d0 · 2025-09-12T14:34:16.000+02:00
diff --git a/assets/vue/views/message/MessageList.vue b/assets/vue/views/message/MessageList.vue
@@ -148,7 +148,7 @@
                   receiverType: showingInbox ? MESSAGE_TYPE_INBOX : MESSAGE_TYPE_SENDER,
                 },
               }"
-              class="text-primary"
+              :class="['text-primary', { 'font-bold': showingInbox && !findMyReceiver(slotProps.data)?.read }]"
             >
               {{ slotProps.data.title }}
             </BaseAppLink>
@@ -223,8 +223,14 @@
           <div class="mt-4">
             <div class="text-sm font-bold">{{ t("Title") }}:</div>
             <BaseAppLink
-              :to="{ name: 'MessageShow', query: { id: item['@id'] } }"
-              class="text-base text-blue-600"
+              :to="{
+                name: 'MessageShow',
+                query: {
+                  id: item['@id'],
+                  receiverType: showingInbox ? MESSAGE_TYPE_INBOX : MESSAGE_TYPE_SENDER,
+                },
+              }"
+              :class="['text-base text-blue-600', { 'font-bold': showingInbox && !findMyReceiver(item)?.read }]"
             >
               {{ item.title }}
             </BaseAppLink>
@@ -279,7 +285,7 @@
 </template>
 
 <script setup>
-import { computed, onMounted, ref } from "vue"
+import { computed, onBeforeUnmount, onMounted, ref } from "vue"
 import { useStore } from "vuex"
 import { useI18n } from "vue-i18n"
 import { useRoute, useRouter } from "vue-router"
@@ -499,6 +505,7 @@ function showInboxByTag(tag) {
 
   fetchPayload = {
     "order[sendDate]": "desc",
+    "receivers.receiver": securityStore.user["@id"],
     itemsPerPage: initialRowsPerPage,
     page: 1,
     "receivers.receiverType": MESSAGE_TYPE_INBOX,
@@ -515,6 +522,7 @@ function showUnread() {
 
   fetchPayload = {
     "order[sendDate]": "desc",
+    "receivers.receiver": securityStore.user["@id"],
     "receivers.read": false,
     itemsPerPage: initialRowsPerPage,
     page: 1,
@@ -653,4 +661,27 @@ function onResetSearch() {
 
   loadMessages()
 }
+
+let onMessageRead
+
+onMounted(() => {
+  onMessageRead = (ev) => {
+    const { iri, receiverId, receiverType } = ev.detail || {}
+    const msg = items.value?.find?.((m) => m["@id"] === iri)
+    if (!msg) return
+
+    const receivers = [...msg.receiversTo, ...msg.receiversCc, ...msg.receiversSender]
+    const mine = receivers.find((r) => r.receiver?.["@id"] === receiverId && r.receiverType === receiverType)
+    if (mine) {
+      mine.read = true
+    }
+  }
+  window.addEventListener("message:read", onMessageRead)
+})
+
+onBeforeUnmount(() => {
+  if (onMessageRead) {
+    window.removeEventListener("message:read", onMessageRead)
+  }
+})
 </script>
diff --git a/assets/vue/views/message/MessageShow.vue b/assets/vue/views/message/MessageShow.vue
@@ -179,12 +179,29 @@ const receiverType = route.query.receiverType ? parseInt(route.query.receiverTyp
 store.dispatch("message/load", id).then((responseItem) => {
   item.value = responseItem
 
-  myReceiver.value = findMyReceiver(responseItem, receiverType)
+  const rawRt = route.query.receiverType ? Number(route.query.receiverType) : undefined
+  myReceiver.value = rawRt
+    ? findMyReceiver(responseItem, rawRt)
+    : findMyReceiver(responseItem, MESSAGE_TYPE_INBOX)
+
+  if (!myReceiver.value) {
+    const all = [...responseItem.receiversTo, ...responseItem.receiversCc, ...responseItem.receiversSender]
+    myReceiver.value = all.find(({ receiver }) => receiver["@id"] === securityStore.user["@id"])
+  }
 
   if (myReceiver.value && !myReceiver.value.read) {
     messageRelUserService
       .update(myReceiver.value["@id"], { read: true })
-      .then(() => messageRelUserStore.findUnreadCount())
+      .then(() => {
+        messageRelUserStore.findUnreadCount()
+        window.dispatchEvent(new CustomEvent("message:read", {
+          detail: {
+            iri: responseItem["@id"],
+            receiverId: myReceiver.value.receiver["@id"],
+            receiverType: myReceiver.value.receiverType,
+          },
+        }))
+      })
   }
 })
 
diff --git a/public/main/inc/lib/AnnouncementManager.php b/public/main/inc/lib/AnnouncementManager.php
@@ -97,7 +97,7 @@ public static function parseContent(
 
             $session->getGeneralCoaches()
                 ->forAll(function (int $key, User $user) use (&$generalCoachName, &$generalCoachEmail) {
-                    $generalCoachName .= $user->getFullname().PHP_EOL;
+                    $generalCoachName .= $user->getFullName().PHP_EOL;
                     $generalCoachEmail .= $user->getEmail().PHP_EOL;
 
                     return true;
diff --git a/public/main/inc/lib/CoursesAndSessionsCatalog.class.php b/public/main/inc/lib/CoursesAndSessionsCatalog.class.php
@@ -1659,7 +1659,7 @@ public static function getFormattedSessionsBlock(array $sessions)
                             'id' => $coach->getId(),
                             'url' => api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?'
                                 .http_build_query(['a' => 'get_user_popup', 'user_id' => $coach->getId()]),
-                            'name' => $coach->getFullname(),
+                            'name' => $coach->getFullName(),
                             'avatar' => UserManager::getUserPicture($coach->getId(), USER_IMAGE_SIZE_SMALL),
                         ]
                     ),
diff --git a/public/main/inc/lib/ScheduledAnnouncement.php b/public/main/inc/lib/ScheduledAnnouncement.php
@@ -384,7 +384,7 @@ public function sendPendingMessages($urlId = 0)
                             $generalCoachEmail = [];
                             /** @var User $generalCoach */
                             foreach ($generalCoaches as $generalCoach) {
-                                $generalCoachName[] = $generalCoach->getFullname();
+                                $generalCoachName[] = $generalCoach->getFullName();
                                 $generalCoachEmail[] = $generalCoach->getEmail();
                             }
 
diff --git a/public/main/inc/lib/TicketManager.php b/public/main/inc/lib/TicketManager.php
@@ -1436,7 +1436,7 @@ public static function sendNotification($ticketId, $title, $message, $onlyToUser
                         self::isUserSubscribedToTicket($ticketId, $follower->getId())
                     )
                 ) {
-                    $recipients[$follower->getId()] = $follower->getFullname();
+                    $recipients[$follower->getId()] = $follower->getFullName();
                 }
             }
         }
diff --git a/public/main/inc/lib/sessionmanager.lib.php b/public/main/inc/lib/sessionmanager.lib.php
@@ -2405,7 +2405,7 @@ public static function notifyBossOfInscription(User $boss, Session $session, int
             '@ChamiloCore/Mailer/Legacy/subject_subscription_to_boss_notification.html.twig',
             [
                 'locale' => $boss->getLocale(),
-                'boss_name' => $boss->getFullname(),
+                'boss_name' => $boss->getFullName(),
                 'student_name' => $user_info['complete_name'],
                 'session_name' => $session->getTitle(),
             ]
@@ -2415,15 +2415,15 @@ public static function notifyBossOfInscription(User $boss, Session $session, int
             '@ChamiloCore/Mailer/Legacy/content_subscription_to_boss_notification.html.twig',
             [
                 'locale' => $boss->getLocale(),
-                'boss_name' => $boss->getFullname(),
+                'boss_name' => $boss->getFullName(),
                 'student_name' => $user_info['complete_name'],
                 'session_name' => $session->getTitle(),
             ]
         );
 
         // Send email
         api_mail_html(
-            $boss->getFullname(),
+            $boss->getFullName(),
             $boss->getEmail(),
             $subject,
             $content,
@@ -10632,7 +10632,7 @@ public static function getGeneralCoachesNamesForSession(int $sessionId): array
     {
         return api_get_session_entity($sessionId)
             ->getGeneralCoaches()
-            ->map(fn(User $user) => $user->getFullname())
+            ->map(fn(User $user) => $user->getFullName())
             ->getValues();
     }
 
diff --git a/public/plugin/BuyCourses/src/buy_course_plugin.class.php b/public/plugin/BuyCourses/src/buy_course_plugin.class.php
@@ -625,7 +625,7 @@ public function getCatalogSessionList($start, $end, $name = null, $min = 0, $max
             }
 
             $sessionData = $this->getSessionInfo($session->getId());
-            $sessionData['coaches'] = $session->getGeneralCoaches()->map(fn(User $coach) => $coach->getFullname());
+            $sessionData['coaches'] = $session->getGeneralCoaches()->map(fn(User $coach) => $coach->getFullName());
             $sessionData['enrolled'] = $this->getUserStatusForSession(
                 api_get_user_id(),
                 $session
diff --git a/public/plugin/BuyCourses/src/configure_course.php b/public/plugin/BuyCourses/src/configure_course.php
@@ -112,7 +112,7 @@
 
     foreach ($generalCoaches as $generalCoach) {
         $generalCoachesOptions[] = [
-            'text' => $generalCoach->getFullname(),
+            'text' => $generalCoach->getFullName(),
             'value' => $generalCoach->getId(),
         ];
         $defaultBeneficiaries[] = $generalCoach->getId();
diff --git a/public/plugin/ImsLti/auth.php b/public/plugin/ImsLti/auth.php
@@ -111,7 +111,7 @@
 
     // User info
     if ($tool->isSharingName()) {
-        $jwtContent['name'] = $user->getFullname();
+        $jwtContent['name'] = $user->getFullName();
         $jwtContent['given_name'] = $user->getFirstname();
         $jwtContent['family_name'] = $user->getLastname();
     }
diff --git a/public/plugin/ImsLti/src/ImsLti.php b/public/plugin/ImsLti/src/ImsLti.php
@@ -43,7 +43,7 @@ public static function getSubstitutableVariables(
             '$Person.sourcedId' => $isLti1p3
                 ? self::getPersonSourcedId($domain, $user)
                 : "$domain:".ImsLtiPlugin::getLaunchUserIdClaim($tool, $user),
-            '$Person.name.full' => $user->getFullname(),
+            '$Person.name.full' => $user->getFullName(),
             '$Person.name.family' => $user->getLastname(),
             '$Person.name.given' => $user->getFirstname(),
             '$Person.address.street1' => $user->getAddress(),
diff --git a/public/plugin/Zoom/Entity/Meeting.php b/public/plugin/Zoom/Entity/Meeting.php
@@ -423,7 +423,7 @@ public function getIntroduction(): string
             }
         }
         if ($this->user) {
-            $introduction .= sprintf('<p>%s</p>', $this->user->getFullname());
+            $introduction .= sprintf('<p>%s</p>', $this->user->getFullName());
         } elseif ($this->isCourseMeeting()) {
             if (null === $this->session) {
                 $introduction .= sprintf('<p class="main">%s</p>', $this->course);
diff --git a/public/plugin/Zoom/lib/ZoomPlugin.php b/public/plugin/Zoom/lib/ZoomPlugin.php
@@ -1321,7 +1321,7 @@ private function createMeetingFromMeeting($meeting)
         $currentUser = api_get_user_entity(api_get_user_id());
 
         $meeting->getMeetingInfoGet()->settings->contact_email = $currentUser->getEmail();
-        $meeting->getMeetingInfoGet()->settings->contact_name = $currentUser->getFullname();
+        $meeting->getMeetingInfoGet()->settings->contact_name = $currentUser->getFullName();
         $meeting->getMeetingInfoGet()->settings->auto_recording = $this->getRecordingSetting();
         $meeting->getMeetingInfoGet()->settings->registrants_email_notification = false;
 
diff --git a/src/CoreBundle/Controller/Api/CreateStudentPublicationCommentAction.php b/src/CoreBundle/Controller/Api/CreateStudentPublicationCommentAction.php
@@ -105,7 +105,7 @@ public function __invoke(
             $subject = \sprintf('New feedback for your submission "%s"', $submission->getTitle());
             $content = \sprintf(
                 'Hello %s, there is a new comment on your assignment submission "%s". Please review it in the platform.',
-                $receiverUser->getFullname(),
+                $receiverUser->getFullName(),
                 $submission->getTitle()
             );
 
diff --git a/src/CoreBundle/Controller/Api/CreateUserOnAccessUrlAction.php b/src/CoreBundle/Controller/Api/CreateUserOnAccessUrlAction.php
@@ -124,7 +124,7 @@ public function __invoke(CreateUserOnAccessUrlInput $data): User
 
             $body = \sprintf(
                 $body,
-                $user->getFullname(),
+                $user->getFullName(),
                 $platformName,
                 $sessionUrl,
                 $user->getUsername(),
diff --git a/src/CoreBundle/Controller/AttendanceController.php b/src/CoreBundle/Controller/AttendanceController.php
@@ -175,13 +175,13 @@ public function exportToPdf(int $id, Request $request): Response
             ;
 
             $teacher = $rel instanceof SessionRelCourseRelUser
-                ? $rel->getUser()?->getFullname()
+                ? $rel->getUser()?->getFullName()
                 : null;
         } else {
             $rel = $course?->getTeachersSubscriptions()?->first();
 
             $teacher = $rel instanceof CourseRelUser
-                ? $rel->getUser()?->getFullname()
+                ? $rel->getUser()?->getFullName()
                 : null;
         }
 
diff --git a/src/CoreBundle/Controller/CatalogueController.php b/src/CoreBundle/Controller/CatalogueController.php
@@ -130,7 +130,7 @@ public function listSessions(): JsonResponse
                     if ($userObj) {
                         $teachers[] = [
                             'id' => $userObj->getId(),
-                            'fullName' => $userObj->getFullname(),
+                            'fullName' => $userObj->getFullName(),
                         ];
                     }
                 }
diff --git a/src/CoreBundle/Controller/SocialController.php b/src/CoreBundle/Controller/SocialController.php
@@ -216,11 +216,11 @@ public function sendLegalTerm(
             foreach ($bossList as $bossId) {
                 $subjectEmail = \sprintf(
                     $translator->trans('User %s signed the agreement.'),
-                    $user->getFullname()
+                    $user->getFullName()
                 );
                 $contentEmail = \sprintf(
                     $translator->trans('User %s signed the agreement the %s.'),
-                    $user->getFullname(),
+                    $user->getFullName(),
                     api_get_local_time()
                 );
 
diff --git a/src/CoreBundle/Entity/User.php b/src/CoreBundle/Entity/User.php
@@ -747,6 +747,8 @@ class User implements UserInterface, EquatableInterface, ResourceInterface, Reso
         'message:read',
         'user_subscriptions:sessions',
         'student_publication_rel_user:read',
+        'student_publication:read',
+        'student_publication_comment:read'
     ])]
     protected string $fullName;
 
@@ -1312,8 +1314,7 @@ public function setCredentialsExpireAt(?DateTime $date = null): self
         return $this;
     }
 
-    #[Groups(['user:read', 'student_publication:read', 'student_publication_comment:read'])]
-    public function getFullname(): string
+    public function getFullName(): string
     {
         if (empty($this->fullName)) {
             return \sprintf('%s %s', $this->getFirstname(), $this->getLastname());
diff --git a/src/CoreBundle/Helpers/MessageHelper.php b/src/CoreBundle/Helpers/MessageHelper.php
@@ -308,7 +308,7 @@ private function sendEmailNotification(User $receiver, User $sender, string $sub
         try {
             $email = (new Email())
                 ->from($from)
-                ->to(new Address($toAddress, $receiver->getFullname() ?: $receiver->getUsername()))
+                ->to(new Address($toAddress, $receiver->getFullName() ?: $receiver->getUsername()))
                 ->subject($subject)
                 ->text($content)
                 ->html($content);
diff --git a/src/CoreBundle/Helpers/ScheduledAnnouncementHelper.php b/src/CoreBundle/Helpers/ScheduledAnnouncementHelper.php
@@ -219,7 +219,7 @@ private function buildMessage($announcement, Session $session, User $user, $cour
         $generalCoachEmail = [];
 
         foreach ($generalCoaches as $coach) {
-            $generalCoachName[] = $coach->getFullname();
+            $generalCoachName[] = $coach->getFullName();
             $generalCoachEmail[] = $coach->getEmail();
         }
 
diff --git a/src/CoreBundle/Migrations/Schema/V200/Version20230720142900.php b/src/CoreBundle/Migrations/Schema/V200/Version20230720142900.php
@@ -62,7 +62,7 @@ public function up(Schema $schema): void
         $this->entityManager->persist($fallbackUser);
         $this->entityManager->flush();
 
-        error_log('Fallback user created: '.$fallbackUser->getFullname());
+        error_log('Fallback user created: '.$fallbackUser->getFullName());
 
         $repo->updateUser($fallbackUser);
     }
diff --git a/src/CoreBundle/Migrations/Schema/V200/Version20240515124400.php b/src/CoreBundle/Migrations/Schema/V200/Version20240515124400.php
@@ -66,7 +66,7 @@ public function up(Schema $schema): void
                             if ($firstResourceLink && $user) {
                                 $resourceLinkId = $firstResourceLink->getId();
                                 $url = $resourceNode->getResourceFiles()->first()->getOriginalName();
-                                echo "Resource link $resourceLinkId Down id {$download->getDownId()} for $url: user ".$user->getFullname()."\n";
+                                echo "Resource link $resourceLinkId Down id {$download->getDownId()} for $url: user ".$user->getFullName()."\n";
 
                                 $this->connection->executeUpdate('UPDATE track_e_downloads SET resource_link_id = ? WHERE down_id = ?', [$resourceLinkId, $download->getDownId()]);
                             }
diff --git a/src/LtiBundle/Controller/CourseController.php b/src/LtiBundle/Controller/CourseController.php
@@ -625,7 +625,7 @@ private static function getReplaceableVariables(User $user, Course $course, ?Ses
             '$User.username' => $user->getUsername(),
 
             '$Person.sourcedId' => false,
-            '$Person.name.full' => $user->getFullname(),
+            '$Person.name.full' => $user->getFullName(),
             '$Person.name.family' => $user->getLastname(),
             '$Person.name.given' => $user->getFirstname(),
             '$Person.name.middle' => false,
diff --git a/tests/CoreBundle/Repository/Node/UserRepositoryTest.php b/tests/CoreBundle/Repository/Node/UserRepositoryTest.php
@@ -257,7 +257,7 @@ public function testCreateUserSkipResourceNode(): void
         $this->assertCount(4, $user->getRoles());
 
         $this->assertSame('Joe Doe', $user->getCompleteNameWithClasses());
-        $this->assertSame('Joe Doe', $user->getFullname());
+        $this->assertSame('Joe Doe', $user->getFullName());
 
         $this->assertCount(0, $user->getCurrentlyAccessibleSessions());
         $this->assertSame('/img/icons/svg/identifier_admin.svg', $user->getIconStatus());

Original file line number	Diff line number	Diff line change
`@@ -1659,7 +1659,7 @@ public static function getFormattedSessionsBlock(array $sessions)`
`1659`	`1659`	`'id' => $coach->getId(),`
`1660`	`1660`	`'url' => api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?'`
`1661`	`1661`	`.http_build_query(['a' => 'get_user_popup', 'user_id' => $coach->getId()]),`
`1662`		`- 'name' => $coach->getFullname(),`
	`1662`	`+ 'name' => $coach->getFullName(),`
`1663`	`1663`	`'avatar' => UserManager::getUserPicture($coach->getId(), USER_IMAGE_SIZE_SMALL),`
`1664`	`1664`	`]`
`1665`	`1665`	`),`
Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,7 @@ public function sendPendingMessages($urlId = 0)`
`384`	`384`	`$generalCoachEmail = [];`
`385`	`385`	`/** @var User $generalCoach */`
`386`	`386`	`foreach ($generalCoaches as $generalCoach) {`
`387`		`- $generalCoachName[] = $generalCoach->getFullname();`
	`387`	`+ $generalCoachName[] = $generalCoach->getFullName();`
`388`	`388`	`$generalCoachEmail[] = $generalCoach->getEmail();`
`389`	`389`	`}`
`390`	`390`
Original file line number	Diff line number	Diff line change
`@@ -1436,7 +1436,7 @@ public static function sendNotification($ticketId, $title, $message, $onlyToUser`
`1436`	`1436`	`self::isUserSubscribedToTicket($ticketId, $follower->getId())`
`1437`	`1437`	`)`
`1438`	`1438`	`) {`
`1439`		`- $recipients[$follower->getId()] = $follower->getFullname();`
	`1439`	`+ $recipients[$follower->getId()] = $follower->getFullName();`
`1440`	`1440`	`}`
`1441`	`1441`	`}`
`1442`	`1442`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2405,7 +2405,7 @@ public static function notifyBossOfInscription(User $boss, Session $session, int`
`2405`	`2405`	`'@ChamiloCore/Mailer/Legacy/subject_subscription_to_boss_notification.html.twig',`
`2406`	`2406`	`[`
`2407`	`2407`	`'locale' => $boss->getLocale(),`
`2408`		`- 'boss_name' => $boss->getFullname(),`
	`2408`	`+ 'boss_name' => $boss->getFullName(),`
`2409`	`2409`	`'student_name' => $user_info['complete_name'],`
`2410`	`2410`	`'session_name' => $session->getTitle(),`
`2411`	`2411`	`]`
`@@ -2415,15 +2415,15 @@ public static function notifyBossOfInscription(User $boss, Session $session, int`
`2415`	`2415`	`'@ChamiloCore/Mailer/Legacy/content_subscription_to_boss_notification.html.twig',`
`2416`	`2416`	`[`
`2417`	`2417`	`'locale' => $boss->getLocale(),`
`2418`		`- 'boss_name' => $boss->getFullname(),`
	`2418`	`+ 'boss_name' => $boss->getFullName(),`
`2419`	`2419`	`'student_name' => $user_info['complete_name'],`
`2420`	`2420`	`'session_name' => $session->getTitle(),`
`2421`	`2421`	`]`
`2422`	`2422`	`);`
`2423`	`2423`
`2424`	`2424`	`// Send email`
`2425`	`2425`	`api_mail_html(`
`2426`		`- $boss->getFullname(),`
	`2426`	`+ $boss->getFullName(),`
`2427`	`2427`	`$boss->getEmail(),`
`2428`	`2428`	`$subject,`
`2429`	`2429`	`$content,`
`@@ -10632,7 +10632,7 @@ public static function getGeneralCoachesNamesForSession(int $sessionId): array`
`10632`	`10632`	`{`
`10633`	`10633`	`return api_get_session_entity($sessionId)`
`10634`	`10634`	`->getGeneralCoaches()`
`10635`		`- ->map(fn(User $user) => $user->getFullname())`
	`10635`	`+ ->map(fn(User $user) => $user->getFullName())`
`10636`	`10636`	`->getValues();`
`10637`	`10637`	`}`
`10638`	`10638`
Original file line number	Diff line number	Diff line change
`@@ -625,7 +625,7 @@ public function getCatalogSessionList($start, $end, $name = null, $min = 0, $max`
`625`	`625`	`}`
`626`	`626`
`627`	`627`	`$sessionData = $this->getSessionInfo($session->getId());`
`628`		`- $sessionData['coaches'] = $session->getGeneralCoaches()->map(fn(User $coach) => $coach->getFullname());`
	`628`	`+ $sessionData['coaches'] = $session->getGeneralCoaches()->map(fn(User $coach) => $coach->getFullName());`
`629`	`629`	`$sessionData['enrolled'] = $this->getUserStatusForSession(`
`630`	`630`	`api_get_user_id(),`
`631`	`631`	`$session`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@`
`111`	`111`
`112`	`112`	`// User info`
`113`	`113`	`if ($tool->isSharingName()) {`
`114`		`- $jwtContent['name'] = $user->getFullname();`
	`114`	`+ $jwtContent['name'] = $user->getFullName();`
`115`	`115`	`$jwtContent['given_name'] = $user->getFirstname();`
`116`	`116`	`$jwtContent['family_name'] = $user->getLastname();`
`117`	`117`	`}`