WebSVN – LeadersLinked - Services – Diff – /module/LeadersLinked/src/Mapper/MicrolearningUserProgressMapper.php

 use LeadersLinked\Model\MicrolearningUserProgress;
 use LeadersLinked\Hydrator\ObjectPropertyHydrator;
 use Laminas\Db\Sql\Expression;
 use LeadersLinked\Mapper\MicrolearningSlideMapper;
 use LeadersLinked\Mapper\MicrolearningTopicCapsuleMapper;
 class MicrolearningUserProgressMapper extends MapperCommon
+{
     const _TABLE = 'tbl_microlearning_user_progress';
     /**
+     *
      * @var MicrolearningUserProgressMapper
      */
+    private static $_instance;
+    private $topicCapsuleMapper;
-    private static $_instance;
+    private $slideMapper;
     /**
+     *
      * @param AdapterInterface $adapter
      */
     private function __construct($adapter)
+    {
+        parent::__construct($adapter);
         $this->topicCapsuleMapper = MicrolearningTopicCapsuleMapper::getInstance($adapter);
-        parent::__construct($adapter);
+        $this->slideMapper = MicrolearningSlideMapper::getInstance($adapter);
+    }
         return $user_ids;
-    }
+    }
     /**
+     *
      * @return MicrolearningUserProgress[]
      */
-    public function fetchAllTopics()
     public function fetchAllTopics()
         $prototype = new MicrolearningUserProgress();
-        $select = $this->sql->select(self::_TABLE);
-        $select->where->equalTo('type', MicrolearningUserProgress::TYPE_TOPIC);
+        $prototype = new MicrolearningUserProgress();
         $select = $this->sql->select(self::_TABLE);
-        //echo $select->getSqlString($this->adapter->platform); exit;
         $select->where->equalTo('type', MicrolearningUserProgress::TYPE_TOPIC);
         return $this->executeFetchAllObject($select, $prototype);
         return $this->executeFetchAllObject($select, $prototype);
+    }
     /**
+     *
-     * @return MicrolearningUserProgress[]
-     */
+     * @return MicrolearningUserProgress[]
-    public function fetchAllCapsules()
+     */
     public function fetchAllCapsules()
         $prototype = new MicrolearningUserProgress();
-        $select = $this->sql->select(self::_TABLE);
+        $prototype = new MicrolearningUserProgress();
-        $select->where->equalTo('type', MicrolearningUserProgress::TYPE_CAPSULE);
+        $select = $this->sql->select(self::_TABLE);
         $select->where->equalTo('type', MicrolearningUserProgress::TYPE_CAPSULE);
         return $this->executeFetchAllObject($select, $prototype);
         return $this->executeFetchAllObject($select, $prototype);
         $select = $this->sql->select(self::_TABLE);
         $select->where->equalTo('user_id', $user_id);
         $select->where->equalTo('slide_id', $slide_id);
-        $select->where->equalTo('type', MicrolearningUserProgress::TYPE_SLIDE);
         $select->where->equalTo('type', MicrolearningUserProgress::TYPE_SLIDE);
         $select->limit(1);
         $record = $this->executeFetchOneArray($select);
         return $record['total'];
-    }
-    /**
-     * Marca una diapositiva como vista por un usuario.
-     *
-     * @param int $user_id ID del usuario
-     * @param int $topic_id ID del tema
-     * @param int $capsule_id ID de la cápsula
-     * @param int $slide_id ID de la diapositiva
-     * @return bool true si se marcó como vista correctamente o ya estaba vista, false en caso de error
-     * @throws \InvalidArgumentException Si alguno de los IDs es inválido
-     * @throws \RuntimeException Si hay un error en la base de datos
-     */
-    public function markSlideViewed($user_id, $topic_id, $capsule_id, $slide_id)
-    {
-        // Verifica si ya existe el registro
-        $exists = $this->fetchOneByUserIdAndSlideId($user_id, $slide_id);
-        if ($exists) {
-            return true; // ya está registrado, consideramos esto un éxito
-        }
-        $now = date('Y-m-d H:i:s');
-        // Crear nuevo progreso
-        $userProgress = new MicrolearningUserProgress();
-        $userProgress->user_id = $user_id;
-        $userProgress->topic_id = $topic_id;
-        $userProgress->capsule_id = $capsule_id;
-        $userProgress->slide_id = $slide_id;
-        $userProgress->type = MicrolearningUserProgress::TYPE_SLIDE;
-        $userProgress->progress = 100;
-        $userProgress->completed = 1;
-        $userProgress->added_on = $now;
-        $userProgress->updated_on = $now;
         return $this->insert($userProgress);
     }
-    /**
-     * Marca una cápsula como completada por un usuario.
+    /**
-     *
+     * Update the progress of a slide
-     * @param int $user_id ID del usuario
+     * @param int $user_id
-     * @param int $topic_id ID del tema
+     * @param int $slide_id
-     * @param int $capsule_id ID de la cápsula
+     * @param int $capsule_id
-     * @return bool true si se marcó como completada correctamente, false en caso de error
+     * @return int
      */
-    public function markCapsuleCompleted($user_id, $topic_id, $capsule_id)
-    {
+    public function updateSlideProgress($user_id, $slide_id, $capsule_id){
-        $now = date('Y-m-d H:i:s');
+        $userProgress = $this->fetchOneByUserIdAndSlideId($user_id, $slide_id);
-        // Verifica si ya existe algún progreso de cápsula
+        if(!$userProgress){
-        $userProgress = $this->fetchOneByUserIdAndCapsuleId($user_id, $capsule_id);
+            $userProgress = new MicrolearningUserProgress();
+            $userProgress->user_id = $user_id;
             $userProgress->slide_id = $slide_id;
-        if ($userProgress) {
+            $userProgress->capsule_id = $capsule_id;
-            // Si ya existe, actualizar el progreso
+            $userProgress->type = MicrolearningUserProgress::TYPE_SLIDE;
-            $userProgress->progress = 100;
-            $userProgress->completed = 1;
-            $userProgress->updated_on = $now;
-            return $this->update($userProgress);
-        }
-        // Si no existe, crear nuevo progreso
-        $userProgress = new MicrolearningUserProgress();
-        $userProgress->user_id = $user_id;
-        $userProgress->topic_id = $topic_id;
-        $userProgress->capsule_id = $capsule_id;
-        $userProgress->type = MicrolearningUserProgress::TYPE_CAPSULE;
-        $userProgress->progress = 100;
+            $userProgress->progress = 100;
-        $userProgress->completed = 1;
-        $userProgress->added_on = $now;
+            $userProgress->completed = 1;
-        $userProgress->updated_on = $now;
-        return $this->insert($userProgress);
-    }
-    /**
-     * Marca un tema/tópico como completado por un usuario.
-     *
-     * @param int $user_id ID del usuario
-     * @param int $topic_id ID del tema
-     * @return bool true si se marcó como completado correctamente, false en caso de error
-     */
-    public function markTopicCompleted($user_id, $topic_id)
-    {
-        $now = date('Y-m-d H:i:s');
-        // Verifica si ya existe algún progreso del tema
+            $userProgress->added_on = date('Y-m-d H:i:s');
-        $userProgress = $this->fetchOneByUserIdAndTopicId($user_id, $topic_id);
             $userProgress->updated_on = date('Y-m-d H:i:s');
-        if ($userProgress) {
+            return $this->insert($userProgress);
-            // Si ya existe, actualizar el progreso
+        } else {
             $userProgress->progress = 100;
             $userProgress->completed = 1;
-            $userProgress->updated_on = $now;
-            return $this->update($userProgress);
-        }
-        // Si no existe, crear nuevo progreso
-        $userProgress = new MicrolearningUserProgress();
-        $userProgress->user_id = $user_id;
-        $userProgress->topic_id = $topic_id;
-        $userProgress->type = MicrolearningUserProgress::TYPE_TOPIC;
-        $userProgress->progress = 100;
-        $userProgress->completed = 1;
-        $userProgress->added_on = $now;
-        $userProgress->updated_on = $now;
+            $userProgress->updated_on = date('Y-m-d H:i:s');
             return $this->update($userProgress);
-        return $this->insert($userProgress);
+        }
-    }
+    }
-    /**
-     * Verifica si un usuario ha visto todas las diapositivas de una cápsula específica.
-     *
-     * @param int $user_id ID del usuario
+    /**
-     * @param int $capsule_id ID de la cápsula
+     * Get the number of slides completed by a capsule
-     * @return bool true si ha visto todas las diapositivas, false en caso contrario
-     * @throws \InvalidArgumentException Si alguno de los IDs es inválido
+     * @param int $capsule_id
-     */
+     * @return int
+     */
+    public function getSlidesCompletedByCapsuleId($capsule_id){
-    public function hasViewedAllSlidesInCapsule($user_id, $capsule_id)
+        // Get total slides in the capsule
-    {
+        $totalSlides = $this->slideMapper->fetchTotalCountByCapsuleId($capsule_id);
-        $slideMapper = MicrolearningSlideMapper::getInstance($this->adapter);
+        // Get all slides completed
-        $allSlides = $slideMapper->fetchAllByCapsuleId($capsule_id);
+        $select = $this->sql->select(self::_TABLE);
+        $select->columns(['total' => new Expression('COUNT(*)')]);
-        // Obtener el total de diapositivas vistas por el usuario en esta cápsula
+        $select->where->equalTo('capsule_id', $capsule_id);
-        $viewedSlides = $this->fetchCountAllSlideCompletedByUserIdAndCapsuleId($user_id, $capsule_id);
+        $select->where->equalTo('type', MicrolearningUserProgress::TYPE_SLIDE);
-        $totalSlides = count($allSlides);
+        $select->where->equalTo('completed', 1);
-        // Comparar si el número de diapositivas vistas es igual al total
-        return $viewedSlides >= $totalSlides;
+        $record = $this->executeFetchOneArray($select);
-    }
+        return (int)$record['total'];
-    /**
+    }
      * Verifica si un usuario ha completado todas las cápsulas disponibles en un tema específico.
-     *
+    /**
+     * Update the progress of a capsule
+     * @param int $user_id
-     * @param int $user_id ID del usuario
+     * @param int $capsule_id
+     * @param int $topic_id
-     * @param int $topic_id ID del tema
+     * @return int
+     */
-     * @return bool true si el usuario ha completado todas las cápsulas del tema, false en caso contrario
+    public function updateCapsuleProgress($user_id, $capsule_id, $topic_id){
+        // Get total slides in the capsule
+        $totalSlides = $this->slideMapper->fetchTotalCountByCapsuleId($capsule_id);
-     * @throws \InvalidArgumentException Si alguno de los IDs es inválido
+        // Get all slides completed
+        $slidesCompleted = $this->getSlidesCompletedByCapsuleId($capsule_id);
+        $progress = ($slidesCompleted * 100) / $totalSlides;
+        $progress = min($progress, 100);
+        $completed = $progress == 100 ? 1 : 0;
+        $userProgress = $this->fetchOneByUserIdAndCapsuleId($user_id, $capsule_id);
+        if(!$userProgress){
+            $userProgress = new MicrolearningUserProgress();
+            $userProgress->user_id = $user_id;
+            $userProgress->capsule_id = $capsule_id;
+            $userProgress->topic_id = $topic_id;
-     * @throws \RuntimeException Si hay un error en la base de datos
+            $userProgress->type = MicrolearningUserProgress::TYPE_CAPSULE;
+            $userProgress->progress = $progress;
+            $userProgress->completed = $completed;
+            $userProgress->total_slides = $totalSlides;
+            $userProgress->view_slides = $slidesCompleted;
+            $userProgress->added_on = date('Y-m-d H:i:s');
+            $userProgress->updated_on = date('Y-m-d H:i:s');
-     */
+            return $this->insert($userProgress);
+        } else {
+            $userProgress->progress = $progress;
+            $userProgress->completed = $completed;
+            $userProgress->total_slides = $totalSlides;
+            $userProgress->view_slides = $slidesCompleted;
+            $userProgress->updated_on = date('Y-m-d H:i:s');
+            return $this->update($userProgress);
     public function hasCompletedAllCapsulesInTopic($user_id, $topic_id)
+    }
-        $capsuleMapper = MicrolearningTopicCapsuleMapper::getInstance($this->adapter);
         $allCapsules = $capsuleMapper->fetchAllByTopicId($topic_id);
     /**
-        if (empty($allCapsules)) {
+     * Get the number of capsules completed by a topic
-            return false;
      * @param int $topic_id
+     * @return int
+     */
+    public function getCapsulesCompletedByTopicId($topic_id){
+        $select = $this->sql->select(self::_TABLE);
+        $select->columns(['total' => new Expression('COUNT(*)')]);
+        $select->where->equalTo('topic_id', $topic_id);
+        $select->where->equalTo('type', MicrolearningUserProgress::TYPE_CAPSULE);
+        $select->where->equalTo('completed', 1);
+        $record = $this->executeFetchOneArray($select);
+        return (int)$record['total'];
+    }
+    /**
+     * Update the progress of a topic
+     * @param int $user_id
+     * @param int $topic_id
+     * @return void
+     */
+    public function updateTopicProgress($user_id, $topic_id){
+        // Get all capsules in the topic
+        $totalCapsules = $this->topicCapsuleMapper->fetchTotalCountByTopicId($topic_id);
+        // Get all capsules completed
+        $completedCapsules = $this->getCapsulesCompletedByTopicId($topic_id);
+        // Calculate progress and completed
+        $progress = ($completedCapsules * 100) / $totalCapsules;
+        $progress = min($progress, 100);
+        $completed = $progress == 100 ? 1 : 0;
+        $userProgress = $this->fetchOneByUserIdAndTopicId($user_id, $topic_id);
+        if(!$userProgress){
+            $userProgress = new MicrolearningUserProgress();
+            $userProgress->user_id = $user_id;
+            $userProgress->topic_id = $topic_id;
+            $userProgress->type = MicrolearningUserProgress::TYPE_TOPIC;
+            $userProgress->progress = $progress;
+            $userProgress->completed = $completed;
-        $select = $this->sql->select(self::_TABLE);
+            $userProgress->added_on = date('Y-m-d H:i:s');
-        $select->columns(['total' => new Expression('COUNT(*)')]);
+            $userProgress->updated_on = date('Y-m-d H:i:s');
-        $select->where->equalTo('user_id', $user_id);
+            return $this->insert($userProgress);

Proyectos de Subversion LeadersLinked - Services

(root)/module/LeadersLinked/src/Mapper/MicrolearningUserProgressMapper.php – Rev 657 → 658