WebSVN – LeadersLinked - Services – Diff – /module/LeadersLinked/src/Controller/MicrolearningController.php

             if(!in_array($order_field,['name', 'added_on'] )) {
                 $order_field = 'name';
+            }
             if(!in_array( $order_direction,['asc', 'desc'])) {
-                $order_field = 'asc';
+                $order_direction = 'asc'; // Corregido: asignar a $order_direction
-            }
+            }
             $userProgressMapper = MicrolearningUserProgressMapper::getInstance($this->adapter);
             $capsuleMapper = MicrolearningCapsuleMapper::getInstance($this->adapter);
+            $topicCapsuleMapper = MicrolearningTopicCapsuleMapper::getInstance($this->adapter); // Añadido
-            $capsuleCommentMapper = MicrolearningCapsuleCommentMapper::getInstance($this->adapter);
+            $topicMapper = MicrolearningTopicMapper::getInstance($this->adapter);
-            $topicMapper = MicrolearningTopicMapper::getInstance($this->adapter);
+            $capsuleCommentMapper = MicrolearningCapsuleCommentMapper::getInstance($this->adapter); // Reordenado
-            $accessGranted = $this->getAccessGranted();
+            $accessGranted = $this->getAccessGranted();
-            $topics = [];
+            // $topics = []; // Ya no es necesario cachear tópicos aquí
-            $capsules = [];
+            $capsulesData = []; // Renombrado
+            $storage = Storage::getInstance($this->config, $this->adapter);
-            $storage = Storage::getInstance($this->config, $this->adapter);
+            $path = $storage->getPathMicrolearningCapsule();
             $path = $storage->getPathMicrolearningCapsule();
             foreach($accessGranted->capsules as $capsule_id)
             foreach($accessGranted->capsules as $capsule_id)
-            {
+                // 1. Verificar progreso (debe ser nulo para pendiente)
+                $userProgress = $userProgressMapper->fetchOneByUseridAndCapsuleId($currentUser->id, $capsule_id);
-                $userProgress = $userProgressMapper->fetchOneByUseridAndCapsuleId($currentUser->id, $capsule_id);
+                if($userProgress) {
+                    continue;
+                }
+                // 2. Obtener detalles de la cápsula
-                if($userProgress) {
+                $capsule = $capsuleMapper->fetchOne($capsule_id);
-                    continue;
+                if(!$capsule) { // Añadir verificación por si la cápsula no existe
                     continue;
+                }
                 $capsule = $capsuleMapper->fetchOne($capsule_id);
+                // 3. Filtrar por nombre
+                if($name) {
+                    if(empty($name) || stripos($capsule->name, $name) === false) {
+                        continue;
-                if($name) {
-                    if(empty($name) || stripos($capsule->name, $name) === false) {
+                    }
-                        continue;
+                }
-                    }
-                }
+                // 4. Obtener Tópico asociado válido
+                $topic = null;
-                $dataCountAndRatingAverage = $capsuleCommentMapper->fetchCountAndRatingAverage($capsule->company_id,  $capsule->id);
+                $topic_uuid_for_links = null;
+                $relation = $topicCapsuleMapper->fetchOneByCapsuleId($capsule->id);
+                if ($relation && in_array($relation->topic_id, $accessGranted->topics)) {
+                    $topic = $topicMapper->fetchOne($relation->topic_id);
+                    if ($topic) {
+                        $topic_uuid_for_links = $topic->uuid;
+                    }
+                }
                 if(isset($topics[$capsule->topic_id])) {
-                    $topic = $topics[$capsule->topic_id];
+                // 5. Obtener datos de comentarios
-                } else {
+                $dataCountAndRatingAverage = $capsuleCommentMapper->fetchCountAndRatingAverage($capsule->company_id,  $capsule->id);
                     $topic = $topicMapper->fetchOne($capsule->topic_id);
-                    $topics[ $capsule->topic_id ] = $topic;
+                // 6. Construir enlace slides
                 $link_slides = $topic_uuid_for_links ? $this->url()->fromRoute('microlearning/slides', ['topic_id' => $topic_uuid_for_links,  'capsule_id' => $capsule->uuid], ['force_canonical' => true]) : '';
+                // 7. Añadir al array de resultados
-                array_push($capsules, [
+                array_push($capsulesData, [
                     'uuid'              => $capsule->uuid,
                     'name'              => $capsule->name ? $capsule->name : '',
                     'description'       => $capsule->description ? $capsule->description : '',
                     'image'             => $capsule->image ? $storage->getGenericImage($path, $capsule->uuid, $capsule->image)  : '',
                     'position'          => $capsule->order,
                     'link_comments'     => $this->url()->fromRoute('microlearning/capsules-comments', ['capsule_id' => $capsule->uuid], ['force_canonical' => true]),
                     'link_comment_add'  => $this->url()->fromRoute('microlearning/capsules-comments/add', ['capsule_id' => $capsule->uuid],['force_canonical' => true]),
+                    'link_slides'       => $link_slides, // Usar enlace construido
-                    'link_slides'       => $this->url()->fromRoute('microlearning/slides', ['topic_id' => $topic->uuid,  'capsule_id' => $capsule->uuid], ['force_canonical' => true]),
+                    'total_comments'    => strval($dataCountAndRatingAverage['total_comments']),
-                    'total_comments'    => strval($dataCountAndRatingAverage['total_comments']),
+                    'total_rating'      => strval($dataCountAndRatingAverage['total_rating']),
-                    'total_rating'      => strval($dataCountAndRatingAverage['total_rating']),
+                    'progress'          => 0,
-                    'progress'          => 0,
+                    'link_get'          => $this->url()->fromRoute('microlearning/get-capsule', ['id' => $capsule->uuid], ['force_canonical' => true]),
-                    'link_get'          => $this->url()->fromRoute('microlearning/get-capsule', ['id' => $capsule->uuid], ['force_canonical' => true]),
+                    'added_on'          => $capsule->added_on,
-                    'added_on'          => $capsule->added_on,
+                    'updated_on'        => $capsule->updated_on,
-                    'updated_on'        => $capsule->updated_on,
+                ]);
                 ]);
-            }
-            if($order_field == 'name') {
-                if($order_direction == 'asc') {
-                    usort($capsules, function($a, $b) {
-                        return strcasecmp($a['name'], $b['name']);
-                    });
+            // 8. Ordenar
                 } else {
-                    usort($capsules, function($a, $b) {
+            if($order_field == 'name') {
-                        $result = strcasecmp($a['name'], $b['name']);
+                if($order_direction == 'asc') {
-                        if($result < 0) {
+                    usort($capsulesData, function($a, $b) {
-                            return 1;
+                        return strcasecmp($a['name'], $b['name']);
-                        } else if($result > 0) {
+                    });
-                            return -1;
+                } else {
-                        } else  {
+                    usort($capsulesData, function($a, $b) {
-                            return  0;
+                        $result = strcasecmp($a['name'], $b['name']);
                         if($result < 0) { return 1; } else if($result > 0) { return -1; } else { return 0; } // Simplificado
-                    });
-                }
+                    });
-            }
-            if($order_field == 'added_on') {
-                if($order_direction == 'asc') {
                     usort($capsules, function($a, $b) {
                         return strcasecmp($a['added_on'], $b['added_on']);
-                    });
+            }
-                } else {
-                    usort($capsules, function($a, $b) {
-                        $result = strcasecmp($a['added_on'], $b['added_on']);
-                        if($result < 0) {
-                            return 1;
-                        } else if($result > 0) {
-                            return -1;
+            if($order_field == 'added_on') {
-                        } else  {
+                if($order_direction == 'asc') {
-                            return  0;
+                    usort($capsulesData, function($a, $b) {
                         return strcasecmp($a['added_on'], $b['added_on']);
                     });
                 $order_field = 'asc';
+            }
             $userProgressMapper = MicrolearningUserProgressMapper::getInstance($this->adapter);
             $capsuleMapper = MicrolearningCapsuleMapper::getInstance($this->adapter);
-            $capsuleCommentMapper = MicrolearningCapsuleCommentMapper::getInstance($this->adapter);
+            $topicCapsuleMapper = MicrolearningTopicCapsuleMapper::getInstance($this->adapter);
+            $topicMapper = MicrolearningTopicMapper::getInstance($this->adapter);
-            $topicMapper = MicrolearningTopicMapper::getInstance($this->adapter);
+            $capsuleCommentMapper = MicrolearningCapsuleCommentMapper::getInstance($this->adapter);
-            $accessGranted = $this->getAccessGranted();
             $accessGranted = $this->getAccessGranted();
             $topics = [];
-            $capsules = [];
+            $capsulesData = [];
+            $storage = Storage::getInstance($this->config, $this->adapter);
-            $storage = Storage::getInstance($this->config, $this->adapter);
+            $path = $storage->getPathMicrolearningCapsule();
             $path = $storage->getPathMicrolearningCapsule();
             foreach($accessGranted->capsules as $capsule_id)
             foreach($accessGranted->capsules as $capsule_id)
                 // 1. Verificar progreso
                 $userProgress = $userProgressMapper->fetchOneByUseridAndCapsuleId($currentUser->id, $capsule_id);
                 if(!$userProgress) {
-                    continue;
-                }
+                    continue;
+                }
+                if(!$userProgress->completed) {
+                    continue;
+                }
                 if(!$userProgress->completed) {
-                    continue;
+                // 2. Obtener detalles de la cápsula
                 $capsule = $capsuleMapper->fetchOne($capsule_id);
                 if(!$capsule) {
                     continue;
+                }
+                // 3. Filtrar por nombre
+                if($name) {
-                $capsule = $capsuleMapper->fetchOne($capsule_id);
+                    if(empty($name) || stripos($capsule->name, $name) === false) {
-                if($name) {
+                        continue;
-                    if(empty($name) || stripos($capsule->name, $name) === false) {
+                    }
-                        continue;
+                }
-                    }
                 // 4. Obtener Tópico asociado válido
+                $topic = null;
+                $topic_uuid_for_links = null;
+                $relation = $topicCapsuleMapper->fetchOneByCapsuleId($capsule->id);
+                if ($relation && in_array($relation->topic_id, $accessGranted->topics)) {
+                    $topic = $topicMapper->fetchOne($relation->topic_id);
+                    if ($topic) {
-                $dataCountAndRatingAverage = $capsuleCommentMapper->fetchCountAndRatingAverage($capsule->company_id, $capsule->id);
+                        $topic_uuid_for_links = $topic->uuid;
+                    }
                 if(isset($topics[$capsule->topic_id])) {
                     $topic = $topics[$capsule->topic_id];
-                } else {
+                // 5. Obtener datos de comentarios
-                    $topic = $topicMapper->fetchOne($capsule->topic_id);
+                $dataCountAndRatingAverage = $capsuleCommentMapper->fetchCountAndRatingAverage($capsule->company_id, $capsule->id);
                     $topics[ $capsule->topic_id ] = $topic;
                 // 6. Construir enlace slides
+                $link_slides = $topic_uuid_for_links ? $this->url()->fromRoute('microlearning/slides', ['topic_id' => $topic_uuid_for_links,  'capsule_id' => $capsule->uuid], ['force_canonical' => true]) : '';
                 // 7. Añadir al array de resultados
-                array_push($capsules, [
+                array_push($capsulesData, [
                     'uuid'              => $capsule->uuid,
                     'name'              => $capsule->name ? $capsule->name : '',
                     'description'       => $capsule->description ? $capsule->description : '',
                     'image'             => $capsule->image ? $storage->getGenericImage($path, $capsule->uuid, $capsule->image)  : '',
                     'position'          => $capsule->order,
                     'link_comments'     => $this->url()->fromRoute('microlearning/capsules-comments', ['capsule_id' => $capsule->uuid], ['force_canonical' => true]),
+                    'link_comment_add'  => $this->url()->fromRoute('microlearning/capsules-comments/add', ['capsule_id' => $capsule->uuid],['force_canonical' => true]),
-                    'link_comment_add'  => $this->url()->fromRoute('microlearning/capsules-comments/add', ['capsule_id' => $capsule->uuid],['force_canonical' => true]),
+                    'link_slides'       => $link_slides,
-                    'link_slides'       => $this->url()->fromRoute('microlearning/slides', ['topic_id' => $topic->uuid,  'capsule_id' => $capsule->uuid], ['force_canonical' => true]),
+                    'total_comments'    => strval($dataCountAndRatingAverage['total_comments']),
-                    'total_comments'    => strval($dataCountAndRatingAverage['total_comments']),
+                    'total_rating'      => strval($dataCountAndRatingAverage['total_rating']),
-                    'total_rating'      => strval($dataCountAndRatingAverage['total_rating']),
+                    'progress'          => $userProgress->progress,
-                    'progress'          => $userProgress->progress,
+                    'link_get'          => $this->url()->fromRoute('microlearning/get-capsule', ['id' => $capsule->uuid], ['force_canonical' => true]),
-                    'link_get'          => $this->url()->fromRoute('microlearning/get-capsule', ['id' => $capsule->uuid], ['force_canonical' => true]),
+                    'added_on'          => $capsule->added_on,
-                    'added_on'          => $capsule->added_on,
+                    'last_access_on'    => $userProgress->updated_on,
-                    'last_access_on'    => $userProgress->updated_on,
+                    'updated_on'        => $capsule->updated_on,
-                    'updated_on'        => $capsule->updated_on,
-                ]);
-            }
+                ]);
-            if($order_field == 'name') {
-                if($order_direction == 'asc') {
-                    usort($capsules, function($a, $b) {
                         return strcasecmp($a['name'], $b['name']);
                     });
-                } else {
-                    usort($capsules, function($a, $b) {
+            // 8. Ordenar (lógica de ordenación permanece igual, usando $capsulesData)
-                        $result = strcasecmp($a['name'], $b['name']);
+            if($order_field == 'name') {
-                        if($result < 0) {
+                if($order_direction == 'asc') {
-                            return 1;
+                    usort($capsulesData, function($a, $b) {
-                        } else if($result > 0) {
+                        return strcasecmp($a['name'], $b['name']);
-                            return -1;
+                    });
-                        } else  {
+                } else {
-                            return  0;
+                    usort($capsulesData, function($a, $b) {
                         $result = strcasecmp($a['name'], $b['name']);
-                    });
-                }
+                        if($result < 0) { return 1; } else if($result > 0) { return -1; } else { return 0; }
-            }
-            if($order_field == 'added_on') {
-                if($order_direction == 'asc') {
-                    usort($capsules, function($a, $b) {
+                    });
                         return strcasecmp($a['added_on'], $b['added_on']);
-                    });
                 } else {
                     usort($capsules, function($a, $b) {
-                        $result = strcasecmp($a['added_on'], $b['added_on']);
+            if($order_field == 'added_on') {
-                        if($result < 0) {
+                if($order_direction == 'asc') {
-                            return 1;
+                    usort($capsulesData, function($a, $b) {
-                        } else if($result > 0) {
+                        return strcasecmp($a['added_on'], $b['added_on']);
-                            return -1;
+                    });
-                        } else  {
+                } else {
-                            return  0;
+                    usort($capsulesData, function($a, $b) {
-                        }
-                    });
-                }
+                        $result = strcasecmp($a['added_on'], $b['added_on']);
-            }
-            if($order_field == 'last_access_on') {
-                if($order_direction == 'asc') {
+                        if($result < 0) { return 1; } else if($result > 0) { return -1; } else { return 0; }
-                    usort($capsules, function($a, $b) {
+                    });
-                        return strcasecmp($a['last_access_on'], $b['last_access_on']);
                     });
                 } else {
                     usort($capsules, function($a, $b) {
-                        $result = strcasecmp($a['last_access_on'], $b['last_access_on']);
+            if($order_field == 'last_access_on') {
-                        if($result < 0) {
+                if($order_direction == 'asc') {
-                            return 1;
+                    usort($capsulesData, function($a, $b) {
-                        } else if($result > 0) {
+                        return strcasecmp($a['last_access_on'], $b['last_access_on']);
             if(!in_array($order_field,['name', 'added_on', 'last_access_on'] )) {
                 $order_field = 'name';
+            }
             if(!in_array( $order_direction,['asc', 'desc'])) {
-                $order_field = 'asc';
+                $order_direction = 'asc';
+            }
             $userProgressMapper = MicrolearningUserProgressMapper::getInstance($this->adapter);
             $capsuleMapper = MicrolearningCapsuleMapper::getInstance($this->adapter);
+            $topicCapsuleMapper = MicrolearningTopicCapsuleMapper::getInstance($this->adapter);
-            $capsuleCommentMapper = MicrolearningCapsuleCommentMapper::getInstance($this->adapter);
+            $topicMapper = MicrolearningTopicMapper::getInstance($this->adapter);
-            $topicMapper = MicrolearningTopicMapper::getInstance($this->adapter);
+            $capsuleCommentMapper = MicrolearningCapsuleCommentMapper::getInstance($this->adapter);
             $accessGranted = $this->getAccessGranted();
             $accessGranted = $this->getAccessGranted();
             $topics = [];
-            $capsules = [];
+            $capsulesData = [];
             $storage = Storage::getInstance($this->config, $this->adapter);
-            $storage = Storage::getInstance($this->config, $this->adapter);
-            $path = $storage->getPathMicrolearningCapsule();
-            foreach($accessGranted->capsules as $capsule_id)
-            {
+            $path = $storage->getPathMicrolearningCapsule();
                 $userProgress = $userProgressMapper->fetchOneByUseridAndCapsuleId($currentUser->id, $capsule_id);
-                if(!$userProgress) {
+            foreach($accessGranted->capsules as $capsule_id)
+            {
-                    continue;
+                // 1. Verificar progreso
+                $userProgress = $userProgressMapper->fetchOneByUseridAndCapsuleId($currentUser->id, $capsule_id);
+                if(!$userProgress || $userProgress->completed) { // Si no hay progreso o ya está completada
+                    continue;
+                }
                 // 2. Obtener detalles de la cápsula
-                if($userProgress->completed) {
+                $capsule = $capsuleMapper->fetchOne($capsule_id);
-                    continue;
+                if(!$capsule) {
                     continue;
+                }
+                // 3. Filtrar por nombre
+                if($name) {
+                    if(empty($name) || stripos($capsule->name, $name) === false) {
+                        continue;
+                    }
+                }
+                // 4. Obtener Tópico asociado válido
+                $topic = null;
                 $topic_uuid_for_links = null;
-                $capsule = $capsuleMapper->fetchOne($capsule_id);
+                $relation = $topicCapsuleMapper->fetchOneByCapsuleId($capsule->id);
-                if($name) {
-                    if(empty($name) || stripos($capsule->name, $name) === false) {
+                if ($relation && in_array($relation->topic_id, $accessGranted->topics)) {
-                        continue;
-                    }
-                }
+                    $topic = $topicMapper->fetchOne($relation->topic_id);
-                $dataCountAndRatingAverage = $capsuleCommentMapper->fetchCountAndRatingAverage($capsule->company_id,  $capsule->id);
+                    if ($topic) {
                         $topic_uuid_for_links = $topic->uuid;
                 if(isset($topics[$capsule->topic_id])) {
                     $topic = $topics[$capsule->topic_id];
                 } else {
-                    $topic = $topicMapper->fetchOne($capsule->topic_id);
+                // 5. Obtener datos de comentarios
-                    $topics[ $capsule->topic_id ] = $topic;
+                $dataCountAndRatingAverage = $capsuleCommentMapper->fetchCountAndRatingAverage($capsule->company_id,  $capsule->id);
+                // 6. Construir enlace slides
                 $link_slides = $topic_uuid_for_links ? $this->url()->fromRoute('microlearning/slides', ['topic_id' => $topic_uuid_for_links,  'capsule_id' => $capsule->uuid], ['force_canonical' => true]) : '';
+                // 7. Añadir al array de resultados
-                array_push($capsules, [
+                array_push($capsulesData, [
                     'uuid'              => $capsule->uuid,
                     'name'              => $capsule->name ? $capsule->name : '',
                     'description'       => $capsule->description ? $capsule->description : '',
                     'image'             => $capsule->image ? $storage->getGenericImage($path, $capsule->uuid, $capsule->image)  : '',
                     'position'          => $capsule->order,
+                    'link_comments'     => $this->url()->fromRoute('microlearning/capsules-comments', ['capsule_id' => $capsule->uuid], ['force_canonical' => true]),
-                    'link_comments'     => $this->url()->fromRoute('microlearning/capsules-comments', ['capsule_id' => $capsule->uuid], ['force_canonical' => true]),
+                    'link_comment_add'  => $this->url()->fromRoute('microlearning/capsules-comments/add', ['capsule_id' => $capsule->uuid],['force_canonical' => true]),
-                    'link_comment_add'  => $this->url()->fromRoute('microlearning/capsules-comments/add', ['capsule_id' => $capsule->uuid],['force_canonical' => true]),
+                    'link_slides'       => $link_slides,
-                    'link_slides'       => $this->url()->fromRoute('microlearning/slides', ['topic_id' => $topic->uuid,  'capsule_id' => $capsule->uuid], ['force_canonical' => true]),
+                    'total_comments'    => strval($dataCountAndRatingAverage['total_comments']),
-                    'total_comments'    => strval($dataCountAndRatingAverage['total_comments']),
+                    'total_rating'      => strval($dataCountAndRatingAverage['total_rating']),
-                    'total_rating'      => strval($dataCountAndRatingAverage['total_rating']),
+                    'progress'          => $userProgress->progress, // Progreso real
-                    'progress'          => $userProgress->progress,
+                    'link_get'          => $this->url()->fromRoute('microlearning/get-capsule', ['id' => $capsule->uuid], ['force_canonical' => true]),
-                    'link_get'          => $this->url()->fromRoute('microlearning/get-capsule', ['id' => $capsule->uuid], ['force_canonical' => true]),
+                    'last_access_on'    => $userProgress->updated_on, // Fecha del progreso
-                    'last_access_on'    => $userProgress->updated_on,
+                    'added_on'          => $capsule->added_on, // Fecha de la cápsula
-                    'added_on'          => $capsule->added_on,
-                    'updated_on'        => $capsule->updated_on,
-                ]);
+                    'updated_on'        => $capsule->updated_on, // Fecha de la cápsula
-            }
-            if($order_field == 'name') {
-                if($order_direction == 'asc') {
-                    usort($capsules, function($a, $b) {
+                ]);
                         return strcasecmp($a['name'], $b['name']);
-                    });
                 } else {
-                    usort($capsules, function($a, $b) {
+            // 8. Ordenar (lógica de ordenación permanece igual, usando $capsulesData)
-                        $result = strcasecmp($a['name'], $b['name']);
+            if($order_field == 'name') {
-                        if($result < 0) {
+                if($order_direction == 'asc') {
-                            return 1;
+                    usort($capsulesData, function($a, $b) {
-                        } else if($result > 0) {
+                        return strcasecmp($a['name'], $b['name']);
-                            return -1;
+                    });
-                        } else  {
+                } else {
-                            return  0;
+                    usort($capsulesData, function($a, $b) {
-                        }
-                    });
-                }
+                        $result = strcasecmp($a['name'], $b['name']);
-            }
-            if($order_field == 'added_on') {
-                if($order_direction == 'asc') {
+                        if($result < 0) { return 1; } else if($result > 0) { return -1; } else { return 0; }
-                    usort($capsules, function($a, $b) {
+                    });
-                        return strcasecmp($a['added_on'], $b['added_on']);
                     });
                 } else {
                     usort($capsules, function($a, $b) {
-                        $result = strcasecmp($a['added_on'], $b['added_on']);
+            if($order_field == 'added_on') {
-                        if($result < 0) {
+                if($order_direction == 'asc') {
-                            return 1;
+                    usort($capsulesData, function($a, $b) {
-                        } else if($result > 0) {
+                        return strcasecmp($a['added_on'], $b['added_on']);
-                            return -1;
+                    });
-                        } else  {
+                } else {
-                            return  0;
-                        }
-                    });
+                    usort($capsulesData, function($a, $b) {
-                }
-            }
-            if($order_field == 'last_access_on') {
+                        $result = strcasecmp($a['added_on'], $b['added_on']);
-                if($order_direction == 'asc') {
+                        if($result < 0) { return 1; } else if($result > 0) { return -1; } else { return 0; }
-                    usort($capsules, function($a, $b) {
-                        return strcasecmp($a['last_access_on'], $b['last_access_on']);
+                    });
                     });
                 } else {
-                    usort($capsules, function($a, $b) {
-                        $result = strcasecmp($a['last_access_on'], $b['last_access_on']);
+            if($order_field == 'last_access_on') {
-                        if($result < 0) {
-                            return 1;
-                        } else if($result > 0) {
-                            return -1;
+                if($order_direction == 'asc') {
-                        } else  {
+                    usort($capsulesData, function($a, $b) {
-                            return  0;
+                        return strcasecmp($a['last_access_on'], $b['last_access_on']);
                     });
      *          'topicCompleted' => cantidad de tópicos completos,
      *          'percentCompleted' => % de diapositivas completados ,
      *          'percentIncompleted' => % de diapositivas incompletos ,
      *          'percentWithoutReturning' => % de cápsulas sin retorno después de completada,
      *          'percentWithReturning' => % de cápsulas con retorno después de completada,
-     *       ],
+     *      ],
      * ]
+     *
+     *
      *  En caso contrario
      *  [
             $currentUserPlugin = $this->plugin('currentUserPlugin');
             $currentUser = $currentUserPlugin->getUser();
-            $topic_id = $this->params()->fromRoute('topic_id');
+            $topic_id_param = $this->params()->fromRoute('topic_id'); // Renombrado para claridad
             $topicMapper = MicrolearningTopicMapper::getInstance($this->adapter);
-            $topic = $topicMapper->fetchOneByUuid($topic_id);
+            $topic = $topicMapper->fetchOneByUuid($topic_id_param);
+            $data = [];
+            // Obtener la relación Tópico-Cápsula
+            $topicCapsuleMapper = MicrolearningTopicCapsuleMapper::getInstance($this->adapter);
+            $topicCapsuleRelations = $topicCapsuleMapper->fetchAllActiveByTopicId($topic->id);
+            $capsuleIdsToFetch = [];
+            $capsuleRelationData = []; // Para guardar datos específicos de la relación si es necesario
+            foreach ($topicCapsuleRelations as $relation) {
+                if (in_array($relation->capsule_id, $accessGrantedIds->capsules)) {
+                    $capsuleIdsToFetch[] = $relation->capsule_id;
+                    $capsuleRelationData[$relation->capsule_id] = [
+                        // Aquí puedes guardar datos de $relation si los necesitas más tarde
+                        // por ejemplo: 'publish_on' => $relation->publish_on
+                    ];
+                }
+            }
+            if (empty($capsuleIdsToFetch)) {
+                return new JsonModel([
+                    'success' => true,
                     'data' => [] // No hay cápsulas accesibles para este tópico
+                ]);
+            }
             $data = [];
             // Obtener los detalles de las cápsulas
             $capsuleMapper = MicrolearningCapsuleMapper::getInstance($this->adapter);
-            $capsuleMapper = MicrolearningCapsuleMapper::getInstance($this->adapter);
+            $capsules = $capsuleMapper->fetchAllByIds($capsuleIdsToFetch);
-            $topicCapsuleMapper = MicrolearningTopicCapsuleMapper::getInstance($this->adapter);
             $userProgressMapper = MicrolearningUserProgressMapper::getInstance($this->adapter);
             $capsuleCommentMapper = MicrolearningCapsuleCommentMapper::getInstance($this->adapter);
+            $storage = Storage::getInstance($this->config, $this->adapter);
+            $path = $storage->getPathMicrolearningCapsule();
-            $storage = Storage::getInstance($this->config, $this->adapter);
+            // Construir la respuesta combinando datos de Cápsula y Progreso
-            $path = $storage->getPathMicrolearningCapsule();
+            foreach($capsules as $capsule) // Iterar sobre los objetos Capsule obtenidos
+            {
-            $capsules = $topicCapsuleMapper->fetchAllActiveByTopicId($topic->id);
+                // $capsule ya no tiene topic_id directamente.
-            foreach($capsules as $capsule)
+                // El contexto del tópico viene de $topic (obtenido al inicio).
                 } else {
                     $progress = 0;
                     $completed = 0;
+                }
                 // Pasar company_id y capsule_id de la cápsula
                 $dataCountAndRatingAverage = $capsuleCommentMapper->fetchCountAndRatingAverage($capsule->company_id,  $capsule->id);
                 array_push($data, [
+                    'uuid'              => $capsule->uuid,
-                    'uuid'              => $capsule->uuid,
+                    'name'              => $capsule->name ? $capsule->name : '',
-                    'name'              => $capsule->name ? $capsule->name : '',
+                    'description'       => $capsule->description ? $capsule->description : '',
-                    'description'       => $capsule->description ? $capsule->description : '',
+                    'image'             => $capsule->image ? $storage->getGenericImage($path, $capsule->uuid, $capsule->image)  : '',
-                    'image'             => $capsule->image ? $storage->getGenericImage($path, $capsule->uuid, $capsule->image)  : '',
+                    // Usar $topic->uuid y $capsule->uuid para los enlaces
                     'link_comments'     => $this->url()->fromRoute('microlearning/capsules-comments', ['capsule_id' => $capsule->uuid], ['force_canonical' => true]),
                     'link_comment_add'  => $this->url()->fromRoute('microlearning/capsules-comments/add', ['capsule_id' => $capsule->uuid],['force_canonical' => true]),
                     'link_slides'       => $this->url()->fromRoute('microlearning/slides', ['topic_id' => $topic->uuid,  'capsule_id' => $capsule->uuid], ['force_canonical' => true]),
                     'link_get'          => $this->url()->fromRoute('microlearning/get-capsule', ['id' => $capsule->uuid], ['force_canonical' => true]),
                     'total_comments'    => strval($dataCountAndRatingAverage['total_comments']),
                     'total_rating'      => strval($dataCountAndRatingAverage['total_rating']),
                     'progress'          => $progress,
+                    'completed'         => $completed,
-                    'completed'         => $completed,
+                    'order'             => $capsule->order, // Asumiendo que el orden viene de la cápsula
-                    'order'             => $capsule->order,
+                    'added_on'          => $capsule->added_on, // Fecha de la cápsula
             $currentUserPlugin = $this->plugin('currentUserPlugin');
             $currentUser = $currentUserPlugin->getUser();
-            $capsule_id = $this->params()->fromRoute('id');
+            $capsule_uuid = $this->params()->fromRoute('id');
             $capsuleMapper = MicrolearningCapsuleMapper::getInstance($this->adapter);
-            $capsule = $capsuleMapper->fetchOneByUuid($capsule_id);
+            $capsule = $capsuleMapper->fetchOneByUuid($capsule_uuid);
             if(!$capsule) {
                 return new JsonModel([
                     'success' => false,
+                    'data' => 'ERROR_CAPSULE_NOT_FOUND'
-                    'data' => 'ERROR_CAPSULE_NOT_FOUND'
+                ]);
                 ]);
             $accessGrantedIds = $this->getAccessGranted();
             $accessGrantedIds = $this->getAccessGranted();
             // Verificar si el usuario tiene acceso a esta cápsula específica
+            if(!in_array($capsule->id, $accessGrantedIds->capsules)) {
+                return new JsonModel([
+                    'success' => false,
+                    'data' => 'ERROR_YOU_DO_NOT_HAVE_ACCESS_TO_THIS_CAPSULE'
+                ]);
+            }
+            // --- Obtener el Tópico asociado (si existe y es necesario) ---
+            $topic = null;
+            $topic_uuid_for_links = null; // UUID del tópico para construir enlaces
+            $topicCapsuleMapper = MicrolearningTopicCapsuleMapper::getInstance($this->adapter);
+            // Asumiendo que una cápsula puede estar asociada a múltiples tópicos (muchos-a-muchos),
+            // necesitamos decidir cuál tópico usar como contexto aquí. Usaremos el primero que encontremos.
+            // Si una cápsula SIEMPRE pertenece a UN SOLO tópico, la tabla de unión podría tener una restricción UNIQUE(capsule_id).
+            $relation = $topicCapsuleMapper->fetchOneByCapsuleId($capsule->id); // Necesitamos un método como este
+            if ($relation && in_array($relation->topic_id, $accessGrantedIds->topics)) {
+                $topicMapper = MicrolearningTopicMapper::getInstance($this->adapter);
+                $topic = $topicMapper->fetchOne($relation->topic_id);
+                if ($topic) {
-            if(!in_array($capsule->id, $accessGrantedIds->capsules)) {
-                return new JsonModel([
-                    'success' => false,
-                    'data' => 'ERROR_YOU_DO_NOT_HAVE_ACCESS_TO_THIS_CAPSULE'
-                ]);
+                    $topic_uuid_for_links = $topic->uuid;
+                }
             $dataCountAndRatingAverage = $capsuleCommentMapper->fetchCountAndRatingAverage($capsule->company_id,  $capsule->id);
+            $slideMapper = MicrolearningSlideMapper::getInstance($this->adapter);
+            // Para contar slides, necesitamos el contexto del tópico.
+            $totalSlides = 0;
+            if ($topic) { // Solo contar si tenemos un tópico asociado válido
+                $totalSlides = $slideMapper->fetchTotalCountByCompanyIdAndTopicIdAndCapsuleId($capsule->company_id, $topic->id, $capsule->id);
+            }
-            $slideMapper = MicrolearningSlideMapper::getInstance($this->adapter);
-            $totalSlides = $slideMapper->fetchTotalCountByCompanyIdAndTopicIdAndCapsuleId($capsule->company_id, $capsule->topic_id, $capsule->id);
+            $link_first_slide = '';
+            $type_first_slide = '';
-            $slide = $slideMapper->fetchFirstByCompanyIdAndTopicIdAndCapsuleId($capsule->company_id, $capsule->topic_id, $capsule->id);
-            if($slide) {
+            if ($topic) { // Solo buscar primer slide si tenemos tópico
-                $link_first_slide = $this->url()->fromRoute('microlearning/get-slide', ['id' => $slide->uuid], ['force_canonical' => true]);
-                $type_first_slide = $slide->type;
                 $slide = $slideMapper->fetchFirstByCompanyIdAndTopicIdAndCapsuleId($capsule->company_id, $topic->id, $capsule->id);
                 if($slide) {
-            } else {
+                    $link_first_slide = $this->url()->fromRoute('microlearning/get-slide', ['id' => $slide->uuid], ['force_canonical' => true]);
+                    $type_first_slide = $slide->type;
+                }
                 $link_first_slide = '';
                 $type_first_slide = '';
             $storage = Storage::getInstance($this->config, $this->adapter);
             $path = $storage->getPathMicrolearningCapsule();
             $storage = Storage::getInstance($this->config, $this->adapter);
             $path = $storage->getPathMicrolearningCapsule();
             // Construir enlaces usando $topic_uuid_for_links si está disponible
+            $link_slides = $topic_uuid_for_links ? $this->url()->fromRoute('microlearning/slides', ['topic_id' => $topic_uuid_for_links,  'capsule_id' => $capsule->uuid], ['force_canonical' => true]) : '';
             $data = [
                     'uuid'              => $capsule->uuid,
                     'name'              => $capsule->name ? $capsule->name : '',
                     'description'       => $capsule->description ? $capsule->description : '',
                     $userProgressTopic = $userProgressMapper->fetchOneByUserIdAndTopicId($currentUser->id, $topic->id);
                     if(!$userProgressTopic) {
                         $userProgressTopic = new MicrolearningUserProgress();
-                        $userProgressTopic->company_id                  = $slide->company_id;
+                        $userProgressTopic->company_id                  = $topic->company_id; // Usar company_id del tópico
-                        $userProgressTopic->topic_id                    = $slide->topic_id;
+                        $userProgressTopic->topic_id                    = $topic->id;        // Usar id del tópico
                         $userProgressTopic->user_id                     = $currentUser->id;
                         $userProgressTopic->progress                    = 0;
                         $userProgressTopic->returning                   = 0;
                         $userProgressTopic->returning_after_completed   = 0;
                         $userProgressTopic->completed                   = 0;
-                        $userProgressTopic->total_slides                = $slideMapper->fetchTotalCountByCompanyIdAndTopicId($slide->company_id, $slide->topic_id);
+                        $userProgressTopic->total_slides                = $slideMapper->fetchTotalCountByCompanyIdAndTopicId($topic->company_id, $topic->id);
                         $userProgressTopic->view_slides                 = 0;
                         $userProgressTopic->type                        = MicrolearningUserProgress::TYPE_TOPIC;
                         $userProgressTopic->added_on                    = $added_on;
                         $userProgressTopic->updated_on                  = $added_on;
                         if($userProgressMapper->insert($userProgressTopic)) {
                             $userLog = new MicrolearningUserLog();
                             $userLog->activity      = MicrolearningUserLog::ACTIVITY_START_TOPIC;
                             $userLog->user_id       = $currentUser->id;
-                            $userLog->company_id    = $slide->company_id;
+                            $userLog->company_id    = $topic->company_id;
-                            $userLog->topic_id      = $slide->topic_id;
+                            $userLog->topic_id      = $topic->id;
                     $userProgressCapsule = $userProgressMapper->fetchOneByUseridAndCapsuleId($currentUser->id, $capsule->id);
                     if(!$userProgressCapsule) {
                         $userProgressCapsule = new MicrolearningUserProgress();
-                        $userProgressCapsule->company_id                  = $slide->company_id;
+                        $userProgressCapsule->company_id                  = $capsule->company_id; // Usar company_id de la cápsula
-                        $userProgressCapsule->topic_id                    = $slide->topic_id;
+                        $userProgressCapsule->topic_id                    = $topic->id;         // Usar el id del tópico obtenido previamente
-                        $userProgressCapsule->capsule_id                  = $slide->capsule_id;
+                        $userProgressCapsule->capsule_id                  = $capsule->id;       // Usar id de la cápsula
                         $userProgressCapsule->user_id                     = $currentUser->id;
                         $userProgressCapsule->progress                    = 0;
                         $userProgressCapsule->returning                   = 0;
                         $userProgressCapsule->returning_after_completed   = 0;
                         $userProgressCapsule->completed                   = 0;
-                        $userProgressCapsule->total_slides                = $slideMapper->fetchTotalCountByCompanyIdAndTopicIdAndCapsuleId($slide->company_id, $slide->topic_id, $slide->capsule_id);
-                        $userProgressCapsule->view_slides                 = 0;
-                        $userProgressCapsule->type                        = MicrolearningUserProgress::TYPE_CAPSULE;
+                        $userProgressCapsule->total_slides                = $slideMapper->fetchTotalCountByCompanyIdAndTopicIdAndCapsuleId($capsule->company_id, $topic->id, $capsule->id);
-                        $userProgressCapsule->added_on                    = $added_on;
+                        $userProgressCapsule->view_slides                 = 0;
                         $userProgressTopic->updated_on                    = $added_on;
                         if($userProgressMapper->insert($userProgressCapsule)) {
                             $userLog = new MicrolearningUserLog();
                             $userLog->activity      = MicrolearningUserLog::ACTIVITY_START_CAPSULE;
                             $userLog->user_id       = $currentUser->id;
-                            $userLog->company_id    = $slide->company_id;
+                            $userLog->company_id    = $capsule->company_id;
-                            $userLog->topic_id      = $slide->topic_id;
+                            $userLog->topic_id      = $topic->id;
-                            $userLog->capsule_id    = $slide->capsule_id;
+                            $userLog->capsule_id    = $capsule->id;
                     if($userProgressCapsule->completed) {
                         $dt = \DateTime::createFromFormat('Y-m-d H:i:s', $added_on);
+                        $returning_on = $dt->format('Y-m-d');
+                        // Asegurarse que returning_on existe en el objeto antes de comparar
-                        $returning_on = $dt->format('Y-m-d');
+                        $current_returning_on = isset($userProgressCapsule->returning_on) ? $userProgressCapsule->returning_on : null;
+                        if(!$current_returning_on || $current_returning_on != $returning_on) {
-                        if(!$userProgressCapsule->returning_on || $userProgressCapsule->returning_on != $returning_on) {
                             $userProgressCapsule->returning_on = $returning_on;
-                            $userProgressCapsule->returning_on = $returning_on;
+                            // Asegurarse que returning_after_completed existe y es numérico antes de incrementar
-                            $userProgressCapsule->returning_after_completed = $userProgressCapsule->returning_after_completed + 1;
+                            $userProgressCapsule->returning_after_completed = (isset($userProgressCapsule->returning_after_completed) ? intval($userProgressCapsule->returning_after_completed) : 0) + 1;
+                            }
+                        }
+                    }  else {
-                    }  else {
+                        // Usar $topic->id para obtener el total de slides de la cápsula en el contexto de este tópico
-                        $userProgressCapsule->total_slides = $slideMapper->fetchTotalCountByCompanyIdAndTopicIdAndCapsuleId($slide->company_id, $slide->topic_id, $slide->capsule_id);
+                        $userProgressCapsule->total_slides = $slideMapper->fetchTotalCountByCompanyIdAndTopicIdAndCapsuleId($capsule->company_id, $topic->id, $capsule->id);
-                        $userProgressCapsule->view_slides = $userProgressMapper->fetchCountAllSlideCompletedByUserIdAndCapsuleId($currentUser->id, $slide->capsule_id);
+                        $userProgressCapsule->view_slides = $userProgressMapper->fetchCountAllSlideCompletedByUserIdAndCapsuleId($currentUser->id, $capsule->id);
+                    }
                     $closeTopic = false;
-                    if(!$userProgressTopic->completed) {
+                    if(!$userProgressTopic->completed) {
+                        // Usar $topic->id para obtener el total de slides del tópico
-                        $userProgressTopic->total_slides = $slideMapper->fetchTotalCountByCompanyIdAndTopicId($slide->company_id, $slide->topic_id);
+                        $userProgressTopic->total_slides = $slideMapper->fetchTotalCountByCompanyIdAndTopicId($topic->company_id, $topic->id);
-                        $userProgressTopic->view_slides = $userProgressMapper->fetchCountAllSlideCompletedByUserIdAndTopicId($currentUser->id, $slide->topic_id);
+                        $userProgressTopic->view_slides = $userProgressMapper->fetchCountAllSlideCompletedByUserIdAndTopicId($currentUser->id, $topic->id);

Proyectos de Subversion LeadersLinked - Services

(root)/module/LeadersLinked/src/Controller/MicrolearningController.php – Rev 333 → 558