Studen follow page: Allow show subscription info for groups - refs BT…

…#18671
chamilo · Apr 27, 2021 · 24c4568 · 24c4568
1 parent b902067
commit 24c4568
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 11 deletions.
diff --git a/main/inc/lib/StudentFollowPage.php b/main/inc/lib/StudentFollowPage.php
@@ -25,11 +25,29 @@ public static function getLpSubscription(
             $itemProperty = $itemRepo->findByUserSuscribedToItem(
                 'learnpath',
                 $lpInfo['iid'],
-                api_get_user_entity($studentId),
-                api_get_course_entity($courseId),
-                api_get_session_entity($sessionId)
+                $studentId,
+                $courseId,
+                $sessionId
             );
 
+            if (null === $itemProperty) {
+                $userGroups = GroupManager::getAllGroupPerUserSubscription($studentId, $courseId);
+
+                foreach ($userGroups as $groupInfo) {
+                    $itemProperty = $itemRepo->findByGroupSuscribedToLp(
+                        'learnpath',
+                        $lpInfo['iid'],
+                        $groupInfo['iid'],
+                        $courseId,
+                        $sessionId
+                    );
+
+                    if (null !== $itemProperty) {
+                        break;
+                    }
+                }
+            }
+
             if (null === $itemProperty) {
                 return '-';
             }

diff --git a/src/Chamilo/CoreBundle/Entity/Repository/ItemPropertyRepository.php b/src/Chamilo/CoreBundle/Entity/Repository/ItemPropertyRepository.php
@@ -47,19 +47,38 @@ public function getUsersSubscribedToItem(
     public function findByUserSuscribedToItem(
         $tool,
         $itemId,
-        User $user,
-        Course $course,
-        Session $session = null,
-        Group $group = null
+        int $userId,
+        int $courseId,
+        int $sessionId = null
     ): ?CItemProperty {
         $criteria = [
             'tool' => $tool,
             'lasteditType' => 'LearnpathSubscription',
             'ref' => $itemId,
-            'toUser' => $user,
-            'course' => $course,
-            'session' => $session,
-            'group' => $group,
+            'toUser' => $userId,
+            'course' => $courseId,
+            'session' => $sessionId ?: null,
+            'group' => null,
+        ];
+
+        return $this->findOneBy($criteria);
+    }
+
+    public function findByGroupSuscribedToLp(
+        $tool,
+        $lpId,
+        int $groupId,
+        int $courseId,
+        int $sessionId = 0
+    ): ?CItemProperty {
+        $criteria = [
+            'tool' => $tool,
+            'lasteditType' => 'LearnpathSubscription',
+            'ref' => $lpId,
+            'toUser' => null,
+            'course' => $courseId,
+            'session' => $sessionId ?: null,
+            'group' => $groupId,
         ];
 
         return $this->findOneBy($criteria);