Merge pull request #7055 from christianbeeznest/GH-7054

christianbeeznest · web-flow · commit 51d316905937 · 2025-11-13T15:14:22.000-05:00
Gradebook: Improve item display and reporting - refs #7054
diff --git a/public/main/gradebook/gradebook_add_link.php b/public/main/gradebook/gradebook_add_link.php
@@ -17,6 +17,7 @@
 $tbl_link = Database::get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
 
 $session_id = api_get_session_id();
+$courseRealId = (int) $course_info['real_id'];
 $typeSelected = isset($_GET['typeselected']) ? (int) $_GET['typeselected'] : null;
 
 if (0 == $session_id) {
@@ -100,9 +101,7 @@
             (isset($addvalues['select_link']) && "" != $addvalues['select_link'])
         ) {
             $sql1 = 'SELECT title from '.$tbl_forum_thread.'
-					 WHERE
-					    c_id = '.$course_info['real_id'].' AND
-					    iid  = '.$addvalues['select_link'];
+					 WHERE iid  = '.$addvalues['select_link'];
             $res1 = Database::query($sql1);
             $rowtit = Database::fetch_row($res1);
             $course_id = api_get_course_id();
@@ -119,9 +118,7 @@
                             thread_qualify_max= "'.api_float_val($addvalues['weight']).'",
                             thread_weight= "'.api_float_val($addvalues['weight']).'",
                             thread_title_qualify = "'.$rowtit[0].'"
-						WHERE
-						    iid ='.$addvalues['select_link'].' AND
-						    c_id = '.$course_info['real_id'].' ';
+						WHERE iid ='.$addvalues['select_link'];
                 Database::query($sql);
             }
         }
diff --git a/public/main/gradebook/gradebook_edit_all.php b/public/main/gradebook/gradebook_edit_all.php
@@ -113,7 +113,7 @@
 foreach ($links as &$row) {
     $item_weight = $row['weight'];
     $sql = 'SELECT * FROM '.GradebookUtils::get_table_type_course($row['type']).'
-            WHERE c_id = '.$course_id.' AND '.$table_evaluated[$row['type']][2].' = '.$row['ref_id'];
+            WHERE '.$table_evaluated[$row['type']][2].' = '.$row['ref_id'];
 
     $result = Database::query($sql);
     $resource_name = Database::fetch_array($result);
diff --git a/public/main/gradebook/lib/GradebookUtils.php b/public/main/gradebook/lib/GradebookUtils.php
@@ -533,6 +533,10 @@ public static function get_table_type_course($type)
     {
         global $table_evaluated;
 
+        if (!isset($table_evaluated[$type][0])) {
+            throw new \InvalidArgumentException('Unknown evaluated type: '.$type);
+        }
+
         return Database::get_course_table($table_evaluated[$type][0]);
     }
 
@@ -674,18 +678,24 @@ public static function get_list_users_certificates($cat_id = null, $userList = [
     {
         $table_certificate = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CERTIFICATE);
         $table_user = Database::get_main_table(TABLE_MAIN_USER);
-        $sql = 'SELECT DISTINCT u.id as user_id, u.lastname, u.firstname, u.username, gc.created_at
-                FROM '.$table_user.' u
-                INNER JOIN '.$table_certificate.' gc
-                ON u.id = gc.user_id ';
+
+        $sql = 'SELECT DISTINCT u.id AS user_id, u.lastname, u.firstname, u.username, gc.created_at
+            FROM '.$table_user.' u
+            INNER JOIN '.$table_certificate.' gc ON u.id = gc.user_id';
+
+        $where = [];
+
         if (!is_null($cat_id) && $cat_id > 0) {
-            $sql .= ' WHERE cat_id='.intval($cat_id);
+            $where[] = 'gc.cat_id = '.(int) $cat_id;
         }
         if (!empty($userList)) {
-            $userList = array_map('intval', $userList);
-            $userListCondition = implode("','", $userList);
-            $sql .= " AND u.id IN ('$userListCondition')";
+            $ids = array_map('intval', $userList);
+            $where[] = 'u.id IN ('.implode(',', $ids).')';
+        }
+        if ($where) {
+            $sql .= ' WHERE '.implode(' AND ', $where);
         }
+
         $sql .= ' ORDER BY '.(api_sort_by_first_name() ? 'u.firstname' : 'u.lastname');
         $rs = Database::query($sql);
 
@@ -1210,39 +1220,31 @@ public static function get_all_users($evals = [], $links = []): array
      */
     public static function find_students($mask = '')
     {
-        // students shouldn't be here // don't search if mask empty
-        if (!api_is_allowed_to_edit() || empty($mask)) {
+        if (!api_is_allowed_to_edit() || $mask === '') {
             return null;
         }
+
         $mask = Database::escape_string($mask);
         $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
-        $tbl_cru = Database::get_main_table(TABLE_MAIN_COURSE_USER);
-        $sql = 'SELECT DISTINCT user.id as user_id, user.lastname, user.firstname, user.email, user.official_code
-                FROM '.$tbl_user.' user';
-        if (!api_is_platform_admin()) {
-            $sql .= ', '.$tbl_cru.' cru';
-        }
+        $tbl_cru  = Database::get_main_table(TABLE_MAIN_COURSE_USER);
 
-        $sql .= ' WHERE user.status = '.STUDENT;
-        $sql .= ' AND (user.lastname LIKE '."'%".$mask."%'";
-        $sql .= ' OR user.firstname LIKE '."'%".$mask."%')";
+        $sql = 'SELECT DISTINCT user.id AS user_id, user.lastname, user.firstname, user.email, user.official_code
+            FROM '.$tbl_user.' user';
 
         if (!api_is_platform_admin()) {
-            $sql .= ' AND user.id = cru.user_id AND
-                      cru.relation_type <> '.COURSE_RELATION_TYPE_RRHH.' AND
-                      cru.c_id in (
-                            SELECT c_id FROM '.$tbl_cru.'
-                            WHERE
-                                user_id = '.api_get_user_id().' AND
-                                status = '.COURSEMANAGER.'
-                        )
-                    ';
+            $sql .= ' INNER JOIN '.$tbl_cru.' cru ON (cru.user_id = user.id)
+                  AND cru.relation_type <> '.COURSE_RELATION_TYPE_RRHH.'
+                  AND cru.c_id IN (
+                        SELECT c_id FROM '.$tbl_cru.'
+                         WHERE user_id = '.api_get_user_id().' AND status = '.COURSEMANAGER.'
+                  )';
         }
 
-        $sql .= ' ORDER BY lastname, firstname';
-        if (api_is_western_name_order()) {
-            $sql .= ' ORDER BY firstname, lastname';
-        }
+        $sql .= ' WHERE user.status = '.STUDENT.'
+              AND (user.lastname LIKE \'%'.$mask.'%\' OR user.firstname LIKE \'%'.$mask.'%\')';
+
+        $orderBy = api_is_western_name_order() ? 'firstname, lastname' : 'lastname, firstname';
+        $sql .= ' ORDER BY '.$orderBy;
 
         $result = Database::query($sql);
 
@@ -1281,14 +1283,13 @@ public static function updateLinkWeight($linkId, $name, $weight)
             $row_attendance = Database::fetch_array($rs_attendance);
             $sql = 'UPDATE '.$tbl_attendance.' SET
                     attendance_weight ='.api_float_val($weight).'
-                    WHERE c_id = '.$course_id.' AND  id = '.intval($row_attendance['ref_id']);
+                    WHERE id = '.intval($row_attendance['ref_id']);
             Database::query($sql);
         }
         // Update weight into forum thread
         $sql = 'UPDATE '.$tbl_forum_thread.' SET
                 thread_weight = '.api_float_val($weight).'
                 WHERE
-                    c_id = '.$course_id.' AND
                     iid = (
                         SELECT ref_id FROM '.$table_link.'
                         WHERE id='.$linkId.' AND type='.LINK_FORUM_THREAD.'
@@ -1300,15 +1301,14 @@ public static function updateLinkWeight($linkId, $name, $weight)
             ->createQuery('
                 UPDATE ChamiloCourseBundle:CStudentPublication w
                 SET w.weight = :final_weight
-                WHERE w.cId = :course
-                    AND w.iid = (
+                WHERE
+                    w.iid = (
                         SELECT l.refId FROM ChamiloCoreBundle:GradebookLink l
                         WHERE l.id = :link AND l.type = :type
                     )
             ')
             ->execute([
                 'final_weight' => $weight,
-                'course' => $course_id,
                 'link' => $linkId,
                 'type' => LINK_STUDENTPUBLICATION,
             ]);
diff --git a/public/main/gradebook/lib/be/attendancelink.class.php b/public/main/gradebook/lib/be/attendancelink.class.php
@@ -53,15 +53,6 @@ public function get_all_links(): array
         $qb = $repo->getResourcesByCourse(api_get_course_entity($this->course_id), api_get_session_entity($sessionId));
         $qb->andWhere('resource.active = 1');
         $links = $qb->getQuery()->getResult();
-
-        /*$tbl_attendance = $this->get_attendance_table();
-        $sql = 'SELECT att.iid, att.title, att.attendance_qualify_title
-                FROM '.$tbl_attendance.' att
-                WHERE
-                    att.c_id = '.$this->course_id.' AND
-                    att.active = 1 AND
-                    att.session_id = '.$sessionId;
-        $result = Database::query($sql);*/
         $cats = [];
         /** @var CAttendance $link */
         foreach ($links as $link) {
@@ -86,9 +77,7 @@ public function has_results(): bool
         $sessionId = $this->get_session_id();
 
         $sql = 'SELECT count(*) AS number FROM '.$tbl_attendance_result."
-                WHERE
-                    session_id = $sessionId AND
-                    attendance_id = ".$this->get_ref_id();
+                WHERE attendance_id = ".$this->get_ref_id();
         $result = Database::query($sql);
         $number = Database::fetch_row($result);
 
@@ -109,8 +98,7 @@ public function calc_score(?int $studentId = null, ?string $type = null): array
         // get attendance qualify max
         $sql = 'SELECT attendance_qualify_max
                 FROM '.$this->get_attendance_table().'
-                WHERE
-                    iid = '.$this->get_ref_id();
+                WHERE iid = '.$this->get_ref_id();
         $query = Database::query($sql);
         $attendance = Database::fetch_assoc($query);
 
diff --git a/public/main/gradebook/lib/be/dropboxlink.class.php b/public/main/gradebook/lib/be/dropboxlink.class.php
@@ -29,10 +29,9 @@ public function get_view_url($stud_id)
         // with the same title as the evaluation name
 
         $eval = $this->get_evaluation();
-        $sql = 'SELECT filename FROM '.$this->get_dropbox_table().' 
-                WHERE 
-                    c_id = '.$this->course_id.' AND 
-                    uploader_id = '.intval($stud_id)." AND 
+        $sql = 'SELECT filename FROM '.$this->get_dropbox_table().'
+                WHERE
+                    uploader_id = '.intval($stud_id)." AND
                     title = '".Database::escape_string($eval->get_name())."'";
 
         $result = Database::query($sql);
diff --git a/public/main/gradebook/lib/be/exerciselink.class.php b/public/main/gradebook/lib/be/exerciselink.class.php
@@ -267,9 +267,7 @@ public function calc_score($studentId = null, $type = null)
             $sql = "SELECT * FROM $tblHp hp
                     INNER JOIN $tblDoc doc
                     ON (hp.title = doc.path)
-                    WHERE
-                        hp.c_id = $courseId AND
-                        doc.iid = $exerciseId";
+                    WHERE doc.iid = $exerciseId";
 
             if (!empty($studentId)) {
                 $sql .= " AND hp.exe_user_id = $studentId ";
diff --git a/public/main/gradebook/lib/be/forumthreadlink.class.php b/public/main/gradebook/lib/be/forumthreadlink.class.php
@@ -52,28 +52,13 @@ public function get_all_links()
 
         $tbl_grade_links = Database::get_course_table(TABLE_FORUM_THREAD);
         $sessionId = $this->get_session_id();
-
-        if ($sessionId) {
-            $session_condition = 'tl.session_id='.$sessionId;
-        } else {
-            $session_condition = '(tl.session_id = 0 OR tl.session_id IS NULL)';
-        }
-
         $repo = Container::getForumThreadRepository();
         $course = api_get_course_entity($this->course_id);
         $session = api_get_session_entity($sessionId);
 
         $qb = $repo->findAllByCourse($course, $session);
         /** @var CForumThread[] $threads */
         $threads = $qb->getQuery()->getResult();
-
-        /*$sql = 'SELECT tl.iid as thread_id, tl.thread_title, tl.thread_title_qualify
-                FROM '.$tbl_grade_links.' tl
-                WHERE
-                    tl.c_id = '.$this->course_id.' AND
-                    '.$session_condition.'
-                ';
-        $result = Database::query($sql);*/
         $cats = [];
         foreach ($threads as $thread) {
             $title = $thread->getTitle();
@@ -97,10 +82,7 @@ public function has_results()
         $table = Database::get_course_table(TABLE_FORUM_POST);
 
         $sql = "SELECT count(*) AS number FROM $table
-                WHERE
-                    c_id = ".$this->course_id." AND
-                    iid = '".$this->get_ref_id()."'
-                ";
+                WHERE iid = '".$this->get_ref_id();
         $result = Database::query($sql);
         $number = Database::fetch_row($result);
 
@@ -126,21 +108,13 @@ public function calc_score($studentId = null, $type = null)
         );
 
         $sql = 'SELECT thread_qualify_max
-                FROM '.Database::get_course_table(TABLE_FORUM_THREAD)."
-                WHERE
-                    c_id = ".$this->course_id." AND
-                    iid = '".$this->get_ref_id()."'
-                    $sessionCondition
-                ";
+                FROM '.Database::get_course_table(TABLE_FORUM_THREAD).'
+                WHERE iid = '.$this->get_ref_id();
         $query = Database::query($sql);
         $assignment = Database::fetch_array($query);
 
         $sql = "SELECT * FROM $thread_qualify
-                WHERE
-                    c_id = ".$this->course_id." AND
-                    iid = ".$this->get_ref_id()."
-                    $sessionCondition
-                ";
+                WHERE iid = ".$this->get_ref_id();
         if (isset($studentId)) {
             $sql .= ' AND user_id = '.intval($studentId);
         }
@@ -270,10 +244,7 @@ public function is_valid_link()
     {
         $sessionId = $this->get_session_id();
         $sql = 'SELECT count(iid) FROM '.$this->get_forum_thread_table().'
-                WHERE
-                    c_id = '.$this->course_id.' AND
-                    iid = '.$this->get_ref_id().' AND
-                    session_id='.$sessionId;
+                WHERE iid = '.$this->get_ref_id();
         $result = Database::query($sql);
         $number = Database::fetch_row($result);
 
@@ -283,11 +254,8 @@ public function is_valid_link()
     public function get_link()
     {
         $sessionId = $this->get_session_id();
-        $sql = 'SELECT * FROM '.$this->get_forum_thread_table()."
-                WHERE
-                    c_id = {$this->course_id} AND
-                    iid = '".$this->get_ref_id()."' AND
-                    session_id = $sessionId ";
+        $sql = 'SELECT * FROM '.$this->get_forum_thread_table().'
+                WHERE iid = '.$this->get_ref_id();
         $result = Database::query($sql);
         $row = Database::fetch_assoc($result);
 
@@ -315,7 +283,7 @@ public function save_linked_data()
         if (!empty($ref_id)) {
             $sql = 'UPDATE '.$this->get_forum_thread_table().' SET
                     thread_weight='.api_float_val($weight).'
-                    WHERE c_id = '.$this->course_id.' AND iid = '.$ref_id;
+                    WHERE iid = '.$ref_id;
             Database::query($sql);
         }
     }
@@ -329,7 +297,7 @@ public function delete_linked_data()
                     thread_qualify_max = 0,
                     thread_weight = 0,
                     thread_title_qualify = ""
-                    WHERE c_id = '.$this->course_id.' AND iid = '.$ref_id;
+                    WHERE iid = '.$ref_id;
             Database::query($sql);
         }
     }
@@ -344,19 +312,9 @@ private function get_forum_thread_table()
 
     private function getThreadData()
     {
-        $sessionId = $this->get_session_id();
-        if ($sessionId) {
-            $session_condition = 'session_id = '.$sessionId;
-        } else {
-            $session_condition = '(session_id = 0 OR session_id IS NULL)';
-        }
-
         if (!isset($this->exercise_data)) {
             $sql = 'SELECT * FROM '.$this->get_forum_thread_table().'
-                    WHERE
-                        c_id = '.$this->course_id.' AND
-                        iid = '.$this->get_ref_id().' AND
-                        '.$session_condition;
+                    WHERE iid = '.$this->get_ref_id();
             $query = Database::query($sql);
             $this->exercise_data = Database::fetch_array($query);
         }
diff --git a/public/main/gradebook/lib/be/learnpathlink.class.php b/public/main/gradebook/lib/be/learnpathlink.class.php
@@ -80,14 +80,9 @@ public function calc_score($studentId = null, $type = null)
     {
         $tbl_stats = Database::get_course_table(TABLE_LP_VIEW);
         $session_id = $this->get_session_id();
-        if (empty($session_id)) {
-            $session_id = api_get_session_id();
-        }
 
         $sql = "SELECT * FROM $tbl_stats
-                WHERE
-                    lp_id = ".$this->get_ref_id()." AND
-                    session_id = $session_id ";
+                WHERE lp_id = ".$this->get_ref_id();
 
         if (isset($studentId)) {
             $sql .= ' AND user_id = '.intval($studentId);
